[Pkg-shadow-devel] Ubuntu (new upstream) shadow 1:4.1.4.2+svn3283-2ubuntu1

Ubuntu Merge-o-Matic mom at ubuntu.com
Wed Nov 24 15:01:46 UTC 2010


This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes.  It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
-------------- next part --------------
Format: 1.8
Date: Wed, 24 Nov 2010 13:42:42 +0100
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.4.2+svn3283-2ubuntu1
Distribution: natty
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Oliver Grawert <ogra at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Closes: 470059 530231 531341 539354 542804 544184 544523 548065 548407 554170 560633 562221 567836 569899 572687 573018 574082 576203 582166 586994 596283
Changes: 
 shadow (1:4.1.4.2+svn3283-2ubuntu1) natty; urgency=low
 .
   * Merge from debian unstable.  Remaining changes:
     - Ubuntu specific:
       + debian/login.defs: use SHA512 by default for password crypt routine.
     - debian/{source_shadow.py,rules}: Add apport hook
     - debian/rules: fix FTBFS from newer libtools
     - debian/patches/495_stdout-encrypted-password: chpasswd can report
       password hashes on stdout (Debian bug 505640).
     - Rework 495_stdout-encrypted-password to cope with chpasswd using PAM.
 .
 shadow (1:4.1.4.2+svn3283-2) unstable; urgency=low
 .
   * The "Bleu du Vercors-Sassenage" release.
   * Fix backup command line in cron.daily script. Closes: #596283
 .
 shadow (1:4.1.4.2+svn3283-1) unstable; urgency=low
 .
   * The "Bleu de Gex" release.
   * New upstream unreleased version:
     - Fix formatting of the login.defs.5 manpage. Closes: #542804
     - Updated Czech translation. Closes: #548407
     - Updated Vietnamese translation. Closes: #548065
     - Remove patches applied upstream:
       + debian/patches/008_su_no_sanitize_env
       + debian/patches/483_su_fakelogin_wrong_arg0
     - Updated patches:
       + debian/patches/523_su_arguments_are_no_more_concatenated_by_default
       + debian/patches/542_useradd-O_option
     - Added support for dates already specified as a number of days since
       Epoch in useradd, usermod and chage. Closes: #562221
     - This also allows, in the chage interactive mode, to specify -1 as the
       expiration date to disable it. Closes: #573018
     - Fixed parsing of gshadow. This fix password support in newgrp.
       Closes: #569899
     - pwck and grpck stop sorting at the first line which begins with a '+'.
       This will avoid messing up with NIS entries. Closes: #567836
     - Fix interruption of su, newgrp, vipw with Ctrl-Z. Closes: 530231
     - mail checking is no more mentioned in login(1) since it is done by PAM.
       Closes: #470059
     - The -e (and -c and -m) option was restored in chpasswd (which still uses
       PAM by default).  Closes: #539354
     - Kazakh translation updated. Closes: #586994
     - Fixed comma splice in chsh(1). Closes: #582166
   * debian/securetty.kfreebsd: On GNU/kFreeBSD the serial devices have change
     from /dev/cuuaX to /dev/ttydX in kernel 6.0. Closes: #544523
   * debian/securetty.linux: Added support for embedded ARM AMBA PL011 ports
     (e.g. emulated by QEMU). Closes: #544184
   * debian/control: Removed Martin Quinson from the Uploaders, on his request.
   * debian/login.defs: Improve documentation of USERGROUPS_ENAB.
     Closes: #572687
   * debian/rules: Added DEB_AUTO_UPDATE_LIBTOOL = pre. Closes: #560633
   * debian/login.pam: return back to mostly "requisite" for the pam_securetty
     PAM module, but ignore PAM_USER_UNKNOWN. This will avoid root from
     entering a password, and will also avoid user enumeration attacks.
     Mis-typed root login are not protected, only root can be blamed for
     mis-typing and entering a password on an insecure line. Users willing to
     protect against mis-typed root login can use "requisite", but will be
     vulnerable to user enumeration attacks on insecure lines, and should use
     pam 1.1.0-4 at least. Closes: #574082, #531341
   * debian/passwd.cron.daily: Handle the backups of the user and group
     databases so that it can be removed from the standard daily cron job.
     Closes: #554170
   * debian/login.defs: Updated description of UMASK (used by pam_umask).
   * debian/securetty.linux: Reorganize and synchronize with
     Documentation/devices.txt. This added a lot of TTYs, including the
     ttyPZ0..3. Closes: #576203
   * debian/rules, debian/man.insert, debian/man.insert.sed: Hack to avoid bug
     507673, causing missing apostrophes in the manpages generated by
     docbook-xsl (see debian bug 507673).
   * debian/control: Standards-Version: bumped to 3.8.4. No changes.
   * debian/passwd.lintian-overrides: Remove old entries relevant for
     passwd.config.
   * debian/control: Do not repeat the Section and Priority fields for the
     binary packages.
   * debian/rules: Disable new features: --without-acl --without-attr
     --without-tcb
Checksums-Sha1: 
 fb4662bfb1a753cda67a87ed692796ddad577b1e 1689 shadow_4.1.4.2+svn3283-2ubuntu1.dsc
 d9d68e3fc8109a305ad566ee47923ccf04758c31 333926 shadow_4.1.4.2+svn3283-2ubuntu1.diff.gz
Checksums-Sha256: 
 e156d0bca5127853974cc7b35305a90e97732cb2eb5d8c3344bce72cfb1986e2 1689 shadow_4.1.4.2+svn3283-2ubuntu1.dsc
 3f735e57dd40d19edff0ebe54cfd5a83dff462332eb84e06f2c55be024da2a44 333926 shadow_4.1.4.2+svn3283-2ubuntu1.diff.gz
Files: 
 ce7f48911c3b17969a3a7efcda3df25f 1689 admin required shadow_4.1.4.2+svn3283-2ubuntu1.dsc
 725d7fc092fae68bd14602943b3208a2 333926 admin required shadow_4.1.4.2+svn3283-2ubuntu1.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.4.2+svn3283-2/debian/changelog 1:4.1.4.2+svn3283-2ubuntu1/debian/changelog
--- 1:4.1.4.2+svn3283-2/debian/changelog	2010-11-24 14:54:13.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/changelog	2010-11-24 14:47:24.000000000 +0000
@@ -1,3 +1,16 @@
+shadow (1:4.1.4.2+svn3283-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Ubuntu specific:
+      + debian/login.defs: use SHA512 by default for password crypt routine.
+    - debian/{source_shadow.py,rules}: Add apport hook
+    - debian/rules: fix FTBFS from newer libtools
+    - debian/patches/495_stdout-encrypted-password: chpasswd can report
+      password hashes on stdout (Debian bug 505640).
+    - Rework 495_stdout-encrypted-password to cope with chpasswd using PAM.
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Wed, 24 Nov 2010 13:42:42 +0100
+
 shadow (1:4.1.4.2+svn3283-2) unstable; urgency=low
 
   * The "Bleu du Vercors-Sassenage" release.
@@ -69,6 +82,32 @@ shadow (1:4.1.4.2+svn3283-1) unstable; u
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sun, 29 Aug 2010 21:14:12 +0200
 
+shadow (1:4.1.4.2-1ubuntu3) maverick; urgency=low
+
+  * add ttyO0-3 to debian/securetty.linux, if OMAP kernels are built with
+    TI's DMA-offloaded driver instead of the default 8250 one the serial tty's
+    are called like that (LP: #512845).
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Tue, 31 Aug 2010 14:45:17 +0200
+
+shadow (1:4.1.4.2-1ubuntu2) lucid; urgency=low
+
+  * debian/{source_shadow.py,rules}: Add apport hook
+  * debian/rules: fix FTBFS from newer libtools
+
+ -- Marc Deslauriers <marc.deslauriers at ubuntu.com>  Tue, 26 Jan 2010 08:54:59 -0500
+
+shadow (1:4.1.4.2-1ubuntu1) lucid; urgency=low
+
+  * Merged with debian unstable. Remaning changes (LP: #477299):
+    - Ubuntu specific:
+      + debian/login.defs: use SHA512 by default for password crypt routine.
+    - debian/patches/495_stdout-encrypted-password: chpasswd can report
+      password hashes on stdout (Debian bug 505640).
+    - Rework 495_stdout-encrypted-password to cope with chpasswd using PAM.
+
+ -- Nicolas Valcárcel Scerpella (Canonical) <nvalcarcel at canonical.com>  Sat, 07 Nov 2009 04:55:18 -0500
+
 shadow (1:4.1.4.2-1) unstable; urgency=low
 
   * The "Tome des Bauges" release.
@@ -96,6 +135,25 @@ shadow (1:4.1.4.2-1) unstable; urgency=l
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 24 Jul 2009 05:03:23 +0200
 
+shadow (1:4.1.4.1-1ubuntu2) karmic; urgency=low
+
+  * debian/securetty.linux: also list ttyS2 and ttyS3; beagleboard uses ttyS2
+    as serial port.
+
+ -- Loïc Minier <loic.minier at ubuntu.com>  Fri, 31 Jul 2009 15:34:56 +0200
+
+shadow (1:4.1.4.1-1ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Ubuntu specific:
+      + debian/login.defs: use SHA512 by default for password crypt routine.
+    - debian/patches/495_stdout-encrypted-password: chpasswd can report
+      password hashes on stdout (Debian bug 505640).
+  * Rework 495_stdout-encrypted-password to cope with chpasswd using PAM.
+    It's looking a bit ugly now ...
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Wed, 03 Jun 2009 11:16:51 +0100
+
 shadow (1:4.1.4.1-1) unstable; urgency=low
 
   * The "Chevrotin" release.
@@ -183,6 +241,21 @@ shadow (1:4.1.4-1) unstable; urgency=low
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Mon, 11 May 2009 00:25:11 +0200
 
+shadow (1:4.1.3.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Ubuntu specific:
+      + debian/login.defs: use SHA512 by default for password crypt routine.
+    - debian/patches/stdout-encrypted-password.patch: chpasswd can report
+      password hashes on stdout (debian bug 505640).
+    - debian/login.pam: Enable SELinux support (debian bug 527106).
+    - debian/securetty.linux: support Freescale MX-series (debian bug 527095).
+  * Add debian/patches/300_lastlog_failure: fixed upstream (debian bug 524873).
+  * Drop debian/patches/593_omit_lastchange_field_if_clock_is_misset: fixed
+    upstream.
+
+ -- Kees Cook <kees at ubuntu.com>  Tue, 05 May 2009 09:45:21 -0700
+
 shadow (1:4.1.3.1-1) unstable; urgency=low
 
   * The "Le Puant Macéré" release.
@@ -278,6 +351,108 @@ shadow (1:4.1.3-1) unstable; urgency=low
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Tue, 14 Apr 2009 23:33:22 +0200
 
+shadow (1:4.1.1-6ubuntu6) jaunty; urgency=low
+
+  * debian/login.preinst: fix typo in grep (LP: #354887).
+
+ -- Kees Cook <kees at ubuntu.com>  Fri, 03 Apr 2009 22:12:07 -0700
+
+shadow (1:4.1.1-6ubuntu5) jaunty; urgency=low
+
+  * debian/login.preinst: add special-case handling to restore the
+    original white-space in /etc/login.defs that is changed by
+    system-tools-backends (LP: #316756).
+
+ -- Kees Cook <kees at ubuntu.com>  Fri, 03 Apr 2009 14:33:43 -0700
+
+shadow (1:4.1.1-6ubuntu4) jaunty; urgency=low
+
+  * debian/patches/593_omit_lastchange_field_if_clock_is_misset (LP: #349504)
+    - If the system clock is set to Jan 01, 1970, and a new user is created
+      the last changed field gets set to 0, which tells login that the 
+      password is expired and must be changed. During installation, 
+      this can cause autologin to fail. Having the clock set to 01/01/1970
+      on a fresh install is common on the ARM architecture, so this is a high
+      priority bug since its likely to affect most ARM users on first install
+
+ -- Michael Casadevall <mcasadevall at ubuntu.com>  Thu, 02 Apr 2009 14:05:31 -0400
+
+shadow (1:4.1.1-6ubuntu3) jaunty; urgency=low
+
+  [ Bryan McLellan ]
+  * Don't do the vm-builder root password check on fresh installations
+    (LP: #340841).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 17 Mar 2009 13:32:55 +0000
+
+shadow (1:4.1.1-6ubuntu2) jaunty; urgency=low
+
+  * debian/securetty.linux (LP: #316841)
+    - Updated securetty support for Freescale MX-series boards
+
+ -- Michael Casadevall <sonicmctails at gmail.com>  Tue, 13 Jan 2009 12:56:38 -0500
+
+shadow (1:4.1.1-6ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Ubuntu specific:
+      + debian/login.pam: Enable SELinux support in login.pam.
+      + debian/rules: regenerate autoconf to avoid libtool-caused FTBFS.
+      + debian/login.defs: use SHA512 by default for password crypt routine.
+      + debian/passwd.postinst: disable the root password for virtual
+        machines created with vm-builder on Ubuntu 8.10.
+    - debian/patches/stdout-encrypted-password.patch: allow chpasswd to
+      report encrypted passwords to stdout for tools needing encrypted
+      passwords (debian bug 505640).
+
+ -- Kees Cook <kees at ubuntu.com>  Mon, 08 Dec 2008 00:44:46 -0800
+
+shadow (1:4.1.1-6) unstable; urgency=medium
+
+  * The "Rollot" release.
+  * debian/patches/303_login_symlink_attack: Fix a race condition that could
+    lead to gaining ownership or changing mode of arbitrary files.
+    Closes: #505271 
+  * debian/patches/304_su.1_synopsis: Fix the su synopsis. username is
+    referenced in the manpage, not LOGIN. Closes: #501830
+  * debian/patches/305_login.1_japanese: Fix the path of the utmp and wtmp
+    files. Closes: #501353
+
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 14 Nov 2008 21:52:42 +0100
+
+shadow (1:4.1.1-5ubuntu3) jaunty; urgency=low
+
+  * disable the root password for virtual machines created with vm-builder
+    on Ubuntu 8.10. (LP: #296841)
+
+ -- Jamie Strandboge <jamie at ubuntu.com>  Thu, 13 Nov 2008 20:32:42 -0600
+
+shadow (1:4.1.1-5ubuntu2) jaunty; urgency=low
+
+  * debian/login.defs: use SHA512 by default for password crypt routine
+    (LP: #51551, currently Ubuntu specific).
+  * debian/patches/stdout-encrypted-password.patch: allow chpasswd to report
+    encrypted passwords to stdout for tools needing encrypted passwords
+    (debian bug 505640).
+  * debian/rules: regenerate autoconf to avoid libtool-caused FTBFS.
+
+ -- Kees Cook <kees at ubuntu.com>  Thu, 13 Nov 2008 16:43:48 -0800
+
+shadow (1:4.1.1-5ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/login.pam: Enable SELinux support in login.pam.
+
+ -- Scott James Remnant <scott at ubuntu.com>  Wed, 05 Nov 2008 07:26:43 +0000
+
+shadow (1:4.1.1-5) unstable; urgency=low
+
+  * The "Bergues" release.
+  * debian/login.pam: restore the Etch behavior of pam_securetty.so in case of
+    unknown user. Closes: #443322, #495831
+
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sun, 14 Sep 2008 19:13:34 +0200
+
 shadow (1:4.1.1-4) unstable; urgency=low
 
   * The "Rocamadour" release.
@@ -355,6 +530,13 @@ shadow (1:4.1.1-2) unstable; urgency=low
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 13 Jun 2008 01:27:16 +0200
 
+shadow (1:4.1.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/login.pam: Enable SELinux support in login.pam.
+
+ -- Kees Cook <kees at ubuntu.com>  Mon, 09 Jun 2008 10:08:38 -0700
+
 shadow (1:4.1.1-1) unstable; urgency=low
 
   * New upstream release. This closes the following bugs:
@@ -480,6 +662,20 @@ shadow (1:4.1.0-1) unstable; urgency=low
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 12 Jan 2008 20:40:02 +0100
 
+shadow (1:4.0.18.2-1ubuntu2) hardy; urgency=low
+
+  * Add 498_make_useradd_faster_with_ldap: make useradd faster when
+    nsswitch uses LDAP or some other remote names database (LP: #120015),
+    thanks to Vince Busam.
+
+ -- Matt T. Proud <mtp at google.com>  Fri, 08 Feb 2008 18:30:51 -0800
+
+shadow (1:4.0.18.2-1ubuntu1) hardy; urgency=low
+
+  * debian/login.pam: Enable SELinux support in login.pam (LP: #191326).
+
+ -- Caleb Case <ccase at tresys.com>  Fri, 08 Feb 2008 02:20:06 -0500
+
 shadow (1:4.0.18.2-1) unstable; urgency=low
 
   * The "Vacherin" release.
@@ -1422,7 +1618,7 @@ shadow (1:4.0.12-5) unstable; urgency=lo
   * Really add /etc/pam.d/su. Closes: #330291
   
  -- Christian Perrier <bubulle at debian.org>  Wed, 28 Sep 2005 19:59:31 +0200
-   
+
 shadow (1:4.0.12-4) unstable; urgency=low
 
   * The "Epoisses" release
@@ -2754,7 +2950,7 @@ shadow (20000902-6.1) unstable; urgency=
   * Upgrade to latest config.sub and config.guess.  Closes: #88547
  
  -- Gerhard Tonn <gt at debian.org>  Fri,  1 Jun 2001 20:38:43 +0200
-                                                              
+
 shadow (20000902-6) unstable; urgency=medium
 
   * actually set root's password when appropriate
diff -pruN 1:4.1.4.2+svn3283-2/debian/control 1:4.1.4.2+svn3283-2ubuntu1/debian/control
--- 1:4.1.4.2+svn3283-2/debian/control	2010-11-24 14:54:13.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/control	2010-11-24 14:47:24.000000000 +0000
@@ -1,9 +1,10 @@
 Source: shadow
 Section: admin
 Priority: required
-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-Standards-Version: 3.8.4
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
 Uploaders: Christian Perrier <bubulle at debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
+Standards-Version: 3.8.4
 Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], gnome-doc-utils (>= 0.4.3)
 Vcs-Svn: svn://svn.debian.org/svn/pkg-shadow/debian/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-shadow/debian/trunk
diff -pruN 1:4.1.4.2+svn3283-2/debian/login.defs 1:4.1.4.2+svn3283-2ubuntu1/debian/login.defs
--- 1:4.1.4.2+svn3283-2/debian/login.defs	2010-11-24 14:54:13.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/login.defs	2010-11-24 14:47:24.000000000 +0000
@@ -270,7 +270,7 @@ USERGROUPS_ENAB yes
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
diff -pruN 1:4.1.4.2+svn3283-2/debian/patches/495_stdout-encrypted-password 1:4.1.4.2+svn3283-2ubuntu1/debian/patches/495_stdout-encrypted-password
--- 1:4.1.4.2+svn3283-2/debian/patches/495_stdout-encrypted-password	1970-01-01 01:00:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/patches/495_stdout-encrypted-password	2010-11-24 14:47:24.000000000 +0000
@@ -0,0 +1,173 @@
+Description: allow chpasswd to report a correctly hashed password (using
+ system defaults for hash mechanism) to stdout.
+Upstream: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505640
+
+Index: shadow-4.1.4.1/src/chpasswd.c
+===================================================================
+--- shadow-4.1.4.1.orig/src/chpasswd.c
++++ shadow-4.1.4.1/src/chpasswd.c
+@@ -54,7 +54,6 @@
+  * Global variables
+  */
+ char *Prog;
+-#ifndef USE_PAM
+ static bool cflg   = false;
+ static bool eflg   = false;
+ static bool md5flg = false;
+@@ -70,7 +69,8 @@
+ static bool is_shadow_pwd;
+ static bool pw_locked = false;
+ static bool spw_locked = false;
+-#endif				/* !USE_PAM */
++
++static int use_stdout = 0;
+ 
+ /* local function prototypes */
+ static void fail_exit (int code);
+@@ -141,6 +141,9 @@
+ 	              stderr);
+ #endif				/* USE_SHA_CRYPT */
+ #endif				/* !USE_PAM */
++	(void) fputs (_("  -S, --stdout                  report encrypted passwords to stdout\n"
++	                "                                instead of changing the passwd file\n"),
++	              stderr);
+ 	(void) fputs ("\n", stderr);
+ 
+ 	exit (E_USAGE);
+@@ -164,6 +167,7 @@
+ 		{"sha-rounds", required_argument, NULL, 's'},
+ #endif				/* USE_SHA_CRYPT */
+ #endif				/* !USE_PAM */
++		{"stdout", no_argument, NULL, 'S'},
+ 		{"help", no_argument, NULL, 'h'},
+ 		{NULL, 0, NULL, '\0'}
+ 	};
+@@ -171,12 +175,12 @@
+ 	while ((c = getopt_long (argc, argv,
+ #ifndef USE_PAM
+ # ifdef USE_SHA_CRYPT
+-	                         "c:ehms:",
++	                         "c:ehms:S",
+ # else				/* !USE_SHA_CRYPT */
+-	                         "c:ehm",
++	                         "c:ehmS",
+ # endif				/* !USE_SHA_CRYPT */
+ #else
+-	                         "h",
++	                         "hS",
+ #endif				/* !USE_PAM */
+ 	                         long_options, &option_index)) != -1) {
+ 		switch (c) {
+@@ -206,6 +210,9 @@
+ 			break;
+ #endif				/* USE_SHA_CRYPT */
+ #endif				/* !USE_PAM */
++		case 'S':
++			use_stdout = 1;
++			break;
+ 		default:
+ 			usage ();
+ 			break;
+@@ -271,6 +278,7 @@
+  */
+ static void check_perms (void)
+ {
++	if (use_stdout) return;
+ #ifdef USE_PAM
+ #ifdef ACCT_TOOLS_SETUID
+ 	pam_handle_t *pamh = NULL;
+@@ -412,6 +420,7 @@
+ 
+ 	OPENLOG ("chpasswd");
+ 
++	if (!use_stdout) {
+ 	check_perms ();
+ 
+ #ifndef USE_PAM
+@@ -419,6 +428,7 @@
+ 
+ 	open_files ();
+ #endif
++	}
+ 
+ 	/*
+ 	 * Read each line, separating the user name from the password. The
+@@ -467,13 +477,14 @@
+ 		newpwd = cp;
+ 
+ #ifdef USE_PAM
+-		if (do_pam_passwd_non_interractive ("chpasswd", name, newpwd) != 0) {
+-			fprintf (stderr,
+-			         _("%s: (line %d, user %s) password not changed\n"),
+-			         Prog, line, name);
+-			errors++;
+-		}
+-#else				/* !USE_PAM */
++		/* Even if we would normally be using PAM, use_stdout
++		 * requires us to compute the password ourselves. This
++		 * requires our ENCRYPT_METHOD to be in sync with PAM so
++		 * needs to be reworked, but for now that's better than the
++		 * rest of the system having to be in sync with PAM too.
++		 */
++		if (use_stdout) {
++#endif
+ 		if (   !eflg
+ 		    && (   (NULL == crypt_method)
+ 		        || (0 != strcmp (crypt_method, "NONE")))) {
+@@ -492,6 +503,24 @@
+ 			cp = pw_encrypt (newpwd,
+ 			                 crypt_make_salt(crypt_method, arg));
+ 		}
++#ifdef USE_PAM
++		}
++#endif
++
++		if (use_stdout) {
++			fprintf (stdout, "%s:%s\n", name, cp);
++			continue;
++		}
++
++#ifdef USE_PAM
++		if (do_pam_passwd_non_interractive ("chpasswd", name, newpwd) != 0) {
++			fprintf (stderr,
++			         _("%s: (line %d, user %s) password not changed\n"),
++			         Prog, line, name);
++			errors++;
++			continue;
++		}
++#else				/* !USE_PAM */
+ 
+ 		/*
+ 		 * Get the password file entry for this user. The user must
+@@ -573,12 +602,14 @@
+ 		fail_exit (1);
+ 	}
+ 
++	if (!use_stdout) {
+ #ifndef USE_PAM
+ 	/* Save the changes */
+ 	close_files ();
+ #endif
+ 
+ 	nscd_flush_cache ("passwd");
++	}
+ 
+ 	return (0);
+ }
+Index: shadow-4.1.4.1/man/chpasswd.8.xml
+===================================================================
+--- shadow-4.1.4.1.orig/man/chpasswd.8.xml
++++ shadow-4.1.4.1/man/chpasswd.8.xml
+@@ -134,6 +134,12 @@
+     </variablelist>
+     <variablelist remap='IP'>
+       <varlistentry>
++	<term><option>-S</option>, <option>--stdout</option></term>
++	<listitem>
++	  <para>Report encrypted passwords to stdout instead of updating password file.</para>
++	</listitem>
++      </varlistentry>
++      <varlistentry>
+ 	<term><option>-h</option>, <option>--help</option></term>
+ 	<listitem>
+ 	  <para>Display help message and exit.</para>
diff -pruN 1:4.1.4.2+svn3283-2/debian/patches/series 1:4.1.4.2+svn3283-2ubuntu1/debian/patches/series
--- 1:4.1.4.2+svn3283-2/debian/patches/series	2010-11-24 14:54:13.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/patches/series	2010-11-24 14:47:24.000000000 +0000
@@ -18,3 +18,4 @@
 523_su_arguments_are_no_more_concatenated_by_default
 508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
+495_stdout-encrypted-password 
diff -pruN 1:4.1.4.2+svn3283-2/debian/rules 1:4.1.4.2+svn3283-2ubuntu1/debian/rules
--- 1:4.1.4.2+svn3283-2/debian/rules	2010-11-24 14:54:13.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/rules	2010-11-24 14:47:24.000000000 +0000
@@ -50,6 +50,8 @@ binary-install/login::
 	dh_installpam -p login --name=su
 	install -c -m 444 debian/login.defs debian/login/etc/login.defs
 	install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty
+	install -d debian/login/usr/share/apport/package-hooks
+	install -c -m 644 debian/source_shadow.py debian/login/usr/share/apport/package-hooks/source_shadow.py
 	dh_lintian -p login
 
 binary-install/passwd::
diff -pruN 1:4.1.4.2+svn3283-2/debian/securetty.linux 1:4.1.4.2+svn3283-2ubuntu1/debian/securetty.linux
--- 1:4.1.4.2+svn3283-2/debian/securetty.linux	2010-11-24 14:54:13.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/securetty.linux	2010-11-24 14:47:24.000000000 +0000
@@ -380,4 +380,3 @@ ttyama0
 ttyama1
 ttyama2
 ttyama3
-
diff -pruN 1:4.1.4.2+svn3283-2/debian/source_shadow.py 1:4.1.4.2+svn3283-2ubuntu1/debian/source_shadow.py
--- 1:4.1.4.2+svn3283-2/debian/source_shadow.py	1970-01-01 01:00:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/debian/source_shadow.py	2010-11-24 14:47:24.000000000 +0000
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+
+'''Apport package hook for shadow
+
+(c) 2010 Canonical Ltd.
+Contributors:
+Marc Deslauriers <marc.deslauriers at canonical.com>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+
+def add_info(report):
+
+    attach_file_if_exists(report, '/etc/login.defs', 'LoginDefs')
+
+if __name__ == '__main__':
+    report = {}
+    add_info(report)
+    for key in report:
+        print '[%s]\n%s' % (key, report[key])
diff -pruN 1:4.1.4.2+svn3283-2/man/po/de.po 1:4.1.4.2+svn3283-2ubuntu1/man/po/de.po
--- 1:4.1.4.2+svn3283-2/man/po/de.po	2010-08-29 16:54:41.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/man/po/de.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "Last-Translator: Simon Brandmair <sbrandmair at gmx.net>\n"
 "Language-Team: debian-l10n-german <http://lists.debian.org/debian-l10n-"
 "german/>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
 #: login.defs.5.xml:477(term)
@@ -177,7 +177,6 @@ msgstr "Bearbeitet die Shadow- oder Gsha
 
 #: vipw.8.xml:122(term)
 #, fuzzy
-#| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
@@ -220,9 +219,6 @@ msgstr "CHFN_AUTH (Boolesh)"
 #: useradd.8.xml:32(para) pwconv.8.xml:32(para) pwck.8.xml:32(para)
 #: login.defs.5.xml:32(para) chage.1.xml:32(para)
 #, fuzzy
-#| msgid ""
-#| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry> for details on how this string is interpreted."
 msgid ""
 "If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing "
@@ -247,7 +243,6 @@ msgstr ""
 # SB: English manual should be "HISTORY"
 #: vipw.8.xml:152(option)
 #, fuzzy
-#| msgid "HYSTORY"
 msgid "EDITOR"
 msgstr "GESCHICHTE"
 
@@ -375,18 +370,6 @@ msgstr "SIEHE AUCH"
 
 #: vipw.8.xml:192(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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -447,9 +430,6 @@ msgstr "<option>-a</option>, <option>--a
 
 #: usermod.8.xml:80(para)
 #, fuzzy
-#| msgid ""
-#| "Add the user to the supplemental group(s). Use only with <option>-G</"
-#| "option> option."
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
@@ -485,16 +465,11 @@ msgstr ""
 
 #: usermod.8.xml:106(para)
 #, fuzzy
-#| msgid "user home directory"
 msgid "The user's new login directory."
 msgstr "Home-Verzeichnis des Benutzers"
 
 #: usermod.8.xml:109(para)
 #, fuzzy
-#| msgid ""
-#| "The user's new login directory. If the <option>-m</option> option is "
-#| "given the contents of the current home directory will be moved to the new "
-#| "home directory, which is created if it does not already exist."
 msgid ""
 "If the <option>-m</option> option is given, the contents of the current home "
 "directory will be moved to the new home directory, which is created if it "
@@ -531,9 +506,6 @@ msgstr ""
 
 #: usermod.8.xml:135(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
@@ -543,11 +515,6 @@ msgstr ""
 
 #: usermod.8.xml:139(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "A value of 0 disables the account as soon as the password has expired, and a "
 "value of -1 disables the feature."
@@ -565,10 +532,6 @@ msgstr ""
 
 #: usermod.8.xml:152(para)
 #, fuzzy
-#| msgid ""
-#| "The group name or number of the user's new initial login group. The group "
-#| "name must exist. A group number must refer to an already existing group. "
-#| "The default group number is 1."
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
@@ -601,12 +564,6 @@ msgstr ""
 
 #: usermod.8.xml:172(para)
 #, fuzzy
-#| msgid ""
-#| "A list of supplementary groups which the user is also a member of. Each "
-#| "group is separated from the next by a comma, with no intervening "
-#| "whitespace. The groups are subject to the same restrictions as the group "
-#| "given with the <option>-g</option> option. The default is for the user to "
-#| "belong only to the initial group."
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
@@ -682,7 +639,6 @@ msgstr ""
 
 #: usermod.8.xml:222(term)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
@@ -692,7 +648,6 @@ msgstr ""
 
 #: usermod.8.xml:230(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -785,12 +740,6 @@ msgstr ""
 
 #: usermod.8.xml:301(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "The default is to use the smallest ID value greater than 999 and greater "
-#| "than every other user. Values between 0 and 999 are typically reserved "
-#| "for system accounts."
 msgid ""
 "This value must be unique, unless the <option>-o</option> option is used. "
 "The value must be non-negative. Values between 0 and 999 are typically "
@@ -804,14 +753,6 @@ msgstr ""
 
 #: usermod.8.xml:307(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "Values between 0 and 999 are typically reserved for system accounts. Any "
-#| "files which the user owns and which are located in the directory tree "
-#| "rooted at the user's home directory will have the file user ID changed "
-#| "automatically. Files outside of the user's home directory must be altered "
-#| "manually."
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
@@ -855,9 +796,6 @@ msgstr ""
 
 #: usermod.8.xml:339(term) useradd.8.xml:482(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -866,9 +804,6 @@ msgstr ""
 
 #: usermod.8.xml:344(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 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."
@@ -1169,9 +1104,6 @@ msgstr ""
 
 #: userdel.8.xml:117(para)
 #, fuzzy
-#| msgid ""
-#| "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable "
-#| "in the <filename>login.defs</filename> file."
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1378,9 +1310,6 @@ msgstr ""
 
 #: userdel.8.xml:233(para)
 #, fuzzy
-#| msgid ""
-#| "You must manually check all file systems to insure that no files remain "
-#| "with the named group as the file group ID."
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
@@ -1398,15 +1327,6 @@ msgstr ""
 
 #: userdel.8.xml:240(para)
 #, fuzzy
-#| msgid ""
-#| "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
-#| "\">yes</emphasis> in <filename>/etc/login.defs</filename>, "
-#| "<command>userdel</command> will delete the group with the same name as "
-#| "the user. To avoid inconsistencies in the passwd and group databases, "
-#| "<command>userdel</command> will check that this group is not used as a "
-#| "primary group for another user, and will just warn without deleting the "
-#| "user otherwise. The <option>-f</option> option can force the deletion of "
-#| "this group."
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1562,7 +1482,6 @@ msgstr ""
 
 #: useradd.8.xml:158(term)
 #, fuzzy
-#| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
@@ -1580,11 +1499,6 @@ msgstr ""
 
 #: useradd.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled. A value of 0 disables the account as soon as the password has "
@@ -1597,9 +1511,6 @@ msgstr ""
 
 #: useradd.8.xml:197(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's login shell. The default is to leave this field "
-#| "blank, which causes the system to select the default login shell."
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
@@ -1610,10 +1521,6 @@ msgstr ""
 
 #: useradd.8.xml:211(para)
 #, fuzzy
-#| msgid ""
-#| "The group name or number of the user's new initial login group. The group "
-#| "name must exist. A group number must refer to an already existing group. "
-#| "The default group number is 1."
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group."
@@ -1652,9 +1559,6 @@ msgstr ""
 
 #: useradd.8.xml:256(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1670,7 +1574,6 @@ msgstr ""
 
 #: useradd.8.xml:266(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1697,25 +1600,15 @@ msgstr ""
 
 #: useradd.8.xml:287(para)
 #, fuzzy
-#| msgid ""
-#| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
-#| "PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
-#| "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
-#| "replaceable> can be used when creating system account to turn off "
-#| "password ageing, even though system account has no password at all. "
-#| "Multiple <option>-K</option> options can be specified, e.g.: <option>-K </"
-#| "option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
-#| "replaceable><option> -K </option><replaceable>UID_MAX</"
-#| "replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
 "<option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: "
-"<option>-K </option><replaceable>PASS_MAX_DAYS</"
-"replaceable>=<replaceable>-1</replaceable> can be used when creating system "
-"account to turn off password ageing, even though system account has no "
-"password at all. Multiple <option>-K</option> options can be specified, e."
-"g.: <option>-K </option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+"<option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-"
+"1</replaceable> can be used when creating system account to turn off "
+"password ageing, even though system account has no password at all. Multiple "
+"<option>-K</option> options can be specified, e.g.: <option>-K </"
+"option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
 "replaceable><option>-K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
@@ -1731,7 +1624,6 @@ msgstr ""
 
 #: useradd.8.xml:311(term)
 #, fuzzy
-#| msgid "<option>-l</option>, <option>--list</option>"
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
@@ -1764,7 +1656,6 @@ msgstr ""
 
 #: useradd.8.xml:343(option)
 #, fuzzy
-#| msgid "-"
 msgid "-M"
 msgstr "-"
 
@@ -1777,7 +1668,6 @@ msgstr ""
 
 #: useradd.8.xml:355(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1804,17 +1694,12 @@ msgstr ""
 
 #: useradd.8.xml:379(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 #: useradd.8.xml:391(para) groupadd.8.xml:149(para)
 #, fuzzy
-#| msgid ""
-#| "The encrypted password, as returned by "
-#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry>. The default is to disable the account."
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1826,7 +1711,6 @@ msgstr ""
 
 #: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -1855,9 +1739,6 @@ msgstr ""
 
 #: useradd.8.xml:440(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's login shell. The default is to leave this field "
-#| "blank, which causes the system to select the default login shell."
 msgid ""
 "The name of the user's login shell. The default is to leave this field "
 "blank, which causes the system to select the default login shell specified "
@@ -1883,7 +1764,6 @@ msgstr ""
 
 #: useradd.8.xml:465(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1895,9 +1775,6 @@ msgstr ""
 
 #: useradd.8.xml:487(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
@@ -1996,9 +1873,6 @@ msgstr "ANMERKUNGEN"
 
 #: useradd.8.xml:597(para)
 #, fuzzy
-#| msgid ""
-#| "The system administrator is responsible for placing the default user "
-#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -2030,10 +1904,6 @@ msgstr ""
 
 #: useradd.8.xml:617(para)
 #, fuzzy
-#| msgid ""
-#| "Usernames must begin with a lower case letter or an underscore, and only "
-#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
-#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -2045,7 +1915,6 @@ msgstr ""
 
 #: useradd.8.xml:623(para)
 #, fuzzy
-#| msgid "Groupnames may only be up to 16 characters long."
 msgid "Usernames may only be up to 32 characters long."
 msgstr "Gruppennamen dürfen nur bis zu 16 Zeichen lang sein."
 
@@ -2080,9 +1949,6 @@ msgstr "GID_MIN (Zahl)"
 #: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 #: groupadd.8.xml:35(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of group IDs used for the creation of regular groups by "
 "<command>useradd</command>, <command>groupadd</command>, or "
@@ -2160,9 +2026,6 @@ msgstr "GID_MIN (Zahl)"
 #: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 #: groupadd.8.xml:33(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of group IDs used for the creation of system groups by "
 "<command>useradd</command>, <command>groupadd</command>, or "
@@ -2183,9 +2046,6 @@ msgstr "UID_MIN (Zahl)"
 
 #: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of user IDs used for the creation of system users by <command>useradd</"
 "command> or <command>newusers</command>."
@@ -2219,9 +2079,6 @@ msgstr "UID_MIN (Zahl)"
 
 #: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of user IDs used for the creation of regular users by "
 "<command>useradd</command> or <command>newusers</command>."
@@ -2238,9 +2095,6 @@ msgstr "UMASK (Zahl)"
 #: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
 #: login.1.xml:34(para)
 #, fuzzy
-#| msgid ""
-#| "The permission mask is initialized to this value. If not specified, the "
-#| "permission mask will be initialized to 022."
 msgid ""
 "The file mode creation mask is initialized to this value. If not specified, "
 "the mask will be initialized to 022."
@@ -2270,9 +2124,6 @@ msgstr ""
 #: useradd.8.xml:50(para) newusers.8.xml:50(para) login.defs.5.xml:50(para)
 #: login.1.xml:50(para)
 #, fuzzy
-#| msgid ""
-#| "If no options are specified, <command>useradd</command> displays the "
-#| "current default values."
 msgid ""
 "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
@@ -2716,13 +2567,6 @@ msgstr ""
 
 #: 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 "
@@ -2878,7 +2722,6 @@ 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."
 
@@ -3027,9 +2870,6 @@ 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 # "
@@ -3204,19 +3044,16 @@ msgstr ""
 
 #: su.1.xml:393(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "126"
 msgstr "12"
 
 #: su.1.xml:395(para)
 #, fuzzy
-#| msgid "execute command as different group ID"
 msgid "The requested command was not found"
 msgstr "führt einen Befehl unter einer anderen Gruppen-ID aus"
 
 #: su.1.xml:399(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "127"
 msgstr "12"
 
@@ -3232,13 +3069,6 @@ msgstr ""
 
 #: su.1.xml:410(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</"
@@ -3309,18 +3139,6 @@ 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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3354,16 +3172,11 @@ msgstr "shadow"
 
 #: shadow.5.xml:40(refpurpose)
 #, fuzzy
-#| msgid "the password file"
 msgid "shadowed password file"
 msgstr "die Passwortdatei"
 
 #: shadow.5.xml:45(para)
 #, fuzzy
-#| msgid ""
-#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-#| "information for user's accounts and optional the password aging "
-#| "information. Included is:"
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
@@ -3409,13 +3222,6 @@ msgstr ""
 
 #: shadow.5.xml:78(para)
 #, fuzzy
-#| msgid ""
-#| "If the password field contains some string that is not valid result of "
-#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry>, for instance ! or *, the user will not be able "
-#| "to use a unix password to log in, subject to "
-#| "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
-#| "citerefentry>."
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -3446,7 +3252,6 @@ msgstr ""
 
 #: shadow.5.xml:102(emphasis)
 #, fuzzy
-#| msgid "days before password may be changed"
 msgid "date of last password change"
 msgstr "Anzahl der Tage, bevor das Passwort geändert werden darf"
 
@@ -3468,7 +3273,6 @@ msgstr ""
 
 #: shadow.5.xml:121(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "minimum password age"
 msgstr "Verändern des Passworts"
 
@@ -3484,7 +3288,6 @@ msgstr ""
 
 #: shadow.5.xml:135(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "maximum password age"
 msgstr "Verändern des Passworts"
 
@@ -3514,15 +3317,11 @@ msgstr ""
 
 #: shadow.5.xml:159(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "password warning period"
 msgstr "Verändern des Passworts"
 
 #: shadow.5.xml:162(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days before a password is going to expire (see the maximum "
 "password age above) during which the user should be warned."
@@ -3560,7 +3359,6 @@ msgstr ""
 
 #: shadow.5.xml:197(emphasis)
 #, fuzzy
-#| msgid "User account information."
 msgid "account expiration date"
 msgstr "Informationen zu den Benutzerkonten."
 
@@ -3589,19 +3387,16 @@ msgstr ""
 
 #: shadow.5.xml:221(emphasis)
 #, fuzzy
-#| msgid "a reserved field"
 msgid "reserved field"
 msgstr "ein reserviertes Feld"
 
 #: shadow.5.xml:223(para)
 #, fuzzy
-#| msgid "sp_flag - reserved for future use"
 msgid "This field is reserved for future use."
 msgstr "sp_flag - für zukünftigen Gebrauch reserviert"
 
 #: shadow.5.xml:245(filename)
 #, fuzzy
-#| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
@@ -3617,21 +3412,6 @@ msgstr ""
 
 #: shadow.5.xml:259(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -4100,15 +3880,6 @@ msgstr ""
 
 #: pwconv.8.xml:200(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>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -4160,13 +3931,6 @@ msgstr "-r"
 
 #: pwck.8.xml:87(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 users and "
 "authentication information. It checks that all entries in <filename>/etc/"
@@ -4193,7 +3957,6 @@ msgstr "die richtige Anzahl von Feldern"
 
 #: pwck.8.xml:105(para)
 #, fuzzy
-#| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "einen eindeutigen Benutzernamen"
 
@@ -4235,7 +3998,6 @@ msgstr ""
 
 #: pwck.8.xml:140(para)
 #, fuzzy
-#| msgid "the correct number of fields"
 msgid "shadow entries have the correct number of fields"
 msgstr "die richtige Anzahl von Feldern"
 
@@ -4245,7 +4007,6 @@ msgstr ""
 
 #: pwck.8.xml:146(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"
 
@@ -4308,17 +4069,11 @@ msgstr ""
 
 #: pwck.8.xml:205(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 #: pwck.8.xml:212(para)
 #, fuzzy
-#| 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."
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -4356,7 +4111,6 @@ msgstr "kann die Passwortdatei nicht akt
 
 #: pwck.8.xml:314(para)
 #, fuzzy
-#| msgid "can't open password files"
 msgid "can't sort password files"
 msgstr "kann die Passwortdatei nicht öffnen"
 
@@ -4370,15 +4124,6 @@ msgstr ""
 
 #: pwck.8.xml:323(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</"
@@ -4635,7 +4380,6 @@ msgstr "optionale Datei für verschlüss
 
 #: passwd.5.xml:131(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
@@ -4645,24 +4389,6 @@ msgstr ""
 
 #: passwd.5.xml:145(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4797,12 +4523,6 @@ msgstr "Hinweise zu Benutzerpasswörtern
 
 #: passwd.1.xml:126(para)
 #, fuzzy
-#| msgid ""
-#| "The security of a password depends upon the strength of the encryption "
-#| "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
-#| "System encryption method is based on the NBS DES algorithm and is very "
-#| "secure. The size of the key space depends upon the randomness of the "
-#| "password which is selected."
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The legacy <emphasis>UNIX</"
@@ -4947,9 +4667,6 @@ msgstr ""
 
 #: passwd.1.xml:247(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -4987,14 +4704,6 @@ msgstr "<option>-S</option>, <option>--s
 
 #: passwd.1.xml:283(para)
 #, fuzzy
-#| msgid ""
-#| "Display account status information. The status information consists of 7 "
-#| "fields. The first field is the user's login name. The second field "
-#| "indicates if the user account is locked (L), has no password (NP), or has "
-#| "a usable password (P). The third field gives the date of the last "
-#| "password change. The next four fields are the minimum age, maximum age, "
-#| "warning period, and inactivity period for the password. These ages are "
-#| "expressed in days."
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
@@ -5065,12 +4774,6 @@ msgstr ""
 
 #: passwd.1.xml:339(para)
 #, fuzzy
-#| msgid ""
-#| "Not all options may be supported. Password complexity checking may vary "
-#| "from site to site. The user is urged to select a password as complex as "
-#| "he or she feels comfortable with. 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."
 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."
@@ -5109,10 +4812,6 @@ msgstr ""
 #: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
 #: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 #, fuzzy
-#| msgid ""
-#| "Example: <option>-K </option><replaceable>GID_MIN</"
-#| "replaceable>=<replaceable>100</replaceable><option> -K </"
-#| "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "It can take one of these values: <replaceable>DES</replaceable> (default), "
 "<replaceable>MD5</replaceable><phrase condition=\"sha_crypt\">, "
@@ -5271,7 +4970,6 @@ msgstr ""
 
 #: passwd.1.xml:395(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
@@ -5310,13 +5008,6 @@ msgstr ""
 
 #: passwd.1.xml:456(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -5374,13 +5065,11 @@ msgstr ""
 # SB: English manual should be "HISTORY"
 #: nologin.8.xml:76(title)
 #, fuzzy
-#| msgid "HYSTORY"
 msgid "HISTORY"
 msgstr "GESCHICHTE"
 
 #: nologin.8.xml:77(para)
 #, fuzzy
-#| msgid "The <command>nologin</command> command appeared in BSD 4.4."
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "Der Befehl <command>nologin</command> tauchte erstmal in BSD 4.4 auf."
 
@@ -5399,13 +5088,6 @@ msgstr "neue_benutzer"
 
 #: newusers.8.xml:71(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>newusers</command> command reads a file of user name and "
-#| "clear-text password pairs and uses this information to update a group of "
-#| "existing users or to create new users. Each line is in the same format as "
-#| "the standard password file (see <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-#| "exceptions:"
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
@@ -5427,7 +5109,6 @@ msgstr ""
 
 #: newusers.8.xml:84(emphasis)
 #, fuzzy
-#| msgid "group_name"
 msgid "pw_name"
 msgstr "Gruppen_Name"
 
@@ -5456,7 +5137,6 @@ msgstr ""
 
 #: newusers.8.xml:112(emphasis)
 #, fuzzy
-#| msgid "pw_gid"
 msgid "pw_uid"
 msgstr "pw_gid"
 
@@ -5592,8 +5272,6 @@ msgstr ""
 
 #: newusers.8.xml:240(para)
 #, fuzzy
-#| msgid ""
-#| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>usermod</command> unterstützt werden, "
@@ -5669,7 +5347,6 @@ msgstr ""
 
 #: newusers.8.xml:390(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
@@ -6340,7 +6017,6 @@ msgstr ""
 
 #: login.defs.5.xml:357(term)
 #, fuzzy
-#| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
@@ -6374,7 +6050,6 @@ msgstr ""
 
 #: login.defs.5.xml:403(para)
 #, fuzzy
-#| msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
@@ -6425,16 +6100,6 @@ msgstr ""
 
 #: login.defs.5.xml:489(para)
 #, fuzzy
-#| msgid ""
-#| "Much of the functionality that used to be provided by the shadow password "
-#| "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> "
-#| "is no longer used by programs such as: "
-#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>. Please refer to the corresponding PAM configuration files "
-#| "instead."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
@@ -6601,16 +6266,6 @@ msgstr "-r <placeholder-1/>"
 
 #: login.1.xml:104(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>login</command> program is used to establish a new session "
-#| "with the system. It is normally invoked automatically by responding to "
-#| "the <emphasis remap=\"I\">login:</emphasis> prompt on the user's "
-#| "terminal. <command>login</command> may be special to the shell and may "
-#| "not be invoked as a sub-process. Typically, <command>login</command> is "
-#| "treated by the shell as <emphasis remap=\"B\">exec login</emphasis> which "
-#| "causes the user to exit from the current shell. Attempting to execute "
-#| "<command>login</command> from any shell but the login shell will produce "
-#| "an error message."
 msgid ""
 "The <command>login</command> program is used to establish a new session with "
 "the system. It is normally invoked automatically by responding to the "
@@ -6918,7 +6573,6 @@ msgstr ""
 
 #: limits.5.xml:70(emphasis)
 #, fuzzy
-#| msgid "user LIMITS_STRING"
 msgid "@group LIMITS_STRING"
 msgstr "Benutzer LIMITS_STRING"
 
@@ -7010,10 +6664,6 @@ msgstr ""
 # SB: "LIMITS_STRING" übersetzen?
 #: limits.5.xml:108(para)
 #, fuzzy
-#| msgid ""
-#| "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-#| "<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the "
-#| "following entries are equivalent:"
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
@@ -7186,9 +6836,6 @@ msgstr ""
 
 #: lastlog.8.xml:102(term) faillog.8.xml:168(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
-#| "replaceable>=<replaceable>VALUE</replaceable>"
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -7198,9 +6845,6 @@ msgstr ""
 
 #: lastlog.8.xml:107(para)
 #, fuzzy
-#| msgid ""
-#| "Print the lastlog record for user with specified <emphasis remap=\"I"
-#| "\">LOGIN</emphasis> only."
 msgid "Print the lastlog record of the specified user(s)."
 msgstr ""
 "Gibt nur die Lastlog-Einträge für den Benutzer aus, der mit <emphasis remap="
@@ -7285,10 +6929,6 @@ msgstr "Datei für Shadow-Gruppen"
 
 #: gshadow.5.xml:44(para)
 #, fuzzy
-#| msgid ""
-#| "<filename>/etc/gshadow</filename> contains the shadowed information for "
-#| "group accounts. It contains lines with the following colon-separated "
-#| "fields:"
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
@@ -7311,13 +6951,6 @@ msgstr ""
 
 #: gshadow.5.xml:75(para)
 #, fuzzy
-#| msgid ""
-#| "If the password field contains some string that is not valid result of "
-#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry>, for instance ! or *, the user will not be able "
-#| "to use a unix password to log in, subject to "
-#| "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
-#| "citerefentry>."
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -7333,10 +6966,6 @@ msgstr ""
 
 #: gshadow.5.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The comment field is used by various system utilities, such as "
-#| "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -7354,9 +6983,6 @@ msgstr ""
 
 #: gshadow.5.xml:98(para)
 #, fuzzy
-#| msgid ""
-#| "This information supersedes any password present in <filename>/etc/group</"
-#| "filename>."
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
@@ -7369,7 +6995,6 @@ msgstr ""
 
 #: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
 #, fuzzy
-#| msgid "comma-separated list of group members"
 msgid "It must be a comma-separated list of user names."
 msgstr "Liste der Mitglieder der Gruppe, durch Kommas getrennt"
 
@@ -7392,9 +7017,6 @@ msgstr ""
 
 #: gshadow.5.xml:131(para)
 #, fuzzy
-#| msgid ""
-#| "This information supersedes any password present in <filename>/etc/group</"
-#| "filename>."
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
@@ -7402,15 +7024,6 @@ msgstr ""
 
 #: gshadow.5.xml:160(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>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -7436,13 +7049,6 @@ msgstr "überprüft die Stimmigkeit der 
 
 #: grpck.8.xml:70(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>grpck</command> command verifies the integrity of the system "
-#| "authentication information. All entries in the <filename>/etc/group</"
-#| "filename> and <filename>/etc/gshadow</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>grpck</command> command verifies the integrity of the groups "
 "information. It checks that all entries in <filename>/etc/group</"
@@ -7460,15 +7066,11 @@ msgstr ""
 
 #: grpck.8.xml:87(para)
 #, fuzzy
-#| msgid "a unique group name"
 msgid "a unique and valid group name"
 msgstr "einen eindeutigen Gruppennamen"
 
 #: 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>"
@@ -7478,7 +7080,6 @@ msgstr ""
 
 #: 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>"
@@ -7486,11 +7087,6 @@ msgstr "eine gültige Liste der Mitglied
 
 #: 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</"
@@ -7503,14 +7099,6 @@ msgstr ""
 
 #: 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 "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -7532,11 +7120,6 @@ msgstr ""
 
 #: 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><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -7551,7 +7134,6 @@ msgstr ""
 
 #: 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 ""
 "Die Optionen, die vom Befehl <command>pwck</command> unterstützt werden, "
@@ -7566,9 +7148,6 @@ msgstr ""
 
 #: grpck.8.xml:151(para)
 #, fuzzy
-#| msgid ""
-#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
-#| "shadow</filename> by UID."
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
@@ -7578,11 +7157,6 @@ msgstr ""
 
 #: grpck.8.xml:160(para)
 #, fuzzy
-#| 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."
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -7622,16 +7196,6 @@ msgstr ""
 
 #: 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</"
@@ -7742,9 +7306,6 @@ msgstr ""
 
 #: groupmod.8.xml:78(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the group will be changed from <replaceable>GROUP</"
-#| "replaceable> to <replaceable>NEW_GROUP</replaceable> name."
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
@@ -7754,12 +7315,6 @@ msgstr ""
 
 #: groupmod.8.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "The default is to use the smallest ID value greater than 999 and greater "
-#| "than every other user. Values between 0 and 999 are typically reserved "
-#| "for system accounts."
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
@@ -7907,8 +7462,6 @@ msgstr ""
 
 #: groupmems.8.xml:82(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -7917,7 +7470,6 @@ msgstr ""
 
 #: groupmems.8.xml:84(para)
 #, fuzzy
-#| msgid "Add a new user to the group membership list."
 msgid "Add an user to the group membership list."
 msgstr "Fügt einen neuen Benutzer der Mitgliederliste der Gruppe hinzu."
 
@@ -7931,9 +7483,6 @@ msgstr ""
 
 #: groupmems.8.xml:93(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -7952,8 +7501,6 @@ msgstr ""
 
 #: groupmems.8.xml:109(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -7975,7 +7522,6 @@ msgstr "Gibt die Mitgliederliste aus."
 
 #: groupmems.8.xml:129(term)
 #, fuzzy
-#| msgid "<option>-e</option>, <option>--expire</option>"
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
@@ -8077,9 +7623,6 @@ msgstr ""
 
 #: groupdel.8.xml:70(para)
 #, fuzzy
-#| msgid ""
-#| "You must manually check all file systems to insure that no files remain "
-#| "with the named group as the file group ID."
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
@@ -8191,10 +7734,6 @@ msgstr ""
 
 #: groupadd.8.xml:122(para)
 #, fuzzy
-#| msgid ""
-#| "Example: <option>-K </option><replaceable>GID_MIN</"
-#| "replaceable>=<replaceable>100</replaceable><option> -K </"
-#| "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -8221,7 +7760,6 @@ msgstr "Erlaubt es, eine Gruppe mit eine
 
 #: groupadd.8.xml:170(para)
 #, fuzzy
-#| msgid "create a new group"
 msgid "Create a system group."
 msgstr "erstellt eine neue Gruppe"
 
@@ -8235,10 +7773,6 @@ msgstr ""
 
 #: groupadd.8.xml:224(para)
 #, fuzzy
-#| msgid ""
-#| "Groupnames must begin with a lower case letter or an underscore, and only "
-#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
-#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -8250,7 +7784,6 @@ msgstr ""
 
 #: groupadd.8.xml:230(para)
 #, fuzzy
-#| msgid "Groupnames may only be up to 16 characters long."
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr "Gruppennamen dürfen nur bis zu 16 Zeichen lang sein."
 
@@ -8324,7 +7857,6 @@ msgstr ""
 
 #: gpasswd.1.xml:49(phrase)
 #, fuzzy
-#| msgid "administer the <placeholder-1/> file"
 msgid "administer <placeholder-1/>"
 msgstr "verwaltet die Datei <placeholder-1/>"
 
@@ -8420,8 +7952,6 @@ msgstr ""
 
 #: gpasswd.1.xml:125(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
@@ -8438,9 +7968,6 @@ msgstr ""
 
 #: gpasswd.1.xml:138(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
@@ -8457,7 +7984,6 @@ msgstr ""
 
 #: gpasswd.1.xml:159(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
@@ -8470,7 +7996,6 @@ msgstr ""
 
 #: gpasswd.1.xml:174(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -8483,9 +8008,6 @@ msgstr ""
 
 #: gpasswd.1.xml:189(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -8500,9 +8022,6 @@ msgstr "Liste der Administratoren der Gr
 
 #: gpasswd.1.xml:201(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -8564,12 +8083,6 @@ msgstr ""
 
 #: faillog.8.xml:54(para)
 #, fuzzy
-#| msgid ""
-#| "<command>faillog</command> formats the contents of the failure log from "
-#| "<filename>/var/log/faillog</filename> database. It also can be used for "
-#| "maintains failure counters and limits. Run <command>faillog</command> "
-#| "without arguments display only list of user faillog records who have ever "
-#| "had a login failure."
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -8598,7 +8111,6 @@ msgstr ""
 
 #: faillog.8.xml:77(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
@@ -8619,9 +8131,6 @@ msgstr ""
 
 #: faillog.8.xml:103(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
-#| "replaceable>"
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -8631,8 +8140,6 @@ msgstr ""
 
 #: faillog.8.xml:108(para)
 #, fuzzy
-#| msgid ""
-#| "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgid ""
 "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
@@ -8653,10 +8160,6 @@ msgstr ""
 
 #: faillog.8.xml:124(para)
 #, fuzzy
-#| msgid ""
-#| "Reset the counters of login failures or one record if used with the "
-#| "<option>-u</option><replaceable>LOGIN</replaceable> option. Write access "
-#| "to <filename>/var/log/faillog</filename> is required for this option."
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
@@ -8689,9 +8192,6 @@ msgstr ""
 # SB: Something is wrong here. IMO, "-u" overrides "-t".
 #: faillog.8.xml:161(para)
 #, fuzzy
-#| msgid ""
-#| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-#| "The <option>-t</option> flag overrides the use of <option>-u</option>."
 msgid ""
 "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
@@ -8701,10 +8201,6 @@ msgstr ""
 
 #: faillog.8.xml:173(para)
 #, fuzzy
-#| msgid ""
-#| "Display faillog record or maintains failure counters and limits (if used "
-#| "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-#| "options) only for user with <replaceable>LOGIN</replaceable>."
 msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
@@ -8718,9 +8214,6 @@ msgstr ""
 
 #: faillog.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
-#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
 "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
 "option> options are used, <command>faillog</command> displays the faillog "
@@ -8771,14 +8264,6 @@ msgstr ""
 
 #: faillog.5.xml:49(para)
 #, fuzzy
-#| msgid ""
-#| "<filename>/var/log/faillog</filename> maintains a count of login failures "
-#| "and the limits for each account. The file is fixed length record, indexed "
-#| "by numerical UID. Each record contains the count of login failures since "
-#| "the last successful login; the maximum number of failures before the "
-#| "account is disabled; the line the last login failure occurred on; the "
-#| "date the last login failure occurred; and the time in seconds how long "
-#| "the account will be locked after a failure."
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
@@ -8859,11 +8344,6 @@ msgstr "ändert die Login-Shell"
 
 #: chsh.1.xml:63(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>chsh</command> command changes the user login shell. This "
-#| "determines the name of the user's initial login command. A normal user "
-#| "may only change the login shell for her own account, the superuser may "
-#| "change the login shell for any account."
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
 "determines the name of the user's initial login command. A normal user may "
@@ -9016,9 +8496,6 @@ msgstr ""
 
 #: chpasswd.8.xml:115(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
-#| "replaceable>"
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -9064,9 +8541,6 @@ msgstr ""
 
 #: chpasswd.8.xml:167(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -9076,9 +8550,6 @@ msgstr ""
 
 #: chpasswd.8.xml:187(para)
 #, fuzzy
-#| msgid ""
-#| "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable "
-#| "in the <filename>login.defs</filename> file."
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
@@ -9097,7 +8568,6 @@ msgstr ""
 
 #: chpasswd.8.xml:244(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
@@ -9507,6 +8977,305 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Simon Brandmair (sbrandmair at gmx.net), 2005, 2007."
 
+#: vipw.8.xml:155(para)
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:297(para)
+msgid ""
+"Note: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgstr ""
+"Hinweis: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> funktioniert noch nicht."
+
+#: useradd.8.xml:328(para)
+msgid "By default, no home directories are created."
+msgstr ""
+
+#: useradd.8.xml:371(para)
+#, fuzzy
+msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:407(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgstr ""
+
+#: pwconv.8.xml:181(para)
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+
+#: pwck.8.xml:84(para)
+#, fuzzy
+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 ""
+"Der Befehl <command>pwck</command> überprüft die Stimmigkeit der "
+"Informationen des Systems zur Authentifizierung. Alle Einträge in <filename>/"
+"etc/passwd</filename> und <filename>/etc/shadow</filename> werden darauf "
+"überprüft, ob der Eintrag das richtige Format hat und gültige Daten enthält. "
+"Der Benutzer wird aufgefordert, Einträge zu löschen, die falsch formatiert "
+"sind oder andere unbehebbare Fehler enthalten."
+
+#: 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 ""
+"Standardmäßig arbeitet <command>pwck</command> mit den Dateien <filename>/"
+"etc/passwd</filename> und <filename>/etc/shadow</filename>. Der Benutzer "
+"kann andere Dateien mit den Parametern <emphasis remap=\"I\">passwd</"
+"emphasis> und <emphasis remap=\"I\">shadow</emphasis> auswählen."
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: newusers.8.xml:270(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
+msgid ""
+"This will most likely be overriden by PAM, since the default pam_unix module "
+"has it's own built in of 3 retries. However, this is a safe fallback in case "
+"you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgstr ""
+
+#: login.defs.5.xml:240(para)
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgstr ""
+
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
+msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+
+#: login.defs.5.xml:423(para)
+#, fuzzy
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+msgstr ""
+"GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
+"UMASK"
+
+#: login.defs.5.xml:436(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+msgstr ""
+
+#: login.defs.5.xml:445(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: groupadd.8.xml:174(para)
+msgid ""
+"The numeric identifiers of new system groups are choosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
+msgstr ""
+
+#: faillog.8.xml:86(term)
+msgid ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+msgstr ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
+"replaceable>"
+
+#: faillog.8.xml:179(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: chsh.1.xml:63(para)
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account, the superuser may change "
+"the login shell for any account."
+msgstr ""
+"chsh ändert die  Login-Shell eines Benutzers. Es legt den Befehl fest, der "
+"bei der Anmeldung ausgeführt wird. Ein normaler Benutzer kann nur die Login-"
+"Shell seines eigenen  Kontos ändern, während Root dies für alle Konten darf."
+
+#: chpasswd.8.xml:71(para)
+#, fuzzy
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
+msgstr ""
+"Das Passwort muss standardmäßig im Klartext angegeben werden. Die "
+"Standardalgorithmus zur Verschlüsselung ist DES. Soweit vorhanden, wird auch "
+"das Alter des Passworts aktualisiert."
+
+#: chpasswd.8.xml:82(para)
+msgid ""
+"<command>chpasswd</command> first update the password in memory, and then "
+"commit all the changes to disk if no errors occured for any users."
+msgstr ""
+
+#: chpasswd.8.xml:89(para)
+#, fuzzy
+msgid "The supplied passwords must be in clear-text."
+msgstr "Passwörter werden verschlüsselt angegeben."
+
+#: chpasswd.8.xml:92(para)
+msgid ""
+"PAM is used to update the password in the system database according to the "
+"PAM chpasswd configuration."
+msgstr ""
+
+#: chpasswd.8.xml:96(para)
+msgid ""
+"When <command>chpasswd</command> fails to update a password, it continues "
+"updating the passwords of the next users, and will return an error code on "
+"exit."
+msgstr ""
+
+#: chpasswd.8.xml:239(para)
+#, fuzzy
+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 ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
 #, fuzzy
 #~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -9539,55 +9308,6 @@ msgstr "Simon Brandmair (sbrandmair at gmx.
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#~ 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>."
-#~ 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>."
-
-#~ msgid ""
-#~ "Note: <option>-K </option><replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> doesn't work yet."
-#~ msgstr ""
-#~ "Hinweis: <option>-K </option><replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> funktioniert noch nicht."
-
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-
-#~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-#~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-
-#, fuzzy
-#~| msgid "Supplied passwords are in encrypted form."
-#~ msgid "The supplied passwords must be in clear-text."
-#~ msgstr "Passwörter werden verschlüsselt angegeben."
-
 #, fuzzy
 #~ msgid "and <placeholder-1/> files"
 #~ msgstr "-a <placeholder-1/>"
diff -pruN 1:4.1.4.2+svn3283-2/man/po/fr.po 1:4.1.4.2+svn3283-2ubuntu1/man/po/fr.po
--- 1:4.1.4.2+svn3283-2/man/po/fr.po	2010-09-05 16:39:15.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/man/po/fr.po	2010-11-24 14:47:24.000000000 +0000
@@ -22,10 +22,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-29 21:10+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "X-Generator: Lokalize 0.3\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
@@ -234,9 +234,6 @@ msgstr "<option>USE_TCB</option> (boolé
 #: useradd.8.xml:32(para) pwconv.8.xml:32(para) pwck.8.xml:32(para)
 #: login.defs.5.xml:32(para) chage.1.xml:32(para)
 #, fuzzy
-#| msgid ""
-#| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry> for details on how this string is interpreted."
 msgid ""
 "If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing "
@@ -1264,8 +1261,7 @@ msgstr "/etc/login.defs"
 #: chsh.1.xml:150(para) chpasswd.8.xml:240(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 »."
+msgstr "Configuration de la suite des mots de passe cachés « shadow password »."
 
 #: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
 #: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
@@ -1569,9 +1565,6 @@ msgstr ""
 
 #: useradd.8.xml:197(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's login shell. The default is to leave this field "
-#| "blank, which causes the system to select the default login shell."
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
@@ -1665,11 +1658,11 @@ msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
 "<option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: "
-"<option>-K </option><replaceable>PASS_MAX_DAYS</"
-"replaceable>=<replaceable>-1</replaceable> can be used when creating system "
-"account to turn off password ageing, even though system account has no "
-"password at all. Multiple <option>-K</option> options can be specified, e."
-"g.: <option>-K </option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+"<option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-"
+"1</replaceable> can be used when creating system account to turn off "
+"password ageing, even though system account has no password at all. Multiple "
+"<option>-K</option> options can be specified, e.g.: <option>-K </"
+"option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
 "replaceable><option>-K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
@@ -1835,9 +1828,6 @@ msgstr ""
 
 #: useradd.8.xml:487(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
@@ -1972,9 +1962,9 @@ msgid ""
 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:623(para)
 msgid "Usernames may only be up to 32 characters long."
@@ -2148,9 +2138,6 @@ msgstr "<option>UMASK</option> (nombre)"
 #: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
 #: login.1.xml:34(para)
 #, fuzzy
-#| msgid ""
-#| "The permission mask is initialized to this value. If not specified, the "
-#| "permission mask will be initialized to 022."
 msgid ""
 "The file mode creation mask is initialized to this value. If not specified, "
 "the mask will be initialized to 022."
@@ -2179,9 +2166,6 @@ msgstr ""
 #: useradd.8.xml:50(para) newusers.8.xml:50(para) login.defs.5.xml:50(para)
 #: login.1.xml:50(para)
 #, fuzzy
-#| msgid ""
-#| "If no options are specified, <command>useradd</command> displays the "
-#| "current default values."
 msgid ""
 "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
@@ -2638,10 +2622,10 @@ msgid ""
 "character of the login shell. The given home directory will be used as the "
 "root of a new file system which the user is actually logged into."
 msgstr ""
-"Une connexion à un sous-système est indiquée par la présence d'un « * » "
-"comme premier caractère de l'interpréteur de commandes initial. Le "
-"répertoire personnel sera utilisé comme racine d'un nouveau système de "
-"fichiers dans lequel l'utilisateur sera connecté."
+"Une connexion à un sous-système est indiquée par la présence d'un « * » comme "
+"premier caractère de l'interpréteur de commandes initial. Le répertoire "
+"personnel sera utilisé comme racine d'un nouveau système de fichiers dans "
+"lequel l'utilisateur sera connecté."
 
 #: su.1.xml:124(para)
 msgid "The options which apply to the <command>su</command> command are:"
@@ -2940,8 +2924,8 @@ 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 ""
-"Les lignes commençant par un « # » sont considérés comme des commentaires, "
-"et sont ignorées."
+"Les lignes commençant par un « # » sont considérés comme 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)"
@@ -3138,7 +3122,6 @@ msgstr "126"
 
 #: su.1.xml:395(para)
 #, fuzzy
-#| msgid "execute command as different group ID"
 msgid "The requested command was not found"
 msgstr "exécuter une commande avec un autre identifiant de groupe"
 
@@ -3260,7 +3243,6 @@ msgstr "shadow"
 
 #: shadow.5.xml:40(refpurpose)
 #, fuzzy
-#| msgid "the password file"
 msgid "shadowed password file"
 msgstr "fichier des mots de passe"
 
@@ -3402,15 +3384,11 @@ msgstr ""
 
 #: shadow.5.xml:159(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "password warning period"
 msgstr "Modifications du mot de passe"
 
 #: shadow.5.xml:162(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days before a password is going to expire (see the maximum "
 "password age above) during which the user should be warned."
@@ -4046,7 +4024,6 @@ msgstr "nombre correct de champs"
 
 #: pwck.8.xml:105(para)
 #, fuzzy
-#| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "unicité des noms d'utilisateur"
 
@@ -4097,7 +4074,6 @@ msgstr ""
 
 #: pwck.8.xml:146(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"
 
@@ -5623,11 +5599,11 @@ msgstr ""
 "Les valeurs des paramètres sont de quatre types : chaînes de caractères, "
 "booléens, nombres et nombres longs. Une chaîne de caractères est constituée "
 "de n'importe quel caractère imprimable. Un booléen est soit « yes » (oui) "
-"soit « no » (non). Un paramètre booléen non défini, ou défini avec une "
-"valeur autre que celles-là prendra la valeur « no ». Un nombre (normal ou "
-"long) peut être soit décimal, soit octal (en précédant la valeur d'un "
-"« 0 »), ou encore hexadécimal (en précédant la valeur de « 0x »). La valeur "
-"maximale des paramètres numériques normaux ou longs dépend de la machine."
+"soit « no » (non). Un paramètre booléen non défini, ou défini avec une valeur "
+"autre que celles-là prendra la valeur « no ». Un nombre (normal ou long) peut "
+"être soit décimal, soit octal (en précédant la valeur d'un « 0 »), ou encore "
+"hexadécimal (en précédant la valeur de « 0x »). La valeur maximale des "
+"paramètres numériques normaux ou longs dépend de la machine."
 
 #: login.defs.5.xml:141(para)
 msgid "The following configuration items are provided:"
@@ -5674,11 +5650,11 @@ msgstr ""
 "emphasis> et <emphasis remap=\"I\">h</emphasis>, correspondant "
 "respectivement au nom complet, au numéro de bureau, au numéro de téléphone "
 "professionnel et au numéro de téléphone personnel. Pour des raisons de "
-"compatibilité avec des versions antérieures, « yes » est équivalent à "
-"« rwh » et « no », à « frwh ». S'il n'est pas spécifié, seul le "
-"superutilisateur peut effectuer des modifications. Pour une configuration "
-"encore plus restrictive, il sera préférable de ne pas installer "
-"<command>chfn</command> avec l'indicateur SUID positionné."
+"compatibilité avec des versions antérieures, « yes » est équivalent à « rwh » "
+"et « no », à « frwh ». S'il n'est pas spécifié, seul le superutilisateur peut "
+"effectuer des modifications. Pour une configuration encore plus restrictive, "
+"il sera préférable de ne pas installer <command>chfn</command> avec "
+"l'indicateur SUID positionné."
 
 #: login.defs.5.xml:32(term) chsh.1.xml:32(term)
 msgid "<option>CHSH_AUTH</option> (boolean)"
@@ -5712,8 +5688,8 @@ msgid ""
 "The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
 "hexadecimal value."
 msgstr ""
-"La valeur peut être préfixée par « 0 » pour une valeur octale, ou « 0x » "
-"pour une valeur hexadécimale."
+"La valeur peut être préfixée par « 0 » pour une valeur octale, ou « 0x » pour "
+"une valeur hexadécimale."
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
 msgid "<option>FAIL_DELAY</option> (number)"
@@ -6429,8 +6405,8 @@ msgstr ""
 "système (<filename>/etc/motd</filename>), en créant un fichier vide "
 "<filename>.hushlogin</filename> dans le répertoire de votre compte. Le "
 "message concernant les courriers sera « <emphasis>You have new mail.</"
-"emphasis> », « <emphasis>You have mail.</emphasis> », ou « <emphasis>No Mail."
-"</emphasis> » suivant l'état de votre boîte aux lettres."
+"emphasis> », « <emphasis>You have mail.</emphasis> », ou « <emphasis>No Mail.</"
+"emphasis> » suivant l'état de votre boîte aux lettres."
 
 #: login.1.xml:145(para)
 msgid ""
@@ -6808,9 +6784,9 @@ msgid ""
 "<emphasis>LIMITS_FILE</emphasis>, then the last one will be used as the "
 "default entry."
 msgstr ""
-"L'entrée par défaut est représentée par un utilisateur dénommé "
-"« <emphasis>*</emphasis> ». Si plusieurs entrées par défaut sont présentes "
-"dans le fichier de limites, alors seule la dernière sera prise en compte."
+"L'entrée par défaut est représentée par un utilisateur dénommé « <emphasis>*</"
+"emphasis> ». Si plusieurs entrées par défaut sont présentes dans le fichier "
+"de limites, alors seule la dernière sera prise en compte."
 
 #: limits.5.xml:133(para)
 #, fuzzy
@@ -6963,9 +6939,9 @@ msgid ""
 "emphasis> will be displayed instead of the port and time."
 msgstr ""
 "Dans le cas où l'utilisateur ne s'est jamais connecté, le message "
-"« <emphasis>**Never logged in**</emphasis> » (« <emphasis>**Jamais "
-"connecté**</emphasis> ») est affiché à la place des champs <emphasis>Port</"
-"emphasis> et date de <emphasis>Dernière</emphasis> connexion."
+"« <emphasis>**Never logged in**</emphasis> » (« <emphasis>**Jamais connecté**</"
+"emphasis> ») est affiché à la place des champs <emphasis>Port</emphasis> et "
+"date de <emphasis>Dernière</emphasis> connexion."
 
 #: lastlog.8.xml:127(para)
 msgid ""
@@ -7063,10 +7039,6 @@ msgstr ""
 
 #: gshadow.5.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The comment field is used by various system utilities, such as "
-#| "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -7117,9 +7089,6 @@ msgstr ""
 
 #: gshadow.5.xml:131(para)
 #, fuzzy
-#| msgid ""
-#| "This information supersedes any password present in <filename>/etc/group</"
-#| "filename>."
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
@@ -7169,15 +7138,11 @@ msgstr ""
 
 #: grpck.8.xml:87(para)
 #, fuzzy
-#| msgid "a unique group name"
 msgid "a unique and valid group name"
 msgstr "unicité des noms de groupe"
 
 #: grpck.8.xml:90(para)
 #, 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>"
@@ -7187,7 +7152,6 @@ msgstr ""
 
 #: 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>"
@@ -7195,11 +7159,6 @@ msgstr "validité des membres et adminis
 
 #: 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</"
@@ -7212,14 +7171,6 @@ msgstr ""
 
 #: 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 "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -7240,11 +7191,6 @@ msgstr ""
 
 #: 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><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -7278,11 +7224,6 @@ msgstr ""
 
 #: grpck.8.xml:160(para)
 #, fuzzy
-#| 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."
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -7433,9 +7374,6 @@ msgstr ""
 
 #: groupmod.8.xml:78(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the group will be changed from <replaceable>GROUP</"
-#| "replaceable> to <replaceable>NEW_GROUP</replaceable> name."
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
@@ -7445,10 +7383,6 @@ msgstr ""
 
 #: groupmod.8.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "This value must be unique, unless the <option>-o</option> option is used. "
-#| "The value must be non-negative. Values between 0 and 999 are typically "
-#| "reserved for system accounts."
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
@@ -7907,8 +7841,8 @@ 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_-]*[$]?"
+"signe dollar. Soit, sous la forme d'une expression rationnelle : [a-z_][a-z0-"
+"9_-]*[$]?"
 
 #: groupadd.8.xml:230(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
@@ -8201,12 +8135,6 @@ msgstr ""
 
 #: faillog.8.xml:54(para)
 #, fuzzy
-#| msgid ""
-#| "<command>faillog</command> formats the contents of the failure log from "
-#| "<filename>/var/log/faillog</filename> database. It also can be used for "
-#| "maintains failure counters and limits. Run <command>faillog</command> "
-#| "without arguments display only list of user faillog records who have ever "
-#| "had a login failure."
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -8233,9 +8161,6 @@ msgstr ""
 
 #: faillog.8.xml:77(para)
 #, fuzzy
-#| msgid ""
-#| "This option is only valid in combination with the <option>-o</option> "
-#| "option."
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "Cette option n'est valable qu'avec l'option <option>-o</option>."
@@ -8287,9 +8212,6 @@ msgstr ""
 
 #: faillog.8.xml:124(para)
 #, fuzzy
-#| msgid ""
-#| "Reset the counters of login failures or one record if used with the "
-#| "<option>-u</option><replaceable>LOGIN</replaceable> option."
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
@@ -8336,9 +8258,6 @@ msgstr ""
 
 #: faillog.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
-#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
 "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
 "option> options are used, <command>faillog</command> displays the faillog "
@@ -8392,14 +8311,6 @@ msgstr ""
 
 #: faillog.5.xml:49(para)
 #, fuzzy
-#| msgid ""
-#| "<filename>/var/log/faillog</filename> maintains a count of login failures "
-#| "and the limits for each account. The file is fixed length record, indexed "
-#| "by numerical UID. Each record contains the count of login failures since "
-#| "the last successful login; the maximum number of failures before the "
-#| "account is disabled; the line the last login failure occurred on; the "
-#| "date the last login failure occurred; and the time in seconds how long "
-#| "the account will be locked after a failure."
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
@@ -8676,9 +8587,6 @@ msgstr ""
 
 #: chpasswd.8.xml:167(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -8688,9 +8596,6 @@ msgstr ""
 
 #: chpasswd.8.xml:187(para)
 #, fuzzy
-#| msgid ""
-#| "The mail spool is defined by the <option>MAIL_DIR</option> variable in "
-#| "the <filename>login.defs</filename> file."
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
@@ -9116,21 +9021,321 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Nicolas FRANÇOIS <nicolas.francois at centraliens.net>, 2005-2010."
 
-#~ msgid ""
-#~ "Note: <option>-K </option><replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> doesn't work yet."
-#~ msgstr ""
-#~ "Note : <option>-K</option> <replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> ne fonctionne pas pour "
-#~ "l'instant."
+#: vipw.8.xml:155(para)
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:297(para)
+msgid ""
+"Note: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgstr ""
+"Note : <option>-K</option> <replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> ne fonctionne pas pour l'instant."
+
+#: useradd.8.xml:328(para)
+msgid "By default, no home directories are created."
+msgstr ""
+
+#: 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>."
+
+#: useradd.8.xml:407(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+"Ce réglage ne s'applique pas pour les utilisateurs système, et peut être "
+"annulé sur la ligne de commande."
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgstr ""
+"S'il est défini, il sera utilisé pour définir la variable d'environnement "
+"PATH quand le super-utilisateur se connecte. La valeur peut être précédée "
+"par <replaceable>PATH=</replaceable> ou une liste de chemins séparés par "
+"deux points (par exemple <replaceable>/sbin:/bin:/usr/sbin:/usr/bin</"
+"replaceable>). La valeur par défaut est <replaceable>PATH=/bin:/usr/bin</"
+"replaceable>."
+
+#: pwconv.8.xml:181(para)
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+
+#: pwck.8.xml:84(para)
+#, fuzzy
+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 ""
+"<command>Pwck</command> vérifie l'intégrité des informations "
+"d'authentification du système. Toutes les entrées des fichiers <filename>/"
+"etc/passwd</filename> et <filename>/etc/shadow</filename> sont vérifiées "
+"afin de s'assurer qu'elles ont le bon format et qu'elles contiennent des "
+"données valables dans chaque champ. Une confirmation de l'utilisateur sera "
+"demandée pour détruire les entrées mal formatées ou ayant d'autres erreurs "
+"non récupérables."
+
+#: 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 ""
+"Par défaut, <command>pwck</command> opère sur les fichiers <filename>/etc/"
+"passwd</filename> et <filename>/etc/shadow</filename>. L'utilisateur peut "
+"spécifier d'autres fichiers avec les paramètres <emphasis remap=\"I"
+"\">fichier_passwd</emphasis> et <emphasis remap=\"I\">fichier_shadow</"
+"emphasis>."
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr "<replaceable>DES</replaceable> (par défaut)"
+
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
+msgid "MD5"
+msgstr "MD5"
+
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
+msgid "SHA256"
+msgstr "SHA256"
+
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
+msgid "SHA512"
+msgstr "SHA512"
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr "Il peut prendre une de ces valeurs : <placeholder-1/>"
+
+#: newusers.8.xml:270(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
+msgid ""
+"This will most likely be overriden by PAM, since the default pam_unix module "
+"has it's own built in of 3 retries. However, this is a safe fallback in case "
+"you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgstr ""
+"Ce sera probablement écrasé par PAM, puisque le module pam_unix est réglé en "
+"dur pour n'effectuer que 3 tentatives. Toutefois, il s'agit d'une solution "
+"de repli au cas où vous utilisez un module d'authentification qui ne fait "
+"pas appliquer PAM_MAXTRIES."
+
+#: login.defs.5.xml:240(para)
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgstr ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
+msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+
+#: login.defs.5.xml:423(para)
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+msgstr ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+
+#: login.defs.5.xml:436(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+msgstr "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+
+#: login.defs.5.xml:445(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+msgstr "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+
+#: groupadd.8.xml:174(para)
+msgid ""
+"The numeric identifiers of new system groups are choosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
+msgstr ""
+
+#: faillog.8.xml:86(term)
+msgid ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+msgstr ""
+"<option>-l</option>, <option>--lock-time</option> <replaceable>SEC</"
+"replaceable>"
+
+#: faillog.8.xml:179(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: chsh.1.xml:63(para)
+#, fuzzy
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account, the superuser may change "
+"the login shell for any account."
+msgstr ""
+"<command>Chsh</command> modifie l'interpréteur de commandes initial (« login "
+"shell ») de l'utilisateur qui sera invoqué lors des connexions de "
+"l'utilisateur. Un utilisateur normal ne peut changer que l'interpréteur "
+"associé à son propre compte. Le superutilisateur peut changer l'interpréteur "
+"de commandes initial de n'importe quel compte."
+
+#: chpasswd.8.xml:71(para)
+#, fuzzy
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
+msgstr ""
+"Par défaut, le mot de passe doit être fourni en clair. L'algorithme de "
+"chiffrement par défaut est le chiffrement DES. L'âge du mot de passe sera "
+"également mis à jour, s'il est présent."
 
-#~ msgid "It can take one of these values: <placeholder-1/>"
-#~ msgstr "Il peut prendre une de ces valeurs : <placeholder-1/>"
+#: chpasswd.8.xml:82(para)
+msgid ""
+"<command>chpasswd</command> first update the password in memory, and then "
+"commit all the changes to disk if no errors occured for any users."
+msgstr ""
+
+#: chpasswd.8.xml:89(para)
+msgid "The supplied passwords must be in clear-text."
+msgstr "Les mots de passe doivent être fournis en clair."
+
+#: chpasswd.8.xml:92(para)
+msgid ""
+"PAM is used to update the password in the system database according to the "
+"PAM chpasswd configuration."
+msgstr ""
+
+#: chpasswd.8.xml:96(para)
+msgid ""
+"When <command>chpasswd</command> fails to update a password, it continues "
+"updating the passwords of the next users, and will return an error code on "
+"exit."
+msgstr ""
 
-#~ msgid "The supplied passwords must be in clear-text."
-#~ msgstr "Les mots de passe doivent être fournis en clair."
+#: chpasswd.8.xml:239(para)
+#, fuzzy
+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 ""
+"<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 ""
 #~ "The encrypted password, as returned by "
@@ -9299,10 +9504,10 @@ msgstr "Nicolas FRANÇOIS <nicolas.franc
 #~ msgstr ""
 #~ "Le champ « mot de passe » doit être rempli. Le mot de passe chiffré "
 #~ "comprend 13 à 24 caractères pris dans l'alphabet de 64 caractère : a-z, A-"
-#~ "Z, 0-9, \\. et /. Il peut optionellement commencer par un caractère "
-#~ "« $ ». Ceci signifie que le mot de passe a été généré par un autre "
-#~ "algorithme (autre que DES). Par exemple, s'il commence par « $1$ », "
-#~ "l'algorithme basé sur MD5 a été utilisé."
+#~ "Z, 0-9, \\. et /. Il peut optionellement commencer par un caractère « $ ». "
+#~ "Ceci signifie que le mot de passe a été généré par un autre algorithme "
+#~ "(autre que DES). Par exemple, s'il commence par « $1$ », l'algorithme basé "
+#~ "sur MD5 a été utilisé."
 
 #~ msgid ""
 #~ "The date of the last password change is given as the number of days since "
diff -pruN 1:4.1.4.2+svn3283-2/man/po/it.po 1:4.1.4.2+svn3283-2ubuntu1/man/po/it.po
--- 1:4.1.4.2+svn3283-2/man/po/it.po	2010-08-29 16:54:42.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/man/po/it.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Language: it\n"
 
 #: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
 #: login.defs.5.xml:477(term)
@@ -197,7 +197,6 @@ msgstr ""
 # type: IP
 #: vipw.8.xml:122(term)
 #, fuzzy
-#| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
@@ -242,9 +241,6 @@ msgstr "<option>-c </option>I<commento>"
 #: useradd.8.xml:32(para) pwconv.8.xml:32(para) pwck.8.xml:32(para)
 #: login.defs.5.xml:32(para) chage.1.xml:32(para)
 #, fuzzy
-#| msgid ""
-#| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry> for details on how this string is interpreted."
 msgid ""
 "If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing "
@@ -399,18 +395,6 @@ msgstr "VEDERE ANCHE"
 # type: Plain text
 #: vipw.8.xml:192(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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -475,7 +459,6 @@ msgstr "<option>-a</option>, <option>--a
 # type: IP
 #: usermod.8.xml:80(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
@@ -515,10 +498,6 @@ msgstr "- una home directory valida"
 # type: Plain text
 #: usermod.8.xml:109(para)
 #, fuzzy
-#| msgid ""
-#| "The user's new login directory. If the <option>-m</option> option is "
-#| "given the contents of the current home directory will be moved to the new "
-#| "home directory, which is created if it does not already exist."
 msgid ""
 "If the <option>-m</option> option is given, the contents of the current home "
 "directory will be moved to the new home directory, which is created if it "
@@ -554,9 +533,6 @@ msgstr ""
 # type: Plain text
 #: usermod.8.xml:135(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
@@ -567,11 +543,6 @@ msgstr ""
 # type: Plain text
 #: usermod.8.xml:139(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "A value of 0 disables the account as soon as the password has expired, and a "
 "value of -1 disables the feature."
@@ -590,9 +561,6 @@ msgstr ""
 # type: Plain text
 #: usermod.8.xml:152(para)
 #, fuzzy
-#| msgid ""
-#| "The group name or number of the user's initial login group. The group "
-#| "name must exist. A group number must refer to an already existing group."
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
@@ -623,12 +591,6 @@ msgstr ""
 # type: Plain text
 #: usermod.8.xml:172(para)
 #, fuzzy
-#| msgid ""
-#| "A list of supplementary groups which the user is also a member of. Each "
-#| "group is separated from the next by a comma, with no intervening "
-#| "whitespace. The groups are subject to the same restrictions as the group "
-#| "given with the <option>-g</option> option. The default is for the user to "
-#| "belong only to the initial group."
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
@@ -699,7 +661,6 @@ msgstr ""
 # type: IP
 #: usermod.8.xml:222(term)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
@@ -710,7 +671,6 @@ msgstr ""
 # type: IP
 #: usermod.8.xml:230(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -800,12 +760,6 @@ msgstr ""
 # type: Plain text
 #: usermod.8.xml:301(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "The default is to use the smallest ID value greater than 999 and greater "
-#| "than every other user. Values between 0 and 999 are typically reserved "
-#| "for system accounts."
 msgid ""
 "This value must be unique, unless the <option>-o</option> option is used. "
 "The value must be non-negative. Values between 0 and 999 are typically "
@@ -821,14 +775,6 @@ msgstr ""
 # type: Plain text
 #: usermod.8.xml:307(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "Values between 0 and 999 are typically reserved for system accounts. Any "
-#| "files which the user owns and which are located in the directory tree "
-#| "rooted at the user's home directory will have the file user ID changed "
-#| "automatically. Files outside of the user's home directory must be altered "
-#| "manually."
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
@@ -871,9 +817,6 @@ msgstr ""
 # type: IP
 #: usermod.8.xml:339(term) useradd.8.xml:482(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
-#| "replaceable>"
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -883,9 +826,6 @@ msgstr ""
 # type: Plain text
 #: usermod.8.xml:344(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 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."
@@ -1389,9 +1329,6 @@ msgstr ""
 # type: Plain text
 #: userdel.8.xml:233(para)
 #, fuzzy
-#| msgid ""
-#| "You must manually check all file systems to insure that no files remain "
-#| "with the named group as the file group ID."
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
@@ -1550,7 +1487,6 @@ msgstr ""
 # type: IP
 #: useradd.8.xml:158(term)
 #, fuzzy
-#| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
@@ -1570,11 +1506,6 @@ msgstr ""
 # type: Plain text
 #: useradd.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled. A value of 0 disables the account as soon as the password has "
@@ -1588,9 +1519,6 @@ msgstr ""
 # type: Plain text
 #: useradd.8.xml:197(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's login shell. The default is to leave this field "
-#| "blank, which causes the system to select the default login shell."
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
@@ -1642,9 +1570,6 @@ msgstr ""
 # type: IP
 #: useradd.8.xml:256(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
-#| "replaceable>"
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1661,7 +1586,6 @@ msgstr ""
 # type: IP
 #: useradd.8.xml:266(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1689,11 +1613,11 @@ msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
 "<option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: "
-"<option>-K </option><replaceable>PASS_MAX_DAYS</"
-"replaceable>=<replaceable>-1</replaceable> can be used when creating system "
-"account to turn off password ageing, even though system account has no "
-"password at all. Multiple <option>-K</option> options can be specified, e."
-"g.: <option>-K </option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+"<option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-"
+"1</replaceable> can be used when creating system account to turn off "
+"password ageing, even though system account has no password at all. Multiple "
+"<option>-K</option> options can be specified, e.g.: <option>-K </"
+"option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
 "replaceable><option>-K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
@@ -1701,7 +1625,6 @@ msgstr ""
 # type: IP
 #: useradd.8.xml:311(term)
 #, fuzzy
-#| msgid "<option>-l</option>, <option>--list</option>"
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
@@ -1735,7 +1658,6 @@ msgstr ""
 
 #: useradd.8.xml:343(option)
 #, fuzzy
-#| msgid "-"
 msgid "-M"
 msgstr "-"
 
@@ -1749,7 +1671,6 @@ msgstr ""
 # type: TP
 #: useradd.8.xml:355(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1775,7 +1696,6 @@ msgstr ""
 # type: IP
 #: useradd.8.xml:379(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
@@ -1783,9 +1703,6 @@ msgstr "<option>-m</option>, <option>--c
 # type: Plain text
 #: useradd.8.xml:391(para) groupadd.8.xml:149(para)
 #, fuzzy
-#| msgid ""
-#| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry> for details on how this string is interpreted."
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1798,7 +1715,6 @@ msgstr ""
 # type: IP
 #: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -1828,9 +1744,6 @@ msgstr ""
 # type: Plain text
 #: useradd.8.xml:440(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's login shell. The default is to leave this field "
-#| "blank, which causes the system to select the default login shell."
 msgid ""
 "The name of the user's login shell. The default is to leave this field "
 "blank, which causes the system to select the default login shell specified "
@@ -1860,7 +1773,6 @@ msgstr ""
 # type: TP
 #: useradd.8.xml:465(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1873,9 +1785,6 @@ msgstr ""
 # type: Plain text
 #: useradd.8.xml:487(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
@@ -1980,9 +1889,6 @@ msgstr "NOTE"
 # type: Plain text
 #: useradd.8.xml:597(para)
 #, fuzzy
-#| msgid ""
-#| "The system administrator is responsible for placing the default user "
-#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -2210,9 +2116,6 @@ msgstr ""
 #: useradd.8.xml:50(para) newusers.8.xml:50(para) login.defs.5.xml:50(para)
 #: login.1.xml:50(para)
 #, fuzzy
-#| msgid ""
-#| "If no options are specified, <command>useradd</command> displays the "
-#| "current default values."
 msgid ""
 "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
@@ -3079,7 +2982,6 @@ msgstr ""
 # type: IP
 #: su.1.xml:383(para)
 #, fuzzy
-#| msgid "<option>-d</option> I<lastday>"
 msgid "success (<option>--help</option> only)"
 msgstr "<option>-d</option> I<ultimo_giorno>"
 
@@ -3090,7 +2992,6 @@ msgstr ""
 # type: IP
 #: su.1.xml:393(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "126"
 msgstr "12"
 
@@ -3107,7 +3008,6 @@ msgstr ""
 # type: IP
 #: su.1.xml:399(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "127"
 msgstr "12"
 
@@ -3202,18 +3102,6 @@ msgstr ""
 # type: Plain text
 #: 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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3254,10 +3142,6 @@ msgstr "impossibile aprire i file delle 
 # type: Plain text
 #: shadow.5.xml:45(para)
 #, fuzzy
-#| msgid ""
-#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-#| "information for user's accounts and optional the password aging "
-#| "information. Included is:"
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
@@ -3374,7 +3258,6 @@ msgstr ""
 # type: SS
 #: shadow.5.xml:121(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "minimum password age"
 msgstr "Modifiche delle password"
 
@@ -3391,7 +3274,6 @@ msgstr ""
 # type: SS
 #: shadow.5.xml:135(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "maximum password age"
 msgstr "Modifiche delle password"
 
@@ -3422,16 +3304,12 @@ msgstr ""
 # type: SS
 #: shadow.5.xml:159(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "password warning period"
 msgstr "Modifiche delle password"
 
 # type: Plain text
 #: shadow.5.xml:162(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days before a password is going to expire (see the maximum "
 "password age above) during which the user should be warned."
@@ -3470,7 +3348,6 @@ msgstr ""
 # type: Plain text
 #: shadow.5.xml:197(emphasis)
 #, fuzzy
-#| msgid "User account information."
 msgid "account expiration date"
 msgstr "informazioni sugli account utente."
 
@@ -3500,20 +3377,17 @@ msgstr ""
 # type: Plain text
 #: shadow.5.xml:221(emphasis)
 #, fuzzy
-#| msgid "a reserved field"
 msgid "reserved field"
 msgstr "Campo riservato"
 
 # type: Plain text
 #: shadow.5.xml:223(para)
 #, fuzzy
-#| msgid "sp_flag - reserved for future use"
 msgid "This field is reserved for future use."
 msgstr "sp_flag - riservato per uso futuro."
 
 #: shadow.5.xml:245(filename)
 #, fuzzy
-#| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
@@ -3530,21 +3404,6 @@ msgstr ""
 # type: Plain text
 #: shadow.5.xml:259(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -4031,15 +3890,6 @@ msgstr ""
 # type: Plain text
 #: pwconv.8.xml:200(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>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -4123,7 +3973,6 @@ msgstr "il corretto numero di campi"
 # type: Plain text
 #: pwck.8.xml:105(para)
 #, fuzzy
-#| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "un nome utente univoco"
 
@@ -4170,7 +4019,6 @@ msgstr ""
 # type: Plain text
 #: pwck.8.xml:140(para)
 #, fuzzy
-#| msgid "the correct number of fields"
 msgid "shadow entries have the correct number of fields"
 msgstr "il corretto numero di campi"
 
@@ -4244,17 +4092,11 @@ msgstr ""
 # type: IP
 #: pwck.8.xml:205(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 #: pwck.8.xml:212(para)
 #, fuzzy
-#| 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."
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -4297,7 +4139,6 @@ msgstr "impossibile aggiornare i file de
 # type: Plain text
 #: pwck.8.xml:314(para)
 #, fuzzy
-#| msgid "can't open password files"
 msgid "can't sort password files"
 msgstr "impossibile aprire i file delle password"
 
@@ -4313,15 +4154,6 @@ msgstr ""
 # type: Plain text
 #: pwck.8.xml:323(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</"
@@ -4579,7 +4411,6 @@ msgstr ""
 
 #: passwd.5.xml:131(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
@@ -4590,24 +4421,6 @@ msgstr ""
 # type: Plain text
 #: passwd.5.xml:145(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4886,9 +4699,6 @@ msgstr ""
 # type: IP
 #: passwd.1.xml:247(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -4994,12 +4804,6 @@ msgstr ""
 # type: Plain text
 #: passwd.1.xml:339(para)
 #, fuzzy
-#| msgid ""
-#| "Not all options may be supported. Password complexity checking may vary "
-#| "from site to site. The user is urged to select a password as complex as "
-#| "he or she feels comfortable with. 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."
 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."
@@ -5039,9 +4843,6 @@ msgstr ""
 #: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
 #: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
-#| "replaceable>"
 msgid ""
 "It can take one of these values: <replaceable>DES</replaceable> (default), "
 "<replaceable>MD5</replaceable><phrase condition=\"sha_crypt\">, "
@@ -5203,14 +5004,12 @@ msgstr ""
 
 #: passwd.1.xml:395(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
 # type: Plain text
 #: 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>"
 
@@ -5245,13 +5044,6 @@ msgstr "Il comando <command>passwd</comm
 # type: Plain text
 #: passwd.1.xml:456(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -5507,8 +5299,6 @@ msgstr ""
 # type: TP
 #: newusers.8.xml:240(para)
 #, fuzzy
-#| msgid ""
-#| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "Il comando <command>usermod</command> accetta le seguenti opzioni:"
 
@@ -5582,7 +5372,6 @@ msgstr ""
 
 #: newusers.8.xml:390(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
@@ -6237,7 +6026,6 @@ msgstr ""
 
 #: login.defs.5.xml:357(term)
 #, fuzzy
-#| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
@@ -6314,13 +6102,6 @@ msgstr ""
 # type: Plain text
 #: login.defs.5.xml:489(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
@@ -7039,9 +6820,6 @@ msgstr ""
 # type: IP
 #: lastlog.8.xml:102(term) faillog.8.xml:168(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
-#| "replaceable>"
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -7051,9 +6829,6 @@ msgstr ""
 # type: Plain text
 #: lastlog.8.xml:107(para)
 #, fuzzy
-#| msgid ""
-#| "Print the lastlog record for user with specified <emphasis remap=\"I"
-#| "\">LOGIN</emphasis> only."
 msgid "Print the lastlog record of the specified user(s)."
 msgstr ""
 "Mostra il record di ultimo accesso per l'utente specificato da <emphasis "
@@ -7146,10 +6921,6 @@ msgstr ""
 # type: Plain text
 #: gshadow.5.xml:44(para)
 #, fuzzy
-#| msgid ""
-#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-#| "information for user's accounts and optional the password aging "
-#| "information. Included is:"
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
@@ -7189,10 +6960,6 @@ msgstr ""
 # type: Plain text
 #: gshadow.5.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The new value of the user's password file comment field. It is normally "
-#| "modified using the <citerefentry><refentrytitle>chfn</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry> utility."
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -7271,15 +7038,6 @@ msgstr ""
 # type: Plain text
 #: gshadow.5.xml:160(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>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -7325,7 +7083,6 @@ msgstr ""
 # type: Plain text
 #: grpck.8.xml:87(para)
 #, fuzzy
-#| msgid "a unique group name"
 msgid "a unique and valid group name"
 msgstr "un nome univoco di gruppo"
 
@@ -7350,11 +7107,6 @@ msgstr ""
 # type: Plain text
 #: 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</"
@@ -7368,14 +7120,6 @@ msgstr ""
 # 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 "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -7397,11 +7141,6 @@ msgstr ""
 # type: Plain text
 #: 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><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -7416,7 +7155,6 @@ msgstr ""
 # type: Plain text
 #: 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:"
 
@@ -7435,11 +7173,6 @@ msgstr ""
 
 #: grpck.8.xml:160(para)
 #, fuzzy
-#| 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."
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -7488,16 +7221,6 @@ msgstr ""
 # 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</"
@@ -7612,9 +7335,6 @@ msgstr ""
 # type: Plain text
 #: groupmod.8.xml:78(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the group will be changed from <replaceable>GROUP</"
-#| "replaceable> to <replaceable>NEW_GROUP</replaceable> name."
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
@@ -7625,12 +7345,6 @@ msgstr ""
 # type: Plain text
 #: groupmod.8.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "The default is to use the smallest ID value greater than 999 and greater "
-#| "than every other user. Values between 0 and 999 are typically reserved "
-#| "for system accounts."
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
@@ -7772,9 +7486,6 @@ msgstr "Il comando <command>groupmems</c
 # type: IP
 #: groupmems.8.xml:82(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--maximum</option><replaceable>MAX</"
-#| "replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -7796,9 +7507,6 @@ msgstr ""
 # type: IP
 #: groupmems.8.xml:93(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -7818,9 +7526,6 @@ msgstr ""
 # type: IP
 #: groupmems.8.xml:109(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
-#| "replaceable>"
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -7843,7 +7548,6 @@ msgstr ""
 # type: TP
 #: groupmems.8.xml:129(term)
 #, fuzzy
-#| msgid "<option>-e</option>, <option>--expire</option>"
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
@@ -7937,9 +7641,6 @@ msgstr ""
 # type: Plain text
 #: groupdel.8.xml:70(para)
 #, fuzzy
-#| msgid ""
-#| "You must manually check all file systems to insure that no files remain "
-#| "with the named group as the file group ID."
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
@@ -8053,9 +7754,6 @@ msgstr ""
 # type: IP
 #: groupadd.8.xml:122(para)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
-#| "replaceable>"
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -8077,7 +7775,6 @@ msgstr ""
 # type: Plain text
 #: groupadd.8.xml:170(para)
 #, fuzzy
-#| msgid "create a new group"
 msgid "Create a system group."
 msgstr "Crea un nuovo gruppo"
 
@@ -8173,7 +7870,6 @@ msgstr ""
 
 #: gpasswd.1.xml:49(phrase)
 #, fuzzy
-#| msgid "administer the <placeholder-1/> file"
 msgid "administer <placeholder-1/>"
 msgstr "amministra il file <placeholder-1/>"
 
@@ -8273,9 +7969,6 @@ msgstr "Il comando <command>passwd</comm
 # type: IP
 #: gpasswd.1.xml:125(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--maximum</option><replaceable>MAX</"
-#| "replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
@@ -8294,9 +7987,6 @@ msgstr ""
 # type: IP
 #: gpasswd.1.xml:138(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
@@ -8315,7 +8005,6 @@ msgstr ""
 # type: IP
 #: gpasswd.1.xml:159(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
@@ -8329,7 +8018,6 @@ msgstr ""
 # type: IP
 #: gpasswd.1.xml:174(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -8343,9 +8031,6 @@ msgstr ""
 # type: IP
 #: gpasswd.1.xml:189(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
-#| "replaceable>"
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -8365,9 +8050,6 @@ msgstr ""
 # type: IP
 #: gpasswd.1.xml:201(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -8429,12 +8111,6 @@ msgstr "mostra i conteggi e imposta i li
 # type: Plain text
 #: faillog.8.xml:54(para)
 #, fuzzy
-#| msgid ""
-#| "<command>faillog</command> formats the contents of the failure log from "
-#| "<filename>/var/log/faillog</filename> database. It also can be used for "
-#| "maintains failure counters and limits. Run <command>faillog</command> "
-#| "without arguments display only list of user faillog records who have ever "
-#| "had a login failure."
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -8462,7 +8138,6 @@ msgstr ""
 # type: IP
 #: faillog.8.xml:77(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
@@ -8484,9 +8159,6 @@ msgstr ""
 # type: IP
 #: faillog.8.xml:103(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
-#| "replaceable>"
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -8497,8 +8169,6 @@ msgstr ""
 # type: Plain text
 #: faillog.8.xml:108(para)
 #, fuzzy
-#| msgid ""
-#| "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgid ""
 "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
@@ -8521,10 +8191,6 @@ msgstr ""
 # type: Plain text
 #: faillog.8.xml:124(para)
 #, fuzzy
-#| msgid ""
-#| "Reset the counters of login failures or one record if used with the "
-#| "<option>-u</option><replaceable>LOGIN</replaceable> option. Write access "
-#| "to <filename>/var/log/faillog</filename> is required for this option."
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
@@ -8558,9 +8224,6 @@ msgstr ""
 # type: Plain text
 #: faillog.8.xml:161(para)
 #, fuzzy
-#| msgid ""
-#| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-#| "The <option>-t</option> flag overrides the use of <option>-u</option>."
 msgid ""
 "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
@@ -8571,10 +8234,6 @@ msgstr ""
 # type: Plain text
 #: faillog.8.xml:173(para)
 #, fuzzy
-#| msgid ""
-#| "Display faillog record or maintains failure counters and limits (if used "
-#| "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-#| "options) only for user with <replaceable>LOGIN</replaceable>."
 msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
@@ -8588,9 +8247,6 @@ msgstr ""
 # type: Plain text
 #: faillog.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
-#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
 "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
 "option> options are used, <command>faillog</command> displays the faillog "
@@ -8902,9 +8558,6 @@ msgstr "Il comando <command>chpasswd</co
 # type: IP
 #: chpasswd.8.xml:115(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -8975,14 +8628,12 @@ msgstr ""
 
 #: chpasswd.8.xml:244(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
 # type: Plain text
 #: chpasswd.8.xml:246(para)
 #, fuzzy
-#| msgid "<command>chpasswd</command> [B<options>]"
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr "<command>chpasswd</command> [B<opzioni>]"
 
@@ -9404,6 +9055,311 @@ msgstr ""
 "Danilo Piazzalunga <danilopiazza at libero.it>, 2005."
 
 # type: Plain text
+#: vipw.8.xml:155(para)
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:297(para)
+msgid ""
+"Note: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgstr ""
+
+#: useradd.8.xml:328(para)
+msgid "By default, no home directories are created."
+msgstr ""
+
+# type: IP
+#: useradd.8.xml:371(para)
+#, fuzzy
+msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:407(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgstr ""
+
+# type: Plain text
+#: pwconv.8.xml:181(para)
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+
+# type: Plain text
+#: pwck.8.xml:84(para)
+#, fuzzy
+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 ""
+"<command>grpck</command> verifica l'integrità delle informazioni di "
+"autenticazione del sistema. Ogni voce in <filename>/etc/passwd</filename> e "
+"in <filename>/etc/shadow</filename> viene controllata per verificare che "
+"abbia il formato corretto e dati validi in ciascun campo. Viene richiesto "
+"all'utente di rimuovere le voci che non hanno un formato appropriato o che "
+"hanno altri errori impossibili da correggere."
+
+#: 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 ""
+"Come impostazione predefinita, <command>pwck</command> opera sui file "
+"<filename>/etc/passwd</filename> e in <filename>/etc/shadow</filename>. "
+"L'utente può selezionare file alternativi con i parametri <emphasis remap=\"I"
+"\">passwd</emphasis> e <emphasis remap=\"I\">shadow</emphasis>."
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: newusers.8.xml:270(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
+msgid ""
+"This will most likely be overriden by PAM, since the default pam_unix module "
+"has it's own built in of 3 retries. However, this is a safe fallback in case "
+"you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgstr ""
+
+#: login.defs.5.xml:240(para)
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgstr ""
+
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
+msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+msgstr ""
+
+#: login.defs.5.xml:423(para)
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+msgstr ""
+
+#: login.defs.5.xml:436(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+msgstr ""
+
+#: login.defs.5.xml:445(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: groupadd.8.xml:174(para)
+msgid ""
+"The numeric identifiers of new system groups are choosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
+msgstr ""
+
+# type: IP
+#: faillog.8.xml:86(term)
+msgid ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+msgstr ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+
+#: faillog.8.xml:179(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+# type: Plain text
+#: chsh.1.xml:63(para)
+#, fuzzy
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account, the superuser may change "
+"the login shell for any account."
+msgstr ""
+"<command>chsh</command> cambia la shell di login dell'utente, in altre "
+"parole determina il comando iniziale eseguito quando un utente fa il login. "
+"Un utente qualsiasi può cambiare la shell di login solo per il proprio "
+"account, mentre l'amministratore può cambiare la shell di login per ogni "
+"account."
+
+# type: Plain text
+#: chpasswd.8.xml:71(para)
+#, fuzzy
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
+msgstr ""
+"Come impostazione predefinita, si devono fornire password in chiaro. "
+"L'algoritmo di cifratura predefinito è DES. Se sono presenti, vengono "
+"aggiornate anche le informazioni sulla durata delle password."
+
+#: chpasswd.8.xml:82(para)
+msgid ""
+"<command>chpasswd</command> first update the password in memory, and then "
+"commit all the changes to disk if no errors occured for any users."
+msgstr ""
+
+# type: Plain text
+#: chpasswd.8.xml:89(para)
+#, fuzzy
+msgid "The supplied passwords must be in clear-text."
+msgstr "Le password fornite sono in forma cifrata."
+
+#: chpasswd.8.xml:92(para)
+msgid ""
+"PAM is used to update the password in the system database according to the "
+"PAM chpasswd configuration."
+msgstr ""
+
+#: chpasswd.8.xml:96(para)
+msgid ""
+"When <command>chpasswd</command> fails to update a password, it continues "
+"updating the passwords of the next users, and will return an error code on "
+"exit."
+msgstr ""
+
+# type: Plain text
+#: chpasswd.8.xml:239(para)
+#, fuzzy
+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 ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+# type: Plain text
 #, fuzzy
 #~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -9436,46 +9392,6 @@ msgstr ""
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-# type: Plain text
-#~ 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>."
-#~ 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: Plain text
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-
-# type: Plain text
-#, fuzzy
-#~| msgid "Supplied passwords are in encrypted form."
-#~ msgid "The supplied passwords must be in clear-text."
-#~ msgstr "Le password fornite sono in forma cifrata."
-
 #, fuzzy
 #~ msgid "and <placeholder-1/> files"
 #~ msgstr "-a <placeholder-1/>"
diff -pruN 1:4.1.4.2+svn3283-2/man/po/pl.po 1:4.1.4.2+svn3283-2ubuntu1/man/po/pl.po
--- 1:4.1.4.2+svn3283-2/man/po/pl.po	2010-08-29 16:54:42.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/man/po/pl.po	2010-11-24 14:47:24.000000000 +0000
@@ -7,10 +7,10 @@ msgstr ""
 "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"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 
 #: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
 #: login.defs.5.xml:477(term)
@@ -174,7 +174,6 @@ msgstr "Edycja bazy shadow lub gshadow."
 
 #: vipw.8.xml:122(term)
 #, fuzzy
-#| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
@@ -364,18 +363,6 @@ msgstr "ZOBACZ TAKŻE"
 
 #: vipw.8.xml:192(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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -433,9 +420,6 @@ msgstr "<option>-a</option>, <option>--a
 
 #: usermod.8.xml:80(para)
 #, fuzzy
-#| msgid ""
-#| "Add the user to the supplemental group(s). Use only with <option>-G</"
-#| "option> option."
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
@@ -475,10 +459,6 @@ msgstr ""
 
 #: usermod.8.xml:109(para)
 #, fuzzy
-#| msgid ""
-#| "The user's new login directory. If the <option>-m</option> option is "
-#| "given the contents of the current home directory will be moved to the new "
-#| "home directory, which is created if it does not already exist."
 msgid ""
 "If the <option>-m</option> option is given, the contents of the current home "
 "directory will be moved to the new home directory, which is created if it "
@@ -520,11 +500,6 @@ msgstr ""
 
 #: usermod.8.xml:139(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "A value of 0 disables the account as soon as the password has expired, and a "
 "value of -1 disables the feature."
@@ -541,10 +516,6 @@ msgstr ""
 
 #: usermod.8.xml:152(para)
 #, fuzzy
-#| msgid ""
-#| "The group name or number of the user's new initial login group. The group "
-#| "name must exist. A group number must refer to an already existing group. "
-#| "The default group number is 1."
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
@@ -648,7 +619,6 @@ msgstr ""
 
 #: usermod.8.xml:222(term)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
@@ -658,7 +628,6 @@ msgstr ""
 
 #: usermod.8.xml:230(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -787,9 +756,6 @@ msgstr ""
 
 #: usermod.8.xml:339(term) useradd.8.xml:482(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -798,9 +764,6 @@ msgstr ""
 
 #: usermod.8.xml:344(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 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."
@@ -1403,7 +1366,6 @@ msgstr ""
 
 #: useradd.8.xml:158(term)
 #, fuzzy
-#| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
@@ -1420,11 +1382,6 @@ msgstr ""
 
 #: useradd.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled. A value of 0 disables the account as soon as the password has "
@@ -1443,10 +1400,6 @@ msgstr ""
 
 #: useradd.8.xml:211(para)
 #, fuzzy
-#| msgid ""
-#| "The group name or number of the user's new initial login group. The group "
-#| "name must exist. A group number must refer to an already existing group. "
-#| "The default group number is 1."
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group."
@@ -1480,9 +1433,6 @@ msgstr ""
 
 #: useradd.8.xml:256(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1498,7 +1448,6 @@ msgstr ""
 
 #: useradd.8.xml:266(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1528,18 +1477,17 @@ msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
 "<option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: "
-"<option>-K </option><replaceable>PASS_MAX_DAYS</"
-"replaceable>=<replaceable>-1</replaceable> can be used when creating system "
-"account to turn off password ageing, even though system account has no "
-"password at all. Multiple <option>-K</option> options can be specified, e."
-"g.: <option>-K </option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+"<option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-"
+"1</replaceable> can be used when creating system account to turn off "
+"password ageing, even though system account has no password at all. Multiple "
+"<option>-K</option> options can be specified, e.g.: <option>-K </"
+"option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
 "replaceable><option>-K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
 #: useradd.8.xml:311(term)
 #, fuzzy
-#| msgid "<option>-l</option>, <option>--list</option>"
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
@@ -1572,7 +1520,6 @@ msgstr ""
 
 #: useradd.8.xml:343(option)
 #, fuzzy
-#| msgid "-"
 msgid "-M"
 msgstr "-"
 
@@ -1585,7 +1532,6 @@ msgstr ""
 
 #: useradd.8.xml:355(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1610,7 +1556,6 @@ msgstr ""
 
 #: useradd.8.xml:379(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
@@ -1628,7 +1573,6 @@ msgstr ""
 
 #: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -1674,7 +1618,6 @@ msgstr ""
 
 #: useradd.8.xml:465(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1686,9 +1629,6 @@ msgstr ""
 
 #: useradd.8.xml:487(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
@@ -2768,7 +2708,6 @@ msgstr ""
 
 #: su.1.xml:393(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "126"
 msgstr "12"
 
@@ -2778,7 +2717,6 @@ msgstr ""
 
 #: su.1.xml:399(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "127"
 msgstr "12"
 
@@ -2794,13 +2732,6 @@ msgstr ""
 
 #: su.1.xml:410(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</"
@@ -2860,18 +2791,6 @@ 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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -2905,7 +2824,6 @@ msgstr ""
 
 #: shadow.5.xml:40(refpurpose)
 #, fuzzy
-#| msgid "can't update password file"
 msgid "shadowed password file"
 msgstr "nie można zaktualizować pliku z hasłami"
 
@@ -3074,7 +2992,6 @@ msgstr ""
 
 #: shadow.5.xml:197(emphasis)
 #, fuzzy
-#| msgid "User account information."
 msgid "account expiration date"
 msgstr "Informacja o kontach użytkowników."
 
@@ -3111,7 +3028,6 @@ msgstr ""
 
 #: shadow.5.xml:245(filename)
 #, fuzzy
-#| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
@@ -3127,21 +3043,6 @@ msgstr ""
 
 #: shadow.5.xml:259(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3508,15 +3409,6 @@ msgstr ""
 
 #: pwconv.8.xml:200(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>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3677,7 +3569,6 @@ msgstr ""
 
 #: pwck.8.xml:205(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
@@ -3715,7 +3606,6 @@ msgstr ""
 
 #: pwck.8.xml:314(para)
 #, fuzzy
-#| msgid "can't update password file"
 msgid "can't sort password files"
 msgstr "nie można zaktualizować pliku z hasłami"
 
@@ -3729,15 +3619,6 @@ msgstr ""
 
 #: pwck.8.xml:323(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</"
@@ -3935,7 +3816,6 @@ msgstr ""
 
 #: passwd.5.xml:131(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
@@ -3945,24 +3825,6 @@ msgstr ""
 
 #: passwd.5.xml:145(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4178,9 +4040,6 @@ msgstr ""
 
 #: passwd.1.xml:247(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -4299,9 +4158,6 @@ msgstr ""
 #: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
 #: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 #, fuzzy
-#| msgid ""
-#| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
-#| "replaceable>=<replaceable>VALUE</replaceable>"
 msgid ""
 "It can take one of these values: <replaceable>DES</replaceable> (default), "
 "<replaceable>MD5</replaceable><phrase condition=\"sha_crypt\">, "
@@ -4459,7 +4315,6 @@ msgstr ""
 
 #: passwd.1.xml:395(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
@@ -4497,13 +4352,6 @@ msgstr ""
 
 #: passwd.1.xml:456(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -4572,13 +4420,6 @@ msgstr "new_users"
 
 #: newusers.8.xml:71(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>newusers</command> command reads a file of user name and "
-#| "clear-text password pairs and uses this information to update a group of "
-#| "existing users or to create new users. Each line is in the same format as "
-#| "the standard password file (see <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-#| "exceptions:"
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
@@ -4600,7 +4441,6 @@ msgstr ""
 
 #: newusers.8.xml:84(emphasis)
 #, fuzzy
-#| msgid "*name"
 msgid "pw_name"
 msgstr "*name"
 
@@ -4628,7 +4468,6 @@ msgstr ""
 
 #: newusers.8.xml:112(emphasis)
 #, fuzzy
-#| msgid "pw_gid"
 msgid "pw_uid"
 msgstr "pw_gid"
 
@@ -4762,8 +4601,6 @@ msgstr ""
 
 #: newusers.8.xml:240(para)
 #, fuzzy
-#| msgid ""
-#| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "Polecenie <command>usermod</command> posiada następujące opcje:"
 
@@ -4835,7 +4672,6 @@ msgstr ""
 
 #: newusers.8.xml:390(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
@@ -5423,7 +5259,6 @@ msgstr ""
 
 #: login.defs.5.xml:357(term)
 #, fuzzy
-#| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
@@ -5457,7 +5292,6 @@ msgstr ""
 
 #: login.defs.5.xml:403(para)
 #, fuzzy
-#| msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
@@ -5507,13 +5341,6 @@ msgstr ""
 
 #: login.defs.5.xml:489(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
@@ -6113,9 +5940,6 @@ msgstr ""
 
 #: lastlog.8.xml:102(term) faillog.8.xml:168(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
-#| "replaceable>=<replaceable>VALUE</replaceable>"
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -6125,9 +5949,6 @@ msgstr ""
 
 #: lastlog.8.xml:107(para)
 #, fuzzy
-#| msgid ""
-#| "Print the lastlog record for user with specified <emphasis remap=\"I"
-#| "\">LOGIN</emphasis> only."
 msgid "Print the lastlog record of the specified user(s)."
 msgstr ""
 "Wyświetlenie informacji o ostanim logowaniu dla użytkownika "
@@ -6240,10 +6061,6 @@ msgstr ""
 
 #: gshadow.5.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The new value of the user's password file comment field. It is normally "
-#| "modified using the <citerefentry><refentrytitle>chfn</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry> utility."
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -6297,15 +6114,6 @@ msgstr ""
 
 #: gshadow.5.xml:160(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>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -6384,7 +6192,6 @@ msgstr ""
 
 #: 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:"
 
@@ -6437,16 +6244,6 @@ msgstr ""
 
 #: 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</"
@@ -6545,9 +6342,6 @@ msgstr ""
 
 #: groupmod.8.xml:78(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the group will be changed from <replaceable>GROUP</"
-#| "replaceable> to <replaceable>NEW_GROUP</replaceable> name."
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
@@ -6693,8 +6487,6 @@ msgstr "Polecenie <command>groupmems</co
 
 #: groupmems.8.xml:82(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -6715,9 +6507,6 @@ msgstr ""
 
 #: groupmems.8.xml:93(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -6736,8 +6525,6 @@ msgstr ""
 
 #: groupmems.8.xml:109(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -6758,7 +6545,6 @@ msgstr ""
 
 #: groupmems.8.xml:129(term)
 #, fuzzy
-#| msgid "<option>-e</option>, <option>--expire</option>"
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
@@ -6935,9 +6721,6 @@ msgstr ""
 
 #: groupadd.8.xml:122(para)
 #, fuzzy
-#| msgid ""
-#| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
-#| "replaceable>=<replaceable>VALUE</replaceable>"
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -6959,7 +6742,6 @@ msgstr ""
 
 #: groupadd.8.xml:170(para)
 #, fuzzy
-#| msgid "create a new group"
 msgid "Create a system group."
 msgstr "twółrz nową grupę"
 
@@ -7046,7 +6828,6 @@ msgstr ""
 
 #: gpasswd.1.xml:49(phrase)
 #, fuzzy
-#| msgid "-r <placeholder-1/>"
 msgid "administer <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
@@ -7123,8 +6904,6 @@ msgstr "Polecenie <command>passwd</comma
 
 #: gpasswd.1.xml:125(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
@@ -7141,9 +6920,6 @@ msgstr ""
 
 #: gpasswd.1.xml:138(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
@@ -7160,7 +6936,6 @@ msgstr ""
 
 #: gpasswd.1.xml:159(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
@@ -7173,7 +6948,6 @@ msgstr ""
 
 #: gpasswd.1.xml:174(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -7186,9 +6960,6 @@ msgstr ""
 
 #: gpasswd.1.xml:189(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -7202,9 +6973,6 @@ msgstr ""
 
 #: gpasswd.1.xml:201(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -7282,7 +7050,6 @@ msgstr ""
 
 #: faillog.8.xml:77(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
@@ -7303,9 +7070,6 @@ msgstr ""
 
 #: faillog.8.xml:103(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
-#| "replaceable>"
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -7357,9 +7121,6 @@ msgstr ""
 
 #: faillog.8.xml:161(para)
 #, fuzzy
-#| msgid ""
-#| "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
-#| "emphasis>."
 msgid ""
 "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
@@ -7487,11 +7248,6 @@ msgstr "zmiana powłoki zgłoszeniowej"
 
 #: chsh.1.xml:63(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>chsh</command> command changes the user login shell. This "
-#| "determines the name of the user's initial login command. A normal user "
-#| "may only change the login shell for her own account, the superuser may "
-#| "change the login shell for any account."
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
 "determines the name of the user's initial login command. A normal user may "
@@ -7641,9 +7397,6 @@ msgstr "Polecenie <command>chpasswd</com
 
 #: chpasswd.8.xml:115(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
-#| "replaceable>"
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -7690,9 +7443,6 @@ msgstr ""
 
 #: chpasswd.8.xml:167(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -7717,7 +7467,6 @@ msgstr ""
 
 #: chpasswd.8.xml:244(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
@@ -8100,6 +7849,293 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Tomasz KÅ‚oczko <kloczek at pld.org.pl>, 2006"
 
+#: vipw.8.xml:155(para)
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:297(para)
+msgid ""
+"Note: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgstr ""
+
+#: useradd.8.xml:328(para)
+msgid "By default, no home directories are created."
+msgstr ""
+
+#: useradd.8.xml:371(para)
+#, fuzzy
+msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:407(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgstr ""
+
+#: pwconv.8.xml:181(para)
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+
+#: 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: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 ""
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: newusers.8.xml:270(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
+msgid ""
+"This will most likely be overriden by PAM, since the default pam_unix module "
+"has it's own built in of 3 retries. However, this is a safe fallback in case "
+"you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgstr ""
+
+#: login.defs.5.xml:240(para)
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgstr ""
+
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
+msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+
+#: login.defs.5.xml:423(para)
+#, fuzzy
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+msgstr ""
+"GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
+"UMASK"
+
+#: login.defs.5.xml:436(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+msgstr ""
+
+#: login.defs.5.xml:445(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: groupadd.8.xml:174(para)
+msgid ""
+"The numeric identifiers of new system groups are choosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
+msgstr ""
+
+#: faillog.8.xml:86(term)
+msgid ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+msgstr ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
+"replaceable>"
+
+#: faillog.8.xml:179(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: chsh.1.xml:63(para)
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account, the superuser may change "
+"the login shell for any account."
+msgstr ""
+"Polecenie <command>chsh</command> zmienia powłokę zgłoszeniową użytkownika, "
+"która określa nazwę początkowego polecenia zgłoszeniowego użytkownika. "
+"Zwykły użytkownik może zmienić wyłącznie  powłokę zgłoszeniową własnego "
+"konta, superużytkownik może zmienić powłokę zgłoszeniową dla dowolnego konta."
+
+#: chpasswd.8.xml:71(para)
+#, fuzzy
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
+msgstr ""
+"Domyślnie dostarczane hasła muszą być w postaci jawnej. Podczas kodowania "
+"haseł używany jest domyślnie algorytm DES. W trakcie zmiany hasła "
+"aktualizowany jest także wiek hasła."
+
+#: chpasswd.8.xml:82(para)
+msgid ""
+"<command>chpasswd</command> first update the password in memory, and then "
+"commit all the changes to disk if no errors occured for any users."
+msgstr ""
+
+#: chpasswd.8.xml:89(para)
+#, fuzzy
+msgid "The supplied passwords must be in clear-text."
+msgstr ""
+"Dostarczone na standardowe wejście hasła są traktowane jako już zakodowane."
+
+#: chpasswd.8.xml:92(para)
+msgid ""
+"PAM is used to update the password in the system database according to the "
+"PAM chpasswd configuration."
+msgstr ""
+
+#: chpasswd.8.xml:96(para)
+msgid ""
+"When <command>chpasswd</command> fails to update a password, it continues "
+"updating the passwords of the next users, and will return an error code on "
+"exit."
+msgstr ""
+
+#: chpasswd.8.xml:239(para)
+#, fuzzy
+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 ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
 #, fuzzy
 #~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -8132,48 +8168,6 @@ msgstr "Tomasz KÅ‚oczko <kloczek at pld.org
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#~ 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>."
-#~ 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>."
-
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-
-#~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-#~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-
-#, fuzzy
-#~| msgid "Supplied passwords are in encrypted form."
-#~ msgid "The supplied passwords must be in clear-text."
-#~ msgstr ""
-#~ "Dostarczone na standardowe wejście hasła są traktowane jako już "
-#~ "zakodowane."
-
 #, fuzzy
 #~ msgid "and <placeholder-1/> files"
 #~ msgstr "-a <placeholder-1/>"
diff -pruN 1:4.1.4.2+svn3283-2/man/po/ru.po 1:4.1.4.2+svn3283-2ubuntu1/man/po/ru.po
--- 1:4.1.4.2+svn3283-2/man/po/ru.po	2010-08-29 16:54:42.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/man/po/ru.po	2010-11-24 14:47:24.000000000 +0000
@@ -7,13 +7,13 @@ msgstr ""
 "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"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # type: Content of: <refentry><refsect1><para><command>
 #: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
@@ -188,7 +188,6 @@ msgstr "Редактировать баÐ
 
 #: vipw.8.xml:122(term)
 #, fuzzy
-#| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
@@ -232,9 +231,6 @@ msgstr "CHFN_AUTH (логический)
 #: useradd.8.xml:32(para) pwconv.8.xml:32(para) pwck.8.xml:32(para)
 #: login.defs.5.xml:32(para) chage.1.xml:32(para)
 #, fuzzy
-#| msgid ""
-#| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry> for details on how this string is interpreted."
 msgid ""
 "If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing "
@@ -259,7 +255,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #: vipw.8.xml:152(option)
 #, fuzzy
-#| msgid "HYSTORY"
 msgid "EDITOR"
 msgstr "ИСТОРИЯ"
 
@@ -395,18 +390,6 @@ msgstr "СМОТРИТЕ ТАКЖЕ"
 
 #: vipw.8.xml:192(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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -470,9 +453,6 @@ msgstr "<option>-a</option>, <option>--a
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:80(para)
 #, fuzzy
-#| msgid ""
-#| "Add the user to the supplemental group(s). Use only with <option>-G</"
-#| "option> option."
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
@@ -510,17 +490,12 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: usermod.8.xml:106(para)
 #, fuzzy
-#| msgid "user home directory"
 msgid "The user's new login directory."
 msgstr "домашний каталог пользователя"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:109(para)
 #, fuzzy
-#| msgid ""
-#| "The user's new login directory. If the <option>-m</option> option is "
-#| "given the contents of the current home directory will be moved to the new "
-#| "home directory, which is created if it does not already exist."
 msgid ""
 "If the <option>-m</option> option is given, the contents of the current home "
 "directory will be moved to the new home directory, which is created if it "
@@ -558,9 +533,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:135(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
@@ -571,11 +543,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:139(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "A value of 0 disables the account as soon as the password has expired, and a "
 "value of -1 disables the feature."
@@ -594,10 +561,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:152(para)
 #, fuzzy
-#| msgid ""
-#| "The group name or number of the user's new initial login group. The group "
-#| "name must exist. A group number must refer to an already existing group. "
-#| "The default group number is 1."
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
@@ -631,12 +594,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:172(para)
 #, fuzzy
-#| msgid ""
-#| "A list of supplementary groups which the user is also a member of. Each "
-#| "group is separated from the next by a comma, with no intervening "
-#| "whitespace. The groups are subject to the same restrictions as the group "
-#| "given with the <option>-g</option> option. The default is for the user to "
-#| "belong only to the initial group."
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
@@ -714,7 +671,6 @@ msgstr ""
 
 #: usermod.8.xml:222(term)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
@@ -724,7 +680,6 @@ msgstr ""
 
 #: usermod.8.xml:230(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -820,12 +775,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:301(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "The default is to use the smallest ID value greater than 999 and greater "
-#| "than every other user. Values between 0 and 999 are typically reserved "
-#| "for system accounts."
 msgid ""
 "This value must be unique, unless the <option>-o</option> option is used. "
 "The value must be non-negative. Values between 0 and 999 are typically "
@@ -840,14 +789,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:307(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "Values between 0 and 999 are typically reserved for system accounts. Any "
-#| "files which the user owns and which are located in the directory tree "
-#| "rooted at the user's home directory will have the file user ID changed "
-#| "automatically. Files outside of the user's home directory must be altered "
-#| "manually."
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
@@ -892,9 +833,6 @@ msgstr ""
 
 #: usermod.8.xml:339(term) useradd.8.xml:482(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -905,9 +843,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:344(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 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."
@@ -1212,9 +1147,6 @@ msgstr ""
 
 #: userdel.8.xml:117(para)
 #, fuzzy
-#| msgid ""
-#| "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable "
-#| "in the <filename>login.defs</filename> file."
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1441,9 +1373,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: userdel.8.xml:233(para)
 #, fuzzy
-#| msgid ""
-#| "You must manually check all file systems to insure that no files remain "
-#| "with the named group as the file group ID."
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
@@ -1462,15 +1391,6 @@ msgstr ""
 
 #: userdel.8.xml:240(para)
 #, fuzzy
-#| msgid ""
-#| "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
-#| "\">yes</emphasis> in <filename>/etc/login.defs</filename>, "
-#| "<command>userdel</command> will delete the group with the same name as "
-#| "the user. To avoid inconsistencies in the passwd and group databases, "
-#| "<command>userdel</command> will check that this group is not used as a "
-#| "primary group for another user, and will just warn without deleting the "
-#| "user otherwise. The <option>-f</option> option can force the deletion of "
-#| "this group."
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1630,7 +1550,6 @@ msgstr ""
 
 #: useradd.8.xml:158(term)
 #, fuzzy
-#| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
@@ -1650,11 +1569,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: useradd.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password expires until the account is "
-#| "permanently disabled. A value of 0 disables the account as soon as the "
-#| "password has expired, and a value of -1 disables the feature. The default "
-#| "value is -1."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled. A value of 0 disables the account as soon as the password has "
@@ -1668,9 +1582,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: useradd.8.xml:197(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's login shell. The default is to leave this field "
-#| "blank, which causes the system to select the default login shell."
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
@@ -1682,10 +1593,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: useradd.8.xml:211(para)
 #, fuzzy
-#| msgid ""
-#| "The group name or number of the user's new initial login group. The group "
-#| "name must exist. A group number must refer to an already existing group. "
-#| "The default group number is 1."
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group."
@@ -1725,9 +1632,6 @@ msgstr ""
 
 #: useradd.8.xml:256(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1744,7 +1648,6 @@ msgstr ""
 
 #: useradd.8.xml:266(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1771,25 +1674,15 @@ msgstr ""
 
 #: useradd.8.xml:287(para)
 #, fuzzy
-#| msgid ""
-#| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
-#| "PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
-#| "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
-#| "replaceable> can be used when creating system account to turn off "
-#| "password ageing, even though system account has no password at all. "
-#| "Multiple <option>-K</option> options can be specified, e.g.: <option>-K </"
-#| "option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
-#| "replaceable><option> -K </option><replaceable>UID_MAX</"
-#| "replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
 "<option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: "
-"<option>-K </option><replaceable>PASS_MAX_DAYS</"
-"replaceable>=<replaceable>-1</replaceable> can be used when creating system "
-"account to turn off password ageing, even though system account has no "
-"password at all. Multiple <option>-K</option> options can be specified, e."
-"g.: <option>-K </option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+"<option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-"
+"1</replaceable> can be used when creating system account to turn off "
+"password ageing, even though system account has no password at all. Multiple "
+"<option>-K</option> options can be specified, e.g.: <option>-K </"
+"option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
 "replaceable><option>-K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
@@ -1806,7 +1699,6 @@ msgstr ""
 
 #: useradd.8.xml:311(term)
 #, fuzzy
-#| msgid "<option>-l</option>, <option>--list</option>"
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
@@ -1840,7 +1732,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
 #: useradd.8.xml:343(option)
 #, fuzzy
-#| msgid "-"
 msgid "-M"
 msgstr "-"
 
@@ -1853,7 +1744,6 @@ msgstr ""
 
 #: useradd.8.xml:355(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1879,17 +1769,12 @@ msgstr "Позволяет создатÑ
 
 #: useradd.8.xml:379(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 #: useradd.8.xml:391(para) groupadd.8.xml:149(para)
 #, fuzzy
-#| msgid ""
-#| "The encrypted password, as returned by "
-#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry>. The default is to disable the account."
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1901,7 +1786,6 @@ msgstr ""
 
 #: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -1931,9 +1815,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: useradd.8.xml:440(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's login shell. The default is to leave this field "
-#| "blank, which causes the system to select the default login shell."
 msgid ""
 "The name of the user's login shell. The default is to leave this field "
 "blank, which causes the system to select the default login shell specified "
@@ -1960,7 +1841,6 @@ msgstr ""
 
 #: useradd.8.xml:465(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1973,9 +1853,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: useradd.8.xml:487(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the user's new login shell. Setting this field to blank "
-#| "causes the system to select the default login shell."
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
@@ -2080,9 +1957,6 @@ msgstr "ЗАМЕЧАНИЯ"
 # type: Content of: <refentry><refsect1><para>
 #: useradd.8.xml:597(para)
 #, fuzzy
-#| msgid ""
-#| "The system administrator is responsible for placing the default user "
-#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -2117,10 +1991,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: useradd.8.xml:617(para)
 #, fuzzy
-#| msgid ""
-#| "Usernames must begin with a lower case letter or an underscore, and only "
-#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
-#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -2134,7 +2004,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: useradd.8.xml:623(para)
 #, fuzzy
-#| msgid "Groupnames may only be up to 16 characters long."
 msgid "Usernames may only be up to 32 characters long."
 msgstr "Имена групп могут быть длиной не более 16 знаков."
 
@@ -2172,9 +2041,6 @@ msgstr "GID_MIN (число)"
 #: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 #: groupadd.8.xml:35(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of group IDs used for the creation of regular groups by "
 "<command>useradd</command>, <command>groupadd</command>, or "
@@ -2258,9 +2124,6 @@ msgstr "GID_MIN (число)"
 #: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 #: groupadd.8.xml:33(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of group IDs used for the creation of system groups by "
 "<command>useradd</command>, <command>groupadd</command>, or "
@@ -2283,9 +2146,6 @@ msgstr "UID_MIN (число)"
 
 #: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of user IDs used for the creation of system users by <command>useradd</"
 "command> or <command>newusers</command>."
@@ -2322,9 +2182,6 @@ msgstr "UID_MIN (число)"
 
 #: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 #, fuzzy
-#| msgid ""
-#| "Range of group IDs to choose from for the <command>useradd</command> and "
-#| "<command>groupadd</command> programs."
 msgid ""
 "Range of user IDs used for the creation of regular users by "
 "<command>useradd</command> or <command>newusers</command>."
@@ -2343,9 +2200,6 @@ msgstr "UMASK (число)"
 #: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
 #: login.1.xml:34(para)
 #, fuzzy
-#| msgid ""
-#| "The permission mask is initialized to this value. If not specified, the "
-#| "permission mask will be initialized to 022."
 msgid ""
 "The file mode creation mask is initialized to this value. If not specified, "
 "the mask will be initialized to 022."
@@ -2374,9 +2228,6 @@ msgstr ""
 #: useradd.8.xml:50(para) newusers.8.xml:50(para) login.defs.5.xml:50(para)
 #: login.1.xml:50(para)
 #, fuzzy
-#| msgid ""
-#| "If no options are specified, <command>useradd</command> displays the "
-#| "current default values."
 msgid ""
 "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
@@ -2850,13 +2701,6 @@ msgstr ""
 
 #: 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 "
@@ -3018,7 +2862,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: su.1.xml:207(para)
 #, fuzzy
-#| msgid "Preserve the current environment."
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Сохранить имеющуюся рабочую среду."
 
@@ -3175,9 +3018,6 @@ 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 ""
 "Формат файла показан ниже, строки начинающиеся с # считаются комментарием и "
@@ -3363,21 +3203,18 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
 #: su.1.xml:393(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "126"
 msgstr "12"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: su.1.xml:395(para)
 #, fuzzy
-#| msgid "execute command as different group ID"
 msgid "The requested command was not found"
 msgstr "выполняет команду с правами другой группы"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
 #: su.1.xml:399(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "127"
 msgstr "12"
 
@@ -3393,13 +3230,6 @@ msgstr ""
 
 #: su.1.xml:410(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</"
@@ -3474,18 +3304,6 @@ 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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3521,17 +3339,12 @@ msgstr "shadow"
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: shadow.5.xml:40(refpurpose)
 #, fuzzy
-#| msgid "the password file"
 msgid "shadowed password file"
 msgstr "файл паролей"
 
 # type: Content of: <refentry><refsect1><para>
 #: shadow.5.xml:45(para)
 #, fuzzy
-#| msgid ""
-#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-#| "information for user's accounts and optional the password aging "
-#| "information. Included is:"
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
@@ -3580,13 +3393,6 @@ msgstr ""
 
 #: shadow.5.xml:78(para)
 #, fuzzy
-#| msgid ""
-#| "If the password field contains some string that is not valid result of "
-#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry>, for instance ! or *, the user will not be able "
-#| "to use a unix password to log in, subject to "
-#| "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
-#| "citerefentry>."
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -3618,7 +3424,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: shadow.5.xml:102(emphasis)
 #, fuzzy
-#| msgid "days before password may be changed"
 msgid "date of last password change"
 msgstr "число дней, перед тем как пароль может быть изменён"
 
@@ -3641,7 +3446,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><title>
 #: shadow.5.xml:121(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "minimum password age"
 msgstr "Изменение пароля"
 
@@ -3658,7 +3462,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><title>
 #: shadow.5.xml:135(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "maximum password age"
 msgstr "Изменение пароля"
 
@@ -3689,16 +3492,12 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><title>
 #: shadow.5.xml:159(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "password warning period"
 msgstr "Изменение пароля"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: shadow.5.xml:162(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days before a password is going to expire (see the maximum "
 "password age above) during which the user should be warned."
@@ -3737,7 +3536,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: shadow.5.xml:197(emphasis)
 #, fuzzy
-#| msgid "User account information."
 msgid "account expiration date"
 msgstr "содержит информацию о пользователях"
 
@@ -3767,21 +3565,18 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: shadow.5.xml:221(emphasis)
 #, fuzzy
-#| msgid "a reserved field"
 msgid "reserved field"
 msgstr "зарезервированное поле"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: shadow.5.xml:223(para)
 #, fuzzy
-#| msgid "sp_flag - reserved for future use"
 msgid "This field is reserved for future use."
 msgstr "sp_flag - зарезервировано"
 
 # type: Content of: <refentry><refsect1><para><filename>
 #: shadow.5.xml:245(filename)
 #, fuzzy
-#| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
@@ -3797,21 +3592,6 @@ msgstr ""
 
 #: shadow.5.xml:259(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -4315,15 +4095,6 @@ msgstr ""
 
 #: pwconv.8.xml:200(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>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -4382,13 +4153,6 @@ msgstr "-r"
 # type: Content of: <refentry><refsect1><para>
 #: pwck.8.xml:87(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 users and "
 "authentication information. It checks that all entries in <filename>/etc/"
@@ -4418,7 +4182,6 @@ msgstr "правильное количÐ
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: pwck.8.xml:105(para)
 #, fuzzy
-#| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "уникальность имени пользователя"
 
@@ -4465,7 +4228,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: pwck.8.xml:140(para)
 #, fuzzy
-#| msgid "the correct number of fields"
 msgid "shadow entries have the correct number of fields"
 msgstr "правильное количество полей"
 
@@ -4476,7 +4238,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: pwck.8.xml:146(para)
 #, fuzzy
-#| msgid "days before password may be changed"
 msgid "the last password changes are not in the future"
 msgstr "число дней, перед тем как пароль может быть изменён"
 
@@ -4538,17 +4299,11 @@ msgstr ""
 
 #: pwck.8.xml:205(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 #: pwck.8.xml:212(para)
 #, fuzzy
-#| 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."
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -4591,7 +4346,6 @@ msgstr "не удалось измени
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: pwck.8.xml:314(para)
 #, fuzzy
-#| msgid "can't open password files"
 msgid "can't sort password files"
 msgstr "не удалось открыть файл паролей"
 
@@ -4606,15 +4360,6 @@ msgstr ""
 
 #: pwck.8.xml:323(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</"
@@ -4888,7 +4633,6 @@ msgstr "необязательный Ñ„Ð
 # type: Content of: <refentry><refsect1><para><filename>
 #: passwd.5.xml:131(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
@@ -4898,24 +4642,6 @@ msgstr ""
 
 #: passwd.5.xml:145(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4960,13 +4686,6 @@ msgstr "изменяет пароль п
 # type: Content of: <refentry><refsect1><para>
 #: passwd.1.xml:67(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>passwd</command> command changes passwords for user "
-#| "accounts. A normal user may only change the password for his/her own "
-#| "account, while the superuser may change the password for any account. "
-#| "<command>passwd</command> also changes account information, such as the "
-#| "full name of the user, the user's login shell, or his/her password expiry "
-#| "date and interval."
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
 "normal user may only change the password for his/her own account, while the "
@@ -5066,12 +4785,6 @@ msgstr "Выбор пароля"
 # type: Content of: <refentry><refsect1><refsect2><para>
 #: passwd.1.xml:126(para)
 #, fuzzy
-#| msgid ""
-#| "The security of a password depends upon the strength of the encryption "
-#| "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
-#| "System encryption method is based on the NBS DES algorithm and is very "
-#| "secure. The size of the key space depends upon the randomness of the "
-#| "password which is selected."
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The legacy <emphasis>UNIX</"
@@ -5217,9 +4930,6 @@ msgstr ""
 
 #: passwd.1.xml:247(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -5257,14 +4967,6 @@ msgstr "<option>-S</option>, <option>--s
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: passwd.1.xml:283(para)
 #, fuzzy
-#| msgid ""
-#| "Display account status information. The status information consists of 7 "
-#| "fields. The first field is the user's login name. The second field "
-#| "indicates if the user account is locked (L), has no password (NP), or has "
-#| "a usable password (P). The third field gives the date of the last "
-#| "password change. The next four fields are the minimum age, maximum age, "
-#| "warning period, and inactivity period for the password. These ages are "
-#| "expressed in days."
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
@@ -5339,12 +5041,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: passwd.1.xml:339(para)
 #, fuzzy
-#| msgid ""
-#| "Not all options may be supported. Password complexity checking may vary "
-#| "from site to site. The user is urged to select a password as complex as "
-#| "he or she feels comfortable with. 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."
 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."
@@ -5381,10 +5077,6 @@ msgstr ""
 #: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
 #: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 #, fuzzy
-#| msgid ""
-#| "Example: <option>-K </option><replaceable>GID_MIN</"
-#| "replaceable>=<replaceable>100</replaceable><option> -K </"
-#| "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "It can take one of these values: <replaceable>DES</replaceable> (default), "
 "<replaceable>MD5</replaceable><phrase condition=\"sha_crypt\">, "
@@ -5549,7 +5241,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para><filename>
 #: passwd.1.xml:395(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
@@ -5595,13 +5286,6 @@ msgstr ""
 
 #: passwd.1.xml:456(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -5663,14 +5347,12 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #: nologin.8.xml:76(title)
 #, fuzzy
-#| msgid "HYSTORY"
 msgid "HISTORY"
 msgstr "ИСТОРИЯ"
 
 # type: Content of: <refentry><refsect1><para>
 #: nologin.8.xml:77(para)
 #, fuzzy
-#| msgid "The <command>nologin</command> command appeared in BSD 4.4."
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "Программа <command>nologin</command> впервые появилась в BSD 4.4."
 
@@ -5694,13 +5376,6 @@ msgstr "new_users"
 # type: Content of: <refentry><refsect1><para>
 #: newusers.8.xml:71(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>newusers</command> command reads a file of user name and "
-#| "clear-text password pairs and uses this information to update a group of "
-#| "existing users or to create new users. Each line is in the same format as "
-#| "the standard password file (see <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-#| "exceptions:"
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
@@ -5722,7 +5397,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
 #: newusers.8.xml:84(emphasis)
 #, fuzzy
-#| msgid "group_name"
 msgid "pw_name"
 msgstr "имя_группы"
 
@@ -5754,7 +5428,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
 #: newusers.8.xml:112(emphasis)
 #, fuzzy
-#| msgid "pw_gid"
 msgid "pw_uid"
 msgstr "pw_gid"
 
@@ -5894,8 +5567,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: newusers.8.xml:240(para)
 #, fuzzy
-#| msgid ""
-#| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "Параметры команды <command>usermod</command>:"
 
@@ -5971,7 +5642,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para><filename>
 #: newusers.8.xml:390(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
@@ -6694,7 +6364,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
 #: login.defs.5.xml:357(term)
 #, fuzzy
-#| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
@@ -6730,7 +6399,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: login.defs.5.xml:403(para)
 #, fuzzy
-#| msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
@@ -6782,16 +6450,6 @@ msgstr ""
 
 #: login.defs.5.xml:489(para)
 #, fuzzy
-#| msgid ""
-#| "Much of the functionality that used to be provided by the shadow password "
-#| "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> "
-#| "is no longer used by programs such as: "
-#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>. Please refer to the corresponding PAM configuration files "
-#| "instead."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
@@ -6969,16 +6627,6 @@ msgstr "-r <placeholder-1/>"
 
 #: login.1.xml:104(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>login</command> program is used to establish a new session "
-#| "with the system. It is normally invoked automatically by responding to "
-#| "the <emphasis remap=\"I\">login:</emphasis> prompt on the user's "
-#| "terminal. <command>login</command> may be special to the shell and may "
-#| "not be invoked as a sub-process. Typically, <command>login</command> is "
-#| "treated by the shell as <emphasis remap=\"B\">exec login</emphasis> which "
-#| "causes the user to exit from the current shell. Attempting to execute "
-#| "<command>login</command> from any shell but the login shell will produce "
-#| "an error message."
 msgid ""
 "The <command>login</command> program is used to establish a new session with "
 "the system. It is normally invoked automatically by responding to the "
@@ -7310,7 +6958,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para><emphasis>
 #: limits.5.xml:70(emphasis)
 #, fuzzy
-#| msgid "user LIMITS_STRING"
 msgid "@group LIMITS_STRING"
 msgstr "user СТРОКА_ОГРАНИЧЕНИЙ"
 
@@ -7414,10 +7061,6 @@ msgstr ""
 
 #: limits.5.xml:108(para)
 #, fuzzy
-#| msgid ""
-#| "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-#| "<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the "
-#| "following entries are equivalent:"
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
@@ -7595,9 +7238,6 @@ msgstr ""
 
 #: lastlog.8.xml:102(term) faillog.8.xml:168(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
-#| "replaceable>=<replaceable>VALUE</replaceable>"
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -7608,9 +7248,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: lastlog.8.xml:107(para)
 #, fuzzy
-#| msgid ""
-#| "Print the lastlog record for user with specified <emphasis remap=\"I"
-#| "\">LOGIN</emphasis> only."
 msgid "Print the lastlog record of the specified user(s)."
 msgstr ""
 "Показать запись lastlog только для указанного пользователя с emphasis remap="
@@ -7701,10 +7338,6 @@ msgstr "файл с защищаемой
 # type: Content of: <refentry><refsect1><para>
 #: gshadow.5.xml:44(para)
 #, fuzzy
-#| msgid ""
-#| "<filename>/etc/gshadow</filename> contains the shadowed information for "
-#| "group accounts. It contains lines with the following colon-separated "
-#| "fields:"
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
@@ -7728,13 +7361,6 @@ msgstr ""
 
 #: gshadow.5.xml:75(para)
 #, fuzzy
-#| msgid ""
-#| "If the password field contains some string that is not valid result of "
-#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry>, for instance ! or *, the user will not be able "
-#| "to use a unix password to log in, subject to "
-#| "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
-#| "citerefentry>."
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -7750,10 +7376,6 @@ msgstr ""
 
 #: gshadow.5.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The comment field is used by various system utilities, such as "
-#| "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -7772,9 +7394,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: gshadow.5.xml:98(para)
 #, fuzzy
-#| msgid ""
-#| "This information supersedes any password present in <filename>/etc/group</"
-#| "filename>."
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
@@ -7789,7 +7408,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
 #, fuzzy
-#| msgid "comma-separated list of group members"
 msgid "It must be a comma-separated list of user names."
 msgstr "список членов группы, перечисленных через запятую"
 
@@ -7813,9 +7431,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: gshadow.5.xml:131(para)
 #, fuzzy
-#| msgid ""
-#| "This information supersedes any password present in <filename>/etc/group</"
-#| "filename>."
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
@@ -7824,15 +7439,6 @@ msgstr ""
 
 #: gshadow.5.xml:160(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>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -7860,13 +7466,6 @@ msgstr "проверяет коррекÑ
 # type: Content of: <refentry><refsect1><para>
 #: grpck.8.xml:70(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>grpck</command> command verifies the integrity of the system "
-#| "authentication information. All entries in the <filename>/etc/group</"
-#| "filename> and <filename>/etc/gshadow</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>grpck</command> command verifies the integrity of the groups "
 "information. It checks that all entries in <filename>/etc/group</"
@@ -7885,15 +7484,11 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: grpck.8.xml:87(para)
 #, 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>"
@@ -7904,7 +7499,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><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>"
@@ -7912,11 +7506,6 @@ 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</"
@@ -7930,14 +7519,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><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 "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -7958,11 +7539,6 @@ msgstr ""
 
 #: 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><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -7978,7 +7554,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><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>:"
 
@@ -7991,9 +7566,6 @@ msgstr ""
 
 #: grpck.8.xml:151(para)
 #, fuzzy
-#| msgid ""
-#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
-#| "shadow</filename> by UID."
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
@@ -8003,11 +7575,6 @@ msgstr ""
 
 #: grpck.8.xml:160(para)
 #, fuzzy
-#| 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."
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -8052,16 +7619,6 @@ msgstr ""
 
 #: 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</"
@@ -8174,9 +7731,6 @@ msgstr ""
 
 #: groupmod.8.xml:78(para)
 #, fuzzy
-#| msgid ""
-#| "The name of the group will be changed from <replaceable>GROUP</"
-#| "replaceable> to <replaceable>NEW_GROUP</replaceable> name."
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
@@ -8187,12 +7741,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: groupmod.8.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The numerical value of the user's ID. This value must be unique, unless "
-#| "the <option>-o</option> option is used. The value must be non-negative. "
-#| "The default is to use the smallest ID value greater than 999 and greater "
-#| "than every other user. Values between 0 and 999 are typically reserved "
-#| "for system accounts."
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
@@ -8342,8 +7890,6 @@ msgstr "Параметры командÑ
 
 #: groupmems.8.xml:82(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -8353,7 +7899,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: groupmems.8.xml:84(para)
 #, fuzzy
-#| msgid "Add a new user to the group membership list."
 msgid "Add an user to the group membership list."
 msgstr "Добавить нового пользователя в группу."
 
@@ -8367,9 +7912,6 @@ msgstr ""
 
 #: groupmems.8.xml:93(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -8389,8 +7931,6 @@ msgstr ""
 
 #: groupmems.8.xml:109(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -8415,7 +7955,6 @@ msgstr "Показать список ч
 
 #: groupmems.8.xml:129(term)
 #, fuzzy
-#| msgid "<option>-e</option>, <option>--expire</option>"
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
@@ -8522,9 +8061,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: groupdel.8.xml:70(para)
 #, fuzzy
-#| msgid ""
-#| "You must manually check all file systems to insure that no files remain "
-#| "with the named group as the file group ID."
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
@@ -8639,10 +8175,6 @@ msgstr ""
 
 #: groupadd.8.xml:122(para)
 #, fuzzy
-#| msgid ""
-#| "Example: <option>-K </option><replaceable>GID_MIN</"
-#| "replaceable>=<replaceable>100</replaceable><option> -K </"
-#| "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -8671,7 +8203,6 @@ msgstr "Разрешить добавлÐ
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: groupadd.8.xml:170(para)
 #, fuzzy
-#| msgid "create a new group"
 msgid "Create a system group."
 msgstr "создаёт новую группу"
 
@@ -8686,10 +8217,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: groupadd.8.xml:224(para)
 #, fuzzy
-#| msgid ""
-#| "Groupnames must begin with a lower case letter or an underscore, and only "
-#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
-#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -8702,7 +8229,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: groupadd.8.xml:230(para)
 #, fuzzy
-#| msgid "Groupnames may only be up to 16 characters long."
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr "Имена групп могут быть длиной не более 16 знаков."
 
@@ -8781,7 +8307,6 @@ msgstr ""
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: gpasswd.1.xml:49(phrase)
 #, fuzzy
-#| msgid "administer the <placeholder-1/> file"
 msgid "administer <placeholder-1/>"
 msgstr "управляет файлом <placeholder-1/>"
 
@@ -8886,8 +8411,6 @@ msgstr "Параметры командÑ
 
 #: gpasswd.1.xml:125(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
@@ -8904,9 +8427,6 @@ msgstr ""
 
 #: gpasswd.1.xml:138(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
@@ -8923,7 +8443,6 @@ msgstr ""
 
 #: gpasswd.1.xml:159(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
@@ -8936,7 +8455,6 @@ msgstr ""
 
 #: gpasswd.1.xml:174(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -8949,9 +8467,6 @@ msgstr ""
 
 #: gpasswd.1.xml:189(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -8967,9 +8482,6 @@ msgstr "список администрÐ
 
 #: gpasswd.1.xml:201(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -9034,12 +8546,6 @@ msgstr ""
 
 #: faillog.8.xml:54(para)
 #, fuzzy
-#| msgid ""
-#| "<command>faillog</command> formats the contents of the failure log from "
-#| "<filename>/var/log/faillog</filename> database. It also can be used for "
-#| "maintains failure counters and limits. Run <command>faillog</command> "
-#| "without arguments display only list of user faillog records who have ever "
-#| "had a login failure."
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -9067,7 +8573,6 @@ msgstr ""
 
 #: faillog.8.xml:77(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
@@ -9088,9 +8593,6 @@ msgstr ""
 
 #: faillog.8.xml:103(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
-#| "replaceable>"
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -9100,8 +8602,6 @@ msgstr ""
 
 #: faillog.8.xml:108(para)
 #, fuzzy
-#| msgid ""
-#| "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgid ""
 "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
@@ -9123,10 +8623,6 @@ msgstr ""
 
 #: faillog.8.xml:124(para)
 #, fuzzy
-#| msgid ""
-#| "Reset the counters of login failures or one record if used with the "
-#| "<option>-u</option><replaceable>LOGIN</replaceable> option. Write access "
-#| "to <filename>/var/log/faillog</filename> is required for this option."
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
@@ -9158,9 +8654,6 @@ msgstr ""
 
 #: faillog.8.xml:161(para)
 #, fuzzy
-#| msgid ""
-#| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-#| "The <option>-t</option> flag overrides the use of <option>-u</option>."
 msgid ""
 "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
@@ -9169,10 +8662,6 @@ msgstr ""
 
 #: faillog.8.xml:173(para)
 #, fuzzy
-#| msgid ""
-#| "Display faillog record or maintains failure counters and limits (if used "
-#| "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-#| "options) only for user with <replaceable>LOGIN</replaceable>."
 msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
@@ -9184,9 +8673,6 @@ msgstr ""
 
 #: faillog.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
-#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
 "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
 "option> options are used, <command>faillog</command> displays the faillog "
@@ -9244,14 +8730,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #: faillog.5.xml:49(para)
 #, fuzzy
-#| msgid ""
-#| "<filename>/var/log/faillog</filename> maintains a count of login failures "
-#| "and the limits for each account. The file is fixed length record, indexed "
-#| "by numerical UID. Each record contains the count of login failures since "
-#| "the last successful login; the maximum number of failures before the "
-#| "account is disabled; the line the last login failure occurred on; the "
-#| "date the last login failure occurred; and the time in seconds how long "
-#| "the account will be locked after a failure."
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
@@ -9337,11 +8815,6 @@ msgstr "изменяет регистрÐ
 # type: Content of: <refentry><refsect1><para>
 #: chsh.1.xml:63(para)
 #, fuzzy
-#| msgid ""
-#| "The <command>chsh</command> command changes the user login shell. This "
-#| "determines the name of the user's initial login command. A normal user "
-#| "may only change the login shell for her own account, the superuser may "
-#| "change the login shell for any account."
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
 "determines the name of the user's initial login command. A normal user may "
@@ -9499,9 +8972,6 @@ msgstr "Параметры командÑ
 
 #: chpasswd.8.xml:115(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
-#| "replaceable>"
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -9549,9 +9019,6 @@ msgstr ""
 
 #: chpasswd.8.xml:167(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -9561,9 +9028,6 @@ msgstr ""
 
 #: chpasswd.8.xml:187(para)
 #, fuzzy
-#| msgid ""
-#| "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable "
-#| "in the <filename>login.defs</filename> file."
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
@@ -9584,7 +9048,6 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para><filename>
 #: chpasswd.8.xml:244(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
@@ -10009,6 +9472,313 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Yuri Kozlov <kozlov.y at gmail.com>, 2005, 2006"
 
+#: vipw.8.xml:155(para)
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:297(para)
+msgid ""
+"Note: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgstr ""
+"Замечание: запись вида <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> пока не работает."
+
+#: useradd.8.xml:328(para)
+msgid "By default, no home directories are created."
+msgstr ""
+
+#: useradd.8.xml:371(para)
+#, fuzzy
+msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:407(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgstr ""
+
+#: pwconv.8.xml:181(para)
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+
+# type: Content of: <refentry><refsect1><para>
+#: pwck.8.xml:84(para)
+#, fuzzy
+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 ""
+"Программа <command>pwck</command> проверяет корректность аутентификационной "
+"информации в системе. Проверяется формат всех записей файлов <filename>/etc/"
+"passwd</filename> и <filename>/etc/shadow</filename> и допустимость данных "
+"каждого поля. В случае обнаружения ошибок пользователю предлагается "
+"подтвердить удаление записей, имеющих неверный формат или восстановление "
+"которых невозможно."
+
+#: 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 ""
+"По умолчанию, команда <command>pwck</command> работает с файлами <filename>/"
+"etc/passwd</filename> и <filename>/etc/shadow</filename>. Пользователь может "
+"указать другие файлы с помощью параметров <emphasis remap=\"I\">passwd</"
+"emphasis> и <emphasis remap=\"I\">shadow</emphasis>"
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: newusers.8.xml:270(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
+msgid ""
+"This will most likely be overriden by PAM, since the default pam_unix module "
+"has it's own built in of 3 retries. However, this is a safe fallback in case "
+"you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgstr ""
+
+#: login.defs.5.xml:240(para)
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
+msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: login.defs.5.xml:423(para)
+#, fuzzy
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+msgstr ""
+"GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
+"UMASK"
+
+#: login.defs.5.xml:436(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+msgstr ""
+
+#: login.defs.5.xml:445(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: groupadd.8.xml:174(para)
+msgid ""
+"The numeric identifiers of new system groups are choosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
+msgstr ""
+
+#: faillog.8.xml:86(term)
+msgid ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+msgstr ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>СЕКУНД</"
+"replaceable>"
+
+#: faillog.8.xml:179(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: chsh.1.xml:63(para)
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account, the superuser may change "
+"the login shell for any account."
+msgstr ""
+"Программа <command>chsh</command> изменяет регистрационную оболочку "
+"пользователя. Она определяет какая команда будет запущена после регистрации "
+"пользователя в системе. Обычный пользователь может изменять регистрационную "
+"оболочку только для своей учётной записи, суперпользователь может изменять "
+"регистрационную оболочку любой учётной записи."
+
+# type: Content of: <refentry><refsect1><para>
+#: chpasswd.8.xml:71(para)
+#, fuzzy
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
+msgstr ""
+"По умолчанию, передаваемый пароль должен быть в виде обычного текста. "
+"Алгоритмом шифрования по умолчанию является DES. Также, если есть срок "
+"устаревания пароля, то он будет обновлён."
+
+#: chpasswd.8.xml:82(para)
+msgid ""
+"<command>chpasswd</command> first update the password in memory, and then "
+"commit all the changes to disk if no errors occured for any users."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: chpasswd.8.xml:89(para)
+#, fuzzy
+msgid "The supplied passwords must be in clear-text."
+msgstr "Передаваемые пароли заданы в шифрованном виде."
+
+#: chpasswd.8.xml:92(para)
+msgid ""
+"PAM is used to update the password in the system database according to the "
+"PAM chpasswd configuration."
+msgstr ""
+
+#: chpasswd.8.xml:96(para)
+msgid ""
+"When <command>chpasswd</command> fails to update a password, it continues "
+"updating the passwords of the next users, and will return an error code on "
+"exit."
+msgstr ""
+
+#: chpasswd.8.xml:239(para)
+#, fuzzy
+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 ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
 #, fuzzy
 #~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -10041,57 +9811,6 @@ msgstr "Yuri Kozlov <kozlov.y at gmail.com>
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#~ 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>."
-#~ 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>."
-
-#~ msgid ""
-#~ "Note: <option>-K </option><replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> doesn't work yet."
-#~ msgstr ""
-#~ "Замечание: запись вида <option>-K </option><replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> пока не работает."
-
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-#~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~| msgid "Supplied passwords are in encrypted form."
-#~ msgid "The supplied passwords must be in clear-text."
-#~ msgstr "Передаваемые пароли заданы в шифрованном виде."
-
 #, fuzzy
 #~ msgid "and <placeholder-1/> files"
 #~ msgstr "-a <placeholder-1/>"
diff -pruN 1:4.1.4.2+svn3283-2/man/po/shadow-man-pages.pot 1:4.1.4.2+svn3283-2ubuntu1/man/po/shadow-man-pages.pot
--- 1:4.1.4.2+svn3283-2/man/po/shadow-man-pages.pot	2010-08-29 16:54:41.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/man/po/shadow-man-pages.pot	2010-11-24 14:47:24.000000000 +0000
@@ -9,15 +9,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command) login.defs.5.xml:477(term)
+#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
+#: login.defs.5.xml:477(term)
 msgid "vipw"
 msgstr ""
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum) userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable) useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum) pwck.8.xml:44(manvolnum) nologin.8.xml:35(manvolnum) newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum) lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum) groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum) groupdel.8.xml:39(manvolnum) groupdel.8.xml:130(replaceable) groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum) faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum) chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
+#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
+#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
+#: pwck.8.xml:44(manvolnum) nologin.8.xml:35(manvolnum)
+#: newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum)
+#: lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum)
+#: groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum)
+#: groupdel.8.xml:39(manvolnum) groupdel.8.xml:130(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
+#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
+#: chgpasswd.8.xml:43(manvolnum)
 msgid "8"
 msgstr ""
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo) userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo) pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(refmiscinfo) nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo) logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo) grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo) groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo) groupadd.8.xml:43(refmiscinfo) faillog.8.xml:36(refmiscinfo) chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
+#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
+#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(refmiscinfo)
+#: nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo)
+#: logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo)
+#: grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo)
+#: groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
+#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
 msgid "System Management Commands"
 msgstr ""
 
@@ -29,24 +48,63 @@ msgstr ""
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr ""
 
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable) usermod.8.xml:54(replaceable) userdel.8.xml:54(arg) useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable) su.1.xml:66(replaceable) passwd.1.xml:57(replaceable) newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable) faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable) chage.1.xml:50(replaceable)
+#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable)
+#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
+#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
+#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
+#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
+#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
+#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
+#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
+#: chage.1.xml:50(replaceable)
 msgid "options"
 msgstr ""
 
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title) useradd.8.xml:82(title) suauth.5.xml:50(title) su.1.xml:77(title) sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title) shadow.3.xml:149(title) pwconv.8.xml:71(title) pwck.8.xml:86(title) porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title) nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title) logoutd.8.xml:50(title) login.defs.5.xml:110(title) login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title) lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title) groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title) groupdel.8.xml:57(title) groupadd.8.xml:63(title) gpasswd.1.xml:72(title) faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title) chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title) chfn.1.xml:63(title) chage.1.xml:59(title)
+#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
+#: useradd.8.xml:82(title) suauth.5.xml:50(title) su.1.xml:77(title)
+#: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:71(title) pwck.8.xml:86(title)
+#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
+#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
+#: logoutd.8.xml:50(title) login.defs.5.xml:110(title)
+#: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
+#: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
+#: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:63(title) gpasswd.1.xml:72(title)
+#: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
+#: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
+#: chfn.1.xml:63(title) chage.1.xml:59(title)
 msgid "DESCRIPTION"
 msgstr ""
 
 #: vipw.8.xml:68(para)
-msgid "The <command>vipw</command> and <command>vigr</command> commands edits the files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, respectively. With the <option>-s</option> flag, they will edit the shadow versions of those files, <filename>/etc/shadow</filename> and <filename>/etc/gshadow</filename>, respectively. The programs will set the appropriate locks to prevent file corruption. When looking for an editor, the programs will first try the environment variable <envar>$VISUAL</envar>, then the environment variable <envar>$EDITOR</envar>, and finally the default editor, <citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
-msgstr ""
-
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title) useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title) passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title) lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title) groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title) faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title) chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+msgid ""
+"The <command>vipw</command> and <command>vigr</command> commands edits the "
+"files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
+"respectively. With the <option>-s</option> flag, they will edit the shadow "
+"versions of those files, <filename>/etc/shadow</filename> and <filename>/etc/"
+"gshadow</filename>, respectively. The programs will set the appropriate "
+"locks to prevent file corruption. When looking for an editor, the programs "
+"will first try the environment variable <envar>$VISUAL</envar>, then the "
+"environment variable <envar>$EDITOR</envar>, and finally the default editor, "
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
+#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
+#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
+#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
+#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
 msgid "OPTIONS"
 msgstr ""
 
 #: vipw.8.xml:86(para)
-msgid "The options which apply to the <command>vipw</command> and <command>vigr</command> commands are:"
+msgid ""
+"The options which apply to the <command>vipw</command> and <command>vigr</"
+"command> commands are:"
 msgstr ""
 
 #: vipw.8.xml:92(term)
@@ -57,11 +115,19 @@ msgstr ""
 msgid "Edit group database."
 msgstr ""
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term) passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term) groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term) gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term) chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
+#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
+#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
+#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
+#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr ""
 
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para) passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para) groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para) gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para) chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
+#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
+#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
+#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
+#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
 msgid "Display help message and exit."
 msgstr ""
 
@@ -97,20 +163,43 @@ msgstr ""
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr ""
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title) useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title) newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title) groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title) chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title) chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
+#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
+#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
+#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
+#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
+#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
+#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
+#: chfn.1.xml:99(title) chage.1.xml:210(title)
 msgid "CONFIGURATION"
 msgstr ""
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para) useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para) groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para) chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para) chage.1.xml:211(para)
-msgid "The following configuration variables in <filename>/etc/login.defs</filename> change the behavior of this tool:"
-msgstr ""
-
-#: vipw.8.xml:30(term) usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term) pwconv.8.xml:30(term) pwck.8.xml:30(term) login.defs.5.xml:30(term) chage.1.xml:30(term)
+#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
+#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
+#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
+#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
+#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
+#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
+#: chage.1.xml:211(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: vipw.8.xml:30(term) usermod.8.xml:30(term) userdel.8.xml:30(term)
+#: useradd.8.xml:30(term) pwconv.8.xml:30(term) pwck.8.xml:30(term)
+#: login.defs.5.xml:30(term) chage.1.xml:30(term)
 msgid "<option>USE_TCB</option> (boolean)"
 msgstr ""
 
-#: vipw.8.xml:32(para) usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para) pwconv.8.xml:32(para) pwck.8.xml:32(para) login.defs.5.xml:32(para) chage.1.xml:32(para)
-msgid "If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing scheme will be used."
+#: vipw.8.xml:32(para) usermod.8.xml:32(para) userdel.8.xml:32(para)
+#: useradd.8.xml:32(para) pwconv.8.xml:32(para) pwck.8.xml:32(para)
+#: login.defs.5.xml:32(para) chage.1.xml:32(para)
+msgid ""
+"If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing "
+"scheme will be used."
 msgstr ""
 
 #: vipw.8.xml:143(title)
@@ -133,51 +222,139 @@ msgstr ""
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr ""
 
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title) useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title) sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title) pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title) passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title) newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title) login.1.xml:316(title) limits.5.xml:170(title) lastlog.8.xml:147(title) gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title) groupmod.8.xml:164(title) groupmems.8.xml:174(title) groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title) faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title) chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title) chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
+#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
+#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
+#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title)
+#: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
+#: login.1.xml:316(title) limits.5.xml:170(title) lastlog.8.xml:147(title)
+#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
+#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
+#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
+#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
+#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
+#: chfn.1.xml:113(title) chage.1.xml:222(title)
 msgid "FILES"
 msgstr ""
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename) userdel.8.xml:147(filename) useradd.8.xml:670(filename) sg.1.xml:103(filename) pwck.8.xml:250(filename) newusers.8.xml:372(filename) newgrp.1.xml:114(filename) gshadow.5.xml:144(filename) grpck.8.xml:188(filename) groups.1.xml:78(filename) groupmod.8.xml:167(filename) groupmems.8.xml:177(filename) groupdel.8.xml:92(filename) groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename) gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename) chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
+#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
+#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
+#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
+#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
+#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
+#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
+#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
+#: chgpasswd.8.xml:187(filename)
 msgid "/etc/group"
 msgstr ""
 
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para) useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para) newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para) grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para) groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para) gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
+#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
+#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
+#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
+#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
+#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
 msgid "Group account information."
 msgstr ""
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename) useradd.8.xml:676(filename) sg.1.xml:109(filename) newusers.8.xml:378(filename) newgrp.1.xml:120(filename) gshadow.5.xml:150(filename) grpck.8.xml:194(filename) groupmod.8.xml:173(filename) groupmems.8.xml:183(filename) groupdel.8.xml:98(filename) groupadd.8.xml:208(filename) gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename) chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
+#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
+#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
+#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
+#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
+#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
+#: chgpasswd.8.xml:193(filename)
 msgid "/etc/gshadow"
 msgstr ""
 
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para) sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para) gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para) groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para) chgpasswd.8.xml:195(para)
+#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
+#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
+#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
+#: chgpasswd.8.xml:195(para)
 msgid "Secure group account information."
 msgstr ""
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename) userdel.8.xml:159(filename) useradd.8.xml:658(filename) su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename) pwck.8.xml:256(filename) passwd.5.xml:119(filename) passwd.1.xml:377(filename) newusers.8.xml:360(filename) newgrp.1.xml:102(filename) login.1.xml:331(filename) grpck.8.xml:200(filename) expiry.1.xml:71(filename) chsh.1.xml:136(filename) chpasswd.8.xml:226(filename) chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
+#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
+#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
+#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
+#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
+#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
+#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
 msgid "/etc/passwd"
 msgstr ""
 
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para) useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para) shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para) passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para) login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para) chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para) chage.1.xml:229(para)
+#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
+#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
+#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
+#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
+#: chage.1.xml:229(para)
 msgid "User account information."
 msgstr ""
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename) userdel.8.xml:165(filename) useradd.8.xml:664(filename) su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename) shadow.3.xml:204(filename) pwck.8.xml:262(filename) passwd.5.xml:125(filename) passwd.1.xml:383(filename) newusers.8.xml:366(filename) newgrp.1.xml:108(filename) login.1.xml:337(filename) expiry.1.xml:77(filename) chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
+#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
+#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
+#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
+#: login.1.xml:337(filename) expiry.1.xml:77(filename)
+#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
 msgid "/etc/shadow"
 msgstr ""
 
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para) useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para) shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para) passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para) login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para) chage.1.xml:237(para)
+#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
+#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
+#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
+#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
+#: chage.1.xml:237(para)
 msgid "Secure user account information."
 msgstr ""
 
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title) useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title) sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title) pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title) passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title) newusers.8.xml:399(title) newgrp.1.xml:129(title) login.defs.5.xml:504(title) login.access.5.xml:108(title) login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title) grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title) groupmems.8.xml:192(title) groupdel.8.xml:146(title) groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title) faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title) chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title) chage.1.xml:277(title)
+#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
+#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
+#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
+#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
+#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
+#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
+#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
+#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
+#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
+#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
+#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
+#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
+#: chage.1.xml:277(title)
 msgid "SEE ALSO"
 msgstr ""
 
 #: vipw.8.xml:192(para)
-msgid "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry><citerefentry condition=\"tcb\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry condition=\"tcb\"><refentrytitle>tcb</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry condition=\"tcb"
+"\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
+"condition=\"tcb\"><refentrytitle>tcb</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname) usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
+#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
 msgid "usermod"
 msgstr ""
 
@@ -185,12 +362,16 @@ msgstr ""
 msgid "modify a user account"
 msgstr ""
 
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable) useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable) chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
+#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
+#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
 msgid "LOGIN"
 msgstr ""
 
 #: usermod.8.xml:62(para)
-msgid "The <command>usermod</command> command modifies the system account files to reflect the changes that are specified on the command line."
+msgid ""
+"The <command>usermod</command> command modifies the system account files to "
+"reflect the changes that are specified on the command line."
 msgstr ""
 
 #: usermod.8.xml:70(para)
@@ -202,19 +383,28 @@ msgid "<option>-a</option>, <option>--ap
 msgstr ""
 
 #: usermod.8.xml:80(para)
-msgid "Add the user to the supplementary group(s). Use only with the <option>-G</option> option."
+msgid ""
+"Add the user to the supplementary group(s). Use only with the <option>-G</"
+"option> option."
 msgstr ""
 
 #: usermod.8.xml:87(term) useradd.8.xml:128(term)
-msgid "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</replaceable>"
+msgid ""
+"<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
+"replaceable>"
 msgstr ""
 
 #: usermod.8.xml:92(para)
-msgid "The new value of the user's password file comment field. It is normally modified using the <citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry> utility."
+msgid ""
+"The new value of the user's password file comment field. It is normally "
+"modified using the <citerefentry><refentrytitle>chfn</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> utility."
 msgstr ""
 
 #: usermod.8.xml:101(term) useradd.8.xml:141(term)
-msgid "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</replaceable>"
+msgid ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+"replaceable>"
 msgstr ""
 
 #: usermod.8.xml:106(para)
@@ -222,63 +412,100 @@ msgid "The user's new login directory."
 msgstr ""
 
 #: usermod.8.xml:109(para)
-msgid "If the <option>-m</option> option is given, the contents of the current home directory will be moved to the new home directory, which is created if it does not already exist."
+msgid ""
+"If the <option>-m</option> option is given, the contents of the current home "
+"directory will be moved to the new home directory, which is created if it "
+"does not already exist."
 msgstr ""
 
 #: usermod.8.xml:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
-msgid "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</replaceable>"
+msgid ""
+"<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
+"replaceable>"
 msgstr ""
 
 #: usermod.8.xml:123(para) useradd.8.xml:173(para)
-msgid "The date on which the user account will be disabled. The date is specified in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
+msgid ""
+"The date on which the user account will be disabled. The date is specified "
+"in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
 msgstr ""
 
 #: usermod.8.xml:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
-msgid "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</replaceable>"
+msgid ""
+"<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
+"replaceable>"
 msgstr ""
 
 #: usermod.8.xml:135(para)
-msgid "The number of days after a password expires until the account is permanently disabled."
+msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled."
 msgstr ""
 
 #: usermod.8.xml:139(para)
-msgid "A value of 0 disables the account as soon as the password has expired, and a value of -1 disables the feature."
+msgid ""
+"A value of 0 disables the account as soon as the password has expired, and a "
+"value of -1 disables the feature."
 msgstr ""
 
 #: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
-msgid "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 
 #: usermod.8.xml:152(para)
-msgid "The group name or number of the user's new initial login group. The group must exist."
+msgid ""
+"The group name or number of the user's new initial login group. The group "
+"must exist."
 msgstr ""
 
 #: usermod.8.xml:156(para)
-msgid "Any file from the user's home directory owned by the previous primary group of the user will be owned by this new group."
+msgid ""
+"Any file from the user's home directory owned by the previous primary group "
+"of the user will be owned by this new group."
 msgstr ""
 
 #: usermod.8.xml:160(para)
-msgid "The group ownership of files outside of the user's home directory must be fixed manually."
+msgid ""
+"The group ownership of files outside of the user's home directory must be "
+"fixed manually."
 msgstr ""
 
 #: usermod.8.xml:167(term) useradd.8.xml:234(term)
-msgid "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I\">,GROUPN</emphasis>]]]"
+msgid ""
+"<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
+"replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
+"\">,GROUPN</emphasis>]]]"
 msgstr ""
 
 #: usermod.8.xml:172(para)
-msgid "A list of supplementary groups which the user is also a member of. Each group is separated from the next by a comma, with no intervening whitespace. The groups are subject to the same restrictions as the group given with the <option>-g</option> option."
+msgid ""
+"A list of supplementary groups which the user is also a member of. Each "
+"group is separated from the next by a comma, with no intervening whitespace. "
+"The groups are subject to the same restrictions as the group given with the "
+"<option>-g</option> option."
 msgstr ""
 
 #: usermod.8.xml:179(para)
-msgid "If the user is currently a member of a group which is not listed, the user will be removed from the group. This behaviour can be changed via the <option>-a</option> option, which appends the user to the current supplementary group list."
+msgid ""
+"If the user is currently a member of a group which is not listed, the user "
+"will be removed from the group. This behaviour can be changed via the "
+"<option>-a</option> option, which appends the user to the current "
+"supplementary group list."
 msgstr ""
 
 #: usermod.8.xml:188(term)
-msgid "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</replaceable>"
+msgid ""
+"<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
+"replaceable>"
 msgstr ""
 
 #: usermod.8.xml:193(para)
-msgid "The name of the user will be changed from <replaceable>LOGIN</replaceable> to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In particular, the user's home directory name should probably be changed manually to reflect the new login name."
+msgid ""
+"The name of the user will be changed from <replaceable>LOGIN</replaceable> "
+"to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In "
+"particular, the user's home directory name should probably be changed "
+"manually to reflect the new login name."
 msgstr ""
 
 #: usermod.8.xml:203(term)
@@ -286,11 +513,17 @@ msgid "<option>-L</option>, <option>--lo
 msgstr ""
 
 #: usermod.8.xml:207(para)
-msgid "Lock a user's password. This puts a '!' in front of the encrypted password, effectively disabling the password. You can't use this option with <option>-p</option> or <option>-U</option>."
+msgid ""
+"Lock a user's password. This puts a '!' in front of the encrypted password, "
+"effectively disabling the password. You can't use this option with <option>-"
+"p</option> or <option>-U</option>."
 msgstr ""
 
 #: usermod.8.xml:213(para)
-msgid "Note: if you wish to lock the account (not only access with a password), you should also set the <replaceable>EXPIRE_DATE</replaceable> to <replaceable>1</replaceable>."
+msgid ""
+"Note: if you wish to lock the account (not only access with a password), you "
+"should also set the <replaceable>EXPIRE_DATE</replaceable> to "
+"<replaceable>1</replaceable>."
 msgstr ""
 
 #: usermod.8.xml:222(term)
@@ -302,51 +535,78 @@ msgid "Move the content of the user's ho
 msgstr ""
 
 #: usermod.8.xml:230(para)
-msgid "This option is only valid in combination with the <option>-d</option> (or <option>--home</option>) option."
+msgid ""
+"This option is only valid in combination with the <option>-d</option> (or "
+"<option>--home</option>) option."
 msgstr ""
 
 #: usermod.8.xml:234(para)
-msgid "<command>usermod</command> will try to adapt the ownership of the files and to copy the modes, ACL and extended attributes, but manual changes might be needed afterwards."
+msgid ""
+"<command>usermod</command> will try to adapt the ownership of the files and "
+"to copy the modes, ACL and extended attributes, but manual changes might be "
+"needed afterwards."
 msgstr ""
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term) groupadd.8.xml:134(term)
+#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
+#: groupadd.8.xml:134(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr ""
 
 #: usermod.8.xml:246(para)
-msgid "When used with the <option>-u</option> option, this option allows to change the user ID to a non-unique value."
+msgid ""
+"When used with the <option>-u</option> option, this option allows to change "
+"the user ID to a non-unique value."
 msgstr ""
 
-#: usermod.8.xml:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term) groupadd.8.xml:144(term)
-msgid "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</replaceable>"
+#: usermod.8.xml:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
+#: groupadd.8.xml:144(term)
+msgid ""
+"<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
+"replaceable>"
 msgstr ""
 
 #: usermod.8.xml:258(para) groupmod.8.xml:132(para)
-msgid "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>."
+msgid ""
+"The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para) groupadd.8.xml:154(para)
-msgid "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended because the password (or encrypted password) will be visible by users listing the processes."
+#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
+#: groupadd.8.xml:154(para)
+msgid ""
+"<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
+"because the password (or encrypted password) will be visible by users "
+"listing the processes."
 msgstr ""
 
 #: usermod.8.xml:268(para)
-msgid "The password will be written in the local <filename>/etc/passwd</filename> or <filename>/etc/shadow</filename> file. This might differ from the password database configured in your PAM configuration."
-msgstr ""
-
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para) groupadd.8.xml:159(para)
-msgid "You should make sure the password respects the system's password policy."
-msgstr ""
-
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term) su.1.xml:157(term) chsh.1.xml:85(term)
-msgid "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
+msgid ""
+"The password will be written in the local <filename>/etc/passwd</filename> "
+"or <filename>/etc/shadow</filename> file. This might differ from the "
+"password database configured in your PAM configuration."
+msgstr ""
+
+#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
+#: groupadd.8.xml:159(para)
+msgid ""
+"You should make sure the password respects the system's password policy."
+msgstr ""
+
+#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
+#: su.1.xml:157(term) chsh.1.xml:85(term)
+msgid ""
+"<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 
 #: usermod.8.xml:286(para) chsh.1.xml:89(para)
-msgid "The name of the user's new login shell. Setting this field to blank causes the system to select the default login shell."
+msgid ""
+"The name of the user's new login shell. Setting this field to blank causes "
+"the system to select the default login shell."
 msgstr ""
 
 #: usermod.8.xml:293(term) useradd.8.xml:450(term)
-msgid "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+msgid ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 
 #: usermod.8.xml:298(para)
@@ -354,15 +614,23 @@ msgid "The new numerical value of the us
 msgstr ""
 
 #: usermod.8.xml:301(para)
-msgid "This value must be unique, unless the <option>-o</option> option is used. The value must be non-negative. Values between 0 and 999 are typically reserved for system accounts."
+msgid ""
+"This value must be unique, unless the <option>-o</option> option is used. "
+"The value must be non-negative. Values between 0 and 999 are typically "
+"reserved for system accounts."
 msgstr ""
 
 #: usermod.8.xml:307(para)
-msgid "The user's mailbox, and any files which the user owns and which are located in the user's home directory will have the file user ID changed automatically."
+msgid ""
+"The user's mailbox, and any files which the user owns and which are located "
+"in the user's home directory will have the file user ID changed "
+"automatically."
 msgstr ""
 
 #: usermod.8.xml:312(para)
-msgid "The ownership of files outside of the user's home directory must be fixed manually."
+msgid ""
+"The ownership of files outside of the user's home directory must be fixed "
+"manually."
 msgstr ""
 
 #: usermod.8.xml:319(term)
@@ -370,106 +638,220 @@ msgid "<option>-U</option>, <option>--un
 msgstr ""
 
 #: usermod.8.xml:323(para)
-msgid "Unlock a user's password. This removes the '!' in front of the encrypted password. You can't use this option with <option>-p</option> or <option>-L</option>."
+msgid ""
+"Unlock a user's password. This removes the '!' in front of the encrypted "
+"password. You can't use this option with <option>-p</option> or <option>-L</"
+"option>."
 msgstr ""
 
 #: usermod.8.xml:328(para)
-msgid "Note: if you wish to unlock the account (not only access with a password), you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example to <replaceable>99999</replaceable>, or to the <option>EXPIRE</option> value from <filename>/etc/default/useradd</filename>)."
+msgid ""
+"Note: if you wish to unlock the account (not only access with a password), "
+"you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example "
+"to <replaceable>99999</replaceable>, or to the <option>EXPIRE</option> value "
+"from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
 #: usermod.8.xml:339(term) useradd.8.xml:482(term)
-msgid "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</replaceable>"
+msgid ""
+"<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
+"replaceable>"
 msgstr ""
 
 #: usermod.8.xml:344(para)
-msgid "The SELinux user for the user's login. The default is to leave this field the blank, which causes the system to select the default SELinux user."
+msgid ""
+"The SELinux user for the user's login. The default is to leave this field "
+"the blank, which causes the system to select the default SELinux user."
 msgstr ""
 
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title) su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title) newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title) groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title) faillog.8.xml:199(title) chpasswd.8.xml:199(title) chgpasswd.8.xml:157(title)
+#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
+#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
+#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
+#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
+#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
+#: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
 msgstr ""
 
 #: usermod.8.xml:356(para)
-msgid "You must make certain that the named user is not executing any processes when this command is being executed if the user's numerical user ID, the user's name, or the user's home directory is being changed. <command>usermod</command> checks this on Linux, but only check if the user is logged in according to utmp on other architectures."
+msgid ""
+"You must make certain that the named user is not executing any processes "
+"when this command is being executed if the user's numerical user ID, the "
+"user's name, or the user's home directory is being changed. "
+"<command>usermod</command> checks this on Linux, but only check if the user "
+"is logged in according to utmp on other architectures."
 msgstr ""
 
 #: usermod.8.xml:364(para)
-msgid "You must change the owner of any <command>crontab</command> files or <command>at</command> jobs manually."
+msgid ""
+"You must change the owner of any <command>crontab</command> files or "
+"<command>at</command> jobs manually."
 msgstr ""
 
 #: usermod.8.xml:368(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 
-#: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term) su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: 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)
 msgid "<option>MAIL_DIR</option> (string)"
 msgstr ""
 
-#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "The mail spool directory. This is needed to manipulate the mailbox when its corresponding user account is modified or deleted. If not specified, a compile-time default is used."
+#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"The mail spool directory. This is needed to manipulate the mailbox when its "
+"corresponding user account is modified or deleted. If not specified, a "
+"compile-time default is used."
 msgstr ""
 
-#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term) su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
+#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term)
+#: su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
 msgid "<option>MAIL_FILE</option> (string)"
 msgstr ""
 
-#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para) su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
-msgid "Defines the location of the users mail spool files relatively to their home directory."
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
+msgid ""
+"Defines the location of the users mail spool files relatively to their home "
+"directory."
 msgstr ""
 
 #. FIXME: MAIL_FILE not used in useradd
-#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para) su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
-msgid "The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are used by <command>useradd</command>, <command>usermod</command>, and <command>userdel</command> to create, move, or delete the user's mail spool."
-msgstr ""
-
-#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para) su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
-msgid "If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</replaceable>, they are also used to define the <envar>MAIL</envar> environment variable."
-msgstr ""
-
-#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term) pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term) grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term) groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term) chgpasswd.8.xml:30(term)
+#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para)
+#: su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
+msgid ""
+"The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are "
+"used by <command>useradd</command>, <command>usermod</command>, and "
+"<command>userdel</command> to create, move, or delete the user's mail spool."
+msgstr ""
+
+#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para)
+#: su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
+msgid ""
+"If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</"
+"replaceable>, they are also used to define the <envar>MAIL</envar> "
+"environment variable."
+msgstr ""
+
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term)
+#: groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term)
+#: chgpasswd.8.xml:30(term)
 msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
 msgstr ""
 
-#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para) pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para) grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para) groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para) chgpasswd.8.xml:32(para)
-msgid "Maximum members per group entry. When the maximum is reached, a new group entry (line) is started in <filename>/etc/group</filename> (with the same name, same password, and same GID)."
-msgstr ""
-
-#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para) pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para) grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para) groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para) chgpasswd.8.xml:37(para)
-msgid "The default value is 0, meaning that there are no limits in the number of members in a group."
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para)
+#: groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para)
+#: chgpasswd.8.xml:32(para)
+msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para)
+#: pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para)
+#: grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para)
+#: groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para)
+#: chgpasswd.8.xml:37(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
 msgstr ""
 
 #. Note: on HP, split groups have the same ID, but different
 #.                names.
-#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para) pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para) grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para) groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para) chgpasswd.8.xml:43(para)
-msgid "This feature (split group) permits to limit the length of lines in the group file. This is useful to make sure that lines for NIS groups are not larger than 1024 characters."
-msgstr ""
-
-#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para) pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para) grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para) groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para) chgpasswd.8.xml:48(para)
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para)
+#: groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para)
+#: chgpasswd.8.xml:43(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para)
+#: pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para)
+#: grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para)
+#: groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para)
+#: chgpasswd.8.xml:48(para)
 msgid "If you need to enforce such limit, you can use 25."
 msgstr ""
 
-#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para) pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para) grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para) groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para) chgpasswd.8.xml:51(para)
-msgid "Note: split groups may not be supported by all tools (even in the Shadow toolsuite). You should not use this variable unless you really need it."
+#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para)
+#: pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para)
+#: grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para)
+#: groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para)
+#: chgpasswd.8.xml:51(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite). You should not use this variable unless you really need it."
 msgstr ""
 
-#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term) pwck.8.xml:30(term) login.defs.5.xml:30(term)
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwck.8.xml:30(term) login.defs.5.xml:30(term)
 msgid "<option>TCB_SYMLINKS</option> (boolean)"
 msgstr ""
 
-#: usermod.8.xml:37(programlisting) userdel.8.xml:37(programlisting) useradd.8.xml:37(programlisting) pwck.8.xml:37(programlisting) login.defs.5.xml:37(programlisting)
+#: usermod.8.xml:37(programlisting) userdel.8.xml:37(programlisting)
+#: useradd.8.xml:37(programlisting) pwck.8.xml:37(programlisting)
+#: login.defs.5.xml:37(programlisting)
 #, no-wrap
-msgid "\nif ( UID is less than 1000) {\n  use /etc/tcb/user\n} else if ( UID is less than 1000000) {\n  kilos = UID / 1000\n  use /etc/tcb/:kilos/user\n  make symlink /etc/tcb/user to the above directory\n} else {\n  megas = UID / 1000000\n  kilos = ( UID / megas * 1000000 ) / 1000\n  use /etc/tcb/:megas/:kilos/user\n  make symlink /etc/tcb/user to the above directory\n}\n      "
-msgstr ""
-
-#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para) pwck.8.xml:32(para) login.defs.5.xml:32(para)
-msgid "If <replaceable>yes</replaceable>, the location of the user tcb directory to be created will not be automatically set to /etc/tcb/user, but will be computed depending on the UID of the user, according to the following algorithm: <placeholder-1/>"
+msgid ""
+"\n"
+"if ( UID is less than 1000) {\n"
+"  use /etc/tcb/user\n"
+"} else if ( UID is less than 1000000) {\n"
+"  kilos = UID / 1000\n"
+"  use /etc/tcb/:kilos/user\n"
+"  make symlink /etc/tcb/user to the above directory\n"
+"} else {\n"
+"  megas = UID / 1000000\n"
+"  kilos = ( UID / megas * 1000000 ) / 1000\n"
+"  use /etc/tcb/:megas/:kilos/user\n"
+"  make symlink /etc/tcb/user to the above directory\n"
+"}\n"
+"      "
+msgstr ""
+
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwck.8.xml:32(para) login.defs.5.xml:32(para)
+msgid ""
+"If <replaceable>yes</replaceable>, the location of the user tcb directory to "
+"be created will not be automatically set to /etc/tcb/user, but will be "
+"computed depending on the UID of the user, according to the following "
+"algorithm: <placeholder-1/>"
 msgstr ""
 
 #: usermod.8.xml:420(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname) userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
+#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
 msgid "userdel"
 msgstr ""
 
@@ -478,7 +860,10 @@ msgid "delete a user account and related
 msgstr ""
 
 #: userdel.8.xml:63(para)
-msgid "The <command>userdel</command> command modifies the system account files, deleting all entries that refer to the user name <emphasis remap=\"I\">LOGIN</emphasis>. The named user must exist."
+msgid ""
+"The <command>userdel</command> command modifies the system account files, "
+"deleting all entries that refer to the user name <emphasis remap=\"I"
+"\">LOGIN</emphasis>. The named user must exist."
 msgstr ""
 
 #: userdel.8.xml:72(para)
@@ -490,11 +875,21 @@ msgid "<option>-f</option>, <option>--fo
 msgstr ""
 
 #: userdel.8.xml:81(para)
-msgid "This option forces the removal of the user account, even if the user is still logged in. It also forces <command>userdel</command> to remove the user's home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user. If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</emphasis> in <filename>/etc/login.defs</filename> and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user."
+msgid ""
+"This option forces the removal of the user account, even if the user is "
+"still logged in. It also forces <command>userdel</command> to remove the "
+"user's home directory and mail spool, even if another user uses the same "
+"home directory or if the mail spool is not owned by the specified user. If "
+"<option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
+"emphasis> in <filename>/etc/login.defs</filename> and if a group exists with "
+"the same name as the deleted user, then this group will be removed, even if "
+"it is still the primary group of another user."
 msgstr ""
 
 #: userdel.8.xml:94(para)
-msgid "<emphasis>Note:</emphasis> This option is dangerous and may leave your system in an inconsistent state."
+msgid ""
+"<emphasis>Note:</emphasis> This option is dangerous and may leave your "
+"system in an inconsistent state."
 msgstr ""
 
 #: userdel.8.xml:107(term)
@@ -502,11 +897,16 @@ msgid "<option>-r</option>, <option>--re
 msgstr ""
 
 #: userdel.8.xml:111(para)
-msgid "Files in the user's home directory will be removed along with the home directory itself and the user's mail spool. Files located in other file systems will have to be searched for and deleted manually."
+msgid ""
+"Files in the user's home directory will be removed along with the home "
+"directory itself and the user's mail spool. Files located in other file "
+"systems will have to be searched for and deleted manually."
 msgstr ""
 
 #: userdel.8.xml:117(para)
-msgid "The mail spool is defined by the <option>MAIL_DIR</option> variable in the <filename>login.defs</filename> file."
+msgid ""
+"The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
+"<filename>login.defs</filename> file."
 msgstr ""
 
 #: userdel.8.xml:33(term) login.defs.5.xml:33(term)
@@ -514,7 +914,10 @@ msgid "<option>USERDEL_CMD</option> (str
 msgstr ""
 
 #: userdel.8.xml:35(para) login.defs.5.xml:35(para)
-msgid "If defined, this command is run when removing a user. It should remove any at/cron/print jobs etc. owned by the user to be removed (passed as the first argument)."
+msgid ""
+"If defined, this command is run when removing a user. It should remove any "
+"at/cron/print jobs etc. owned by the user to be removed (passed as the first "
+"argument)."
 msgstr ""
 
 #: userdel.8.xml:40(para) login.defs.5.xml:40(para)
@@ -523,46 +926,109 @@ msgstr ""
 
 #: userdel.8.xml:46(programlisting) login.defs.5.xml:46(programlisting)
 #, no-wrap
-msgid "\n#! /bin/sh\n\n# Check for the required argument.\nif [ $# != 1 ]; then\n\techo \"Usage: $0 username\"\n\texit 1\nfi\n\n# Remove cron jobs.\ncrontab -r -u $1\n\n# Remove at jobs.\n# Note that it will remove any jobs owned by the same UID,\n# even if it was shared by a different username.\nAT_SPOOL_DIR=/var/spool/cron/atjobs\nfind $AT_SPOOL_DIR -name \"[^.]*\" -type f -user $1 -delete \\;\n\n# Remove print jobs.\nlprm $1\n\n# All done.\nexit 0\n      "
+msgid ""
+"\n"
+"#! /bin/sh\n"
+"\n"
+"# Check for the required argument.\n"
+"if [ $# != 1 ]; then\n"
+"\techo \"Usage: $0 username\"\n"
+"\texit 1\n"
+"fi\n"
+"\n"
+"# Remove cron jobs.\n"
+"crontab -r -u $1\n"
+"\n"
+"# Remove at jobs.\n"
+"# Note that it will remove any jobs owned by the same UID,\n"
+"# even if it was shared by a different username.\n"
+"AT_SPOOL_DIR=/var/spool/cron/atjobs\n"
+"find $AT_SPOOL_DIR -name \"[^.]*\" -type f -user $1 -delete \\;\n"
+"\n"
+"# Remove print jobs.\n"
+"lprm $1\n"
+"\n"
+"# All done.\n"
+"exit 0\n"
+"      "
 msgstr ""
 
 #: userdel.8.xml:43(para) login.defs.5.xml:43(para)
-msgid "Here is an example script, which removes the user's cron, at and print jobs: <placeholder-1/>"
+msgid ""
+"Here is an example script, which removes the user's cron, at and print jobs: "
+"<placeholder-1/>"
 msgstr ""
 
-#: 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)
+#: 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)
 msgid "<option>USERGROUPS_ENAB</option> (boolean)"
 msgstr ""
 
-#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable setting of the umask group bits to be the same as owner bits (examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is the same as gid, and username is the same as the primary group name."
-msgstr ""
-
-#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
-msgid "If set to <replaceable>yes</replaceable>, <command>userdel</command> will remove the user's group if it contains no more members, and <command>useradd</command> will create by default a group with the name of the user."
-msgstr ""
-
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename) su.1.xml:353(filename) pwconv.8.xml:190(filename) passwd.1.xml:389(filename) newusers.8.xml:384(filename) login.access.5.xml:99(filename) login.1.xml:367(filename) groupadd.8.xml:214(filename) chsh.1.xml:148(filename) chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename) chfn.1.xml:116(filename)
+#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"Enable setting of the umask group bits to be the same as owner bits "
+"(examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is "
+"the same as gid, and username is the same as the primary group name."
+msgstr ""
+
+#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para)
+#: login.defs.5.xml:39(para) login.1.xml:39(para)
+msgid ""
+"If set to <replaceable>yes</replaceable>, <command>userdel</command> will "
+"remove the user's group if it contains no more members, and "
+"<command>useradd</command> will create by default a group with the name of "
+"the user."
+msgstr ""
+
+#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
+#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
+#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
+#: login.access.5.xml:99(filename) login.1.xml:367(filename)
+#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
+#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
+#: chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr ""
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para) pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para) login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para) chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
+#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
+#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
+#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
+#: chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title) pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title) groupdel.8.xml:107(title) groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
+#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
+#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
+#: groupadd.8.xml:245(title) chage.1.xml:244(title)
 msgid "EXIT VALUES"
 msgstr ""
 
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable) su.1.xml:381(replaceable) pwck.8.xml:276(replaceable) passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable) groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
+#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
+#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
+#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
+#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
 msgid "0"
 msgstr ""
 
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para) passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para) groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
+#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
+#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
 msgid "success"
 msgstr ""
 
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable) su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum) pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum) grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum) gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum) chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:39(manvolnum) chage.1.xml:255(replaceable)
+#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
+#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
+#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
+#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
+#: login.1.xml:71(manvolnum) grpck.8.xml:220(replaceable)
+#: groups.1.xml:35(manvolnum) gpasswd.1.xml:43(manvolnum)
+#: expiry.1.xml:42(manvolnum) chsh.1.xml:41(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:39(manvolnum)
+#: chage.1.xml:255(replaceable)
 msgid "1"
 msgstr ""
 
@@ -570,15 +1036,23 @@ msgstr ""
 msgid "can't update password file"
 msgstr ""
 
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable) pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable) grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable) groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable) chage.1.xml:261(replaceable)
+#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
+#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
+#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
+#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
+#: chage.1.xml:261(replaceable)
 msgid "2"
 msgstr ""
 
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para) grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para) groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
+#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
+#: groupadd.8.xml:258(para) chage.1.xml:263(para)
 msgid "invalid command syntax"
 msgstr ""
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable) pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable) groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
+#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
+#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
 msgid "6"
 msgstr ""
 
@@ -590,11 +1064,14 @@ msgstr ""
 msgid "user currently logged in"
 msgstr ""
 
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable) groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable) groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
+#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
+#: groupadd.8.xml:280(replaceable)
 msgid "10"
 msgstr ""
 
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para) groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
+#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
 msgid "can't update group file"
 msgstr ""
 
@@ -607,30 +1084,65 @@ msgid "can't remove home directory"
 msgstr ""
 
 #: userdel.8.xml:175(para)
-msgid "The <command>userdel</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>userdel</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #: userdel.8.xml:226(para)
-msgid "<command>userdel</command> will not allow you to remove an account if there are running processes which belong to this account. In that case, you may have to kill those processes or lock the user's password or account and remove the account later. The <option>-f</option> option can force the deletion of this account."
+msgid ""
+"<command>userdel</command> will not allow you to remove an account if there "
+"are running processes which belong to this account. In that case, you may "
+"have to kill those processes or lock the user's password or account and "
+"remove the account later. The <option>-f</option> option can force the "
+"deletion of this account."
 msgstr ""
 
 #: userdel.8.xml:233(para)
-msgid "You should manually check all file systems to ensure that no files remain owned by this user."
+msgid ""
+"You should manually check all file systems to ensure that no files remain "
+"owned by this user."
 msgstr ""
 
 #: userdel.8.xml:237(para)
-msgid "You may not remove any NIS attributes on a NIS client. This must be performed on the NIS server."
+msgid ""
+"You may not remove any NIS attributes on a NIS client. This must be "
+"performed on the NIS server."
 msgstr ""
 
 #: userdel.8.xml:240(para)
-msgid "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</command> will delete the group with the same name as the user. To avoid inconsistencies in the passwd and group databases, <command>userdel</command> will check that this group is not used as a primary group for another user, and will just warn without deleting the group otherwise. The <option>-f</option> option can force the deletion of this group."
+msgid ""
+"If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
+"emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
+"command> will delete the group with the same name as the user. To avoid "
+"inconsistencies in the passwd and group databases, <command>userdel</"
+"command> will check that this group is not used as a primary group for "
+"another user, and will just warn without deleting the group otherwise. The "
+"<option>-f</option> option can force the deletion of this group."
 msgstr ""
 
 #: userdel.8.xml:253(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
-msgstr ""
-
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname) useradd.8.xml:62(command) useradd.8.xml:69(command) useradd.8.xml:73(command) login.defs.5.xml:444(term)
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgstr ""
+
+#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
+#: useradd.8.xml:62(command) useradd.8.xml:69(command)
+#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
 msgid "useradd"
 msgstr ""
 
@@ -643,11 +1155,20 @@ msgid "-D"
 msgstr ""
 
 #: useradd.8.xml:83(para)
-msgid "When invoked without the <option>-D</option> option, the <command>useradd</command> command creates a new user account using the values specified on the command line plus the default values from the system. Depending on command line options, the <command>useradd</command> command will update system files and may also create the new user's home directory and copy initial files."
+msgid ""
+"When invoked without the <option>-D</option> option, the <command>useradd</"
+"command> command creates a new user account using the values specified on "
+"the command line plus the default values from the system. Depending on "
+"command line options, the <command>useradd</command> command will update "
+"system files and may also create the new user's home directory and copy "
+"initial files."
 msgstr ""
 
 #: useradd.8.xml:92(para)
-msgid "By default, a group will also be created for the new user (see <option>-g</option>, <option>-N</option>, <option>-U</option>, and <option>USERGROUPS_ENAB</option>)."
+msgid ""
+"By default, a group will also be created for the new user (see <option>-g</"
+"option>, <option>-N</option>, <option>-U</option>, and "
+"<option>USERGROUPS_ENAB</option>)."
 msgstr ""
 
 #: useradd.8.xml:101(para)
@@ -655,23 +1176,41 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: useradd.8.xml:105(term) useradd.8.xml:507(term)
-msgid "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</replaceable>"
+msgid ""
+"<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
+"replaceable>"
 msgstr ""
 
 #: useradd.8.xml:110(para)
-msgid "The default base directory for the system if <option>-d</option><replaceable>HOME_DIR</replaceable> is not specified. <replaceable>BASE_DIR</replaceable> is concatenated with the account name to define the home directory. If the <option>-m</option> option is not used, <replaceable>BASE_DIR</replaceable> must exist."
+msgid ""
+"The default base directory for the system if <option>-d</"
+"option><replaceable>HOME_DIR</replaceable> is not specified. "
+"<replaceable>BASE_DIR</replaceable> is concatenated with the account name to "
+"define the home directory. If the <option>-m</option> option is not used, "
+"<replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
 #: useradd.8.xml:118(para)
-msgid "If this option is not specified, <command>useradd</command> will use the base directory specified by the <option>HOME</option> variable in <filename>/etc/default/useradd</filename>, or <filename>/home</filename> by default."
+msgid ""
+"If this option is not specified, <command>useradd</command> will use the "
+"base directory specified by the <option>HOME</option> variable in <filename>/"
+"etc/default/useradd</filename>, or <filename>/home</filename> by default."
 msgstr ""
 
 #: useradd.8.xml:133(para)
-msgid "Any text string. It is generally a short description of the login, and is currently used as the field for the user's full name."
+msgid ""
+"Any text string. It is generally a short description of the login, and is "
+"currently used as the field for the user's full name."
 msgstr ""
 
 #: useradd.8.xml:146(para)
-msgid "The new user will be created using <replaceable>HOME_DIR</replaceable> as the value for the user's login directory. The default is to append the <replaceable>LOGIN</replaceable> name to <replaceable>BASE_DIR</replaceable> and use that as the login directory name. The directory <replaceable>HOME_DIR</replaceable> does not have to exist but will not be created if it is missing."
+msgid ""
+"The new user will be created using <replaceable>HOME_DIR</replaceable> as "
+"the value for the user's login directory. The default is to append the "
+"<replaceable>LOGIN</replaceable> name to <replaceable>BASE_DIR</replaceable> "
+"and use that as the login directory name. The directory "
+"<replaceable>HOME_DIR</replaceable> does not have to exist but will not be "
+"created if it is missing."
 msgstr ""
 
 #: useradd.8.xml:158(term)
@@ -683,43 +1222,79 @@ msgid "See below, the subsection \"Chang
 msgstr ""
 
 #: useradd.8.xml:177(para)
-msgid "If not specified, <command>useradd</command> will use the default expiry date specified by the <option>EXPIRE</option> variable in <filename>/etc/default/useradd</filename>, or an empty string (no expiry) by default."
+msgid ""
+"If not specified, <command>useradd</command> will use the default expiry "
+"date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or an empty string (no expiry) by default."
 msgstr ""
 
 #: useradd.8.xml:191(para)
-msgid "The number of days after a password expires until the account is permanently disabled. A value of 0 disables the account as soon as the password has expired, and a value of -1 disables the feature."
+msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled. A value of 0 disables the account as soon as the password has "
+"expired, and a value of -1 disables the feature."
 msgstr ""
 
 #: useradd.8.xml:197(para)
-msgid "If not specified, <command>useradd</command> will use the default inactivity period specified by the <option>INACTIVE</option> variable in <filename>/etc/default/useradd</filename>, or -1 by default."
+msgid ""
+"If not specified, <command>useradd</command> will use the default inactivity "
+"period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or -1 by default."
 msgstr ""
 
 #: useradd.8.xml:211(para)
-msgid "The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group."
+msgid ""
+"The group name or number of the user's initial login group. The group name "
+"must exist. A group number must refer to an already existing group."
 msgstr ""
 
 #: useradd.8.xml:216(para)
-msgid "If not specified, the behavior of <command>useradd</command> will depend on the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</filename>. If this variable is set to <replaceable>yes</replaceable> (or <option>-U/--user-group</option> is specified on the command line), a group will be created for the user, with the same name as her loginname. If the variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-group</option> is specified on the command line), useradd will set the primary group of the new user to the value specified by the <option>GROUP</option> variable in <filename>/etc/default/useradd</filename>, or 100 by default."
+msgid ""
+"If not specified, the behavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
 msgstr ""
 
 #: useradd.8.xml:239(para)
-msgid "A list of supplementary groups which the user is also a member of. Each group is separated from the next by a comma, with no intervening whitespace. The groups are subject to the same restrictions as the group given with the <option>-g</option> option. The default is for the user to belong only to the initial group."
+msgid ""
+"A list of supplementary groups which the user is also a member of. Each "
+"group is separated from the next by a comma, with no intervening whitespace. "
+"The groups are subject to the same restrictions as the group given with the "
+"<option>-g</option> option. The default is for the user to belong only to "
+"the initial group."
 msgstr ""
 
 #: useradd.8.xml:256(term)
-msgid "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</replaceable>"
+msgid ""
+"<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
+"replaceable>"
 msgstr ""
 
 #: useradd.8.xml:261(para)
-msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by <command>useradd</command>."
+msgid ""
+"The skeleton directory, which contains files and directories to be copied in "
+"the user's home directory, when the home directory is created by "
+"<command>useradd</command>."
 msgstr ""
 
 #: useradd.8.xml:266(para)
-msgid "This option is only valid if the <option>-m</option> (or <option>--create-home</option>) option is specified."
+msgid ""
+"This option is only valid if the <option>-m</option> (or <option>--create-"
+"home</option>) option is specified."
 msgstr ""
 
 #: useradd.8.xml:270(para)
-msgid "If this option is not set, the skeleton directory is defined by the <option>SKEL</option> variable in <filename>/etc/default/useradd</filename> or, by default, <filename>/etc/skel</filename>."
+msgid ""
+"If this option is not set, the skeleton directory is defined by the "
+"<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
+"or, by default, <filename>/etc/skel</filename>."
 msgstr ""
 
 #: useradd.8.xml:276(para)
@@ -727,11 +1302,23 @@ msgid "If possible, the ACLs and extende
 msgstr ""
 
 #: useradd.8.xml:282(term) groupadd.8.xml:113(term)
-msgid "<option>-K</option>, <option>--key</option><replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>"
+msgid ""
+"<option>-K</option>, <option>--key</option><replaceable>KEY</"
+"replaceable>=<replaceable>VALUE</replaceable>"
 msgstr ""
 
 #: useradd.8.xml:287(para)
-msgid "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</option>, <option>UID_MAX</option>, <option>UMASK</option>, <option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: <option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</replaceable> can be used when creating system account to turn off password ageing, even though system account has no password at all. Multiple <option>-K</option> options can be specified, e.g.: <option>-K </option><replaceable>UID_MIN</replaceable>=<replaceable>100</replaceable><option>-K </option><replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>"
+msgid ""
+"Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
+"option>, <option>UID_MAX</option>, <option>UMASK</option>, "
+"<option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: "
+"<option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-"
+"1</replaceable> can be used when creating system account to turn off "
+"password ageing, even though system account has no password at all. Multiple "
+"<option>-K</option> options can be specified, e.g.: <option>-K </"
+"option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+"replaceable><option>-K </option><replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
 #: useradd.8.xml:311(term)
@@ -743,7 +1330,9 @@ msgid "Do not add the user to the lastlo
 msgstr ""
 
 #: useradd.8.xml:316(para)
-msgid "By default, the user's entries in the lastlog and faillog databases are resetted to avoid reusing the entry from a previously deleted user."
+msgid ""
+"By default, the user's entries in the lastlog and faillog databases are "
+"resetted to avoid reusing the entry from a previously deleted user."
 msgstr ""
 
 #: useradd.8.xml:324(term)
@@ -751,11 +1340,16 @@ msgid "<option>-m</option>, <option>--cr
 msgstr ""
 
 #: useradd.8.xml:328(para)
-msgid "Create the user's home directory if it does not exist. The files and directories contained in the skeleton directory (which can be defined with the <option>-k</option> option) will be copied to the home directory."
+msgid ""
+"Create the user's home directory if it does not exist. The files and "
+"directories contained in the skeleton directory (which can be defined with "
+"the <option>-k</option> option) will be copied to the home directory."
 msgstr ""
 
 #: useradd.8.xml:334(para)
-msgid "By default, if this option is not specified and <option>CREATE_HOME</option> is not enabled, no home directories are created."
+msgid ""
+"By default, if this option is not specified and <option>CREATE_HOME</option> "
+"is not enabled, no home directories are created."
 msgstr ""
 
 #: useradd.8.xml:343(option)
@@ -763,7 +1357,10 @@ msgid "-M"
 msgstr ""
 
 #: useradd.8.xml:346(para)
-msgid "Do no create the user's home directory, even if the system wide setting from <filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set to <replaceable>yes</replaceable>."
+msgid ""
+"Do no create the user's home directory, even if the system wide setting from "
+"<filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set "
+"to <replaceable>yes</replaceable>."
 msgstr ""
 
 #: useradd.8.xml:355(term)
@@ -771,11 +1368,18 @@ msgid "<option>-N</option>, <option>--no
 msgstr ""
 
 #: useradd.8.xml:359(para)
-msgid "Do not create a group with the same name as the user, but add the user to the group specified by the <option>-g</option> option or by the <option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
+msgid ""
+"Do not create a group with the same name as the user, but add the user to "
+"the group specified by the <option>-g</option> option or by the "
+"<option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
 #: useradd.8.xml:365(para) useradd.8.xml:473(para)
-msgid "The default behavior (if the <option>-g</option>, <option>-N</option>, and <option>-U</option> options are not specified) is defined by the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</filename>."
+msgid ""
+"The default behavior (if the <option>-g</option>, <option>-N</option>, and "
+"<option>-U</option> options are not specified) is defined by the "
+"<option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>."
 msgstr ""
 
 #: useradd.8.xml:378(para)
@@ -783,11 +1387,15 @@ msgid "Allow the creation of a user acco
 msgstr ""
 
 #: useradd.8.xml:379(para)
-msgid "This option is only valid in combination with the <option>-u</option> option."
+msgid ""
+"This option is only valid in combination with the <option>-u</option> option."
 msgstr ""
 
 #: useradd.8.xml:391(para) groupadd.8.xml:149(para)
-msgid "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to disable the password."
+msgid ""
+"The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
+"disable the password."
 msgstr ""
 
 #: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
@@ -799,19 +1407,39 @@ msgid "Create a system account."
 msgstr ""
 
 #: useradd.8.xml:415(para)
-msgid "System users will be created with no aging information in <filename>/etc/shadow</filename>, and their numeric identifiers are chosen in the <option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in <filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-<option>UID_MAX</option> (and their <option>GID</option> counterparts for the creation of groups)."
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are chosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
 msgstr ""
 
 #: useradd.8.xml:424(para)
-msgid "Note that <command>useradd</command> will not create a home directory for such an user, regardless of the default setting in <filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>). You have to specify the <option>-m</option> options if you want a home directory for a system account to be created."
+msgid ""
+"Note that <command>useradd</command> will not create a home directory for "
+"such an user, regardless of the default setting in <filename>/etc/login."
+"defs</filename> (<option>CREATE_HOME</option>). You have to specify the "
+"<option>-m</option> options if you want a home directory for a system "
+"account to be created."
 msgstr ""
 
 #: useradd.8.xml:440(para)
-msgid "The name of the user's login shell. The default is to leave this field blank, which causes the system to select the default login shell specified by the <option>SHELL</option> variable in <filename>/etc/default/useradd</filename>, or an empty string by default."
+msgid ""
+"The name of the user's login shell. The default is to leave this field "
+"blank, which causes the system to select the default login shell specified "
+"by the <option>SHELL</option> variable in <filename>/etc/default/useradd</"
+"filename>, or an empty string by default."
 msgstr ""
 
 #: useradd.8.xml:455(para)
-msgid "The numerical value of the user's ID. This value must be unique, unless the <option>-o</option> option is used. The value must be non-negative. The default is to use the smallest ID value greater than 999 and greater than every other user. Values between 0 and 999 are typically reserved for system accounts."
+msgid ""
+"The numerical value of the user's ID. This value must be unique, unless the "
+"<option>-o</option> option is used. The value must be non-negative. The "
+"default is to use the smallest ID value greater than 999 and greater than "
+"every other user. Values between 0 and 999 are typically reserved for system "
+"accounts."
 msgstr ""
 
 #: useradd.8.xml:465(term)
@@ -819,11 +1447,15 @@ msgid "<option>-U</option>, <option>--us
 msgstr ""
 
 #: useradd.8.xml:469(para)
-msgid "Create a group with the same name as the user, and add the user to this group."
+msgid ""
+"Create a group with the same name as the user, and add the user to this "
+"group."
 msgstr ""
 
 #: useradd.8.xml:487(para)
-msgid "The SELinux user for the user's login. The default is to leave this field blank, which causes the system to select the default SELinux user."
+msgid ""
+"The SELinux user for the user's login. The default is to leave this field "
+"blank, which causes the system to select the default SELinux user."
 msgstr ""
 
 #: useradd.8.xml:497(title)
@@ -831,15 +1463,25 @@ msgid "Changing the default values"
 msgstr ""
 
 #: useradd.8.xml:498(para)
-msgid "When invoked with only the <option>-D</option> option, <command>useradd</command> will display the current default values. When invoked with <option>-D</option> plus other options, <command>useradd</command> will update the default values for the specified options. Valid default-changing options are:"
+msgid ""
+"When invoked with only the <option>-D</option> option, <command>useradd</"
+"command> will display the current default values. When invoked with <option>-"
+"D</option> plus other options, <command>useradd</command> will update the "
+"default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
 #: useradd.8.xml:512(para)
-msgid "The path prefix for a new user's home directory. The user's name will be affixed to the end of <replaceable>BASE_DIR</replaceable> to form the new user's home directory name, if the <option>-d</option> option is not used when creating a new account."
+msgid ""
+"The path prefix for a new user's home directory. The user's name will be "
+"affixed to the end of <replaceable>BASE_DIR</replaceable> to form the new "
+"user's home directory name, if the <option>-d</option> option is not used "
+"when creating a new account."
 msgstr ""
 
 #: useradd.8.xml:519(para)
-msgid "This option sets the <option>HOME</option> variable in <filename>/etc/default/useradd</filename>."
+msgid ""
+"This option sets the <option>HOME</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
 
 #: useradd.8.xml:531(para)
@@ -847,23 +1489,36 @@ msgid "The date on which the user accoun
 msgstr ""
 
 #: useradd.8.xml:532(para)
-msgid "This option sets the <option>EXPIRE</option> variable in <filename>/etc/default/useradd</filename>."
+msgid ""
+"This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
 
 #: useradd.8.xml:544(para)
-msgid "The number of days after a password has expired before the account will be disabled."
+msgid ""
+"The number of days after a password has expired before the account will be "
+"disabled."
 msgstr ""
 
 #: useradd.8.xml:548(para)
-msgid "This option sets the <option>INACTIVE</option> variable in <filename>/etc/default/useradd</filename>."
+msgid ""
+"This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
 
 #: useradd.8.xml:560(para)
-msgid "The group name or ID for a new user's initial group (when the <option>-N/--no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> variable is set to <replaceable>no</replaceable> in <filename>/etc/login.defs</filename>. The named group must exist, and a numerical group ID must have an existing entry."
+msgid ""
+"The group name or ID for a new user's initial group (when the <option>-N/--"
+"no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> "
+"variable is set to <replaceable>no</replaceable> in <filename>/etc/login."
+"defs</filename>. The named group must exist, and a numerical group ID must "
+"have an existing entry."
 msgstr ""
 
 #: useradd.8.xml:569(para)
-msgid "This option sets the <option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
+msgid ""
+"This option sets the <option>GROUP</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
 
 #: useradd.8.xml:581(para)
@@ -871,7 +1526,9 @@ msgid "The name of a new user's login sh
 msgstr ""
 
 #: useradd.8.xml:584(para)
-msgid "This option sets the <option>SHELL</option> variable in <filename>/etc/default/useradd</filename>."
+msgid ""
+"This option sets the <option>SHELL</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
 
 #: useradd.8.xml:596(title)
@@ -879,19 +1536,31 @@ msgid "NOTES"
 msgstr ""
 
 #: useradd.8.xml:597(para)
-msgid "The system administrator is responsible for placing the default user files in the <filename>/etc/skel/</filename> directory (or any other skeleton directory specified in <filename>/etc/default/useradd</filename> or on the command line)."
+msgid ""
+"The system administrator is responsible for placing the default user files "
+"in the <filename>/etc/skel/</filename> directory (or any other skeleton "
+"directory specified in <filename>/etc/default/useradd</filename> or on the "
+"command line)."
 msgstr ""
 
 #: useradd.8.xml:606(para)
-msgid "You may not add a user to a NIS or LDAP group. This must be performed on the corresponding server."
+msgid ""
+"You may not add a user to a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 
 #: useradd.8.xml:611(para)
-msgid "Similarly, if the username already exists in an external user database such as NIS or LDAP, <command>useradd</command> will deny the user account creation request."
+msgid ""
+"Similarly, if the username already exists in an external user database such "
+"as NIS or LDAP, <command>useradd</command> will deny the user account "
+"creation request."
 msgstr ""
 
 #: useradd.8.xml:617(para)
-msgid "Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes. They can end with a dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
+msgid ""
+"Usernames must start with a lower case letter or an underscore, followed by "
+"lower case letters, digits, underscores, or dashes. They can end with a "
+"dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
 #: useradd.8.xml:623(para)
@@ -903,59 +1572,89 @@ msgid "<option>CREATE_HOME</option> (boo
 msgstr ""
 
 #: useradd.8.xml:32(para) login.defs.5.xml:32(para)
-msgid "Indicate if a home directory should be created by default for new users."
+msgid ""
+"Indicate if a home directory should be created by default for new users."
 msgstr ""
 
 #: useradd.8.xml:36(para) login.defs.5.xml:36(para)
-msgid "This setting does not apply to system users, and can be overridden on the command line."
+msgid ""
+"This setting does not apply to system users, and can be overridden on the "
+"command line."
 msgstr ""
 
-#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term) groupadd.8.xml:32(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: groupadd.8.xml:32(term)
 msgid "<option>GID_MAX</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term) groupadd.8.xml:33(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
+#: groupadd.8.xml:33(term)
 msgid "<option>GID_MIN</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para) groupadd.8.xml:35(para)
-msgid "Range of group IDs used for the creation of regular groups by <command>useradd</command>, <command>groupadd</command>, or <command>newusers</command>."
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
+#: groupadd.8.xml:35(para)
+msgid ""
+"Range of group IDs used for the creation of regular groups by "
+"<command>useradd</command>, <command>groupadd</command>, or "
+"<command>newusers</command>."
 msgstr ""
 
-#: 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)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
-msgid "The maximum number of days a password may be used. If the password is older than this, a password change will be forced. If not specified, -1 will be assumed (which disables the restriction)."
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
+msgid ""
+"The maximum number of days a password may be used. If the password is older "
+"than this, a password change will be forced. If not specified, -1 will be "
+"assumed (which disables the restriction)."
 msgstr ""
 
-#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
-msgid "The minimum number of days allowed between password changes. Any password changes attempted sooner than this will be rejected. If not specified, -1 will be assumed (which disables the restriction)."
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
+msgid ""
+"The minimum number of days allowed between password changes. Any password "
+"changes attempted sooner than this will be rejected. If not specified, -1 "
+"will be assumed (which disables the restriction)."
 msgstr ""
 
-#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
-msgid "The number of days warning given before a password expires. A zero means warning is given only upon the day of expiration, a negative value means no warning is given. If not specified, no warning will be provided."
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
+msgid ""
+"The number of days warning given before a password expires. A zero means "
+"warning is given only upon the day of expiration, a negative value means no "
+"warning is given. If not specified, no warning will be provided."
 msgstr ""
 
-#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term) groupadd.8.xml:30(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: groupadd.8.xml:30(term)
 msgid "<option>SYS_GID_MAX</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term) groupadd.8.xml:31(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: groupadd.8.xml:31(term)
 msgid "<option>SYS_GID_MIN</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para) groupadd.8.xml:33(para)
-msgid "Range of group IDs used for the creation of system groups by <command>useradd</command>, <command>groupadd</command>, or <command>newusers</command>."
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: groupadd.8.xml:33(para)
+msgid ""
+"Range of group IDs used for the creation of system groups by "
+"<command>useradd</command>, <command>groupadd</command>, or "
+"<command>newusers</command>."
 msgstr ""
 
 #: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
@@ -967,7 +1666,9 @@ msgid "<option>SYS_UID_MIN</option> (num
 msgstr ""
 
 #: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
-msgid "Range of user IDs used for the creation of system users by <command>useradd</command> or <command>newusers</command>."
+msgid ""
+"Range of user IDs used for the creation of system users by <command>useradd</"
+"command> or <command>newusers</command>."
 msgstr ""
 
 #: useradd.8.xml:30(term) pwck.8.xml:30(term) login.defs.5.xml:30(term)
@@ -975,7 +1676,9 @@ msgid "<option>TCB_AUTH_GROUP</option> (
 msgstr ""
 
 #: useradd.8.xml:32(para) pwck.8.xml:32(para) login.defs.5.xml:32(para)
-msgid "If <replaceable>yes</replaceable>, newly created tcb shadow files will be group owned by the <replaceable>auth</replaceable> group."
+msgid ""
+"If <replaceable>yes</replaceable>, newly created tcb shadow files will be "
+"group owned by the <replaceable>auth</replaceable> group."
 msgstr ""
 
 #: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
@@ -987,27 +1690,45 @@ msgid "<option>UID_MIN</option> (number)
 msgstr ""
 
 #: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
-msgid "Range of user IDs used for the creation of regular users by <command>useradd</command> or <command>newusers</command>."
+msgid ""
+"Range of user IDs used for the creation of regular users by "
+"<command>useradd</command> or <command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: login.1.xml:32(term)
 msgid "<option>UMASK</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "The file mode creation mask is initialized to this value. If not specified, the mask will be initialized to 022."
-msgstr ""
-
-#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
-msgid "<command>useradd</command> and <command>newusers</command> use this mask to set the mode of the home directory they create"
-msgstr ""
-
-#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para) login.1.xml:42(para)
-msgid "It is also used by <command>login</command> to define users' initial umask. Note that this mask can be overridden by the user's GECOS line (if <option>QUOTAS_ENAB</option> is set) or by the specification of a limit with the <emphasis>K</emphasis> identifier in <citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-msgstr ""
-
-#: useradd.8.xml:50(para) newusers.8.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
-msgid "It is also used by <command>pam_umask</command> as the default umask value."
+#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: login.1.xml:34(para)
+msgid ""
+"The file mode creation mask is initialized to this value. If not specified, "
+"the mask will be initialized to 022."
+msgstr ""
+
+#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para)
+#: login.1.xml:38(para)
+msgid ""
+"<command>useradd</command> and <command>newusers</command> use this mask to "
+"set the mode of the home directory they create"
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overridden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: useradd.8.xml:50(para) newusers.8.xml:50(para) login.defs.5.xml:50(para)
+#: login.1.xml:50(para)
+msgid ""
+"It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
 
 #: useradd.8.xml:682(filename)
@@ -1026,15 +1747,21 @@ msgstr ""
 msgid "Directory containing default files."
 msgstr ""
 
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum) pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable) grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable) groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
+#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
+#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
+#: groupadd.8.xml:262(replaceable)
 msgid "3"
 msgstr ""
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para) groupadd.8.xml:264(para)
+#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
+#: groupadd.8.xml:264(para)
 msgid "invalid argument to option"
 msgstr ""
 
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable) passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable) groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
+#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
+#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
 msgid "4"
 msgstr ""
 
@@ -1042,11 +1769,13 @@ msgstr ""
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr ""
 
-#: useradd.8.xml:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para) groupdel.8.xml:126(para)
+#: useradd.8.xml:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
+#: groupdel.8.xml:126(para)
 msgid "specified group doesn't exist"
 msgstr ""
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable) groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
+#: groupadd.8.xml:274(replaceable)
 msgid "9"
 msgstr ""
 
@@ -1067,22 +1796,50 @@ msgid "can't create mail spool"
 msgstr ""
 
 #: useradd.8.xml:704(para)
-msgid "The <command>useradd</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>useradd</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #: useradd.8.xml:773(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newusers</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 
 #: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
 msgid "suauth"
 msgstr ""
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum) pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum) passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable) login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum) limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum) grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
+#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
+#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
+#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
+#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr ""
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo) porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo) login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo) limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo) faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
+#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
+#: login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
+#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
+#: faillog.5.xml:36(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr ""
 
@@ -1095,35 +1852,56 @@ msgid "/etc/suauth"
 msgstr ""
 
 #: suauth.5.xml:51(para)
-msgid "The file <filename>/etc/suauth</filename> is referenced whenever the su command is called. It can change the behaviour of the su command, based upon:"
+msgid ""
+"The file <filename>/etc/suauth</filename> is referenced whenever the su "
+"command is called. It can change the behaviour of the su command, based upon:"
 msgstr ""
 
 #. .RS
 #: suauth.5.xml:58(literallayout)
 #, no-wrap
-msgid "\n      1) the user su is targetting\n    "
+msgid ""
+"\n"
+"      1) the user su is targetting\n"
+"    "
 msgstr ""
 
 #. .fi
 #: suauth.5.xml:62(para)
-msgid "2) the user executing the su command (or any groups he might be a member of)"
+msgid ""
+"2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
 #: suauth.5.xml:67(para)
-msgid "The file is formatted like this, with lines starting with a # being treated as comment lines and ignored;"
+msgid ""
+"The file is formatted like this, with lines starting with a # being treated "
+"as comment lines and ignored;"
 msgstr ""
 
 #: suauth.5.xml:72(literallayout)
 #, no-wrap
-msgid "\n      to-id:from-id:ACTION\n    "
+msgid ""
+"\n"
+"      to-id:from-id:ACTION\n"
+"    "
 msgstr ""
 
 #: suauth.5.xml:76(para)
-msgid "Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by a list of usernames delimited by \",\""
+msgid ""
+"Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames "
+"delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by "
+"a list of usernames delimited by \",\""
 msgstr ""
 
 #: suauth.5.xml:82(para)
-msgid "from-id is formatted the same as to-id except the extra word <emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</emphasis> is perfectly valid too. Following <emphasis>GROUP</emphasis> appears one or more group names, delimited by \",\". It is not sufficient to have primary group id of the relevant group, an entry in <citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</manvolnum></citerefentry> is neccessary."
+msgid ""
+"from-id is formatted the same as to-id except the extra word "
+"<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
+"emphasis> is perfectly valid too. Following <emphasis>GROUP</emphasis> "
+"appears one or more group names, delimited by \",\". It is not sufficient to "
+"have primary group id of the relevant group, an entry in "
+"<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry> is neccessary."
 msgstr ""
 
 #: suauth.5.xml:93(para)
@@ -1143,7 +1921,8 @@ msgid "NOPASS"
 msgstr ""
 
 #: suauth.5.xml:112(para)
-msgid "The attempt to su is automatically successful; no password is asked for."
+msgid ""
+"The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 
 #: suauth.5.xml:120(emphasis)
@@ -1151,11 +1930,18 @@ msgid "OWNPASS"
 msgstr ""
 
 #: suauth.5.xml:123(para)
-msgid "For the su command to be successful, the user must enter his or her own password. They are told this."
+msgid ""
+"For the su command to be successful, the user must enter his or her own "
+"password. They are told this."
 msgstr ""
 
 #: suauth.5.xml:131(para)
-msgid "Note there are three separate fields delimited by a colon. No whitespace must surround this colon. Also note that the file is examined sequentially line by line, and the first applicable rule is used without examining the file further. This makes it possible for a system administrator to exercise as fine control as he or she wishes."
+msgid ""
+"Note there are three separate fields delimited by a colon. No whitespace "
+"must surround this colon. Also note that the file is examined sequentially "
+"line by line, and the first applicable rule is used without examining the "
+"file further. This makes it possible for a system administrator to exercise "
+"as fine control as he or she wishes."
 msgstr ""
 
 #: suauth.5.xml:141(title)
@@ -1164,7 +1950,29 @@ msgstr ""
 
 #: suauth.5.xml:142(literallayout)
 #, no-wrap
-msgid "\n      # sample /etc/suauth file\n      #\n      # A couple of privileged usernames may\n      # su to root with their own password.\n      #\n      root:chris,birddog:OWNPASS\n      #\n      # Anyone else may not su to root unless in\n      # group wheel. This is how BSD does things.\n      #\n      root:ALL EXCEPT GROUP wheel:DENY\n      #\n      # Perhaps terry and birddog are accounts\n      # owned by the same person.\n      # Access can be arranged between them\n      # with no password.\n      #\n      terry:birddog:NOPASS\n      birddog:terry:NOPASS\n      #\n    "
+msgid ""
+"\n"
+"      # sample /etc/suauth file\n"
+"      #\n"
+"      # A couple of privileged usernames may\n"
+"      # su to root with their own password.\n"
+"      #\n"
+"      root:chris,birddog:OWNPASS\n"
+"      #\n"
+"      # Anyone else may not su to root unless in\n"
+"      # group wheel. This is how BSD does things.\n"
+"      #\n"
+"      root:ALL EXCEPT GROUP wheel:DENY\n"
+"      #\n"
+"      # Perhaps terry and birddog are accounts\n"
+"      # owned by the same person.\n"
+"      # Access can be arranged between them\n"
+"      # with no password.\n"
+"      #\n"
+"      terry:birddog:NOPASS\n"
+"      birddog:terry:NOPASS\n"
+"      #\n"
+"    "
 msgstr ""
 
 #: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
@@ -1172,7 +1980,10 @@ msgid "BUGS"
 msgstr ""
 
 #: suauth.5.xml:179(para)
-msgid "There could be plenty lurking. The file parser is particularly unforgiving about syntax errors, expecting no spurious whitespace (apart from beginning and end of lines), and a specific token delimiting different things."
+msgid ""
+"There could be plenty lurking. The file parser is particularly unforgiving "
+"about syntax errors, expecting no spurious whitespace (apart from beginning "
+"and end of lines), and a specific token delimiting different things."
 msgstr ""
 
 #: suauth.5.xml:188(title) shadow.3.xml:183(title)
@@ -1180,18 +1991,29 @@ msgid "DIAGNOSTICS"
 msgstr ""
 
 #: suauth.5.xml:189(para)
-msgid "An error parsing the file is reported using <citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</manvolnum></citerefentry> as level ERR on facility AUTH."
+msgid ""
+"An error parsing the file is reported using "
+"<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry> as level ERR on facility AUTH."
 msgstr ""
 
 #: suauth.5.xml:198(para)
-msgid "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>."
 msgstr ""
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command) login.defs.5.xml:418(term)
+#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
+#: login.defs.5.xml:418(term)
 msgid "su"
 msgstr ""
 
-#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo) passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo) login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo) gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo) chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo) chage.1.xml:40(refmiscinfo)
+#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo)
+#: passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo)
+#: login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo)
+#: gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo)
+#: chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:40(refmiscinfo)
 msgid "User Commands"
 msgstr ""
 
@@ -1199,32 +2021,57 @@ msgstr ""
 msgid "change user ID or become superuser"
 msgstr ""
 
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable) login.1.xml:93(replaceable)
+#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
+#: login.1.xml:93(replaceable)
 msgid "username"
 msgstr ""
 
 #: su.1.xml:78(para)
-msgid "The <command>su</command> command is used to become another user during a login session. Invoked without a <option>username</option>, <command>su</command> defaults to becoming the superuser. The optional argument <option>-</option> may be used to provide an environment similar to what the user would expect had the user logged in directly."
+msgid ""
+"The <command>su</command> command is used to become another user during a "
+"login session. Invoked without a <option>username</option>, <command>su</"
+"command> defaults to becoming the superuser. The optional argument <option>-"
+"</option> may be used to provide an environment similar to what the user "
+"would expect had the user logged in directly."
 msgstr ""
 
 #: su.1.xml:87(para)
-msgid "Additional arguments may be provided after the username, in which case they are supplied to the user's login shell. In particular, an argument of <option>-c</option> will cause the next argument to be treated as a command by most command interpreters. The command will be executed by the shell specified in <filename>/etc/passwd</filename> for the target user."
+msgid ""
+"Additional arguments may be provided after the username, in which case they "
+"are supplied to the user's login shell. In particular, an argument of "
+"<option>-c</option> will cause the next argument to be treated as a command "
+"by most command interpreters. The command will be executed by the shell "
+"specified in <filename>/etc/passwd</filename> for the target user."
 msgstr ""
 
 #: su.1.xml:96(para)
-msgid "You can use the <option>--</option> argument to separate <command>su</command> options from the arguments supplied to the shell."
+msgid ""
+"You can use the <option>--</option> argument to separate <command>su</"
+"command> options from the arguments supplied to the shell."
 msgstr ""
 
 #: su.1.xml:101(para)
-msgid "The user will be prompted for a password, if appropriate. Invalid passwords will produce an error message. All attempts, both valid and invalid, are logged to detect abuse of the system."
+msgid ""
+"The user will be prompted for a password, if appropriate. Invalid passwords "
+"will produce an error message. All attempts, both valid and invalid, are "
+"logged to detect abuse of the system."
 msgstr ""
 
 #: su.1.xml:106(para)
-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>."
+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)
-msgid "A subsystem login is indicated by the presence of a \"*\" as the first character of the login shell. The given home directory will be used as the root of a new file system which the user is actually logged into."
+msgid ""
+"A subsystem login is indicated by the presence of a \"*\" as the first "
+"character of the login shell. The given home directory will be used as the "
+"root of a new file system which the user is actually logged into."
 msgstr ""
 
 #: su.1.xml:124(para)
@@ -1232,11 +2079,15 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: su.1.xml:128(term)
-msgid "<option>-c</option>, <option>--command</option><replaceable>COMMAND</replaceable>"
+msgid ""
+"<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
+"replaceable>"
 msgstr ""
 
 #: su.1.xml:133(para)
-msgid "Specify a command that will be invoked by the shell using its <option>-c</option>."
+msgid ""
+"Specify a command that will be invoked by the shell using its <option>-c</"
+"option>."
 msgstr ""
 
 #: su.1.xml:140(term)
@@ -1244,11 +2095,16 @@ msgid "<option>-</option>, <option>-l</o
 msgstr ""
 
 #: su.1.xml:144(para)
-msgid "Provide an environment similar to what the user would expect had the user logged in directly."
+msgid ""
+"Provide an environment similar to what the user would expect had the user "
+"logged in directly."
 msgstr ""
 
 #: su.1.xml:148(para)
-msgid "When <option>-</option> is used, it must be specified as the last <command>su</command> option. The other forms (<option>-l</option> and <option>--login</option>) do not have this restriction."
+msgid ""
+"When <option>-</option> is used, it must be specified as the last "
+"<command>su</command> option. The other forms (<option>-l</option> and "
+"<option>--login</option>) do not have this restriction."
 msgstr ""
 
 #: su.1.xml:162(para)
@@ -1260,27 +2116,41 @@ msgid "The shell specified with --shell.
 msgstr ""
 
 #: su.1.xml:173(para)
-msgid "If <option>--preserve-environment</option> is used, the shell specified by the <envar>$SHELL</envar> environment variable."
+msgid ""
+"If <option>--preserve-environment</option> is used, the shell specified by "
+"the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
 #: su.1.xml:180(para)
-msgid "The shell indicated in the <filename>/etc/passwd</filename> entry for the target user."
+msgid ""
+"The shell indicated in the <filename>/etc/passwd</filename> entry for the "
+"target user."
 msgstr ""
 
 #: su.1.xml:186(para)
-msgid "<filename>/bin/sh</filename> if a shell could not be found by any above method."
+msgid ""
+"<filename>/bin/sh</filename> if a shell could not be found by any above "
+"method."
 msgstr ""
 
 #: su.1.xml:163(para)
-msgid "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
+msgid ""
+"The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
 #: 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."
+msgid ""
+"If the target user has a restricted shell (i.e. the shell field of this "
+"user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
+"etc/shell</filename>), then the <option>--shell</option> option or the "
+"<envar>$SHELL</envar> environment variable won't be taken into account, "
+"unless <command>su</command> is called by root."
 msgstr ""
 
 #: su.1.xml:202(term)
-msgid "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</option>"
+msgid ""
+"<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
+"option>"
 msgstr ""
 
 #: su.1.xml:211(envar)
@@ -1288,7 +2158,9 @@ 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);"
+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)
@@ -1296,7 +2168,9 @@ 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."
+msgid ""
+"reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was "
+"set."
 msgstr ""
 
 #: su.1.xml:207(para)
@@ -1304,27 +2178,44 @@ msgid "Preserve the current environment,
 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)."
+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."
+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."
+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."
+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)."
+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)."
+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)
@@ -1332,11 +2223,15 @@ msgid "Other environments might be set b
 msgstr ""
 
 #: su.1.xml:237(para)
-msgid "Note that the default behavior for the environment is the following: <placeholder-1/>"
+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."
+msgid ""
+"This version of <command>su</command> has many compilation options, only "
+"some of which may be in use at any particular site."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1344,7 +2239,10 @@ msgid "<option>CONSOLE</option> (string)
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If defined, either full pathname of a file containing device names (one per line) or a \":\" delimited list of device names. Root logins will be allowed only upon these devices."
+msgid ""
+"If defined, either full pathname of a file containing device names (one per "
+"line) or a \":\" delimited list of device names. Root logins will be allowed "
+"only upon these devices."
 msgstr ""
 
 #: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
@@ -1360,7 +2258,11 @@ msgid "<option>CONSOLE_GROUPS</option> (
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "List of groups to add to the user's supplementary groups set when logging in on the console (as determined by the CONSOLE setting). Default is none. <placeholder-1/> Use with caution - it is possible for users to gain permanent access to these groups, even when not logged in on the console."
+msgid ""
+"List of groups to add to the user's supplementary groups set when logging in "
+"on the console (as determined by the CONSOLE setting). Default is none. "
+"<placeholder-1/> Use with caution - it is possible for users to gain "
+"permanent access to these groups, even when not logged in on the console."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1368,11 +2270,16 @@ msgid "<option>DEFAULT_HOME</option> (bo
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Indicate if login is allowed if we can't cd to the home directory. Default in no."
+msgid ""
+"Indicate if login is allowed if we can't cd to the home directory. Default "
+"in no."
 msgstr ""
 
 #: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
-msgid "If set to <replaceable>yes</replaceable>, the user will login in the root (<filename>/</filename>) directory if it is not possible to cd to her home directory."
+msgid ""
+"If set to <replaceable>yes</replaceable>, the user will login in the root "
+"(<filename>/</filename>) directory if it is not possible to cd to her home "
+"directory."
 msgstr ""
 
 #. XXX: When compiled with PAM support, only sulogin uses ENV_HZ
@@ -1381,11 +2288,16 @@ msgid "<option>ENV_HZ</option> (string)"
 msgstr ""
 
 #: su.1.xml:35(para) login.defs.5.xml:35(para) login.1.xml:35(para)
-msgid "If set, it will be used to define the HZ environment variable when a user login. The value must be preceded by <replaceable>HZ=</replaceable>. A common value on Linux is <replaceable>HZ=100</replaceable>."
+msgid ""
+"If set, it will be used to define the HZ environment variable when a user "
+"login. The value must be preceded by <replaceable>HZ=</replaceable>. A "
+"common value on Linux is <replaceable>HZ=100</replaceable>."
 msgstr ""
 
 #: su.1.xml:41(para) login.defs.5.xml:41(para) login.1.xml:41(para)
-msgid "The <envar>HZ</envar> environment variable is only set when the user (the superuser) logs in with <command>sulogin</command>."
+msgid ""
+"The <envar>HZ</envar> environment variable is only set when the user (the "
+"superuser) logs in with <command>sulogin</command>."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1393,7 +2305,9 @@ msgid "<option>ENVIRON_FILE</option> (st
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If this file exists and is readable, login environment will be read from it. Every line should be in the form name=value."
+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)
@@ -1405,7 +2319,12 @@ msgid "<option>ENV_PATH</option> (string
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If set, it will be used to define the PATH environment variable when a regular user login. The value can be preceded by <replaceable>PATH=</replaceable>, or a colon separated list of paths (for example <replaceable>/bin:/usr/bin</replaceable>). The default value is <replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgid ""
+"If set, it will be used to define the PATH environment variable when a "
+"regular user login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"bin:/usr/bin</replaceable>). The default value is <replaceable>PATH=/bin:/"
+"usr/bin</replaceable>."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1413,7 +2332,12 @@ msgid "<option>ENV_SUPATH</option> (stri
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If set, it will be used to define the PATH environment variable when the superuser login. The value can be preceded by <replaceable>PATH=</replaceable>, or a colon separated list of paths (for example <replaceable>/sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is <replaceable>PATH=/sbin:/bin:/usr/sbin:/usr/bin</replaceable>."
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/sbin:/bin:/usr/sbin:/usr/bin</replaceable>."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1421,24 +2345,39 @@ msgid "<option>ENV_TZ</option> (string)"
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If set, it will be used to define the TZ environment variable when a user login. The value can be the name of a timezone preceded by <replaceable>TZ=</replaceable> (for example <replaceable>TZ=CST6CDT</replaceable>), or the full path to the file containing the timezone specification (for example <filename>/etc/tzname</filename>)."
+msgid ""
+"If set, it will be used to define the TZ environment variable when a user "
+"login. The value can be the name of a timezone preceded by <replaceable>TZ=</"
+"replaceable> (for example <replaceable>TZ=CST6CDT</replaceable>), or the "
+"full path to the file containing the timezone specification (for example "
+"<filename>/etc/tzname</filename>)."
 msgstr ""
 
 #. TODO: it can in fact be used to set any other variable
 #: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
-msgid "If a full path is specified but the file does not exist or cannot be read, the default is to use <replaceable>TZ=CST6CDT</replaceable>."
+msgid ""
+"If a full path is specified but the file does not exist or cannot be read, "
+"the default is to use <replaceable>TZ=CST6CDT</replaceable>."
 msgstr ""
 
-#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term) chsh.1.xml:32(term) chfn.1.xml:32(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: chsh.1.xml:32(term) chfn.1.xml:32(term)
 msgid "<option>LOGIN_STRING</option> (string)"
 msgstr ""
 
-#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para) chsh.1.xml:34(para) chfn.1.xml:34(para)
-msgid "The string used for prompting a password. The default is to use \"Password: \", or a translation of that string. If you set this variable, the prompt will no be translated."
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#: chsh.1.xml:34(para) chfn.1.xml:34(para)
+msgid ""
+"The string used for prompting a password. The default is to use \"Password: "
+"\", or a translation of that string. If you set this variable, the prompt "
+"will no be translated."
 msgstr ""
 
-#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para) chsh.1.xml:39(para) chfn.1.xml:39(para)
-msgid "If the string contains <replaceable>%s</replaceable>, this will be replaced by the user's name."
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
+#: chsh.1.xml:39(para) chfn.1.xml:39(para)
+msgid ""
+"If the string contains <replaceable>%s</replaceable>, this will be replaced "
+"by the user's name."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1450,7 +2389,9 @@ msgid "Enable checking and display of ma
 msgstr ""
 
 #: su.1.xml:37(para) login.defs.5.xml:37(para) login.1.xml:37(para)
-msgid "You should disable it if the shell startup files already check for mail (\"mailx -e\" or equivalent)."
+msgid ""
+"You should disable it if the shell startup files already check for mail "
+"(\"mailx -e\" or equivalent)."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1474,7 +2415,11 @@ msgid "<option>SU_NAME</option> (string)
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para)
-msgid "If defined, the command name to display when running \"su -\". For example, if this is defined as \"su\" then a \"ps\" will display the command is \"-su\". If not defined, then \"ps\" would display the name of the shell actually being run, e.g. something like \"-sh\"."
+msgid ""
+"If defined, the command name to display when running \"su -\". For example, "
+"if this is defined as \"su\" then a \"ps\" will display the command is \"-su"
+"\". If not defined, then \"ps\" would display the name of the shell actually "
+"being run, e.g. something like \"-sh\"."
 msgstr ""
 
 #: su.1.xml:33(term) login.defs.5.xml:33(term)
@@ -1482,7 +2427,12 @@ msgid "<option>SU_WHEEL_ONLY</option> (b
 msgstr ""
 
 #: su.1.xml:35(para) login.defs.5.xml:35(para)
-msgid "If <replaceable>yes</replaceable>, the user must be listed as a member of the first gid 0 group in <filename>/etc/group</filename> (called <replaceable>root</replaceable> on most Linux systems) to be able to <command>su</command> to uid 0 accounts. If the group doesn't exist or is empty, no one will be able to <command>su</command> to uid 0."
+msgid ""
+"If <replaceable>yes</replaceable>, the user must be listed as a member of "
+"the first gid 0 group in <filename>/etc/group</filename> (called "
+"<replaceable>root</replaceable> on most Linux systems) to be able to "
+"<command>su</command> to uid 0 accounts. If the group doesn't exist or is "
+"empty, no one will be able to <command>su</command> to uid 0."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term)
@@ -1490,19 +2440,27 @@ msgid "<option>SYSLOG_SU_ENAB</option> (
 msgstr ""
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para)
-msgid "Enable \"syslog\" logging of <command>su</command> activity - in addition to sulog file logging."
+msgid ""
+"Enable \"syslog\" logging of <command>su</command> activity - in addition to "
+"sulog file logging."
 msgstr ""
 
 #: su.1.xml:363(para)
-msgid "On success, <command>su</command> returns the exit value of the command it executed."
+msgid ""
+"On success, <command>su</command> returns the exit value of the command it "
+"executed."
 msgstr ""
 
 #: su.1.xml:367(para)
-msgid "If this command was terminated by a signal, <command>su</command> returns the number of this signal plus 128."
+msgid ""
+"If this command was terminated by a signal, <command>su</command> returns "
+"the number of this signal plus 128."
 msgstr ""
 
 #: su.1.xml:371(para)
-msgid "If su has to kill the command (because it was asked to terminate, and the command did not terminate in time), <command>su</command> returns 255."
+msgid ""
+"If su has to kill the command (because it was asked to terminate, and the "
+"command did not terminate in time), <command>su</command> returns 255."
 msgstr ""
 
 #: su.1.xml:383(para)
@@ -1530,11 +2488,19 @@ msgid "The requested command could not b
 msgstr ""
 
 #: su.1.xml:376(para)
-msgid "Some exit values from <command>su</command> are independent from the executed command: <placeholder-1/>"
+msgid ""
+"Some exit values from <command>su</command> are independent from the "
+"executed command: <placeholder-1/>"
 msgstr ""
 
 #: su.1.xml:410(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>."
+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)
@@ -1558,7 +2524,16 @@ msgid "group <placeholder-1/> command"
 msgstr ""
 
 #: sg.1.xml:60(para)
-msgid "The <command>sg</command> command works similar to <command>newgrp</command> but accepts a command. The command will be executed with the <filename>/bin/sh</filename> shell. With most shells you may run <command>sg</command> from, you need to enclose multi-word commands in quotes. Another difference between <command>newgrp</command> and <command>sg</command> is that some shells treat <command>newgrp</command> specially, replacing themselves with a new instance of a shell that <command>newgrp</command> creates. This doesn't happen with <command>sg</command>, so upon exit from a <command>sg</command> command you are returned to your previous group ID."
+msgid ""
+"The <command>sg</command> command works similar to <command>newgrp</command> "
+"but accepts a command. The command will be executed with the <filename>/bin/"
+"sh</filename> shell. With most shells you may run <command>sg</command> "
+"from, you need to enclose multi-word commands in quotes. Another difference "
+"between <command>newgrp</command> and <command>sg</command> is that some "
+"shells treat <command>newgrp</command> specially, replacing themselves with "
+"a new instance of a shell that <command>newgrp</command> creates. This "
+"doesn't happen with <command>sg</command>, so upon exit from a <command>sg</"
+"command> command you are returned to your previous group ID."
 msgstr ""
 
 #: sg.1.xml:32(term) newgrp.1.xml:32(term) login.defs.5.xml:32(term)
@@ -1570,10 +2545,24 @@ msgid "Enable \"syslog\" logging of <com
 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><phrase condition=\"gshadow\">, <citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
-msgstr ""
-
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname) shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname) pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable) grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+msgid ""
+"<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry><phrase condition=\"gshadow\">, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry></phrase>."
+msgstr ""
+
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
+#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
+#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
+#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr ""
 
@@ -1582,15 +2571,21 @@ msgid "shadowed password file"
 msgstr ""
 
 #: shadow.5.xml:45(para)
-msgid "<filename>shadow</filename> is a file which contains the password information for the system's accounts and optional aging information."
+msgid ""
+"<filename>shadow</filename> is a file which contains the password "
+"information for the system's accounts and optional aging information."
 msgstr ""
 
 #: shadow.5.xml:51(para) gshadow.5.xml:49(para)
-msgid "This file must not be readable by regular users if password security is to be maintained."
+msgid ""
+"This file must not be readable by regular users if password security is to "
+"be maintained."
 msgstr ""
 
 #: shadow.5.xml:56(para)
-msgid "Each line of this file contains 9 fields, separated by colons (<quote>:</quote>), in the following order:"
+msgid ""
+"Each line of this file contains 9 fields, separated by colons (<quote>:</"
+"quote>), in the following order:"
 msgstr ""
 
 #: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
@@ -1606,19 +2601,32 @@ msgid "encrypted password"
 msgstr ""
 
 #: shadow.5.xml:73(para) gshadow.5.xml:70(para)
-msgid "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry> for details on how this string is interpreted."
+msgid ""
+"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
 
 #: shadow.5.xml:78(para)
-msgid "If the password field contains some string that is not a valid result of <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>, for instance ! or *, the user will not be able to use a unix password to log in (but the user may log in the system by other means)."
+msgid ""
+"If the password field contains some string that is not a valid result of "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, for instance ! or *, the user will not be able to use a unix "
+"password to log in (but the user may log in the system by other means)."
 msgstr ""
 
 #: shadow.5.xml:85(para)
-msgid "This field may be empty, in which case no passwords are required to authenticate as the specified login name. However, some applications which read the <filename>/etc/shadow</filename> file may decide not to permit any access at all if the password field is empty."
+msgid ""
+"This field may be empty, in which case no passwords are required to "
+"authenticate as the specified login name. However, some applications which "
+"read the <filename>/etc/shadow</filename> file may decide not to permit any "
+"access at all if the password field is empty."
 msgstr ""
 
 #: shadow.5.xml:92(para) gshadow.5.xml:92(para)
-msgid "A password field which starts with a exclamation mark means that the password is locked. The remaining characters on the line represent the password field before the password was locked."
+msgid ""
+"A password field which starts with a exclamation mark means that the "
+"password is locked. The remaining characters on the line represent the "
+"password field before the password was locked."
 msgstr ""
 
 #: shadow.5.xml:102(emphasis)
@@ -1626,11 +2634,15 @@ msgid "date of last password change"
 msgstr ""
 
 #: shadow.5.xml:105(para)
-msgid "The date of the last password change, expressed as the number of days since Jan 1, 1970."
+msgid ""
+"The date of the last password change, expressed as the number of days since "
+"Jan 1, 1970."
 msgstr ""
 
 #: shadow.5.xml:109(para)
-msgid "The value 0 has a special meaning, which is that the user should change her pasword the next time she will log in the system."
+msgid ""
+"The value 0 has a special meaning, which is that the user should change her "
+"pasword the next time she will log in the system."
 msgstr ""
 
 #: shadow.5.xml:114(para)
@@ -1642,7 +2654,9 @@ msgid "minimum password age"
 msgstr ""
 
 #: shadow.5.xml:123(para)
-msgid "The minimum password age is the number of days the user will have to wait before she will be allowed to change her password again."
+msgid ""
+"The minimum password age is the number of days the user will have to wait "
+"before she will be allowed to change her password again."
 msgstr ""
 
 #: shadow.5.xml:128(para)
@@ -1654,19 +2668,27 @@ msgid "maximum password age"
 msgstr ""
 
 #: shadow.5.xml:137(para)
-msgid "The maximum password age is the number of days after which the user will have to change her password."
+msgid ""
+"The maximum password age is the number of days after which the user will "
+"have to change her password."
 msgstr ""
 
 #: shadow.5.xml:141(para)
-msgid "After this number of days is elapsed, the password may still be valid. The user should be asked to change her password the next time she will log in."
+msgid ""
+"After this number of days is elapsed, the password may still be valid. The "
+"user should be asked to change her password the next time she will log in."
 msgstr ""
 
 #: shadow.5.xml:146(para)
-msgid "An empty field means that there are no maximum password age, no password warning period, and no password inactivity period (see below)."
+msgid ""
+"An empty field means that there are no maximum password age, no password "
+"warning period, and no password inactivity period (see below)."
 msgstr ""
 
 #: shadow.5.xml:151(para)
-msgid "If the maximum password age is lower than the minimum password age, the user cannot change her password."
+msgid ""
+"If the maximum password age is lower than the minimum password age, the user "
+"cannot change her password."
 msgstr ""
 
 #: shadow.5.xml:159(emphasis)
@@ -1674,11 +2696,14 @@ msgid "password warning period"
 msgstr ""
 
 #: shadow.5.xml:162(para)
-msgid "The number of days before a password is going to expire (see the maximum password age above) during which the user should be warned."
+msgid ""
+"The number of days before a password is going to expire (see the maximum "
+"password age above) during which the user should be warned."
 msgstr ""
 
 #: shadow.5.xml:167(para)
-msgid "An empty field and value 0 mean that there are no password warning period."
+msgid ""
+"An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
 #: shadow.5.xml:175(emphasis)
@@ -1686,15 +2711,22 @@ msgid "password inactivity period"
 msgstr ""
 
 #: shadow.5.xml:178(para)
-msgid "The number of days after a password has expired (see the maximum password age above) during which the password should still be accepted (and the user should update her password during the next login)."
+msgid ""
+"The number of days after a password has expired (see the maximum password "
+"age above) during which the password should still be accepted (and the user "
+"should update her password during the next login)."
 msgstr ""
 
 #: shadow.5.xml:184(para)
-msgid "After expiration of the password and this expiration period is elapsed, no login is possible using the current user's password. The user should contact her administrator."
+msgid ""
+"After expiration of the password and this expiration period is elapsed, no "
+"login is possible using the current user's password. The user should contact "
+"her administrator."
 msgstr ""
 
 #: shadow.5.xml:189(para)
-msgid "An empty field means that there are no enforcement of an inactivity period."
+msgid ""
+"An empty field means that there are no enforcement of an inactivity period."
 msgstr ""
 
 #: shadow.5.xml:197(emphasis)
@@ -1702,11 +2734,16 @@ msgid "account expiration date"
 msgstr ""
 
 #: shadow.5.xml:200(para)
-msgid "The date of expiration of the account, expressed as the number of days since Jan 1, 1970."
+msgid ""
+"The date of expiration of the account, expressed as the number of days since "
+"Jan 1, 1970."
 msgstr ""
 
 #: shadow.5.xml:204(para)
-msgid "Note that an account expiration differs from a password expiration. In case of an acount expiration, the user shall not be allowed to login. In case of a password expiration, the user is not allowed to login using her password."
+msgid ""
+"Note that an account expiration differs from a password expiration. In case "
+"of an acount expiration, the user shall not be allowed to login. In case of "
+"a password expiration, the user is not allowed to login using her password."
 msgstr ""
 
 #: shadow.5.xml:210(para)
@@ -1714,7 +2751,9 @@ msgid "An empty field means that the acc
 msgstr ""
 
 #: shadow.5.xml:213(para)
-msgid "The value 0 should not be used as it is interpreted as either an account with no expiration, or as an expiration on Jan 1, 1970."
+msgid ""
+"The value 0 should not be used as it is interpreted as either an account "
+"with no expiration, or as an expiration on Jan 1, 1970."
 msgstr ""
 
 #: shadow.5.xml:221(emphasis)
@@ -1734,11 +2773,27 @@ 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."
+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>."
+msgid ""
+"<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>pwconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 
 #: shadow.3.xml:36(refmiscinfo)
@@ -1773,7 +2828,8 @@ msgstr ""
 msgid "*name"
 msgstr ""
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis) shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
+#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
 msgid ");"
 msgstr ""
 
@@ -1822,12 +2878,27 @@ msgid "int ulckpwdf();"
 msgstr ""
 
 #: shadow.3.xml:94(para)
-msgid "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the shadow password file, <filename>/etc/shadow</filename>. The structure in the <emphasis remap=\"I\">#include</emphasis> file is:"
+msgid ""
+"<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
+"shadow password file, <filename>/etc/shadow</filename>. The structure in the "
+"<emphasis remap=\"I\">#include</emphasis> file is:"
 msgstr ""
 
 #: shadow.3.xml:99(programlisting)
 #, no-wrap
-msgid "struct spwd {\n      char\t\t*sp_namp; /* user login name */\n      char\t\t*sp_pwdp; /* encrypted password */\n      long int\t\tsp_lstchg; /* last password change */\n      long int\t\tsp_min; /* days until change allowed. */\n      long int\t\tsp_max; /* days before change required */\n      long int\t\tsp_warn; /* days warning for expiration */\n      long int\t\tsp_inact; /* days before account inactive */\n      long int\t\tsp_expire; /* date when account expires */\n      unsigned long int\tsp_flag; /* reserved for future use */\n}\n    "
+msgid ""
+"struct spwd {\n"
+"      char\t\t*sp_namp; /* user login name */\n"
+"      char\t\t*sp_pwdp; /* encrypted password */\n"
+"      long int\t\tsp_lstchg; /* last password change */\n"
+"      long int\t\tsp_min; /* days until change allowed. */\n"
+"      long int\t\tsp_max; /* days before change required */\n"
+"      long int\t\tsp_warn; /* days warning for expiration */\n"
+"      long int\t\tsp_inact; /* days before account inactive */\n"
+"      long int\t\tsp_expire; /* date when account expires */\n"
+"      unsigned long int\tsp_flag; /* reserved for future use */\n"
+"}\n"
+"    "
 msgstr ""
 
 #: shadow.3.xml:111(para)
@@ -1855,11 +2926,15 @@ msgid "sp_max - days after which passwor
 msgstr ""
 
 #: shadow.3.xml:129(para)
-msgid "sp_warn - days before password is to expire that user is warned of pending password expiration"
+msgid ""
+"sp_warn - days before password is to expire that user is warned of pending "
+"password expiration"
 msgstr ""
 
 #: shadow.3.xml:134(para)
-msgid "sp_inact - days after password expires that account is considered inactive and disabled"
+msgid ""
+"sp_inact - days after password expires that account is considered inactive "
+"and disabled"
 msgstr ""
 
 #: shadow.3.xml:139(para)
@@ -1871,42 +2946,73 @@ msgid "sp_flag - reserved for future use
 msgstr ""
 
 #: shadow.3.xml:150(para)
-msgid "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, <emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each return a pointer to a <emphasis>struct spwd</emphasis>. <emphasis>getspent</emphasis> returns the next entry from the file, and <emphasis>fgetspent</emphasis> returns the next entry from the given stream, which is assumed to be a file of the proper format. <emphasis>sgetspent</emphasis> returns a pointer to a <emphasis>struct spwd</emphasis> using the provided string as input. <emphasis>getspnam</emphasis> searches from the current position in the file for an entry matching <emphasis>name</emphasis>."
+msgid ""
+"<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
+"<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
+"return a pointer to a <emphasis>struct spwd</emphasis>. <emphasis>getspent</"
+"emphasis> returns the next entry from the file, and <emphasis>fgetspent</"
+"emphasis> returns the next entry from the given stream, which is assumed to "
+"be a file of the proper format. <emphasis>sgetspent</emphasis> returns a "
+"pointer to a <emphasis>struct spwd</emphasis> using the provided string as "
+"input. <emphasis>getspnam</emphasis> searches from the current position in "
+"the file for an entry matching <emphasis>name</emphasis>."
 msgstr ""
 
 #: shadow.3.xml:163(para)
-msgid "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used to begin and end, respectively, access to the shadow password file."
+msgid ""
+"<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
+"to begin and end, respectively, access to the shadow password file."
 msgstr ""
 
 #: shadow.3.xml:169(para)
-msgid "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines should be used to insure exclusive access to the <filename>/etc/shadow</filename> file. <emphasis>lckpwdf</emphasis> attempts to acquire a lock using <emphasis>pw_lock</emphasis> for up to 15 seconds. It continues by attempting to acquire a second lock using <emphasis>spw_lock</emphasis> for the remainder of the initial 15 seconds. Should either attempt fail after a total of 15 seconds, <emphasis>lckpwdf</emphasis> returns -1. When both locks are acquired 0 is returned."
+msgid ""
+"The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
+"should be used to insure exclusive access to the <filename>/etc/shadow</"
+"filename> file. <emphasis>lckpwdf</emphasis> attempts to acquire a lock "
+"using <emphasis>pw_lock</emphasis> for up to 15 seconds. It continues by "
+"attempting to acquire a second lock using <emphasis>spw_lock</emphasis> for "
+"the remainder of the initial 15 seconds. Should either attempt fail after a "
+"total of 15 seconds, <emphasis>lckpwdf</emphasis> returns -1. When both "
+"locks are acquired 0 is returned."
 msgstr ""
 
 #: shadow.3.xml:184(para)
-msgid "Routines return NULL if no more entries are available or if an error occurs during processing. Routines which have <emphasis>int</emphasis> as the return value return 0 for success and -1 for failure."
+msgid ""
+"Routines return NULL if no more entries are available or if an error occurs "
+"during processing. Routines which have <emphasis>int</emphasis> as the "
+"return value return 0 for success and -1 for failure."
 msgstr ""
 
 #: shadow.3.xml:194(para)
-msgid "These routines may only be used by the superuser as access to the shadow password file is restricted."
+msgid ""
+"These routines may only be used by the superuser as access to the shadow "
+"password file is restricted."
 msgstr ""
 
 #: shadow.3.xml:214(para)
-msgid "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname) pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
+#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
 msgid "pwconv"
 msgstr ""
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command) login.defs.5.xml:410(term)
+#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
+#: login.defs.5.xml:410(term)
 msgid "pwunconv"
 msgstr ""
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command) login.defs.5.xml:314(term)
+#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
+#: login.defs.5.xml:314(term)
 msgid "grpconv"
 msgstr ""
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command) login.defs.5.xml:320(term)
+#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:320(term)
 msgid "grpunconv"
 msgstr ""
 
@@ -1915,62 +3021,125 @@ msgid "convert to and from shadow passwo
 msgstr ""
 
 #: pwconv.8.xml:72(para)
-msgid "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally existing <emphasis remap=\"I\">shadow</emphasis>."
+msgid ""
+"The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
+"emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
+"existing <emphasis remap=\"I\">shadow</emphasis>."
 msgstr ""
 
 #: pwconv.8.xml:77(para)
-msgid "<command>pwconv</command> does not work with <option>USE_TCB</option> enabled. To convert to tcb passwords, you should first use <command>pwconv</command> to convert to shadowed passwords by disabling <option>USE_TCB</option> in <filename>login.defs</filename> and then convert to tcb password using <command>tcb_convert</command> (and re-enable <option>USE_TCB</option> in <filename>login.defs</filename>.)"
+msgid ""
+"<command>pwconv</command> does not work with <option>USE_TCB</option> "
+"enabled. To convert to tcb passwords, you should first use <command>pwconv</"
+"command> to convert to shadowed passwords by disabling <option>USE_TCB</"
+"option> in <filename>login.defs</filename> and then convert to tcb password "
+"using <command>tcb_convert</command> (and re-enable <option>USE_TCB</option> "
+"in <filename>login.defs</filename>.)"
 msgstr ""
 
 #: pwconv.8.xml:87(para)
-msgid "The <command>pwunconv</command> command creates <emphasis remap=\"I\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and <emphasis remap=\"I\">shadow</emphasis> and then removes <emphasis remap=\"I\">shadow</emphasis>."
+msgid ""
+"The <command>pwunconv</command> command creates <emphasis remap=\"I"
+"\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
+"<emphasis remap=\"I\">shadow</emphasis> and then removes <emphasis remap=\"I"
+"\">shadow</emphasis>."
 msgstr ""
 
 #: pwconv.8.xml:93(para)
-msgid "<command>pwunconv</command> does not work with <option>USE_TCB</option> enabled. You should first switch back from tcb to shadowed passwords using <command>tcb_unconvert</command>, and then disable <option>USE_TCB</option> in <filename>login.defs</filename> before using <command>pwunconv</command>."
+msgid ""
+"<command>pwunconv</command> does not work with <option>USE_TCB</option> "
+"enabled. You should first switch back from tcb to shadowed passwords using "
+"<command>tcb_unconvert</command>, and then disable <option>USE_TCB</option> "
+"in <filename>login.defs</filename> before using <command>pwunconv</command>."
 msgstr ""
 
 #: pwconv.8.xml:102(para)
-msgid "The <command>grpconv</command> command creates <emphasis remap=\"I\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an optionally existing <emphasis remap=\"I\">gshadow</emphasis>."
+msgid ""
+"The <command>grpconv</command> command creates <emphasis remap=\"I"
+"\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
+"optionally existing <emphasis remap=\"I\">gshadow</emphasis>."
 msgstr ""
 
 #: pwconv.8.xml:108(para)
-msgid "The <command>grpunconv</command> command creates <emphasis remap=\"I\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and <emphasis remap=\"I\">gshadow</emphasis> and then removes <emphasis remap=\"I\">gshadow</emphasis>."
+msgid ""
+"The <command>grpunconv</command> command creates <emphasis remap=\"I"
+"\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
+"<emphasis remap=\"I\">gshadow</emphasis> and then removes <emphasis remap=\"I"
+"\">gshadow</emphasis>."
 msgstr ""
 
 #: pwconv.8.xml:115(para)
-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 ""
+"These four programs all operate on the normal and shadow password and group "
+"files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
+"<filename>/etc/shadow</filename>, and <filename>/etc/gshadow</filename>."
 msgstr ""
 
 #: pwconv.8.xml:122(para)
-msgid "Each program acquires the necessary locks before conversion. <command>pwconv</command> and <command>grpconv</command> are similar. First, entries in the shadowed file which don't exist in the main file are removed. Then, shadowed entries which don't have `x' as the password in the main file are updated. Any missing shadowed entries are added. Finally, passwords in the main file are replaced with `x'. These programs can be used for initial conversion as well to update the shadowed file if the main file is edited by hand."
+msgid ""
+"Each program acquires the necessary locks before conversion. "
+"<command>pwconv</command> and <command>grpconv</command> are similar. First, "
+"entries in the shadowed file which don't exist in the main file are removed. "
+"Then, shadowed entries which don't have `x' as the password in the main file "
+"are updated. Any missing shadowed entries are added. Finally, passwords in "
+"the main file are replaced with `x'. These programs can be used for initial "
+"conversion as well to update the shadowed file if the main file is edited by "
+"hand."
 msgstr ""
 
 #: pwconv.8.xml:133(para)
-msgid "<command>pwconv</command> will use the values of <emphasis remap=\"I\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, and <emphasis remap=\"I\">PASS_WARN_AGE</emphasis> from <filename>/etc/login.defs</filename> when adding new entries to <filename>/etc/shadow</filename>."
+msgid ""
+"<command>pwconv</command> will use the values of <emphasis remap=\"I"
+"\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
+"and <emphasis remap=\"I\">PASS_WARN_AGE</emphasis> from <filename>/etc/login."
+"defs</filename> when adding new entries to <filename>/etc/shadow</filename>."
 msgstr ""
 
 #: pwconv.8.xml:142(para)
-msgid "Likewise <command>pwunconv</command> and <command>grpunconv</command> are similar. Passwords in the main file are updated from the shadowed file. Entries which exist in the main file but not in the shadowed file are left alone. Finally, the shadowed file is removed. Some password aging information is lost by <command>pwunconv</command>. It will convert what it can."
+msgid ""
+"Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
+"similar. Passwords in the main file are updated from the shadowed file. "
+"Entries which exist in the main file but not in the shadowed file are left "
+"alone. Finally, the shadowed file is removed. Some password aging "
+"information is lost by <command>pwunconv</command>. It will convert what it "
+"can."
 msgstr ""
 
 #: pwconv.8.xml:154(para)
-msgid "Errors in the password or group files (such as invalid or duplicate entries) may cause these programs to loop forever or fail in other strange ways. Please run <command>pwck</command> and <command>grpck</command> to correct any such errors before converting to or from shadow passwords or groups."
+msgid ""
+"Errors in the password or group files (such as invalid or duplicate entries) "
+"may cause these programs to loop forever or fail in other strange ways. "
+"Please run <command>pwck</command> and <command>grpck</command> to correct "
+"any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
 #: pwconv.8.xml:165(para)
-msgid "The following configuration variable in <filename>/etc/login.defs</filename> changes the behavior of <command>grpconv</command> and <command>grpunconv</command>:"
+msgid ""
+"The following configuration variable in <filename>/etc/login.defs</filename> "
+"changes the behavior of <command>grpconv</command> and <command>grpunconv</"
+"command>:"
 msgstr ""
 
 #: pwconv.8.xml:173(para)
-msgid "The following configuration variables in <filename>/etc/login.defs</filename> change the behavior of <command>pwconv</command>:"
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
 #: pwconv.8.xml:200(para)
-msgid "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry><phrase condition=\"tcb\">, <citerefentry><refentrytitle>tcb_convert</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>tcb_unconvert</refentrytitle><manvolnum>8</manvolnum></citerefentry></phrase>."
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry><phrase condition=\"tcb\">, "
+"<citerefentry><refentrytitle>tcb_convert</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>tcb_unconvert</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry></phrase>."
 msgstr ""
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command) pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
+#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
 msgid "pwck"
 msgstr ""
 
@@ -1982,20 +3151,32 @@ msgstr ""
 msgid "-q"
 msgstr ""
 
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg) grpck.8.xml:149(option)
+#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:149(option)
 msgid "-s"
 msgstr ""
 
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(replaceable) passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname) passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname) passwd.1.xml:55(command) login.defs.5.xml:381(term)
+#: pwck.8.xml:59(replaceable) pwck.8.xml:74(replaceable)
+#: passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname)
+#: passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname)
+#: passwd.1.xml:55(command) login.defs.5.xml:381(term)
 msgid "passwd"
 msgstr ""
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option) grpck.8.xml:49(arg) grpck.8.xml:139(option)
+#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
 msgid "-r"
 msgstr ""
 
 #: pwck.8.xml:87(para)
-msgid "The <command>pwck</command> command verifies the integrity of the users and authentication information. It checks that all entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb\">(or the files in <filename>/etc/tcb</filename>, when <option>USE_TCB</option> is enabled)</phrase> have the proper format and contain valid data. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
+msgid ""
+"The <command>pwck</command> command verifies the integrity of the users and "
+"authentication information. It checks that all entries in <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
+"\">(or the files in <filename>/etc/tcb</filename>, when <option>USE_TCB</"
+"option> is enabled)</phrase> have the proper format and contain valid data. "
+"The user is prompted to delete entries that are improperly formatted or "
+"which have other uncorrectable errors."
 msgstr ""
 
 #: pwck.8.xml:99(para) grpck.8.xml:80(para)
@@ -2027,7 +3208,9 @@ msgid "a valid login shell"
 msgstr ""
 
 #: pwck.8.xml:121(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."
+msgid ""
+"<filename>shadow</filename> checks are enabled when a second file parameter "
+"is specified or when <filename>/etc/shadow</filename> exists on the system."
 msgstr ""
 
 #: pwck.8.xml:126(para)
@@ -2035,7 +3218,9 @@ msgid "These checks are the following:"
 msgstr ""
 
 #: pwck.8.xml:131(para)
-msgid "every passwd entry has a matching shadow entry, and every shadow entry has a matching passwd entry"
+msgid ""
+"every passwd entry has a matching shadow entry, and every shadow entry has a "
+"matching passwd entry"
 msgstr ""
 
 #: pwck.8.xml:137(para)
@@ -2055,11 +3240,21 @@ msgid "the last password changes are not
 msgstr ""
 
 #: pwck.8.xml:150(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."
+msgid ""
+"The checks for correct number of fields and unique user name are fatal. If "
+"the entry has the wrong number of fields, the user will be prompted to "
+"delete the entire line. If the user does not answer affirmatively, all "
+"further checks are bypassed. An entry with a duplicated user name is "
+"prompted for deletion, but the remaining checks will still be made. All "
+"other errors are warning and the user is encouraged to run the "
+"<command>usermod</command> command to correct the error."
 msgstr ""
 
 #: pwck.8.xml:161(para)
-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."
+msgid ""
+"The commands which operate on the <filename>/etc/passwd</filename> file are "
+"not able to alter corrupted or duplicated entries. <command>pwck</command> "
+"should be used in those circumstances to remove the offending entry."
 msgstr ""
 
 #: pwck.8.xml:171(para)
@@ -2067,7 +3262,9 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: pwck.8.xml:180(para)
-msgid "Report errors only. The warnings which do not require any action from the user won't be displayed."
+msgid ""
+"Report errors only. The warnings which do not require any action from the "
+"user won't be displayed."
 msgstr ""
 
 #: pwck.8.xml:191(para)
@@ -2075,7 +3272,9 @@ msgid "Execute the <command>pwck</comman
 msgstr ""
 
 #: pwck.8.xml:201(para)
-msgid "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename> by UID."
+msgid ""
+"Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
+"filename> by UID."
 msgstr ""
 
 #: pwck.8.xml:205(para)
@@ -2083,11 +3282,19 @@ msgid "This option has no effect when <o
 msgstr ""
 
 #: pwck.8.xml:212(para)
-msgid "By default, <command>pwck</command> operates on the files <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb\"> (or the files in <filename>/etc/tcb</filename>)</phrase>. The user may select alternate files with the <replaceable>passwd</replaceable> and <replaceable>shadow</replaceable> parameters."
+msgid ""
+"By default, <command>pwck</command> operates on the files <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
+"\"> (or the files in <filename>/etc/tcb</filename>)</phrase>. The user may "
+"select alternate files with the <replaceable>passwd</replaceable> and "
+"<replaceable>shadow</replaceable> parameters."
 msgstr ""
 
 #: pwck.8.xml:221(para)
-msgid "Note that when <option>USE_TCB</option> is enabled, you cannot specify an alternative <replaceable>shadow</replaceable> file. In future releases, this paramater could be replaced by an alternate TCB directory."
+msgid ""
+"Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
+"alternative <replaceable>shadow</replaceable> file. In future releases, this "
+"paramater could be replaced by an alternate TCB directory."
 msgstr ""
 
 #: pwck.8.xml:290(para)
@@ -2111,11 +3318,21 @@ msgid "can't sort password files"
 msgstr ""
 
 #: pwck.8.xml:272(para)
-msgid "The <command>pwck</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>pwck</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #: pwck.8.xml:323(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>."
+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)
@@ -2127,15 +3344,30 @@ msgid "port access time file"
 msgstr ""
 
 #: porttime.5.xml:45(para)
-msgid "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, user names, and permitted login times."
+msgid ""
+"<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
+"user names, and permitted login times."
 msgstr ""
 
 #: porttime.5.xml:50(para)
-msgid "Each entry consists of three colon separated fields. The first field is a comma separated list of tty devices, or an asterisk to indicate that all tty devices are matched by this entry. The second field is a comma separated list of user names, or an asterisk to indicated that all user names are matched by this entry. The third field is a comma separated list of permitted access times."
+msgid ""
+"Each entry consists of three colon separated fields. The first field is a "
+"comma separated list of tty devices, or an asterisk to indicate that all tty "
+"devices are matched by this entry. The second field is a comma separated "
+"list of user names, or an asterisk to indicated that all user names are "
+"matched by this entry. The third field is a comma separated list of "
+"permitted access times."
 msgstr ""
 
 #: porttime.5.xml:59(para)
-msgid "Each access time entry consists of zero or more days of the week, abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</emphasis>, <emphasis>We</emphasis>, <emphasis>Th</emphasis>, <emphasis>Fr</emphasis>, and <emphasis>Sa</emphasis>, followed by a pair of times separated by a hyphen. The abbreviation <emphasis>Wk</emphasis> may be used to represent Monday thru Friday, and <emphasis>Al</emphasis> may be used to indicate every day. If no days are given, <emphasis>Al</emphasis> is assumed."
+msgid ""
+"Each access time entry consists of zero or more days of the week, "
+"abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
+"emphasis>, <emphasis>We</emphasis>, <emphasis>Th</emphasis>, <emphasis>Fr</"
+"emphasis>, and <emphasis>Sa</emphasis>, followed by a pair of times "
+"separated by a hyphen. The abbreviation <emphasis>Wk</emphasis> may be used "
+"to represent Monday thru Friday, and <emphasis>Al</emphasis> may be used to "
+"indicate every day. If no days are given, <emphasis>Al</emphasis> is assumed."
 msgstr ""
 
 #: porttime.5.xml:73(title)
@@ -2143,7 +3375,9 @@ msgid "EXAMPLES"
 msgstr ""
 
 #: porttime.5.xml:74(para)
-msgid "The following entry allows access to user <emphasis remap=\"B\">jfh</emphasis> on every port during weekdays from 9am to 5pm."
+msgid ""
+"The following entry allows access to user <emphasis remap=\"B\">jfh</"
+"emphasis> on every port during weekdays from 9am to 5pm."
 msgstr ""
 
 #: porttime.5.xml:80(para)
@@ -2151,16 +3385,27 @@ msgid "*:jfh:Wk0900-1700"
 msgstr ""
 
 #: porttime.5.xml:82(para)
-msgid "The following entries allow access only to the users <emphasis>root</emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> at any time. This illustrates how the <filename>/etc/porttime</filename> file is an ordered list of access times. Any other user would match the second entry which does not permit access at any time."
+msgid ""
+"The following entries allow access only to the users <emphasis>root</"
+"emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
+"at any time. This illustrates how the <filename>/etc/porttime</filename> "
+"file is an ordered list of access times. Any other user would match the "
+"second entry which does not permit access at any time."
 msgstr ""
 
 #: porttime.5.xml:91(programlisting)
 #, no-wrap
-msgid "\n      console:root,oper:Al0000-2400\n      console:*:\n    "
+msgid ""
+"\n"
+"      console:root,oper:Al0000-2400\n"
+"      console:*:\n"
+"    "
 msgstr ""
 
 #: porttime.5.xml:96(para)
-msgid "The following entry allows access for the user <emphasis>games</emphasis> on any port during non-working hours."
+msgid ""
+"The following entry allows access for the user <emphasis>games</emphasis> on "
+"any port during non-working hours."
 msgstr ""
 
 #: porttime.5.xml:101(para)
@@ -2176,7 +3421,9 @@ msgid "File containing port access."
 msgstr ""
 
 #: porttime.5.xml:118(para) login.access.5.xml:109(para)
-msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>."
 msgstr ""
 
 #: passwd.5.xml:40(refpurpose)
@@ -2184,7 +3431,9 @@ msgid "the password file"
 msgstr ""
 
 #: passwd.5.xml:45(para)
-msgid "<filename>/etc/passwd</filename> contains one line for each user account, with seven fields delimited by colons (<quote>:</quote>). These fields are:"
+msgid ""
+"<filename>/etc/passwd</filename> contains one line for each user account, "
+"with seven fields delimited by colons (<quote>:</quote>). These fields are:"
 msgstr ""
 
 #: passwd.5.xml:56(para)
@@ -2212,19 +3461,44 @@ msgid "optional user command interpreter
 msgstr ""
 
 #: passwd.5.xml:75(para)
-msgid "The encrypted password field may be blank, in which case no password is required to authenticate as the specified login name. However, some applications which read the <filename>/etc/passwd</filename> file may decide not to permit <emphasis>any</emphasis> access at all if the <emphasis>password</emphasis> field is blank. If the <emphasis>password</emphasis> field is a lower-case <quote>x</quote>, then the encrypted password is actually stored in the <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry> file instead; there <emphasis>must</emphasis> be a corresponding line in the <filename>/etc/shadow</filename> file, or else the user account is invalid. If the <emphasis>password</emphasis> field is any other string, then it will be treated as an encrypted password, as specified by <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>."
+msgid ""
+"The encrypted password field may be blank, in which case no password is "
+"required to authenticate as the specified login name. However, some "
+"applications which read the <filename>/etc/passwd</filename> file may decide "
+"not to permit <emphasis>any</emphasis> access at all if the "
+"<emphasis>password</emphasis> field is blank. If the <emphasis>password</"
+"emphasis> field is a lower-case <quote>x</quote>, then the encrypted "
+"password is actually stored in the <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry> file instead; there "
+"<emphasis>must</emphasis> be a corresponding line in the <filename>/etc/"
+"shadow</filename> file, or else the user account is invalid. If the "
+"<emphasis>password</emphasis> field is any other string, then it will be "
+"treated as an encrypted password, as specified by "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>."
 msgstr ""
 
 #: passwd.5.xml:94(para)
-msgid "The comment field is used by various system utilities, such as <citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
+msgid ""
+"The comment field is used by various system utilities, such as "
+"<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>."
 msgstr ""
 
 #: passwd.5.xml:100(para)
-msgid "The home directory field provides the name of the initial working directory. The <command>login</command> program uses this information to set the value of the <envar>$HOME</envar> environmental variable."
+msgid ""
+"The home directory field provides the name of the initial working directory. "
+"The <command>login</command> program uses this information to set the value "
+"of the <envar>$HOME</envar> environmental variable."
 msgstr ""
 
 #: passwd.5.xml:106(para)
-msgid "The command interpreter field provides the name of the user's command language interpreter, or the name of the initial program to execute. The <command>login</command> program uses this information to set the value of the <envar>$SHELL</envar> environmental variable. If this field is empty, it defaults to the value <filename>/bin/sh</filename>."
+msgid ""
+"The command interpreter field provides the name of the user's command "
+"language interpreter, or the name of the initial program to execute. The "
+"<command>login</command> program uses this information to set the value of "
+"the <envar>$SHELL</envar> environmental variable. If this field is empty, it "
+"defaults to the value <filename>/bin/sh</filename>."
 msgstr ""
 
 #: passwd.5.xml:127(para)
@@ -2240,7 +3514,23 @@ 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>."
+msgid ""
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getent</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>pwunconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
 #: passwd.1.xml:50(refpurpose)
@@ -2248,7 +3538,11 @@ msgid "change user password"
 msgstr ""
 
 #: passwd.1.xml:67(para)
-msgid "The <command>passwd</command> command changes passwords for user accounts. A normal user may only change the password for his/her own account, while the superuser may change the password for any account. <command>passwd</command> also changes the account or associated password validity period."
+msgid ""
+"The <command>passwd</command> command changes passwords for user accounts. A "
+"normal user may only change the password for his/her own account, while the "
+"superuser may change the password for any account. <command>passwd</command> "
+"also changes the account or associated password validity period."
 msgstr ""
 
 #: passwd.1.xml:76(title)
@@ -2256,19 +3550,32 @@ msgid "Password Changes"
 msgstr ""
 
 #: passwd.1.xml:77(para)
-msgid "The user is first prompted for his/her old password, if one is present. This password is then encrypted and compared against the stored password. The user has only one chance to enter the correct password. The superuser is permitted to bypass this step so that forgotten passwords may be changed."
+msgid ""
+"The user is first prompted for his/her old password, if one is present. This "
+"password is then encrypted and compared against the stored password. The "
+"user has only one chance to enter the correct password. The superuser is "
+"permitted to bypass this step so that forgotten passwords may be changed."
 msgstr ""
 
 #: passwd.1.xml:85(para)
-msgid "After the password has been entered, password aging information is checked to see if the user is permitted to change the password at this time. If not, <command>passwd</command> refuses to change the password and exits."
+msgid ""
+"After the password has been entered, password aging information is checked "
+"to see if the user is permitted to change the password at this time. If not, "
+"<command>passwd</command> refuses to change the password and exits."
 msgstr ""
 
 #: passwd.1.xml:92(para)
-msgid "The user is then prompted twice for a replacement password. The second entry is compared against the first and both are required to match in order for the password to be changed."
+msgid ""
+"The user is then prompted twice for a replacement password. The second entry "
+"is compared against the first and both are required to match in order for "
+"the password to be changed."
 msgstr ""
 
 #: passwd.1.xml:98(para)
-msgid "Then, the password is tested for complexity. As a general guideline, passwords should consist of 6 to 8 characters including one or more characters from each of the following sets:"
+msgid ""
+"Then, the password is tested for complexity. As a general guideline, "
+"passwords should consist of 6 to 8 characters including one or more "
+"characters from each of the following sets:"
 msgstr ""
 
 #: passwd.1.xml:106(para)
@@ -2284,7 +3591,10 @@ msgid "punctuation marks"
 msgstr ""
 
 #: passwd.1.xml:116(para)
-msgid "Care must be taken not to include the system default erase or kill characters. <command>passwd</command> will reject any password which is not suitably complex."
+msgid ""
+"Care must be taken not to include the system default erase or kill "
+"characters. <command>passwd</command> will reject any password which is not "
+"suitably complex."
 msgstr ""
 
 #: passwd.1.xml:125(title)
@@ -2292,15 +3602,28 @@ msgid "Hints for user passwords"
 msgstr ""
 
 #: passwd.1.xml:126(para)
-msgid "The security of a password depends upon the strength of the encryption algorithm and the size of the key space. The legacy <emphasis>UNIX</emphasis> System encryption method is based on the NBS DES algorithm. More recent methods are now recommended (see <option>ENCRYPT_METHOD</option>). The size of the key space depends upon the randomness of the password which is selected."
+msgid ""
+"The security of a password depends upon the strength of the encryption "
+"algorithm and the size of the key space. The legacy <emphasis>UNIX</"
+"emphasis> System encryption method is based on the NBS DES algorithm. More "
+"recent methods are now recommended (see <option>ENCRYPT_METHOD</option>). "
+"The size of the key space depends upon the randomness of the password which "
+"is selected."
 msgstr ""
 
 #: passwd.1.xml:135(para)
-msgid "Compromises in password security normally result from careless password selection or handling. For this reason, you should not select a password which appears in a dictionary or which must be written down. The password should also not be a proper name, your license number, birth date, or street address. Any of these may be used as guesses to violate system security."
+msgid ""
+"Compromises in password security normally result from careless password "
+"selection or handling. For this reason, you should not select a password "
+"which appears in a dictionary or which must be written down. The password "
+"should also not be a proper name, your license number, birth date, or street "
+"address. Any of these may be used as guesses to violate system security."
 msgstr ""
 
 #: passwd.1.xml:144(para)
-msgid "You can find advices on how to choose a strong password on http://en.wikipedia.org/wiki/Password_strength"
+msgid ""
+"You can find advices on how to choose a strong password on http://en."
+"wikipedia.org/wiki/Password_strength"
 msgstr ""
 
 #: passwd.1.xml:153(para)
@@ -2312,7 +3635,9 @@ msgid "<option>-a</option>, <option>--al
 msgstr ""
 
 #: passwd.1.xml:162(para)
-msgid "This option can be used only with <option>-S</option> and causes show status for all users."
+msgid ""
+"This option can be used only with <option>-S</option> and causes show status "
+"for all users."
 msgstr ""
 
 #: passwd.1.xml:169(term)
@@ -2320,7 +3645,9 @@ msgid "<option>-d</option>, <option>--de
 msgstr ""
 
 #: passwd.1.xml:173(para)
-msgid "Delete a user's password (make it empty). This is a quick way to disable a password for an account. It will set the named account passwordless."
+msgid ""
+"Delete a user's password (make it empty). This is a quick way to disable a "
+"password for an account. It will set the named account passwordless."
 msgstr ""
 
 #: passwd.1.xml:181(term)
@@ -2328,15 +3655,23 @@ msgid "<option>-e</option>, <option>--ex
 msgstr ""
 
 #: passwd.1.xml:185(para)
-msgid "Immediately expire an account's password. This in effect can force a user to change his/her password at the user's next login."
+msgid ""
+"Immediately expire an account's password. This in effect can force a user to "
+"change his/her password at the user's next login."
 msgstr ""
 
 #: passwd.1.xml:198(term)
-msgid "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</replaceable>"
+msgid ""
+"<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
+"replaceable>"
 msgstr ""
 
 #: passwd.1.xml:202(para)
-msgid "This option is used to disable an account after the password has been expired for a number of days. After a user account has had an expired password for <replaceable>INACTIVE</replaceable> days, the user may no longer sign on to the account."
+msgid ""
+"This option is used to disable an account after the password has been "
+"expired for a number of days. After a user account has had an expired "
+"password for <replaceable>INACTIVE</replaceable> days, the user may no "
+"longer sign on to the account."
 msgstr ""
 
 #: passwd.1.xml:211(term)
@@ -2344,7 +3679,10 @@ msgid "<option>-k</option>, <option>--ke
 msgstr ""
 
 #: passwd.1.xml:215(para)
-msgid "Indicate password change should be performed only for expired authentication tokens (passwords). The user wishes to keep their non-expired tokens as before."
+msgid ""
+"Indicate password change should be performed only for expired authentication "
+"tokens (passwords). The user wishes to keep their non-expired tokens as "
+"before."
 msgstr ""
 
 #: passwd.1.xml:223(term)
@@ -2352,11 +3690,18 @@ msgid "<option>-l</option>, <option>--lo
 msgstr ""
 
 #: passwd.1.xml:227(para)
-msgid "Lock the password of the named account. This option disables a password by changing it to a value which matches no possible encrypted value (it adds a ´!´ at the beginning of the password)."
+msgid ""
+"Lock the password of the named account. This option disables a password by "
+"changing it to a value which matches no possible encrypted value (it adds a "
+"´!´ at the beginning of the password)."
 msgstr ""
 
 #: passwd.1.xml:233(para)
-msgid "Note that this does not disable the account. The user may still be able to login using another authentication token (e.g. an SSH key). To disable the account, administrators should use <command>usermod --expiredate 1</command> (this set the account's expire date to Jan 2, 1970)."
+msgid ""
+"Note that this does not disable the account. The user may still be able to "
+"login using another authentication token (e.g. an SSH key). To disable the "
+"account, administrators should use <command>usermod --expiredate 1</command> "
+"(this set the account's expire date to Jan 2, 1970)."
 msgstr ""
 
 #: passwd.1.xml:240(para)
@@ -2364,15 +3709,22 @@ msgid "Users with a locked password are 
 msgstr ""
 
 #: passwd.1.xml:247(term)
-msgid "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</replaceable>"
+msgid ""
+"<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
 msgstr ""
 
 #: passwd.1.xml:251(para) chage.1.xml:146(para)
-msgid "Set the minimum number of days between password changes to <replaceable>MIN_DAYS</replaceable>. A value of zero for this field indicates that the user may change his/her password at any time."
+msgid ""
+"Set the minimum number of days between password changes to "
+"<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
+"indicates that the user may change his/her password at any time."
 msgstr ""
 
 #: passwd.1.xml:269(term)
-msgid "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</replaceable>"
+msgid ""
+"<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
+"replaceable>"
 msgstr ""
 
 #: passwd.1.xml:273(para)
@@ -2384,7 +3736,14 @@ msgid "<option>-S</option>, <option>--st
 msgstr ""
 
 #: passwd.1.xml:283(para)
-msgid "Display account status information. The status information consists of 7 fields. The first field is the user's login name. The second field indicates if the user account has a locked password (L), has no password (NP), or has a usable password (P). The third field gives the date of the last password change. The next four fields are the minimum age, maximum age, warning period, and inactivity period for the password. These ages are expressed in days."
+msgid ""
+"Display account status information. The status information consists of 7 "
+"fields. The first field is the user's login name. The second field indicates "
+"if the user account has a locked password (L), has no password (NP), or has "
+"a usable password (P). The third field gives the date of the last password "
+"change. The next four fields are the minimum age, maximum age, warning "
+"period, and inactivity period for the password. These ages are expressed in "
+"days."
 msgstr ""
 
 #: passwd.1.xml:297(term)
@@ -2392,71 +3751,124 @@ msgid "<option>-u</option>, <option>--un
 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)."
+msgid ""
+"Unlock the password of the named account. This option re-enables a password "
+"by changing the password back to its previous value (to the value before "
+"using the <option>-l</option> option)."
 msgstr ""
 
 #: passwd.1.xml:310(term)
-msgid "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</replaceable>"
+msgid ""
+"<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
+"replaceable>"
 msgstr ""
 
 #: 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."
+msgid ""
+"Set the number of days of warning before a password change is required. The "
+"<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
+"the password expiring that a user will be warned that his/her password is "
+"about to expire."
 msgstr ""
 
 #: passwd.1.xml:323(term)
-msgid "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</replaceable>"
+msgid ""
+"<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
+"replaceable>"
 msgstr ""
 
 #: 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."
+msgid ""
+"Set the maximum number of days a password remains valid. After "
+"<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
 msgstr ""
 
 #: passwd.1.xml:339(para)
-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."
+msgid ""
+"Password complexity checking may vary from site to site. The user is urged "
+"to select a password as complex as he or she feels comfortable with."
 msgstr ""
 
 #: passwd.1.xml:344(para)
-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."
+msgid ""
+"Users may not be able to change their password on a system if NIS is enabled "
+"and they are not logged into the NIS server."
 msgstr ""
 
 #: passwd.1.xml:349(para)
-msgid "<command>passwd</command> uses PAM to authenticate users and to change their passwords."
+msgid ""
+"<command>passwd</command> uses PAM to authenticate users and to change their "
+"passwords."
 msgstr ""
 
-#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term) gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para) gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
-msgid "This defines the system default encryption algorithm for encrypting passwords (if no algorithm are specified on the command line)."
-msgstr ""
-
-#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para) gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
-msgid "It can take one of these values: <replaceable>DES</replaceable> (default), <replaceable>MD5</replaceable><phrase condition=\"sha_crypt\">, <replaceable>SHA256</replaceable>, <replaceable>SHA512</replaceable></phrase>."
-msgstr ""
-
-#: passwd.1.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para) gpasswd.1.xml:43(para) chpasswd.8.xml:43(para) chgpasswd.8.xml:43(para)
-msgid "Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
-msgstr ""
-
-#: passwd.1.xml:47(para) passwd.1.xml:53(para) passwd.1.xml:62(para) newusers.8.xml:47(para) newusers.8.xml:53(para) newusers.8.xml:62(para) login.defs.5.xml:47(para) login.defs.5.xml:53(para) login.defs.5.xml:62(para) gpasswd.1.xml:47(para) gpasswd.1.xml:53(para) gpasswd.1.xml:62(para) chpasswd.8.xml:47(para) chpasswd.8.xml:53(para) chpasswd.8.xml:62(para) chgpasswd.8.xml:47(para) chgpasswd.8.xml:53(para) chgpasswd.8.xml:62(para)
-msgid "Note: This only affect the generation of group passwords. The generation of user passwords is done by PAM and subject to the PAM configuration. It is recommended to set this variable consistently with the PAM configuration."
+#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
+msgid ""
+"This defines the system default encryption algorithm for encrypting "
+"passwords (if no algorithm are specified on the command line)."
+msgstr ""
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid ""
+"It can take one of these values: <replaceable>DES</replaceable> (default), "
+"<replaceable>MD5</replaceable><phrase condition=\"sha_crypt\">, "
+"<replaceable>SHA256</replaceable>, <replaceable>SHA512</replaceable></"
+"phrase>."
+msgstr ""
+
+#: passwd.1.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: gpasswd.1.xml:43(para) chpasswd.8.xml:43(para) chgpasswd.8.xml:43(para)
+msgid ""
+"Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
+msgstr ""
+
+#: passwd.1.xml:47(para) passwd.1.xml:53(para) passwd.1.xml:62(para)
+#: newusers.8.xml:47(para) newusers.8.xml:53(para) newusers.8.xml:62(para)
+#: login.defs.5.xml:47(para) login.defs.5.xml:53(para)
+#: login.defs.5.xml:62(para) gpasswd.1.xml:47(para) gpasswd.1.xml:53(para)
+#: gpasswd.1.xml:62(para) chpasswd.8.xml:47(para) chpasswd.8.xml:53(para)
+#: chpasswd.8.xml:62(para) chgpasswd.8.xml:47(para) chgpasswd.8.xml:53(para)
+#: chgpasswd.8.xml:62(para)
+msgid ""
+"Note: This only affect the generation of group passwords. The generation of "
+"user passwords is done by PAM and subject to the PAM configuration. It is "
+"recommended to set this variable consistently with the PAM configuration."
 msgstr ""
 
-#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term) gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
+#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
 msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
 msgstr ""
 
-#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para) gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
-msgid "Indicate if passwords must be encrypted using the MD5-based algorithm. If set to <replaceable>yes</replaceable>, new passwords will be encrypted using the MD5-based algorithm compatible with the one used by recent releases of FreeBSD. It supports passwords of unlimited length and longer salt strings. Set to <replaceable>no</replaceable> if you need to copy encrypted passwords to other systems which don't understand the new algorithm. Default is <replaceable>no</replaceable>."
-msgstr ""
-
-#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para) gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
-msgid "This variable is superceded by the <option>ENCRYPT_METHOD</option> variable or by any command line option used to configure the encryption algorithm."
-msgstr ""
-
-#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para) gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
-msgid "This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
+#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
+msgid ""
+"Indicate if passwords must be encrypted using the MD5-based algorithm. If "
+"set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
+"the MD5-based algorithm compatible with the one used by recent releases of "
+"FreeBSD. It supports passwords of unlimited length and longer salt strings. "
+"Set to <replaceable>no</replaceable> if you need to copy encrypted passwords "
+"to other systems which don't understand the new algorithm. Default is "
+"<replaceable>no</replaceable>."
+msgstr ""
+
+#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para)
+#: gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option used to configure the encryption algorithm."
+msgstr ""
+
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
+msgid ""
+"This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
 msgstr ""
 
 #: passwd.1.xml:32(term) login.defs.5.xml:32(term)
@@ -2492,39 +3904,63 @@ msgid "<option>PASS_MIN_LEN</option> (nu
 msgstr ""
 
 #: passwd.1.xml:35(para) login.defs.5.xml:35(para)
-msgid "Number of significant characters in the password for crypt(). <option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt() is better. This is ignored if <option>MD5_CRYPT_ENAB</option> set to <replaceable>yes</replaceable>."
+msgid ""
+"Number of significant characters in the password for crypt(). "
+"<option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt"
+"() is better. This is ignored if <option>MD5_CRYPT_ENAB</option> set to "
+"<replaceable>yes</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term) gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term) gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
+#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
 msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para) gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
-msgid "When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</replaceable> or <replaceable>SHA512</replaceable>, this defines the number of SHA rounds used by the encryption algorithm by default (when the number of rounds is not specified on the command line)."
-msgstr ""
-
-#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para) gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
-msgid "With a lot of rounds, it is more difficult to brute forcing the password. But note also that more CPU resources will be needed to authenticate users."
+#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
+msgid ""
+"When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
+"replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
+"of SHA rounds used by the encryption algorithm by default (when the number "
+"of rounds is not specified on the command line)."
+msgstr ""
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid ""
+"With a lot of rounds, it is more difficult to brute forcing the password. "
+"But note also that more CPU resources will be needed to authenticate users."
+msgstr ""
+
+#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para)
+#: gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
+msgid ""
+"If not specified, the libc will choose the default number of rounds (5000)."
 msgstr ""
 
-#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para) gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
-msgid "If not specified, the libc will choose the default number of rounds (5000)."
-msgstr ""
-
-#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para) gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid "The values must be inside the 1000-999999999 range."
 msgstr ""
 
-#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para) gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
-msgid "If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or <option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be used."
+#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
+#: gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
+msgid ""
+"If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
+"<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
+"used."
 msgstr ""
 
-#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para) gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
-msgid "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</option>, the highest value will be used."
+#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para)
+#: gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
+msgid ""
+"If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
+"option>, the highest value will be used."
 msgstr ""
 
 #: passwd.1.xml:395(filename)
@@ -2556,14 +3992,24 @@ msgid "<filename>passwd</filename> file 
 msgstr ""
 
 #: passwd.1.xml:405(para)
-msgid "The <command>passwd</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>passwd</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #: passwd.1.xml:456(para)
-msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition=\"no_pam\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+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)
+#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
+#: nologin.8.xml:45(command)
 msgid "nologin"
 msgstr ""
 
@@ -2572,15 +4018,23 @@ msgid "politely refuse a login"
 msgstr ""
 
 #: nologin.8.xml:51(para)
-msgid "The <command>nologin</command> command displays a message that an account is not available and exits non-zero. It is intended as a replacement shell field for accounts that have been disabled."
+msgid ""
+"The <command>nologin</command> command displays a message that an account is "
+"not available and exits non-zero. It is intended as a replacement shell "
+"field for accounts that have been disabled."
 msgstr ""
 
 #: nologin.8.xml:56(para)
-msgid "To disable all logins, investigate <citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
 #: nologin.8.xml:65(para)
-msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>nologin</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
 #: nologin.8.xml:76(title)
@@ -2591,7 +4045,8 @@ msgstr ""
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr ""
 
-#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname) newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
+#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
 msgid "newusers"
 msgstr ""
 
@@ -2604,7 +4059,13 @@ msgid "new_users"
 msgstr ""
 
 #: newusers.8.xml:71(para)
-msgid "The <command>newusers</command> command reads a file of user name and clear-text password pairs and uses this information to update a group of existing users or to create new users. Each line is in the same format as the standard password file (see <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions explained below:"
+msgid ""
+"The <command>newusers</command> command reads a file of user name and clear-"
+"text password pairs and uses this information to update a group of existing "
+"users or to create new users. Each line is in the same format as the "
+"standard password file (see <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions "
+"explained below:"
 msgstr ""
 
 #: newusers.8.xml:79(para)
@@ -2620,7 +4081,10 @@ msgid "This is the name of the user."
 msgstr ""
 
 #: newusers.8.xml:90(para)
-msgid "It can be the name of a new user or the name of an existing user (or an user created before by <command>newusers</command>). In case of an existing user, the user's information will be changed, otherwise a new user will be created."
+msgid ""
+"It can be the name of a new user or the name of an existing user (or an user "
+"created before by <command>newusers</command>). In case of an existing user, "
+"the user's information will be changed, otherwise a new user will be created."
 msgstr ""
 
 #: newusers.8.xml:101(emphasis)
@@ -2628,7 +4092,9 @@ msgid "pw_passwd"
 msgstr ""
 
 #: newusers.8.xml:104(para)
-msgid "This field will be encrypted and used as the new value of the encrypted password."
+msgid ""
+"This field will be encrypted and used as the new value of the encrypted "
+"password."
 msgstr ""
 
 #: newusers.8.xml:112(emphasis)
@@ -2640,7 +4106,9 @@ msgid "This field is used to define the 
 msgstr ""
 
 #: newusers.8.xml:118(para)
-msgid "If the field is empty, an new (unused) UID will be defined automatically by <command>newusers</command>."
+msgid ""
+"If the field is empty, an new (unused) UID will be defined automatically by "
+"<command>newusers</command>."
 msgstr ""
 
 #: newusers.8.xml:122(para)
@@ -2648,11 +4116,16 @@ msgid "If this field contains a number, 
 msgstr ""
 
 #: newusers.8.xml:126(para)
-msgid "If this field contains the name of an existing user (or the name of an user created before by <command>newusers</command>), the UID of the specified user will be used."
+msgid ""
+"If this field contains the name of an existing user (or the name of an user "
+"created before by <command>newusers</command>), the UID of the specified "
+"user will be used."
 msgstr ""
 
 #: newusers.8.xml:132(para)
-msgid "If the UID of an existing user is changed, the files ownership of the user's file should be fixed manually."
+msgid ""
+"If the UID of an existing user is changed, the files ownership of the user's "
+"file should be fixed manually."
 msgstr ""
 
 #: newusers.8.xml:140(emphasis)
@@ -2664,19 +4137,34 @@ msgid "This field is used to define the 
 msgstr ""
 
 #: newusers.8.xml:146(para)
-msgid "If this field contains the name of an existing group (or a group created before by <command>newusers</command>), the GID of this group will be used as the primary group ID for the user."
+msgid ""
+"If this field contains the name of an existing group (or a group created "
+"before by <command>newusers</command>), the GID of this group will be used "
+"as the primary group ID for the user."
 msgstr ""
 
 #: newusers.8.xml:152(para)
-msgid "If this field is a number, this number will be used as the primary group ID of the user. If no groups exist with this GID, a new group will be created with this GID, and the name of the user."
+msgid ""
+"If this field is a number, this number will be used as the primary group ID "
+"of the user. If no groups exist with this GID, a new group will be created "
+"with this GID, and the name of the user."
 msgstr ""
 
 #: newusers.8.xml:158(para)
-msgid "If this field is empty, a new group will be created with the name of the user and a GID will be automatically defined by <command>newusers</command> to be used as the primary group ID for the user and as the GID for the new group."
+msgid ""
+"If this field is empty, a new group will be created with the name of the "
+"user and a GID will be automatically defined by <command>newusers</command> "
+"to be used as the primary group ID for the user and as the GID for the new "
+"group."
 msgstr ""
 
 #: newusers.8.xml:164(para)
-msgid "If this field contains the name of a group which does not exist (and was not created earlier wbefore by <command>newusers</command>), a new group will be created with the specified name and a GID will be automatically defined by <command>newusers</command> to be used as the primary group ID for the user and Gs the ID for the new group."
+msgid ""
+"If this field contains the name of a group which does not exist (and was not "
+"created earlier wbefore by <command>newusers</command>), a new group will be "
+"created with the specified name and a GID will be automatically defined by "
+"<command>newusers</command> to be used as the primary group ID for the user "
+"and Gs the ID for the new group."
 msgstr ""
 
 #: newusers.8.xml:176(emphasis)
@@ -2696,11 +4184,17 @@ msgid "This field is used to define the 
 msgstr ""
 
 #: newusers.8.xml:192(para)
-msgid "If this field does not specify an existing directory, the specified directory is created, with ownership set to the user being created or updated and its primary group."
+msgid ""
+"If this field does not specify an existing directory, the specified "
+"directory is created, with ownership set to the user being created or "
+"updated and its primary group."
 msgstr ""
 
 #: newusers.8.xml:197(para)
-msgid "If the home directory of an existing user is changed, <command>newusers</command> does not move or copy the content of the old directory to the new location. This should be done manually."
+msgid ""
+"If the home directory of an existing user is changed, <command>newusers</"
+"command> does not move or copy the content of the old directory to the new "
+"location. This should be done manually."
 msgstr ""
 
 #: newusers.8.xml:207(emphasis)
@@ -2708,19 +4202,31 @@ msgid "pw_shell"
 msgstr ""
 
 #: newusers.8.xml:210(para)
-msgid "This field defines the shell of the user. No checks are performed on this field."
+msgid ""
+"This field defines the shell of the user. No checks are performed on this "
+"field."
 msgstr ""
 
 #: newusers.8.xml:218(para)
-msgid "<command>newusers</command> first tries to create or change all the specified users, and then write these changes to the user or group databases. If an error occurs (except in the final writes to the databases), no changes are committed to the databases."
+msgid ""
+"<command>newusers</command> first tries to create or change all the "
+"specified users, and then write these changes to the user or group "
+"databases. If an error occurs (except in the final writes to the databases), "
+"no changes are committed to the databases."
 msgstr ""
 
 #: newusers.8.xml:224(para)
-msgid "During this first pass, users are created with a locked password (and passwords are not changed for the users which are not created). A second pass is used to update the passwords using PAM. Failures to update a password are reported, but will not stop the other password updates."
+msgid ""
+"During this first pass, users are created with a locked password (and "
+"passwords are not changed for the users which are not created). A second "
+"pass is used to update the passwords using PAM. Failures to update a "
+"password are reported, but will not stop the other password updates."
 msgstr ""
 
 #: newusers.8.xml:232(para)
-msgid "This command is intended to be used in a large system environment where many accounts are updated at a single time."
+msgid ""
+"This command is intended to be used in a large system environment where many "
+"accounts are updated at a single time."
 msgstr ""
 
 #: newusers.8.xml:240(para)
@@ -2736,11 +4242,19 @@ msgid "Use the specified method to encry
 msgstr ""
 
 #: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
-msgid "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc support these methods."
+msgid ""
+"The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
+"support these methods."
 msgstr ""
 
 #: newusers.8.xml:270(para)
-msgid "System users will be created with no aging information in <filename>/etc/shadow</filename>, and their numeric identifiers are chosen in the <option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in <filename>login.defs</filename>, instead of <option>UID_MIN</option>-<option>UID_MAX</option> (and their <option>GID</option> counterparts for the creation of groups)."
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are chosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
 msgstr ""
 
 #: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
@@ -2752,11 +4266,14 @@ msgid "Use the specified number of round
 msgstr ""
 
 #: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
-msgid "The value 0 means that the system will choose the default number of rounds for the crypt method (5000)."
+msgid ""
+"The value 0 means that the system will choose the default number of rounds "
+"for the crypt method (5000)."
 msgstr ""
 
 #: newusers.8.xml:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
-msgid "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
+msgid ""
+"A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
 #: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
@@ -2764,15 +4281,20 @@ msgid "You can only use this option with
 msgstr ""
 
 #: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
-msgid "By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
+msgid ""
+"By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and "
+"SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
 #: newusers.8.xml:313(para)
-msgid "The input file must be protected since it contains unencrypted passwords."
+msgid ""
+"The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
 #: newusers.8.xml:317(para) chgpasswd.8.xml:162(para)
-msgid "You should make sure the passwords and the encryption method respect the system's password policy."
+msgid ""
+"You should make sure the passwords and the encryption method respect the "
+"system's password policy."
 msgstr ""
 
 #: newusers.8.xml:390(filename)
@@ -2784,10 +4306,16 @@ msgid "PAM configuration for <command>ne
 msgstr ""
 
 #: newusers.8.xml:400(para)
-msgid "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname) newgrp.1.xml:49(command)
+#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
+#: newgrp.1.xml:49(command)
 msgid "newgrp"
 msgstr ""
 
@@ -2795,27 +4323,60 @@ msgstr ""
 msgid "log in to a new group"
 msgstr ""
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable) grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable) groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
+#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
+#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
 msgid "group"
 msgstr ""
 
 #: newgrp.1.xml:56(para)
-msgid "The <command>newgrp</command> command is used to change the current group ID during a login session. If the optional <option>-</option> flag is given, the user's environment will be reinitialized as though the user had logged in, otherwise the current environment, including current working directory, remains unchanged."
+msgid ""
+"The <command>newgrp</command> command is used to change the current group ID "
+"during a login session. If the optional <option>-</option> flag is given, "
+"the user's environment will be reinitialized as though the user had logged "
+"in, otherwise the current environment, including current working directory, "
+"remains unchanged."
 msgstr ""
 
 #: newgrp.1.xml:64(para)
-msgid "<command>newgrp</command> changes the current real group ID to the named group, or to the default group listed in <filename>/etc/passwd</filename> if no group name is given. <command>newgrp</command> also tries to add the group to the user groupset. If not root, the user will be prompted for a password if she does not have a password (in <filename>/etc/shadow</filename> if this user has an entry in the shadowed password file, or in <filename>/etc/passwd</filename> otherwise) and the group does, or if the user is not listed as a member and the group has a password. The user will be denied access if the group password is empty and the user is not listed as a member."
+msgid ""
+"<command>newgrp</command> changes the current real group ID to the named "
+"group, or to the default group listed in <filename>/etc/passwd</filename> if "
+"no group name is given. <command>newgrp</command> also tries to add the "
+"group to the user groupset. If not root, the user will be prompted for a "
+"password if she does not have a password (in <filename>/etc/shadow</"
+"filename> if this user has an entry in the shadowed password file, or in "
+"<filename>/etc/passwd</filename> otherwise) and the group does, or if the "
+"user is not listed as a member and the group has a password. The user will "
+"be denied access if the group password is empty and the user is not listed "
+"as a member."
 msgstr ""
 
 #: newgrp.1.xml:78(para)
-msgid "If there is an entry for this group in <filename>/etc/gshadow</filename>, then the list of members and the password of this group will be taken from this file, otherwise, the entry in <filename>/etc/group</filename> is considered."
+msgid ""
+"If there is an entry for this group in <filename>/etc/gshadow</filename>, "
+"then the list of members and the password of this group will be taken from "
+"this file, otherwise, the entry in <filename>/etc/group</filename> is "
+"considered."
 msgstr ""
 
 #: newgrp.1.xml:130(para)
-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>."
+msgid ""
+"<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry><phrase condition=\"gshadow\">, <citerefentry condition="
+"\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry></phrase>."
 msgstr ""
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname) logoutd.8.xml:45(command)
+#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
+#: logoutd.8.xml:45(command)
 msgid "logoutd"
 msgstr ""
 
@@ -2824,7 +4385,14 @@ msgid "Enforce login time restrictions"
 msgstr ""
 
 #: logoutd.8.xml:51(para)
-msgid "<command>logoutd</command> enforces the login time and port restrictions specified in <filename>/etc/porttime</filename>. <command>logoutd</command> should be started from <filename>/etc/rc</filename>. The <filename>/var/run/utmp</filename> file is scanned periodically and each user name is checked to see if the named user is permitted on the named port at the current time. Any login session which is violating the restrictions in <filename>/etc/porttime</filename> is terminated."
+msgid ""
+"<command>logoutd</command> enforces the login time and port restrictions "
+"specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
+"should be started from <filename>/etc/rc</filename>. The <filename>/var/run/"
+"utmp</filename> file is scanned periodically and each user name is checked "
+"to see if the named user is permitted on the named port at the current time. "
+"Any login session which is violating the restrictions in <filename>/etc/"
+"porttime</filename> is terminated."
 msgstr ""
 
 #: logoutd.8.xml:73(filename) login.1.xml:319(filename)
@@ -2844,15 +4412,33 @@ msgid "shadow password suite configurati
 msgstr ""
 
 #: login.defs.5.xml:111(para)
-msgid "The <filename>/etc/login.defs</filename> file defines the site-specific configuration for the shadow password suite. This file is required. Absence of this file will not prevent system operation, but will probably result in undesirable operation."
+msgid ""
+"The <filename>/etc/login.defs</filename> file defines the site-specific "
+"configuration for the shadow password suite. This file is required. Absence "
+"of this file will not prevent system operation, but will probably result in "
+"undesirable operation."
 msgstr ""
 
 #: login.defs.5.xml:118(para)
-msgid "This file is a readable text file, each line of the file describing one configuration parameter. The lines consist of a configuration name and value, separated by whitespace. Blank lines and comment lines are ignored. Comments are introduced with a \"#\" pound sign and the pound sign must be the first non-white character of the line."
+msgid ""
+"This file is a readable text file, each line of the file describing one "
+"configuration parameter. The lines consist of a configuration name and "
+"value, separated by whitespace. Blank lines and comment lines are ignored. "
+"Comments are introduced with a \"#\" pound sign and the pound sign must be "
+"the first non-white character of the line."
 msgstr ""
 
 #: login.defs.5.xml:126(para)
-msgid "Parameter values may be of four types: strings, booleans, numbers, and long numbers. A string is comprised of any printable characters. A boolean should be either the value <replaceable>yes</replaceable> or <replaceable>no</replaceable>. An undefined boolean parameter or one with a value other than these will be given a <replaceable>no</replaceable> value. Numbers (both regular and long) may be either decimal values, octal values (precede the value with <replaceable>0</replaceable>) or hexadecimal values (precede the value with <replaceable>0x</replaceable>). The maximum value of the regular and long numeric parameters is machine-dependent."
+msgid ""
+"Parameter values may be of four types: strings, booleans, numbers, and long "
+"numbers. A string is comprised of any printable characters. A boolean should "
+"be either the value <replaceable>yes</replaceable> or <replaceable>no</"
+"replaceable>. An undefined boolean parameter or one with a value other than "
+"these will be given a <replaceable>no</replaceable> value. Numbers (both "
+"regular and long) may be either decimal values, octal values (precede the "
+"value with <replaceable>0</replaceable>) or hexadecimal values (precede the "
+"value with <replaceable>0x</replaceable>). The maximum value of the regular "
+"and long numeric parameters is machine-dependent."
 msgstr ""
 
 #: login.defs.5.xml:141(para)
@@ -2864,7 +4450,10 @@ msgid "<option>CHFN_AUTH</option> (boole
 msgstr ""
 
 #: login.defs.5.xml:34(para) chfn.1.xml:34(para)
-msgid "If <replaceable>yes</replaceable>, the <command>chfn</command> program will require authentication before making any changes, unless run by the superuser."
+msgid ""
+"If <replaceable>yes</replaceable>, the <command>chfn</command> program will "
+"require authentication before making any changes, unless run by the "
+"superuser."
 msgstr ""
 
 #: login.defs.5.xml:32(term) chfn.1.xml:32(term)
@@ -2872,7 +4461,18 @@ msgid "<option>CHFN_RESTRICT</option> (s
 msgstr ""
 
 #: login.defs.5.xml:34(para) chfn.1.xml:34(para)
-msgid "This parameter specifies which values in the <emphasis remap=\"I\">gecos</emphasis> field of the <filename>/etc/passwd</filename> file may be changed by regular users using the <command>chfn</command> program. It can be any combination of letters <replaceable>f</replaceable>, <replaceable>r</replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, for Full name, Room number, Work phone, and Home phone, respectively. For backward compatibility, <replaceable>yes</replaceable> is equivalent to <replaceable>rwh</replaceable> and <replaceable>no</replaceable> is equivalent to <replaceable>frwh</replaceable>. If not specified, only the superuser can make any changes. The most restrictive setting is better achieved by not installing <command>chfn</command> SUID."
+msgid ""
+"This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
+"emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
+"by regular users using the <command>chfn</command> program. It can be any "
+"combination of letters <replaceable>f</replaceable>, <replaceable>r</"
+"replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, "
+"for Full name, Room number, Work phone, and Home phone, respectively. For "
+"backward compatibility, <replaceable>yes</replaceable> is equivalent to "
+"<replaceable>rwh</replaceable> and <replaceable>no</replaceable> is "
+"equivalent to <replaceable>frwh</replaceable>. If not specified, only the "
+"superuser can make any changes. The most restrictive setting is better "
+"achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 
 #: login.defs.5.xml:32(term) chsh.1.xml:32(term)
@@ -2880,7 +4480,10 @@ msgid "<option>CHSH_AUTH</option> (boole
 msgstr ""
 
 #: login.defs.5.xml:34(para) chsh.1.xml:34(para)
-msgid "If <replaceable>yes</replaceable>, the <command>chsh</command> program will require authentication before making any changes, unless run by the superuser."
+msgid ""
+"If <replaceable>yes</replaceable>, the <command>chsh</command> program will "
+"require authentication before making any changes, unless run by the "
+"superuser."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2888,11 +4491,16 @@ msgid "<option>ERASECHAR</option> (numbe
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Terminal ERASE character (<replaceable>010</replaceable> = backspace, <replaceable>0177</replaceable> = DEL)."
+msgid ""
+"Terminal ERASE character (<replaceable>010</replaceable> = backspace, "
+"<replaceable>0177</replaceable> = DEL)."
 msgstr ""
 
-#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para) login.1.xml:37(para)
-msgid "The value can be prefixed \"0\" for an octal value, or \"0x\" for an hexadecimal value."
+#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para)
+#: login.1.xml:37(para)
+msgid ""
+"The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
+"hexadecimal value."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2900,7 +4508,8 @@ msgid "<option>FAIL_DELAY</option> (numb
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Delay in seconds before being allowed another attempt after a login failure."
+msgid ""
+"Delay in seconds before being allowed another attempt after a login failure."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2908,7 +4517,9 @@ msgid "<option>FAILLOG_ENAB</option> (bo
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable logging and display of <filename>/var/log/faillog</filename> login failure info."
+msgid ""
+"Enable logging and display of <filename>/var/log/faillog</filename> login "
+"failure info."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2916,7 +4527,9 @@ msgid "<option>FAKE_SHELL</option> (stri
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If set, <command>login</command> will execute this shell instead of the users' shell specified in <filename>/etc/passwd</filename>."
+msgid ""
+"If set, <command>login</command> will execute this shell instead of the "
+"users' shell specified in <filename>/etc/passwd</filename>."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2924,7 +4537,8 @@ msgid "<option>FTMP_FILE</option> (strin
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If defined, login failures will be logged in this file in a utmp format."
+msgid ""
+"If defined, login failures will be logged in this file in a utmp format."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2932,7 +4546,12 @@ msgid "<option>HUSHLOGIN_FILE</option> (
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If defined, this file can inhibit all the usual chatter during the login sequence. If a full pathname is specified, then hushed mode will be enabled if the user's name or shell are found in the file. If not a full pathname, then hushed mode will be enabled if the file exists in the user's home directory."
+msgid ""
+"If defined, this file can inhibit all the usual chatter during the login "
+"sequence. If a full pathname is specified, then hushed mode will be enabled "
+"if the user's name or shell are found in the file. If not a full pathname, "
+"then hushed mode will be enabled if the file exists in the user's home "
+"directory."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2976,7 +4595,9 @@ msgid "Enable display of unknown usernam
 msgstr ""
 
 #: login.defs.5.xml:38(para) login.1.xml:38(para)
-msgid "Note: logging unknown usernames may be a security issue if an user enter her password instead of her login name."
+msgid ""
+"Note: logging unknown usernames may be a security issue if an user enter her "
+"password instead of her login name."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -2988,7 +4609,11 @@ msgid "Maximum number of login retries i
 msgstr ""
 
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
-msgid "This will most likely be overridden by PAM, since the default pam_unix module has it's own built in of 3 retries. However, this is a safe fallback in case you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgid ""
+"This will most likely be overridden by PAM, since the default pam_unix "
+"module has it's own built in of 3 retries. However, this is a safe fallback "
+"in case you are using an authentication module that does not enforce "
+"PAM_MAXTRIES."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -3004,7 +4629,9 @@ msgid "<option>MOTD_FILE</option> (strin
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If defined, \":\" delimited list of \"message of the day\" files to be displayed upon login."
+msgid ""
+"If defined, \":\" delimited list of \"message of the day\" files to be "
+"displayed upon login."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -3012,11 +4639,17 @@ msgid "<option>NOLOGINS_FILE</option> (s
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If defined, name of file whose presence will inhibit non-root logins. The contents of this file should be a message indicating why logins are inhibited."
+msgid ""
+"If defined, name of file whose presence will inhibit non-root logins. The "
+"contents of this file should be a message indicating why logins are "
+"inhibited."
 msgstr ""
 
 #: login.defs.5.xml:184(para)
-msgid "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and <option>PASS_WARN_AGE</option> are only used at the time of account creation. Any changes to these settings won't affect existing accounts."
+msgid ""
+"<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
+"<option>PASS_WARN_AGE</option> are only used at the time of account "
+"creation. Any changes to these settings won't affect existing accounts."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -3036,19 +4669,30 @@ msgid "<option>TTYPERM</option> (string)
 msgstr ""
 
 #: login.defs.5.xml:35(para) login.1.xml:35(para)
-msgid "The terminal permissions: the login tty will be owned by the <option>TTYGROUP</option> group, and the permissions will be set to <option>TTYPERM</option>."
+msgid ""
+"The terminal permissions: the login tty will be owned by the "
+"<option>TTYGROUP</option> group, and the permissions will be set to "
+"<option>TTYPERM</option>."
 msgstr ""
 
 #: login.defs.5.xml:40(para) login.1.xml:40(para)
-msgid "By default, the ownership of the terminal is set to the user's primary group and the permissions are set to <replaceable>0600</replaceable>."
+msgid ""
+"By default, the ownership of the terminal is set to the user's primary group "
+"and the permissions are set to <replaceable>0600</replaceable>."
 msgstr ""
 
 #: login.defs.5.xml:45(para) login.1.xml:45(para)
-msgid "<option>TTYGROUP</option> can be either the name of a group or a numeric group identifier."
+msgid ""
+"<option>TTYGROUP</option> can be either the name of a group or a numeric "
+"group identifier."
 msgstr ""
 
 #: login.defs.5.xml:49(para) login.1.xml:49(para)
-msgid "If you have a <command>write</command> program which is \"setgid\" to a special group which owns the terminals, define TTYGROUP to the group number and TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign TTYPERM to either 622 or 600."
+msgid ""
+"If you have a <command>write</command> program which is \"setgid\" to a "
+"special group which owns the terminals, define TTYGROUP to the group number "
+"and TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign "
+"TTYPERM to either 622 or 600."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -3056,7 +4700,9 @@ msgid "<option>TTYTYPE_FILE</option> (st
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "If defined, file which maps tty line to TERM environment parameter. Each line of the file is in a format something like \"vt100 tty01\"."
+msgid ""
+"If defined, file which maps tty line to TERM environment parameter. Each "
+"line of the file is in a format something like \"vt100 tty01\"."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -3072,34 +4718,45 @@ msgid "CROSS REFERENCES"
 msgstr ""
 
 #: login.defs.5.xml:216(para)
-msgid "The following cross references show which programs in the shadow password suite use which parameters."
+msgid ""
+"The following cross references show which programs in the shadow password "
+"suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle) chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle)
+#: chage.1.xml:43(refname) chage.1.xml:48(command)
 msgid "chage"
 msgstr ""
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase) login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
+#: login.defs.5.xml:480(phrase)
 msgid "USE_TCB"
 msgstr ""
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle) chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
 msgid "chfn"
 msgstr ""
 
 #: login.defs.5.xml:231(para)
-msgid "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase condition=\"no_pam\">LOGIN_STRING</phrase>"
+msgid ""
+"<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
+"condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle) chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle)
+#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
 msgid "chgpasswd"
 msgstr ""
 
 #: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
-msgid "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition=\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgid ""
+"ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
+"\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:249(term) chpasswd.8.xml:41(refentrytitle) chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:249(term) chpasswd.8.xml:41(refentrytitle)
+#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
 msgid "chpasswd"
 msgstr ""
 
@@ -3111,7 +4768,8 @@ msgstr ""
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr ""
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle) chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
+#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
 msgid "chsh"
 msgstr ""
 
@@ -3119,11 +4777,13 @@ msgstr ""
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr ""
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle) gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
 msgid "gpasswd"
 msgstr ""
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle) groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
 msgid "groupadd"
 msgstr ""
 
@@ -3131,32 +4791,51 @@ msgstr ""
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 
-#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle) groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle)
+#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
 msgid "groupdel"
 msgstr ""
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para) login.defs.5.xml:303(para) login.defs.5.xml:310(para) login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
+#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
+#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle) groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
+#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
 msgid "groupmems"
 msgstr ""
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle) groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
+#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
 msgid "groupmod"
 msgstr ""
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle) grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
+#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
 msgid "grpck"
 msgstr ""
 
-#: login.defs.5.xml:328(term) login.1.xml:70(refentrytitle) login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command) login.1.xml:96(command)
+#: login.defs.5.xml:328(term) login.1.xml:70(refentrytitle)
+#: login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command)
+#: login.1.xml:96(command)
 msgid "login"
 msgstr ""
 
 #: login.defs.5.xml:330(para)
-msgid "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME <phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</phrase> ERASECHAR FAIL_DELAY <phrase condition=\"no_pam\">FAILLOG_ENAB</phrase> FAKE_SHELL <phrase condition=\"no_pam\">FTMP_FILE</phrase> HUSHLOGIN_FILE <phrase condition=\"no_pam\">ISSUE_FILE</phrase> KILLCHAR <phrase condition=\"no_pam\">LASTLOG_ENAB</phrase> LOGIN_RETRIES <phrase condition=\"no_pam\">LOGIN_STRING</phrase> LOGIN_TIMEOUT LOG_OK_LOGINS LOG_UNKFAIL_ENAB <phrase condition=\"no_pam\">MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB QUOTAS_ENAB</phrase> TTYGROUP TTYPERM TTYTYPE_FILE <phrase condition=\"no_pam\">ULIMIT UMASK</phrase> USERGROUPS_ENAB"
+msgid ""
+"<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
+"<phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</"
+"phrase> ERASECHAR FAIL_DELAY <phrase condition=\"no_pam\">FAILLOG_ENAB</"
+"phrase> FAKE_SHELL <phrase condition=\"no_pam\">FTMP_FILE</phrase> "
+"HUSHLOGIN_FILE <phrase condition=\"no_pam\">ISSUE_FILE</phrase> KILLCHAR "
+"<phrase condition=\"no_pam\">LASTLOG_ENAB</phrase> LOGIN_RETRIES <phrase "
+"condition=\"no_pam\">LOGIN_STRING</phrase> LOGIN_TIMEOUT LOG_OK_LOGINS "
+"LOG_UNKFAIL_ENAB <phrase condition=\"no_pam\">MAIL_CHECK_ENAB MAIL_DIR "
+"MAIL_FILE MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB QUOTAS_ENAB</phrase> "
+"TTYGROUP TTYPERM TTYTYPE_FILE <phrase condition=\"no_pam\">ULIMIT UMASK</"
+"phrase> USERGROUPS_ENAB"
 msgstr ""
 
 #: login.defs.5.xml:357(term)
@@ -3168,23 +4847,40 @@ msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
 #: login.defs.5.xml:367(para)
-msgid "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase> SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
+msgid ""
+"ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
+"PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase> SYS_GID_MAX "
+"SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
 msgstr ""
 
 #: login.defs.5.xml:383(para)
-msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN "
+"PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
 #: login.defs.5.xml:394(para)
-msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
+msgid ""
+"PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
+"\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
 #: login.defs.5.xml:403(para)
-msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</phrase>"
+msgid ""
+"PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
+"phrase>"
 msgstr ""
 
 #: login.defs.5.xml:420(para)
-msgid "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME <phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH ENV_SUPATH <phrase condition=\"no_pam\">ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE QUOTAS_ENAB</phrase> SULOG_FILE SU_NAME <phrase condition=\"no_pam\">SU_WHEEL_ONLY</phrase> SYSLOG_SU_ENAB <phrase condition=\"no_pam\">USERGROUPS_ENAB</phrase>"
+msgid ""
+"<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
+"<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
+"ENV_SUPATH <phrase condition=\"no_pam\">ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB "
+"MAIL_DIR MAIL_FILE QUOTAS_ENAB</phrase> SULOG_FILE SU_NAME <phrase condition="
+"\"no_pam\">SU_WHEEL_ONLY</phrase> SYSLOG_SU_ENAB <phrase condition=\"no_pam"
+"\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
 #: login.defs.5.xml:435(term)
@@ -3196,23 +4892,48 @@ msgid "ENV_HZ <phrase condition=\"no_pam
 msgstr ""
 
 #: login.defs.5.xml:446(para)
-msgid "CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINK USE_TCB</phrase>"
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINK "
+"USE_TCB</phrase>"
 msgstr ""
 
 #: login.defs.5.xml:460(para)
-msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
+msgid ""
+"MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
+"condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
 #: login.defs.5.xml:470(para)
-msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
+msgid ""
+"MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
+"\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
 #: login.defs.5.xml:489(para)
-msgid "Much of the functionality that used to be provided by the shadow password suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is no longer used by <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, and <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the corresponding PAM configuration files instead."
+msgid ""
+"Much of the functionality that used to be provided by the shadow password "
+"suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
+"no longer used by <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by "
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, and <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the "
+"corresponding PAM configuration files instead."
 msgstr ""
 
 #: login.defs.5.xml:505(para)
-msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 
 #: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
@@ -3224,42 +4945,71 @@ msgid "login access control table"
 msgstr ""
 
 #: login.access.5.xml:46(para)
-msgid "The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, host) combinations and/or (user, tty) combinations for which a login will be either accepted or refused."
+msgid ""
+"The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, "
+"host) combinations and/or (user, tty) combinations for which a login will be "
+"either accepted or refused."
 msgstr ""
 
 #: login.access.5.xml:52(para)
-msgid "When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is scanned for the first entry that matches the (user, host) combination, or, in case of non-networked logins, the first entry that matches the (user, tty) combination. The permissions field of that table entry determines whether the login will be accepted or refused."
+msgid ""
+"When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is "
+"scanned for the first entry that matches the (user, host) combination, or, "
+"in case of non-networked logins, the first entry that matches the (user, "
+"tty) combination. The permissions field of that table entry determines "
+"whether the login will be accepted or refused."
 msgstr ""
 
 #: login.access.5.xml:60(para)
-msgid "Each line of the login access control table has three fields separated by a \":\" character:"
+msgid ""
+"Each line of the login access control table has three fields separated by a "
+"\":\" character:"
 msgstr ""
 
 #: login.access.5.xml:65(para)
-msgid "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</emphasis>:<emphasis remap=\"I\">origins</emphasis>"
+msgid ""
+"<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
+"emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
 #: login.access.5.xml:69(para)
-msgid "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or \"<emphasis>-</emphasis>\" (access denied) character. The second field should be a list of one or more login names, group names, or <emphasis>ALL</emphasis> (always matches). The third field should be a list of one or more tty names (for non-networked logins), host names, domain names (begin with \"<literal>.</literal>\"), host addresses, internet network numbers (end with \"<literal>.</literal>\"), <emphasis>ALL</emphasis> (always matches) or <emphasis>LOCAL</emphasis> (matches any string that does not contain a \"<literal>.</literal>\" character). If you run NIS you can use @netgroupname in host or user patterns."
+msgid ""
+"The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
+"\"<emphasis>-</emphasis>\" (access denied) character. The second field "
+"should be a list of one or more login names, group names, or <emphasis>ALL</"
+"emphasis> (always matches). The third field should be a list of one or more "
+"tty names (for non-networked logins), host names, domain names (begin with "
+"\"<literal>.</literal>\"), host addresses, internet network numbers (end "
+"with \"<literal>.</literal>\"), <emphasis>ALL</emphasis> (always matches) or "
+"<emphasis>LOCAL</emphasis> (matches any string that does not contain a "
+"\"<literal>.</literal>\" character). If you run NIS you can use "
+"@netgroupname in host or user patterns."
 msgstr ""
 
 #: login.access.5.xml:83(para)
-msgid "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very compact rules."
+msgid ""
+"The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
+"compact rules."
 msgstr ""
 
 #: login.access.5.xml:88(para)
-msgid "The group file is searched only when a name does not match that of the logged-in user. Only groups are matched in which users are explicitly listed: the program does not look at a user's primary group id value."
+msgid ""
+"The group file is searched only when a name does not match that of the "
+"logged-in user. Only groups are matched in which users are explicitly "
+"listed: the program does not look at a user's primary group id value."
 msgstr ""
 
 #: login.1.xml:76(refpurpose)
 msgid "begin session on the system"
 msgstr ""
 
-#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg) login.1.xml:214(option) groupmems.8.xml:54(arg)
+#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg)
+#: login.1.xml:214(option) groupmems.8.xml:54(arg)
 msgid "-p"
 msgstr ""
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable) login.1.xml:98(replaceable)
+#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
+#: login.1.xml:98(replaceable)
 msgid "host"
 msgstr ""
 
@@ -3280,35 +5030,82 @@ msgid "-r <placeholder-1/>"
 msgstr ""
 
 #: login.1.xml:104(para)
-msgid "The <command>login</command> program is used to establish a new session with the system. It is normally invoked automatically by responding to the <emphasis remap=\"I\">login:</emphasis> prompt on the user's terminal. <command>login</command> may be special to the shell and may not be invoked as a sub-process. When called from a shell, <command>login</command> should be executed as <emphasis remap=\"B\">exec login</emphasis> which will cause the user to exit from the current shell (and thus will prevent the new logged in user to return to the session of the caller). Attempting to execute <command>login</command> from any shell but the login shell will produce an error message."
+msgid ""
+"The <command>login</command> program is used to establish a new session with "
+"the system. It is normally invoked automatically by responding to the "
+"<emphasis remap=\"I\">login:</emphasis> prompt on the user's terminal. "
+"<command>login</command> may be special to the shell and may not be invoked "
+"as a sub-process. When called from a shell, <command>login</command> should "
+"be executed as <emphasis remap=\"B\">exec login</emphasis> which will cause "
+"the user to exit from the current shell (and thus will prevent the new "
+"logged in user to return to the session of the caller). Attempting to "
+"execute <command>login</command> from any shell but the login shell will "
+"produce an error message."
 msgstr ""
 
 #: login.1.xml:118(para)
-msgid "The user is then prompted for a password, where appropriate. Echoing is disabled to prevent revealing the password. Only a small number of password failures are permitted before <command>login</command> exits and the communications link is severed."
+msgid ""
+"The user is then prompted for a password, where appropriate. Echoing is "
+"disabled to prevent revealing the password. Only a small number of password "
+"failures are permitted before <command>login</command> exits and the "
+"communications link is severed."
 msgstr ""
 
 #: login.1.xml:125(para)
-msgid "If password aging has been enabled for your account, you may be prompted for a new password before proceeding. You will be forced to provide your old password and the new password before continuing. Please refer to <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry> for more information."
+msgid ""
+"If password aging has been enabled for your account, you may be prompted for "
+"a new password before proceeding. You will be forced to provide your old "
+"password and the new password before continuing. Please refer to "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> for more information."
 msgstr ""
 
 #: login.1.xml:134(para)
-msgid "After a successful login, you will be informed of any system messages and the presence of mail. You may turn off the printing of the system message file, <filename>/etc/motd</filename>, by creating a zero-length file <filename>.hushlogin</filename> in your login directory. The mail message will be one of \"<emphasis>You have new mail.</emphasis>\", \"<emphasis>You have mail.</emphasis>\", or \"<emphasis>No Mail.</emphasis>\" according to the condition of your mailbox."
+msgid ""
+"After a successful login, you will be informed of any system messages and "
+"the presence of mail. You may turn off the printing of the system message "
+"file, <filename>/etc/motd</filename>, by creating a zero-length file "
+"<filename>.hushlogin</filename> in your login directory. The mail message "
+"will be one of \"<emphasis>You have new mail.</emphasis>\", \"<emphasis>You "
+"have mail.</emphasis>\", or \"<emphasis>No Mail.</emphasis>\" according to "
+"the condition of your mailbox."
 msgstr ""
 
 #: login.1.xml:145(para)
-msgid "Your user and group ID will be set according to their values in the <filename>/etc/passwd</filename> file. The value for <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$PATH</envar>, <envar>$LOGNAME</envar>, and <envar>$MAIL</envar> are set according to the appropriate fields in the password entry. Ulimit, umask and nice values may also be set according to entries in the GECOS field."
+msgid ""
+"Your user and group ID will be set according to their values in the "
+"<filename>/etc/passwd</filename> file. The value for <envar>$HOME</envar>, "
+"<envar>$SHELL</envar>, <envar>$PATH</envar>, <envar>$LOGNAME</envar>, and "
+"<envar>$MAIL</envar> are set according to the appropriate fields in the "
+"password entry. Ulimit, umask and nice values may also be set according to "
+"entries in the GECOS field."
 msgstr ""
 
 #: login.1.xml:154(para)
-msgid "On some installations, the environmental variable <envar>$TERM</envar> will be initialized to the terminal type on your tty line, as specified in <filename>/etc/ttytype</filename>."
+msgid ""
+"On some installations, the environmental variable <envar>$TERM</envar> will "
+"be initialized to the terminal type on your tty line, as specified in "
+"<filename>/etc/ttytype</filename>."
 msgstr ""
 
 #: login.1.xml:160(para)
-msgid "An initialization script for your command interpreter may also be executed. Please see the appropriate manual section for more information on this function."
+msgid ""
+"An initialization script for your command interpreter may also be executed. "
+"Please see the appropriate manual section for more information on this "
+"function."
 msgstr ""
 
 #: login.1.xml:172(para) login.1.xml:248(para)
-msgid "The <command>login</command> program is NOT responsible for removing users from the utmp file. It is the responsibility of <citerefentry><refentrytitle>getty</refentrytitle><manvolnum>8</manvolnum></citerefentry> and <citerefentry><refentrytitle>init</refentrytitle><manvolnum>8</manvolnum></citerefentry> to clean up apparent ownership of a terminal session. If you use <command>login</command> from the shell prompt without <command>exec</command>, the user you use will continue to appear to be logged in even after you log out of the \"subsession\"."
+msgid ""
+"The <command>login</command> program is NOT responsible for removing users "
+"from the utmp file. It is the responsibility of "
+"<citerefentry><refentrytitle>getty</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry> and <citerefentry><refentrytitle>init</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry> to clean up apparent "
+"ownership of a terminal session. If you use <command>login</command> from "
+"the shell prompt without <command>exec</command>, the user you use will "
+"continue to appear to be logged in even after you log out of the \"subsession"
+"\"."
 msgstr ""
 
 #: login.1.xml:195(para)
@@ -3336,19 +5133,29 @@ msgid "Perform autologin protocol for rl
 msgstr ""
 
 #: login.1.xml:230(para)
-msgid "The <option>-r</option>, <option>-h</option> and <option>-f</option> options are only used when <command>login</command> is invoked by root."
+msgid ""
+"The <option>-r</option>, <option>-h</option> and <option>-f</option> options "
+"are only used when <command>login</command> is invoked by root."
 msgstr ""
 
 #: login.1.xml:239(para)
-msgid "This version of <command>login</command> has many compilation options, only some of which may be in use at any particular site."
+msgid ""
+"This version of <command>login</command> has many compilation options, only "
+"some of which may be in use at any particular site."
 msgstr ""
 
 #: login.1.xml:244(para)
-msgid "The location of files is subject to differences in system configuration."
+msgid ""
+"The location of files is subject to differences in system configuration."
 msgstr ""
 
 #: login.1.xml:260(para)
-msgid "As with any program, <command>login</command>'s appearance can be faked. If non-trusted users have physical access to a machine, an attacker could use this to obtain the password of the next person coming to sit in front of the machine. Under Linux, the SAK mechanism can be used by users to initiate a trusted path and prevent this kind of attack."
+msgid ""
+"As with any program, <command>login</command>'s appearance can be faked. If "
+"non-trusted users have physical access to a machine, an attacker could use "
+"this to obtain the password of the next person coming to sit in front of the "
+"machine. Under Linux, the SAK mechanism can be used by users to initiate a "
+"trusted path and prevent this kind of attack."
 msgstr ""
 
 #: login.1.xml:325(filename)
@@ -3392,7 +5199,20 @@ msgid "Suppress printing of system messa
 msgstr ""
 
 #: 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>."
+msgid ""
+"<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>securetty</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
 #: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
@@ -3404,11 +5224,17 @@ msgid "resource limits definition"
 msgstr ""
 
 #: limits.5.xml:47(para)
-msgid "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</filename> by default or LIMITS_FILE defined <filename>config.h</filename>) describes the resource limits you wish to impose. It should be owned by root and readable by root account only."
+msgid ""
+"The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
+"filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
+"describes the resource limits you wish to impose. It should be owned by root "
+"and readable by root account only."
 msgstr ""
 
 #: limits.5.xml:55(para)
-msgid "By default no quota is imposed on 'root'. In fact, there is no way to impose limits via this procedure to root-equiv accounts (accounts with UID 0)."
+msgid ""
+"By default no quota is imposed on 'root'. In fact, there is no way to impose "
+"limits via this procedure to root-equiv accounts (accounts with UID 0)."
 msgstr ""
 
 #: limits.5.xml:61(para)
@@ -3428,7 +5254,10 @@ msgid "@group LIMITS_STRING"
 msgstr ""
 
 #: limits.5.xml:73(para)
-msgid "The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of resource limits. Each limit consists of a letter identifier followed by a numerical limit."
+msgid ""
+"The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of "
+"resource limits. Each limit consists of a letter identifier followed by a "
+"numerical limit."
 msgstr ""
 
 #: limits.5.xml:79(para)
@@ -3476,7 +5305,9 @@ msgid "U: max number of processes"
 msgstr ""
 
 #: limits.5.xml:92(para)
-msgid "K: file creation mask, set by <citerefentry><refentrytitle>umask</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+msgid ""
+"K: file creation mask, set by <citerefentry><refentrytitle>umask</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
 #: limits.5.xml:97(para)
@@ -3484,7 +5315,9 @@ msgid "L: max number of logins for this 
 msgstr ""
 
 #: limits.5.xml:98(para)
-msgid "P: process priority, set by <citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+msgid ""
+"P: process priority, set by <citerefentry><refentrytitle>setpriority</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
 #: limits.5.xml:103(para)
@@ -3496,44 +5329,74 @@ msgid "O: max real time priority"
 msgstr ""
 
 #: limits.5.xml:108(para)
-msgid "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid <emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following entries are equivalent:"
+msgid ""
+"For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
+"<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
+"entries are equivalent:"
 msgstr ""
 
 #: limits.5.xml:114(programlisting)
 #, no-wrap
-msgid "\n      username L2D2048N5\n      username L2 D2048 N5\n    "
+msgid ""
+"\n"
+"      username L2D2048N5\n"
+"      username L2 D2048 N5\n"
+"    "
 msgstr ""
 
 #: limits.5.xml:119(para)
-msgid "Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of the line is considered a limit string, thus comments are not allowed. A invalid limits string will be rejected (not considered) by the <command>login</command> program."
+msgid ""
+"Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of "
+"the line is considered a limit string, thus comments are not allowed. A "
+"invalid limits string will be rejected (not considered) by the "
+"<command>login</command> program."
 msgstr ""
 
 #: limits.5.xml:126(para)
-msgid "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you have multiple <emphasis remap=\"I\">default</emphasis> entries in your <emphasis>LIMITS_FILE</emphasis>, then the last one will be used as the default entry."
+msgid ""
+"The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
+"have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
+"<emphasis>LIMITS_FILE</emphasis>, then the last one will be used as the "
+"default entry."
 msgstr ""
 
 #: limits.5.xml:133(para)
-msgid "The limits specified in the form \"<replaceable>@group</replaceable>\" apply to the members of the specified <replaceable>group</replaceable>."
+msgid ""
+"The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
+"to the members of the specified <replaceable>group</replaceable>."
 msgstr ""
 
 #: limits.5.xml:139(para)
-msgid "If a line with limits for an user exist, only the first line for this user will be considered."
+msgid ""
+"If a line with limits for an user exist, only the first line for this user "
+"will be considered."
 msgstr ""
 
 #: limits.5.xml:144(para)
-msgid "If no lines are specified for an user, the last <replaceable>@group</replaceable> line matching a group whose the user is a member of will be conisdered, or the last line with default limits if no groups contain the user)."
+msgid ""
+"If no lines are specified for an user, the last <replaceable>@group</"
+"replaceable> line matching a group whose the user is a member of will be "
+"conisdered, or the last line with default limits if no groups contain the "
+"user)."
 msgstr ""
 
 #: limits.5.xml:151(para)
-msgid "To completely disable limits for a user, a single dash \"<emphasis>-</emphasis>\" will do."
+msgid ""
+"To completely disable limits for a user, a single dash \"<emphasis>-</"
+"emphasis>\" will do."
 msgstr ""
 
 #: limits.5.xml:156(para)
-msgid "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>\" can be used instead of the numerical value for this limit."
+msgid ""
+"To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
+"\" can be used instead of the numerical value for this limit."
 msgstr ""
 
 #: limits.5.xml:162(para)
-msgid "Also, please note that all limit settings are set PER LOGIN. They are not global, nor are they permanent. Perhaps global limits will come, but for now this will have to do ;)"
+msgid ""
+"Also, please note that all limit settings are set PER LOGIN. They are not "
+"global, nor are they permanent. Perhaps global limits will come, but for now "
+"this will have to do ;)"
 msgstr ""
 
 #: limits.5.xml:173(filename)
@@ -3541,10 +5404,16 @@ msgid "/etc/limits"
 msgstr ""
 
 #: limits.5.xml:181(para)
-msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</manvolnum></citerefentry>, <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>setpriority</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
+"manvolnum></citerefentry>."
 msgstr ""
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname) lastlog.8.xml:46(command)
+#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
+#: lastlog.8.xml:46(command)
 msgid "lastlog"
 msgstr ""
 
@@ -3553,7 +5422,12 @@ msgid "reports the most recent login of 
 msgstr ""
 
 #: lastlog.8.xml:55(para)
-msgid "<command>lastlog</command> formats and prints the contents of the last login log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</emphasis>, <emphasis>port</emphasis>, and <emphasis>last login time</emphasis> will be printed. The default (no flags) causes lastlog entries to be printed, sorted by their order in <filename>/etc/passwd</filename>."
+msgid ""
+"<command>lastlog</command> formats and prints the contents of the last login "
+"log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</"
+"emphasis>, <emphasis>port</emphasis>, and <emphasis>last login time</"
+"emphasis> will be printed. The default (no flags) causes lastlog entries to "
+"be printed, sorted by their order in <filename>/etc/passwd</filename>."
 msgstr ""
 
 #: lastlog.8.xml:67(para)
@@ -3561,23 +5435,30 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: lastlog.8.xml:72(term)
-msgid "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
+msgid ""
+"<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 
 #: lastlog.8.xml:76(para)
-msgid "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
+msgid ""
+"Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 
 #: lastlog.8.xml:90(term) faillog.8.xml:157(term)
-msgid "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
+msgid ""
+"<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 
 #: lastlog.8.xml:95(para)
-msgid "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</emphasis>."
+msgid ""
+"Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
+"emphasis>."
 msgstr ""
 
 #: lastlog.8.xml:102(term) faillog.8.xml:168(term)
-msgid "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|<replaceable>RANGE</replaceable>"
+msgid ""
+"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
+"<replaceable>RANGE</replaceable>"
 msgstr ""
 
 #: lastlog.8.xml:107(para)
@@ -3585,23 +5466,39 @@ msgid "Print the lastlog record of the s
 msgstr ""
 
 #: lastlog.8.xml:110(para) faillog.8.xml:178(para)
-msgid "The users can be specified by a login name, a numerical user ID, or a <replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</replaceable> of users can be specified with a min and max values (<replaceable>UID_MIN-UID_MAX</replaceable>), a max value (<replaceable>-UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
+msgid ""
+"The users can be specified by a login name, a numerical user ID, or a "
+"<replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</"
+"replaceable> of users can be specified with a min and max values "
+"(<replaceable>UID_MIN-UID_MAX</replaceable>), a max value (<replaceable>-"
+"UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
 #: lastlog.8.xml:122(para)
-msgid "If the user has never logged in the message <emphasis>** Never logged in**</emphasis> will be displayed instead of the port and time."
+msgid ""
+"If the user has never logged in the message <emphasis>** Never logged in**</"
+"emphasis> will be displayed instead of the port and time."
 msgstr ""
 
 #: lastlog.8.xml:127(para)
-msgid "Only the entries for the current users of the system will be displayed. Other entries may exist for users that were deleted previously."
+msgid ""
+"Only the entries for the current users of the system will be displayed. "
+"Other entries may exist for users that were deleted previously."
 msgstr ""
 
-#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title) chage.1.xml:197(title)
+#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
+#: chage.1.xml:197(title)
 msgid "NOTE"
 msgstr ""
 
 #: lastlog.8.xml:136(para)
-msgid "The <filename>lastlog</filename> file is a database which contains info on the last login of each user. You should not rotate it. It is a sparse file, so its size on the disk is usually much smaller than the one shown by \"<command>ls -l</command>\" (which can indicate a really big file if you have in <filename>passwd</filename> users with a high UID). You can display its real size with \"<command>ls -s</command>\"."
+msgid ""
+"The <filename>lastlog</filename> file is a database which contains info on "
+"the last login of each user. You should not rotate it. It is a sparse file, "
+"so its size on the disk is usually much smaller than the one shown by "
+"\"<command>ls -l</command>\" (which can indicate a really big file if you "
+"have in <filename>passwd</filename> users with a high UID). You can display "
+"its real size with \"<command>ls -s</command>\"."
 msgstr ""
 
 #: lastlog.8.xml:150(filename)
@@ -3613,7 +5510,11 @@ msgid "Database times of previous user l
 msgstr ""
 
 #: lastlog.8.xml:160(para)
-msgid "Large gaps in UID numbers will cause the lastlog program to run longer with no output to the screen (i.e. if in lastlog database there is no entries for users with UID between 170 and 800 lastlog will appear to hang as it processes entries with UIDs 171-799)."
+msgid ""
+"Large gaps in UID numbers will cause the lastlog program to run longer with "
+"no output to the screen (i.e. if in lastlog database there is no entries for "
+"users with UID between 170 and 800 lastlog will appear to hang as it "
+"processes entries with UIDs 171-799)."
 msgstr ""
 
 #: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
@@ -3625,7 +5526,9 @@ msgid "shadowed group file"
 msgstr ""
 
 #: gshadow.5.xml:44(para)
-msgid "<filename>/etc/gshadow</filename> contains the shadowed information for group accounts."
+msgid ""
+"<filename>/etc/gshadow</filename> contains the shadowed information for "
+"group accounts."
 msgstr ""
 
 #: gshadow.5.xml:54(para)
@@ -3641,19 +5544,30 @@ msgid "It must be a valid group name, wh
 msgstr ""
 
 #: gshadow.5.xml:75(para)
-msgid "If the password field contains some string that is not a valid result of <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>, for instance ! or *, users will not be able to use a unix password to access the group (but group members do not need the password)."
+msgid ""
+"If the password field contains some string that is not a valid result of "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, for instance ! or *, users will not be able to use a unix "
+"password to access the group (but group members do not need the password)."
 msgstr ""
 
 #: gshadow.5.xml:82(para)
-msgid "The password is used when an user who is not a member of the group wants to gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>)."
+msgid ""
+"The password is used when an user who is not a member of the group wants to "
+"gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>)."
 msgstr ""
 
 #: gshadow.5.xml:88(para)
-msgid "This field may be empty, in which case only the group members can gain the group permissions."
+msgid ""
+"This field may be empty, in which case only the group members can gain the "
+"group permissions."
 msgstr ""
 
 #: gshadow.5.xml:98(para)
-msgid "This password supersedes any password specified in <filename>/etc/group</filename>."
+msgid ""
+"This password supersedes any password specified in <filename>/etc/group</"
+"filename>."
 msgstr ""
 
 #: gshadow.5.xml:106(emphasis)
@@ -3669,7 +5583,8 @@ msgid "Administrators can change the pas
 msgstr ""
 
 #: gshadow.5.xml:115(para)
-msgid "Administrators also have the same permissions as the members (see below)."
+msgid ""
+"Administrators also have the same permissions as the members (see below)."
 msgstr ""
 
 #: gshadow.5.xml:122(emphasis)
@@ -3681,11 +5596,20 @@ msgid "Members can access the group with
 msgstr ""
 
 #: gshadow.5.xml:131(para)
-msgid "You should use the same list of users as in <filename>/etc/group</filename>."
+msgid ""
+"You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
 
 #: gshadow.5.xml:160(para)
-msgid "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>grpconv</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>."
 msgstr ""
 
 #: grpck.8.xml:44(refpurpose)
@@ -3693,7 +5617,13 @@ msgid "verify integrity of group files"
 msgstr ""
 
 #: grpck.8.xml:70(para)
-msgid "The <command>grpck</command> command verifies the integrity of the groups information. It checks that all entries in <filename>/etc/group</filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename></phrase> have the proper format and contain valid data. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
+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)
@@ -3701,23 +5631,42 @@ msgid "a unique and valid group name"
 msgstr ""
 
 #: grpck.8.xml:90(para)
-msgid "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/group</filename> only)</phrase>"
+msgid ""
+"a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
+"group</filename> only)</phrase>"
 msgstr ""
 
 #: grpck.8.xml:97(para)
-msgid "a valid list of members <phrase condition=\"gshadow\"> and administrators</phrase>"
+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)"
+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 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."
+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."
+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)
@@ -3725,15 +5674,26 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: 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."
+msgid ""
+"Execute the <command>grpck</command> command in read-only mode. This causes "
+"all questions regarding changes to be answered <emphasis>no</emphasis> "
+"without user intervention."
 msgstr ""
 
 #: grpck.8.xml:151(para)
-msgid "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename></phrase> by GID."
+msgid ""
+"Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
+"\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
 #: grpck.8.xml:160(para)
-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>"
+msgid ""
+"By default, <command>grpck</command> operates on <filename>/etc/group</"
+"filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
+"filename></phrase>. The user may select alternate files with the <emphasis "
+"remap=\"I\">group</emphasis><phrase condition=\"no_gshadow\">parameter.</"
+"phrase><phrase condition=\"gshadow\">and <emphasis remap=\"I\">shadow</"
+"emphasis> parameters.</phrase>"
 msgstr ""
 
 #: grpck.8.xml:228(para)
@@ -3753,14 +5713,27 @@ 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/>"
+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>."
+msgid ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"gshadow\"><citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </"
+"phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 msgstr ""
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname) groups.1.xml:45(command)
+#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
+#: groups.1.xml:45(command)
 msgid "groups"
 msgstr ""
 
@@ -3773,15 +5746,30 @@ msgid "user"
 msgstr ""
 
 #: groups.1.xml:54(para)
-msgid "The <command>groups</command> command displays the current group names or ID values. If the value does not have a corresponding entry in <filename>/etc/group</filename>, the value will be displayed as the numerical group value. The optional <emphasis remap=\"I\">user</emphasis> parameter will display the groups for the named <emphasis remap=\"I\">user</emphasis>."
+msgid ""
+"The <command>groups</command> command displays the current group names or ID "
+"values. If the value does not have a corresponding entry in <filename>/etc/"
+"group</filename>, the value will be displayed as the numerical group value. "
+"The optional <emphasis remap=\"I\">user</emphasis> parameter will display "
+"the groups for the named <emphasis remap=\"I\">user</emphasis>."
 msgstr ""
 
 #: groups.1.xml:66(para)
-msgid "Systems which do not support concurrent group sets will have the information from <filename>/etc/group</filename> reported. The user must use <command>newgrp</command> or <command>sg</command> to change their current real and effective group ID."
+msgid ""
+"Systems which do not support concurrent group sets will have the information "
+"from <filename>/etc/group</filename> reported. The user must use "
+"<command>newgrp</command> or <command>sg</command> to change their current "
+"real and effective group ID."
 msgstr ""
 
 #: groups.1.xml:88(para)
-msgid "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>getgid</refentrytitle><manvolnum>2</manvolnum></citerefentry>, <citerefentry><refentrytitle>getgroups</refentrytitle><manvolnum>2</manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getgid</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getgroups</refentrytitle><manvolnum>2</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
 #: groupmod.8.xml:44(refpurpose)
@@ -3793,7 +5781,10 @@ msgid "GROUP"
 msgstr ""
 
 #: groupmod.8.xml:59(para)
-msgid "The <command>groupmod</command> command modifies the definition of the specified <replaceable>GROUP</replaceable> by modifying the appropriate entry in the group database."
+msgid ""
+"The <command>groupmod</command> command modifies the definition of the "
+"specified <replaceable>GROUP</replaceable> by modifying the appropriate "
+"entry in the group database."
 msgstr ""
 
 #: groupmod.8.xml:68(para)
@@ -3801,31 +5792,45 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: groupmod.8.xml:74(term) groupadd.8.xml:93(term)
-msgid "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 
 #: groupmod.8.xml:78(para)
-msgid "The group ID of the given <replaceable>GROUP</replaceable> will be changed to <replaceable>GID</replaceable>."
+msgid ""
+"The group ID of the given <replaceable>GROUP</replaceable> will be changed "
+"to <replaceable>GID</replaceable>."
 msgstr ""
 
 #: groupmod.8.xml:82(para)
-msgid "The value of <replaceable>GID</replaceable> must be a non-negative decimal integer. This value must be unique, unless the <option>-o</option> option is used. Values between 0 and 999 are typically reserved for system groups."
+msgid ""
+"The value of <replaceable>GID</replaceable> must be a non-negative decimal "
+"integer. This value must be unique, unless the <option>-o</option> option is "
+"used. Values between 0 and 999 are typically reserved for system groups."
 msgstr ""
 
 #: groupmod.8.xml:89(para)
-msgid "Any files that have the old group ID and must continue to belong to <replaceable>GROUP</replaceable>, must have their group ID changed manually."
+msgid ""
+"Any files that have the old group ID and must continue to belong to "
+"<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
 
 #: groupmod.8.xml:104(term)
-msgid "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</replaceable>"
+msgid ""
+"<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
+"replaceable>"
 msgstr ""
 
 #: groupmod.8.xml:109(para)
-msgid "The name of the group will be changed from <replaceable>GROUP</replaceable> to <replaceable>NEW_GROUP</replaceable> name."
+msgid ""
+"The name of the group will be changed from <replaceable>GROUP</replaceable> "
+"to <replaceable>NEW_GROUP</replaceable> name."
 msgstr ""
 
 #: groupmod.8.xml:120(para)
-msgid "When used with the <option>-g</option> option, allow to change the group <replaceable>GID</replaceable> to a non-unique value."
+msgid ""
+"When used with the <option>-g</option> option, allow to change the group "
+"<replaceable>GID</replaceable> to a non-unique value."
 msgstr ""
 
 #: groupmod.8.xml:219(para)
@@ -3833,11 +5838,27 @@ msgid "group name already in use"
 msgstr ""
 
 #: groupmod.8.xml:183(para)
-msgid "The <command>groupmod</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>groupmod</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #: groupmod.8.xml:234(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 
 #: groupmems.8.xml:44(refpurpose)
@@ -3869,31 +5890,46 @@ msgid "-l"
 msgstr ""
 
 #: groupmems.8.xml:61(para)
-msgid "The <command>groupmems</command> command allows a user to administer his/her own group membership list without the requirement of superuser privileges. The <command>groupmems</command> utility is for systems that configure its users to be in their own name sake primary group (i.e., guest / guest)."
+msgid ""
+"The <command>groupmems</command> command allows a user to administer his/her "
+"own group membership list without the requirement of superuser privileges. "
+"The <command>groupmems</command> utility is for systems that configure its "
+"users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
 #: groupmems.8.xml:69(para)
-msgid "Only the superuser, as administrator, can use <command>groupmems</command> to alter the memberships of other groups."
+msgid ""
+"Only the superuser, as administrator, can use <command>groupmems</command> "
+"to alter the memberships of other groups."
 msgstr ""
 
 #: groupmems.8.xml:76(para)
-msgid "The options which apply to the <command>groupmems</command> command are:"
+msgid ""
+"The options which apply to the <command>groupmems</command> command are:"
 msgstr ""
 
 #: groupmems.8.xml:82(term)
-msgid "<option>-a</option>, <option>--add</option><replaceable>user_name</replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user_name</"
+"replaceable>"
 msgstr ""
 
 #: groupmems.8.xml:84(para)
 msgid "Add an user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para) groupmems.8.xml:132(para)
-msgid "If the <filename>/etc/gshadow</filename> file exist, and the group has no entry in the <filename>/etc/gshadow</filename> file, a new entry will be created."
+#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
+#: groupmems.8.xml:132(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, and the group has no "
+"entry in the <filename>/etc/gshadow</filename> file, a new entry will be "
+"created."
 msgstr ""
 
 #: groupmems.8.xml:93(term)
-msgid "<option>-d</option>, <option>--delete</option><replaceable>user_name</replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user_name</"
+"replaceable>"
 msgstr ""
 
 #: groupmems.8.xml:95(para)
@@ -3901,11 +5937,15 @@ msgid "Delete a user from the group memb
 msgstr ""
 
 #: groupmems.8.xml:96(para)
-msgid "If the <filename>/etc/gshadow</filename> file exist, the user will be removed from the list of members and administrators of the group."
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, the user will be "
+"removed from the list of members and administrators of the group."
 msgstr ""
 
 #: groupmems.8.xml:109(term)
-msgid "<option>-g</option>, <option>--group</option><replaceable>group_name</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--group</option><replaceable>group_name</"
+"replaceable>"
 msgstr ""
 
 #: groupmems.8.xml:111(para)
@@ -3933,12 +5973,23 @@ msgid "SETUP"
 msgstr ""
 
 #: groupmems.8.xml:144(para)
-msgid "The <command>groupmems</command> executable should be in mode <literal>2770</literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</emphasis>. The system administrator can add users to group <emphasis>groups</emphasis> to allow or disallow them using the <command>groupmems</command> utility to manage their own group membership list."
+msgid ""
+"The <command>groupmems</command> executable should be in mode <literal>2770</"
+"literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
+"emphasis>. The system administrator can add users to group <emphasis>groups</"
+"emphasis> to allow or disallow them using the <command>groupmems</command> "
+"utility to manage their own group membership list."
 msgstr ""
 
 #: groupmems.8.xml:153(programlisting)
 #, no-wrap
-msgid "\n\t$ groupadd -r groups\n\t$ chmod 2770 groupmems\n\t$ chown root.groups groupmems\n\t$ groupmems -g groups -a gk4\n    "
+msgid ""
+"\n"
+"\t$ groupadd -r groups\n"
+"\t$ chmod 2770 groupmems\n"
+"\t$ chown root.groups groupmems\n"
+"\t$ groupmems -g groups -a gk4\n"
+"    "
 msgstr ""
 
 #: groupmems.8.xml:185(para)
@@ -3946,7 +5997,19 @@ msgid "secure group account information"
 msgstr ""
 
 #: groupmems.8.xml:193(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
 #: groupdel.8.xml:44(refpurpose)
@@ -3954,15 +6017,22 @@ msgid "delete a group"
 msgstr ""
 
 #: groupdel.8.xml:58(para)
-msgid "The <command>groupdel</command> command modifies the system account files, deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. The named group must exist."
+msgid ""
+"The <command>groupdel</command> command modifies the system account files, "
+"deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. "
+"The named group must exist."
 msgstr ""
 
 #: groupdel.8.xml:66(para)
-msgid "You may not remove the primary group of any existing user. You must remove the user before you remove the group."
+msgid ""
+"You may not remove the primary group of any existing user. You must remove "
+"the user before you remove the group."
 msgstr ""
 
 #: groupdel.8.xml:70(para)
-msgid "You should manually check all file systems to ensure that no files remain owned by this group."
+msgid ""
+"You should manually check all file systems to ensure that no files remain "
+"owned by this group."
 msgstr ""
 
 #: groupdel.8.xml:132(para)
@@ -3970,11 +6040,27 @@ msgid "can't remove user's primary group
 msgstr ""
 
 #: groupdel.8.xml:108(para)
-msgid "The <command>groupdel</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>groupdel</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #: groupdel.8.xml:147(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>"
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>"
 msgstr ""
 
 #: groupadd.8.xml:47(refpurpose)
@@ -3982,7 +6068,10 @@ msgid "create a new group"
 msgstr ""
 
 #: groupadd.8.xml:64(para)
-msgid "The <command>groupadd</command> command creates a new group account using the values specified on the command line plus the default values from the system. The new group will be entered into the system files as needed."
+msgid ""
+"The <command>groupadd</command> command creates a new group account using "
+"the values specified on the command line plus the default values from the "
+"system. The new group will be entered into the system files as needed."
 msgstr ""
 
 #: groupadd.8.xml:73(para)
@@ -3990,23 +6079,40 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: groupadd.8.xml:83(para)
-msgid "This option causes the command to simply exit with success status if the specified group already exists. When used with <option>-g</option>, and the specified GID already exists, another (unique) GID is chosen (i.e. <option>-g</option> is turned off)."
+msgid ""
+"This option causes the command to simply exit with success status if the "
+"specified group already exists. When used with <option>-g</option>, and the "
+"specified GID already exists, another (unique) GID is chosen (i.e. <option>-"
+"g</option> is turned off)."
 msgstr ""
 
 #: groupadd.8.xml:97(para)
-msgid "The numerical value of the group's ID. This value must be unique, unless the <option>-o</option> option is used. The value must be non-negative. The default is to use the smallest ID value greater than 999 and greater than every other group. Values between 0 and 999 are typically reserved for system accounts."
+msgid ""
+"The numerical value of the group's ID. This value must be unique, unless the "
+"<option>-o</option> option is used. The value must be non-negative. The "
+"default is to use the smallest ID value greater than 999 and greater than "
+"every other group. Values between 0 and 999 are typically reserved for "
+"system accounts."
 msgstr ""
 
 #: groupadd.8.xml:117(para)
-msgid "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX and others). Multiple <option>-K</option> options can be specified."
+msgid ""
+"Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
+"and others). Multiple <option>-K</option> options can be specified."
 msgstr ""
 
 #: groupadd.8.xml:122(para)
-msgid "Example: <option>-K </option><replaceable>GID_MIN</replaceable>=<replaceable>100</replaceable><option>-K </option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
+msgid ""
+"Example: <option>-K </option><replaceable>GID_MIN</"
+"replaceable>=<replaceable>100</replaceable><option>-K </"
+"option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
 #: groupadd.8.xml:126(para)
-msgid "Note: <option>-K </option><replaceable>GID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgid ""
+"Note: <option>-K </option><replaceable>GID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
 msgstr ""
 
 #: groupadd.8.xml:138(para)
@@ -4018,11 +6124,18 @@ msgid "Create a system group."
 msgstr ""
 
 #: groupadd.8.xml:173(para)
-msgid "The numeric identifiers of new system groups are chosen in the <option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in <filename>login.defs</filename>, instead of <option>GID_MIN</option>-<option>GID_MAX</option>."
+msgid ""
+"The numeric identifiers of new system groups are chosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
 msgstr ""
 
 #: groupadd.8.xml:224(para)
-msgid "Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes. They can end with a dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
+msgid ""
+"Groupnames must start with a lower case letter or an underscore, followed by "
+"lower case letters, digits, underscores, or dashes. They can end with a "
+"dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
 #: groupadd.8.xml:230(para)
@@ -4030,11 +6143,15 @@ msgid "Groupnames may only be up to &GRO
 msgstr ""
 
 #: groupadd.8.xml:233(para)
-msgid "You may not add a NIS or LDAP group. This must be performed on the corresponding server."
+msgid ""
+"You may not add a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 
 #: groupadd.8.xml:237(para)
-msgid "If the groupname already exists in an external group database such as NIS or LDAP, <command>groupadd</command> will deny the group creation request."
+msgid ""
+"If the groupname already exists in an external group database such as NIS or "
+"LDAP, <command>groupadd</command> will deny the group creation request."
 msgstr ""
 
 #: groupadd.8.xml:270(para)
@@ -4046,11 +6163,28 @@ msgid "group name not unique"
 msgstr ""
 
 #: groupadd.8.xml:246(para)
-msgid "The <command>groupadd</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>groupadd</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #: groupadd.8.xml:291(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
 #: gpasswd.1.xml:49(phrase)
@@ -4066,19 +6200,33 @@ msgid "option"
 msgstr ""
 
 #: 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."
+msgid ""
+"The <command>gpasswd</command> command is used to administer <filename>/etc/"
+"group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
+"filename></phrase>. Every group can have <phrase condition=\"gshadow"
+"\">administrators,</phrase> members and a password."
 msgstr ""
 
 #: gpasswd.1.xml:81(para)
-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."
+msgid ""
+"System administrators can use the <option>-A</option> option to define group "
+"administrator(s) and the <option>-M</option> option to define members. They "
+"have all rights of group administrators and members."
 msgstr ""
 
 #: gpasswd.1.xml:86(para)
-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>."
+msgid ""
+"<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
+"administrator</phrase><phrase condition=\"no_gshadow\">a system "
+"administrator</phrase> with a group name only prompts for the new password "
+"of the <replaceable>group</replaceable>."
 msgstr ""
 
 #: gpasswd.1.xml:93(para)
-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."
+msgid ""
+"If a password is set the members can still use "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> without a password, and non-members must supply the password."
 msgstr ""
 
 #: gpasswd.1.xml:101(title)
@@ -4086,11 +6234,16 @@ msgid "Notes about group passwords"
 msgstr ""
 
 #: 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."
+msgid ""
+"Group passwords are an inherent security problem since more than one person "
+"is permitted to know the password. However, groups are a useful tool for "
+"permitting co-operation between different users."
 msgstr ""
 
 #: gpasswd.1.xml:113(para)
-msgid "Except for the <option>-A</option> and <option>-M</option> options, the options cannot be combined."
+msgid ""
+"Except for the <option>-A</option> and <option>-M</option> options, the "
+"options cannot be combined."
 msgstr ""
 
 #: gpasswd.1.xml:117(para)
@@ -4102,19 +6255,25 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: gpasswd.1.xml:125(term)
-msgid "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
 
 #: gpasswd.1.xml:129(para)
-msgid "Add the <replaceable>user</replaceable> to the named <replaceable>group</replaceable>."
+msgid ""
+"Add the <replaceable>user</replaceable> to the named <replaceable>group</"
+"replaceable>."
 msgstr ""
 
 #: gpasswd.1.xml:138(term)
-msgid "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
 
 #: gpasswd.1.xml:142(para)
-msgid "Remove the <replaceable>user</replaceable> from the named <replaceable>group</replaceable>."
+msgid ""
+"Remove the <replaceable>user</replaceable> from the named "
+"<replaceable>group</replaceable>."
 msgstr ""
 
 #: gpasswd.1.xml:159(term)
@@ -4122,7 +6281,10 @@ msgid "<option>-r</option>, <option>--re
 msgstr ""
 
 #: gpasswd.1.xml:163(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>."
+msgid ""
+"Remove the password from the named <replaceable>group</replaceable>. Only "
+"group members will be allowed to use <command>newgrp</command> to join the "
+"named <replaceable>group</replaceable>."
 msgstr ""
 
 #: gpasswd.1.xml:174(term)
@@ -4130,11 +6292,16 @@ msgid "<option>-R</option>, <option>--re
 msgstr ""
 
 #: gpasswd.1.xml:178(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>."
+msgid ""
+"Restrict the access to the named <replaceable>group</replaceable>. Only "
+"group members will be allowed to use <command>newgrp</command> to join the "
+"named <replaceable>group</replaceable>."
 msgstr ""
 
 #: gpasswd.1.xml:189(term)
-msgid "<option>-A</option>, <option>--administrators</option><replaceable>user</replaceable>,..."
+msgid ""
+"<option>-A</option>, <option>--administrators</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
 
 #: gpasswd.1.xml:193(para)
@@ -4142,7 +6309,9 @@ msgid "Set the list of administrative us
 msgstr ""
 
 #: gpasswd.1.xml:201(term)
-msgid "<option>-M</option>, <option>--members</option><replaceable>user</replaceable>,..."
+msgid ""
+"<option>-M</option>, <option>--members</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
 
 #: gpasswd.1.xml:205(para)
@@ -4150,14 +6319,32 @@ msgid "Set the list of group members."
 msgstr ""
 
 #: gpasswd.1.xml:215(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."
+msgid ""
+"This tool only operates on the <filename>/etc/group</filename><phrase "
+"condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
+"phrase><phrase condition=\"no_gshadow\">file.</phrase> Thus you cannot "
+"change any NIS or LDAP group. This must be performed on the corresponding "
+"server."
 msgstr ""
 
 #: gpasswd.1.xml:260(para)
-msgid "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry><phrase condition=\"gshadow\">, <citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
-msgstr ""
-
-#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname) faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle) faillog.5.xml:39(refname) faillog.5.xml:86(refentrytitle)
+msgid ""
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry><phrase condition="
+"\"gshadow\">, <citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
+msgstr ""
+
+#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname)
+#: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
+#: faillog.5.xml:39(refname) faillog.5.xml:86(refentrytitle)
 msgid "faillog"
 msgstr ""
 
@@ -4166,7 +6353,12 @@ msgid "display faillog records or set lo
 msgstr ""
 
 #: faillog.8.xml:54(para)
-msgid "<command>faillog</command> displays the contents of the failure log database (<filename>/var/log/faillog</filename>). It can also set the failure counters and limits. When <command>faillog</command> is run without arguments, it only displays the faillog records of the users who had a login failure."
+msgid ""
+"<command>faillog</command> displays the contents of the failure log database "
+"(<filename>/var/log/faillog</filename>). It can also set the failure "
+"counters and limits. When <command>faillog</command> is run without "
+"arguments, it only displays the faillog records of the users who had a login "
+"failure."
 msgstr ""
 
 #: faillog.8.xml:65(para)
@@ -4174,47 +6366,68 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: faillog.8.xml:73(para)
-msgid "Display (or act on) faillog records for all users having an entry in the <filename>faillog</filename> database."
+msgid ""
+"Display (or act on) faillog records for all users having an entry in the "
+"<filename>faillog</filename> database."
 msgstr ""
 
 #: faillog.8.xml:77(para)
-msgid "The range of users can be restricted with the <option>-u</option> option."
+msgid ""
+"The range of users can be restricted with the <option>-u</option> option."
 msgstr ""
 
 #: faillog.8.xml:81(para)
-msgid "In display mode, this is still restricted to existing users but forces the display of the faillog entries even if they are empty."
+msgid ""
+"In display mode, this is still restricted to existing users but forces the "
+"display of the faillog entries even if they are empty."
 msgstr ""
 
 #: faillog.8.xml:86(para)
-msgid "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, <option>-t</option> options, the users' records are changed, even if the user does not exist on the system. This is useful to reset records of users that have been deleted or to set a policy in advance for a range of users."
+msgid ""
+"With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
+"<option>-t</option> options, the users' records are changed, even if the "
+"user does not exist on the system. This is useful to reset records of users "
+"that have been deleted or to set a policy in advance for a range of users."
 msgstr ""
 
 #: faillog.8.xml:103(term)
-msgid "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</replaceable>"
+msgid ""
+"<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
+"replaceable>"
 msgstr ""
 
 #: faillog.8.xml:108(para)
-msgid "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
+msgid ""
+"Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 
 #: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
-msgid "Write access to <filename>/var/log/faillog</filename> is required for this option."
+msgid ""
+"Write access to <filename>/var/log/faillog</filename> is required for this "
+"option."
 msgstr ""
 
 #: faillog.8.xml:119(term)
-msgid "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
+msgid ""
+"<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 
 #: faillog.8.xml:124(para)
-msgid "Set the maximum number of login failures after the account is disabled to <replaceable>MAX</replaceable>."
+msgid ""
+"Set the maximum number of login failures after the account is disabled to "
+"<replaceable>MAX</replaceable>."
 msgstr ""
 
 #: faillog.8.xml:128(para)
-msgid "Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not placing a limit on the number of failed logins."
+msgid ""
+"Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
+"placing a limit on the number of failed logins."
 msgstr ""
 
 #: faillog.8.xml:133(para)
-msgid "The maximum failure count should always be 0 for <emphasis>root</emphasis> to prevent a denial of services attack against the system."
+msgid ""
+"The maximum failure count should always be 0 for <emphasis>root</emphasis> "
+"to prevent a denial of services attack against the system."
 msgstr ""
 
 #: faillog.8.xml:145(term)
@@ -4226,19 +6439,31 @@ msgid "Reset the counters of login failu
 msgstr ""
 
 #: faillog.8.xml:161(para)
-msgid "Display faillog records more recent than <replaceable>DAYS</replaceable>."
+msgid ""
+"Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 
 #: faillog.8.xml:173(para)
-msgid "Display faillog record or maintains failure counters and limits (if used with <option>-l</option>, <option>-m</option> or <option>-r</option> options) only for the specified user(s)."
+msgid ""
+"Display faillog record or maintains failure counters and limits (if used "
+"with <option>-l</option>, <option>-m</option> or <option>-r</option> "
+"options) only for the specified user(s)."
 msgstr ""
 
 #: faillog.8.xml:191(para)
-msgid "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</option> options are used, <command>faillog</command> displays the faillog record of the specified user(s)."
+msgid ""
+"When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
+"option> options are used, <command>faillog</command> displays the faillog "
+"record of the specified user(s)."
 msgstr ""
 
 #: faillog.8.xml:200(para)
-msgid "<command>faillog</command> only prints out users with no successful login since the last failure. To print out a user who has had a successful login since their last failure, you must explicitly request the user with the <option>-u</option> flag, or print out all users with the <option>-a</option> flag."
+msgid ""
+"<command>faillog</command> only prints out users with no successful login "
+"since the last failure. To print out a user who has had a successful login "
+"since their last failure, you must explicitly request the user with the "
+"<option>-u</option> flag, or print out all users with the <option>-a</"
+"option> flag."
 msgstr ""
 
 #: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
@@ -4250,7 +6475,10 @@ msgid "Failure logging file."
 msgstr ""
 
 #: faillog.8.xml:223(para)
-msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>faillog</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>faillog</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
 #: faillog.5.xml:40(refpurpose)
@@ -4258,11 +6486,19 @@ msgid "login failure logging file"
 msgstr ""
 
 #: faillog.5.xml:45(para)
-msgid "<filename>/var/log/faillog</filename> maintains a count of login failures and the limits for each account."
+msgid ""
+"<filename>/var/log/faillog</filename> maintains a count of login failures "
+"and the limits for each account."
 msgstr ""
 
 #: faillog.5.xml:49(para)
-msgid "The file contains fixed length records, indexed by numerical UID. Each record contains the count of login failures since the last successful login; the maximum number of failures before the account is disabled; the line on whiche the last login failure occurred; the date of the last login failure; and the duration (in seconds) during which the account will be locked after a failure."
+msgid ""
+"The file contains fixed length records, indexed by numerical UID. Each "
+"record contains the count of login failures since the last successful login; "
+"the maximum number of failures before the account is disabled; the line on "
+"whiche the last login failure occurred; the date of the last login failure; "
+"and the duration (in seconds) during which the account will be locked after "
+"a failure."
 msgstr ""
 
 #: faillog.5.xml:59(para)
@@ -4271,10 +6507,19 @@ msgstr ""
 
 #: faillog.5.xml:60(programlisting)
 #, no-wrap
-msgid "\nstruct\tfaillog {\n\tshort   fail_cnt;\n\tshort   fail_max;\n\tchar    fail_line[12];\n\ttime_t  fail_time;\n\tlong    fail_locktime;\n};"
+msgid ""
+"\n"
+"struct\tfaillog {\n"
+"\tshort   fail_cnt;\n"
+"\tshort   fail_max;\n"
+"\tchar    fail_line[12];\n"
+"\ttime_t  fail_time;\n"
+"\tlong    fail_locktime;\n"
+"};"
 msgstr ""
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname) expiry.1.xml:52(command)
+#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
+#: expiry.1.xml:52(command)
 msgid "expiry"
 msgstr ""
 
@@ -4283,11 +6528,17 @@ msgid "check and enforce password expira
 msgstr ""
 
 #: expiry.1.xml:60(para)
-msgid "The <command>expiry</command> command checks (<option>-c</option>) the current password expiration and forces (<option>-f</option>) changes when required. It is callable as a normal user command."
+msgid ""
+"The <command>expiry</command> command checks (<option>-c</option>) the "
+"current password expiration and forces (<option>-f</option>) changes when "
+"required. It is callable as a normal user command."
 msgstr ""
 
 #: expiry.1.xml:87(para) chage.1.xml:278(para)
-msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
 #: chsh.1.xml:46(refpurpose)
@@ -4295,7 +6546,11 @@ msgid "change login shell"
 msgstr ""
 
 #: chsh.1.xml:63(para)
-msgid "The <command>chsh</command> command changes the user login shell. This determines the name of the user's initial login command. A normal user may only change the login shell for her own account; the superuser may change the login shell for any account."
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account; the superuser may change "
+"the login shell for any account."
 msgstr ""
 
 #: chsh.1.xml:74(para)
@@ -4303,11 +6558,23 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: chsh.1.xml:96(para)
-msgid "If the <option>-s</option> option is not selected, <command>chsh</command> operates in an interactive fashion, prompting the user with the current login shell. Enter the new value to change the shell, or leave the line blank to use the current one. The current shell is displayed between a pair of <emphasis>[ ]</emphasis> marks."
+msgid ""
+"If the <option>-s</option> option is not selected, <command>chsh</command> "
+"operates in an interactive fashion, prompting the user with the current "
+"login shell. Enter the new value to change the shell, or leave the line "
+"blank to use the current one. The current shell is displayed between a pair "
+"of <emphasis>[ ]</emphasis> marks."
 msgstr ""
 
 #: chsh.1.xml:107(para)
-msgid "The only restriction placed on the login shell is that the command name must be listed in <filename>/etc/shells</filename>, unless the invoker is the superuser, and then any value may be added. An account with a restricted login shell may not change her login shell. For this reason, placing <filename>/bin/rsh</filename> in <filename>/etc/shells</filename> is discouraged since accidentally changing to a restricted shell would prevent the user from ever changing her login shell back to its original value."
+msgid ""
+"The only restriction placed on the login shell is that the command name must "
+"be listed in <filename>/etc/shells</filename>, unless the invoker is the "
+"superuser, and then any value may be added. An account with a restricted "
+"login shell may not change her login shell. For this reason, placing "
+"<filename>/bin/rsh</filename> in <filename>/etc/shells</filename> is "
+"discouraged since accidentally changing to a restricted shell would prevent "
+"the user from ever changing her login shell back to its original value."
 msgstr ""
 
 #: chsh.1.xml:142(filename)
@@ -4319,7 +6586,12 @@ msgid "List of valid login shells."
 msgstr ""
 
 #: chsh.1.xml:158(para)
-msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 msgstr ""
 
 #: chpasswd.8.xml:47(refpurpose)
@@ -4327,35 +6599,60 @@ msgid "update passwords in batch mode"
 msgstr ""
 
 #: chpasswd.8.xml:61(para)
-msgid "The <command>chpasswd</command> command reads a list of user name and password pairs from standard input and uses this information to update a group of existing users. Each line is of the format:"
+msgid ""
+"The <command>chpasswd</command> command reads a list of user name and "
+"password pairs from standard input and uses this information to update a "
+"group of existing users. Each line is of the format:"
 msgstr ""
 
 #: chpasswd.8.xml:66(para)
-msgid "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</emphasis>"
+msgid ""
+"<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
+"emphasis>"
 msgstr ""
 
 #: chpasswd.8.xml:70(para)
-msgid "By default the passwords must be supplied in clear-text, and are encrypted by <command>chpasswd</command>. Also the password age will be updated, if present."
+msgid ""
+"By default the passwords must be supplied in clear-text, and are encrypted "
+"by <command>chpasswd</command>. Also the password age will be updated, if "
+"present."
 msgstr ""
 
 #: chpasswd.8.xml:75(para)
-msgid "The default encryption algorithm can be defined for the system with the <option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables of <filename>/etc/login.defs</filename>, and can be overwitten with the <option>-e</option>, <option>-m</option>, or <option>-c</option> options."
+msgid ""
+"The default encryption algorithm can be defined for the system with the "
+"<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
+"of <filename>/etc/login.defs</filename>, and can be overwitten with the "
+"<option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
 #: chpasswd.8.xml:83(para)
-msgid "By default, passwords are encrypted by PAM, but (even if not recommended) you can select a different encryption method with the <option>-e</option>, <option>-m</option>, or <option>-c</option> options."
+msgid ""
+"By default, passwords are encrypted by PAM, but (even if not recommended) "
+"you can select a different encryption method with the <option>-e</option>, "
+"<option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
 #: chpasswd.8.xml:89(para)
-msgid "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</phrase><command>chpasswd</command> first updates all the passwords in memory, and then commits all the changes to disk if no errors occured for any user."
+msgid ""
+"<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
+"phrase><command>chpasswd</command> first updates all the passwords in "
+"memory, and then commits all the changes to disk if no errors occured for "
+"any user."
 msgstr ""
 
 #: chpasswd.8.xml:95(para)
-msgid "When PAM is used to encrypt the passwords (and update the passwords in the system database) then if a password cannot be updated <command>chpasswd</command> continues updating the passwords of the next users, and will return an error code on exit."
+msgid ""
+"When PAM is used to encrypt the passwords (and update the passwords in the "
+"system database) then if a password cannot be updated <command>chpasswd</"
+"command> continues updating the passwords of the next users, and will return "
+"an error code on exit."
 msgstr ""
 
 #: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
-msgid "This command is intended to be used in a large system environment where many accounts are created at a single time."
+msgid ""
+"This command is intended to be used in a large system environment where many "
+"accounts are created at a single time."
 msgstr ""
 
 #: chpasswd.8.xml:109(para)
@@ -4363,7 +6660,9 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: chpasswd.8.xml:115(term)
-msgid "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</replaceable>"
+msgid ""
+"<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
+"replaceable>"
 msgstr ""
 
 #: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
@@ -4375,7 +6674,11 @@ msgid "By default, PAM is used to encryp
 msgstr ""
 
 #: chpasswd.8.xml:131(para)
-msgid "By default (if none of the <option>-c</option>, <option>-m</option>, or <option>-e</option> options are specified), the encryption method is defined by the <option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables of <filename>/etc/login.defs</filename>."
+msgid ""
+"By default (if none of the <option>-c</option>, <option>-m</option>, or "
+"<option>-e</option> options are specified), the encryption method is defined "
+"by the <option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> "
+"variables of <filename>/etc/login.defs</filename>."
 msgstr ""
 
 #: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
@@ -4391,19 +6694,28 @@ msgid "<option>-m</option>, <option>--md
 msgstr ""
 
 #: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
-msgid "Use MD5 encryption instead of DES when the supplied passwords are not encrypted."
+msgid ""
+"Use MD5 encryption instead of DES when the supplied passwords are not "
+"encrypted."
 msgstr ""
 
 #: chpasswd.8.xml:167(term)
-msgid "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</replaceable>"
+msgid ""
+"<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
+"replaceable>"
 msgstr ""
 
 #: chpasswd.8.xml:187(para)
-msgid "By default, the number of rounds is defined by the <option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</option> variables in <filename>/etc/login.defs</filename>."
+msgid ""
+"By default, the number of rounds is defined by the "
+"<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
+"option> variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
 #: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
-msgid "Remember to set permissions or umask to prevent readability of unencrypted files by other users."
+msgid ""
+"Remember to set permissions or umask to prevent readability of unencrypted "
+"files by other users."
 msgstr ""
 
 #: chpasswd.8.xml:244(filename)
@@ -4415,7 +6727,13 @@ msgid "PAM configuration for <command>ch
 msgstr ""
 
 #: chpasswd.8.xml:254(para)
-msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>newusers</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<phrase><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
 #: chgpasswd.8.xml:48(refpurpose)
@@ -4423,27 +6741,44 @@ msgid "update group passwords in batch m
 msgstr ""
 
 #: chgpasswd.8.xml:62(para)
-msgid "The <command>chgpasswd</command> command reads a list of group name and password pairs from standard input and uses this information to update a set of existing groups. Each line is of the format:"
+msgid ""
+"The <command>chgpasswd</command> command reads a list of group name and "
+"password pairs from standard input and uses this information to update a set "
+"of existing groups. Each line is of the format:"
 msgstr ""
 
 #: chgpasswd.8.xml:67(para)
-msgid "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</emphasis>"
+msgid ""
+"<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
+"emphasis>"
 msgstr ""
 
 #: chgpasswd.8.xml:71(para)
-msgid "By default the supplied password must be in clear-text, and is encrypted by <command>chgpasswd</command>."
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chgpasswd</command>."
 msgstr ""
 
 #: chgpasswd.8.xml:75(para)
-msgid "The default encryption algorithm can be defined for the system with the ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</option> options."
+msgid ""
+"The default encryption algorithm can be defined for the system with the "
+"ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be "
+"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
+"option> options."
 msgstr ""
 
 #: chgpasswd.8.xml:89(para)
-msgid "The options which apply to the <command>chgpasswd</command> command are:"
+msgid ""
+"The options which apply to the <command>chgpasswd</command> command are:"
 msgstr ""
 
 #: chgpasswd.8.xml:209(para)
-msgid "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>."
 msgstr ""
 
 #: chfn.1.xml:47(refpurpose)
@@ -4483,19 +6818,45 @@ msgid "-o <placeholder-1/>"
 msgstr ""
 
 #: chfn.1.xml:64(para)
-msgid "The <command>chfn</command> command changes user fullname, office number, office extension, and home phone number information for a user's account. This information is typically printed by <citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs. A normal user may only change the fields for her own account, subject to the restrictions in <filename>/etc/login.defs</filename>. (The default configuration is to prevent users from changing their fullname.) The superuser may change any field for any account. Additionally, only the superuser may use the <option>-o</option> option to change the undefined portions of the GECOS field."
+msgid ""
+"The <command>chfn</command> command changes user fullname, office number, "
+"office extension, and home phone number information for a user's account. "
+"This information is typically printed by "
+"<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> and similar programs. A normal user may only change the fields "
+"for her own account, subject to the restrictions in <filename>/etc/login."
+"defs</filename>. (The default configuration is to prevent users from "
+"changing their fullname.) The superuser may change any field for any "
+"account. Additionally, only the superuser may use the <option>-o</option> "
+"option to change the undefined portions of the GECOS field."
 msgstr ""
 
 #: chfn.1.xml:78(para)
-msgid "These fields must not contain any colons. Except for the <emphasis remap=\"I\">other</emphasis> field, they should not contain any comma or equal sign. It is also recommended to avoid non-US-ASCII characters, but this is only enforced for the phone numbers. The <emphasis remap=\"I\">other</emphasis> field is used to store accounting information used by other applications."
+msgid ""
+"These fields must not contain any colons. Except for the <emphasis remap=\"I"
+"\">other</emphasis> field, they should not contain any comma or equal sign. "
+"It is also recommended to avoid non-US-ASCII characters, but this is only "
+"enforced for the phone numbers. The <emphasis remap=\"I\">other</emphasis> "
+"field is used to store accounting information used by other applications."
 msgstr ""
 
 #: chfn.1.xml:87(para)
-msgid "If none of the options are selected, <command>chfn</command> operates in an interactive fashion, prompting the user with the current values for all of the fields. Enter the new value to change the field, or leave the line blank to use the current value. The current value is displayed between a pair of <emphasis remap=\"B\">[ ]</emphasis> marks. Without options, <command>chfn</command> prompts for the current user account."
+msgid ""
+"If none of the options are selected, <command>chfn</command> operates in an "
+"interactive fashion, prompting the user with the current values for all of "
+"the fields. Enter the new value to change the field, or leave the line blank "
+"to use the current value. The current value is displayed between a pair of "
+"<emphasis remap=\"B\">[ ]</emphasis> marks. Without options, <command>chfn</"
+"command> prompts for the current user account."
 msgstr ""
 
 #: chfn.1.xml:132(para)
-msgid "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 msgstr ""
 
 #: chage.1.xml:44(refpurpose)
@@ -4503,7 +6864,10 @@ msgid "change user password expiry infor
 msgstr ""
 
 #: chage.1.xml:60(para)
-msgid "The <command>chage</command> command changes the number of days between password changes and the date of the last password change. This information is used by the system to determine when a user must change his/her password."
+msgid ""
+"The <command>chage</command> command changes the number of days between "
+"password changes and the date of the last password change. This information "
+"is used by the system to determine when a user must change his/her password."
 msgstr ""
 
 #: chage.1.xml:70(para)
@@ -4511,35 +6875,58 @@ msgid "The options which apply to the <c
 msgstr ""
 
 #: chage.1.xml:75(term)
-msgid "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</replaceable>"
+msgid ""
+"<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
+"replaceable>"
 msgstr ""
 
 #: chage.1.xml:79(para)
-msgid "Set the number of days since January 1st, 1970 when the password was last changed. The date may also be expressed in the format YYYY-MM-DD (or the format more commonly used in your area)."
+msgid ""
+"Set the number of days since January 1st, 1970 when the password was last "
+"changed. The date may also be expressed in the format YYYY-MM-DD (or the "
+"format more commonly used in your area)."
 msgstr ""
 
 #: chage.1.xml:87(term)
-msgid "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</replaceable>"
+msgid ""
+"<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
+"replaceable>"
 msgstr ""
 
 #: chage.1.xml:91(para)
-msgid "Set the date or number of days since January 1, 1970 on which the user's account will no longer be accessible. The date may also be expressed in the format YYYY-MM-DD (or the format more commonly used in your area). A user whose account is locked must contact the system administrator before being able to use the system again."
+msgid ""
+"Set the date or number of days since January 1, 1970 on which the user's "
+"account will no longer be accessible. The date may also be expressed in the "
+"format YYYY-MM-DD (or the format more commonly used in your area). A user "
+"whose account is locked must contact the system administrator before being "
+"able to use the system again."
 msgstr ""
 
 #: chage.1.xml:99(para)
-msgid "Passing the number <emphasis remap=\"I\">-1</emphasis> as the <replaceable>EXPIRE_DATE</replaceable> will remove an account expiration date."
+msgid ""
+"Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
+"<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
+"date."
 msgstr ""
 
 #: chage.1.xml:113(term)
-msgid "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</replaceable>"
+msgid ""
+"<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
+"replaceable>"
 msgstr ""
 
 #: chage.1.xml:117(para)
-msgid "Set the number of days of inactivity after a password has expired before the account is locked. The <replaceable>INACTIVE</replaceable> option is the number of days of inactivity. A user whose account is locked must contact the system administrator before being able to use the system again."
+msgid ""
+"Set the number of days of inactivity after a password has expired before the "
+"account is locked. The <replaceable>INACTIVE</replaceable> option is the "
+"number of days of inactivity. A user whose account is locked must contact "
+"the system administrator before being able to use the system again."
 msgstr ""
 
 #: chage.1.xml:124(para)
-msgid "Passing the number <emphasis remap=\"I\">-1</emphasis> as the <replaceable>INACTIVE</replaceable> will remove an account's inactivity."
+msgid ""
+"Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
+"<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
 msgstr ""
 
 #: chage.1.xml:136(para)
@@ -4547,39 +6934,68 @@ msgid "Show account aging information."
 msgstr ""
 
 #: chage.1.xml:142(term)
-msgid "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</replaceable>"
+msgid ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
 msgstr ""
 
 #: chage.1.xml:154(term)
-msgid "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</replaceable>"
+msgid ""
+"<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
+"replaceable>"
 msgstr ""
 
 #: chage.1.xml:158(para)
-msgid "Set the maximum number of days during which a password is valid. When <replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> is less than the current day, the user will be required to change his/her password before being able to use his/her account. This occurrence can be planned for in advance by use of the <option>-W</option> option, which provides the user with advance warning."
+msgid ""
+"Set the maximum number of days during which a password is valid. When "
+"<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
+"is less than the current day, the user will be required to change his/her "
+"password before being able to use his/her account. This occurrence can be "
+"planned for in advance by use of the <option>-W</option> option, which "
+"provides the user with advance warning."
 msgstr ""
 
 #: chage.1.xml:167(para)
-msgid "Passing the number <emphasis remap=\"I\">-1</emphasis> as <replaceable>MAX_DAYS</replaceable> will remove checking a password's validity."
+msgid ""
+"Passing the number <emphasis remap=\"I\">-1</emphasis> as "
+"<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
+"validity."
 msgstr ""
 
 #: chage.1.xml:175(term)
-msgid "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</replaceable>"
+msgid ""
+"<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
+"replaceable>"
 msgstr ""
 
 #: chage.1.xml:179(para)
-msgid "Set the number of days of warning before a password change is required. The <replaceable>WARN_DAYS</replaceable> option is the number of days prior to the password expiring that a user will be warned his/her password is about to expire."
+msgid ""
+"Set the number of days of warning before a password change is required. The "
+"<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
+"the password expiring that a user will be warned his/her password is about "
+"to expire."
 msgstr ""
 
 #: chage.1.xml:188(para)
-msgid "If none of the options are selected, <command>chage</command> operates in an interactive fashion, prompting the user with the current values for all of the fields. Enter the new value to change the field, or leave the line blank to use the current value. The current value is displayed between a pair of <emphasis>[ ]</emphasis> marks."
+msgid ""
+"If none of the options are selected, <command>chage</command> operates in an "
+"interactive fashion, prompting the user with the current values for all of "
+"the fields. Enter the new value to change the field, or leave the line blank "
+"to use the current value. The current value is displayed between a pair of "
+"<emphasis>[ ]</emphasis> marks."
 msgstr ""
 
 #: chage.1.xml:198(para)
-msgid "The <command>chage</command> program requires a shadow password file to be available."
+msgid ""
+"The <command>chage</command> program requires a shadow password file to be "
+"available."
 msgstr ""
 
 #: chage.1.xml:202(para)
-msgid "The <command>chage</command> command is restricted to the root user, except for the <option>-l</option> option, which may be used by an unprivileged user to determine when his/her password or account is due to expire."
+msgid ""
+"The <command>chage</command> command is restricted to the root user, except "
+"for the <option>-l</option> option, which may be used by an unprivileged "
+"user to determine when his/her password or account is due to expire."
 msgstr ""
 
 #: chage.1.xml:267(replaceable)
@@ -4591,7 +7007,9 @@ msgid "can't find the shadow password fi
 msgstr ""
 
 #: chage.1.xml:245(para)
-msgid "The <command>chage</command> command exits with the following values: <placeholder-1/>"
+msgid ""
+"The <command>chage</command> command exits with the following values: "
+"<placeholder-1/>"
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
@@ -4599,3 +7017,253 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 
+#: vipw.8.xml:155(para)
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:297(para)
+msgid ""
+"Note: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgstr ""
+
+#: useradd.8.xml:328(para)
+msgid "By default, no home directories are created."
+msgstr ""
+
+#: useradd.8.xml:371(para)
+msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr ""
+
+#: useradd.8.xml:407(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgstr ""
+
+#: pwconv.8.xml:181(para)
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: 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: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 ""
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: newusers.8.xml:270(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
+msgid ""
+"This will most likely be overriden by PAM, since the default pam_unix module "
+"has it's own built in of 3 retries. However, this is a safe fallback in case "
+"you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgstr ""
+
+#: login.defs.5.xml:240(para)
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgstr ""
+
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
+msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+msgstr ""
+
+#: login.defs.5.xml:423(para)
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+msgstr ""
+
+#: login.defs.5.xml:436(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+msgstr ""
+
+#: login.defs.5.xml:445(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: groupadd.8.xml:174(para)
+msgid ""
+"The numeric identifiers of new system groups are choosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
+msgstr ""
+
+#: faillog.8.xml:86(term)
+msgid ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+msgstr ""
+
+#: faillog.8.xml:179(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: chsh.1.xml:63(para)
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account, the superuser may change "
+"the login shell for any account."
+msgstr ""
+
+#: chpasswd.8.xml:71(para)
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
+msgstr ""
+
+#: chpasswd.8.xml:82(para)
+msgid ""
+"<command>chpasswd</command> first update the password in memory, and then "
+"commit all the changes to disk if no errors occured for any users."
+msgstr ""
+
+#: chpasswd.8.xml:89(para)
+msgid "The supplied passwords must be in clear-text."
+msgstr ""
+
+#: chpasswd.8.xml:92(para)
+msgid ""
+"PAM is used to update the password in the system database according to the "
+"PAM chpasswd configuration."
+msgstr ""
+
+#: chpasswd.8.xml:96(para)
+msgid ""
+"When <command>chpasswd</command> fails to update a password, it continues "
+"updating the passwords of the next users, and will return an error code on "
+"exit."
+msgstr ""
+
+#: chpasswd.8.xml:239(para)
+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 ""
diff -pruN 1:4.1.4.2+svn3283-2/man/po/sv.po 1:4.1.4.2+svn3283-2ubuntu1/man/po/sv.po
--- 1:4.1.4.2+svn3283-2/man/po/sv.po	2010-08-29 16:54:43.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/man/po/sv.po	2010-11-24 14:47:24.000000000 +0000
@@ -5,10 +5,10 @@ msgstr ""
 "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"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 
 # Swedish translation of shadow manpage.
 # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
@@ -176,7 +176,6 @@ msgstr "Redigera shadow- eller gshadow-d
 
 #: vipw.8.xml:122(term)
 #, fuzzy
-#| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
@@ -219,9 +218,6 @@ msgstr "CHFN_AUTH (boolesk)"
 #: useradd.8.xml:32(para) pwconv.8.xml:32(para) pwck.8.xml:32(para)
 #: login.defs.5.xml:32(para) chage.1.xml:32(para)
 #, fuzzy
-#| msgid ""
-#| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry> for details on how this string is interpreted."
 msgid ""
 "If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing "
@@ -245,7 +241,6 @@ msgstr ""
 
 #: vipw.8.xml:152(option)
 #, fuzzy
-#| msgid "HYSTORY"
 msgid "EDITOR"
 msgstr "HISTORIK"
 
@@ -371,18 +366,6 @@ msgstr "SE OCKSÃ…"
 
 #: vipw.8.xml:192(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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -440,9 +423,6 @@ msgstr "<option>-a</option>, <option>--a
 
 #: usermod.8.xml:80(para)
 #, fuzzy
-#| msgid ""
-#| "Add the user to the supplemental group(s). Use only with <option>-G</"
-#| "option> option."
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
@@ -478,7 +458,6 @@ msgstr ""
 
 #: usermod.8.xml:106(para)
 #, fuzzy
-#| msgid "user home directory"
 msgid "The user's new login directory."
 msgstr "användarens hemkatalog"
 
@@ -513,9 +492,6 @@ msgstr ""
 
 #: usermod.8.xml:135(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
@@ -618,7 +594,6 @@ msgstr ""
 
 #: usermod.8.xml:222(term)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
@@ -628,7 +603,6 @@ msgstr ""
 
 #: usermod.8.xml:230(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -758,9 +732,6 @@ msgstr ""
 
 #: usermod.8.xml:339(term) useradd.8.xml:482(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -1375,7 +1346,6 @@ msgstr ""
 
 #: useradd.8.xml:158(term)
 #, fuzzy
-#| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
@@ -1436,9 +1406,6 @@ msgstr ""
 
 #: useradd.8.xml:256(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
-#| "replaceable>"
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1454,7 +1421,6 @@ msgstr ""
 
 #: useradd.8.xml:266(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1481,25 +1447,15 @@ msgstr ""
 
 #: useradd.8.xml:287(para)
 #, fuzzy
-#| msgid ""
-#| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
-#| "PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
-#| "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
-#| "replaceable> can be used when creating system account to turn off "
-#| "password ageing, even though system account has no password at all. "
-#| "Multiple <option>-K</option> options can be specified, e.g.: <option>-K </"
-#| "option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
-#| "replaceable><option> -K </option><replaceable>UID_MAX</"
-#| "replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
 "<option>PASS_MAX_DAYS</option> and others). <placeholder-1/> Example: "
-"<option>-K </option><replaceable>PASS_MAX_DAYS</"
-"replaceable>=<replaceable>-1</replaceable> can be used when creating system "
-"account to turn off password ageing, even though system account has no "
-"password at all. Multiple <option>-K</option> options can be specified, e."
-"g.: <option>-K </option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+"<option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-"
+"1</replaceable> can be used when creating system account to turn off "
+"password ageing, even though system account has no password at all. Multiple "
+"<option>-K</option> options can be specified, e.g.: <option>-K </"
+"option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
 "replaceable><option>-K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
@@ -1515,7 +1471,6 @@ msgstr ""
 
 #: useradd.8.xml:311(term)
 #, fuzzy
-#| msgid "<option>-l</option>, <option>--list</option>"
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
@@ -1548,7 +1503,6 @@ msgstr ""
 
 #: useradd.8.xml:343(option)
 #, fuzzy
-#| msgid "-"
 msgid "-M"
 msgstr "-"
 
@@ -1561,7 +1515,6 @@ msgstr ""
 
 #: useradd.8.xml:355(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1586,17 +1539,12 @@ msgstr ""
 
 #: useradd.8.xml:379(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 #: useradd.8.xml:391(para) groupadd.8.xml:149(para)
 #, fuzzy
-#| msgid ""
-#| "The encrypted password, as returned by "
-#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1608,7 +1556,6 @@ msgstr ""
 
 #: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -1654,7 +1601,6 @@ msgstr ""
 
 #: useradd.8.xml:465(term)
 #, fuzzy
-#| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
@@ -1751,9 +1697,6 @@ msgstr "NOTERINGAR"
 
 #: useradd.8.xml:597(para)
 #, fuzzy
-#| msgid ""
-#| "The system administrator is responsible for placing the default user "
-#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -1781,10 +1724,6 @@ msgstr ""
 
 #: useradd.8.xml:617(para)
 #, fuzzy
-#| msgid ""
-#| "Usernames must begin with a lower case letter or an underscore, and only "
-#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
-#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -2508,7 +2447,6 @@ 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."
 
@@ -2656,9 +2594,6 @@ 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 "
@@ -2833,19 +2768,16 @@ msgstr ""
 
 #: su.1.xml:393(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "126"
 msgstr "12"
 
 #: su.1.xml:395(para)
 #, fuzzy
-#| msgid "execute command as different group ID"
 msgid "The requested command was not found"
 msgstr "kör kommando med annat grupp-id"
 
 #: su.1.xml:399(replaceable)
 #, fuzzy
-#| msgid "12"
 msgid "127"
 msgstr "12"
 
@@ -2861,13 +2793,6 @@ msgstr ""
 
 #: su.1.xml:410(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</"
@@ -2927,18 +2852,6 @@ 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><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -2972,16 +2885,11 @@ msgstr "shadow"
 
 #: shadow.5.xml:40(refpurpose)
 #, fuzzy
-#| msgid "the password file"
 msgid "shadowed password file"
 msgstr "lösenordsfilen"
 
 #: shadow.5.xml:45(para)
 #, fuzzy
-#| msgid ""
-#| "<filename>/etc/gshadow</filename> contains the shadowed information for "
-#| "group accounts. It contains lines with the following colon-separated "
-#| "fields:"
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
@@ -3053,7 +2961,6 @@ msgstr ""
 
 #: shadow.5.xml:102(emphasis)
 #, fuzzy
-#| msgid "days before password may be changed"
 msgid "date of last password change"
 msgstr "dagar innan lösenordet får ändras"
 
@@ -3075,7 +2982,6 @@ msgstr ""
 
 #: shadow.5.xml:121(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "minimum password age"
 msgstr "Lösenordsändringar"
 
@@ -3091,7 +2997,6 @@ msgstr ""
 
 #: shadow.5.xml:135(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "maximum password age"
 msgstr "Lösenordsändringar"
 
@@ -3121,15 +3026,11 @@ msgstr ""
 
 #: shadow.5.xml:159(emphasis)
 #, fuzzy
-#| msgid "Password Changes"
 msgid "password warning period"
 msgstr "Lösenordsändringar"
 
 #: shadow.5.xml:162(para)
 #, fuzzy
-#| msgid ""
-#| "The number of days after a password has expired before the account will "
-#| "be disabled."
 msgid ""
 "The number of days before a password is going to expire (see the maximum "
 "password age above) during which the user should be warned."
@@ -3167,7 +3068,6 @@ msgstr ""
 
 #: shadow.5.xml:197(emphasis)
 #, fuzzy
-#| msgid "User account information."
 msgid "account expiration date"
 msgstr "Användarkontoinformation."
 
@@ -3196,19 +3096,16 @@ msgstr ""
 
 #: shadow.5.xml:221(emphasis)
 #, fuzzy
-#| msgid "a reserved field"
 msgid "reserved field"
 msgstr "ett reserverat fält"
 
 #: shadow.5.xml:223(para)
 #, fuzzy
-#| msgid "sp_flag - reserved for future use"
 msgid "This field is reserved for future use."
 msgstr "sp_flag - reserverat för framtida användning"
 
 #: shadow.5.xml:245(filename)
 #, fuzzy
-#| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
@@ -3224,21 +3121,6 @@ msgstr ""
 
 #: shadow.5.xml:259(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3605,15 +3487,6 @@ msgstr ""
 
 #: pwconv.8.xml:200(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>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3684,7 +3557,6 @@ msgstr "korrekt antal fält"
 
 #: pwck.8.xml:105(para)
 #, fuzzy
-#| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "ett unikt användarnamn"
 
@@ -3726,7 +3598,6 @@ msgstr ""
 
 #: pwck.8.xml:140(para)
 #, fuzzy
-#| msgid "the correct number of fields"
 msgid "shadow entries have the correct number of fields"
 msgstr "korrekt antal fält"
 
@@ -3736,7 +3607,6 @@ msgstr ""
 
 #: pwck.8.xml:146(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"
 
@@ -3782,7 +3652,6 @@ msgstr ""
 
 #: pwck.8.xml:205(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
@@ -3820,7 +3689,6 @@ msgstr "kan inte uppdatera lösenordsfil
 
 #: pwck.8.xml:314(para)
 #, fuzzy
-#| msgid "can't open password files"
 msgid "can't sort password files"
 msgstr "kan inte öppna lösenordsfiler"
 
@@ -3829,20 +3697,11 @@ 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/>"
+"Kommandot <command>pwck</command> avslutas med följande värden: <placeholder-"
+"1/>"
 
 #: pwck.8.xml:323(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</"
@@ -4053,7 +3912,6 @@ msgstr ""
 
 #: passwd.5.xml:131(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
@@ -4063,24 +3921,6 @@ msgstr ""
 
 #: passwd.5.xml:145(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4213,12 +4053,6 @@ msgstr "Tips för användarlösenord"
 
 #: passwd.1.xml:126(para)
 #, fuzzy
-#| msgid ""
-#| "The security of a password depends upon the strength of the encryption "
-#| "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
-#| "System encryption method is based on the NBS DES algorithm and is very "
-#| "secure. The size of the key space depends upon the randomness of the "
-#| "password which is selected."
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The legacy <emphasis>UNIX</"
@@ -4356,9 +4190,6 @@ msgstr ""
 
 #: passwd.1.xml:247(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -4395,14 +4226,6 @@ msgstr "<option>-S</option>, <option>--s
 
 #: passwd.1.xml:283(para)
 #, fuzzy
-#| msgid ""
-#| "Display account status information. The status information consists of 7 "
-#| "fields. The first field is the user's login name. The second field "
-#| "indicates if the user account is locked (L), has no password (NP), or has "
-#| "a usable password (P). The third field gives the date of the last "
-#| "password change. The next four fields are the minimum age, maximum age, "
-#| "warning period, and inactivity period for the password. These ages are "
-#| "expressed in days."
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
@@ -4472,12 +4295,6 @@ msgstr ""
 
 #: passwd.1.xml:339(para)
 #, fuzzy
-#| msgid ""
-#| "Not all options may be supported. Password complexity checking may vary "
-#| "from site to site. The user is urged to select a password as complex as "
-#| "he or she feels comfortable with. 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."
 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."
@@ -4515,10 +4332,6 @@ msgstr ""
 #: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
 #: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 #, fuzzy
-#| msgid ""
-#| "Example: <option>-K </option><replaceable>GID_MIN</"
-#| "replaceable>=<replaceable>100</replaceable><option> -K </"
-#| "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "It can take one of these values: <replaceable>DES</replaceable> (default), "
 "<replaceable>MD5</replaceable><phrase condition=\"sha_crypt\">, "
@@ -4677,7 +4490,6 @@ msgstr ""
 
 #: passwd.1.xml:395(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
@@ -4715,13 +4527,6 @@ msgstr ""
 
 #: passwd.1.xml:456(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -4779,13 +4584,11 @@ msgstr ""
 
 #: nologin.8.xml:76(title)
 #, fuzzy
-#| msgid "HYSTORY"
 msgid "HISTORY"
 msgstr "HISTORIK"
 
 #: nologin.8.xml:77(para)
 #, fuzzy
-#| msgid "The <command>nologin</command> command appeared in BSD 4.4."
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "Kommandot <command>nologin</command> dök upp i BSD 4.4."
 
@@ -4818,7 +4621,6 @@ msgstr ""
 
 #: newusers.8.xml:84(emphasis)
 #, fuzzy
-#| msgid "group_name"
 msgid "pw_name"
 msgstr "gruppnamn"
 
@@ -4847,7 +4649,6 @@ msgstr ""
 
 #: newusers.8.xml:112(emphasis)
 #, fuzzy
-#| msgid "pw_gid"
 msgid "pw_uid"
 msgstr "pw_gid"
 
@@ -4983,8 +4784,6 @@ msgstr ""
 
 #: newusers.8.xml:240(para)
 #, fuzzy
-#| msgid ""
-#| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>usermod</command> är:"
 
@@ -5057,7 +4856,6 @@ msgstr ""
 
 #: newusers.8.xml:390(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
@@ -5647,7 +5445,6 @@ msgstr ""
 
 #: login.defs.5.xml:357(term)
 #, fuzzy
-#| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
@@ -5681,7 +5478,6 @@ msgstr ""
 
 #: login.defs.5.xml:403(para)
 #, fuzzy
-#| msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
@@ -5731,13 +5527,6 @@ msgstr ""
 
 #: login.defs.5.xml:489(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
@@ -6107,7 +5896,6 @@ msgstr ""
 
 #: limits.5.xml:70(emphasis)
 #, fuzzy
-#| msgid "user LIMITS_STRING"
 msgid "@group LIMITS_STRING"
 msgstr "user LIMITS_STRING"
 
@@ -6329,9 +6117,6 @@ msgstr ""
 
 #: lastlog.8.xml:102(term) faillog.8.xml:168(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
-#| "replaceable>=<replaceable>VALUE</replaceable>"
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -6405,10 +6190,6 @@ msgstr "skuggad gruppfil"
 
 #: gshadow.5.xml:44(para)
 #, fuzzy
-#| msgid ""
-#| "<filename>/etc/gshadow</filename> contains the shadowed information for "
-#| "group accounts. It contains lines with the following colon-separated "
-#| "fields:"
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
@@ -6442,10 +6223,6 @@ msgstr ""
 
 #: gshadow.5.xml:82(para)
 #, fuzzy
-#| msgid ""
-#| "The new value of the user's password file comment field. It is normally "
-#| "modified using the <citerefentry><refentrytitle>chfn</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry> utility."
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -6473,7 +6250,6 @@ msgstr ""
 
 #: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
 #, fuzzy
-#| msgid "comma-separated list of group members"
 msgid "It must be a comma-separated list of user names."
 msgstr "kommaseparerad lista med gruppmedlemmar"
 
@@ -6501,15 +6277,6 @@ msgstr ""
 
 #: gshadow.5.xml:160(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>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -6545,15 +6312,11 @@ msgstr ""
 
 #: grpck.8.xml:87(para)
 #, fuzzy
-#| msgid "a unique group name"
 msgid "a unique and valid group name"
 msgstr "ett unikt gruppnamn"
 
 #: 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>"
@@ -6563,7 +6326,6 @@ msgstr ""
 
 #: 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>"
@@ -6598,7 +6360,6 @@ msgstr ""
 
 #: 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:"
 
@@ -6611,9 +6372,6 @@ msgstr ""
 
 #: grpck.8.xml:151(para)
 #, fuzzy
-#| msgid ""
-#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
-#| "shadow</filename> by UID."
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
@@ -6887,8 +6645,6 @@ msgstr "Flaggorna som gäller för komma
 
 #: groupmems.8.xml:82(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -6897,7 +6653,6 @@ msgstr ""
 
 #: groupmems.8.xml:84(para)
 #, fuzzy
-#| msgid "Add a new user to the group membership list."
 msgid "Add an user to the group membership list."
 msgstr "Lägg till en ny användare till gruppens medlemslista."
 
@@ -6911,9 +6666,6 @@ msgstr ""
 
 #: groupmems.8.xml:93(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -6932,8 +6684,6 @@ msgstr ""
 
 #: groupmems.8.xml:109(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -6955,7 +6705,6 @@ msgstr "Lista gruppens medlemslista."
 
 #: groupmems.8.xml:129(term)
 #, fuzzy
-#| msgid "<option>-e</option>, <option>--expire</option>"
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
@@ -7136,10 +6885,6 @@ msgstr ""
 
 #: groupadd.8.xml:122(para)
 #, fuzzy
-#| msgid ""
-#| "Example: <option>-K </option><replaceable>GID_MIN</"
-#| "replaceable>=<replaceable>100</replaceable><option> -K </"
-#| "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -7166,7 +6911,6 @@ msgstr "Denna flagga tillåter att en gr
 
 #: groupadd.8.xml:170(para)
 #, fuzzy
-#| msgid "create a new group"
 msgid "Create a system group."
 msgstr "skapa en ny grupp"
 
@@ -7180,10 +6924,6 @@ msgstr ""
 
 #: groupadd.8.xml:224(para)
 #, fuzzy
-#| msgid ""
-#| "Usernames must begin with a lower case letter or an underscore, and only "
-#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
-#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -7264,7 +7004,6 @@ msgstr ""
 
 #: gpasswd.1.xml:49(phrase)
 #, fuzzy
-#| msgid "-r <placeholder-1/>"
 msgid "administer <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
@@ -7343,8 +7082,6 @@ msgstr "Flaggorna som gäller för komma
 
 #: gpasswd.1.xml:125(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
@@ -7358,9 +7095,6 @@ msgstr ""
 
 #: gpasswd.1.xml:138(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
@@ -7374,7 +7108,6 @@ msgstr ""
 
 #: gpasswd.1.xml:159(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
@@ -7387,7 +7120,6 @@ msgstr ""
 
 #: gpasswd.1.xml:174(term)
 #, fuzzy
-#| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
@@ -7400,9 +7132,6 @@ msgstr ""
 
 #: gpasswd.1.xml:189(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -7417,9 +7146,6 @@ msgstr "kommaseparerad lista med gruppad
 
 #: gpasswd.1.xml:201(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -7499,7 +7225,6 @@ msgstr ""
 
 #: faillog.8.xml:77(para)
 #, fuzzy
-#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
@@ -7520,9 +7245,6 @@ msgstr ""
 
 #: faillog.8.xml:103(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
-#| "replaceable>"
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -7532,8 +7254,6 @@ msgstr ""
 
 #: faillog.8.xml:108(para)
 #, fuzzy
-#| msgid ""
-#| "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgid ""
 "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
@@ -7554,10 +7274,6 @@ msgstr ""
 
 #: faillog.8.xml:124(para)
 #, fuzzy
-#| msgid ""
-#| "Set the maximum number of days a password remains valid. After "
-#| "<replaceable>MAX_DAYS</replaceable>, the password is required to be "
-#| "changed."
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
@@ -7599,9 +7315,6 @@ msgstr ""
 
 #: faillog.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
-#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
 "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
 "option> options are used, <command>faillog</command> displays the faillog "
@@ -7842,9 +7555,6 @@ msgstr "Flaggorna som gäller för komma
 
 #: chpasswd.8.xml:115(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
-#| "replaceable>"
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -7890,9 +7600,6 @@ msgstr ""
 
 #: chpasswd.8.xml:167(term)
 #, fuzzy
-#| msgid ""
-#| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
-#| "replaceable>"
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -7917,7 +7624,6 @@ msgstr ""
 
 #: chpasswd.8.xml:244(filename)
 #, fuzzy
-#| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
@@ -8259,6 +7965,290 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Daniel Nylander <po at danielnylander.se>, 2006."
 
+#: vipw.8.xml:155(para)
+msgid ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:297(para)
+msgid ""
+"Note: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> doesn't work yet."
+msgstr ""
+"Notera: <option>-K </option><replaceable>UID_MIN</"
+"replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
+"replaceable>=<replaceable>499</replaceable> fungerar ännu inte."
+
+#: useradd.8.xml:328(para)
+msgid "By default, no home directories are created."
+msgstr ""
+
+#: useradd.8.xml:371(para)
+#, fuzzy
+msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:407(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+msgid ""
+"If set, it will be used to define the PATH environment variable when the "
+"superuser login. The value can be preceded by <replaceable>PATH=</"
+"replaceable>, or a colon separated list of paths (for example <replaceable>/"
+"sbin:/bin:/usr/sbin:/usr/bin</replaceable>). The default value is "
+"<replaceable>PATH=/bin:/usr/bin</replaceable>."
+msgstr ""
+
+#: pwconv.8.xml:181(para)
+msgid ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>."
+
+#: 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: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 ""
+
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: newusers.8.xml:270(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
+msgid ""
+"This will most likely be overriden by PAM, since the default pam_unix module "
+"has it's own built in of 3 retries. However, this is a safe fallback in case "
+"you are using an authentication module that does not enforce PAM_MAXTRIES."
+msgstr ""
+
+#: login.defs.5.xml:240(para)
+msgid ""
+"ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
+"\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
+msgstr ""
+
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
+msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
+
+#: login.defs.5.xml:423(para)
+#, fuzzy
+msgid ""
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
+msgstr ""
+"GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
+"UMASK"
+
+#: login.defs.5.xml:436(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
+msgstr ""
+
+#: login.defs.5.xml:445(para)
+msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: groupadd.8.xml:174(para)
+msgid ""
+"The numeric identifiers of new system groups are choosen in the "
+"<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>GID_MIN</option>-"
+"<option>GID_MAX</option>."
+msgstr ""
+
+#: faillog.8.xml:86(term)
+msgid ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+msgstr ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
+"replaceable>"
+
+#: faillog.8.xml:179(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: chsh.1.xml:63(para)
+msgid ""
+"The <command>chsh</command> command changes the user login shell. This "
+"determines the name of the user's initial login command. A normal user may "
+"only change the login shell for her own account, the superuser may change "
+"the login shell for any account."
+msgstr ""
+
+#: chpasswd.8.xml:71(para)
+#, fuzzy
+msgid ""
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
+msgstr ""
+"Som standard måste det insända lösenordet vara i klartext. "
+"Standardkrypteringsalgoritmen är DES."
+
+#: chpasswd.8.xml:82(para)
+msgid ""
+"<command>chpasswd</command> first update the password in memory, and then "
+"commit all the changes to disk if no errors occured for any users."
+msgstr ""
+
+#: chpasswd.8.xml:89(para)
+#, fuzzy
+msgid "The supplied passwords must be in clear-text."
+msgstr "Insända lösenord är i ett krypterat format."
+
+#: chpasswd.8.xml:92(para)
+msgid ""
+"PAM is used to update the password in the system database according to the "
+"PAM chpasswd configuration."
+msgstr ""
+
+#: chpasswd.8.xml:96(para)
+msgid ""
+"When <command>chpasswd</command> fails to update a password, it continues "
+"updating the passwords of the next users, and will return an error code on "
+"exit."
+msgstr ""
+
+#: chpasswd.8.xml:239(para)
+#, fuzzy
+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 ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
 #, fuzzy
 #~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -8291,55 +8281,6 @@ msgstr "Daniel Nylander <po at danielnyland
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#~ 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>."
-#~ 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>."
-
-#~ msgid ""
-#~ "Note: <option>-K </option><replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> doesn't work yet."
-#~ msgstr ""
-#~ "Notera: <option>-K </option><replaceable>UID_MIN</"
-#~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
-#~ "replaceable>=<replaceable>499</replaceable> fungerar ännu inte."
-
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
-#~ "manvolnum></citerefentry>."
-
-#~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-#~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
-
-#, fuzzy
-#~| msgid "Supplied passwords are in encrypted form."
-#~ msgid "The supplied passwords must be in clear-text."
-#~ msgstr "Insända lösenord är i ett krypterat format."
-
 #, fuzzy
 #~ msgid "and <placeholder-1/> files"
 #~ msgstr "-a <placeholder-1/>"
diff -pruN 1:4.1.4.2+svn3283-2/po/bs.po 1:4.1.4.2+svn3283-2ubuntu1/po/bs.po
--- 1:4.1.4.2+svn3283-2/po/bs.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/bs.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,12 +10,12 @@ msgstr ""
 "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"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #, c-format
 msgid ""
@@ -49,7 +49,6 @@ msgid "%s: out of memory\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -102,7 +101,6 @@ msgid "%s: Cannot change owners of %s: %
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -121,7 +119,6 @@ msgid "%s: mkdir: %s: %s\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -201,8 +198,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -219,8 +216,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -420,12 +417,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: Pokušajte ponovo kasnije\n"
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -849,7 +844,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: grupa %s postoji\n"
 
@@ -1042,7 +1036,6 @@ msgid "Usage: grpunconv\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -1360,7 +1353,6 @@ msgid "%s: password changed.\n"
 msgstr "Å ifra:"
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Upozorenje o isteku Å¡ifre"
 
@@ -1396,7 +1388,6 @@ msgid "invalid user ID '%lu'\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Adding user %s to group %s\n"
 msgid "user '%s': no group %lu\n"
 msgstr "Dodajem korisnika %s grupi %s\n"
 
@@ -1421,7 +1412,6 @@ msgid "failed to create tcb directory fo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -1482,7 +1472,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -1814,7 +1803,6 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: unknown member %s\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: nepoznat član %s\n"
 
@@ -2025,6 +2013,79 @@ msgstr ""
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: grupa %s postoji\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr ""
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Password set to expire."
 #~ msgstr "Vaša šifra je istekla."
diff -pruN 1:4.1.4.2+svn3283-2/po/ca.po 1:4.1.4.2+svn3283-2ubuntu1/po/ca.po
--- 1:4.1.4.2+svn3283-2/po/ca.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/ca.po	2010-11-24 14:47:24.000000000 +0000
@@ -9,10 +9,10 @@ msgstr ""
 "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"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #, c-format
@@ -49,17 +49,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: sense memòria\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: no es pot actualitzar el fitxer %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: el directori personal «%s» no és vàlid\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
@@ -68,57 +65,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: no es pot crear el directori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: avís: no es pot eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: avís: no es pot eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: renomena: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: avís: no es pot eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: no es pot crear el directori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: avís: no es pot eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: no es pot actualitzar el fitxer %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n"
 
@@ -129,12 +115,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: renomena: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: no es pot obrir el fitxer %s\n"
 
@@ -177,17 +161,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "No es pot canviar la tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: els camps són massa llargs\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -221,8 +202,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -239,8 +220,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -297,7 +278,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "S'ha canviat la contrasenya."
 
@@ -341,30 +321,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) ha fallat\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "No\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -479,12 +439,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: l'autenticació PAM ha fallat\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: no es poden blocar els fitxers, intenteu-ho més tard\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: no es pot obrir el fitxer %s\n"
 
@@ -493,7 +451,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: fallada al fer fork: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
 
@@ -535,7 +492,6 @@ msgid "Full Name"
 msgstr "Nom complet"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -579,7 +535,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: el telèfon de casa no és vàlid: «%s»\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: «%s» conté caràcters il·legals\n"
 
@@ -653,12 +608,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: línia %d: manca la nova contrasenya\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: el grup %s no existeix\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
@@ -667,7 +620,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: s'ha detectat un error, els canvis s'han ignorat\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -717,7 +669,6 @@ msgid "Login Shell"
 msgstr "Intèrpret d'accés"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "No podeu canviar l'intèrpret per a %s.\n"
 
@@ -730,17 +681,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: L'entrada no és vàlida: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s no és un intèrpret vàlid.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: l'usuari %s no existeix\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: avís: %s no és propietat de %s\n"
 
@@ -781,7 +729,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Usuari      Fallades Màxim   Últim                    A\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [falten %lds]"
 
@@ -806,7 +753,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "L'usuari és desconegut: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: no es pot obrir el fitxer %s\n"
 
@@ -815,7 +761,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -844,12 +789,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "No es pot canviar la contrasenya per a %s.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "No es pot canviar la contrasenya per a %s.\n"
 
@@ -858,7 +801,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: contrasenyes ombra de grups requerides per a «-A»\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: el grup %s no existeix\n"
 
@@ -900,7 +842,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: No és una tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -933,7 +874,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s no és un nom de grup valid\n"
 
@@ -946,12 +886,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: «-K» requereix CLAU=VALOR\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: el grup %s existeix\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "El membre ja existeix\n"
 
@@ -959,7 +897,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Forma d'ús: groupdel grup\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
@@ -968,12 +905,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: no s'ha pogut canviar l'usuari «%s» al client NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: el grup %s no existeix\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: el grup «%s» és un grup NIS.\n"
 
@@ -982,7 +917,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s és el mestre NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: l'usuari %s és un usuari NIS\n"
 
@@ -991,7 +925,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: sense memòria a update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1087,7 +1020,6 @@ msgid "invalid group name '%s'\n"
 msgstr "el nom de grup «%s» no és vàlid\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "el nom de grup «%s» no és vàlid\n"
 
@@ -1104,7 +1036,6 @@ msgid "no matching group file entry in %
 msgstr "no hi ha cap entrada coincident al fitxer de grup en %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "voleu afegir el grup «%s» a %s?"
 
@@ -1140,17 +1071,14 @@ msgid "%s: no changes\n"
 msgstr "%s: no hi ha canvis\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Forma d'ús: groupdel grup\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Forma d'ús: groupdel grup\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: no es pot actualitzar el fitxer %s\n"
 
@@ -1241,9 +1169,6 @@ msgstr ""
 "[S'ha evitat la desconnexió -- l'accés de root està permès]."
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1271,7 +1196,6 @@ msgid "login: "
 msgstr "usuari: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "S'ha excedit el nombre màxim d'intents (%d)\n"
 
@@ -1320,7 +1244,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Forma d'ús: id\n"
 
@@ -1357,7 +1280,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: el grup %s no existeix\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
 
@@ -1390,12 +1312,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: línia %d: no es pot actualitzar la contrasenya\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: línia %d: no s'ha pogut crear el directori\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: línia %d: no s'ha pogut canviar el propietari\n"
 
@@ -1404,33 +1324,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1555,17 +1448,14 @@ msgid "The password for %s is unchanged.
 msgstr "No s'ha canviat la contrasenya per a %s.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "S'ha canviat la contrasenya."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Avís de caducitat de la contrasenya"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Forma d'ús: %s [-q] [-r] [-s] [contrasenya [ombra]]\n"
 
@@ -1574,7 +1464,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1593,42 +1482,34 @@ msgid "invalid user name '%s'\n"
 msgstr "el nom d'usuari «%s» no és vàlid\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "el nom d'usuari «%s» no és vàlid\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "usuari %s: no existeix el grup %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuari %s: el directori %s no existeix\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuari %s: el programa %s no existeix\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: no es pot crear el directori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: no es pot crear el directori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: no es pot crear el directori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: no es pot blocar el fitxer %s\n"
 
@@ -1656,17 +1537,14 @@ msgid "user %s: last password change in 
 msgstr "usuari %s: l'últim canvi de contrasenya s'ha produït en el futur\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: no es pot obrir el fitxer %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Forma d'ús: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: no es pot reescriure el fitxer\n"
 
@@ -1675,7 +1553,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Forma d'ús: id\n"
 
@@ -1695,7 +1572,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: no es pot blocar el fitxer %s\n"
 
@@ -1772,12 +1648,10 @@ msgstr ""
 "(Ignorat)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: l'autenticació PAM ha fallat\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "No esteu autoritzats a usar «su %s»\n"
 
@@ -1822,12 +1696,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: no es pot obrir un fitxer nou de preferències predeterminades\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: línia %d: no s'ha pogut canviar el propietari\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: renomena: %s"
 
@@ -1840,7 +1712,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: s'han especificat massa grups (màx de %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1992,7 +1863,6 @@ msgid "Setting mailbox file permissions"
 msgstr "S'estan establint els permisos de la bústia de correu"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: l'usuari %s existeix\n"
 
@@ -2008,12 +1878,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: no es pot crear %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: el UID %u no és únic\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: no es pot crear el directori %s\n"
 
@@ -2050,15 +1918,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: no es pot eliminar el grup %s, que és el grup primari per un altre "
 "usuari.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: avís: no es pot eliminar "
 
@@ -2071,17 +1936,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
@@ -2094,7 +1956,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: l'usuari %s està actualment dins el sistema\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: el directori personal «%s» no és vàlid\n"
 
@@ -2176,7 +2037,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: l'usuari %s existeix\n"
 
@@ -2193,7 +2053,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "El membre ja existeix\n"
 
@@ -2208,7 +2067,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: no es pot crear el directori %s\n"
 
@@ -2247,7 +2105,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2270,31 +2127,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: no s'ha canviat %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "no s'ha pogut reanomenar la bústia de correu"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "No s'ha pogut blocar el fitxer"
 
@@ -2302,7 +2152,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
 
@@ -2313,27 +2162,22 @@ msgid "Couldn't make backup"
 msgstr "No s'ha pogut fer una còpia de seguretat"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "No es pot obrir el fitxer de grup\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: els camps són massa llargs\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "no s'ha pogut reanomenar la bústia de correu"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "no s'ha pogut canviar el propietari de la bústia de correu"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "no s'ha pogut reanomenar la bústia de correu"
 
@@ -2342,10 +2186,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: no es pot restaurar %s: %s (els seus canvis estan a %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: el directori base «%s» no és vàlid\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s no és un intèrpret vàlid.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Forma d'ús: %s [entrada]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: no es pot crear %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: no es pot fer canviar el propietari a %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Forma d'ús: vipw [opcions]\n"
+"\n"
+"Opcions:\n"
+"  -g, --group                   edita la base de dades de grup\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -p, --passwd                  edita la base de dades de passwd\n"
+"  -q, --quiet                   mode silenciós\n"
+"  -s, --shadow                  edita la base de dades de shadow o gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2381,20 +2306,6 @@ msgstr "%s: el directori base «%s» no 
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Forma d'ús: %s [entrada]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: no es pot crear %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: no es pot fer canviar el propietari a %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/cs.po 1:4.1.4.2+svn3283-2ubuntu1/po/cs.po
--- 1:4.1.4.2+svn3283-2/po/cs.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/cs.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,12 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2009-10-04 15:44+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #, c-format
 msgid ""
@@ -52,17 +52,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: došla paměť\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: nelze smazat %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s home directory (%s) not found\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: domovský adresář uživatele %s (%s) nebyl nalezen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nelze odstranit záznam „%s“ z %s\n"
 
@@ -71,57 +68,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: nelze zjistit velikost %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: varování: nelze smazat %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: přejmenovat: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: adresář %s nelze na %s přejmenovat\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: adresář %s nelze na %s přejmenovat\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: varování: nelze smazat %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: nelze zjistit velikost %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: nelze smazat %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
 
@@ -132,12 +118,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: přejmenovat: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: nelze otevřít %s\n"
 
@@ -188,7 +172,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: nepodařilo se odemknout %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -225,8 +208,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -243,8 +226,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -652,7 +635,6 @@ msgstr ""
 "Volby:\n"
 
 #, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
 msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
 msgstr "  -c, --crypt-method            typ Å¡ifry (jeden z %s)\n"
 
@@ -708,17 +690,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: chybná položka %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s není platný shell.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: uživatel %s neexistuje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: varování: vlastníkem %s není %s\n"
 
@@ -731,9 +710,6 @@ msgstr ""
 "uživatelích\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -l, --lock-time SEC           after failed login lock account for SEC "
-#| "seconds\n"
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
@@ -834,10 +810,6 @@ msgid "  -M, --members USER,...        s
 msgstr "  -M, --members UŽIVATEL,...    nastaví seznam členů SKUPINY\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -1522,7 +1494,6 @@ msgid "%s: password expiry information c
 msgstr "%s: informace o vypršení platnosti hesla byly změněny.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr ""
 "Použití: %s [-q] [-r] [-s] [soubor s hesly [soubor se stínovými hesly]]\n"
@@ -1567,22 +1538,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "uživatel „%s“: program „%s“ neexistuje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: nelze otevřít %s\n"
 
@@ -1619,7 +1586,6 @@ msgid "Usage: pwconv\n"
 msgstr "Použití: pwconv\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: nelze přepsat soubor\n"
 
@@ -1979,7 +1945,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu není jedinečné\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
@@ -2033,17 +1998,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: selhalo odevzdání privilegií (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: nelze zjistit velikost %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: nelze odstranit záznam „%s“ z %s\n"
 
@@ -2167,7 +2129,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
@@ -2182,14 +2143,14 @@ msgstr "%s: adresář %s nelze na %s př
 #, c-format
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: nepodařilo se zkopírovat lastlog záznamy uživatele %lu uživateli %lu: "
-"%s\n"
+"%s: nepodařilo se zkopírovat lastlog záznamy uživatele %lu uživateli %lu: %"
+"s\n"
 
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: nepodařilo se zkopírovat faillog záznamy uživatele %lu uživateli %lu: "
-"%s\n"
+"%s: nepodařilo se zkopírovat faillog záznamy uživatele %lu uživateli %lu: %"
+"s\n"
 
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
@@ -2212,10 +2173,6 @@ msgstr ""
 "Můžete to provést příkazem „%s“.\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2226,30 +2183,24 @@ msgstr ""
 "Volby:\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -g, --group                   edit group database\n"
 msgstr "  -g, --gid GID                 změní ID skupiny na GID\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -r, --system                  vytvoří systémový účet\n"
 
 #, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -l, --list                    vypíše členy skupiny\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -a, --all                     zobrazí záznamy faillogu o všech "
 "uživatelích\n"
 
 #, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
 
@@ -2262,12 +2213,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s je beze změny\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "chyba při přejmenovávání poštovní schránky"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: selhalo odevzdání privilegií (%s)\n"
 
@@ -2278,7 +2227,6 @@ msgid "setfscreatecon () failed"
 msgstr "Volání setfscreatecon() selhalo"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: selhalo odevzdání privilegií (%s)\n"
 
@@ -2289,27 +2237,22 @@ msgid "Couldn't make backup"
 msgstr "Zálohování nelze provést."
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Soubor se skupinami nelze otevřít\n"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: nepodařilo se odemknout %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "chyba při přejmenovávání poštovní schránky"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "chyba při změně vlastníka poštovní schránky"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "chyba při přejmenovávání poštovní schránky"
 
@@ -2318,10 +2261,119 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: %s nelze obnovit: %s (změny jsou v %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: chybný základní adresář „%s“\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s není platný shell.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Použití: %s [volby] SKUPINA\n"
+"\n"
+"Volby:\n"
+"  -a, --add UŽIVATEL            přidá UŽIVATELE do SKUPINY\n"
+"  -d, --delete UŽIVATEL         odstraní UŽIVATELE ze SKUPINY\n"
+"  -r, --remove-password         odstraní heslo SKUPINY\n"
+"  -R, --restrict                povolí přístup ke SKUPINĚ jen členům\n"
+"  -M, --members UŽIVATEL,...    nastaví seznam členů SKUPINY\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators SPRÁVCE,...\n"
+"                                nastaví seznam správců SKUPINY\n"
+"Kromě voleb -A a -M není možné volby kombinovat.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Použití: groupmems [volby] [akce]\n"
+"\n"
+"Volby:\n"
+"  -g, --group skupina           místo uživatelovy skupiny změní zadanou\n"
+"                                skupinu (pouze root)\n"
+"\n"
+"Akce:\n"
+"  -a, --add uživatel            přidá uživatele mezi členy skupiny\n"
+"  -d, --delete uživatel         odebere uživateli členství ve skupině\n"
+"  -p, --purge                   ze skupiny odstraní všechny uživatele\n"
+"  -l, --list                    vypíše členy skupiny\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Použití: useradd [volby] ÚČET\n"
+"\n"
+"Volby:\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s nelze vytvořit\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: volání chown pro %s selhalo\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Použití: vipw [volby]\n"
+"\n"
+"Volby:\n"
+"  -g, --group                   upraví databázi skupin\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -p, --passwd                  upraví databázi hesel\n"
+"  -q, --quiet                   tichý režim\n"
+"  -s, --shadow                  upraví databázi shadow nebo gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2356,73 +2408,6 @@ msgstr "%s: chybný základní adresář
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Použití: %s [volby] SKUPINA\n"
-#~ "\n"
-#~ "Volby:\n"
-#~ "  -a, --add UŽIVATEL            přidá UŽIVATELE do SKUPINY\n"
-#~ "  -d, --delete UŽIVATEL         odstraní UŽIVATELE ze SKUPINY\n"
-#~ "  -r, --remove-password         odstraní heslo SKUPINY\n"
-#~ "  -R, --restrict                povolí přístup ke SKUPINĚ jen členům\n"
-#~ "  -M, --members UŽIVATEL,...    nastaví seznam členů SKUPINY\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Použití: groupmems [volby] [akce]\n"
-#~ "\n"
-#~ "Volby:\n"
-#~ "  -g, --group skupina           místo uživatelovy skupiny změní zadanou\n"
-#~ "                                skupinu (pouze root)\n"
-#~ "\n"
-#~ "Akce:\n"
-#~ "  -a, --add uživatel            přidá uživatele mezi členy skupiny\n"
-#~ "  -d, --delete uživatel         odebere uživateli členství ve skupině\n"
-#~ "  -p, --purge                   ze skupiny odstraní všechny uživatele\n"
-#~ "  -l, --list                    vypíše členy skupiny\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr ""
-#~ "Použití: useradd [volby] ÚČET\n"
-#~ "\n"
-#~ "Volby:\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s nelze vytvořit\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: volání chown pro %s selhalo\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/da.po 1:4.1.4.2+svn3283-2ubuntu1/po/da.po
--- 1:4.1.4.2+svn3283-2/po/da.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/da.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2007-11-24 18:50+0100\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: hukommelse opbrugt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: kan ikke opdatere filen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: ugyldig hjemmemappe '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: omdøb: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: kan ikke opdatere filen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: kan ikke opdatere skyggefilen\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: omdøb: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: kan ikke åbne filen %s\n"
 
@@ -179,17 +163,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Kunne ikke ændre tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: felter for lange\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -223,8 +204,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -241,8 +222,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -299,7 +280,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Adgangskode ændret."
 
@@ -343,30 +323,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) mislykkedes\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Nej\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -481,12 +441,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-autentifikation mislykkedes\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: kan ikke låse filer. Prøv igen senere\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: kan ikke åbne filen %s\n"
 
@@ -495,7 +453,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: fejl under spaltning: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
 
@@ -536,7 +493,6 @@ msgid "Full Name"
 msgstr "Fulde navn"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -580,7 +536,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: ugyldig hjemmetelefon: '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: '%s' indeholder ugyldige tegn\n"
 
@@ -655,12 +610,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: linje %d: mangler ny adgangskode\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: gruppen %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: linje %d: kan ikke opdatere posten\n"
 
@@ -669,7 +622,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: fejl opdaget, ændringerne blev ignoreret\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -720,7 +672,6 @@ msgid "Login Shell"
 msgstr "Login-skal"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Du kan ikke ændre skal for %s.\n"
 
@@ -733,17 +684,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ugyldig linje: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s er en ugyldig skal.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: brugeren %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: advarsel: %s ejes ikke af %s\n"
 
@@ -784,7 +732,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Logind      Fejl     Maksimum Seneste                 Tid\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds tilbage]"
 
@@ -809,7 +756,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Ukendt bruger: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: kan ikke åbne filen %s\n"
 
@@ -818,7 +764,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -847,12 +792,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Adgangskoden for %s kan ikke ændres.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Adgangskoden for %s kan ikke ændres.\n"
 
@@ -861,7 +804,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: der kræves skyggeadgangskoder for -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: gruppen %s eksisterer ikke\n"
 
@@ -903,7 +845,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Ikke en tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -936,7 +877,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s er ikke et gyldigt gruppenavn\n"
 
@@ -949,12 +889,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K kræver NAVN=VÆRDI\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: gruppen %s eksisterer\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Medlemmet eksisterer allerede\n"
 
@@ -962,7 +900,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Brug: groupdel gruppe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
@@ -971,12 +908,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: kan ikke ændre brugeren'%s' på NIS-klienten.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppen %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: gruppen '%s' er en NIS-gruppe.\n"
 
@@ -985,7 +920,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-masteren\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: brugeren %s er en NIS-bruger\n"
 
@@ -994,7 +928,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: løbet tør for hukommelse i update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1090,7 +1023,6 @@ msgid "invalid group name '%s'\n"
 msgstr "ugyldigt gruppenavn '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "ugyldigt gruppenavn '%s'\n"
 
@@ -1107,7 +1039,6 @@ msgid "no matching group file entry in %
 msgstr "ingen tilsvarende gruppefilslinje i %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "tilføj gruppen %s i %s?"
 
@@ -1143,17 +1074,14 @@ msgid "%s: no changes\n"
 msgstr "%s: ingen ændringer\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Brug: groupdel gruppe\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Brug: groupdel gruppe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: kan ikke opdatere filen %s\n"
 
@@ -1244,9 +1172,6 @@ msgstr ""
 "[Afbrød ikke forbindelsen -- root-login er tilladt.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1273,7 +1198,6 @@ msgid "login: "
 msgstr "logind: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Maksimalt antal forsøg nået (%d)\n"
 
@@ -1322,7 +1246,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Brug: id\n"
 
@@ -1359,7 +1282,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: gruppen %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: ugyldigt brugernavn '%s'\n"
 
@@ -1392,12 +1314,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: linje %d: kan ikke opdatere adgangskode\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: linje %d: mkdir fejlede\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: linje %d: chown fejlede\n"
 
@@ -1406,33 +1326,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: linje %d: kan ikke opdatere posten\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1551,17 +1444,14 @@ msgid "The password for %s is unchanged.
 msgstr "Adgangskoden for %s er uændret.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Adgangskode ændret."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Advarsel om udløb af adgangskode"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Brug: %s [-q] [-r] [-s] [adgangskode [skygge]]\n"
 
@@ -1570,7 +1460,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1589,42 +1478,34 @@ msgid "invalid user name '%s'\n"
 msgstr "ugyldigt brugernavn'%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "ugyldigt brugernavn'%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "bruger %s: ingen gruppe %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "bruger %s: mappen %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "bruger %s: programmet %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: kan ikke låse filen %s\n"
 
@@ -1652,17 +1533,14 @@ msgid "user %s: last password change in 
 msgstr "bruger %s: seneste ændring af adgangskoden skete i fremtiden\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: kan ikke åbne filen %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Brug: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: kan ikke genskrive fil\n"
 
@@ -1671,7 +1549,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Brug: id\n"
 
@@ -1691,7 +1568,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: kan ikke låse filen %s\n"
 
@@ -1767,12 +1643,10 @@ msgstr ""
 "(Ignoreret)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM-autentifikation mislykkedes\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Du er ikke autoriseret til at 'su %s'\n"
 
@@ -1817,12 +1691,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: kan ikke åbne ny standardværdi-fil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linje %d: chown fejlede\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: omdøb: %s"
 
@@ -1835,7 +1707,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: der er angivet for mange grupper (højst %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1987,7 +1858,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Indstiller postboks-filens rettigheder"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: brugeren %s eksisterer\n"
 
@@ -2003,12 +1873,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: kan ikke oprette %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u er ikke unikt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
@@ -2044,14 +1912,11 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Kan ikke fjerne gruppen %s, som er primærgruppe for en anden bruger.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne "
 
@@ -2064,17 +1929,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
@@ -2087,7 +1949,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: brugeren %s er logget på\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: ugyldig hjemmemappe '%s'\n"
 
@@ -2164,7 +2025,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: brugeren %s eksisterer\n"
 
@@ -2181,7 +2041,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Medlemmet eksisterer allerede\n"
 
@@ -2196,7 +2055,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
@@ -2234,7 +2092,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2257,31 +2114,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s er uændret\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "kunne ikke omdøbe postkasse"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "kunne ikke låse filen"
 
@@ -2289,7 +2139,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
 
@@ -2300,27 +2149,22 @@ msgid "Couldn't make backup"
 msgstr "kunne ikke lave sikkerhedskopi"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Kan ikke åbne gruppefil\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: felter for lange\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "kunne ikke omdøbe postkasse"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "kunne ikke ændre postkassens ejer"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "kunne ikke omdøbe postkasse"
 
@@ -2329,10 +2173,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: kunne ikke genskabe %s: %s (dine ændringer er i %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ugyldig grundmappe '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s er en ugyldig skal.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Brug: %s [inddata]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: kan ikke oprette %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: kan ikke chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Brug: vipw [tilvalg]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   ret gruppedatabasen\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -p, --passwd                  redigér passwd-databasen\n"
+"  -q, --quiet                   stille tilstand\n"
+"  -s, --shadow                  ret shadow- eller gshadow-databasen\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2367,20 +2292,6 @@ msgstr "%s: ugyldig grundmappe '%s'\n"
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Brug: %s [inddata]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: kan ikke oprette %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: kan ikke chown %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/de.po 1:4.1.4.2+svn3283-2ubuntu1/po/de.po
--- 1:4.1.4.2+svn3283-2/po/de.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/de.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -56,17 +56,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: Speicher erschöpft\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: %s kann nicht gelöscht werden.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: Ungültiges Home-Verzeichnis »%s«\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Eintrag »%s« konnte nicht aus %s entfernt werden.\n"
 
@@ -75,57 +72,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden.\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: Warnung: %s kann nicht gelöscht werden: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: Umbenennen: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: Verzeichnis %s kann nicht in %s umbenannt werden\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: Verzeichnis %s kann nicht in %s umbenannt werden\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: Warnung: %s kann nicht gelöscht werden: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden.\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: %s kann nicht gelöscht werden.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: Zeile %d: Benutzer »%s« ist nicht vorhanden.\n"
 
@@ -136,12 +122,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: Umbenennen: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: %s konnte nicht geöffnet werden.\n"
 
@@ -192,7 +176,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: Entsperren von %s fehlgeschlagen.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -226,12 +209,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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"
 
@@ -245,8 +227,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -668,9 +650,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -679,7 +658,6 @@ msgstr ""
 "                                Verschlüsselungs-Algorithmus\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: Zeile %d: Benutzer »%s« ist nicht vorhanden.\n"
 
@@ -718,17 +696,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ungültiger Eintrag: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s ist eine ungültige Shell.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: Benutzer »%s« ist nicht vorhanden.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Warnung: %s nicht im Besitz von %s.\n"
 
@@ -748,9 +723,6 @@ msgid ""
 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"
@@ -768,7 +740,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "faillog: Auslesen des Eintrags für UID %d fehlgeschlagen\n"
 
@@ -784,18 +755,15 @@ msgid " [%lds lock]"
 msgstr " [%lds Sperre]"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
 msgid "faillog: Failed to reset fail count for UID %lu\n"
 msgstr ""
 "faillog: Zurücksetzen des Fehlanmeldungszählers für UID %d fehlgeschlagen\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
 msgid "faillog: Failed to set max for UID %lu\n"
 msgstr "faillog: Setzen des Max-Werts für UID %d fehlgeschlagen\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
 msgid "faillog: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Setzen der Sperrzeit für UID %d fehlgeschlagen\n"
 
@@ -819,9 +787,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr ""
 "  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
@@ -834,9 +799,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr ""
@@ -847,10 +809,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -861,7 +819,6 @@ msgstr ""
 "Außer für -A und -M können die Optionen nicht kombiniert werden.\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Die Optionen können nicht kombiniert werden.\n"
 
@@ -921,9 +878,6 @@ msgid ""
 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"
@@ -933,9 +887,6 @@ msgstr ""
 "                                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"
@@ -945,9 +896,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -961,9 +909,6 @@ msgid ""
 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"
@@ -1028,9 +973,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1046,9 +988,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr ""
@@ -1061,18 +1000,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -p, --purge                   purge all members from the group\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 "  -l, --list                    list the members of the group\n"
 msgstr ""
 "  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
@@ -1087,9 +1020,6 @@ msgid "%s: only root can use the -g/--gr
 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"
@@ -1240,7 +1170,6 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
 msgid "lastlog: Failed to get the entry for UID %lu\n"
 msgstr "lastlog: Auslesen des Eintrags für UID %d fehlgeschlagen\n"
 
@@ -1274,7 +1203,6 @@ msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r Rechner\n"
 
 #, fuzzy, c-format
-#| msgid "configuration error - cannot parse %s value: '%s'"
 msgid "configuration error - cannot parse %s value: '%d'"
 msgstr ""
 "Konfigurationsfehler - Wert für %s konnte nicht ausgewertet werden: »%s«"
@@ -1297,9 +1225,6 @@ msgstr ""
 "[Trennung abgebrochen -- root-Login erlaubt.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1328,7 +1253,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Maximale Anzahl der Versuche überschritten (%d)\n"
 
@@ -1404,9 +1328,6 @@ msgid "  -c, --crypt-method            t
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -r, --system                  create system accounts\n"
 msgstr ""
 "  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
@@ -1591,17 +1512,14 @@ msgid "The password for %s is unchanged.
 msgstr "Das Passwort für %s wurde nicht geändert.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Passwort geändert."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Passwortablaufwarnung"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Aufruf: %s [-q] [-r] [-s] [passwort [shadow]]\n"
 
@@ -1610,7 +1528,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1645,22 +1562,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "Benutzer »%s«: Programm »%s« existiert nicht.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: %s konnte nicht geöffnet werden.\n"
 
@@ -1721,7 +1634,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: Ihr Benutzername konnte nicht bestimmt werden.\n"
 
@@ -1845,12 +1757,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: Neue defaults-Datei kann nicht geöffnet werden.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: Zeile %d: chown %s fehlgeschlagen: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: Umbenennen: %s"
 
@@ -1870,9 +1780,6 @@ msgid ""
 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"
@@ -1901,9 +1808,6 @@ msgid ""
 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"
@@ -1912,9 +1816,6 @@ msgstr ""
 "                                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"
@@ -1927,9 +1828,6 @@ msgid ""
 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"
@@ -1938,9 +1836,6 @@ msgstr ""
 "                                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"
@@ -1951,9 +1846,6 @@ msgid ""
 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"
@@ -1962,9 +1854,6 @@ msgstr ""
 "                                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"
@@ -1976,18 +1865,12 @@ msgid "  -p, --password PASSWORD       e
 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"
@@ -2092,7 +1975,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu ist nicht einmalig\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden.\n"
 
@@ -2135,7 +2017,6 @@ msgstr ""
 "nicht entfernt.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: Warnung: %s kann nicht gelöscht werden: %s"
 
@@ -2148,17 +2029,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: Entfernen der Privilegien (%s) fehlgeschlagen.\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: Eintrag »%s« konnte nicht aus %s entfernt werden.\n"
 
@@ -2171,7 +2049,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: Benutzer %s ist derzeit angemeldet.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: Ungültiges Home-Verzeichnis »%s«\n"
 
@@ -2291,7 +2168,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden.\n"
 
@@ -2343,45 +2219,30 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -g, --group                   edit group database\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 "  -p, --passwd                  edit passwd database\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 "  -q, --quiet                   quiet mode\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 "  -s, --shadow                  edit shadow or gshadow database\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, --user                    which user's tcb shadow file to edit\n"
 msgstr ""
 "  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
@@ -2396,12 +2257,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s ist unverändert.\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "Fehler beim Umbenennen von mailbox"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: Entfernen der Privilegien (%s) fehlgeschlagen.\n"
 
@@ -2412,7 +2271,6 @@ msgid "setfscreatecon () failed"
 msgstr "setfscreatecon () fehlgeschlagen"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: Entfernen der Privilegien (%s) fehlgeschlagen.\n"
 
@@ -2423,27 +2281,22 @@ msgid "Couldn't make backup"
 msgstr "Sicherung konnte nicht erstellt werden"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "Fehler beim Umbenennen von mailbox"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: Entsperren von %s fehlgeschlagen.\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "Fehler beim Umbenennen von mailbox"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "Fehler beim Ändern des mailbox-Besitzers"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "Fehler beim Umbenennen von mailbox"
 
@@ -2454,10 +2307,120 @@ msgstr ""
 "(Ihre Änderungen befinden sich in %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: Ungültiges Basis-Verzeichnis »%s«\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s ist eine ungültige Shell.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Aufruf: %s [Option] GRUPPE\n"
+"\n"
+"Optionen:\n"
+"  -a, --add NUTZER               NUTZER zu GRUPPE hinzufügen\n"
+"  -d, --delete NUTZER            NUTZER aus GRUPPE entfernen\n"
+"  -r, --remove-password          Passwort der GRUPPE entfernen\n"
+"  -R, --restrict                 Zugriff zu GRUPPE auf ihre Mitglieder\n"
+"                                 beschränken\n"
+"  -M, --members NUTZER,...       Liste der Mitglieder von GRUPPE setzen\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators ADMIN,...\n"
+"                                 setze die Liste der Administratoren für "
+"GRUPPE.\n"
+"Außer für -A und -M können die Optionen nicht kombiniert werden.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Aufruf: groupmems [Optionen] [Aktion]\n"
+"\n"
+"Optionen:\n"
+"  -g, --group Gruppenname       Ändere Gruppenname statt der Gruppe des\n"
+"                                Benutzers (nur root)\n"
+"\n"
+"Aktionen:\n"
+"  -a, --add Benutzername        Benutzername zu den Mitgliedern der Gruppe\n"
+"                                hinzufügen\n"
+"  -d, --delete Benutzername     Benutzername von den Mitgliedern der Gruppe\n"
+"                                entfernen\n"
+"  -p, --purge                   Alle Mitglieder aus der Gruppe entfernen\n"
+"  -l, --list                    Die Mitglieder der Gruppe auflisten\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s kann nicht erstellt werden\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: Besitzer von %s kann nicht geändert werden\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Aufruf: vipw [Optionen]\n"
+"\n"
+"Optionen:\n"
+"  -g, --group                   Gruppen-Datenbank editieren\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -p, --passwd                  passwd-Datenbank editieren\n"
+"  -q, --quiet                   Nicht so geschwätzig verhalten\n"
+"  -s, --shadow                  shadow- oder gshadow-Datenbank editieren\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2492,69 +2455,6 @@ msgstr "%s: Ungültiges Basis-Verzeichni
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Aufruf: %s [Option] GRUPPE\n"
-#~ "\n"
-#~ "Optionen:\n"
-#~ "  -a, --add NUTZER               NUTZER zu GRUPPE hinzufügen\n"
-#~ "  -d, --delete NUTZER            NUTZER aus GRUPPE entfernen\n"
-#~ "  -r, --remove-password          Passwort der GRUPPE entfernen\n"
-#~ "  -R, --restrict                 Zugriff zu GRUPPE auf ihre Mitglieder\n"
-#~ "                                 beschränken\n"
-#~ "  -M, --members NUTZER,...       Liste der Mitglieder von GRUPPE setzen\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Aufruf: groupmems [Optionen] [Aktion]\n"
-#~ "\n"
-#~ "Optionen:\n"
-#~ "  -g, --group Gruppenname       Ändere Gruppenname statt der Gruppe des\n"
-#~ "                                Benutzers (nur root)\n"
-#~ "\n"
-#~ "Aktionen:\n"
-#~ "  -a, --add Benutzername        Benutzername zu den Mitgliedern der "
-#~ "Gruppe\n"
-#~ "                                hinzufügen\n"
-#~ "  -d, --delete Benutzername     Benutzername von den Mitgliedern der "
-#~ "Gruppe\n"
-#~ "                                entfernen\n"
-#~ "  -p, --purge                   Alle Mitglieder aus der Gruppe entfernen\n"
-#~ "  -l, --list                    Die Mitglieder der Gruppe auflisten\n"
-#~ "\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s kann nicht erstellt werden\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: Besitzer von %s kann nicht geändert werden\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/dz.po 1:4.1.4.2+svn3283-2ubuntu1/po/dz.po
--- 1:4.1.4.2+svn3283-2/po/dz.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/dz.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: dzongkha\n"
 "X-Poedit-Country: bhutan\n"
@@ -52,17 +52,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: དྲན་ཚད་ལས་བརྒལ་བ།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: ནུས་མེད་ཁྱིམ་གྱི་སྣོད་ཐོ་  '%s'།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
@@ -71,57 +68,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: བསྐྱར་མིང་བཏགས་:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
@@ -132,12 +118,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: བསྐྱར་མིང་བཏགས་:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
@@ -180,17 +164,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "ཊི་ཊི་ཝའི་ %s བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: ས་སྒོ་ཚུ་རིང་དྲགས་པས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -226,8 +207,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -244,8 +225,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -302,7 +283,6 @@ msgid "passwd: %s\n"
 msgstr "ཆོག་ཡིག་: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "ཆོག་ཡིག་སོར་ཡོདཔ།"
 
@@ -346,7 +326,6 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "མེན།\n"
 
@@ -463,12 +442,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s:ཡིག་སྣོད་ཚུ་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས་ དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
@@ -477,7 +454,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: ཁ་སྤེལ་བ་འཐུས་ཤོར་:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
@@ -517,7 +493,6 @@ msgid "Full Name"
 msgstr "མིང་ཆ་ཚང་།"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -561,7 +536,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: ནུས་མེད་ཀྱི་ ཁྱིམ་གྱི་བརྒྱུད་འཕྲིན་: '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s:  '%s' ནང་ལུ་ ཁྲིམས་འགལ་ཡིག་ཆ་ཚུ་ཡོད།\n"
 
@@ -636,12 +610,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: གྲལ་ཐིག་ %d: ཆོག་ཡིག་གསརཔ་ བརླག་སྟོར་ཞུགས་པ།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: གྲལ་ཐིག་ %d: ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
@@ -650,7 +622,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: འཛོལ་བ་སྐྱོན་འཛིན་འབད་ཡི་ བསྒྱུར་བཅོས་ཚུ་སྣང་མེད་བཞག་ཡི།\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -702,7 +673,6 @@ msgid "Login Shell"
 msgstr "ནང་བསྐྱོད་ཀྱི་ཤལ།"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "ཁྱོད་ཀྱིས་ %sགི་དོན་ལུ་ ཤལ་བསྒྱུར་བཅོས་མི་འབདཝ་འོང་།\n"
 
@@ -715,17 +685,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: ནུས་མེད་ཀྱི་ཐོ་བཀོད་:%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s འདི་ནུས་མེད་ཀྱི་ཤལ་ཨིན།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: ཉེན་བརྡ་: %s འདི་ %s གིས་ བདག་དབང་བཟུངམ་མེན།\n"
 
@@ -766,7 +733,6 @@ msgid "Login       Failures Maximum Late
 msgstr "ནང་བསྐྱོད་       མང་མཐའི་མཇུག་མཐའ་འཐུས་ཤོར་                   ཨཱོན། \n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds གཡོན་]"
 
@@ -791,7 +757,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "མ་ཤེས་པའི་ལག་ལེན་པ་:%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
@@ -800,7 +765,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -829,12 +793,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "%sགི་དོན་ལུ་ ཆོག་ཡིག་སོར་མི་ཚུགས།\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "%sགི་དོན་ལུ་ ཆོག་ཡིག་སོར་མི་ཚུགས།\n"
 
@@ -843,7 +805,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: -Aགི་དོན་ལུ་ གྱིབ་མའི་སྡེ་ཚན་ཆོག་ཡིག་ཚུ་དགོ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
@@ -885,7 +846,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: ཊི་ཊི་ཝའི་མེན།\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -918,7 +878,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s འདི་ ནུས་ཅན་གྱི་སྡེ་ཚན་མིང་མེན་པས།\n"
 
@@ -931,7 +890,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K གིས་ ལྡེ་མིག་=བེ་ལུ་ དགོཔ་ཨིན།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: སྡེ་ཚན་ %sཡོདཔ་ཨིན།\n"
 
@@ -943,7 +901,6 @@ msgid "Usage: groupdel group\n"
 msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
@@ -952,12 +909,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: ཨེན་ཨའི་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མི་གུ་ ལག་ལེན་པ་ '%s' བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: སྡེ་ཚན་ '%s' འདི་ ཨེན་ཨའི་ཨེསི་སྡེ་ཚན་ཨིན།\n"
 
@@ -966,7 +921,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %sའདི་ ཨེན་ཇི་ཨེསི་ ཨམ་ཨིན།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: ལག་ལེན་པ་ %sའདི་ ཨེན་ཨའི་ཨེསི་ ལག་ལེན་པ་ཅིག་ཨིན།\n"
 
@@ -975,7 +929,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: དུས་མཐུན་སྡེ་ཚན་ནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1071,7 +1024,6 @@ msgid "invalid group name '%s'\n"
 msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
 
@@ -1088,7 +1040,6 @@ msgid "no matching group file entry in %
 msgstr "%sནང་ མཐུན་སྒྲིག་སྡེ་ཚན་གྱི་ཡིག་སྣོད་ཐོ་བཀོད་མེད།\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "%sནང་ སྡེ་ཚན་ '%s' ཁ་སྐོང་འབད་ནི་ཨིན་ན?"
 
@@ -1124,17 +1075,14 @@ msgid "%s: no changes\n"
 msgstr "%s: སོར་ནི་མེད།\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
@@ -1225,9 +1173,6 @@ msgstr ""
 "[མཐུད་བཏོག་ཟུར་ཏེ་འགྱོ་ཡོདཔ་ --རྩ་བའི་ནང་བསྐྱོད་མི་ཆོག]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1255,7 +1200,6 @@ msgid "login: "
 msgstr "ནང་བསྐྱོད་: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "འབད་རྩོལ་གྱི་ཨང་གྲངས་མང་མཐའ་ལྷག་ཡོདཔ་(%d)\n"
 
@@ -1304,7 +1248,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "ལག་ལེན་པ་: id\n"
 
@@ -1341,7 +1284,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
 
@@ -1374,12 +1316,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: གྲལ་ཐིག་ %d: ཆོག་ཡིག་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: གྲལ་ཐིག་ %d: mkdir འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: གྲལ་ཐིག་ %d: chown འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
@@ -1502,17 +1442,14 @@ msgid "The password for %s is unchanged.
 msgstr " %sགི་དོན་ལུ་ ཆོག་ཡིག་འདི་མ་སོར་བས།\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "ཆོག་ཡིག་སོར་ཡོདཔ།"
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "ཆོག་ཡིག་དུས་ཡོལ་ཉེན་བརྡ།"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "ལག་ལེན་:%s [-q] [-r] [-s] [passwd [གྱིབ་མ་]]\n"
 
@@ -1521,7 +1458,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1540,42 +1476,34 @@ msgid "invalid user name '%s'\n"
 msgstr "ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "ལག་ལེན་པ་ %s: སྡེ་ཚན་ %uམེད།\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "ལག་ལེན་པ་ %s: སྣོད་ཐོ་ %s མེད།\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "ལག་ལེན་པ་ %s: ལས་རིམ་%s མེད།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: ཡིག་སྣོད་ %sའདི་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
 
@@ -1603,17 +1531,14 @@ msgid "user %s: last password change in 
 msgstr "ལག་ལེན་པ་ %s: མ་འོངས་པ་ནང་ མཇུག་གི་ཆོག་ཡིག་སོར་ནི།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "ལག་ལེན་པ་: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: ཡིག་སྣོད་ལོག་འབྲི་མི་ཚུགས།\n"
 
@@ -1622,7 +1547,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "ལག་ལེན་པ་: id\n"
 
@@ -1642,7 +1566,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: ཡིག་སྣོད་ %sའདི་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
 
@@ -1718,12 +1641,10 @@ msgstr ""
 "(སྣང་མེད་བཞག་ཡོདཔ་)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "ཁྱོད་ ཟླ་%sལུ་ དབང་སྤྲོད་མ་འབད།\n"
 
@@ -1768,12 +1689,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: སྔོན་སྒྲིག་ཡིག་སྣོད་གསརཔ་ ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: གྲལ་ཐིག་ %d: chown འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: བསྐྱར་མིང་བཏགས་:%s"
 
@@ -1786,7 +1705,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: སྡེ་ཚན་མང་རབས་ཅིག་གསལ་བཀོད་འབད་ཡོདཔ་(མང་མཐའ་ %d)།\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1937,7 +1855,6 @@ msgid "Setting mailbox file permissions"
 msgstr "ཡིག་སྒྲོམ་ཡིག་སྣོད་གྱི་གནང་བ་ གཞི་སྒྲིག་འབད་དོ།"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: ལག་ལེན་པ་ %sཡོདཔ་ཨིན།\n"
 
@@ -1953,12 +1870,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: %sགསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: ཡུ་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་མེན།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
@@ -1995,14 +1910,11 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: ལག་ལེན་པ་གཞན་གྱི་དོན་ལུ་ གཞི་རིམ་སྡེ་ཚན་ཅིག་ཨིན་མི་སྡེ་ཚན་ %sའདི་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
@@ -2015,17 +1927,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
@@ -2038,7 +1947,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ ད་ལྟོ་རང་ནང་བསྐྱོད་འབད་ཡི།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: ནུས་མེད་ཁྱིམ་གྱི་སྣོད་ཐོ་  '%s'།\n"
 
@@ -2114,7 +2022,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: ལག་ལེན་པ་ %sཡོདཔ་ཨིན།\n"
 
@@ -2145,7 +2052,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
@@ -2184,7 +2090,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2207,31 +2112,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %sའདི་ བསྒྱུར་བཅོས་མ་འབད་བས།\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "ཡིག་སྒྲོམ་གྱི་བསྐྱར་མིང་བཏགས་ནི་ལུ་ འཛོལ་བ།"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "ཡིག་སྣོད་ལྡེ་མིག་བརྐྱབས་མ་ཚུགས།"
 
@@ -2239,7 +2137,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
@@ -2254,22 +2151,18 @@ msgid "failed to open scratch file"
 msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: ས་སྒོ་ཚུ་རིང་དྲགས་པས།\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "ཡིག་སྒྲོམ་གྱི་བསྐྱར་མིང་བཏགས་ནི་ལུ་ འཛོལ་བ།"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "ཡིག་སྒྲོམ་བདག་པོ་སོར་ནི་ལུ་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "ཡིག་སྒྲོམ་གྱི་བསྐྱར་མིང་བཏགས་ནི་ལུ་ འཛོལ་བ།"
 
@@ -2278,10 +2171,92 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: %sསོར་ཆུད་འབད་མ་ཚུགས་: %s (ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ %sནང་ཨིན་)།\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ནུས་མེད་གཞི་རྟེན་སྣོད་ཐོ་'%s'།\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s འདི་ནུས་མེད་ཀྱི་ཤལ་ཨིན།\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %sགསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: %s chownའབད་མི་ཚུགས།\n"
+
+#, fuzzy
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"ལག་ལེན་: vipw [གདམ་ཁ་ཚུ་]\n"
+"\n"
+"གདམ་ཁ་ཚུ་:\n"
+"  -g, --group\t\t\t  སྡེ་ཚན་གནད་སྡུད་གཞི་རྟེན་ ཞུན་དག་འབད།\n"
+"  -h, --help\t\t\t  གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+"  -p, --passwd\t\t\t  ཆོག་ཡིག་གནད་སྡུད་གཞི་རྟེན་ ཞུན་དག་འབད།\n"
+"  -q, --quiet\t\t\t  ཁུ་སིམ་སིམ་གྱི་ཐབས་ལམ།\n"
+"  -s, --shadow\t\t\t གྱིབ་མ་ ཡང་ན་  gshadowགནད་སྡུད་གཞི་རྟེན་ ཞུན་དག་འབད།\n"
+"\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
@@ -2306,20 +2281,6 @@ msgstr "%s: ནུས་མེད་གà
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %sགསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: %s chownའབད་མི་ཚུགས།\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/el.po 1:4.1.4.2+svn3283-2ubuntu1/po/el.po
--- 1:4.1.4.2+svn3283-2/po/el.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/el.po	2010-11-24 14:47:24.000000000 +0000
@@ -13,10 +13,10 @@ msgstr ""
 "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"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
@@ -53,7 +53,6 @@ msgid "%s: out of memory\n"
 msgstr "%s: δεν υπάρχει ελεύθερη μνήμη\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: αδυναμία ανανέωσης αρχείου %s\n"
 
@@ -62,7 +61,6 @@ msgid "%s: %s is neither a directory, no
 msgstr "%s: Μη έγκυρος αρχικός κατάλογος χρήστη `%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
@@ -71,57 +69,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: μετονομασία: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: αδυναμία ανανέωσης αρχείου %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: αδυναμία ανανέωσης καταχώρησης του αρχείου σκιωδών συνθηματικών\n"
 
@@ -132,12 +119,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: μετονομασία: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
@@ -180,17 +165,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Αδυναμία αλλαγής tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: Πολύ μακριά πεδία\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -224,8 +206,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -242,8 +224,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -300,7 +282,6 @@ msgid "passwd: %s\n"
 msgstr "συνθηματικό: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Το συνθηματικό άλλαξε."
 
@@ -344,30 +325,10 @@ msgid "malloc(%d) failed\n"
 msgstr "Η κλήση malloc(%d) απέτυχε\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Όχι\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -482,12 +443,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: αδυναμία κλειδώματος αρχείων, ξαναδοκιμάστε αργότερα\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
@@ -496,7 +455,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: αποτυχία διχάλωσης: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
@@ -538,7 +496,6 @@ msgid "Full Name"
 msgstr "Πλήρες όνομα"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -659,12 +616,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: γραμμή %d: έλλειψη νέου συνθηματικού\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: γραμμή %d: αδυναμία ανανέωσης καταχώρησης\n"
 
@@ -673,7 +628,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: Ανιχνεύτηκε σφάλμα, οι αλλαγές αγνοήθηκαν\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -716,7 +670,6 @@ msgid "Login Shell"
 msgstr "Κέλυφος Εισόδου"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Δεν μπορείτε να αλλάξετε το φλοιό για το(ν) %s.\n"
 
@@ -729,17 +682,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Μη έγκυρη καταχώρηση: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s δεν είναι έγκυρος φλοιός.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: προειδοποίηση: Το %s δεν ανήκει στον %s\n"
 
@@ -780,7 +730,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Login       Αποτυχίες Μέγιστο Τελευταία                   Στις\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds απέμειναν]"
 
@@ -805,7 +754,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Άγνωστος χρήστης: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
@@ -814,7 +762,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -843,12 +790,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Το συνθηματικό για τον %s δεν μπορεί να αλλάξει.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Το συνθηματικό για τον %s δεν μπορεί να αλλάξει.\n"
 
@@ -857,7 +802,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: σκιώδη συνθηματικά ομάδων απαιτούνται για το -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
@@ -899,7 +843,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Δεν είναι tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -932,7 +875,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: Το %s δεν είναι έγκυρο όνομα ομάδας\n"
 
@@ -945,7 +887,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K απαιτεί KEY=VALUE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: Η ομάδα %s υπάρχει\n"
 
@@ -957,7 +898,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Χρήση: groupdel ομάδα\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
@@ -966,7 +906,6 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: αδυναμία αλλαγής χρήστη `%s' στον NIS εξυπηρετούμενο.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
@@ -979,7 +918,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: Ο %s είναι ο κύριος διακομιστής NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: Ο χρήστης %s είναι NIS χρήστης\n"
 
@@ -988,7 +926,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: δεν υπάρχει ελεύθερη μνήμη στο update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1135,17 +1072,14 @@ msgid "%s: no changes\n"
 msgstr "%s: καμιά αλλαγή\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Χρήση: groupdel ομάδα\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Χρήση: groupdel ομάδα\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: αδυναμία ανανέωσης αρχείου %s\n"
 
@@ -1237,9 +1171,6 @@ msgstr ""
 "[Παράκαμψη αποσύνδεσης -- Η είσοδος του root επετράπη.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1317,7 +1248,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Χρήση: id\n"
 
@@ -1354,7 +1284,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: Μη έγκυρο όνομα χρήστη `%s'\n"
 
@@ -1387,12 +1316,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: γραμμή %d: αδυναμία ανανέωση συνθηματικού\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: γραμμή %d: αποτυχία δημιουργίας καταλόγου(mkdir)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: γραμμή %d: αποτυχία αλλαγής ιδιοκτήτη(chown)\n"
 
@@ -1527,17 +1454,14 @@ msgid "The password for %s is unchanged.
 msgstr "Το συνθηματικό για τον %s δεν άλλαξε.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Το συνθηματικό άλλαξε."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Προειδοποίηση λήξης συνθηματικού"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Χρήση: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1546,7 +1470,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1565,42 +1488,34 @@ msgid "invalid user name '%s'\n"
 msgstr "Μη έγκυρο όνομα χρήστη '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "Μη έγκυρο όνομα χρήστη '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "χρήστης %s: καμιά ομάδα %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "χρήστης %s: ο κατάλογος %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "χρήστης %s: το πρόγραμμα %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: αδυναμία κλειδώματος του αρχείου %s\n"
 
@@ -1628,17 +1543,14 @@ msgid "user %s: last password change in 
 msgstr "χρήστης %s: τελευταία αλλαγή συνθηματικού στο μέλλον\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Χρήση: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: αδυναμία επανεγγραφής αρχείου\n"
 
@@ -1647,7 +1559,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Χρήση: id\n"
 
@@ -1667,7 +1578,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: αδυναμία κλειδώματος του αρχείου %s\n"
 
@@ -1745,12 +1655,10 @@ msgstr ""
 "(Αγνοήθηκε)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Δεν έχετε άδεια για su %s\n"
 
@@ -1795,12 +1703,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: αδυναμία ανοίγματος νέου αρχείου προκαθορισμένων ρυθμίσεων\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: γραμμή %d: αποτυχία αλλαγής ιδιοκτήτη(chown)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: μετονομασία: %s"
 
@@ -1813,7 +1719,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: Προσδιορίστηκαν υπερβολικές ομάδες (μεγ. %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1963,7 +1868,6 @@ msgid "Setting mailbox file permissions"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: Ο χρήστης %s υπάρχει\n"
 
@@ -1979,12 +1883,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: αδυναμία δημιουργίας του %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: Το UID %u δεν είναι μοναδικό\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
@@ -2012,15 +1914,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Αδυναμία αφαίρεσης της ομάδας %s ή οποία είναι πρωταρχική ομάδα για άλλο "
 "χρήστη.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
 
@@ -2033,17 +1932,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
@@ -2138,7 +2034,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: Ο χρήστης %s υπάρχει\n"
 
@@ -2169,7 +2064,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
@@ -2209,7 +2103,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2232,31 +2125,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: Το %s δεν άλλαξε\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "αποτυχία μετονομασίας mailbox"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Αδυναμία ξεκλειδώματος αρχείου"
 
@@ -2264,7 +2150,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
@@ -2279,22 +2164,18 @@ msgid "failed to open scratch file"
 msgstr "%s: Αδυναμία ανοίγματος του αρχείου ομάδων\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: Πολύ μακριά πεδία\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "αποτυχία μετονομασίας mailbox"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "αποτυχία αλλαγής του ιδιοκτήτη του γραμματοκιβωτίου"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "αποτυχία μετονομασίας mailbox"
 
@@ -2306,6 +2187,89 @@ msgstr "%s: αδυναμία επαναÏ
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: Μη έγκυρος κατάλογος βάσης `%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s δεν είναι έγκυρος φλοιός.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Χρήση: %s [είσοδος]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: αδυναμία δημιουργίας του %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: Αδυναμία αλλαγής ιδιοκτήτη(chown) του %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Χρήση: vipw [options]\n"
+"\n"
+"Επιλογές:\n"
+"  -g, --group                   επεξεργασία βάσης δεδομένων ομάδας\n"
+"  -h, --help                    προβολή κειμένου βοήθειας και έξοδος\n"
+"  -p, --passwd                  επεξεργασία βάσης δεδομένων κωδικών\n"
+"  -q, --quiet                   σιωπηλή λειτουργία\n"
+"  -s, --shadow                  επεξεργασία βάσης δεδομένων shadow ή "
+"gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2341,20 +2305,6 @@ msgstr "%s: Μη έγκυρος κατά
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Χρήση: %s [είσοδος]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: αδυναμία δημιουργίας του %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: Αδυναμία αλλαγής ιδιοκτήτη(chown) του %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/es.po 1:4.1.4.2+svn3283-2ubuntu1/po/es.po
--- 1:4.1.4.2+svn3283-2/po/es.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/es.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -50,17 +50,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: sin memoria\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: no se puede actualizar el fichero %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: directorio home «%s» inválido\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
@@ -69,57 +66,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: no se puede crear el directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: aviso: no se puede eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: aviso: no se puede eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: renombra: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: aviso: no se puede eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: no se puede crear el directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: aviso: no se puede eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: no se puede actualizar el fichero %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: no se puede actualizar el fichero oculto (shadow)\n"
 
@@ -130,12 +116,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: renombra: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: no se puede abrir el fichero %s\n"
 
@@ -178,17 +162,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Incapaz de cambiar tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: campos demasiado largos\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -222,8 +203,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -240,8 +221,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -298,7 +279,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Contraseña cambiada."
 
@@ -342,30 +322,10 @@ msgid "malloc(%d) failed\n"
 msgstr "falló malloc(%d)\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "No\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -479,12 +439,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: Autenticación PAM fallida\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: no se pueden bloquear los ficheros, pruebe de nuevo más tarde\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: no se puede abrir el fichero %s\n"
 
@@ -493,7 +451,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: fallo en la llamada a fork: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
 
@@ -535,7 +492,6 @@ msgid "Full Name"
 msgstr "Nombre completo"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -579,7 +535,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: teléfono de casa inválido: «%s»\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: «%s» contiene caracteres ilegales\n"
 
@@ -655,12 +610,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: línea %d: falta la nueva contraseña\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: el grupo %s no existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: línea %d: no se puede actualizar la entrada\n"
 
@@ -669,7 +622,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: error detectado, cambios ignorados\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -721,7 +673,6 @@ msgid "Login Shell"
 msgstr "Shell de acceso"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "No debe cambiar la shell para %s.\n"
 
@@ -734,17 +685,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: entrada inválida: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s no es una shell válida.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: el usuario %s no existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: aviso: %s no pertenece a %s\n"
 
@@ -785,7 +733,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Usuario     Fallos Máximo Último                   Activo\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr "[faltan %lds]"
 
@@ -810,7 +757,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Usuario desconocido: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: no se puede abrir el fichero %s\n"
 
@@ -819,7 +765,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -848,12 +793,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "No puede cambiarse la contraseña para %s.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "No puede cambiarse la contraseña para %s.\n"
 
@@ -862,7 +805,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: se requieren contraseñas de grupo ocultas (shadow) para -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: el grupo %s no existe\n"
 
@@ -904,7 +846,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: No es una tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -937,7 +878,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s no es un nombre de grupo válido\n"
 
@@ -950,7 +890,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K requiere NOMBRE=VALOR\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: el grupo %s existe\n"
 
@@ -962,7 +901,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Modo de uso: groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
@@ -971,12 +909,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: no se pudo cambiar el usuario «%s» en el cliente NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: el grupo %s no existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: el grupo «%s» es un grupo NIS.\n"
 
@@ -985,7 +921,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s es el maestro NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: el usuario %s es un usuario NIS\n"
 
@@ -994,7 +929,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: sin memoria en update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1090,7 +1024,6 @@ msgid "invalid group name '%s'\n"
 msgstr "nombre de grupo «%s» inválido\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "nombre de grupo «%s» inválido\n"
 
@@ -1107,7 +1040,6 @@ msgid "no matching group file entry in %
 msgstr "no hay entradas coincidentes en el fichero de grupos en «%s»\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "¿añadir grupo «%s» a «%s»?"
 
@@ -1143,17 +1075,14 @@ msgid "%s: no changes\n"
 msgstr "%s: sin cambios\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Modo de uso: groupdel grupo\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Modo de uso: groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: no se puede actualizar el fichero %s\n"
 
@@ -1243,9 +1172,6 @@ msgstr ""
 "[Desconexión evitada -- acceso del superusuario permitido.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1272,7 +1198,6 @@ msgid "login: "
 msgstr "nombre: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Número de intentos máximo excedido (%d)\n"
 
@@ -1321,7 +1246,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Modo de uso: id\n"
 
@@ -1358,7 +1282,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: el grupo %s no existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: nombre de usuario `%s' inválido\n"
 
@@ -1391,12 +1314,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: línea %d: no se puede actualizar la contraseña\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: línea %d: falló mkdir\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr ""
 "%s: línea %d: falló chown\n"
@@ -1527,17 +1448,14 @@ msgid "The password for %s is unchanged.
 msgstr "La contraseña para %s no se ha modificado.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Contraseña cambiada."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Aviso de caducidad de la contraseña"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Modo de uso: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1546,7 +1464,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1565,42 +1482,34 @@ msgid "invalid user name '%s'\n"
 msgstr "nombre de usuario '%s' inválido\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "nombre de usuario '%s' inválido\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "usuario %s: no existe el grupo %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuario %s: el directorio %s no existe\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuario %s: el programa %s no existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: no se puede crear el directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: no se puede crear el directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: no se puede crear el directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: no se puede bloquear el fichero %s\n"
 
@@ -1629,17 +1538,14 @@ msgstr ""
 "usuario %s: el último cambio de la contraseña se produjo en el futuro\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: no se puede abrir el fichero %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Modo de uso: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: no se puede reescribir el fichero\n"
 
@@ -1648,7 +1554,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Modo de uso: id\n"
 
@@ -1668,7 +1573,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: no se puede bloquear el fichero %s\n"
 
@@ -1745,12 +1649,10 @@ msgstr ""
 "(Ignorado)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: Autenticación PAM fallida\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "No está autorizado a usar su %s\n"
 
@@ -1797,14 +1699,12 @@ msgstr ""
 "%s: no se puede abrir un nuevo fichero de preferencias predeterminadas\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr ""
 "%s: línea %d: falló chown\n"
 "\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: renombra: %s"
 
@@ -1817,7 +1717,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: demasiados grupos especificados (máx de %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1969,7 +1868,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Estableciendo los permisos del buzón de correo"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: el usuario %s existe\n"
 
@@ -1984,12 +1882,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: no se puede crear %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: el UID %u no es único\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: no se puede crear el directorio %s\n"
 
@@ -2025,15 +1921,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: no se puede eliminar el grupo %s, que es un prupo primario\n"
 "para otro usuario.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: aviso: no se puede eliminar "
 
@@ -2046,17 +1939,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
@@ -2069,7 +1959,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: el usuario %s está actualmente dentro del sistema\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: directorio home «%s» inválido\n"
 
@@ -2152,7 +2041,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: el usuario %s existe\n"
 
@@ -2183,7 +2071,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: no se puede crear el directorio %s\n"
 
@@ -2222,7 +2109,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2245,31 +2131,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s no se cambia\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "falló el cambio de nombre del buzón de correo"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "No se puede bloquear el fichero"
 
@@ -2277,7 +2156,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
 
@@ -2292,22 +2170,18 @@ msgid "failed to open scratch file"
 msgstr "%s: incapaz de abrir el fichero de grupos\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: campos demasiado largos\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "falló el cambio de nombre del buzón de correo"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "falló el cambio de propietario del buzón de correo"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "falló el cambio de nombre del buzón de correo"
 
@@ -2316,10 +2190,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: no se puede restaurar %s: %s (sus cambios están en %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: directorio base «%s» inválido\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s no es una shell válida.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Modo de uso: %s [entrada]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: no se puede crear %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: no se puede chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Modo de uso: vipw [opciones]\n"
+"\n"
+"Opciones:\n"
+"  -g, --group                   edita la base de datos con los grupos\n"
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+"  -p, --passwd                  edita la base de datos con las contraseñas\n"
+"  -q, --quiet                   modo silencioso\n"
+"  -s, --shadow                  edita la base de datos shadow o gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2355,20 +2310,6 @@ msgstr "%s: directorio base «%s» invá
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Modo de uso: %s [entrada]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: no se puede crear %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: no se puede chown %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/eu.po 1:4.1.4.2+svn3283-2ubuntu1/po/eu.po
--- 1:4.1.4.2+svn3283-2/po/eu.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/eu.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "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"
 
@@ -54,17 +54,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: memoriarik ez\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: ezin da %s ezabatu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s home directory (%s) not found\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: %s etxe-direktorioa (%s) ez dago\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: ezin da '%s' sarrera %s-tik kendu\n"
 
@@ -73,57 +70,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: abisua: ezin da %s ezabatu: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: berrizendatu: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: ezin da %s direktorioa %s gisa izenez aldatu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: ezin da %s direktorioa %s gisa izenez aldatu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: abisua: ezin da %s ezabatu: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: ezin da %s ezabatu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: (line %d, user %s) password not changed\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: `(%d lerroa, %s erabiltzailea) pasahitza ez da aldatu\n"
 
@@ -134,12 +120,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: berrizendatu: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: ezin da %s ireki\n"
 
@@ -190,7 +174,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: huts %s desblokeatzean\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -224,12 +207,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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"
@@ -244,8 +226,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -654,7 +636,6 @@ msgstr ""
 "Aukerak:\n"
 
 #, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
 msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
 msgstr "  -c, --crypt-method            zifratze metodoa (%s-etako bat)\n"
 
@@ -711,17 +692,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: baliogabeko sarrera: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s shell baliogabea da.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: '%s' erabiltzailea ez da existitzen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: abisua: %s ez dago %s(r)en jabegoan\n"
 
@@ -729,7 +707,6 @@ 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"
@@ -744,12 +721,10 @@ msgid ""
 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"
@@ -802,10 +777,6 @@ msgid "faillog: Cannot get the size of %
 msgstr "huts-erregistroa: Ezinda %s tamaina eskuratu: %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -816,7 +787,6 @@ msgstr ""
 "Aukerak:\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
@@ -827,7 +797,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
@@ -836,10 +805,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -849,7 +814,6 @@ msgstr ""
 "-A eta -M auekrekin kenduta, aukerak ezin dira nahastu.\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Aukera hauek ezin dira nahastu.\n"
 
@@ -902,10 +866,6 @@ 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: %s [options] GROUP\n"
 "\n"
@@ -916,9 +876,6 @@ msgstr ""
 "Aukerak:\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"
@@ -928,7 +885,6 @@ msgstr ""
 "                                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"
 
@@ -936,9 +892,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -952,7 +905,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -r, --system                  create a system account\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
@@ -1008,10 +960,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: memoriarik ez. Ezin da %s eguneratu.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1022,9 +970,6 @@ msgstr ""
 "Aukerak:\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1040,7 +985,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
@@ -1051,12 +995,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --purge                   purge all members from the group\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -l, --list                    list the members of the group\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
@@ -1069,7 +1011,6 @@ msgid "%s: only root can use the -g/--gr
 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"
 
@@ -1565,7 +1506,6 @@ msgid "%s: password expiry information c
 msgstr "%s: pasahitz iraungitzea informazioa aldatua.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n"
 
@@ -1574,7 +1514,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1609,22 +1548,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "'%s' erabiltzailea: '%s' programa ez da existitzen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: ezin da %s ireki\n"
 
@@ -1687,7 +1622,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
 
@@ -1827,10 +1761,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: talde gehiegi zehaztu dira (geh. %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1841,9 +1771,6 @@ msgstr ""
 "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"
@@ -1872,9 +1799,6 @@ msgid ""
 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"
@@ -1883,9 +1807,6 @@ msgstr ""
 "                                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"
@@ -1898,9 +1819,6 @@ msgid ""
 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"
@@ -1909,7 +1827,6 @@ msgstr ""
 "                                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"
 
@@ -1918,9 +1835,6 @@ msgid ""
 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"
@@ -1929,9 +1843,6 @@ msgstr ""
 "                                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"
@@ -1943,12 +1854,10 @@ msgid "  -p, --password PASSWORD       e
 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"
 
@@ -2049,7 +1958,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: %lu UIDa ez da bakarra\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
@@ -2103,17 +2011,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: huts baimenak kentzerakoan (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: ezin da '%s' sarrera %s-tik kendu\n"
 
@@ -2242,7 +2147,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
@@ -2287,10 +2191,6 @@ msgstr ""
 "Mesedez erabili '%s' komandoa horretarako.\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2301,28 +2201,23 @@ msgstr ""
 "Aukerak:\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -g, --group                   edit group database\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
 #, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
@@ -2335,12 +2230,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s ez da aldatu\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "huts egin du postontzia izenez aldatzean"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: huts baimenak kentzerakoan (%s)\n"
 
@@ -2351,7 +2244,6 @@ msgid "setfscreatecon () failed"
 msgstr "setfscreatecon () -ek huts egin du"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: huts baimenak kentzerakoan (%s)\n"
 
@@ -2362,27 +2254,22 @@ msgid "Couldn't make backup"
 msgstr "Ezin izan da babeskopiarik egin"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "huts egin du postontzia izenez aldatzean"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: huts %s desblokeatzean\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "huts egin du postontzia izenez aldatzean"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "huts egin du postontzia jabez aldatzean"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "huts egin du postontzia izenez aldatzean"
 
@@ -2391,10 +2278,122 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: ezin da %s leheneratu: %s (zure aldaketak %s(e)n daude)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: oinarrizko '%s' direktorio baliogabea\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s shell baliogabea da.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Erabilera: %s [aukera] TALDEA\n"
+"\n"
+"Aukerak:\n"
+"  -a, --add ERAB                Gehitu ERABiltzailea TALDEra\n"
+"  -d, --delete ERAB             kendu ERABiltzailea TALDEtik\n"
+"  -r, --remove-password         TALDEaren pasahitaz kendu\n"
+"  -R, --restrict                mugatu sarrera TALDEra bere partaideetara\n"
+"  -M, --members ERAB,...        ezarri TALDEaren partaideen zerrenda\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators ADMIN,...\n"
+"                                ezarri TALDEaren kudeatzaile zerrenda\n"
+"-A eta -M auekrekin kenduta, aukerak ezin dira nahastu.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Erabilera: groupmems [aukerak] [ekintza]\n"
+"\n"
+"Aukerak:\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"
+"  -p, --purge                   garbitu talde baten partaide guztiak\n"
+"  -l, --list                    taldearen partaideak zerrendatu\n"
+"\n"
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: ezin da %s sortu\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s:ezin da %s jabez aldatu\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Erabilera: vipw [aukerak]\n"
+"\n"
+"Aukerak:\n"
+"  -g, --group                   talde datu-basea editatu\n"
+"  -h, --help                    laguntza testu hau bistarazi eta irten\n"
+"  -p, --passwd                  pasahitz datu-basea editatu\n"
+"  -q, --quiet                   ixiltasun modua\n"
+"  -s, --shadow                  shadow edo gshadow datubasea editatu\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2429,82 +2428,6 @@ msgstr "%s: oinarrizko '%s' direktorio b
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Erabilera: %s [aukera] TALDEA\n"
-#~ "\n"
-#~ "Aukerak:\n"
-#~ "  -a, --add ERAB                Gehitu ERABiltzailea TALDEra\n"
-#~ "  -d, --delete ERAB             kendu ERABiltzailea TALDEtik\n"
-#~ "  -r, --remove-password         TALDEaren pasahitaz kendu\n"
-#~ "  -R, --restrict                mugatu sarrera TALDEra bere "
-#~ "partaideetara\n"
-#~ "  -M, --members ERAB,...        ezarri TALDEaren partaideen zerrenda\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Erabilera: groupmems [aukerak] [ekintza]\n"
-#~ "\n"
-#~ "Aukerak:\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"
-#~ "  -p, --purge                   garbitu talde baten partaide guztiak\n"
-#~ "  -l, --list                    taldearen partaideak zerrendatu\n"
-#~ "\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "Usage: %s [options]\n"
-#~| "\n"
-#~| "Options:\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr ""
-#~ "Erabilera: %s [aukerak]\n"
-#~ "\n"
-#~ "Aukerak:\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: ezin da %s sortu\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s:ezin da %s jabez aldatu\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/fi.po 1:4.1.4.2+svn3283-2ubuntu1/po/fi.po
--- 1:4.1.4.2+svn3283-2/po/fi.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/fi.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -48,17 +48,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: muisti loppui\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi päivittää\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: virheellinen kotihakemisto \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
@@ -67,58 +64,47 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: varoitus: ei voi poistaa tiedostoa "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: varoitus: ei voi poistaa tiedostoa "
 
 # Kannattaako tuota kääntää, siinä viitataan rename()-funktioon...
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: varoitus: ei voi poistaa tiedostoa "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: varoitus: ei voi poistaa tiedostoa "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi päivittää\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: varjotiedostoa ei voi päivittää\n"
 
@@ -130,12 +116,10 @@ msgstr ""
 
 # Kannattaako tuota kääntää, siinä viitataan rename()-funktioon...
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
@@ -178,17 +162,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Päätettä %s ei voi vaihtaa"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: kentät liian pitkiä\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -222,8 +203,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -240,8 +221,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -298,7 +279,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Salasana vaihdettu."
 
@@ -342,30 +322,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) epäonnistui\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Ei\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -480,12 +440,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-todennus epäonnistui\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: tiedostoja ei voi lukita, yritä myöhemmin uudelleen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
@@ -494,7 +452,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: fork-kutsu epäonnistui: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
@@ -534,7 +491,6 @@ msgid "Full Name"
 msgstr "Koko nimi"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -578,7 +534,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: virheellinen kotipuhelin: \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: \"%s\" sisältää ei-sallittuja merkkejä\n"
 
@@ -652,12 +607,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: rivi %d: uusi salasana puuttuu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: ryhmää %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: rivi %d: tietuetta ei voi päivittää\n"
 
@@ -666,7 +619,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: virhe havaittu, muutokset ohitetaan\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -716,7 +668,6 @@ msgid "Login Shell"
 msgstr "Sisäänkirjautumiskuori"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Et voi muuttaa käyttäjän %s kuorta.\n"
 
@@ -729,17 +680,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Virheellinen tietue: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s on virheellinen kuori.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: varoitus: tiedoston %s omistaja ei ole %s\n"
 
@@ -780,7 +728,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Tunnus      Epäonn.  Enint.  Edellinen                Päätteellä\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds jäljellä]"
 
@@ -805,7 +752,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Tuntematon käyttäjä: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
@@ -814,7 +760,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -843,12 +788,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Käyttäjän %s salasanaa ei voi vaihtaa.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Käyttäjän %s salasanaa ei voi vaihtaa.\n"
 
@@ -857,7 +800,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: varjoryhmäsalanat vaaditaan valitsimelle -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: ryhmää %s ei ole olemassa\n"
 
@@ -899,7 +841,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Ei ole pääte\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -932,7 +873,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s ei ole kelpo ryhmänimi\n"
 
@@ -945,12 +885,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K vaatii AVAIN=ARVO\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: ryhmä %s on olemassa\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Jäsen on jo olemassa\n"
 
@@ -958,7 +896,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Käyttö: groupdel ryhmä\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
@@ -967,12 +904,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: ei voi vaihtaa käyttäjää \"%s\" NIS-asiakkaalla.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: ryhmää %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: ryhmä \"%s\" on NIS-ryhmä.\n"
 
@@ -981,7 +916,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: isäntä %s on NIS-palvelin\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: käyttäjä %s on NIS-käyttäjä\n"
 
@@ -990,7 +924,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: muisti loppui funktiossa update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1086,7 +1019,6 @@ msgid "invalid group name '%s'\n"
 msgstr "virheellinen ryhmänimi \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "virheellinen ryhmänimi \"%s\"\n"
 
@@ -1103,7 +1035,6 @@ msgid "no matching group file entry in %
 msgstr "ei täsmäävää ryhmätiedostotietuetta tiedostossa %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "lisää ryhmä \"%s\" tiedostoon %s?"
 
@@ -1139,17 +1070,14 @@ msgid "%s: no changes\n"
 msgstr "%s: ei muutoksia\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Käyttö: groupdel ryhmä\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Käyttö: groupdel ryhmä\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: tiedostoa %s ei voi päivittää\n"
 
@@ -1239,9 +1167,6 @@ msgstr ""
 "[Yhteydenkatkaisu ohitettu -- pääkäyttäjän kirjautuminen sallittu.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1268,7 +1193,6 @@ msgid "login: "
 msgstr "tunnus: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Suurin sallittu määrä yrityksiä ylitetty (%d)\n"
 
@@ -1318,7 +1242,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Käyttö: id\n"
 
@@ -1355,7 +1278,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: ryhmää %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
 
@@ -1388,12 +1310,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: rivi %d: salasanaa ei voi päivittää\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: rivi %d: mkdir epäonnistui\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: rivi %d: chown epäonnistui\n"
 
@@ -1402,33 +1322,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: rivi %d: tietuetta ei voi päivittää\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1548,17 +1441,14 @@ msgid "The password for %s is unchanged.
 msgstr "Käyttäjän %s salasanaa ei vaihdettu.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Salasana vaihdettu."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Salasanan vanhenemisvaroitus"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Käyttö: %s [-q] [-r] [-s] [passwd [varjo]]\n"
 
@@ -1567,7 +1457,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1586,42 +1475,34 @@ msgid "invalid user name '%s'\n"
 msgstr "virheellinen käyttäjätunnus \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "virheellinen käyttäjätunnus \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "käyttäjä %s: ei ryhmää %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "käyttäjä %s: hakemistoa %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "käyttäjä %s: kuorta %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
@@ -1649,17 +1530,14 @@ msgid "user %s: last password change in 
 msgstr "käyttäjä %s: viimeisin salasanan vaihto tapahtunut tulevaisuudessa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Käyttö: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: tiedostoa ei voi uudelleenkirjoittaa\n"
 
@@ -1668,7 +1546,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Käyttö: id\n"
 
@@ -1688,7 +1565,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
@@ -1764,12 +1640,10 @@ msgstr ""
 "(Ohitettu)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM-todennus epäonnistui\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Sinulla ei ole lupaa asettua käyttäjäksi %s\n"
 
@@ -1814,13 +1688,11 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: uutta defaults-tiedostoa ei voi avata\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: rivi %d: chown epäonnistui\n"
 
 # Kannattaako tuota kääntää, siinä viitataan rename()-funktioon...
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: rename: %s"
 
@@ -1833,7 +1705,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: liian monta ryhmää määritelty (korkeintaan %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1985,7 +1856,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Asetetaan postilaatikkotiedoston oikeudet"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: käyttäjä %s on olemassa\n"
 
@@ -2001,12 +1871,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: tiedostoa %s ei voi luoda\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u ei ole ainutkertainen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
@@ -2043,15 +1911,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Ryhmää %s ei voi poistaa, koska se on toisen käyttäjän ensisijainen "
 "ryhmä.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: varoitus: ei voi poistaa tiedostoa "
 
@@ -2064,17 +1929,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
@@ -2087,7 +1949,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: käyttäjä %s on nyt sisäänkirjautuneena\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: virheellinen kotihakemisto \"%s\"\n"
 
@@ -2167,7 +2028,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: käyttäjä %s on olemassa\n"
 
@@ -2184,7 +2044,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Jäsen on jo olemassa\n"
 
@@ -2199,7 +2058,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
@@ -2238,7 +2096,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2261,31 +2118,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: tiedostoa %s ei muutettu\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "postilaatikon uudelleennimeäminen epäonnistui"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Tiedostoa ei voi lukita"
 
@@ -2293,7 +2143,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
@@ -2304,27 +2153,22 @@ msgid "Couldn't make backup"
 msgstr "Tiedostoa ei voi varmuuskopioida"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Ryhmätiedostoa ei voi avata\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: kentät liian pitkiä\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "postilaatikon uudelleennimeäminen epäonnistui"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "postilaatikon omistajan vaihtaminen epäonnistui"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "postilaatikon uudelleennimeäminen epäonnistui"
 
@@ -2334,10 +2178,91 @@ msgstr ""
 "%s: tiedostoa %s ei voi palauttaa: %s (muutoksesi ovat tiedostossa %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: virheellinen perushakemisto \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s on virheellinen kuori.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Käyttö: %s [syöte]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: tiedostoa %s ei voi luoda\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: tiedoston %s omistajaa ei voi asettaa\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Käyttö: vipw [valitsimet]\n"
+"\n"
+"Valitsimet:\n"
+"  -g, --group                   Muokkaa ryhmätietokantaa\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -p, --passwd                  Muokkaa passwd-tietokantaa\n"
+"  -q, --quiet                   Hiljainen toiminta\n"
+"  -s, --shadow                  Muokkaa shadow- tai gshadow-tietokantaa\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2372,20 +2297,6 @@ msgstr "%s: virheellinen perushakemisto 
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Käyttö: %s [syöte]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: tiedostoa %s ei voi luoda\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: tiedoston %s omistajaa ei voi asettaa\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/fr.po 1:4.1.4.2+svn3283-2ubuntu1/po/fr.po
--- 1:4.1.4.2+svn3283-2/po/fr.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/fr.po	2010-11-24 14:47:24.000000000 +0000
@@ -15,10 +15,10 @@ msgstr ""
 "PO-Revision-Date: 2009-08-14 23:11+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Lokalize 0.3\n"
 
@@ -61,17 +61,14 @@ msgid "%s: out of memory\n"
 msgstr "%s : plus de mémoire\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s : impossible de supprimer %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s home directory (%s) not found\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s : le répertoire personnel de %s (%s) n'a pas été trouvé\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s : impossible de supprimer l'entrée « %s » de %s\n"
 
@@ -80,59 +77,48 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog : impossible d'obtenir la talle de %s : %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s : attention : impossible de supprimer %s : %s\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s : renomme : %s : %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s : impossible de renommer le répertoire %s en %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s : impossible de renommer le répertoire %s en %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s : attention : impossible de supprimer %s : %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog : impossible d'obtenir la talle de %s : %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s : impossible de supprimer %s\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: (line %d, user %s) password not changed\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s : (ligne %d, utilisateur %s) mot de passe non modifié\n"
 
@@ -144,12 +130,10 @@ msgstr ""
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s : renomme : %s : %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s : impossible d'ouvrir %s\n"
 
@@ -201,7 +185,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s : échec du déverrouillage de %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s : %s\n"
 
@@ -235,8 +218,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 # , c-format
@@ -258,8 +241,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -459,8 +442,8 @@ msgstr ""
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
-"Nombre de jours d'avertissement avant la fin de validité du mot de passe\t: "
-"%ld\n"
+"Nombre de jours d'avertissement avant la fin de validité du mot de passe\t: %"
+"ld\n"
 
 #, c-format
 msgid "%s: invalid date '%s'\n"
@@ -684,7 +667,6 @@ msgstr ""
 "Options:\n"
 
 #, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
 msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
 msgstr ""
 "  -c, --crypt-method            méthode de chiffrement\n"
@@ -746,17 +728,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s : entrée non valable : %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s : %s n'est pas un interpréteur de commandes valable.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s : l'utilisateur %s n'existe pas\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s : attention : %s n'appartient pas à %s\n"
 
@@ -770,9 +749,6 @@ msgstr ""
 "                                pour tous les utilisateurs\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -l, --lock-time SEC           after failed login lock account for SEC "
-#| "seconds\n"
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
@@ -865,10 +841,6 @@ msgstr "faillog : impossible d'obtenir 
 
 # , c-format
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] GROUP\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -879,7 +851,6 @@ msgstr ""
 "Options:\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr ""
 "  -g, --gid GID                 modifier l'identifiant de groupe en\n"
@@ -892,8 +863,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr ""
@@ -904,10 +873,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -920,7 +885,6 @@ msgstr ""
 
 #
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Les options ne peuvent pas être combinées.\n"
 
@@ -1076,10 +1040,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s : mémoire insuffisante. Impossible de mettre à jour %s.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1090,10 +1050,6 @@ msgstr ""
 "Options:\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1109,7 +1065,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr ""
@@ -1122,14 +1077,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -p, --purge                   purge all members from the group\n"
 msgstr ""
 "  -g, --gid GID                 utiliser cet identifiant (GID) pour le "
 "nouveau groupe\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -l, --list                    list the members of the group\n"
 msgstr ""
 "  -g, --gid GID                 utiliser cet identifiant (GID) pour le "
@@ -1665,7 +1618,6 @@ msgid "%s: password expiry information c
 msgstr "%s : expiration du mot de passe modifiée.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Syntaxe : %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1709,22 +1661,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "utilisateur %s : le programme « %s » n'existe pas\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s : impossible d'ouvrir %s\n"
 
@@ -1790,7 +1738,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s : Impossible de déterminer votre nom d'utilisateur.\n"
 
@@ -1937,10 +1884,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s : trop de groupes spécifiés (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -2051,8 +1994,7 @@ msgstr ""
 msgid "  -u, --uid UID                 user ID of the new account\n"
 msgstr ""
 "  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
-"                                « UID » pour le compte du nouvel "
-"utilisateur\n"
+"                                « UID » pour le compte du nouvel utilisateur\n"
 
 msgid ""
 "  -U, --user-group              create a group with the same name as the "
@@ -2158,7 +2100,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s : l'identifiant d'utilisateur (UID) %lu n'est pas unique\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
@@ -2213,17 +2154,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog : impossible d'obtenir la talle de %s : %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s : impossible de supprimer l'entrée « %s » de %s\n"
 
@@ -2360,7 +2298,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
@@ -2406,10 +2343,6 @@ msgstr ""
 "Veuillez utiliser la commande « %s » pour le faire.\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2420,27 +2353,22 @@ msgstr ""
 "Options:\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -g, --group                   edit group database\n"
 msgstr ""
 "  -g, --gid GID                 modifier l'identifiant de groupe en\n"
 "                                utilisant GID comme valeur\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -r, --system                  créer des comptes système\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr ""
 "  -g, --gid GID                 utiliser cet identifiant (GID) pour le "
 "nouveau groupe\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -a, --all                     afficher les enregistrements d'échec "
@@ -2448,12 +2376,10 @@ msgstr ""
 "                                pour tous les utilisateurs\n"
 
 #, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr ""
 "  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
-"                                « UID » pour le compte du nouvel "
-"utilisateur\n"
+"                                « UID » pour le compte du nouvel utilisateur\n"
 
 #, c-format
 msgid "%s: failed to remove %s\n"
@@ -2464,12 +2390,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s : %s est inchangé\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "échec du changement de nom de la boîte à lettres"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
 
@@ -2480,7 +2404,6 @@ msgid "setfscreatecon () failed"
 msgstr "échec de setfscreatecon ()"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
 
@@ -2491,27 +2414,22 @@ msgid "Couldn't make backup"
 msgstr "Impossible d'effectuer une sauvegarde"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "échec du changement de nom de la boîte à lettres"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s : échec du déverrouillage de %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "échec du changement de nom de la boîte à lettres"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "échec du changement de propriétaire de la boîte à lettres"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "échec du changement de nom de la boîte à lettres"
 
@@ -2521,10 +2439,130 @@ msgstr ""
 "%s : impossible de restaurer %s : %s (vos modifications sont dans %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s : répertoire de base non valable « %s »\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s : %s  n'est pas un interpréteur de commandes valable.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Syntaxe : %s [option] GROUPE\n"
+"\n"
+"Options :\n"
+"  -a, --add UTILISATEUR           ajouter l'UTILISATEUR au GROUPE\n"
+"  -d, --delete UTILISATEUR        supprimer l'UTILISATEUR du GROUPE\n"
+"  -r, --remove-password           supprimer le mot de passe du GROUPE\n"
+"  -R, --restrict                  restreindre à ses membres l'accès au\n"
+"                                  GROUPE\n"
+"  -M, --members UTILISATEUR, ...  définir la liste des membres du GROUPE\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators ADMIN,...\n"
+"                                définir la liste des administrateurs "
+"du                                 GROUPE\n"
+"À l'exception des options A et M, les options ne peuvent pas être "
+"combinées.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Syntaxe : groupmems [options] [action]\n"
+"\n"
+"Options :\n"
+"  -g, --group nom-du-groupe     modifier le nom-du-groupe plutôt que les\n"
+"                                utilisateurs du groupe\n"
+"                                (administrateur uniquement)\n"
+"\n"
+"Actions :\n"
+"  -a, --add username            ajouter un nom d'utilisateur aux membres\n"
+"                                du groupe\n"
+"  -d, --delete username         supprimer un nom d'utilisateur aux membres\n"
+"                                du groupe\n"
+"  -p, --purge                   purger tous les membres du groupe\n"
+"  -l, --list                    afficher la liste des membres du groupe\n"
+"\n"
+
+# , c-format
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Syntaxe : useradd [options] IDENTIFIANT\n"
+"\n"
+"Options:\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s : impossible de créer %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s : impossible de changer le propriétaire de %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Syntaxe : vipw [options]\n"
+"\n"
+"Options :\n"
+"  -g, --group                   modifier la base de données des groupes\n"
+"                                (/etc/group)\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -p, --passwd                  modifier la base de données des comptes\n"
+"                                (/etc/passwd)\n"
+"  -q, --quiet                   mode silencieux\n"
+"  -s, --shadow                  modifier la base de données des mots de\n"
+"                                passe cachés (« shadow passwords ») :\n"
+"                                shadow ou gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2562,79 +2600,6 @@ msgstr "%s : répertoire de base non va
 #~ "                                shadow ou gshadow\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Syntaxe : %s [option] GROUPE\n"
-#~ "\n"
-#~ "Options :\n"
-#~ "  -a, --add UTILISATEUR           ajouter l'UTILISATEUR au GROUPE\n"
-#~ "  -d, --delete UTILISATEUR        supprimer l'UTILISATEUR du GROUPE\n"
-#~ "  -r, --remove-password           supprimer le mot de passe du GROUPE\n"
-#~ "  -R, --restrict                  restreindre à ses membres l'accès au\n"
-#~ "                                  GROUPE\n"
-#~ "  -M, --members UTILISATEUR, ...  définir la liste des membres du GROUPE\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Syntaxe : groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options :\n"
-#~ "  -g, --group nom-du-groupe     modifier le nom-du-groupe plutôt que les\n"
-#~ "                                utilisateurs du groupe\n"
-#~ "                                (administrateur uniquement)\n"
-#~ "\n"
-#~ "Actions :\n"
-#~ "  -a, --add username            ajouter un nom d'utilisateur aux membres\n"
-#~ "                                du groupe\n"
-#~ "  -d, --delete username         supprimer un nom d'utilisateur aux "
-#~ "membres\n"
-#~ "                                du groupe\n"
-#~ "  -p, --purge                   purger tous les membres du groupe\n"
-#~ "  -l, --list                    afficher la liste des membres du groupe\n"
-#~ "\n"
-
-# , c-format
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr ""
-#~ "Syntaxe : useradd [options] IDENTIFIANT\n"
-#~ "\n"
-#~ "Options:\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s : impossible de créer %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s : impossible de changer le propriétaire de %s\n"
-
 #
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/gl.po 1:4.1.4.2+svn3283-2ubuntu1/po/gl.po
--- 1:4.1.4.2+svn3283-2/po/gl.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/gl.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #, c-format
@@ -50,17 +50,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: memoria esgotada\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: non se pode actualizar o ficheiro %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: directorio inicial \"%s\" non válido\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
@@ -69,57 +66,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: non se pode crear o directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: aviso: non se pode eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: aviso: non se pode eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: aviso: non se pode eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: non se pode crear o directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: aviso: non se pode eliminar "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: non se pode actualizar o ficheiro %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: non se pode actualizar o ficheiro shadow\n"
 
@@ -130,12 +116,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: non se pode abrir o ficheiro %s\n"
 
@@ -178,17 +162,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Non se puido cambiar o tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: campos longos de máis\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -222,8 +203,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -240,8 +221,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -298,7 +279,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Cambiouse o contrasinal."
 
@@ -342,7 +322,6 @@ msgid "malloc(%d) failed\n"
 msgstr "A chamada a malloc(%d) fallou\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Non\n"
 
@@ -459,12 +438,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: a autenticación con PAM fallou\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: non se pode bloquear ficheiros, volva tentalo despois\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: non se pode abrir o ficheiro %s\n"
 
@@ -473,7 +450,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: fallo ao lanzar o proceso: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
@@ -514,7 +490,6 @@ msgid "Full Name"
 msgstr "Nome completo"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -558,7 +533,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: teléfono da casa non válido: \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: \"%s\" contén caracteres non válidos\n"
 
@@ -633,12 +607,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: liña %d: falla o novo contrasinal\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: o grupo %s non existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: liña %d: non se pode actualizar a entrada\n"
 
@@ -647,7 +619,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: detectouse un erro, ignóranse os cambios\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -697,7 +668,6 @@ msgid "Login Shell"
 msgstr "Intérprete de ordes"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Non pode cambiar o intérprete de ordes de %s.\n"
 
@@ -710,17 +680,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Entrada non válida: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s non é un intérprete de ordes válido.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: o usuario %s non existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: aviso: %s non pertence a %s\n"
 
@@ -761,7 +728,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Usuario     Fallos   Máximo  Último                   O\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [fallan %lds]"
 
@@ -786,7 +752,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Usuario descoñecido: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: non se pode abrir o ficheiro %s\n"
 
@@ -795,7 +760,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -824,12 +788,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Non se pode cambiar o contrasinal de %s.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Non se pode cambiar o contrasinal de %s.\n"
 
@@ -838,7 +800,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: precísase de contrasinais de grupo shadow para -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: o grupo %s non existe\n"
 
@@ -880,7 +841,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Non é un tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -913,7 +873,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s non é un nome de grupo válido\n"
 
@@ -926,12 +885,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K precisa de CLAVE=VALOR\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: o grupo %s existe\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "O membro xa existe\n"
 
@@ -939,7 +896,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Emprego: groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
@@ -948,12 +904,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: non se pode cambiar o usuario \"%s\" no cliente NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: o grupo %s non existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: o grupo \"%s\" é un grupo NIS.\n"
 
@@ -962,7 +916,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s é o mestre NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: o usuario %s é un usuario NIS\n"
 
@@ -971,7 +924,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: esgotouse a memoria en update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1067,7 +1019,6 @@ msgid "invalid group name '%s'\n"
 msgstr "nome de grupo \"%s\" non válido\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "nome de grupo \"%s\" non válido\n"
 
@@ -1084,7 +1035,6 @@ msgid "no matching group file entry in %
 msgstr "non hai unha entrada do ficheiro de grupos que coincida en %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "¿engadir o grupo \"%s\" en %s? "
 
@@ -1120,17 +1070,14 @@ msgid "%s: no changes\n"
 msgstr "%s: non hai cambios\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Emprego: groupdel grupo\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Emprego: groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: non se pode actualizar o ficheiro %s\n"
 
@@ -1221,9 +1168,6 @@ msgstr ""
 "[Omitida a desconexión -- permítese a entrada coma root.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1252,7 +1196,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Superouse o número máximo de intentos (%d)\n"
 
@@ -1301,7 +1244,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Emprego: id\n"
 
@@ -1338,7 +1280,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: o grupo %s non existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: nome de usuario \"%s\" non válido\n"
 
@@ -1371,12 +1312,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: liña %d: non se pode actualizar o contrasinal\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: liña %d: a chamada a mkdir fallou\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: liña %d: a chamada a chown fallou\n"
 
@@ -1503,17 +1442,14 @@ msgid "The password for %s is unchanged.
 msgstr "Non se cambiou o contrasinal de %s\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Cambiouse o contrasinal."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Aviso de caducidade de contrasinal"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1522,7 +1458,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1541,42 +1476,34 @@ msgid "invalid user name '%s'\n"
 msgstr "nome de usuario \"%s\" non válido\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "nome de usuario \"%s\" non válido\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "usuario %s: non existe o grupo %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuario %s: o directorio %s non existe\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuario %s: o programa %s non existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: non se pode crear o directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: non se pode crear o directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: non se pode crear o directorio %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: non se pode bloquear o ficheiro %s\n"
 
@@ -1604,17 +1531,14 @@ msgid "user %s: last password change in 
 msgstr "usuario %s: último cambio de contrasinal no futuro\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: non se pode abrir o ficheiro %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Emprego: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: non se pode rescribir o ficheiro\n"
 
@@ -1623,7 +1547,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Emprego: id\n"
 
@@ -1643,7 +1566,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: non se pode bloquear o ficheiro %s\n"
 
@@ -1719,12 +1641,10 @@ msgstr ""
 "(Ignórase)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: a autenticación con PAM fallou\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Non está autorizado para facer su %s\n"
 
@@ -1769,12 +1689,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: non se pode abrir o novo ficheiro de valores por defecto\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: liña %d: a chamada a chown fallou\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: rename: %s"
 
@@ -1787,7 +1705,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: especificáronse grupos de máis (máximo %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1939,7 +1856,6 @@ msgid "Setting mailbox file permissions"
 msgstr "A estabrecer os permisos do ficheiro da caixa do correo"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: o usuario %s existe\n"
 
@@ -1955,12 +1871,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: non se pode crear %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: o UID %u non é único\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: non se pode crear o directorio %s\n"
 
@@ -1996,15 +1910,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Non se pode eliminar o grupo %s, que é o grupo primario de outro "
 "usuario.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: aviso: non se pode eliminar "
 
@@ -2017,17 +1928,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
@@ -2040,7 +1948,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: o usuario %s está conectado\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: directorio inicial \"%s\" non válido\n"
 
@@ -2118,7 +2025,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: o usuario %s existe\n"
 
@@ -2135,7 +2041,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "O membro xa existe\n"
 
@@ -2150,7 +2055,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: non se pode crear o directorio %s\n"
 
@@ -2189,7 +2093,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2212,31 +2115,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s non ten cambios\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "non se puido cambiar o nome da caixa do correo"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Non se puido bloquear o ficheiro"
 
@@ -2244,7 +2140,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
@@ -2255,27 +2150,22 @@ msgid "Couldn't make backup"
 msgstr "Non se puido facer unha copia de seguridade"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Non se pode abrir o ficheiro de grupos\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: campos longos de máis\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "non se puido cambiar o nome da caixa do correo"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "non se puido cambiar o propietario da caixa do correo"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "non se puido cambiar o nome da caixa do correo"
 
@@ -2284,10 +2174,92 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: non se pode restaurar %s: %s (os seus cambios están en %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: directorio base \"%s\" non válido\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s non é un intérprete de ordes válido.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Emprego: %s [entrada]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: non se pode crear %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: non se pode cambiar o propietario de %s\n"
+
+#, fuzzy
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Emprego: vipw [opcións]\n"
+"\n"
+"Opcións:\n"
+"  -g, --group\t\tedita a base de datos de grupos\n"
+"  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
+"  -p, --passwd\t\tedita a base de datos de contrasinais\n"
+"  -q, --quiet\t\tmodo silencioso\n"
+"  -s, --shadow\t\tedita a base de datos shadow ou gshadow\n"
+"\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
@@ -2312,20 +2284,6 @@ msgstr "%s: directorio base \"%s\" non v
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Emprego: %s [entrada]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: non se pode crear %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: non se pode cambiar o propietario de %s\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/he.po 1:4.1.4.2+svn3283-2ubuntu1/po/he.po
--- 1:4.1.4.2+svn3283-2/po/he.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/he.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -106,7 +106,6 @@ msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: לא יכול לנעול קובץ צל\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: לא יכול לנעול קובץ צל\n"
 
@@ -121,7 +120,6 @@ msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't open shadow file\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: לא יכול לפתוח קובץ צל\n"
 
@@ -164,12 +162,10 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "לא יכול לשנות tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: שדות ארוכים מידי\n"
 
@@ -203,8 +199,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -221,8 +217,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -425,12 +421,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: זיהוי PAM נכשל\n"
 
 #, fuzzy, c-format
-#| msgid "Cannot lock the password file; try again later.\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "לא יכול לנעול קובץ סיסמאות; נסה שוב מאוחר יותר\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't open shadow file\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: לא יכול לפתוח קובץ צל\n"
 
@@ -619,12 +613,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: unknown user %s\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: unknown user %s\n"
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
@@ -641,7 +633,6 @@ msgid "Login Shell"
 msgstr "מעטפת כניסה למערכת"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "אינך רשאי לשנות את המעטפת בשביל %s.\n"
 
@@ -654,7 +645,6 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: רשומה לא חוקית: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s היא מעטפת לא חוקית.\n"
 
@@ -846,7 +836,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
@@ -1048,7 +1037,6 @@ msgid "%s: no changes\n"
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: grpconv\n"
 msgstr "שימוש: id\n"
 
@@ -1199,7 +1187,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "שימוש: id\n"
 
@@ -1260,7 +1247,6 @@ msgid "%s: line %d: can't create group\n
 msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: unknown user %s\n"
 msgid "%s: line %d: user '%s' does not exist in %s\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
@@ -1269,7 +1255,6 @@ msgid "%s: line %d: can't update passwor
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: missing new password\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: שורה %d: חסרה סיסמה חדשה\n"
 
@@ -1375,7 +1360,6 @@ msgid "%s: password changed.\n"
 msgstr "סיסמה: "
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "אזהרת תוקף סיסמה"
 
@@ -1436,7 +1420,6 @@ msgid "failed to create tcb directory fo
 msgstr "לא יכול לשנות ספרית שורש ל-\"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't open shadow file\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: לא יכול לפתוח קובץ צל\n"
 
@@ -1470,12 +1453,10 @@ msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "שימוש: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock shadow file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: לא יכול לנעול קובץ צל\n"
 
@@ -1484,7 +1465,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "שימוש: id\n"
 
@@ -1504,7 +1484,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
 
@@ -1566,7 +1545,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: זיהוי PAM נכשל\n"
 
@@ -2028,7 +2006,6 @@ msgid "failed to open scratch file"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: שדות ארוכים מידי\n"
 
@@ -2049,6 +2026,79 @@ msgstr ""
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "ספרית שורש לא חוקית \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s היא מעטפת לא חוקית.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr ""
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Password set to expire."
 #~ msgstr "תוקף הסיסמה שלך פג."
diff -pruN 1:4.1.4.2+svn3283-2/po/hu.po 1:4.1.4.2+svn3283-2ubuntu1/po/hu.po
--- 1:4.1.4.2+svn3283-2/po/hu.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/hu.po	2010-11-24 14:47:24.000000000 +0000
@@ -7,10 +7,10 @@ msgstr ""
 "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"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
@@ -48,17 +48,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: a memória elfogyott\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: %s fájl nem frissíthető\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: érvénytelen saját könyvtár: \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
@@ -67,57 +64,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: figyelem: nem törölhető: "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: figyelem: nem törölhető: "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: átnevezés: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: figyelem: nem törölhető: "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: figyelem: nem törölhető: "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: %s fájl nem frissíthető\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: nem tudom frissíteni a \"shadow\" fájlt\n"
 
@@ -128,12 +114,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: átnevezés: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: %s fájl nem nyitható meg\n"
 
@@ -176,17 +160,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Nem lehet a következő terminálra váltani: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: túl hosszú mezők\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -217,8 +198,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -235,8 +216,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -293,7 +274,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Jelszó módosítva."
 
@@ -337,30 +317,10 @@ msgid "malloc(%d) failed\n"
 msgstr "Sikertelen malloc(%d)\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Nem\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -476,12 +436,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM hitelesítési hiba\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: fájlok zárolása sikertelen, próbáld később\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: %s fájl nem nyitható meg\n"
 
@@ -490,7 +448,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: hiba a következő indításakor: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
@@ -532,7 +489,6 @@ msgid "Full Name"
 msgstr "TELJES Név"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -576,7 +532,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: érvénytelen otthoni telefonszám: \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: \"%s\" illegális karaktereket tartalmaz\n"
 
@@ -651,12 +606,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: %d. sor: hiányzó új jelszó\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: %s csoport nem létezik\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: %d. sor: nem tudom frissíteni a bejegyzést\n"
 
@@ -665,7 +618,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: hibákat észleltem, a változások elvetve\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -714,7 +666,6 @@ msgid "Login Shell"
 msgstr "Bejelentkező héj"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Nem módosíthatod %s parancsértelmezőjét.\n"
 
@@ -727,17 +678,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Érvénytelen bejegyzés: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s érvénytelen héj.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: %s felhasználó nem létezik\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: figyelem: %s tulajdonosa nem %s\n"
 
@@ -778,7 +726,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Név         Hibás Maximális Legutóbbi                   Ezen\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds van hátra]"
 
@@ -803,7 +750,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Ismeretlen felhasználó: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: %s fájl nem nyitható meg\n"
 
@@ -812,7 +758,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -841,12 +786,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "%s jelszava nem változtatható\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "%s jelszava nem változtatható\n"
 
@@ -855,7 +798,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: árnyék csoport jelszavak kellenek ehhez: -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: %s csoport nem létezik\n"
 
@@ -897,7 +839,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Nem tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -930,7 +871,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s rossz csoport név\n"
 
@@ -943,12 +883,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K KULCS=ÉRTÉK párost kíván\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: %s csoport létezik\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "A tag már létezik\n"
 
@@ -956,7 +894,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Használat: groupdel csoport\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
@@ -965,12 +902,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: `%s' felhasználó nem módosítható NIS kliensen.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: %s csoport nem létezik\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: a(z) \"%s\" csoport egy NIS csoport.\n"
 
@@ -979,7 +914,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s a NIS mester\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: %s egy NIS felhasználó\n"
 
@@ -988,7 +922,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: elfogyott a memória az update_group során\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1084,7 +1017,6 @@ msgid "invalid group name '%s'\n"
 msgstr "érvénytelen csoportnév: `%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "érvénytelen csoportnév: `%s'\n"
 
@@ -1101,7 +1033,6 @@ msgid "no matching group file entry in %
 msgstr "nincs megfelelő csoportfájl bejegyzés a következőben: %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "hozzáadod a(z) %s csoportot a következőhöz: %s ?"
 
@@ -1137,17 +1068,14 @@ msgid "%s: no changes\n"
 msgstr "%s: nincs változás\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Használat: groupdel csoport\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Használat: groupdel csoport\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s fájl nem frissíthető\n"
 
@@ -1238,9 +1166,6 @@ msgstr ""
 "[Leválasztás átlépve -- root bejelentkezés engedélyezett]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1269,7 +1194,6 @@ msgid "login: "
 msgstr "bejelentkezés: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Próbálkozások megengedett száma átlépve (%d)\n"
 
@@ -1318,7 +1242,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Használat: id\n"
 
@@ -1355,7 +1278,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: %s csoport nem létezik\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: érvénytelen '%s' felhasználónév\n"
 
@@ -1388,12 +1310,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: %d. sor: jelszó frissítése sikertelen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: %d. sor: mkdir sikertelen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: %d. sor: chown sikertelen\n"
 
@@ -1402,33 +1322,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: %d. sor: nem tudom frissíteni a bejegyzést\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1547,17 +1440,14 @@ msgid "The password for %s is unchanged.
 msgstr "%s jelszava változatlan.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Jelszó módosítva."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Jelszó elévülési figyelmeztetés"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Használat: %s [-q] [-r] [-s] [jelszó [árnyék]]\n"
 
@@ -1566,7 +1456,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1585,42 +1474,34 @@ msgid "invalid user name '%s'\n"
 msgstr "érvénytelen '%s' felhasználó név\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "érvénytelen '%s' felhasználó név\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "%s felhasználó: nincs %u csoport\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "%s felhasználó: %s könyvtár nem létezik\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "%s felhasználó: %s program nem létezik\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: %s fájl nem zárolható\n"
 
@@ -1648,17 +1529,14 @@ msgid "user %s: last password change in 
 msgstr "%s felhasználó: az utolsó jelszómódosítás időpontja a jövőben van\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: %s fájl nem nyitható meg\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Használat: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: nem tudom újraírni a fájlt\n"
 
@@ -1667,7 +1545,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Használat: id\n"
 
@@ -1687,7 +1564,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: %s fájl nem zárolható\n"
 
@@ -1764,12 +1640,10 @@ msgstr ""
 "(Átlépve)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM hitelesítési hiba\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Nem vagy jogosult ehhez: su %s\n"
 
@@ -1814,12 +1688,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: nem tudom megnyitni az új defaults fájlt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: %d. sor: chown sikertelen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: átnevezés: %s"
 
@@ -1832,7 +1704,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: túl sok csoport van megadva (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1984,7 +1855,6 @@ msgid "Setting mailbox file permissions"
 msgstr "A postafiókfájl jogosultságainak beállítása"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: %s felhasználó létezik\n"
 
@@ -2000,12 +1870,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: %s létrehozása sikertelen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u nem egyedi\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
@@ -2042,15 +1910,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Nem tudom %s csoportot törölni, ami egy másik felhasználó elsődleges "
 "csoportja.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: figyelem: nem törölhető: "
 
@@ -2063,17 +1928,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
@@ -2086,7 +1948,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: %s felhasználó most be van jelentkezve\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: érvénytelen saját könyvtár: \"%s\"\n"
 
@@ -2174,7 +2035,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: %s felhasználó létezik\n"
 
@@ -2191,7 +2051,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "A tag már létezik\n"
 
@@ -2206,7 +2065,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
@@ -2244,7 +2102,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2267,31 +2124,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s is változatlan\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "a postafiók átnevezése sikertelen"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Nem tudtam zárolni a fájlt"
 
@@ -2299,7 +2149,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
@@ -2310,27 +2159,22 @@ msgid "Couldn't make backup"
 msgstr "Nem tudtam biztonsági másolatot készíteni"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Csoport fájl megnyitása sikertelen\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: túl hosszú mezők\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "a postafiók átnevezése sikertelen"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "a postafiók tulajdonosának váltása sikertelen"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "a postafiók átnevezése sikertelen"
 
@@ -2339,10 +2183,92 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: nem tudom visszaállítani %s-t: %s (módosításaid itt vannak: %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: érvénytelen alapkönyvtár: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s érvénytelen héj.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [bemenet]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s létrehozása sikertelen\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: chown %s sikertelen\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Használat: vipw [kapcsolók]\n"
+"\n"
+"Kapcsolók:\n"
+"  -g, --group                   csoportadatbázis szerkesztése\n"
+"  -h, --help                    ezen súgószöveg megjelenítése\n"
+"  -p, --passwd                  a passwd adatbázis szerkesztése\n"
+"  -q, --quiet                   csendes mód\n"
+"  -s, --shadow                  a shadow vagy gshadow adatbázis "
+"szerkesztése\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2378,20 +2304,6 @@ msgstr "%s: érvénytelen alapkönyvtár
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Használat: %s [bemenet]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s létrehozása sikertelen\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: chown %s sikertelen\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/id.po 1:4.1.4.2+svn3283-2ubuntu1/po/id.po
--- 1:4.1.4.2+svn3283-2/po/id.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/id.po	2010-11-24 14:47:24.000000000 +0000
@@ -9,10 +9,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
@@ -48,7 +48,6 @@ msgid "%s: out of memory\n"
 msgstr "%s: kehabisan memori\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: tidak dapat memperbaharui berkas %s\n"
 
@@ -57,7 +56,6 @@ msgid "%s: %s is neither a directory, no
 msgstr "%s: direktori rumah `%s' tak sah\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
@@ -66,57 +64,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: perhatian: tak dapat menghapus "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: perhatian: tak dapat menghapus "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: ubah nama: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: perhatian: tak dapat menghapus "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: perhatian: tak dapat menghapus "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: tidak dapat memperbaharui berkas %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: tak dapat memperbaharui berkas shadow\n"
 
@@ -127,12 +114,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: ubah nama: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: tidak dapat membuka berkas %s\n"
 
@@ -175,17 +160,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Tidak dapat mengubah tts %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: ruas terlalu panjang\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -216,8 +198,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -234,8 +216,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -292,7 +274,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Password telah diubah."
 
@@ -336,30 +317,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) gagal\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Tidak\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -474,12 +435,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: Otentikasi PAM gagal\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: tidak dapat mengunci berkas-berkas, coba lagi nanti\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: tidak dapat membuka berkas %s\n"
 
@@ -488,7 +447,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: gagal membuat proses: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: gagal membuang hak (%s)\n"
 
@@ -529,7 +487,6 @@ msgid "Full Name"
 msgstr "Nama Lengkap"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -646,12 +603,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: baris %d: kata sandi baru hilang\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: grup %s tidak ada\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: baris %d: tak dapat memperbaharui entri\n"
 
@@ -660,7 +615,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: kesalahan terdeteksi, perubahan diabaikan\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -703,7 +657,6 @@ msgid "Login Shell"
 msgstr "Login Shell"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Anda tidak boleh mengubah shell untuk %s.\n"
 
@@ -716,17 +669,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Entri tidak sah: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s merupakan shell yang tidak sah.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: pengguna %s tak ada\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: perhatian %s tak dimiliki oleh %s\n"
 
@@ -767,7 +717,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Login       Gagal    Maks.   Terakhir                 Pada\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds tersisa]"
 
@@ -792,7 +741,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Pengguna tak dikenal: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: tidak dapat membuka berkas %s\n"
 
@@ -801,7 +749,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -830,12 +777,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Kata sandi untuk %s tidak dapat diganti.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Kata sandi untuk %s tidak dapat diganti.\n"
 
@@ -844,7 +789,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: kata sandi bayangan grup diperlukan untuk -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: grup %s tidak ada\n"
 
@@ -886,7 +830,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Bukan sebuah tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -919,7 +862,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: nama grup %s tidak sah\n"
 
@@ -932,7 +874,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K memerlukan NAMA=NILAI\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: grup %s telah ada\n"
 
@@ -944,7 +885,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Penggunaan: groupdel grup\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
@@ -953,7 +893,6 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: tidak dapat mengubah pengguna '%s' pada klien NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grup %s tidak ada\n"
 
@@ -966,7 +905,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s merupakan master NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: pengguna %s merupakan pengguna NIS\n"
 
@@ -975,7 +913,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: kehabisan memori saat update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1122,17 +1059,14 @@ msgid "%s: no changes\n"
 msgstr "%s: tak ada perubahan\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Penggunaan: groupdel grup\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Penggunaan: groupdel grup\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: tidak dapat memperbaharui berkas %s\n"
 
@@ -1222,9 +1156,6 @@ msgstr ""
 "[Pemutusan hubungan diabaikan -- login root diperbolehkan.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1252,7 +1183,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Jumlah pengulangan maksimum terlampaui (%d)\n"
 
@@ -1301,7 +1231,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Penggunaan: id\n"
 
@@ -1338,7 +1267,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: grup %s tidak ada\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: nama pengguna `%s' tak sah\n"
 
@@ -1371,12 +1299,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: baris %d: tak dapat memperbaharui kata sandi\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: baris %d: mkdir gagal\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: baris %d: chown gagal\n"
 
@@ -1507,17 +1433,14 @@ msgid "The password for %s is unchanged.
 msgstr "Kata sandi untuk %s tidak diubah.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Password telah diubah."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Peringatan Kadaluarsanya Kata Sandi"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1526,7 +1449,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1545,42 +1467,34 @@ msgid "invalid user name '%s'\n"
 msgstr "nama pengguna tak sah '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "nama pengguna tak sah '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "pengguna %s: tak ada grup %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "pengguna %s: tak terdapat direktori %s\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "pengguna %s: tak terdapat program %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: tidak dapat mengunci berkas %s\n"
 
@@ -1608,17 +1522,14 @@ msgid "user %s: last password change in 
 msgstr "pengguna %s: pergantian kata sandi terakhir terjadi dimasa depan\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: tidak dapat membuka berkas %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Penggunaan: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: tidak dapat menuliskan kembali berkas\n"
 
@@ -1627,7 +1538,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Penggunaan: id\n"
 
@@ -1647,7 +1557,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: tidak dapat mengunci berkas %s\n"
 
@@ -1725,12 +1634,10 @@ msgstr ""
 "(Diabaikan)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: Otentikasi PAM gagal\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Anda tak diperbolehkan untuk su %s\n"
 
@@ -1775,12 +1682,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: tak dapat membuka berkas-berkas bawaan yang baru\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: baris %d: chown gagal\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: ubah nama: %s"
 
@@ -1793,7 +1698,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: grup yang diberikan terlalu banyak (maks %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1943,7 +1847,6 @@ msgid "Setting mailbox file permissions"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: pengguna %s telah ada\n"
 
@@ -1958,12 +1861,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: tak dapat membuat %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u tidak unik\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
@@ -1991,15 +1892,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: tidak dapat menghapus grup %s yg merupakan grup utama dari pengguna "
 "lain.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: perhatian: tak dapat menghapus "
 
@@ -2012,17 +1910,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: gagal membuang hak (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
@@ -2109,7 +2004,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: pengguna %s telah ada\n"
 
@@ -2140,7 +2034,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
@@ -2178,7 +2071,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2201,31 +2093,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: gagal membuang hak (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s tidak berubah\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "gagal mengubah nama kotak-surat"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: gagal membuang hak (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Tidak dapat mengunci berkas"
 
@@ -2233,7 +2118,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: gagal membuang hak (%s)\n"
 
@@ -2248,22 +2132,18 @@ msgid "failed to open scratch file"
 msgstr "%s: tidak dapat membuka berkas grup\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: ruas terlalu panjang\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "gagal mengubah nama kotak-surat"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "gagal mengganti pemilik kotak-surat"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "gagal mengubah nama kotak-surat"
 
@@ -2275,6 +2155,88 @@ msgstr "%s: tidak dapat mengembalikan %s
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: direktori awal `%s' tak sah\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s merupakan shell yang tidak sah.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Penggunaan: %s [input]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: tak dapat membuat %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: tak dapat chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Penggunaan: vipw [pilihan-pilihan]\n"
+"\n"
+"Pilihan-pilihan:\n"
+"  -g, --group                   sunting basisdata grup\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -p, --passwd                  sunting basisdata kata sandi\n"
+"  -q, --quiet                   mode tenang\n"
+"  -s, --shadow                  sunting basisdata shadow atau gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2309,20 +2271,6 @@ msgstr "%s: direktori awal `%s' tak sah\
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Penggunaan: %s [input]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: tak dapat membuat %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: tak dapat chown %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/it.po 1:4.1.4.2+svn3283-2ubuntu1/po/it.po
--- 1:4.1.4.2+svn3283-2/po/it.po	2010-08-29 16:53:58.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/it.po	2010-11-24 14:47:24.000000000 +0000
@@ -29,10 +29,10 @@ msgstr ""
 "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"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -71,17 +71,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: memoria esaurita\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: impossibile aggiornare il file %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: directory home «%s» non valida\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
@@ -90,57 +87,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: impossibile creare la directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: attenzione: impossibile rimuovere "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: attenzione: impossibile rimuovere "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: attenzione: impossibile rimuovere "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: impossibile creare la directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: attenzione: impossibile rimuovere "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: impossibile aggiornare il file %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: impossibile aggiornare il file shadow\n"
 
@@ -151,12 +137,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: impossibile aprire il file %s\n"
 
@@ -199,17 +183,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Impossibile cambiare i permessi al device %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: lunghezza dei campi eccessiva\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -243,17 +224,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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"
 
@@ -263,17 +242,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system UID (no more available UIDs)\n"
 msgstr "Impossibile ottenere un UID univoco (nessun UID disponibile)\n"
 
 #, fuzzy, c-format
-#| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Impossibile ottenere un UID univoco (nessun UID disponibile)\n"
 
@@ -324,7 +301,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Password cambiata."
 
@@ -373,25 +349,6 @@ msgid "No"
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -505,23 +462,19 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: autenticazione PAM non riuscita\n"
 
 #, fuzzy, c-format
-#| msgid "Cannot lock the password file; try again later.\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr ""
 "Impossibile fare il lock del file delle password; riprovare più tardi.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: impossibile aprire il file %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failure forking: %s\n"
 msgid "%s: failure while writing changes to %s\n"
 msgstr "%s: impossibile eseguire fork(): %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
@@ -534,7 +487,6 @@ msgid "%s: failed to drop privileges (%s
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
@@ -564,7 +516,6 @@ msgid "Full Name"
 msgstr "Nome completo"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -608,7 +559,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: telefono di casa «%s» non valido\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: «%s» contiene caratteri non ammessi\n"
 
@@ -617,7 +567,6 @@ msgid "%s: '%s' contains illegal charact
 msgstr "%s: «%s» contiene caratteri non ammessi\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
@@ -667,7 +616,6 @@ msgstr ""
 "                                algoritmi di cifratura SHA*\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
 msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: è permesso usare il flag %s solo con il flag %s\n"
 
@@ -688,12 +636,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: riga %d: manca la nuova password\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: gruppo «%s» inesistente\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: riga %d: impossibile aggiornare la voce\n"
 
@@ -719,9 +665,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -730,12 +673,10 @@ msgstr ""
 "                                algoritmi di cifratura SHA*\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
@@ -758,7 +699,6 @@ msgid "Login Shell"
 msgstr "Shell di login"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Non è permesso cambiare la shell di %s.\n"
 
@@ -771,17 +711,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: voce «%s» non valida\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s non è una shell valida.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: l'utente %s non esiste\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: attenzione: %s non appartiene a %s\n"
 
@@ -825,7 +762,6 @@ msgstr "Login       Errori   Massimo Ult
 
 # NdT: La «s» indica l'unità di misura (secondi).
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds rimasti]"
 
@@ -847,12 +783,10 @@ msgid "faillog: Failed to set locktime f
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unknown user or range: %s\n"
 msgid "lastlog: Unknown user or range: %s\n"
 msgstr "Utente o intervallo «%s» sconosciuto\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: impossibile aprire il file %s\n"
 
@@ -889,12 +823,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "La password di %s non può essere cambiata.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "La password di %s non può essere cambiata.\n"
 
@@ -903,12 +835,10 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: l'opzione -A richiede le shadow password per i gruppi\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: gruppo «%s» inesistente\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failure forking: %s\n"
 msgid "%s: failure while closing read-only %s\n"
 msgstr "%s: impossibile eseguire fork(): %s\n"
 
@@ -938,7 +868,6 @@ msgid "Removing user %s from group %s\n"
 msgstr "Rimozione dell'utente %s dal gruppo %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' is not a member of '%s'\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
@@ -954,9 +883,6 @@ msgid ""
 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"
@@ -972,9 +898,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -991,12 +914,10 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s non è un nome di gruppo valido\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group ID '%s'\n"
 msgstr "%s: nome di gruppo «%s» non valido\n"
 
@@ -1005,12 +926,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K richiede NOME=VALORE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: gruppo «%s» già esistente\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Membro già esistente\n"
 
@@ -1018,24 +937,19 @@ msgid "Usage: groupdel group\n"
 msgstr "Uso: groupdel GRUPPO\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
 msgid "%s: cannot remove the primary group of user '%s'\n"
 msgstr ""
-"%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a "
-"%u.\n"
+"%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a %u.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppo «%s» inesistente\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: il gruppo «%s» è un gruppo NIS.\n"
 
@@ -1044,12 +958,10 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s è il NIS master\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: l'utente %s è un utente NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: Out of memory. Cannot update the group database.\n"
 msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr "%s: memoria esaurita. Impossibila aggiornare il database dei gruppi.\n"
 
@@ -1061,9 +973,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1117,7 +1026,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: nome di gruppo «%s» non valido\n"
 
@@ -1156,7 +1064,6 @@ msgid "invalid group name '%s'\n"
 msgstr "nome di gruppo «%s» non valido\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "nome di gruppo «%s» non valido\n"
 
@@ -1173,7 +1080,6 @@ msgid "no matching group file entry in %
 msgstr "nessuna voce corrispondente nel file dei gruppi %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "aggiungere il gruppo «%s» in %s? "
 
@@ -1209,17 +1115,14 @@ msgid "%s: no changes\n"
 msgstr "%s: nessuna modifica\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Uso: groupdel GRUPPO\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Uso: groupdel GRUPPO\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: impossibile aggiornare il file %s\n"
 
@@ -1311,9 +1214,6 @@ msgstr ""
 "[Disconnessione obbligatoria evitata: root può accedere.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1340,7 +1240,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Superato il numero massimo di tentativi (%d)\n"
 
@@ -1390,7 +1289,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Uso: id\n"
 
@@ -1408,7 +1306,6 @@ msgid "%s: failure forking: %s\n"
 msgstr "%s: impossibile eseguire fork(): %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
@@ -1423,12 +1320,10 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
 msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: il gruppo «%s» è un gruppo shadow, ma non esiste in /etc/group\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: nome utente «%s» non valido\n"
 
@@ -1455,7 +1350,6 @@ msgid "%s: line %d: can't create group\n
 msgstr "%s: riga %d: impossibile creare il gruppo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: line %d: user '%s' does not exist in %s\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
@@ -1464,12 +1358,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: riga %d: impossibile aggiornare la password\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: riga %d: la chiamata mkdir ha restituito un errore\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: riga %d: la chiamata chown ha restituito un errore\n"
 
@@ -1478,33 +1370,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: riga %d: impossibile aggiornare la voce\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1601,9 +1466,6 @@ msgid "The password for %s cannot be cha
 msgstr "La password di %s non può ancora essere cambiata.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock the password of this "
@@ -1635,17 +1497,14 @@ msgid "The password for %s is unchanged.
 msgstr "La password di %s non è cambiata.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Password cambiata."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Avviso di scadenza della password"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Uso: %s [-q] [-r] [-s] [PASSWD [SHADOW]]\n"
 
@@ -1654,7 +1513,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1673,42 +1531,34 @@ msgid "invalid user name '%s'\n"
 msgstr "nome utente «%s» non valido\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "nome utente «%s» non valido\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "utente %s: nessun gruppo %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "utente %s: la directory %s non esiste\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "utente %s: il programma %s non esiste\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: impossibile creare la directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: impossibile creare la directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: impossibile creare la directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: impossibile fare il lock del file %s\n"
 
@@ -1736,17 +1586,14 @@ msgid "user %s: last password change in 
 msgstr "utente %s: l'ultimo cambio di password reca una data futura\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: impossibile aprire il file %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Uso: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: impossibile riscrivere il file\n"
 
@@ -1755,7 +1602,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Uso: id\n"
 
@@ -1775,7 +1621,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: impossibile fare il lock del file %s\n"
 
@@ -1851,12 +1696,10 @@ msgstr ""
 "(Ignorato)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: autenticazione PAM non riuscita\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Non si è autorizzati a diventare %s\n"
 
@@ -1901,12 +1744,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: impossibile aprire il nuovo file dei valori predefiniti\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: riga %d: la chiamata chown ha restituito un errore\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: rename: %s"
 
@@ -1926,9 +1767,6 @@ msgid ""
 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"
@@ -1957,9 +1795,6 @@ msgid ""
 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"
@@ -1968,9 +1803,6 @@ msgstr ""
 "                                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"
@@ -1983,9 +1815,6 @@ msgid ""
 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"
@@ -2001,9 +1830,6 @@ msgid ""
 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"
@@ -2012,9 +1838,6 @@ msgstr ""
 "                                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"
@@ -2106,7 +1929,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Impostazione dei permessi del file della casella di posta"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: l'utente «%s» esiste già\n"
 
@@ -2122,12 +1944,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: impossibile creare l'utente\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u non univoco\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: impossibile creare la directory %s\n"
 
@@ -2163,15 +1983,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: impossibile rimuovere il gruppo «%s» in quanto gruppo principale di un "
 "altro utente.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: attenzione: impossibile rimuovere "
 
@@ -2184,17 +2001,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
@@ -2207,7 +2021,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: l'utente %s è attualmente collegato\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: directory home «%s» non valida\n"
 
@@ -2222,36 +2035,6 @@ msgid "%s: error removing directory %s\n
 msgstr "%s: errore nel rimuovere la directory %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2311,9 +2094,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the user's password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock this user's password.\n"
@@ -2323,7 +2103,6 @@ msgstr ""
 "account.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: l'utente «%s» esiste già\n"
 
@@ -2340,7 +2119,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr "%s: i flag -L, -p e -U sono mutuamente esclusivi\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Membro già esistente\n"
 
@@ -2355,7 +2133,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: impossibile creare la directory %s\n"
 
@@ -2388,10 +2165,6 @@ msgid "failed to rename mailbox"
 msgstr "impossibile rinominare la casella di posta"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "You have modified %s.\n"
-#| "You may need to modify %s for consistency.\n"
-#| "Please use the command `%s' to do so.\n"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
@@ -2423,31 +2196,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s non modificato\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "impossibile rinominare la casella di posta"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Impossibile fare il lock del file"
 
@@ -2455,7 +2221,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
@@ -2466,27 +2231,22 @@ msgid "Couldn't make backup"
 msgstr "Impossibile effettuare il backup"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Impossibile aprire il file dei gruppi\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: lunghezza dei campi eccessiva\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "impossibile rinominare la casella di posta"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "impossibile cambiare il proprietario della casella di posta"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "impossibile rinominare la casella di posta"
 
@@ -2496,10 +2256,91 @@ msgstr ""
 "%s: impossibile ripristinare %s: %s (le modifiche effettuate sono in %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: directory di base «%s» non valida\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s non è una shell valida.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: impossibile creare %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: chown di %s non riuscito\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Uso: vipw [OPZIONI]\n"
+"\n"
+"Opzioni:\n"
+"  -g, --group                   modifica il database dei gruppi\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -p, --passwd                  modifica il database delle password\n"
+"  -q, --quiet                   opera in modalità silenziosa\n"
+"  -s, --shadow                  modifica il database shadow o gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2533,12 +2374,6 @@ msgstr "%s: directory di base «%s» non
 #~ "  -s, --shadow                  modifica il database shadow o gshadow\n"
 #~ "\n"
 
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: impossibile creare %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: chown di %s non riuscito\n"
-
 #, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
@@ -3031,8 +2866,8 @@ msgstr "%s: directory di base «%s» non
 #~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
 #~ "is not in the passwd file.\n"
 #~ msgstr ""
-#~ "%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a "
-#~ "%u, in quanto non è presente nel file delle password.\n"
+#~ "%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a %"
+#~ "u, in quanto non è presente nel file delle password.\n"
 
 #~ msgid "%s: can't update shadow entry for %s\n"
 #~ msgstr "%s: impossibile aggiornare la voce relativa a %s nel file shadow\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/ja.po 1:4.1.4.2+svn3283-2ubuntu1/po/ja.po
--- 1:4.1.4.2+svn3283-2/po/ja.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/ja.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2009-05-10 15:58+0900\n"
 "Last-Translator: NAKANO Takeo <nakano at webmasters.gr.jp>\n"
 "Language-Team: Japanese\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: メモリが足りません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: %s を削除できません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: ホームディレクトリ '%s' は不正です\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: '%s' のエントリを %s から削除できません\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: %s のサイズを取得できませんでした: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: 警告: %s を削除できません: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: ファイル名変更: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: ディレクトリ %s の名前を %s に変更できません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: ディレクトリ %s の名前を %s に変更できません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: 警告: %s を削除できません: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: %s のサイズを取得できませんでした: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: %s を削除できません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: %d 行目: ユーザ '%s' は存在しません\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: ファイル名変更: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: %s を開けません\n"
 
@@ -187,7 +171,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: %s がアンロックできませんでした\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -218,12 +201,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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 がありませ"
@@ -241,8 +223,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -658,9 +640,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -668,7 +647,6 @@ msgstr ""
 "  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: %d 行目: ユーザ '%s' は存在しません\n"
 
@@ -707,17 +685,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: 不正なエントリ: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s はシェルに指定できません。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: ユーザ '%s' は存在しません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: 警告: %s は %s の所有ではありません\n"
 
@@ -737,9 +712,6 @@ msgid ""
 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"
@@ -757,7 +729,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "faillog: UID %d のエントリを取得できませんでした\n"
 
@@ -773,17 +744,14 @@ msgid " [%lds lock]"
 msgstr "[ロック %ld 秒]"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
 msgid "faillog: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: UID %d の失敗回数をリセットできませんでした\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
 msgid "faillog: Failed to set max for UID %lu\n"
 msgstr "faillog: UID %d の最大回数を設定できませんでした\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
 msgid "faillog: Failed to set locktime for UID %lu\n"
 msgstr "faillog: UID %d のロック時間を設定できませんでした\n"
 
@@ -807,9 +775,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
@@ -822,9 +787,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr ""
@@ -835,10 +797,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -848,7 +806,6 @@ msgstr ""
 "-A オプションと -M オプション以外は同時に指定できない\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "これらのオプションは同時に指定できません。\n"
 
@@ -908,9 +865,6 @@ msgid ""
 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"
@@ -919,9 +873,6 @@ 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"
@@ -931,9 +882,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -946,9 +894,6 @@ msgid ""
 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"
@@ -1013,9 +958,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1030,9 +972,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr ""
@@ -1045,18 +984,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -p, --purge                   purge all members from the group\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
 "                                ユーザマッピング\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -l, --list                    list the members of the group\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
@@ -1071,9 +1004,6 @@ msgid "%s: only root can use the -g/--gr
 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"
@@ -1221,7 +1151,6 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
 msgid "lastlog: Failed to get the entry for UID %lu\n"
 msgstr "lastlog: UID %d のエントリを取得できませんでした\n"
 
@@ -1255,7 +1184,6 @@ msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r ホスト\n"
 
 #, fuzzy, c-format
-#| msgid "configuration error - cannot parse %s value: '%s'"
 msgid "configuration error - cannot parse %s value: '%d'"
 msgstr "設定エラー - %s の値 '%s' をパースできません"
 
@@ -1277,9 +1205,6 @@ msgstr ""
 "[切断を迂回 -- root ログインが可能です。]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1308,7 +1233,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "最大試行回数 (%d) を越えました\n"
 
@@ -1385,9 +1309,6 @@ msgid "  -c, --crypt-method            t
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -r, --system                  create system accounts\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
@@ -1565,17 +1486,14 @@ msgid "The password for %s is unchanged.
 msgstr "%s のパスワードは変更されません。\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "パスワードは変更されました。"
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "パスワード期限切れ警告日数"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "使い方: %s [-q] [-r] [-s] [パスワード [シャドウ]]\n"
 
@@ -1584,7 +1502,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1619,22 +1536,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "ユーザ '%s': プログラム '%s' が存在しません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: %s を開けません\n"
 
@@ -1695,7 +1608,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: あなたのユーザ名を判定できません。\n"
 
@@ -1818,12 +1730,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: 新しいデフォルトファイルを開けません\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: %d 行: chown %s が失敗しました: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: ファイル名変更: %s"
 
@@ -1843,9 +1753,6 @@ msgid ""
 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"
@@ -1873,9 +1780,6 @@ msgid ""
 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"
@@ -1883,9 +1787,6 @@ 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"
@@ -1897,9 +1798,6 @@ msgid ""
 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"
@@ -1907,9 +1805,6 @@ 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"
@@ -1920,9 +1815,6 @@ msgid ""
 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"
@@ -1930,9 +1822,6 @@ 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"
@@ -1943,18 +1832,12 @@ msgid "  -p, --password PASSWORD       e
 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"
@@ -2057,7 +1940,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: ユーザ ID %lu は重複しています\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
@@ -2097,7 +1979,6 @@ msgid "%s: group %s is the primary group
 msgstr "%s: グループ %s は他のユーザのプライマリグループなので削除しません。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: 警告: %s を削除できません: %s"
 
@@ -2110,17 +1991,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: 特権を落とせませんでした (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: %s のサイズを取得できませんでした: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: '%s' のエントリを %s から削除できません\n"
 
@@ -2133,7 +2011,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: ユーザ %s は現在ログイン中です\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: ホームディレクトリ '%s' は不正です\n"
 
@@ -2248,7 +2125,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
@@ -2297,45 +2173,30 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -g, --group                   edit group database\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
 "                                ユーザマッピング\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
 "                                ユーザマッピング\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
 "                                ユーザマッピング\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
 "                                ユーザマッピング\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr ""
 "  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
@@ -2350,12 +2211,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s は変更されません\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "mailbox の名前変更に失敗しました"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: 特権を落とせませんでした (%s)\n"
 
@@ -2366,7 +2225,6 @@ msgid "setfscreatecon () failed"
 msgstr "setfscreatecon () が失敗しました"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: 特権を落とせませんでした (%s)\n"
 
@@ -2377,27 +2235,22 @@ msgid "Couldn't make backup"
 msgstr "バックアップを作成できません"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "mailbox の名前変更に失敗しました"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: %s がアンロックできませんでした\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "mailbox の名前変更に失敗しました"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "mailbox 所有者の変更に失敗しました"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "mailbox の名前変更に失敗しました"
 
@@ -2406,10 +2259,120 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: %s を復旧できませんでした: %s (あなたの変更は %s にあります)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ベースディレクトリ '%s' は不正です\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s はシェルに指定できません。\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"使い方: %s [オプション] GROUP\n"
+"\n"
+"オプション:\n"
+"  -a, --add USER        \n"
+"\n"
+"  -a, --add USER                USER を GROUP に追加する\n"
+"  -d, --delete USER             USER を GROUP から削除する\n"
+"  -r, --remove-password         GROUP のパスワードを削除する\n"
+"  -R, --restrict                GROUP へのアクセスをそのメンバーのみに制限す"
+"ã‚‹\n"
+"  -M, --members USER,...        GROUP のメンバーリストを設定する\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators ADMIN,...\n"
+"                                GROUP の管理者のリストを設定する\n"
+"-A オプションと -M オプション以外は同時に指定できない\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"使い方: groupmems [オプション] [動作]\n"
+"\n"
+"オプション:\n"
+"  -g, --group groupname         ユーザのグループでなく groupname を使う\n"
+"                                (root のみ)\n"
+"\n"
+"動作:\n"
+"  -a, --add username            username をグループのメンバーに加える\n"
+"  -d, --delete username         username をグループのメンバーから除く\n"
+"  -p, --purge                   すべてのメンバーをグループから削除する\n"
+"  -l, --list                    グループのメンバー一覧を表示する\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s を作成できません\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: %s を chown できません\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"使い方: vipw [オプション]\n"
+"\n"
+"オプション:\n"
+"  -g, --group                   group データベースを編集する\n"
+"  -h, --help                    このヘルプを表示して終了する\n"
+"  -p, --passwd                  passwd データベースを編集する\n"
+"  -q, --quiet                   表示抑制モード\n"
+"  -s, --shadow                  shadow ないし gshadow データベースを編集す"
+"ã‚‹\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2445,67 +2408,6 @@ msgstr "%s: ベースディレクトリ 
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "使い方: %s [オプション] GROUP\n"
-#~ "\n"
-#~ "オプション:\n"
-#~ "  -a, --add USER        \n"
-#~ "\n"
-#~ "  -a, --add USER                USER を GROUP に追加する\n"
-#~ "  -d, --delete USER             USER を GROUP から削除する\n"
-#~ "  -r, --remove-password         GROUP のパスワードを削除する\n"
-#~ "  -R, --restrict                GROUP へのアクセスをそのメンバーのみに制限"
-#~ "する\n"
-#~ "  -M, --members USER,...        GROUP のメンバーリストを設定する\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "使い方: groupmems [オプション] [動作]\n"
-#~ "\n"
-#~ "オプション:\n"
-#~ "  -g, --group groupname         ユーザのグループでなく groupname を使う\n"
-#~ "                                (root のみ)\n"
-#~ "\n"
-#~ "動作:\n"
-#~ "  -a, --add username            username をグループのメンバーに加える\n"
-#~ "  -d, --delete username         username をグループのメンバーから除く\n"
-#~ "  -p, --purge                   すべてのメンバーをグループから削除する\n"
-#~ "  -l, --list                    グループのメンバー一覧を表示する\n"
-#~ "\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s を作成できません\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: %s を chown できません\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/kk.po 1:4.1.4.2+svn3283-2ubuntu1/po/kk.po
--- 1:4.1.4.2+svn3283-2/po/kk.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/kk.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-22 22:58+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #, c-format
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: жады жеткіліксіз\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: %s өшіру мүмкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s home directory (%s) not found\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: %s үшін үй бумасы (%s) табылмады\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: '%s' жазбасын %s ішінен өшіру мүмкін емес\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: %s бумасын жасау мүкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: %s өлшемін алу мүмкін емес: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: ексерту: %s өшіру мүмкін емес: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: атын ауыстыру: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: %s бумасының атын %s атына ауыстыру мүмкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: %s бумасының атын %s атына ауыстыру мүмкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: ексерту: %s өшіру мүмкін емес: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: %s бумасын жасау мүкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: %s өлшемін алу мүмкін емес: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: %s өшіру мүмкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "%s: (line %d, user %s) password not changed\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: (жол %d, пайдаланушы %s) пароль өзгертілмеген\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: атын ауыстыру: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: %s ашу мүмкін емес\n"
 
@@ -187,7 +171,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: %s босату сәтсіз\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -218,8 +201,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -236,8 +219,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -430,8 +413,8 @@ msgstr "Парольді ауыстырÑ
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
-"Парольдің мерзімі аяқталу туралы хабарламаны көрсете бастау, күн саны\t: "
-"%ld\n"
+"Парольдің мерзімі аяқталу туралы хабарламаны көрсете бастау, күн саны\t: %"
+"ld\n"
 
 #, c-format
 msgid "%s: invalid date '%s'\n"
@@ -653,7 +636,6 @@ msgstr ""
 "Опциялар:\n"
 
 #, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
 msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
 msgstr "  -c, --crypt-method            шифрлеу тәсілі (%s ішінен біреу)\n"
 
@@ -709,17 +691,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Қате мән: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s дұрыс қоршам емес.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: пайдаланушы '%s' жоқ болып тұр\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: ескерту: %s қазір %s иелігінде емес\n"
 
@@ -732,9 +711,6 @@ msgstr ""
 "жазбаларын көрсету\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -l, --lock-time SEC           after failed login lock account for SEC "
-#| "seconds\n"
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
@@ -810,10 +786,6 @@ msgid "faillog: Cannot get the size of %
 msgstr "faillog: %s өлшемін алу мүмкін емес: %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] GROUP\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -824,7 +796,6 @@ msgstr ""
 "Опциялар:\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr "  -g, --gid GID                 топ ID-ін GID мәніне орнату\n"
 
@@ -835,8 +806,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr "  -r, --reset                   сәтсіз кіру талап санағышын нөлдеу\n"
@@ -845,10 +814,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -858,7 +823,6 @@ msgstr ""
 "-A мен -M опцияларынан бөлек, бұл опцияларды бірге қолдануға болмайды.\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Бұл опцияларды бірге қолдануға болмайды.\n"
 
@@ -1005,10 +969,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: Жады жеткіліксіз. %s жаңарту мүмкін емес.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1019,10 +979,6 @@ msgstr ""
 "Опциялар:\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1036,7 +992,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
@@ -1047,12 +1002,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -p, --purge                   purge all members from the group\n"
 msgstr "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -l, --list                    list the members of the group\n"
 msgstr "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
 
@@ -1560,7 +1513,6 @@ msgid "%s: password expiry information c
 msgstr "%s: пароль мерзімі туралы ақпарат өзгертілді.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Қолданылуы: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1603,22 +1555,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "пайдаланушы '%s': '%s' бағдарламасы жоқ болып тұр\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: %s бумасын жасау мүкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: %s бумасын жасау мүкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: %s бумасын жасау мүкін емес\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: %s ашу мүмкін емес\n"
 
@@ -1681,7 +1629,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: Сіздің пайдаланушы атын анықтау мүмкін емес.\n"
 
@@ -1822,10 +1769,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: шектен көп топ саны көрсетілген (максимум %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -2013,7 +1956,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu бар болып тұр\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: %s бумасын жасау мүкін емес\n"
 
@@ -2067,17 +2009,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: %s өлшемін алу мүмкін емес: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: '%s' жазбасын %s ішінен өшіру мүмкін емес\n"
 
@@ -2205,7 +2144,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: warning: failed to completely remove old home directory %s"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: ескерту: %s ескі үй бумасын толығымен өшіру мүмкін емес"
 
@@ -2248,10 +2186,6 @@ msgstr ""
 "Оны орындау үшін '%s' командасын қолданыңыз.\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2262,30 +2196,24 @@ msgstr ""
 "Опциялар:\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -g, --group                   edit group database\n"
 msgstr "  -g, --gid GID                 топ ID-ін GID мәніне орнату\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -r, --system                  жүйелік тіркелгіні жасау\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -a, --all                     барлық пайдаланушылар үшін faillog "
 "жазбаларын көрсету\n"
 
 #, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
 
@@ -2298,12 +2226,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s өзгертілмеді\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "mailbox атын ауыстыру қатемен аяқталды"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
 
@@ -2314,7 +2240,6 @@ msgid "setfscreatecon () failed"
 msgstr "setfscreatecon () сәтсіз"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
 
@@ -2325,27 +2250,22 @@ msgid "Couldn't make backup"
 msgstr "Қор көшірмені жасау мүмкін емес"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "mailbox атын ауыстыру қатемен аяқталды"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: %s босату сәтсіз\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "mailbox атын ауыстыру қатемен аяқталды"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "mailbox иесін ауыстыру қатемен аяқталды"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "mailbox атын ауыстыру қатемен аяқталды"
 
@@ -2354,10 +2274,113 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: %s қайтару мүмкін емес: %s (сіздің өзгертулеріңіз %s ішінде)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: '%s' негізгі бумасы қате\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s - дұрыс қоршам емес.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Қолданылуы: %s [опция] ТОП\n"
+"\n"
+"Options:\n"
+"  -a, --add ПАЙДАЛАНУШЫ         ПАЙДАЛАНУШЫНЫ ТОП ішіне қосу\n"
+"  -d, --delete ПАЙДАЛАНУШЫ         ПАЙДАЛАНУШЫНЫ ТОП ішінен өшіру\n"
+"  -r, --remove-password         ТОП паролін өшіру\n"
+"  -R, --restrict                ТОПқа рұқсатты тек оның мүшелеріне беру\n"
+"  -M, --members ПАЙДАЛАНУШЫ,... ТОП мүшелер тізімін орнату\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Қолданылуы: groupmems [опциялар] [әрекет]\n"
+"\n"
+"Опциялар:\n"
+"  -g, --group топ_аты           пайдаланушы тобының орнына топ_аты орнату\n"
+"                                (тек root үшін)\n"
+"\n"
+"Әрекеттер:\n"
+"  -a, --add тіркелгі            тіркелгіні топ мүшелеріне қосу\n"
+"  -d, --delete тіркелгі         тіркелгіні топ мүшелерінен өшіру\n"
+"  -p, --purge                   топтан барлық мүшелерді өшіру\n"
+"  -l, --list                    топ мүшелерін тізіп шығару\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s құру мүмкін емес\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: %s үшін chown жасау мүмкін емес\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Қолданылуы: vipw [опциялар]\n"
+"\n"
+"Опциялары:\n"
+"  -g, --group                   топтар дерекқорын түзету\n"
+"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+"  -p, --passwd                  парольлдер дерекқорын түзету\n"
+"  -q, --quiet                   \"тыныш\" түрі\n"
+"  -s, --shadow                  shadow не gshadow дерекқорын түзету\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2390,62 +2413,3 @@ msgstr "%s: '%s' негізгі бума
 #~ "  -q, --quiet                   \"тыныш\" түрі\n"
 #~ "  -s, --shadow                  shadow не gshadow дерекқорын түзету\n"
 #~ "\n"
-
-#~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Қолданылуы: %s [опция] ТОП\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add ПАЙДАЛАНУШЫ         ПАЙДАЛАНУШЫНЫ ТОП ішіне қосу\n"
-#~ "  -d, --delete ПАЙДАЛАНУШЫ         ПАЙДАЛАНУШЫНЫ ТОП ішінен өшіру\n"
-#~ "  -r, --remove-password         ТОП паролін өшіру\n"
-#~ "  -R, --restrict                ТОПқа рұқсатты тек оның мүшелеріне беру\n"
-#~ "  -M, --members ПАЙДАЛАНУШЫ,... ТОП мүшелер тізімін орнату\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Қолданылуы: groupmems [опциялар] [әрекет]\n"
-#~ "\n"
-#~ "Опциялар:\n"
-#~ "  -g, --group топ_аты           пайдаланушы тобының орнына топ_аты "
-#~ "орнату\n"
-#~ "                                (тек root үшін)\n"
-#~ "\n"
-#~ "Әрекеттер:\n"
-#~ "  -a, --add тіркелгі            тіркелгіні топ мүшелеріне қосу\n"
-#~ "  -d, --delete тіркелгі         тіркелгіні топ мүшелерінен өшіру\n"
-#~ "  -p, --purge                   топтан барлық мүшелерді өшіру\n"
-#~ "  -l, --list                    топ мүшелерін тізіп шығару\n"
-#~ "\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s құру мүмкін емес\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: %s үшін chown жасау мүмкін емес\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/km.po 1:4.1.4.2+svn3283-2ubuntu1/po/km.po
--- 1:4.1.4.2+svn3283-2/po/km.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/km.po	2010-11-24 14:47:24.000000000 +0000
@@ -15,10 +15,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
@@ -54,17 +54,14 @@ msgid "%s: out of memory\n"
 msgstr "%s ៖ អស់​សតិ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s ៖ ថត​ផ្ទះ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
@@ -73,57 +70,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s ៖​ ប្តូរ​ឈ្មោះ​ ៖ %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យបានឡើយ​\n"
 
@@ -134,12 +120,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s ៖​ ប្តូរ​ឈ្មោះ​ ៖ %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
@@ -186,17 +170,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "មិន​អាច​ប្តូរ​ tty %s បានឡើយ"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s ៖ វាល គឺ​វែងវែងពេក​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s ៖ %s\n"
 
@@ -230,8 +211,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -248,8 +229,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -349,7 +330,6 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) បាន​បរាជ័យ​\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "ទេ\n"
 
@@ -467,12 +447,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s ៖ មិន​អាច​ចាក់សោ​ឯកសារ​បានឡើយ សូមព្យាយាម​ម្តង​ទៀតនៅពេលក្រោយ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
@@ -481,7 +459,6 @@ msgid "%s: failure while writing changes
 msgstr "%s ៖ ការចែកជាពីរវិធី​​បានបរាជ័យ​ ៖ %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
@@ -521,7 +498,6 @@ msgid "Full Name"
 msgstr "ឈ្មោះ​ពេញ"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s ៖ %s\n"
 
@@ -565,7 +541,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s ៖ លេខ​ទូរស័ព្ទនៅផ្ទះ​មិន​ត្រឹមត្រូវ​ ៖ '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s ៖ '%s' មាន​តួអក្សរ​មិន​ត្រឹមត្រូវ​\n"
 
@@ -640,12 +615,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s ៖ បន្ទាត់​ %d ៖ បាត់បង់​ពាក្យ​សម្ងាត់​ថ្មី​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនអាចធ្វើឲ្យ​ធាតុបញ្ចូល​ទាន់សម័យបានឡើយ\n"
 
@@ -654,7 +627,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s ៖ បានរកឃើញ​កំហុស មិនអើពើនឹងការផ្លាស់ប្ដូរ​\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -705,7 +677,6 @@ msgid "Login Shell"
 msgstr "សែលចូល"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "អ្នក​មិនអាច​​ប្តូរ​សែល​សម្រាប់​ %s បានទេ ។\n"
 
@@ -718,17 +689,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s ៖ ធាតុបញ្ចូល​​មិន​ត្រឹមត្រូវ​ ៖ %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s គឺជា​សែល​មិន​ត្រឹមត្រូវ​ ។\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s ៖ ការព្រមាន ៖​ %s មិនត្រូវបានទទួល​យក​ដោយ %s ឡើយ\n"
 
@@ -769,7 +737,6 @@ msgid "Login       Failures Maximum Late
 msgstr "ចូល       ភាពបរាជ័យ​នៃការចូល​ចុងក្រោយ​ជាអតិបរមា                   លើ\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds នៅសល់]"
 
@@ -794,7 +761,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "មិន​ស្គាល់​អ្នក​ប្រើ ៖ %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
@@ -803,7 +769,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -832,12 +797,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "មិនអាចប្ដូរ​ពាក្យ​សម្ងាត់​សម្រាប់​ %s បានឡើយ ។\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "មិនអាចប្ដូរ​ពាក្យ​សម្ងាត់​សម្រាប់​ %s បានឡើយ ។\n"
 
@@ -846,7 +809,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s ៖ បានទាមទារ​ពាក្យសម្ងាត់​ក្រុម​ស្រមោល​សម្រាប់​ -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
@@ -888,7 +850,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s ៖ មិនមែន​ tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -921,7 +882,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s  ៖ %s ជា​ឈ្មោះ​ក្រុម​មិន​ត្រឹមត្រូវ​\n"
 
@@ -934,7 +894,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K ទាមទារ​ KEY=VALUE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s ៖ មានក្រុម​ %s រួច​ហើយ​\n"
 
@@ -946,7 +905,6 @@ msgid "Usage: groupdel group\n"
 msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
@@ -955,12 +913,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s ៖ មិនអាចផ្លាស់​​ប្តូរ​អ្នក​ប្រើបានទេ​ '%s' លើ​ម៉ាស៊ីន​ភ្ញៀវ NIS បានទេ ។\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s ៖ ក្រុម​ '%s' គឺជាក្រុម​ NIS ។\n"
 
@@ -969,7 +925,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s ៖ %s គឺជា​មេ NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s ៖ អ្នកប្រើ​ %s គឺជា​អ្នក​​ប្រើ​ NIS\n"
 
@@ -978,7 +933,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: អស់​សតិ​ក្នុង​ក្នុងការធ្វើឲ្យ​ក្រុមទាន់សម័យ\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1076,7 +1030,6 @@ msgid "invalid group name '%s'\n"
 msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
 
@@ -1093,7 +1046,6 @@ msgid "no matching group file entry in %
 msgstr "គ្មាន​ធាតុបញ្ចូល​ឯកសារ​ក្រុមផ្គូរផ្គង​នៅក្នុង​​ %s ទេ\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "បន្ថែម​ក្រុម​ '%s' ទៅក្នុង​ %s ឬ ?"
 
@@ -1131,17 +1083,14 @@ msgid "%s: no changes\n"
 msgstr "%s ៖គ្មាន​ការផ្លាស់ប្ដូរ​\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
 
@@ -1236,9 +1185,6 @@ msgstr ""
 "[បាន​វៀង​ការ​ផ្ដាច់ -- បាន​អនុញ្ញាត​ការ​ចូល​ជា root ។]\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1265,7 +1211,6 @@ msgid "login: "
 msgstr "ចូល​ ៖ "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "បាន​លើសពី​ចំនួន​អតិបរ​មា​នៃ​ការ​សាកល្បង​ (%d)\n"
 
@@ -1315,7 +1260,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
 
@@ -1352,7 +1296,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
@@ -1385,12 +1328,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​អាច​ធ្វើ​ឲ្យ​ពាក្យ​សម្ងាត់​ទាន់សម័យ​បានឡើយ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ mkdir បានបរាជ័យ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ chown បានបរាជ័យ​\n"
 
@@ -1522,12 +1463,10 @@ msgid "%s: password changed.\n"
 msgstr "ពាក្យ​សម្ងាត់​បាន​ប្តូរ​ ។\n"
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "ការព្រមាន​ការផុត​កំណត់​នៃ​ពាក្យ​សម្ងាត់​"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "របៀបប្រើ ៖ %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1536,7 +1475,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1557,42 +1495,34 @@ msgid "invalid user name '%s'\n"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "អ្នក​ប្រើ​ %s ៖ គ្មាន​ក្រុម​ %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "អ្នក​ប្រើ %s ៖ មិនទាន់មាន​ថត​ %s នៅ​ឡើយ​ទេ​\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "អ្នកប្រើ​ %s ៖ មិនទាន់មាន​កម្មវិធី​ %s នៅឡើយទេ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s ៖ មិន​អាច​ចាក់សោ​ឯកសារ​ %s បានទេ\n"
 
@@ -1622,17 +1552,14 @@ msgid "user %s: last password change in 
 msgstr "អ្នកប្រើ​ %s ៖ ពាក្យ​សម្ងាត់​ចុងក្រោយ​​ប្ដូរនៅក្នុង​អនាគត\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ឡើង​វិញបានទេ​\n"
 
@@ -1641,7 +1568,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
 
@@ -1661,7 +1587,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s ៖ មិន​អាច​ចាក់សោ​ឯកសារ​ %s បានទេ\n"
 
@@ -1737,12 +1662,10 @@ msgstr ""
 "(មិន​អើពើ​)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "អ្នកគ្មាន​ការ​អនុញ្ញាតឲ្យ​ចូល​ទៅ​កាន់​ su ទេ​ %s\n"
 
@@ -1790,12 +1713,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​លំនាំដើម​ថ្មី​​បានលឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s ៖ បន្ទាត់​ %d ៖ chown បានបរាជ័យ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s ៖​ ប្តូរ​ឈ្មោះ​ ៖ %s"
 
@@ -1808,7 +1729,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s ៖ ក្រុម​ដែលបានបញ្ជាក់​ច្រើនពេក​ (អតិ​ %d) ។\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1958,7 +1878,6 @@ msgid "Setting mailbox file permissions"
 msgstr "ការកំណត់​សិទ្ធ​លើ​ឯកសារ​ប្រអប់​សំបុត្រ​"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s ៖ អ្នក​ប្រើ​ %s មាន​រួច​ហើយ​\n"
 
@@ -1972,12 +1891,10 @@ msgid "%s: can't create user\n"
 msgstr "%s ៖ មិន​អាច​បង្កើត​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s ៖ UID %u មិន​មែន​មាន​តែមួយទេ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
@@ -2013,13 +1930,10 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s ៖ មិនអាច​យកក្រុម %s ដែលជា​ក្រុម​ចម្បង​សម្រាប់​អ្នកប្រើដទៃទៀតចេញបានទេ ។\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
 
@@ -2032,17 +1946,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
@@ -2055,7 +1966,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s ៖ បច្ចុប្បន្ន ​អ្នក​ប្រើ​ %s បាន​ចូលហើយ​\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s ៖ ថត​ផ្ទះ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
@@ -2129,7 +2039,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s ៖ អ្នក​ប្រើ​ %s មាន​រួច​ហើយ​\n"
 
@@ -2160,7 +2069,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
@@ -2198,7 +2106,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2221,31 +2128,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s ៖ %s មិនត្រូវបានប្ដូរឡើយ​\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "​បរាជ័យ​ក្នុងការប្ដូរឈ្មោះប្រអប់"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "មិនអាច​ចាក់សោ​ឯកសារបានឡើយ"
 
@@ -2253,7 +2153,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
@@ -2268,22 +2167,18 @@ msgid "failed to open scratch file"
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​បានទេ​\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s ៖ វាល គឺ​វែងវែងពេក​\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "​បរាជ័យ​ក្នុងការប្ដូរឈ្មោះប្រអប់"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរ​ម្ចាស់​ប្រអប់សំបុត្រ"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "​បរាជ័យ​ក្នុងការប្ដូរឈ្មោះប្រអប់"
 
@@ -2292,10 +2187,92 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s ៖ មិន​អាច​ស្តារ %s ៖ %s (ការប្ដូរ​របស់អ្នក​គឺនៅក្នុង​ %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s  ៖ ថត​មូលដ្ឋាន​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s គឺជា​សែល​មិន​ត្រឹមត្រូវ​ ។\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s ៖ មិន​អាច​បង្កើត​ %s បានឡើយ\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s ៖ មិន​អាច​ chown %s បានឡើយ\n"
+
+#, fuzzy
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"របៀបប្រើ ៖ vipw [ជម្រើស]\n"
+"\n"
+"ជម្រើស ៖\n"
+"  -g, --group\t\t\tកែសម្រួល​មូលដ្ឋាន​ទិន្នន័យ​ក្រុម\n"
+"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
+"  -p, --passwd\t\t\tកែសម្រួល​មូលដ្ឋាន​ទិន្នន័យ passwd\n"
+"  -q, --quiet\t\t\tរបៀប​ស្ងាត់\n"
+"  -s, --shadow\t\t\tកែសម្រួល​មូលដ្ឋាន​ទិន្នន័យ​ស្រមោល ឬ gshadow\n"
+"\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
@@ -2320,20 +2297,6 @@ msgstr "%s  ៖ ថត​មូលដá
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "របៀបប្រើ ៖ %s [input]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s ៖ មិន​អាច​បង្កើត​ %s បានឡើយ\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s ៖ មិន​អាច​ chown %s បានឡើយ\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/ko.po 1:4.1.4.2+svn3283-2ubuntu1/po/ko.po
--- 1:4.1.4.2+svn3283-2/po/ko.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/ko.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
@@ -52,17 +52,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: 메모리 부족\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: '%s'을(를) 삭제할 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: 홈 디렉터리 '%s'은(는) 잘못되었습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: '%s' 항목을 %s에서 제거할 수 없습니다\n"
 
@@ -71,57 +68,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: %s의 크기를 읽을 수 없습니다: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: 경고: %s을(를) 제거할 수 없습니다: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: 이름 다시 설정: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: 디렉터리 %s의 이름을 %s(으)로 바꿀 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: 디렉터리 %s의 이름을 %s(으)로 바꿀 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: 경고: %s을(를) 제거할 수 없습니다: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: %s의 크기를 읽을 수 없습니다: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: '%s'을(를) 삭제할 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: %d번 줄: '%s' 사용자가 없습니다\n"
 
@@ -132,12 +118,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: 이름 다시 설정: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: %s을(를) 열 수 없습니다\n"
 
@@ -188,7 +172,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: %s의 잠금을 푸는데 실패했습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -219,12 +202,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: 유일한 UID를 얻을 수 없습니다 (UID가 남아 있지 않습니다)\n"
 
@@ -238,12 +220,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system UID (no more available UIDs)\n"
 msgstr "%s: 유일한 UID를 얻을 수 없습니다 (UID가 남아 있지 않습니다)\n"
 
@@ -344,25 +325,6 @@ msgid "No"
 msgstr "아니오"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -676,16 +638,12 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
 msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: %d번 줄: '%s' 사용자가 없습니다\n"
 
@@ -724,17 +682,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: 부적절한 입력: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s은(는) 사용할 수 없는 쉘입니다.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: '%s' 사용자가 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: 경고: %s은(는) %s이(가) 소유하고 있지 않습니다\n"
 
@@ -768,7 +723,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "faillog: UID %d번의 항목을 읽는데 실패했습니다\n"
 
@@ -784,17 +738,14 @@ msgid " [%lds lock]"
 msgstr " [%ld초 잠금]"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
 msgid "faillog: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: UID %d의 실패 횟수를 초기화하는데 실패했습니다\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
 msgid "faillog: Failed to set max for UID %lu\n"
 msgstr "faillog: UID %d의 최대값을 설정하는데 실패했습니다\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
 msgid "faillog: Failed to set locktime for UID %lu\n"
 msgstr "faillog: UID %d의 잠금시각을 설정하는데 실패했습니다\n"
 
@@ -834,10 +785,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -847,7 +794,6 @@ msgstr ""
 "이 옵션은 같이 쓸 수 없습니다. 예외로 -A와 -M 옵션은 같이 쓸 수 있습니다.\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "이 옵션은 같이 쓸 수 없습니다.\n"
 
@@ -907,9 +853,6 @@ msgid ""
 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"
@@ -923,9 +866,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -998,9 +938,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1180,7 +1117,6 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
 msgid "lastlog: Failed to get the entry for UID %lu\n"
 msgstr "lastlog: UID %d번의 항목을 읽는데 실패했습니다\n"
 
@@ -1235,9 +1171,6 @@ msgstr ""
 "[접속해제가 무시되었습니다 -- 루트 로그인 허용.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1265,7 +1198,6 @@ msgid "login: "
 msgstr "로그인: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "로그인 시도 횟수 최대값을 초과했습니다(%d)\n"
 
@@ -1382,12 +1314,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: %d번 줄: 암호를 업데이트 할 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: %d번 줄: 디렉터리 만들기에 실패했습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: %d번 줄: chown 실패했습니다\n"
 
@@ -1514,17 +1444,14 @@ msgid "The password for %s is unchanged.
 msgstr "%s의 암호를 바꾸지 않았습니다.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "암호를 바꿨습니다."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "암호 사용만료 예고"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "사용법: %s [-q] [-r] [-s] [암호 [shadow]]\n"
 
@@ -1533,7 +1460,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1568,22 +1494,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "사용자 '%s': '%s' 프로그램이 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: %s을(를) 열 수 없습니다\n"
 
@@ -1644,7 +1566,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
 
@@ -1767,12 +1688,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: 새로운 기본값 파일을 만들 수 없습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: %d번 줄: chown 실패했습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: 이름 다시 설정: %s"
 
@@ -1792,9 +1711,6 @@ msgid ""
 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"
@@ -1821,18 +1737,12 @@ msgid ""
 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"
@@ -1843,9 +1753,6 @@ msgid ""
 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"
@@ -1859,18 +1766,12 @@ msgid ""
 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"
 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"
@@ -1978,7 +1879,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu번은 유일하지 않습니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
 
@@ -2018,7 +1918,6 @@ msgid "%s: group %s is the primary group
 msgstr "%s: %s 그룹은 다른 사용자의 주요 그룹이므로 제거하지 않습니다.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: 경고: %s을(를) 제거할 수 없습니다: %s"
 
@@ -2031,17 +1930,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: 관리자 권한을 버릴 수 없습니다 (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: %s의 크기를 읽을 수 없습니다: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: '%s' 항목을 %s에서 제거할 수 없습니다\n"
 
@@ -2054,7 +1950,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: %s 사용자는 현재 로그인한 상태 입니다\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: 홈 디렉터리 '%s'은(는) 잘못되었습니다\n"
 
@@ -2069,36 +1964,6 @@ msgid "%s: error removing directory %s\n
 msgstr "%s: 디렉터리 %s을(를) 제거하는 데 오류가 발생했습니다\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2198,7 +2063,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
 
@@ -2271,17 +2135,14 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s은(는) 바뀌지 않았습니다\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: 관리자 권한을 버릴 수 없습니다 (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "파일을 잠글 수 없습니다"
 
@@ -2289,7 +2150,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: 관리자 권한을 버릴 수 없습니다 (%s)\n"
 
@@ -2300,27 +2160,22 @@ msgid "Couldn't make backup"
 msgstr "백업을 만들 수 없습니다"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: %s의 잠금을 푸는데 실패했습니다\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "메일함 소유자를 바꾸는 데 실패했습니다"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
@@ -2329,10 +2184,117 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: %s을(를) 복구할 수 없습니다: %s (바뀐 사항은 %s에 있습니다)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: 기본 디렉터리 '%s' 잘못되었습니다\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s은(는) 사용할 수 없는 쉘입니다.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"사용법: %s [옵션] <그룹>\n"
+"\n"
+"옵션:\n"
+"  -a, --add <사용자>            <사용자>를 <그룹>에 추가합니다\n"
+"  -d, --delete <사용자>         <사용자>를 <그룹>에서 제거합니다\n"
+"  -r, --remove-password         <그룹>의 암호를 제거합니다\n"
+"  -R, --restrict                <그룹>에 접근하는 권한을 멤버로 제한합니다\n"
+"  -M, --members <사용자>,...    그룹의 멤버 목록을 설정합니다\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators <관리자>,...\n"
+"                                <그룹>의 관리자 목록을 설정합니다\n"
+"이 옵션은 같이 쓸 수 없습니다. 예외로 -A와 -M 옵션은 같이 쓸 수 있습니다.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"사용법: groupmems [옵션] [동작]\n"
+"\n"
+"옵션:\n"
+"  -g, --group <그룹이름>        사용자의 그룹이 아닌 <그룹이름>을 바꿉니다\n"
+"                                (root ì „ìš©)\n"
+"\n"
+"Actions:\n"
+"  -a, --add <사용자이름>        <사용자이름>을 그룹의 멤버로 추가합니다\n"
+"  -d, --delete <사용자이름>     그룹 멤버에서 <사용자이름>을 제거합니다\n"
+"  -p, --purge                   그룹에서 모든 멤버를 없앱니다\n"
+"  -l, --list                    그룹의 멤버 목록을 표시합니다\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s을(를) 만들 수 없습니다\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: %s을(를) chown할 수 없습니다\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"사용법: vipw [옵션]\n"
+"\n"
+"옵션:\n"
+"  -g, --group                   그룹 데이터베이스를 편집합니다\n"
+"  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
+"  -p, --passwd                  passwd 데이터베이스를 편집합니다\n"
+"  -q, --quiet                   조용한 모드\n"
+"  -s, --shadow                  셰도우 데이터베이스나 그룹 셰도우 \n"
+"                                데이터베이스를 수정합니다\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2368,66 +2330,6 @@ msgstr "%s: 기본 디렉터리 '%s' 잘
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "사용법: %s [옵션] <그룹>\n"
-#~ "\n"
-#~ "옵션:\n"
-#~ "  -a, --add <사용자>            <사용자>를 <그룹>에 추가합니다\n"
-#~ "  -d, --delete <사용자>         <사용자>를 <그룹>에서 제거합니다\n"
-#~ "  -r, --remove-password         <그룹>의 암호를 제거합니다\n"
-#~ "  -R, --restrict                <그룹>에 접근하는 권한을 멤버로 제한합니"
-#~ "다\n"
-#~ "  -M, --members <사용자>,...    그룹의 멤버 목록을 설정합니다\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "사용법: groupmems [옵션] [동작]\n"
-#~ "\n"
-#~ "옵션:\n"
-#~ "  -g, --group <그룹이름>        사용자의 그룹이 아닌 <그룹이름>을 바꿉니"
-#~ "다\n"
-#~ "                                (root ì „ìš©)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add <사용자이름>        <사용자이름>을 그룹의 멤버로 추가합니다\n"
-#~ "  -d, --delete <사용자이름>     그룹 멤버에서 <사용자이름>을 제거합니다\n"
-#~ "  -p, --purge                   그룹에서 모든 멤버를 없앱니다\n"
-#~ "  -l, --list                    그룹의 멤버 목록을 표시합니다\n"
-#~ "\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s을(를) 만들 수 없습니다\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: %s을(를) chown할 수 없습니다\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/nb.po 1:4.1.4.2+svn3283-2ubuntu1/po/nb.po
--- 1:4.1.4.2+svn3283-2/po/nb.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/nb.po	2010-11-24 14:47:24.000000000 +0000
@@ -15,10 +15,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -57,18 +57,15 @@ msgstr "%s: slapp opp for minne\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: kan ikke slette %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: ugyldig hjemmemappe «%s»\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: kunne ikke fjerne innslaget «%s» fra %s\n"
 
@@ -77,60 +74,49 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: Kan ikke finne størrelse på %s: %s\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: gi nytt navn: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: kunne ikke endre navn på mappa %s til %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: kunne ikke endre navn på mappa %s til %s\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: Kan ikke finne størrelse på %s: %s\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: kan ikke slette %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: klarer ikke å oppdatere shadow-fila\n"
 
@@ -141,13 +127,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: gi nytt navn: %s"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: kan ikke åpne %s\n"
 
@@ -200,7 +184,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: klarte ikke å låse opp %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -234,13 +217,12 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 # , 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"
 
@@ -255,13 +237,12 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system UID (no more available UIDs)\n"
 msgstr "%s: klarer ikke å få entydig UID (ingen flere UID-er tilgjengelig)\n"
 
@@ -363,25 +344,6 @@ msgid "No"
 msgstr "Nei"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -627,16 +589,6 @@ msgstr "%s: feltene er for lange\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --crypt-method            the crypt method (one of %s)\n"
-#| "  -e, --encrypted               supplied passwords are encrypted\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
-#| "%s\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -700,7 +652,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: feil funnet, endringer er ikke utført\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -718,9 +669,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -730,7 +678,6 @@ msgstr ""
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: linje %d: bruker «%s» finnes ikke\n"
 
@@ -772,17 +719,14 @@ msgstr "%s: ugyldig inntasting: %s\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s er et ugyldig skall.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: bruker %s finnes ikke\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: advarsel: %s er ikke eid av %s\n"
 
@@ -816,7 +760,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "faillog: klarte ikke finne oppføring for UID %d\n"
 
@@ -833,17 +776,14 @@ msgid " [%lds lock]"
 msgstr " [%lds lås]"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
 msgid "faillog: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Klarte ikke tilbakestille feiltelling for UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
 msgid "faillog: Failed to set max for UID %lu\n"
 msgstr "faillog: Klarte ikke sette maksimum for UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
 msgid "faillog: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Klarte ikke sette låsetid for UID %d\n"
 
@@ -862,7 +802,6 @@ msgid "faillog: Cannot get the size of %
 msgstr "faillog: Kan ikke finne størrelse av %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -886,10 +825,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -899,7 +834,6 @@ msgstr ""
 "Valgene kan ikke kobles sammen, unntatt for -A og -M-\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Valgene kan ikke kombineres.\n"
 
@@ -955,7 +889,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Ikke en tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -963,9 +896,6 @@ msgid ""
 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"
@@ -981,9 +911,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -1060,7 +987,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: slapp opp for minne. Kan ikke oppdatere %s.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1068,9 +994,6 @@ msgid ""
 msgstr "Bruk: %s [input]\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1256,7 +1179,6 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
 msgid "lastlog: Failed to get the entry for UID %lu\n"
 msgstr "lastlog: Klarte ikke hente innslag for UID %d\n"
 
@@ -1311,9 +1233,6 @@ msgstr ""
 "[Frakobling omgått - root-innlogging tillatt.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1340,7 +1259,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Maks. antall forsøk er overskredet (%d)\n"
 
@@ -1465,12 +1383,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: linje %d: kan ikke oppdatere passord\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: linje %d: mkdir mislyktes\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: linje %d: chown mislyktes\n"
 
@@ -1600,17 +1516,14 @@ msgid "The password for %s is unchanged.
 msgstr "Passordet for %s er uendret.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Passordet er endret."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Varsel når passordet snart går ut på dato"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n"
 
@@ -1619,7 +1532,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1658,22 +1570,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "bruker «%s»: programmet «%s» finnes ikke\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: kan ikke låse fila %s\n"
 
@@ -1709,7 +1617,6 @@ msgid "Usage: pwconv\n"
 msgstr "Bruk: pwconv\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: klarer ikke å omskrive fila\n"
 
@@ -1736,7 +1643,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: kan ikke låse fila %s\n"
 
@@ -1862,12 +1768,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: klarer ikke å åpne ny «defaults»-fil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linje %d: chown mislyktes\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: gi nytt navn: %s"
 
@@ -1880,7 +1784,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: for mange grupper oppgitt (maks %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1888,9 +1791,6 @@ msgid ""
 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"
@@ -1919,9 +1819,6 @@ msgid ""
 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"
@@ -1930,9 +1827,6 @@ msgstr ""
 "                                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"
@@ -1945,9 +1839,6 @@ msgid ""
 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"
@@ -1963,9 +1854,6 @@ msgid ""
 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"
@@ -1974,9 +1862,6 @@ msgstr ""
 "                                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"
@@ -2090,7 +1975,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu er ikke entydig\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
@@ -2134,7 +2018,6 @@ msgstr ""
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: advarsel: kan ikke fjerne %s: %s"
 
@@ -2147,18 +2030,15 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: klarte ikke minske privilegier (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: Kan ikke finne størrelse på %s: %s\n"
 
 # , c-format
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: kunne ikke fjerne innslaget «%s» fra %s\n"
 
@@ -2171,7 +2051,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: brukeren %s er pålogget\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: ugyldig hjemmemappe «%s»\n"
 
@@ -2185,36 +2064,6 @@ msgid "%s: error removing directory %s\n
 msgstr "%s: feil ved fjerning av mappe %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2303,7 +2152,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
@@ -2319,14 +2167,14 @@ msgstr "%s: kunne ikke endre navn på ma
 #, c-format
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: klarte ikke å kopiere lastlog-innslaget for bruker %lu til bruker %lu: "
-"%s\n"
+"%s: klarte ikke å kopiere lastlog-innslaget for bruker %lu til bruker %lu: %"
+"s\n"
 
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: klarte ikke å kopiere faillog-innslaget for bruker %lu til bruker %lu: "
-"%s\n"
+"%s: klarte ikke å kopiere faillog-innslaget for bruker %lu til bruker %lu: %"
+"s\n"
 
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
@@ -2349,7 +2197,6 @@ msgstr ""
 "Bruk kommandoen «%s» til dette.\n"
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2382,17 +2229,14 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s er ikke endret\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "klarte ikke å endre navn på mailbox"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: klarte ikke minske privilegier (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Kunne ikke låse fil"
 
@@ -2400,7 +2244,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: klarte ikke minske privilegier (%s)\n"
 
@@ -2416,22 +2259,18 @@ msgstr "%s: klarer ikke å åpne gruppef
 
 # , c-format
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: klarte ikke å låse opp %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "klarte ikke å endre navn på mailbox"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "klarte ikke å endre eier av mailbox"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "klarte ikke å endre navn på mailbox"
 
@@ -2440,10 +2279,119 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: kan ikke gjenopprette %s: %s (dine endringer befinner seg i %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ugyldig basismappe «%s»\n"
 
+# , c-format
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s er et ugyldig skall.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Bruk: %s [option] GRUPPE\n"
+"\n"
+"Valg:\n"
+"  -a, --add BRUKER             legg til BRUKER i GRUPPE\n"
+"  -d, --delete BRUKER         fjern BRUKER fra GRUPPE\n"
+"  -r, --remove-password      fjern GRUPPEs passord\n"
+"  -R, --restrict                     tilgang til GRUPPE bare for medlemmer\n"
+"  -M, --members BRUKER –  oppgi lista over medlemmer i GRUPPE\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators ADMIN,...\n"
+"                                oppgi liste over administratorer for GRUPPE\n"
+"Valgene kan ikke kobles sammen, unntatt for -A og -M-\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Brul: groupmems [valg] [handling]\n"
+"\n"
+"Valg:\n"
+"  -g, --group gruppenavn         endre gruppenavn i stedet for brukerens "
+"gruppe\n"
+"                                (bare root)\n"
+"\n"
+"Handlinger:\n"
+"  -a, --add brukernavn           legg til brukernavn til medlemmer av "
+"gruppa\n"
+"  -d, --delete brukernavn        fjern brukernavn fra medlemmer av gruppa\n"
+"  -p, --purge                   slett alle medlemmer av gruppa\n"
+"  -l, --list                    list opp medlemmer av gruppa\n"
+"\n"
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [input]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: kan ikke opprette %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: kan ikke chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Bruk: vipw [valg]\n"
+"\n"
+"Valg:\n"
+"  -g, --group                   rediger gruppedatabasen\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -p, --passwd                  rediger passwd-databasen\n"
+"  -q., --quiet                  ordknapp kjøremåte\n"
+"  -s, --shadow                  rediger shadow- eller gshadow-databasen\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2478,76 +2426,6 @@ msgstr "%s: ugyldig basismappe «%s»\n"
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Bruk: %s [option] GRUPPE\n"
-#~ "\n"
-#~ "Valg:\n"
-#~ "  -a, --add BRUKER             legg til BRUKER i GRUPPE\n"
-#~ "  -d, --delete BRUKER         fjern BRUKER fra GRUPPE\n"
-#~ "  -r, --remove-password      fjern GRUPPEs passord\n"
-#~ "  -R, --restrict                     tilgang til GRUPPE bare for "
-#~ "medlemmer\n"
-#~ "  -M, --members BRUKER –  oppgi lista over medlemmer i GRUPPE\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Brul: groupmems [valg] [handling]\n"
-#~ "\n"
-#~ "Valg:\n"
-#~ "  -g, --group gruppenavn         endre gruppenavn i stedet for brukerens "
-#~ "gruppe\n"
-#~ "                                (bare root)\n"
-#~ "\n"
-#~ "Handlinger:\n"
-#~ "  -a, --add brukernavn           legg til brukernavn til medlemmer av "
-#~ "gruppa\n"
-#~ "  -d, --delete brukernavn        fjern brukernavn fra medlemmer av "
-#~ "gruppa\n"
-#~ "  -p, --purge                   slett alle medlemmer av gruppa\n"
-#~ "  -l, --list                    list opp medlemmer av gruppa\n"
-#~ "\n"
-
-#, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Bruk: %s [input]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: kan ikke opprette %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: kan ikke chown %s\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/ne.po 1:4.1.4.2+svn3283-2ubuntu1/po/ne.po
--- 1:4.1.4.2+svn3283-2/po/ne.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/ne.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.10.2\n"
 
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: स्मृति भन्दा बाहिर\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: अवैध गृह डाइरेक्ट्री '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: चेतावनी: हट्न सक्दैन "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: चेतावनी: हट्न सक्दैन "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: पुन:नामकरण गर्नुहोस्: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: चेतावनी: हट्न सक्दैन "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: चेतावनी: हट्न सक्दैन "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: स्याडो फाइल अद्यावधिक हुन सकेन\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: पुन:नामकरण गर्नुहोस्: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
@@ -179,17 +163,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "tty %s लाई परिवर्तन गर्न असक्षम भयो"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: अति लामो फाँट\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -223,8 +204,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -241,8 +222,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -299,7 +280,6 @@ msgid "passwd: %s\n"
 msgstr "पासवर्ड: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "पासवर्ड परिवर्तन भयो ।"
 
@@ -343,7 +323,6 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) असफल भयो\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "होइन\n"
 
@@ -460,12 +439,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM आधिकरण असफल भयो\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: फाइलहरू ताल्चा मार्न सकिएन, पछि फेरी प्रयास गर्नुहोस्\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
@@ -474,7 +451,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: फोर्क गर्दा असफल: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
@@ -514,7 +490,6 @@ msgid "Full Name"
 msgstr "पुरा नाम"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -558,7 +533,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: अवैध गृह फोन: '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: '%s' ले गैरकानूनी क्यारेक्टरहरू समाविष्ट गर्दछ\n"
 
@@ -633,12 +607,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: रेखा %d: नयाँ पासवर्ड हराइरहेको छ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: समूह %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: रेखा %d: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
 
@@ -647,7 +619,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: त्रुटि पत्ता लाग्यो, परिवर्तनहरू उपेक्षा गरियो\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -698,7 +669,6 @@ msgid "Login Shell"
 msgstr "शेल लगइन"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "तपाईँ यस को लागि शेल परिवर्तन गर्न सक्नुहुन्न %s ।\n"
 
@@ -711,17 +681,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: अवैध प्रविष्टि: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s अवैध शेल हो ।\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: चेतावनी: %s चाँहि %s को स्वामित्वमा छैन\n"
 
@@ -762,7 +729,6 @@ msgid "Login       Failures Maximum Late
 msgstr "सबैभन्दा पछि                  असफल भएको                           लगइन\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds left]"
 
@@ -787,7 +753,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "अज्ञात प्रयोगकर्ता: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
@@ -796,7 +761,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -825,12 +789,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "%s को लागि पासवर्ड परिवर्तन गर्न सकिदैन ।\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "%s को लागि पासवर्ड परिवर्तन गर्न सकिदैन ।\n"
 
@@ -839,7 +801,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: स्याडो समूह पासवर्डहरुलाई -A को आवश्यक छ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: समूह %s अवस्थित छैन\n"
 
@@ -881,7 +842,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: tty होइन\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -914,7 +874,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s वैध समूह नाम होइन\n"
 
@@ -927,7 +886,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K लाई KEY=VALUE को आवश्यक पर्दछ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: समूह %s अवस्थित छ\n"
 
@@ -939,7 +897,6 @@ msgid "Usage: groupdel group\n"
 msgstr "उपयोग: groupdel समूह नाम\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
@@ -948,12 +905,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: NIS ग्राहकमा प्रयोगकर्ता '%s' परिवर्तन गर्न सकिदैन ।\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: समूह %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: समूह '%s' NIS समूह हो ।\n"
 
@@ -962,7 +917,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS मास्टर हो\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: प्रयोगकर्ता %s NIS प्रयोगकर्ता हो\n"
 
@@ -971,7 +925,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: update_group मा स्मृति भन्दा बाहिर\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1067,7 +1020,6 @@ msgid "invalid group name '%s'\n"
 msgstr "अवैध समूह नाम '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "अवैध समूह नाम '%s'\n"
 
@@ -1084,7 +1036,6 @@ msgid "no matching group file entry in %
 msgstr "यो %s मा समूह फाइल प्रविष्टि मेल खाएको छैन\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "यस %s मा '%s' समूह थप्नुहुन्छ ?"
 
@@ -1120,17 +1071,14 @@ msgid "%s: no changes\n"
 msgstr "%s: कुनै परिवर्तनहरू छैन\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "उपयोग: groupdel समूह नाम\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "उपयोग: groupdel समूह नाम\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
 
@@ -1219,9 +1167,6 @@ msgstr ""
 "[बाइपास जडान विच्छेदन भयो --मूल लगइनलाई अनुमति छ । ]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1250,7 +1195,6 @@ msgid "login: "
 msgstr "लगइन: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "बढेको प्रयासहरको अधिक्तम संख्या (%d)\n"
 
@@ -1299,7 +1243,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "उपयोग: id\n"
 
@@ -1336,7 +1279,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: समूह %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
 
@@ -1369,12 +1311,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: रेखा %d: पासवर्ड अद्यावधिक गर्न सकिएन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: रेखा %d: mkdir असफल भयो\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: रेखा %d: chown असफल भयो\n"
 
@@ -1501,17 +1441,14 @@ msgid "The password for %s is unchanged.
 msgstr "%s को लागि पासवर्ड परिवर्तन हुन सकिदैन ।\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "पासवर्ड परिवर्तन भयो ।"
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "पासवर्ड समाप्ति चेतावनी"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "उपयोग: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1520,7 +1457,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1539,42 +1475,34 @@ msgid "invalid user name '%s'\n"
 msgstr "अवैध प्रयोगकर्ता नाम '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "अवैध प्रयोगकर्ता नाम '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "प्रयोगकर्ता %s: समूह छैन %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "प्रयोगकर्ता %s: डाइरेक्ट्री %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "प्रयोगकर्ता %s: कार्यक्रम %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: फाइल %s ताल्चा मार्न सकिदैन\n"
 
@@ -1602,17 +1530,14 @@ msgid "user %s: last password change in 
 msgstr "प्रयोगकर्ता %s: अन्तिम पासवर्ड भविष्यमा परिवर्तन हुनेछ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "उपयोग: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: फाइल पुन:लेखन गर्न सकिएन\n"
 
@@ -1621,7 +1546,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "उपयोग: id\n"
 
@@ -1641,7 +1565,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: फाइल %s ताल्चा मार्न सकिदैन\n"
 
@@ -1717,12 +1640,10 @@ msgstr ""
 "(उपेक्षा गरियो)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM आधिकरण असफल भयो\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "तपाईँ su %s मा प्रमाणिकरण हुनुहुन्न\n"
 
@@ -1767,12 +1688,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: नयाँ पूर्वनिर्धारित फाइल खोल्न सकिएन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: रेखा %d: chown असफल भयो\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: पुन:नामकरण गर्नुहोस्: %s"
 
@@ -1785,7 +1704,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: अति धेरै समूहरू निर्दिष्ट गरिएको छ (max %d) ।\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1935,7 +1853,6 @@ msgid "Setting mailbox file permissions"
 msgstr "मेल बाकस फाइल अनुमतिहरू मिलाउदै"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छ\n"
 
@@ -1951,12 +1868,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: यो %s सिर्जना गर्न सकिदैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u अद्वितिय होइन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
@@ -1992,13 +1907,10 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s: समूह %s हटाउन सकिदैन जुन अर्को प्रयोगकर्ताको लागि प्राथमिक समूह हो ।\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: चेतावनी: हट्न सक्दैन "
 
@@ -2011,17 +1923,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
@@ -2034,7 +1943,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: प्रयोगकर्ता %s हालै लग गरियो\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: अवैध गृह डाइरेक्ट्री '%s'\n"
 
@@ -2109,7 +2017,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छ\n"
 
@@ -2140,7 +2047,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
@@ -2178,7 +2084,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2201,31 +2106,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s परिवर्तन हुदैन\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "मेल बक्सलाई पुन:नामकरण गर्न असफल भयो"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "फाइल ताल्चा मार्न सकिदैन"
 
@@ -2233,7 +2131,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
@@ -2248,22 +2145,18 @@ msgid "failed to open scratch file"
 msgstr "%s: समूह फाइल खोल्न असक्षम भयो\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: अति लामो फाँट\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "मेल बक्सलाई पुन:नामकरण गर्न असफल भयो"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "मेलबक्स प्रापक परिवर्तन गर्न असफल भयो"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "मेल बक्सलाई पुन:नामकरण गर्न असफल भयो"
 
@@ -2272,10 +2165,92 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: पुन:भण्डारण गर्न सकिदैन %s: %s (तपाईँको परिवर्तनहरू %s मा छ)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: अवैध डाइरेक्ट्री '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s अवैध शेल हो ।\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "उपयोग: %s [आगत]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: यो %s सिर्जना गर्न सकिदैन\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: स्वामित्व परिवर्तन गर्न सकिदैन %s\n"
+
+#, fuzzy
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"उपयोग: vipw [options]\n"
+"\n"
+"विकल्पहरू:\n"
+"  -g, --group\t\t\tसमूह डेटाबेस सम्पादन गर्दछ\n"
+"  -h, --help\t\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्दछ\n"
+"  -p, --passwd\t\t\tपासवर्ड डेटाबेस सम्पादन गर्दछ\n"
+"  -q, --quiet \t\t\tअन्त्य मोड\n"
+"  -s, --shadow\t\t\t स्याडो वा जि स्याडो डेटाबेस सम्पादन गर्दछ\n"
+"\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
@@ -2300,20 +2275,6 @@ msgstr "%s: अवैध डाइरे
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "उपयोग: %s [आगत]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: यो %s सिर्जना गर्न सकिदैन\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: स्वामित्व परिवर्तन गर्न सकिदैन %s\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/nl.po 1:4.1.4.2+svn3283-2ubuntu1/po/nl.po
--- 1:4.1.4.2+svn3283-2/po/nl.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/nl.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -50,17 +50,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: onvoldoende geheugen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: kan bestand %s niet bijwerken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: ongeldige thuismap '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
@@ -69,57 +66,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: kan map %s niet aanmaken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: waarschuwing: kan niet verwijderen "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: waarschuwing: kan niet verwijderen "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: hernoemen: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: waarschuwing: kan niet verwijderen "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: kan map %s niet aanmaken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: waarschuwing: kan niet verwijderen "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: kan bestand %s niet bijwerken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: kan schaduwbestand niet bijwerken\n"
 
@@ -130,12 +116,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: hernoemen: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: kan bestand %s niet openen\n"
 
@@ -178,17 +162,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Kan tty %s niet veranderen"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: velden zijn te lang\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -222,8 +203,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -240,8 +221,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -298,7 +279,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Wachtwoord is veranderd."
 
@@ -342,30 +322,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) is mislukt\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Nee\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -478,12 +438,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-authentificatie is mislukt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: kan bestanden niet vergrendelen; probeer het later nog eens\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: kan bestand %s niet openen\n"
 
@@ -492,7 +450,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: afsplisten van proces is mislukt: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
@@ -533,7 +490,6 @@ msgid "Full Name"
 msgstr "Volledige naam"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -577,7 +533,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: '%s' voor 'telefoon thuis' is ongeldig\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: '%s' bevat ongeldige tekens\n"
 
@@ -651,12 +606,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: regel %d: nieuw wachtwoord ontbreekt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: groep %s bestaan niet\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: regel %d: kan ingang niet bijwerken\n"
 
@@ -665,7 +618,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: fouten gedetecteerd, aanpassingen genegeerd\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -714,7 +666,6 @@ msgid "Login Shell"
 msgstr "Aanmeld-shell"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "U mag de shell voor %s niet aanpassen.\n"
 
@@ -727,17 +678,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: ongeldige ingang: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s is geen geldige shell.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: gebruiker %s bestaat niet\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: waarschuwing: %s is niet van %s\n"
 
@@ -778,7 +726,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Gebruiker Missingen Maximum Laatste          Op\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds over]"
 
@@ -803,7 +750,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Onbekende gebruiker %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: kan bestand %s niet openen\n"
 
@@ -812,7 +758,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -841,12 +786,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Het wachtwoord voor %s kan niet veranderd worden.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Het wachtwoord voor %s kan niet veranderd worden.\n"
 
@@ -855,7 +798,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: schaduw groepwachtwoorden zijn vereist voor -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: groep %s bestaan niet\n"
 
@@ -897,7 +839,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Is geen tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -930,7 +871,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s is geen geldige groepsnaam\n"
 
@@ -943,12 +883,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K vereist SLEUTEL=WAARDE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: groep %s bestaat reeds\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Lid bestaat reeds\n"
 
@@ -956,7 +894,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Gebruik: groupdel groep\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
@@ -965,12 +902,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: groep %s bestaan niet\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: groep '%s' is een NIS-groep.\n"
 
@@ -979,7 +914,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s is de NIS-master\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: gebruiker %s is een NIS-gebruiker\n"
 
@@ -988,7 +922,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: onvoldoende geheugen in update_group()\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1084,7 +1017,6 @@ msgid "invalid group name '%s'\n"
 msgstr "ongeldige groepsnaam '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "ongeldige groepsnaam '%s'\n"
 
@@ -1101,7 +1033,6 @@ msgid "no matching group file entry in %
 msgstr "geen ingang in %s die overeenkomt met die in het 'group'-bestand\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "groep '%s' toevoegen in %s?"
 
@@ -1137,17 +1068,14 @@ msgid "%s: no changes\n"
 msgstr "%s: geen aanpassingen\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Gebruik: groupdel groep\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Gebruik: groupdel groep\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: kan bestand %s niet bijwerken\n"
 
@@ -1237,9 +1165,6 @@ msgstr ""
 "[Verbinding verbreken omzeild -- aanmelden van root is toegelaten.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1268,7 +1193,6 @@ msgid "login: "
 msgstr "gebruikersnaam: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Maximaal aantal pogingen overschreden (%d)\n"
 
@@ -1318,7 +1242,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Gebruik: id\n"
 
@@ -1355,7 +1278,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: groep %s bestaan niet\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: ongeldige gebruikersnaam '%s'\n"
 
@@ -1388,12 +1310,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: regel %d: kan wachtwoord niet bijwerken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: regel %d: mkdir is mislukt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: regel %d: chown is mislukt\n"
 
@@ -1402,33 +1322,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: regel %d: kan ingang niet bijwerken\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1556,17 +1449,14 @@ msgid "The password for %s is unchanged.
 msgstr "Het wachtwoord voor %s is niet veranderd.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Wachtwoord is veranderd."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Waarschuwing voor wachtwoordverval"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n"
 
@@ -1575,7 +1465,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1594,42 +1483,34 @@ msgid "invalid user name '%s'\n"
 msgstr "ongeldige gebruikersnaam '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "ongeldige gebruikersnaam '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "gebruiker %s: geen groep %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "gebruiker %s: map %s bestaat niet\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "gebruiker %s: programma %s bestaat niet\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: kan map %s niet aanmaken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: kan map %s niet aanmaken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: kan map %s niet aanmaken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: kan bestand %s niet vergrendelen\n"
 
@@ -1657,17 +1538,14 @@ msgid "user %s: last password change in 
 msgstr "gebruiker %s: laatste wachtwoordverandering is in de toekomst\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: kan bestand %s niet openen\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Gebruik: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: kan bestand niet herschrijven\n"
 
@@ -1676,7 +1554,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Gebruik: id\n"
 
@@ -1696,7 +1573,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: kan bestand %s niet vergrendelen\n"
 
@@ -1772,12 +1648,10 @@ msgstr ""
 "(Genegeerd)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM-authentificatie is mislukt\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "U bent niet gerechtigd om 'su %s' uit te voeren\n"
 
@@ -1822,12 +1696,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: kan het nieuwe standaardwaardenbestand niet openen\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: regel %d: chown is mislukt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: hernoemen: %s"
 
@@ -1840,7 +1712,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: te veel groepen gespecificeerd (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1992,7 +1863,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Bestandsrechten van mailbox-bestand worden ingesteld"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: gebruiker %s bestaat al\n"
 
@@ -2008,12 +1878,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: kan %s niet aanmaken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u is niet uniek\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: kan map %s niet aanmaken\n"
 
@@ -2051,15 +1919,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: kan de groep %s niet verwijderen, daar deze de primaire groep van een "
 "andere gebruiker is.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: waarschuwing: kan niet verwijderen "
 
@@ -2072,17 +1937,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
@@ -2095,7 +1957,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: gebruiker %s is momenteel aangemeld\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: ongeldige thuismap '%s'\n"
 
@@ -2176,7 +2037,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: gebruiker %s bestaat al\n"
 
@@ -2193,7 +2053,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Lid bestaat reeds\n"
 
@@ -2208,7 +2067,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: kan map %s niet aanmaken\n"
 
@@ -2247,7 +2105,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2270,31 +2127,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s is onveranderd\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "hernoemen van de e-mailbox is mislukt"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Kon bestand niet vergrendelen"
 
@@ -2302,7 +2152,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
@@ -2313,27 +2162,22 @@ msgid "Couldn't make backup"
 msgstr "Kon geen reservekopie maken"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Kan groepbestand niet openen\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: velden zijn te lang\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "hernoemen van de e-mailbox is mislukt"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "aanpassen van de eigenaar van de e-mailbox is mislukt"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "hernoemen van de e-mailbox is mislukt"
 
@@ -2342,10 +2186,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: kan %s niet herstellen: %s (uw aanpassingen staan in %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ongeldige basismap '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s is geen geldige shell.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Gebruik: %s [invoer]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: kan %s niet aanmaken\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: kan chown %s niet uitvoeren\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Gebruik: vipw [opties]\n"
+"\n"
+"Opties:\n"
+"  -g, --group                   de groepdatabase bewerken\n"
+"  -h, --help                    toon deze boodschap en sluit af\n"
+"  -p, --passwd                  passwd-database bewerken\n"
+"  -q, --quiet                   stille modus\n"
+"  -s, --shadow                  shadow- of gshadow-database bewerken\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2380,20 +2305,6 @@ msgstr "%s: ongeldige basismap '%s'\n"
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Gebruik: %s [invoer]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: kan %s niet aanmaken\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: kan chown %s niet uitvoeren\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/nn.po 1:4.1.4.2+svn3283-2ubuntu1/po/nn.po
--- 1:4.1.4.2+svn3283-2/po/nn.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/nn.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -49,7 +49,6 @@ msgid "%s: out of memory\n"
 msgstr "%s: tomt for minne\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: klarer ikkje oppdatere fila %s\n"
 
@@ -58,7 +57,6 @@ msgid "%s: %s is neither a directory, no
 msgstr "%s: ugyldig heimemappe «%s»\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
@@ -67,57 +65,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: åtvaring: kan ikkje fjerna "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: åtvaring: kan ikkje fjerna "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: gje nytt namn: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: åtvaring: kan ikkje fjerna "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: åtvaring: kan ikkje fjerna "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: klarer ikkje oppdatere fila %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n"
 
@@ -128,12 +115,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: gje nytt namn: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: klarer ikkje opna fila %s\n"
 
@@ -176,12 +161,10 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Klarer ikkje skifta tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: felta er for lange\n"
 
@@ -215,8 +198,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -233,8 +216,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -292,7 +275,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Passord er endra."
 
@@ -440,12 +422,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-autentisering feila\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: klarer ikkje låsa filer, prøv igjen seinare\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: klarer ikkje opna fila %s\n"
 
@@ -582,7 +562,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: do not include \"l\" with other flags\n"
 msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: ta ikkje med «l» med andre flagg\n"
 
@@ -603,12 +582,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: linje %d: manglar nytt passord\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: gruppe %s eksisterer ikkje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: linje %d: kan ikkje oppdatere oppføring\n"
 
@@ -617,7 +594,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: feil funne, endringar er ikkje utført\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -660,7 +636,6 @@ msgid "Login Shell"
 msgstr "Innloggingskal"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Du treng ikkje endra skal for %s.\n"
 
@@ -673,17 +648,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ugyldig inntasting: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s er eit ugyldig skal.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: brukar %s finst ikkje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: åtvaring: %s er ikkje eigd av %s\n"
 
@@ -724,7 +696,6 @@ msgid "Login       Failures Maximum Late
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds igjen]"
 
@@ -749,7 +720,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Ukjent brukar: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: klarer ikkje opna fila %s\n"
 
@@ -758,7 +728,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -787,12 +756,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Passordet for %s kan ikkje endrast.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Passordet for %s kan ikkje endrast.\n"
 
@@ -801,7 +768,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: skuggepassord for gruppe krevst for -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: gruppe %s eksisterer ikkje\n"
 
@@ -843,7 +809,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Ikkje ein tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -876,7 +841,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s er ikkje eit gyldig gruppenamn\n"
 
@@ -889,7 +853,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O krev NAME=VERDI\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: gruppa %s finst allereie\n"
 
@@ -901,7 +864,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Bruk: goupdel gruppe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
@@ -910,7 +872,6 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: klarer ikkje endra brukar «%s» på NIS-klient.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppe %s eksisterer ikkje\n"
 
@@ -923,7 +884,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-hovudet\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: brukar %s er ikkje ein NIS brukar\n"
 
@@ -932,7 +892,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: slapp opp for minne i update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1079,17 +1038,14 @@ msgid "%s: no changes\n"
 msgstr "%s: ingen endringar\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Bruk: goupdel gruppe\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Bruk: goupdel gruppe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: klarer ikkje oppdatere fila %s\n"
 
@@ -1169,9 +1125,6 @@ msgstr ""
 "[Fråkopling omgått -- innlogging av root er tillete.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1249,7 +1202,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Bruk: id\n"
 
@@ -1286,7 +1238,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: gruppe %s eksisterer ikkje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: ugyldig brukarnamn «%s»\n"
 
@@ -1319,12 +1270,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: linje %d: klarer ikkje oppdatere passord\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: linje %d: mkdir feila\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: linje %d: chown feila\n"
 
@@ -1428,17 +1377,14 @@ msgid "The password for %s is unchanged.
 msgstr "Passordet til %s er ikkje endra.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Passord er endra."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Åtvaring for utgått passord"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n"
 
@@ -1447,7 +1393,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1466,42 +1411,34 @@ msgid "invalid user name '%s'\n"
 msgstr "ugyldig brukarnamn «%s»\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "ugyldig brukarnamn «%s»\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "brukar %s: inga gruppe %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "brukar %s: mappe %s finst ikkje\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "brukar %s: program %s finst ikkje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: klarer ikkje låse fila %s\n"
 
@@ -1529,17 +1466,14 @@ msgid "user %s: last password change in 
 msgstr "brukar %s: siste passordendring i framtida\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: klarer ikkje opna fila %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Bruk: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: klarer ikkje skriva ny fila\n"
 
@@ -1548,7 +1482,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Bruk: id\n"
 
@@ -1568,7 +1501,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: klarer ikkje låse fila %s\n"
 
@@ -1632,12 +1564,10 @@ msgstr ""
 "(Ignorert)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM-autentisering feila\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Du er ikkje autorisert til su %s\n"
 
@@ -1682,12 +1612,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: klarer ikkje opna fil for standardverdiar\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linje %d: chown feila\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: gje nytt namn: %s"
 
@@ -1700,7 +1628,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: for mange grupper spesifisert (maks %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1850,7 +1777,6 @@ msgid "Setting mailbox file permissions"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: brukar %s finst\n"
 
@@ -1870,7 +1796,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: gid %u er ikkje unikt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
@@ -1900,7 +1825,6 @@ msgid "%s: group %s is the primary group
 msgstr "%s: klarer ikkje fjerna primærgruppa til brukaren.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: åtvaring: kan ikkje fjerna "
 
@@ -1913,17 +1837,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: klarer ikkje oppdatere fila %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
@@ -1988,7 +1909,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: brukar %s finst\n"
 
@@ -2019,7 +1939,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
@@ -2057,7 +1976,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2084,16 +2002,12 @@ msgid "%s: failed to remove %s\n"
 msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s er ikkje endra\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "klarte ikkje endra namn på mailbox"
 
@@ -2102,7 +2016,6 @@ msgid "failed to drop privileges"
 msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Klarte ikkje låsa fil"
 
@@ -2123,22 +2036,18 @@ msgid "failed to open scratch file"
 msgstr "%s: klarer ikkje opna gruppefil\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: felta er for lange\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "klarte ikkje endra namn på mailbox"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "klarte ikke å endra eigar av mailbox"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "klarte ikkje endra namn på mailbox"
 
@@ -2150,19 +2059,78 @@ msgstr "%s: klarer ikkje gjenoppretta %s
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ugyldig startmappe «%s»\n"
 
-#, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Bruk: %s [inndata]\n"
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s er eit ugyldig skal.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: kan ikkje oppretta %s\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: kan ikkje chown %s\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [inndata]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: kan ikkje oppretta %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: kan ikkje chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Password set to expire."
diff -pruN 1:4.1.4.2+svn3283-2/po/pl.po 1:4.1.4.2+svn3283-2ubuntu1/po/pl.po
--- 1:4.1.4.2+svn3283-2/po/pl.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/pl.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
@@ -52,17 +52,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: brak pamięci\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: nie można zaktualizować pliku %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: nieprawidłowy katalog domowy '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
@@ -71,57 +68,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: ostrzeżenie: nie można usunąć "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: ostrzeżenie: nie można usunąć "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: zmiana nazwy: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: ostrzeżenie: nie można usunąć "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: ostrzeżenie: nie można usunąć "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: nie można zaktualizować pliku %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami\n"
 
@@ -132,12 +118,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: zmiana nazwy: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: nie można otworzyć pliku %s\n"
 
@@ -180,17 +164,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Nie można zmienić tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: pola zbyt długie\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -227,8 +208,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -245,8 +226,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -303,7 +284,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Hasło zmienione."
 
@@ -347,30 +327,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) nie powiodło się\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Nie\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -486,12 +446,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: błąd podczas uwierzytelniania przez PAM\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: nie można zablokować plików, spróbuj później\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: nie można otworzyć pliku %s\n"
 
@@ -500,7 +458,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: failure forking: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
@@ -541,7 +498,6 @@ msgid "Full Name"
 msgstr "ImiÄ™ i nazwisko"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -585,7 +541,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: nieprawidłowy numer telefonu domowego: '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: '%s' zawiera nieprawidłowe znaki\n"
 
@@ -660,12 +615,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: linia %d: brakuje nowego hasła\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: grupa %s nie istnieje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: linia %d: nie można zaktualizować wpisu\n"
 
@@ -674,7 +627,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: wykryto błąd, zignorowano modyfikacje\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -723,7 +675,6 @@ msgid "Login Shell"
 msgstr "Powłoka logowania"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Nie możesz zmieniać powłoki dla %s.\n"
 
@@ -736,17 +687,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Nieprawidłowy wpis: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s jest nieprawidłową powłoką.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: użytkownik %s nie istnieje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: ostrzeżenie: właścicielem %s nie jest %s\n"
 
@@ -787,7 +735,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Login       Nieudane Maks.   Ostanio                  Na\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [pozostało %lds]"
 
@@ -812,7 +759,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Nieznany użytkownik: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: nie można otworzyć pliku %s\n"
 
@@ -821,7 +767,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -850,12 +795,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Hasło dla %s nie może być zmienione.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Hasło dla %s nie może być zmienione.\n"
 
@@ -864,7 +807,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: plik z ukrytymi hasłami grup wymagany dla -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: grupa %s nie istnieje\n"
 
@@ -906,7 +848,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: To nie tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -939,7 +880,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s: nie jest prawidłową nazwą grupy\n"
 
@@ -952,12 +892,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K wymaga KLUCZ=WARTOŚĆ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: grupa %s istnieje\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Członek grupy już istnieje\n"
 
@@ -965,7 +903,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Użycie: groupdel grupa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
@@ -974,12 +911,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: nie można zmienić użytkownika '%s' na kliencie NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grupa %s nie istnieje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: grupa '%s' jest grupÄ… NIS.\n"
 
@@ -988,7 +923,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s jest głównym serwerem NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: użytkownik %s jest użytkownikiem NIS\n"
 
@@ -997,7 +931,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: zabrakło pamięci w update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1093,7 +1026,6 @@ msgid "invalid group name '%s'\n"
 msgstr "nieprawidłowa nazwa grupy '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "nieprawidłowa nazwa grupy '%s'\n"
 
@@ -1110,7 +1042,6 @@ msgid "no matching group file entry in %
 msgstr "brak pasujÄ…cego wpisu w pliku group %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "dodać grupę '%s' w %s ?"
 
@@ -1148,17 +1079,14 @@ msgid "%s: no changes\n"
 msgstr "%s: bez zmian\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Użycie: groupdel grupa\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Użycie: groupdel grupa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nie można zaktualizować pliku %s\n"
 
@@ -1247,9 +1175,6 @@ msgstr ""
 "[Rozłączenie pominięte -- zezwolenie na logowanie się roota.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1277,7 +1202,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Maksymalna ilość prób przekroczona (%d)\n"
 
@@ -1326,7 +1250,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Użycie: id\n"
 
@@ -1363,7 +1286,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: grupa %s nie istnieje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
 
@@ -1396,12 +1318,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: linia %d: nie można zaktualizować pliku z hasłami\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: linia %d: mkdir nie powiodło się\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: linia %d: chown nie powiodło się\n"
 
@@ -1410,33 +1330,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: linia %d: nie można zaktualizować wpisu\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1559,17 +1452,14 @@ msgid "The password for %s is unchanged.
 msgstr "Hasło dla %s pozostaje niezmienione.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Hasło zmienione."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Ostrzeżenie o utracie ważności hasła"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Użycie: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1578,7 +1468,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1597,42 +1486,34 @@ msgid "invalid user name '%s'\n"
 msgstr "nieprawidłowa nazwa użytkownika '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "nieprawidłowa nazwa użytkownika '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "użytkownik %s: brak grupy %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "użytkownik %s: katalog %s nie istnieje\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "użytkownik %s: program %s nie istnieje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: nie można zablokować pliku %s\n"
 
@@ -1660,17 +1541,14 @@ msgid "user %s: last password change in 
 msgstr "użytkownik %s: ostatnia zmiana hasła w przyszłości\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: nie można otworzyć pliku %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Użycie: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: nie można przepisać pliku\n"
 
@@ -1679,7 +1557,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Użycie: id\n"
 
@@ -1699,7 +1576,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: nie można zablokować pliku %s\n"
 
@@ -1773,12 +1649,10 @@ msgstr ""
 "(Zignorowano)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: błąd podczas uwierzytelniania przez PAM\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Nie masz autoryzacji by używać su %s\n"
 
@@ -1823,12 +1697,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: nie można otworzyć nowego pliku z ustawieniami domyślnymi\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linia %d: chown nie powiodło się\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: zmiana nazwy: %s"
 
@@ -1841,7 +1713,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: podano zbyt wiele grup (maks %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1993,7 +1864,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Ustawianie praw dostępu do pliku mailbox"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: użytkownik %s istnieje\n"
 
@@ -2008,12 +1878,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: nie można utworzyć %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u nie jest niepowtarzalny\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
@@ -2049,15 +1917,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: nie można usunąć grupy %s która jest grupą podstawową\n"
 "dla innego użytkownika.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: ostrzeżenie: nie można usunąć "
 
@@ -2070,17 +1935,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
@@ -2093,7 +1955,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: użytkownik %s jest aktualnie zalogowany\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: nieprawidłowy katalog domowy '%s'\n"
 
@@ -2170,7 +2031,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: użytkownik %s istnieje\n"
 
@@ -2187,7 +2047,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Członek grupy już istnieje\n"
 
@@ -2202,7 +2061,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
@@ -2241,7 +2099,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2264,31 +2121,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s jest niezmieniony\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "zmiana nazwy skrzynki pocztowej nie powiodła się"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Nie można zablokować pliku"
 
@@ -2296,7 +2146,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
@@ -2307,27 +2156,22 @@ msgid "Couldn't make backup"
 msgstr "Nie można wykonać kopii zapasowej"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Nie można otworzyć pliku z grupami\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: pola zbyt długie\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "zmiana nazwy skrzynki pocztowej nie powiodła się"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "zmiana właściciela skrzynki pocztowej nie powiodła się"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "zmiana nazwy skrzynki pocztowej nie powiodła się"
 
@@ -2336,10 +2180,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: nie można odzyskać %s: %s (twoje zmiany są w %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: nieprawidłowy katalog bazowy '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s jest nieprawidłową powłoką.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Użycie: %s [wejście]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: nie można utworzyć %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: nie można zmienić właściciela %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Użycie: vipw [opcje]\n"
+"\n"
+"Opcje:\n"
+"  -g, --group           edycja bazy group\n"
+"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"  -p, --passwd          edycja bazy passwd\n"
+"  -q, --quiet           cichy tryb pracy\n"
+"  -s, --shadow          edycja bazy shadow lub gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2374,20 +2299,6 @@ msgstr "%s: nieprawidłowy katalog bazow
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Użycie: %s [wejście]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: nie można utworzyć %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: nie można zmienić właściciela %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/pt_BR.po 1:4.1.4.2+svn3283-2ubuntu1/po/pt_BR.po
--- 1:4.1.4.2+svn3283-2/po/pt_BR.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/pt_BR.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, c-format
@@ -51,7 +51,6 @@ msgid "%s: out of memory\n"
 msgstr "%s : sem memória\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s : não foi possível atualizar arquivo %s\n"
 
@@ -60,7 +59,6 @@ msgid "%s: %s is neither a directory, no
 msgstr "%s : diretório home `%s' inválido\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
@@ -69,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s : não foi possível criar diretório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s : aviso : não foi possível remover "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s : aviso : não foi possível remover "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s : rename : %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s : aviso : não foi possível remover "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s : não foi possível criar diretório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s : aviso : não foi possível remover "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s : não foi possível atualizar arquivo %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s : não foi possível atualizar arquivo shadow\n"
 
@@ -130,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s : rename : %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s : não foi possível abrir arquivo %s\n"
 
@@ -178,17 +163,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Não foi possível mudar tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s : campos muito extensos\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -222,8 +204,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -240,8 +222,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -298,7 +280,6 @@ msgid "passwd: %s\n"
 msgstr "passwd : %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Senha modificada."
 
@@ -344,7 +325,6 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) falhou\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Não\n"
 
@@ -462,13 +442,11 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s : autenticação PAM falhou\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr ""
 "%s : não foi possível obter lock de arquivos, tente novamente mais tarde\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s : não foi possível abrir arquivo %s\n"
 
@@ -477,7 +455,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: falha iniciando: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: falha ao abandonar privilégios (%s)\n"
 
@@ -519,7 +496,6 @@ msgid "Full Name"
 msgstr "Nome Completo"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -641,12 +617,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s : linha %d : nova senha faltando\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s : grupo %s não existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s : linha %d : não foi possível atualizar entrada\n"
 
@@ -655,7 +629,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s : erro detectado, mudanças ignoradas\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -673,9 +646,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -710,7 +680,6 @@ msgid "Login Shell"
 msgstr "Shell de Login"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Você não pode mudar o shell para %s.\n"
 
@@ -723,17 +692,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s : Entrada inválida : %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s é um shell inválido.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s : usuário %s não existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s : aviso : %s não é propriedade de %s\n"
 
@@ -774,7 +740,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Login       Falhas   Máximo  Último                   Em\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds restante]"
 
@@ -799,7 +764,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Usuário Desconhecido : %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s : não foi possível abrir arquivo %s\n"
 
@@ -808,7 +772,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -837,12 +800,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "A senha para %s não pode ser modificada.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "A senha para %s não pode ser modificada.\n"
 
@@ -851,7 +812,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s : senhas de grupo shadow requeridas para -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s : grupo %s não existe\n"
 
@@ -893,7 +853,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s : Não é um tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -901,9 +860,6 @@ msgid ""
 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"
@@ -919,9 +875,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -938,7 +891,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s : %s não é um nome de grupo válido\n"
 
@@ -951,12 +903,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s : -K requer CHAVE=VALOR\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s : grupo %s existe\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Membros já existem\n"
 
@@ -964,7 +914,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Uso : groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
@@ -973,7 +922,6 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s : não foi possível mudar o usuário `%s' no cliente NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s : grupo %s não existe\n"
 
@@ -986,7 +934,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s : %s é o mestre NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s : usuário %s é um usuário NIS\n"
 
@@ -995,7 +942,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s : sem memória em update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1003,9 +949,6 @@ msgid ""
 msgstr "Uso : %s [entrada]\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1148,17 +1091,14 @@ msgid "%s: no changes\n"
 msgstr "%s : nenhuma mudança\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Uso : groupdel grupo\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Uso : groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s : não foi possível atualizar arquivo %s\n"
 
@@ -1249,9 +1189,6 @@ msgstr ""
 "[Disconexão contornada -- login de root permitido.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1280,7 +1217,6 @@ msgid "login: "
 msgstr "login:"
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Número máximo de tentativas excedido (%d)\n"
 
@@ -1329,7 +1265,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Uso : id\n"
 
@@ -1366,7 +1301,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s : grupo %s não existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s : nome de usuário '%s' inválido\n"
 
@@ -1399,12 +1333,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s : linha %d : não foi possível atualizar a senha\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s : linha %d : mkdir falhou\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s : linha %d : chown falhou\n"
 
@@ -1508,9 +1440,6 @@ msgid "The password for %s cannot be cha
 msgstr "A senha para %s não pode ser modificada.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock the password of this "
@@ -1541,17 +1470,14 @@ msgid "The password for %s is unchanged.
 msgstr "A senha para %s não foi modificada.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Senha modificada."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Aviso de Expiração de Senha"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Uso : %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1560,7 +1486,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1579,42 +1504,34 @@ msgid "invalid user name '%s'\n"
 msgstr "nome de usuário '%s' inválido\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "nome de usuário '%s' inválido\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "usuário %s : nenhum grupo %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuário %s : diretório %s não existe\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuário %s : programa %s não existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s : não foi possível criar diretório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s : não foi possível criar diretório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s : não foi possível criar diretório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s : não foi possível obter lock no arquivo %s\n"
 
@@ -1642,17 +1559,14 @@ msgid "user %s: last password change in 
 msgstr "usuário %s : última mudança de senha no futuro\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s : não foi possível abrir arquivo %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Uso : id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s : não foi possível regravar arquivo\n"
 
@@ -1661,7 +1575,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Uso : id\n"
 
@@ -1681,7 +1594,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s : não foi possível obter lock no arquivo %s\n"
 
@@ -1757,12 +1669,10 @@ msgstr ""
 "(Ignorado)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s : autenticação PAM falhou\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Você não está autorizado a usar o su para %s\n"
 
@@ -1807,12 +1717,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s : não foi possível abrir novo arquivo de padrões\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s : linha %d : chown falhou\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s : rename : %s"
 
@@ -1825,7 +1733,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s : muitos grupos especificados *máimo %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1833,9 +1740,6 @@ msgid ""
 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"
@@ -1864,9 +1768,6 @@ msgid ""
 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"
@@ -1875,9 +1776,6 @@ msgstr ""
 "                                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"
@@ -1890,9 +1788,6 @@ msgid ""
 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"
@@ -1908,9 +1803,6 @@ msgid ""
 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"
@@ -1919,9 +1811,6 @@ msgstr ""
 "                                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"
@@ -2013,7 +1902,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Configurando caixa-postal arquivos de permissao"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s : usuário %s existe\n"
 
@@ -2029,12 +1917,10 @@ msgid "%s: can't create user\n"
 msgstr "%s : não foi possível criar %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s : UID %u não é único\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s : não foi possível criar diretório %s\n"
 
@@ -2069,15 +1955,12 @@ msgstr ""
 "-r, --remove                remove o diretorio home e spool\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s : Não foi possível remover grupo %s, o qual é um grupo primário de outro "
 "usuário.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s : aviso : não foi possível remover "
 
@@ -2090,17 +1973,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: falha ao abandonar privilégios (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
@@ -2184,9 +2064,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the user's password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock this user's password.\n"
@@ -2195,7 +2072,6 @@ msgstr ""
 "Você deve arrumar a senha com usermod-p  para desbloquear esta conta.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s : usuário %s existe\n"
 
@@ -2212,7 +2088,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr "%s: the -L, -p, and -U flags são exclusivas\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Membros já existem\n"
 
@@ -2227,7 +2102,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s : não foi possível criar diretório %s\n"
 
@@ -2258,10 +2132,6 @@ msgid "failed to rename mailbox"
 msgstr "falha ao renomear caixa-postal"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "You have modified %s.\n"
-#| "You may need to modify %s for consistency.\n"
-#| "Please use the command `%s' to do so.\n"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
@@ -2272,7 +2142,6 @@ msgstr ""
 "Por favor use o comando  '%s' para faze-lo.\n"
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2295,31 +2164,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: falha ao abandonar privilégios (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s : %s não foi modificado\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "falha ao renomear caixa-postal"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: falha ao abandonar privilégios (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Não foi possível obter lock em arquivo"
 
@@ -2327,7 +2189,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: falha ao abandonar privilégios (%s)\n"
 
@@ -2342,22 +2203,18 @@ msgid "failed to open scratch file"
 msgstr "%s : não foi possível abrir arquivo de grupo\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s : campos muito extensos\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "falha ao renomear caixa-postal"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "falha au mudar o dono da caixa-postal"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "falha ao renomear caixa-postal"
 
@@ -2369,6 +2226,88 @@ msgstr "%s : não foi possível restaura
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s : diretório base `%s'inválido\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s é um shell inválido.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Uso : %s [entrada]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s : não foi possível criar %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s : não foi possível executar chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Uso: vipw [opções]\n"
+"\n"
+"Opções:\n"
+"  -g, --group                   editar base de dados de grupo\n"
+"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
+"  -p, --passwd                  editar base de dados de senhas\n"
+"  -q, --quiet                   modo quieto\n"
+"  -s, --shadow                  editar base de dados shadow ou gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2404,20 +2343,6 @@ msgstr "%s : diretório base `%s'inváli
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Uso : %s [entrada]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s : não foi possível criar %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s : não foi possível executar chown %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
@@ -2869,8 +2794,8 @@ msgstr "%s : diretório base `%s'inváli
 #~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
 #~ "is not in the passwd file.\n"
 #~ msgstr ""
-#~ "%s: não foi possivel mudar o grupo primário do usuario '%s' de %u para "
-#~ "%u, uma vez que  não se encontra no arquivo passwd.\n"
+#~ "%s: não foi possivel mudar o grupo primário do usuario '%s' de %u para %"
+#~ "u, uma vez que  não se encontra no arquivo passwd.\n"
 
 #~ msgid "%s: can't update shadow entry for %s\n"
 #~ msgstr "%s : não foi possível atualizar entrada shadow para %s\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/pt.po 1:4.1.4.2+svn3283-2ubuntu1/po/pt.po
--- 1:4.1.4.2+svn3283-2/po/pt.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/pt.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -52,17 +52,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: memória esgotada\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: não é possível apagar %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: o directório home '%s' é inválida\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: não é possível remover a entrada '%s' de %s\n"
 
@@ -71,57 +68,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: não é possível criar o directório %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: Não conseguiu obter o tamanho de %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: aviso: não é possível remover %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: renomear: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: não é possível renomear o directório %s para %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: não é possível renomear o directório %s para %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: aviso: não é possível remover %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: não é possível criar o directório %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: Não conseguiu obter o tamanho de %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: não é possível apagar %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: linha %d: o utilizador '%s' não existe\n"
 
@@ -132,12 +118,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: renomear: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: não é possível abrir %s\n"
 
@@ -188,7 +172,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: falha ao desbloquear %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -222,12 +205,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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 "
@@ -244,8 +226,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -668,9 +650,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -679,7 +658,6 @@ msgstr ""
 "                                de encriptação SHA*\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: linha %d: o utilizador '%s' não existe\n"
 
@@ -719,17 +697,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Entrada inválida: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s é uma shell inválida.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: o utilizador '%s' não existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: aviso: o %s não pertence a %s\n"
 
@@ -749,9 +724,6 @@ msgid ""
 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 "
@@ -769,7 +741,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "faillog: Falhou obter a entrada para UID %d\n"
 
@@ -785,17 +756,14 @@ msgid " [%lds lock]"
 msgstr " [%lds bloqueio]"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
 msgid "faillog: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Falhou reiniciar a contagem de falhas para o UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
 msgid "faillog: Failed to set max for UID %lu\n"
 msgstr "faillog: Falhou definir o máximo para UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
 msgid "faillog: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Falhou definir a hora de bloqueio para UID %d\n"
 
@@ -819,9 +787,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr ""
 "  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
@@ -834,9 +799,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr ""
@@ -847,10 +809,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -860,7 +818,6 @@ msgstr ""
 "Excepto para as opções -A e -M, as opções não podem ser combinadas.\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "As opções não podem ser combinadas.\n"
 
@@ -920,9 +877,6 @@ msgid ""
 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"
@@ -932,9 +886,6 @@ msgstr ""
 "                                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 "
@@ -944,9 +895,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -960,9 +908,6 @@ msgid ""
 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 "
@@ -1027,9 +972,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1045,9 +987,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr ""
@@ -1060,18 +999,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -p, --purge                   purge all members from the group\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 "  -l, --list                    list the members of the group\n"
 msgstr ""
 "  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
@@ -1086,9 +1019,6 @@ msgid "%s: only root can use the -g/--gr
 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 "
@@ -1238,7 +1168,6 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
 msgid "lastlog: Failed to get the entry for UID %lu\n"
 msgstr "lastlog: Falhou obter a entrada para UID %d\n"
 
@@ -1272,7 +1201,6 @@ msgid "       %s [-p] -r host\n"
 msgstr "            %s [-p] -r máquina\n"
 
 #, fuzzy, c-format
-#| msgid "configuration error - cannot parse %s value: '%s'"
 msgid "configuration error - cannot parse %s value: '%d'"
 msgstr ""
 "erro de configuração - não foi possível interpretar o valor de %s: '%s'"
@@ -1295,9 +1223,6 @@ msgstr ""
 "[Encerramento ultrapassado -- login de root permitido.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1326,7 +1251,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Número máximo de tentativas excedidas (%d)\n"
 
@@ -1402,9 +1326,6 @@ msgid "  -c, --crypt-method            t
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -r, --system                  create system accounts\n"
 msgstr ""
 "  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
@@ -1590,17 +1511,14 @@ msgid "The password for %s is unchanged.
 msgstr "A palavra-passe de %s não foi alterada.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Palavra-passe alterada."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Aviso de Caducidade da palavra-passe"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Utilização: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1609,7 +1527,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1644,22 +1561,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "utilizador '%s': o programa '%s' não existe\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: não é possível criar o directório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: não é possível criar o directório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: não é possível criar o directório %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: não é possível abrir %s\n"
 
@@ -1720,7 +1633,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: Não é possível determinar o seu nome de utilizador.\n"
 
@@ -1845,12 +1757,10 @@ msgstr ""
 "%s: não é possível abrir um novo ficheiro de configurações pré-definidas\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linha %d: chown %s falhou: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: renomear: %s"
 
@@ -1870,9 +1780,6 @@ msgid ""
 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"
@@ -1901,9 +1808,6 @@ msgid ""
 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"
@@ -1912,9 +1816,6 @@ msgstr ""
 "                                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"
@@ -1927,9 +1828,6 @@ msgid ""
 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"
@@ -1938,9 +1836,6 @@ msgstr ""
 "                                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 "
@@ -1951,9 +1846,6 @@ msgid ""
 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"
@@ -1962,9 +1854,6 @@ msgstr ""
 "                                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"
@@ -1976,18 +1865,12 @@ msgid "  -p, --password PASSWORD       e
 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 "
@@ -2091,7 +1974,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu não é único\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: não é possível criar o directório %s\n"
 
@@ -2132,7 +2014,6 @@ msgstr ""
 "%s: o grupo %s é o grupo primário de outro utilizador e não é removido.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: aviso: não é possível remover %s: %s"
 
@@ -2145,17 +2026,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: falhou baixar privilégios (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: Não conseguiu obter o tamanho de %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: não é possível remover a entrada '%s' de %s\n"
 
@@ -2168,15 +2046,14 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: o utilizador %s está actualmente no sistema\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: o directório home '%s' é inválida\n"
 
 #, c-format
 msgid "%s: not removing directory %s (would remove home of user %s)\n"
 msgstr ""
-"%s: o directório %s não será removido (iria remover a home do utilizador "
-"%s)\n"
+"%s: o directório %s não será removido (iria remover a home do utilizador %"
+"s)\n"
 
 #, c-format
 msgid "%s: error removing directory %s\n"
@@ -2289,7 +2166,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: não é possível criar o directório %s\n"
 
@@ -2341,45 +2217,30 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -g, --group                   edit group database\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 "  -p, --passwd                  edit passwd database\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 "  -q, --quiet                   quiet mode\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 "  -s, --shadow                  edit shadow or gshadow database\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, --user                    which user's tcb shadow file to edit\n"
 msgstr ""
 "  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
@@ -2394,17 +2255,14 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s não foi alterado\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "falha ao renomear a caixa do correio"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: falhou baixar privilégios (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Não é possível obter acesso exclusivo ao ficheiro"
 
@@ -2412,7 +2270,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: falhou baixar privilégios (%s)\n"
 
@@ -2423,27 +2280,22 @@ msgid "Couldn't make backup"
 msgstr "Não é possível efectuar cópia de segurança"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "falha ao renomear a caixa do correio"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: falha ao desbloquear %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "falha ao renomear a caixa do correio"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "a alteração do dono da caixa de correio falhou"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "falha ao renomear a caixa do correio"
 
@@ -2452,10 +2304,114 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: não é possível restaurar %s: %s (a suas alterações estão em %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: directório base inválido '%s'\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s é uma shell inválida.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Utilização: %s [opção] GRUPO\n"
+"\n"
+"Opções:\n"
+"  -a, --add UTILIZADOR\t\tacrescentar UTILIZADOR ao GRUPO\n"
+"  -d, --delete UTILIZADOR\tremover UTILIZADOR do GRUPO\n"
+"  -r, --remove-password\tremover a palavra-passe do GRUPO\n"
+"  -R, --restrict\t\trestringir o acesso ao GRUPO aos seus membros\n"
+"  -M, --members UTILIZADOR,...\tdefinir a lista de membros do GRUPO\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators ADMIN,...\n"
+"\t\t\t\tdefinir a lista de administradores do GRUPO\n"
+"Excepto para as opções -A e -M, as opções não podem ser combinadas.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Utilização: groupmems [opções] [acção]\n"
+"\n"
+"Opções:\n"
+"  -g, --group nomegrupo\tmudar nomegrupo em vez do grupo do utilizador\n"
+"\t\t\t\t(apenas root)\n"
+"\n"
+"Acções:\n"
+"  -a, --add nomeutilizador\tacrescentar nomeutilizador aos membros do grupo\n"
+"  -d, --delete nomeutilizador\tremover nomeutilizador dos membros do grupo\n"
+"  -p, --purge\t\t\tpurgar todos os membros do grupo\n"
+"  -l, --list\t\t\tlistar todos os membros do grupo\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: não é possível criar %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: não é possível efectuar o chown a %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Utilização: vipw [opções]\n"
+"  -g, --group                   editar a base de dados group\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e terminar\n"
+"  -p, --passwd                  editar a base de dados passwd\n"
+"  -q, --quit                    modo silencioso\n"
+"  -s, --shadow                  editar a base de dados shadow ou gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2489,66 +2445,6 @@ msgstr "%s: directório base inválido '
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Utilização: %s [opção] GRUPO\n"
-#~ "\n"
-#~ "Opções:\n"
-#~ "  -a, --add UTILIZADOR\t\tacrescentar UTILIZADOR ao GRUPO\n"
-#~ "  -d, --delete UTILIZADOR\tremover UTILIZADOR do GRUPO\n"
-#~ "  -r, --remove-password\tremover a palavra-passe do GRUPO\n"
-#~ "  -R, --restrict\t\trestringir o acesso ao GRUPO aos seus membros\n"
-#~ "  -M, --members UTILIZADOR,...\tdefinir a lista de membros do GRUPO\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Utilização: groupmems [opções] [acção]\n"
-#~ "\n"
-#~ "Opções:\n"
-#~ "  -g, --group nomegrupo\tmudar nomegrupo em vez do grupo do utilizador\n"
-#~ "\t\t\t\t(apenas root)\n"
-#~ "\n"
-#~ "Acções:\n"
-#~ "  -a, --add nomeutilizador\tacrescentar nomeutilizador aos membros do "
-#~ "grupo\n"
-#~ "  -d, --delete nomeutilizador\tremover nomeutilizador dos membros do "
-#~ "grupo\n"
-#~ "  -p, --purge\t\t\tpurgar todos os membros do grupo\n"
-#~ "  -l, --list\t\t\tlistar todos os membros do grupo\n"
-#~ "\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: não é possível criar %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: não é possível efectuar o chown a %s\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/ro.po 1:4.1.4.2+svn3283-2ubuntu1/po/ro.po
--- 1:4.1.4.2+svn3283-2/po/ro.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/ro.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "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"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=2; plural=n>1\n"
 "X-Generator: KBabel 1.10.2\n"
 
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: nu mai este memorie\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: nu pot actualiza fiÅŸierul %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: director personal nevalid '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: avertisment: nu pot ÅŸterge "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: avertisment: nu pot ÅŸterge "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: redenumire: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: avertisment: nu pot ÅŸterge "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: avertisment: nu pot ÅŸterge "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: nu pot actualiza fiÅŸierul %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: nu pot actualiza fiÅŸierul shadow\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: redenumire: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: nu pot deschide fiÅŸierul %s\n"
 
@@ -179,17 +163,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Nu pot schimba tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: câmpuri prea lungi\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -223,8 +204,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -241,8 +222,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -299,7 +280,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Parolă schimbată."
 
@@ -343,7 +323,6 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) a eÅŸuat\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Nu\n"
 
@@ -462,12 +441,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: autentificare PAM eşuată\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: nu pot încuia fişierele, încercaţi mai târziu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: nu pot deschide fiÅŸierul %s\n"
 
@@ -476,7 +453,6 @@ msgid "%s: failure while writing changes
 msgstr "%s : eşuare la bifurcare: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
@@ -518,7 +494,6 @@ msgid "Full Name"
 msgstr "Nume complet"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -562,7 +537,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: număr telefon acasă nevalid: '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: '%s' conţine caractere ilegale\n"
 
@@ -638,12 +612,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: linia %d: lipseşte noua parolă\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: grupul %s nu există\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: linia %d: nu pot actualiza intrarea\n"
 
@@ -652,7 +624,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: a fost detectată o eroare, schimbările sunt ignorate\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -705,7 +676,6 @@ msgid "Login Shell"
 msgstr "Autentificare consolă"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Nu puteţi schimba consola pentru %s.\n"
 
@@ -718,17 +688,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Intrare nevalidă: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s este o consolă nevalidă.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: utilizatorul %s nu există\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: avertisment: %s nu este deţinut de către %s\n"
 
@@ -769,7 +736,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Autentificare       Eşuări Maximum Ultima dată                   La\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds rămase]"
 
@@ -794,7 +760,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Utilizator necunoscut: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: nu pot deschide fiÅŸierul %s\n"
 
@@ -803,7 +768,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -832,12 +796,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Parola pentru %s nu poate fi schimbată.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Parola pentru %s nu poate fi schimbată.\n"
 
@@ -846,7 +808,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: sunt cerute parole criptate de grup pentru -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: grupul %s nu există\n"
 
@@ -888,7 +849,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: nu este un tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -921,7 +881,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s nu este un nume de grup valid\n"
 
@@ -934,7 +893,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K cere KEY=VALUE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: grupul %s există\n"
 
@@ -946,7 +904,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Utilizare: groupdel grup\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
@@ -955,12 +912,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: nu pot schimba utilizatorul '%s' pe un client NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grupul %s nu există\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: grupul '%s' este un grup NIS.\n"
 
@@ -969,7 +924,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s este stăpân NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: utilizatorul %s este un utilizator NIS\n"
 
@@ -978,7 +932,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: nu mai este memorie pentru update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1074,7 +1027,6 @@ msgid "invalid group name '%s'\n"
 msgstr "nume de grup nevalid '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "nume de grup nevalid '%s'\n"
 
@@ -1091,7 +1043,6 @@ msgid "no matching group file entry in %
 msgstr "nici o potrivire între intrările din fişierul de grupuri în %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "adaug grupul '%s' în '%s'?"
 
@@ -1127,17 +1078,14 @@ msgid "%s: no changes\n"
 msgstr "%s: nici o schimbare\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Utilizare: groupdel grup\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Utilizare: groupdel grup\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nu pot actualiza fiÅŸierul %s\n"
 
@@ -1229,9 +1177,6 @@ msgstr ""
 "[Deconectare ocolită -- autentificare permisă pentru root.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1260,7 +1205,6 @@ msgid "login: "
 msgstr "autentificare: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Numărul maxim de încercări a depăşit (%d)\n"
 
@@ -1309,7 +1253,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Utilizare: id\n"
 
@@ -1346,7 +1289,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: grupul %s nu există\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: nume utilizator nevalid '%s'\n"
 
@@ -1379,12 +1321,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: linia %d: nu pot actualiza parola\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: linia %d: eÅŸuare mkdir\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: linia %d: eÅŸuare chown\n"
 
@@ -1515,17 +1455,14 @@ msgid "The password for %s is unchanged.
 msgstr "Parola pentru %s este neschimbată.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Parolă schimbată."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Avertisment de expirare a parolei"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Folosire: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1534,7 +1471,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1553,42 +1489,34 @@ msgid "invalid user name '%s'\n"
 msgstr "nume de utilizator nevalid '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "nume de utilizator nevalid '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "utilizatorul %s: fără grup %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "utilizatorul %s: directorul %s nu există\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "utilizatorul %s: programul %s nu există\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: nu pot crea directorul %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: nu pot încuia fişierul %s\n"
 
@@ -1616,17 +1544,14 @@ msgid "user %s: last password change in 
 msgstr "utilizatorul %s: ultima schimbare de parolă s-a făcut în viitor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: nu pot deschide fiÅŸierul %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Utilizare: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: nu pot rescrie fiÅŸierul\n"
 
@@ -1635,7 +1560,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Utilizare: id\n"
 
@@ -1655,7 +1579,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: nu pot încuia fişierul %s\n"
 
@@ -1732,12 +1655,10 @@ msgstr ""
 "(Ignorat)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: autentificare PAM eşuată\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Nu sunteţi autorizat pentru su %s\n"
 
@@ -1782,12 +1703,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: nu pot deschide noile fiÅŸiere implicite\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linia %d: eÅŸuare chown\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: redenumire: %s"
 
@@ -1800,7 +1719,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: prea multe grupuri specificate (maximum %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1952,7 +1870,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Se atribuie permisiunile fişierului căsuţă de mesaje"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: utilizatorul %s există\n"
 
@@ -1968,12 +1885,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: nu pot crea %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u nu este unic\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
 
@@ -2010,14 +1925,11 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Nu pot ÅŸterge grupul %s care este un grup primar pentru alt utilizator.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: avertisment: nu pot ÅŸterge "
 
@@ -2030,17 +1942,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
@@ -2053,7 +1962,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: utilizatorul %s este autentificat în acest moment\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: director personal nevalid '%s'\n"
 
@@ -2134,7 +2042,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: utilizatorul %s există\n"
 
@@ -2165,7 +2072,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: nu pot crea directorul %s\n"
 
@@ -2204,7 +2110,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2227,31 +2132,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s este neschimbat\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "eşuare în redenumirea căsuţei poştale"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "N-am putut încuia fişierul"
 
@@ -2259,7 +2157,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
@@ -2274,22 +2171,18 @@ msgid "failed to open scratch file"
 msgstr "%s: nu pot deschide fiÅŸierul de grupuri\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: câmpuri prea lungi\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "eşuare în redenumirea căsuţei poştale"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "eşuare în schimbarea proprietarului căsuţei poştale"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "eşuare în redenumirea căsuţei poştale"
 
@@ -2298,10 +2191,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: nu pot reface %s: %s (schimbările dvs. sunt în %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: director de bază nevalid '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s este o consolă nevalidă.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Utilizare: %s [input]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: nu pot crea %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: nu pot schimba proprietarul %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Utilizare: vipw [opţiuni]\n"
+"\n"
+"Opţiuni:\n"
+"  -g, --group                   editează baza de date de grupuri\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -p, --passwd                  editează baza de date de conturi\n"
+"  -q, --quiet                   modul tăcut\n"
+"  -s, --shadow                  editează baza de date shadow sau gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2336,20 +2310,6 @@ msgstr "%s: director de bază nevalid '%
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Utilizare: %s [input]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: nu pot crea %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: nu pot schimba proprietarul %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/ru.po 1:4.1.4.2+svn3283-2ubuntu1/po/ru.po
--- 1:4.1.4.2+svn3283-2/po/ru.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/ru.po	2010-11-24 14:47:24.000000000 +0000
@@ -14,13 +14,13 @@ msgstr ""
 "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"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #, c-format
 msgid ""
@@ -56,17 +56,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: нехватка памяти\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: не удалось удалить %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: неверный домашний каталог '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: не удалось удалить запись %s из %s\n"
 
@@ -75,57 +72,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: не удалось создать каталог %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: не удалось получить размер %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: внимание: не удалось удалить %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: переименовать: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: не удалось переименовать каталог %s в %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: не удалось переименовать каталог %s в %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: внимание: не удалось удалить %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: не удалось создать каталог %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: не удалось получить размер %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: не удалось удалить %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: line %d: пользователь '%s' не существует\n"
 
@@ -136,12 +122,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: переименовать: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: не удалось открыть %s\n"
 
@@ -194,7 +178,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: не удалось разблокировать %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -229,12 +212,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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-"
@@ -250,8 +232,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -675,9 +657,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -686,7 +665,6 @@ msgstr ""
 "                        шифрования SHA*\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: line %d: пользователь '%s' не существует\n"
 
@@ -725,17 +703,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Неверное значение: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s не является командной оболочкой.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: пользователь '%s' не существует\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: внимание: %s не принадлежит %s\n"
 
@@ -755,9 +730,6 @@ msgid ""
 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"
@@ -774,7 +746,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "faillog: не удалось получить запись для UID %d\n"
 
@@ -790,17 +761,14 @@ msgid " [%lds lock]"
 msgstr " [%ld блокировок]"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
 msgid "faillog: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: не удалось сбросить счётчики неудачных попыток для UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
 msgid "faillog: Failed to set max for UID %lu\n"
 msgstr "faillog: не удалось установить максимальное число попыток для UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
 msgid "faillog: Failed to set locktime for UID %lu\n"
 msgstr "faillog: не удалось установить время блокировки для UID %d\n"
 
@@ -824,9 +792,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
@@ -838,9 +803,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr ""
@@ -850,10 +812,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -865,7 +823,6 @@ msgstr ""
 
 #
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Параметры не могут быть указаны одновременно.\n"
 
@@ -926,9 +883,6 @@ msgid ""
 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"
@@ -938,9 +892,6 @@ msgstr ""
 "                        шифрования 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"
@@ -949,9 +900,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -965,9 +913,6 @@ msgid ""
 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"
@@ -1031,9 +976,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1049,9 +991,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr ""
@@ -1063,17 +1002,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -p, --purge                   purge all members from the group\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -l, --list                    list the members of the group\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
@@ -1087,9 +1020,6 @@ msgid "%s: only root can use the -g/--gr
 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"
@@ -1237,7 +1167,6 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
 msgid "lastlog: Failed to get the entry for UID %lu\n"
 msgstr "lastlog: не удалось получить запись для UID %d\n"
 
@@ -1271,7 +1200,6 @@ msgid "       %s [-p] -r host\n"
 msgstr "                    %s [-p] -r имя хоста\n"
 
 #, fuzzy, c-format
-#| msgid "configuration error - cannot parse %s value: '%s'"
 msgid "configuration error - cannot parse %s value: '%d'"
 msgstr "ошибка настройки: не удалось разобрать значение %s: '%s'"
 
@@ -1293,9 +1221,6 @@ msgstr ""
 "[Отключение не выполнено -- вход в систему для суперпользователя разрешён.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1324,7 +1249,6 @@ msgid "login: "
 msgstr "имя пользователя: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Превышено максимальное число попыток (%d)\n"
 
@@ -1401,9 +1325,6 @@ msgid "  -c, --crypt-method            t
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -r, --system                  create system accounts\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
@@ -1586,17 +1507,14 @@ msgid "The password for %s is unchanged.
 msgstr "Пароль для %s не был изменён.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Пароль изменён."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Предупреждать об истечении срока действия пароля за (дней)"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr ""
 "Использование: %s [-q] [-r] [-s] [файл паролей [теневой файл паролей]]\n"
@@ -1607,7 +1525,6 @@ 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"
 
@@ -1642,22 +1559,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "пользователь %s: программа %s не существует\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: не удалось создать каталог %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: не удалось создать каталог %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: не удалось создать каталог %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: не удалось открыть %s\n"
 
@@ -1720,7 +1633,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: Не удалось определить имя пользователя.\n"
 
@@ -1847,12 +1759,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: не удалось открыть новый файл значений по умолчанию\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: строка %d: вызов chown %s завершился неудачно: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: переименовать: %s"
 
@@ -1872,9 +1782,6 @@ msgid ""
 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"
@@ -1903,9 +1810,6 @@ msgid ""
 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"
@@ -1914,9 +1818,6 @@ msgstr ""
 "                        шифрования 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"
@@ -1929,9 +1830,6 @@ msgid ""
 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"
@@ -1940,9 +1838,6 @@ msgstr ""
 "                        шифрования 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"
@@ -1952,9 +1847,6 @@ msgid ""
 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"
@@ -1963,9 +1855,6 @@ msgstr ""
 "                        шифрования 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"
@@ -1977,17 +1866,11 @@ msgid "  -p, --password PASSWORD       e
 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"
@@ -2090,7 +1973,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu не является уникальным\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: не удалось создать каталог %s\n"
 
@@ -2133,7 +2015,6 @@ msgstr ""
 "удалена.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: внимание: не удалось удалить %s: %s"
 
@@ -2146,17 +2027,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: не удалось получить размер %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: не удалось удалить запись %s из %s\n"
 
@@ -2169,7 +2047,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: пользователь %s находится в системе\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: неверный домашний каталог '%s'\n"
 
@@ -2287,7 +2164,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: не удалось создать каталог %s\n"
 
@@ -2302,14 +2178,14 @@ msgstr "%s: не удалось пере
 #, c-format
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: не удалось скопировать запись lastlog о пользователе %lu в пользователя "
-"%lu: %s\n"
+"%s: не удалось скопировать запись lastlog о пользователе %lu в пользователя %"
+"lu: %s\n"
 
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: не удалось скопировать запись faillog о пользователе %lu в пользователя "
-"%lu: %s\n"
+"%s: не удалось скопировать запись faillog о пользователе %lu в пользователя %"
+"lu: %s\n"
 
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
@@ -2338,41 +2214,26 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -g, --group                   edit group database\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user            new SELinux user mapping for the user "
-#| "account\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr ""
 "  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
@@ -2386,12 +2247,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s не был изменён\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "не удалось переименовать почтовый ящик"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
 
@@ -2403,7 +2262,6 @@ msgid "setfscreatecon () failed"
 msgstr "Вызов setfscreatecon () завершился неудачно"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
 
@@ -2414,27 +2272,22 @@ msgid "Couldn't make backup"
 msgstr "Не удалось создать резервную копию"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "не удалось переименовать почтовый ящик"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: не удалось разблокировать %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "не удалось переименовать почтовый ящик"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "не удалось сменить владельца почтового ящика"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "не удалось переименовать почтовый ящик"
 
@@ -2443,10 +2296,120 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: не удалось восстановить %s: %s (ваши изменения в %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: неверный базовый каталог '%s'\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s не является командной оболочкой.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Использование: %s [параметр] ГРУППА\n"
+"\n"
+"Параметры:\n"
+"  -a, --add ПОЛЬЗОВАТЕЛЬ          добавить ПОЛЬЗОВАТЕЛЯ в ГРУППУ\n"
+"  -d, --delete ПОЛЬЗОВАТЕЛЬ       удалить ПОЛЬЗОВАТЕЛЯ из ГРУППЫ\n"
+"  -r, --remove-password           удалить пароль ГРУППЫ\n"
+"  -R, --restrict                  ограничить доступ к ГРУППЕ её членам\n"
+"  -M, --members ПОЛЬЗОВАТЕЛЬ,...  задать список членов ГРУППЫ\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators АДМИН,...\n"
+"                                  задать список администраторов ГРУППЫ\n"
+"За исключением параметров -A и -M, остальные не могут указываться\n"
+"одновременно.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Использование: groupmems [параметры] [действие]\n"
+"\n"
+"Параметры:\n"
+"  -g, --group имя_группы          изменить имя_группы вместо "
+"пользовательской\n"
+"                                  группы (только для root)\n"
+"\n"
+"Действия:\n"
+"  -a, --add имя_польз             добавить имя_польз в члены группы\n"
+"  -d, --delete имя_польз          удалить имя_польз из членов группы\n"
+"  -p, --purge                     удалить всех членов из группы\n"
+"  -l, --list                      показать всех членов группы\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: не удалось создать %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: не удалось сменить владельца %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Использование: vipw [параметры]\n"
+"\n"
+"Параметры:\n"
+"  -g, --group                   редактировать базу данных групп\n"
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+"  -p, --passwd                  редактировать базу данных паролей\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  редактировать базу данных теневых\n"
+"                                паролей пользователей или групп\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2482,65 +2445,6 @@ msgstr "%s: неверный базовÑ
 #~ "                                паролей пользователей или групп\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Использование: %s [параметр] ГРУППА\n"
-#~ "\n"
-#~ "Параметры:\n"
-#~ "  -a, --add ПОЛЬЗОВАТЕЛЬ          добавить ПОЛЬЗОВАТЕЛЯ в ГРУППУ\n"
-#~ "  -d, --delete ПОЛЬЗОВАТЕЛЬ       удалить ПОЛЬЗОВАТЕЛЯ из ГРУППЫ\n"
-#~ "  -r, --remove-password           удалить пароль ГРУППЫ\n"
-#~ "  -R, --restrict                  ограничить доступ к ГРУППЕ её членам\n"
-#~ "  -M, --members ПОЛЬЗОВАТЕЛЬ,...  задать список членов ГРУППЫ\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Использование: groupmems [параметры] [действие]\n"
-#~ "\n"
-#~ "Параметры:\n"
-#~ "  -g, --group имя_группы          изменить имя_группы вместо "
-#~ "пользовательской\n"
-#~ "                                  группы (только для root)\n"
-#~ "\n"
-#~ "Действия:\n"
-#~ "  -a, --add имя_польз             добавить имя_польз в члены группы\n"
-#~ "  -d, --delete имя_польз          удалить имя_польз из членов группы\n"
-#~ "  -p, --purge                     удалить всех членов из группы\n"
-#~ "  -l, --list                      показать всех членов группы\n"
-#~ "\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: не удалось создать %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: не удалось сменить владельца %s\n"
-
 #
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/shadow.pot 1:4.1.4.2+svn3283-2ubuntu1/po/shadow.pot
--- 1:4.1.4.2+svn3283-2/po/shadow.pot	2010-08-29 16:53:57.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/shadow.pot	2010-11-24 14:47:24.000000000 +0000
@@ -199,8 +199,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -217,8 +217,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -2002,3 +2002,76 @@ msgstr ""
 #, c-format
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr ""
+
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr ""
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr ""
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
diff -pruN 1:4.1.4.2+svn3283-2/po/sk.po 1:4.1.4.2+svn3283-2ubuntu1/po/sk.po
--- 1:4.1.4.2+svn3283-2/po/sk.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/sk.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "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"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
 #, c-format
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: nedostatok pamäti\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: nie je možné zmazať %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: chybný domovský adresár „%s“\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nie je možné odstrániť položku „%s“ z %s\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: upozornenie: nemôžem odstrániť %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: premenovať: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: adresár %s sa nedá premenovať na %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: adresár %s sa nedá premenovať na %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: upozornenie: nemôžem odstrániť %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: nie je možné zmazať %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: premenovať: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: súbor %s sa nedá otvoriť\n"
 
@@ -187,7 +171,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: nepodarilo sa odmknúť %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -224,12 +207,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: Nedá sa získať jedinečný UID (už nie sú dostupné žiadne UID)\n"
 
@@ -243,12 +225,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system UID (no more available UIDs)\n"
 msgstr "%s: Nedá sa získať jedinečný UID (už nie sú dostupné žiadne UID)\n"
 
@@ -349,25 +330,6 @@ msgid "No"
 msgstr "Nie"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -670,7 +632,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: zistená chyba, zmeny budú zamietnuté\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -688,9 +649,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -699,7 +657,6 @@ msgstr ""
 "                                algoritmov SHA*\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: riadok %d: používateľ „%s“ neexistuje\n"
 
@@ -739,17 +696,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Chybná položka: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s je neplatný shell.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: používateľ %s neexistuje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: upozornenie: vlastníkom %s nie je %s\n"
 
@@ -783,7 +737,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "faillog: Nepodarilo sa získať položku s UID %d\n"
 
@@ -799,17 +752,14 @@ msgid " [%lds lock]"
 msgstr " [%lds zámok]"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
 msgid "faillog: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Nepodarilo sa znulovať počet chýb pre UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
 msgid "faillog: Failed to set max for UID %lu\n"
 msgstr "faillog: Nepodarilo sa nastaviť max. pre UID %d\n"
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
 msgid "faillog: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Nepodarilo sa nastaviť čas zamknutia pre UID %d\n"
 
@@ -826,7 +776,6 @@ msgid "faillog: Cannot get the size of %
 msgstr "faillog: Nepodarilo sa zistiť veľkosť %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -850,10 +799,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -863,7 +808,6 @@ msgstr ""
 "Okrem volieb -A a -M nie je možné voľby kombinovať.\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Voľby nie je možné kombinovať.\n"
 
@@ -916,7 +860,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Nejedná sa o tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -924,9 +867,6 @@ msgid ""
 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"
@@ -942,9 +882,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -1012,7 +949,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: Nedostatok pamäte. Nie je možné aktualizovať %s.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1020,9 +956,6 @@ msgid ""
 msgstr "Použitie: %s [vstup]\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1206,7 +1139,6 @@ msgstr ""
 "                        ako LOGIN\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
 msgid "lastlog: Failed to get the entry for UID %lu\n"
 msgstr "lastlog: Nepodarilo sa získať položku s UID %d\n"
 
@@ -1261,9 +1193,6 @@ msgstr ""
 "[Odpojenie vynechané -- používateľ root sa môže prihlásiť.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1290,7 +1219,6 @@ msgid "login: "
 msgstr "Prihlasovacie meno: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Prekročený maximálny počet pokusov (%d)\n"
 
@@ -1406,12 +1334,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: riadok %d: heslo sa nedá aktualizovať\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: riadok %d: volanie mkdir zlyhalo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: riadok %d: volanie chown zlyhalo\n"
 
@@ -1540,17 +1466,14 @@ msgid "The password for %s is unchanged.
 msgstr "Heslo používateľa %s nebolo zmenené.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Heslo bolo zmenené."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Upozornenie o uplynutí doby platnosti hesla"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr ""
 "Použitie: %s [-q] [-r] [-s] [súbor_s_heslami [súbor_s_tieňovými_heslami]]\n"
@@ -1561,7 +1484,6 @@ 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"
 
@@ -1596,22 +1518,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "používateľ „%s“: program „%s“ neexistuje\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: súbor %s sa nedá zamknúť\n"
 
@@ -1646,7 +1564,6 @@ msgid "Usage: pwconv\n"
 msgstr "Použitie: pwconv\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: súbor sa nedá prepísať\n"
 
@@ -1673,7 +1590,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: súbor %s sa nedá zamknúť\n"
 
@@ -1798,12 +1714,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: nedá sa otvoriť nový súbor s predvolenými hodnotami\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: riadok %d: volanie chown zlyhalo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: premenovať: %s"
 
@@ -1816,7 +1730,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: bolo zadaných príliš veľa skupín (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1824,9 +1737,6 @@ msgid ""
 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"
@@ -1855,9 +1765,6 @@ msgid ""
 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"
@@ -1866,9 +1773,6 @@ msgstr ""
 "                                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"
@@ -1881,9 +1785,6 @@ msgid ""
 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"
@@ -1899,9 +1800,6 @@ msgid ""
 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"
@@ -1910,9 +1808,6 @@ msgstr ""
 "                                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"
@@ -2023,7 +1918,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu nie je jedinečný\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
@@ -2065,7 +1959,6 @@ msgstr ""
 "používateľa.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: upozornenie: nemôžem odstrániť %s: %s"
 
@@ -2078,17 +1971,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: nie je možné odstrániť položku „%s“ z %s\n"
 
@@ -2101,7 +1991,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: používateľ %s je práve prihlásený\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: chybný domovský adresár „%s“\n"
 
@@ -2114,36 +2003,6 @@ msgid "%s: error removing directory %s\n
 msgstr "%s: chyba pri mazaní adresára %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2245,7 +2104,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
@@ -2261,14 +2119,14 @@ msgstr "%s: adresár %s sa nedá premeno
 #, c-format
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: Nepodarilo sa skopírovať položku lastlog používateľa %lu používateľovi "
-"%lu: %s\n"
+"%s: Nepodarilo sa skopírovať položku lastlog používateľa %lu používateľovi %"
+"lu: %s\n"
 
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: Nepodarilo sa skopírovať položku faillog používateľa %lu používateľovi "
-"%lu: %s\n"
+"%s: Nepodarilo sa skopírovať položku faillog používateľa %lu používateľovi %"
+"lu: %s\n"
 
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
@@ -2291,7 +2149,6 @@ msgstr ""
 "Prosím, urobte tak príkazom „%s“.\n"
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2322,17 +2179,14 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s je bez zmien\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "chyba pri premenovaní schránky"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Súbor sa nedá zamknúť"
 
@@ -2340,7 +2194,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
 
@@ -2351,27 +2204,22 @@ msgid "Couldn't make backup"
 msgstr "Nedá sa vytvoriť záloha"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Súbor so skupinami sa nedá otvoriť\n"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: nepodarilo sa odmknúť %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "chyba pri premenovaní schránky"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "chyba pri zmene vlastníka schránky"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "chyba pri premenovaní schránky"
 
@@ -2380,10 +2228,118 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: %s sa nedá obnoviť: %s (zmeny sú v %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: chybný základný adresár „%s“\n"
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: %s je neplatný shell.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Použitie: %s [voľba] SKUPINA\n"
+"\n"
+"Voľby:\n"
+"  -a, --add POUŽ                pridať POUŽ do SKUPINY\n"
+"  -d, --delete POUŽ             odstrániť POUŽ zo SKUPINY\n"
+"  -r, --remove-password         odstrániť heslo SKUPINY\n"
+"  -R, --restrict                obmedziť prístup do SKUPINY iba na jej "
+"členov\n"
+"  -M, --members POUŽ,...        nastaviť zoznam členov SKUPINY\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+"  -A, --administrators ADMIN,...\n"
+"                                nastaviť zoznam správcov SKUPINY\n"
+"Okrem volieb -A a -M nie je možné voľby kombinovať.\n"
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Použitie: groupmems [voľby] [operácia]\n"
+"\n"
+"Voľby:\n"
+"  -g, --group groupname         zmeniť názov skupiny namiesto skupiny "
+"používateľa\n"
+"                                (iba root)\n"
+"\n"
+"Actions:\n"
+"  -a, --add používateľ           pridať používateľa medzi členov skupiny\n"
+"  -d, --delete používateľ       odobrať používateľa spomedzi členov skupiny\n"
+"  -p, --purge                   odstrániť všetkých členov skupiny\n"
+"  -l, --list                    vypísať členov skupiny\n"
+"\n"
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Použitie: %s [vstup]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s sa nedá vytvoriť\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: volanie chown pre %s zlyhalo\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Použitie: vipw [voľby]\n"
+"\n"
+"Voľby:\n"
+"  -g, --group                   upraví databázu skupín\n"
+"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+"  -p, --passwd                  upraví databázu passwd\n"
+"  -q, --quiet                   stručný režim\n"
+"  -s, --shadow                  upraví databázu shadow alebo gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2418,75 +2374,6 @@ msgstr "%s: chybný základný adresár 
 #~ "\n"
 
 #~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Použitie: %s [voľba] SKUPINA\n"
-#~ "\n"
-#~ "Voľby:\n"
-#~ "  -a, --add POUŽ                pridať POUŽ do SKUPINY\n"
-#~ "  -d, --delete POUŽ             odstrániť POUŽ zo SKUPINY\n"
-#~ "  -r, --remove-password         odstrániť heslo SKUPINY\n"
-#~ "  -R, --restrict                obmedziť prístup do SKUPINY iba na jej "
-#~ "členov\n"
-#~ "  -M, --members POUŽ,...        nastaviť zoznam členov SKUPINY\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Použitie: groupmems [voľby] [operácia]\n"
-#~ "\n"
-#~ "Voľby:\n"
-#~ "  -g, --group groupname         zmeniť názov skupiny namiesto skupiny "
-#~ "používateľa\n"
-#~ "                                (iba root)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add používateľ           pridať používateľa medzi členov skupiny\n"
-#~ "  -d, --delete používateľ       odobrať používateľa spomedzi členov "
-#~ "skupiny\n"
-#~ "  -p, --purge                   odstrániť všetkých členov skupiny\n"
-#~ "  -l, --list                    vypísať členov skupiny\n"
-#~ "\n"
-
-#, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Použitie: %s [vstup]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s sa nedá vytvoriť\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: volanie chown pre %s zlyhalo\n"
-
-#~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
 #~ "Options:\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/sq.po 1:4.1.4.2+svn3283-2ubuntu1/po/sq.po
--- 1:4.1.4.2+svn3283-2/po/sq.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/sq.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "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"
-"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
@@ -200,8 +200,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -218,8 +218,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -2010,6 +2010,79 @@ msgstr ""
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr ""
 
+#, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr ""
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr ""
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Password set to expire."
 #~ msgstr "Fjalëkalimi yt ka skaduar."
diff -pruN 1:4.1.4.2+svn3283-2/po/sv.po 1:4.1.4.2+svn3283-2ubuntu1/po/sv.po
--- 1:4.1.4.2+svn3283-2/po/sv.po	2010-08-29 16:53:59.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/sv.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "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"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
 #, c-format
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: slut på minne\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: kan inte uppdatera filen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: ogiltig hemkatalog \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: varning: kan inte ta bort "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: varning: kan inte ta bort "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: byt namn: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: varning: kan inte ta bort "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: varning: kan inte ta bort "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: kan inte uppdatera filen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: kan inte uppdatera skuggfilen\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: byt namn: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: kan inte öppna filen %s\n"
 
@@ -179,17 +163,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Kunde inte ändra tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: fälten för långa\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -223,17 +204,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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"
 
@@ -243,17 +222,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system UID (no more available UIDs)\n"
 msgstr "Kan inte få tag i unikt UID (inga fler tillgängliga UID)\n"
 
 #, fuzzy, c-format
-#| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Kan inte få tag i unikt UID (inga fler tillgängliga UID)\n"
 
@@ -303,7 +280,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Lösenordet ändrat."
 
@@ -349,30 +325,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) misslyckades\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Nej\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -487,22 +443,18 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM autentisering misslyckades\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: kan inte låsa filer, försök igen senare\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: kan inte öppna filen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failure forking: %s\n"
 msgid "%s: failure while writing changes to %s\n"
 msgstr "%s: fel vid processgrening: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
@@ -515,7 +467,6 @@ msgid "%s: failed to drop privileges (%s
 msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
 
@@ -544,7 +495,6 @@ msgid "Full Name"
 msgstr "Helt namn"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -588,7 +538,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: ogiltigt telefonnummer (hem): \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: \"%s\" innehåller ogiltiga tecken\n"
 
@@ -597,7 +546,6 @@ msgid "%s: '%s' contains illegal charact
 msgstr "%s: \"%s\" innehåller ogiltiga tecken\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
 
@@ -647,7 +595,6 @@ msgstr ""
 "                                krypteringsalgoritmerna\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
 msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: flaggan %s tillåts ENDAST med flaggan %s\n"
 
@@ -668,12 +615,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: rad %d: saknar nytt lösenord\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: gruppen %s finns inte\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: rad %d: kan inte uppdatera post\n"
 
@@ -682,7 +627,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: ett fel upptäcktes, ändringar ignorerade\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -700,9 +644,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -711,12 +652,10 @@ msgstr ""
 "                                krypteringsalgoritmerna\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
 
@@ -739,7 +678,6 @@ msgid "Login Shell"
 msgstr "Inloggningsskal"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Du får inte ändra skalet för %s.\n"
 
@@ -752,17 +690,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ogiltig post: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s är ett ogiltigt skal.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: användaren %s finns inte\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: varning: %s ägs inte av %s\n"
 
@@ -803,7 +738,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Användare       Fel      Max Senaste                  På\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds kvar]"
 
@@ -824,12 +758,10 @@ msgid "faillog: Failed to set locktime f
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unknown user or range: %s\n"
 msgid "lastlog: Unknown user or range: %s\n"
 msgstr "Okänd användare eller intervall: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: kan inte öppna filen %s\n"
 
@@ -838,7 +770,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -867,12 +798,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Lösenordet för %s kan inte ändras.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Lösenordet för %s kan inte ändras.\n"
 
@@ -881,12 +810,10 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: lösenord för skuggrupper krävs för -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: gruppen %s finns inte\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failure forking: %s\n"
 msgid "%s: failure while closing read-only %s\n"
 msgstr "%s: fel vid processgrening: %s\n"
 
@@ -916,7 +843,6 @@ msgid "Removing user %s from group %s\n"
 msgstr "Ta bort användaren %s från gruppen %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' is not a member of '%s'\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
 
@@ -925,7 +851,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Inte en tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -933,9 +858,6 @@ msgid ""
 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"
@@ -951,9 +873,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -970,12 +889,10 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s är inte ett giltigt gruppnamn\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group ID '%s'\n"
 msgstr "%s: ogiltigt gruppnamn \"%s\"\n"
 
@@ -984,12 +901,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K kräver KEY=VÄRDE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: gruppen %s finns redan\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Medlemmen finns redan\n"
 
@@ -997,23 +912,19 @@ msgid "Usage: groupdel group\n"
 msgstr "Användning: groupdel grupp\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
 msgid "%s: cannot remove the primary group of user '%s'\n"
 msgstr ""
 "%s: kan inte ändra primära gruppen för användaren \"%s\" från %u till %u.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppen %s finns inte\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: gruppen \"%s\" är en NIS-grupp.\n"
 
@@ -1022,17 +933,14 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s är NIS master\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: användaren %s är en NIS-användare\n"
 
 #, fuzzy, c-format
-#| msgid "%s: Out of memory. Cannot update the group database.\n"
 msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr "%s: Slut på minne. Kan inte uppdatera gruppdatabasen.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1040,9 +948,6 @@ msgid ""
 msgstr "Användning: %s [inmatning]\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1096,7 +1001,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: ogiltigt gruppnamn \"%s\"\n"
 
@@ -1135,7 +1039,6 @@ msgid "invalid group name '%s'\n"
 msgstr "ogiltigt gruppnamn \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "ogiltigt gruppnamn \"%s\"\n"
 
@@ -1152,7 +1055,6 @@ msgid "no matching group file entry in %
 msgstr "ingen matchande gruppfilspost i %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "lägg till grupp \"%s\" i %s ?"
 
@@ -1188,17 +1090,14 @@ msgid "%s: no changes\n"
 msgstr "%s: inga ändringar\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Användning: groupdel grupp\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Användning: groupdel grupp\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: kan inte uppdatera filen %s\n"
 
@@ -1287,9 +1186,6 @@ msgstr ""
 "[Nedkoppling kringgådd -- rootinloggning tillåten.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1316,7 +1212,6 @@ msgid "login: "
 msgstr "inloggning: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Maximalt antal försök överskreds (%d)\n"
 
@@ -1365,7 +1260,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Användning: id\n"
 
@@ -1383,7 +1277,6 @@ msgid "%s: failure forking: %s\n"
 msgstr "%s: fel vid processgrening: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
 
@@ -1398,12 +1291,10 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
 msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: gruppen %s är en skugg-grupp, men den finns inte i /etc/group\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: ogiltigt användarnamn \"%s\"\n"
 
@@ -1430,7 +1321,6 @@ msgid "%s: line %d: can't create group\n
 msgstr "%s: rad %d: kan inte skapa grupp\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: line %d: user '%s' does not exist in %s\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
 
@@ -1439,12 +1329,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: rad %d: kan inte uppdatera lösenord\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: rad %d: mkdir misslyckades\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: rad %d: chown misslyckades\n"
 
@@ -1453,33 +1341,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: rad %d: kan inte uppdatera post\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1575,9 +1436,6 @@ msgid "The password for %s cannot be cha
 msgstr "Lösenordet för %s kan inte ändras ännu.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock the password of this "
@@ -1608,17 +1466,14 @@ msgid "The password for %s is unchanged.
 msgstr "Lösenordet för %s är oförändrat.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Lösenordet ändrat."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Utlöpsvarning för lösenord"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Användning: %s [-q] [-r] [-s] [lösenord [skugga]]\n"
 
@@ -1627,7 +1482,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1646,42 +1500,34 @@ msgid "invalid user name '%s'\n"
 msgstr "ogiltigt användarnamn \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "ogiltigt användarnamn \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "användare %s: ingen grupp %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "användare %s: katalogen %s finns inte\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "användare %s: programmet %s finns inte\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: kan inte skapa katalog %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: kan inte låsa filen %s\n"
 
@@ -1709,17 +1555,14 @@ msgid "user %s: last password change in 
 msgstr "användare %s: senaste lösenordsändringen i framtiden\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: kan inte öppna filen %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Användning: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: kan inte skriva om fil\n"
 
@@ -1728,7 +1571,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Användning: id\n"
 
@@ -1748,7 +1590,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: kan inte låsa filen %s\n"
 
@@ -1824,12 +1665,10 @@ msgstr ""
 "(Ignorerad)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM autentisering misslyckades\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Du är inte bemyndigad att su %s\n"
 
@@ -1874,12 +1713,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: kan inte öppna ny fil med standardvärden\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: rad %d: chown misslyckades\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: byt namn: %s"
 
@@ -1892,7 +1729,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: för många grupper angivna (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1900,9 +1736,6 @@ msgid ""
 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"
@@ -1931,9 +1764,6 @@ msgid ""
 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"
@@ -1942,9 +1772,6 @@ msgstr ""
 "                                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"
@@ -1957,9 +1784,6 @@ msgid ""
 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"
@@ -1975,9 +1799,6 @@ msgid ""
 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"
@@ -1986,9 +1807,6 @@ msgstr ""
 "                                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"
@@ -2080,7 +1898,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Ställer in rättigheter för postlådefil"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: användaren %s finns redan\n"
 
@@ -2096,12 +1913,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: kan inte skapa användare\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u är inte unikt\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"
 
@@ -2137,15 +1952,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Kan inte ta bort gruppen %s som är en primär grupp för en annan "
 "användare.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: varning: kan inte ta bort "
 
@@ -2158,17 +1970,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
@@ -2181,7 +1990,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: användaren %s är för närvarande inloggad\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: ogiltig hemkatalog \"%s\"\n"
 
@@ -2195,36 +2003,6 @@ msgid "%s: error removing directory %s\n
 msgstr "%s: fel vid borttagning av katalogen %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2284,9 +2062,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the user's password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock this user's password.\n"
@@ -2296,7 +2071,6 @@ msgstr ""
 "användarkonto.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: användaren %s finns redan\n"
 
@@ -2313,7 +2087,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr "%s: flaggorna -L, -p och -U är uteslutande\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Medlemmen finns redan\n"
 
@@ -2328,7 +2101,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: kan inte skapa katalog %s\n"
 
@@ -2360,10 +2132,6 @@ msgid "failed to rename mailbox"
 msgstr "misslyckades med att byta namn på postlåda"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "You have modified %s.\n"
-#| "You may need to modify %s for consistency.\n"
-#| "Please use the command `%s' to do so.\n"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
@@ -2374,7 +2142,6 @@ msgstr ""
 "Använd kommandot \"%s\" för att göra det.\n"
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2397,31 +2164,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s är oförändrad\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "misslyckades med att byta namn på postlåda"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Kunde inte låsa fil"
 
@@ -2429,7 +2189,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
@@ -2440,27 +2199,22 @@ msgid "Couldn't make backup"
 msgstr "Kunde inte göra en säkerhetskopia"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Kunde inte öppna gruppfilen\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: fälten för långa\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "misslyckades med att byta namn på postlåda"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "misslyckades med att byta ägare på postlåda"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "misslyckades med att byta namn på postlåda"
 
@@ -2469,10 +2223,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: kan inte återställa %s: %s (dina ändringar finns i %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ogiltig baskatalog \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s är ett ogiltigt skal.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Användning: %s [inmatning]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: kan inte skapa %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: kan inte chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Användning: vipw [flaggor]\n"
+"\n"
+"Flaggor:\n"
+"  -g, --group                   redigera gruppdatabas\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -p, --passwd                  redigera lösenordsdatabas\n"
+"  -q, --quiet                   tyst läge\n"
+"  -s, --shadow                  redigera databaserna shadow eller gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2508,20 +2343,6 @@ msgstr "%s: ogiltig baskatalog \"%s\"\n"
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Användning: %s [inmatning]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: kan inte skapa %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: kan inte chown %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/tl.po 1:4.1.4.2+svn3283-2ubuntu1/po/tl.po
--- 1:4.1.4.2+svn3283-2/po/tl.po	2010-08-29 16:54:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/tl.po	2010-11-24 14:47:24.000000000 +0000
@@ -14,10 +14,10 @@ msgstr ""
 "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"
-"Language: tl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tl\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #, c-format
@@ -54,17 +54,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: nagkulang ng memory\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: hindi ma-apdeyt ang talaksang %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: hindi tanggap na directory na tahanan '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
@@ -73,57 +70,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: babala: hindi matanggal "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: babala: hindi matanggal "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: baguhin ang pangalan: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: babala: hindi matanggal "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: babala: hindi matanggal "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: hindi ma-apdeyt ang talaksang %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: hindi maapdeyt ang talaksang shadow\n"
 
@@ -134,12 +120,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: baguhin ang pangalan: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
@@ -182,17 +166,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Hindi mabago ang tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: mahaba masyado ang mga field\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -230,8 +211,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -248,8 +229,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -306,7 +287,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Napalitan ang password."
 
@@ -350,30 +330,10 @@ msgid "malloc(%d) failed\n"
 msgstr "bigo ang malloc(%d)\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Hindi\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -487,12 +447,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: bigo ang pagpapakilalang PAM\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: hindi makapag-aldaba ng mga talaksan, subukan muli mamaya.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
@@ -501,7 +459,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: bigo sa pag-fork: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
@@ -544,7 +501,6 @@ msgid "Full Name"
 msgstr "Buong Pangalan"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -588,7 +544,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: hindi tanggap na telepono sa bahay: '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: '%s' ay may hindi legal na mga karakter\n"
 
@@ -663,12 +618,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: linya %d: walang bagong password\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: walang grupong %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: linya %d: hindi ma-apdeyt ang ipinasok\n"
 
@@ -677,7 +630,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: may error na naganap, di pinansin ang mga pagbabago\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -726,7 +678,6 @@ msgid "Login Shell"
 msgstr "Login Shell"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Hindi niyo mapapalitan ang shell para kay %s.\n"
 
@@ -739,17 +690,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Hindi tanggap na entry: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "Ang %s ay hindi tanggap na shell.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: babala: %s ay hindi pag-aari ni %s\n"
 
@@ -790,7 +738,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Login       Kabiguan Maximum Pinakahuli               On\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds naiwan]"
 
@@ -815,7 +762,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Di kilalang Gumagamit: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
@@ -824,7 +770,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -853,12 +798,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Ang password ni %s ay hindi mapapalitan.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Ang password ni %s ay hindi mapapalitan.\n"
 
@@ -867,7 +810,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: kailangan ng password ng grupong shadow para sa -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: walang grupong %s\n"
 
@@ -909,7 +851,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Hindi tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -942,7 +883,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: hindi tanggap na pangalan ng grupo ang %s\n"
 
@@ -955,12 +895,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: kinakailangan ng -O ang PANGALAN=HALAGA\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: mayroon nang grupong %s\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Mayroon nang kasapi na ganito\n"
 
@@ -968,7 +906,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Pag-gamit: groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
@@ -977,12 +914,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: hindi mapalitan ang gumagamit '%s' sa NIS client.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: walang grupong %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: ang grupong '%s' ay grupong NIS.\n"
 
@@ -991,7 +926,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s ay ang NIS master\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: ang gumagamit na %s ay nasa NIS\n"
 
@@ -1000,7 +934,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: naubos ang memory sa update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1096,7 +1029,6 @@ msgid "invalid group name '%s'\n"
 msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
 
@@ -1113,7 +1045,6 @@ msgid "no matching group file entry in %
 msgstr "walang katumbas na entry sa talaksang grupo sa %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "idagdag ang grupong '%s' sa %s ?"
 
@@ -1149,17 +1080,14 @@ msgid "%s: no changes\n"
 msgstr "%s: walang pagbabago\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Pag-gamit: groupdel grupo\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Pag-gamit: groupdel grupo\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: hindi ma-apdeyt ang talaksang %s\n"
 
@@ -1249,9 +1177,6 @@ msgstr ""
 "[Nilaktawan ang pag-diskonek -- pinayagang makapasok ang root.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1280,7 +1205,6 @@ msgid "login: "
 msgstr "login: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Lumampas sa bilang ng maaaring pagsubok : (%d)\n"
 
@@ -1329,7 +1253,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Pag-gamit: id\n"
 
@@ -1366,7 +1289,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: walang grupong %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: hindi tanggap na pangalan `%s'\n"
 
@@ -1399,12 +1321,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: linya %d: hindi ma-apdeyt ang kontrasenyas\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: linya %d: bigo ang mkdir\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: linya %d: bigo ang chown\n"
 
@@ -1533,17 +1453,14 @@ msgid "The password for %s is unchanged.
 msgstr "Ang password ni %s ay hindi napalitan.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Napalitan ang password."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Babala ng Paglipas ng Taning ng Password"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1552,7 +1469,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1571,42 +1487,34 @@ msgid "invalid user name '%s'\n"
 msgstr "hindi tanggap na pangalan '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "hindi tanggap na pangalan '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "gumagamit %s: walang grupo %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "gumagamit %s: walang directory na %s\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "gumagamit %s: walang programang %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: hindi malikha ang directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: hindi maaldaba ang talaksang %s\n"
 
@@ -1634,17 +1542,14 @@ msgid "user %s: last password change in 
 msgstr "gumagamit %s: huling pagpalit ng password ay nasa hinaharap\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Pag-gamit: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: hindi maisulat muli ang talaksan\n"
 
@@ -1653,7 +1558,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Pag-gamit: id\n"
 
@@ -1673,7 +1577,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: hindi maaldaba ang talaksang %s\n"
 
@@ -1750,12 +1653,10 @@ msgstr ""
 "(Di pinansin)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: bigo ang pagpapakilalang PAM\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Hindi kayo awtorisadong gumamit ng su %s\n"
 
@@ -1800,12 +1701,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: hindi mabuksan ang bagong talaksan ng mga default\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linya %d: bigo ang chown\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: baguhin ang pangalan: %s"
 
@@ -1818,7 +1717,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: sobrang dami ng grupo ang nakatakda (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1970,7 +1868,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Itinatakda ang pahintulot sa talaksang mailbox"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: mayroon nang gumagamit na %s\n"
 
@@ -1986,12 +1883,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: hindi malikha ang %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: hindi kakaiba ang UID %u\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
 
@@ -2027,15 +1922,12 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: hindi matanggal ang grupong %s dahil ito'y pangunahing grupo ng ibang "
 "gumagamit.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: babala: hindi matanggal "
 
@@ -2048,17 +1940,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
@@ -2071,7 +1960,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: gumagamit na si %s ay kasalukuyang nakapasok\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: hindi tanggap na directory na tahanan '%s'\n"
 
@@ -2153,7 +2041,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: mayroon nang gumagamit na %s\n"
 
@@ -2170,7 +2057,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Mayroon nang kasapi na ganito\n"
 
@@ -2185,7 +2071,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: hindi malikha ang directory %s\n"
 
@@ -2224,7 +2109,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2247,31 +2131,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s ay hindi binago\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "bigo sa pagpalit ng pangalan ng mailbox"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Hindi maaldaba ang talaksan"
 
@@ -2279,7 +2156,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
@@ -2290,27 +2166,22 @@ msgid "Couldn't make backup"
 msgstr "Hindi makagawa ng backup"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Hindi mabuksan ang talaksang grupo\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: mahaba masyado ang mga field\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "bigo sa pagpalit ng pangalan ng mailbox"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "bigo sa pagpalit ng may-ari ng mailbox"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "bigo sa pagpalit ng pangalan ng mailbox"
 
@@ -2319,10 +2190,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: hindi maibalik ang %s: %s (ang mga pagbabago ay nasa %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: hindi tanggap na batayang directory '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "Ang %s ay hindi tanggap na shell.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Pag-gamit: %s [input]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: hindi malikha ang %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: hindi ma-chown %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Pag-gamit: vipw [mga opsiyon]\n"
+"\n"
+"Mga opsiyon:\n"
+"  -g, --group                   baguhin ang database ng mga grupo\n"
+"  -h, --help                    ipakita ang payo na ito\n"
+"  -p, --passwd                  baguhin ang database na passwd\n"
+"  -q, --quiet                   modong tahimik\n"
+"  -s, --shadow                  baguhin ang database na shadow o gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2357,20 +2309,6 @@ msgstr "%s: hindi tanggap na batayang di
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Pag-gamit: %s [input]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: hindi malikha ang %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: hindi ma-chown %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/tr.po 1:4.1.4.2+svn3283-2ubuntu1/po/tr.po
--- 1:4.1.4.2+svn3283-2/po/tr.po	2010-08-29 16:54:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/tr.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.1\n"
 
@@ -54,17 +54,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: yetersiz bellek\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: %s dosyası güncellenemiyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: geçersiz ev dizini '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
@@ -73,57 +70,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: uyarı: silinemiyor "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: uyarı: silinemiyor "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: yeniden adlandırma: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: uyarı: silinemiyor "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: uyarı: silinemiyor "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: %s dosyası güncellenemiyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: gölge dosyası güncellenemedi\n"
 
@@ -134,12 +120,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: yeniden adlandırma: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: %s dosyası açılamıyor\n"
 
@@ -182,17 +166,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Geçilemeyen tty: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: alanlar çok uzun\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -222,17 +203,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, 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"
 
@@ -242,17 +221,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system UID (no more available UIDs)\n"
 msgstr "Benzersiz bir UID alınamıyor (mevcut UID yok)\n"
 
 #, fuzzy, c-format
-#| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Benzersiz bir UID alınamıyor (mevcut UID yok)\n"
 
@@ -302,7 +279,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Parola deÄŸiÅŸti "
 
@@ -348,30 +324,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) başarısız oldu\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Hayır\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -492,22 +448,18 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM yetkilendirmesi başarısız oldu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: dosyalar kilitlenemiyor, daha sonra tekrar deneyin\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: %s dosyası açılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failure forking: %s\n"
 msgid "%s: failure while writing changes to %s\n"
 msgstr "%s: çatallama (fork) hatası: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
@@ -520,7 +472,6 @@ msgid "%s: failed to drop privileges (%s
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
@@ -548,7 +499,6 @@ msgid "Full Name"
 msgstr "Tam Ä°sim"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -592,7 +542,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: geçersiz ev telefonu: '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: '%s' geçersiz karakterler içeriyor\n"
 
@@ -601,7 +550,6 @@ msgid "%s: '%s' contains illegal charact
 msgstr "%s: '%s' geçersiz karakterler içeriyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
@@ -651,7 +599,6 @@ msgstr ""
 "                                SHA yuvarlamaları sayısı\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
 msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: %s bayrağına SADECE %s bayrağı ile kullanıldığında izin verilir\n"
 
@@ -672,12 +619,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: satır %d: yeni parola eksik\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: grup %s mevcut deÄŸil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: satır %d: kayıt güncellenemiyor\n"
 
@@ -686,7 +631,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: hata algılandı, değişiklikler görmezden gelindi\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -704,9 +648,6 @@ msgid "  -h, --help                    d
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
@@ -715,12 +656,10 @@ msgstr ""
 "                                SHA yuvarlamaları sayısı\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
@@ -743,7 +682,6 @@ msgid "Login Shell"
 msgstr "Oturum KabuÄŸu"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "%s için kabuğu değiştiremezsiniz.\n"
 
@@ -756,17 +694,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Geçersiz kayıt: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s geçersiz bir kabuk.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: kullanıcı %s mevcut değil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: uyarı: %s %s kullanıcısına ait değil\n"
 
@@ -807,7 +742,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Oturum Aç       Failures Maximum Latest                   Açık\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds kaldı]"
 
@@ -828,12 +762,10 @@ msgid "faillog: Failed to set locktime f
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unknown user or range: %s\n"
 msgid "lastlog: Unknown user or range: %s\n"
 msgstr "Bilinmeyen kullanıcı veya aralık: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: %s dosyası açılamıyor\n"
 
@@ -842,7 +774,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -871,12 +802,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "%s için parola değiştirilemedi.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "%s için parola değiştirilemedi.\n"
 
@@ -885,12 +814,10 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: -A için gölge grup parolaları gerekli\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: grup %s mevcut deÄŸil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failure forking: %s\n"
 msgid "%s: failure while closing read-only %s\n"
 msgstr "%s: çatallama (fork) hatası: %s\n"
 
@@ -920,7 +847,6 @@ msgid "Removing user %s from group %s\n"
 msgstr "%s kullanıcısı %s grubundan çıkarılıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' is not a member of '%s'\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
@@ -929,7 +855,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Bir tty deÄŸil\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -937,9 +862,6 @@ msgid ""
 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"
@@ -955,9 +877,6 @@ msgid "  -K, --key KEY=VALUE           o
 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"
@@ -974,12 +893,10 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s geçerli bir grup adı değil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group ID '%s'\n"
 msgstr "%s: geçersiz grup adı `%s'\n"
 
@@ -988,12 +905,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K seçeneği ANAHTAR=DEĞER gerektirir\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: grup %s zaten var\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Ãœye zaten mevcut\n"
 
@@ -1001,24 +916,20 @@ msgid "Usage: groupdel group\n"
 msgstr "Kullanım: groupdel grup_adı\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
 msgid "%s: cannot remove the primary group of user '%s'\n"
 msgstr ""
 "%s: '%s' kullanıcısı için birincil grup %u grubundan %u grubuna "
 "deÄŸiÅŸtirilemiyor.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grup %s mevcut deÄŸil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: grup '%s' bir NIS grubu.\n"
 
@@ -1027,17 +938,14 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS efendisidir\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: kullanıcı %s bir NIS kullanıcısı\n"
 
 #, fuzzy, c-format
-#| msgid "%s: Out of memory. Cannot update the group database.\n"
 msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr "%s: Bellek yetersiz. Grup veritabanı güncellenemiyor.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1045,9 +953,6 @@ msgid ""
 msgstr "Kullanım: %s [girdi]\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1101,7 +1006,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: geçersiz grup adı `%s'\n"
 
@@ -1140,7 +1044,6 @@ msgid "invalid group name '%s'\n"
 msgstr "geçersiz grup adı '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "geçersiz grup adı '%s'\n"
 
@@ -1157,7 +1060,6 @@ msgid "no matching group file entry in %
 msgstr "%s girişi içinde grup dosyası kaydı eşleşmedi\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "Grup %s, %s'in içine eklensin mi?"
 
@@ -1193,17 +1095,14 @@ msgid "%s: no changes\n"
 msgstr "%s: deÄŸiÅŸiklik yok\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Kullanım: groupdel grup_adı\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Kullanım: groupdel grup_adı\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s dosyası güncellenemiyor\n"
 
@@ -1294,9 +1193,6 @@ msgstr ""
 "[Bağlantı kesilmesi atlandı -- root girişi olanaklı.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1325,7 +1221,6 @@ msgid "login: "
 msgstr "giriÅŸ: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Maksimum giriş denemesi sayısı aşıldı (%d)\n"
 
@@ -1374,7 +1269,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Kullanım: id\n"
 
@@ -1392,7 +1286,6 @@ msgid "%s: failure forking: %s\n"
 msgstr "%s: çatallama (fork) hatası: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
@@ -1407,12 +1300,10 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
 msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: %s grubu bir shadow grubu, fakat /etc/group içinde mevcut değil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: geçersiz kullanıcı adı '%s'\n"
 
@@ -1439,7 +1330,6 @@ msgid "%s: line %d: can't create group\n
 msgstr "%s: satır %d: grup yaratılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user `%s' does not exist\n"
 msgid "%s: line %d: user '%s' does not exist in %s\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
@@ -1448,12 +1338,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: satır %d: parola güncellenemiyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: satır %d: mkdir başarısız oldu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: satır %d: chown başarısız oldu\n"
 
@@ -1462,33 +1350,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: satır %d: kayıt güncellenemiyor\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1586,9 +1447,6 @@ msgid "The password for %s cannot be cha
 msgstr "%s için parola henüz değiştirilemiyor.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock the password of this "
@@ -1620,17 +1478,14 @@ msgid "The password for %s is unchanged.
 msgstr "%s için parola değişmedi\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Parola deÄŸiÅŸti "
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Parola Kullanım Süresi Bitti Uyarısı"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Kullanım: %s [-q] [-r] [-s] [parola [gölge]]\n"
 
@@ -1639,7 +1494,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1658,42 +1512,34 @@ msgid "invalid user name '%s'\n"
 msgstr "geçersiz kullanıcı adı '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "geçersiz kullanıcı adı '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "kullanıcı %s: %u grubu mevcut değil\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "kullanıcı %s: %s dizini mevcut değil\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "kullanıcı %s: uygulama %s mevcut değil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: %s dosyası kilitlenemiyor\n"
 
@@ -1721,17 +1567,14 @@ msgid "user %s: last password change in 
 msgstr "kullanıcı %s: gelecekteki son parola değişimi\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: %s dosyası açılamıyor\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Kullanım: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: dosya tekrar yazılamıyor\n"
 
@@ -1740,7 +1583,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Kullanım: id\n"
 
@@ -1760,7 +1602,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: %s dosyası kilitlenemiyor\n"
 
@@ -1836,12 +1677,10 @@ msgstr ""
 "(Dikkate alınmadı)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM yetkilendirmesi başarısız oldu\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "su %s için yetkili değilsiniz\n"
 
@@ -1886,12 +1725,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: yeni varsayılanlar dosyası açılamadı\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: satır %d: chown başarısız oldu\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: yeniden adlandırma: %s"
 
@@ -1904,7 +1741,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: çok fazla grup verildi (azami %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1912,9 +1748,6 @@ msgid ""
 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"
@@ -1943,9 +1776,6 @@ msgid ""
 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"
@@ -1954,9 +1784,6 @@ msgstr ""
 "                                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"
@@ -1969,9 +1796,6 @@ msgid ""
 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"
@@ -1987,9 +1811,6 @@ msgid ""
 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"
@@ -1998,9 +1819,6 @@ msgstr ""
 "                                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"
@@ -2092,7 +1910,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Mail kutusu dosyası için yetkiler ayarlanıyor"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: kullanıcı %s mevcut\n"
 
@@ -2108,12 +1925,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: kullanıcı yaratılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: GID %u tek deÄŸil\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
@@ -2148,14 +1963,11 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Başka bir kullanıcı için birincil grub olan %s grubu kaldırılamıyor.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: uyarı: silinemiyor "
 
@@ -2168,17 +1980,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
@@ -2191,7 +2000,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: kullanıcı %s şu an oturumda\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: geçersiz ev dizini '%s'\n"
 
@@ -2204,36 +2012,6 @@ msgid "%s: error removing directory %s\n
 msgstr "%s: %s dizini silinirken hata oluÅŸtu\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2295,9 +2073,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: unlocking the user would result in a passwordless account.\n"
-#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
 "%s: unlocking the user's password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock this user's password.\n"
@@ -2308,7 +2083,6 @@ msgstr ""
 "belirlemelisiniz.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: kullanıcı %s mevcut\n"
 
@@ -2325,7 +2099,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr "%s: -L, -p, ve -U bayrakları özel bayraklardır\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Ãœye zaten mevcut\n"
 
@@ -2340,7 +2113,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
@@ -2371,10 +2143,6 @@ msgid "failed to rename mailbox"
 msgstr "postakutusu isim değişikliği başarısız"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "You have modified %s.\n"
-#| "You may need to modify %s for consistency.\n"
-#| "Please use the command `%s' to do so.\n"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
@@ -2385,7 +2153,6 @@ msgstr ""
 "Bunu yapmak için lütfen `%s' komutunu kullanın.\n"
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2408,31 +2175,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s deÄŸiÅŸtirilmedi\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "postakutusu isim değişikliği başarısız"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Dosya kilitlenemedi"
 
@@ -2440,7 +2200,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
@@ -2451,27 +2210,22 @@ msgid "Couldn't make backup"
 msgstr "Yedek alınamadı"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Grup dosyası açılamıyor\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: alanlar çok uzun\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "postakutusu isim değişikliği başarısız"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "postakutusu sahibi deÄŸiÅŸtirilmedi"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "postakutusu isim değişikliği başarısız"
 
@@ -2480,10 +2234,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: %s geri yüklenemiyor: %s (değişiklikleriniz %s içinde)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: geçersiz ana dizin '%s'\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s geçersiz bir kabuk.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Kullanım: %s [girdi]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: %s yaratılamıyor\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: chown %s gerçekleştirilemiyor\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Kullanım: vipw [seçenekler]\n"
+"\n"
+"Seçenekler:\n"
+"  -g, --group                   grub veri tabanını düzenler\n"
+"  -h, --help                    bu yardım dosyasını gösterir ve çıkar\n"
+"  -p, --passwd                  şifre veri tabanını düzenler\n"
+"  -q, --quiet                   sessiz kip\n"
+"  -s, --shadow                  shadow veya gshadow veri tabanını düzenler\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2519,20 +2354,6 @@ msgstr "%s: geçersiz ana dizin '%s'\n"
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Kullanım: %s [girdi]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: %s yaratılamıyor\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: chown %s gerçekleştirilemiyor\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/uk.po 1:4.1.4.2+svn3283-2ubuntu1/po/uk.po
--- 1:4.1.4.2+svn3283-2/po/uk.po	2010-08-29 16:54:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/uk.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,12 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2007-11-26 22:52+0100\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: \n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.2\n"
 
 #, c-format
@@ -53,17 +53,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: брак пам'яті\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: неможливо оновити файл %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: невірна домашня тека \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
@@ -72,57 +69,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: не можу створити теку %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s: застереження: не можу видалити "
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: застереження: не можу видалити "
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: перейменування: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: застереження: не можу видалити "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: не можу створити теку %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s: застереження: не можу видалити "
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: неможливо оновити файл %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: не можу оновити файл прихованих паролів\n"
 
@@ -133,12 +119,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: перейменування: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: не можу відкрити файл %s\n"
 
@@ -181,17 +165,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Не можу змінити tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: поля занадто довгі\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -224,8 +205,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -242,8 +223,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -300,7 +281,6 @@ msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "Пароль змінено."
 
@@ -344,30 +324,10 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) не виконано\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "Ні\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -484,12 +444,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM автентифікація не пройшла\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s: не можу блокувати файли, спробуйте пізніше\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s: не можу відкрити файл %s\n"
 
@@ -498,7 +456,6 @@ msgid "%s: failure while writing changes
 msgstr "%s: помилка відгалудження: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
@@ -540,7 +497,6 @@ msgid "Full Name"
 msgstr "Повне ім'я"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s: %s\n"
 
@@ -584,7 +540,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: невірний домашній телефон: \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s: \"%s\" містить заборонені символи\n"
 
@@ -659,12 +614,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s: рядок %d: бракує нового пароля\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: група %s не існує\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s: рядок %d: не можу оновити запис\n"
 
@@ -673,7 +626,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s: виявлено помилку, зміни ігноруються\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -722,7 +674,6 @@ msgid "Login Shell"
 msgstr "Логін-оболонка"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "Не можна змінити оболонку для %s.\n"
 
@@ -735,17 +686,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Невірний запис: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s є невірна оболонка.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: користувач %s не існує\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: застереження: %s не належить %s\n"
 
@@ -786,7 +734,6 @@ msgid "Login       Failures Maximum Late
 msgstr "Логін       Помилок Максимум Останнє                 На\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [%lds залишилось]"
 
@@ -811,7 +758,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "Невідомий користувач: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s: не можу відкрити файл %s\n"
 
@@ -820,7 +766,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -849,12 +794,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Пароль для %s не може бути змінений.\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "Пароль для %s не може бути змінений.\n"
 
@@ -863,7 +806,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s: приховані паролі груп потрібні для -A\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s: група %s не існує\n"
 
@@ -905,7 +847,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s: Не є tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -938,7 +879,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s: то не є вірне ім'я групи\n"
 
@@ -951,12 +891,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K вимагає ЗМІННА=ЗНАЧЕННЯ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s: група %s існує\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Член вже існує\n"
 
@@ -964,7 +902,6 @@ msgid "Usage: groupdel group\n"
 msgstr "Використання: groupdel група\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
@@ -973,12 +910,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s: неможливо змінити користувача \"%s\" у клієнті NIS.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s: група %s не існує\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s: група \"%s\" є групою NIS.\n"
 
@@ -987,7 +922,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s є сервер NIS\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s: користувач %s є користувачем NIS\n"
 
@@ -996,7 +930,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: бракує пам'яті у update_group\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1092,7 +1025,6 @@ msgid "invalid group name '%s'\n"
 msgstr "невірна назва групи \"%s\"\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "невірна назва групи \"%s\"\n"
 
@@ -1109,7 +1041,6 @@ msgid "no matching group file entry in %
 msgstr "відповідний запис файлу груп відсутній у %s\n"
 
 #, fuzzy, c-format
-#| msgid "add group '%s' in %s ?"
 msgid "add group '%s' in %s? "
 msgstr "додати групу \"%s\" у %s?"
 
@@ -1145,17 +1076,14 @@ msgid "%s: no changes\n"
 msgstr "%s: без змін\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "Використання: groupdel група\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "Використання: groupdel група\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: неможливо оновити файл %s\n"
 
@@ -1244,9 +1172,6 @@ msgstr ""
 "[Сталося відключення -- дозволено лише вхід root-a.]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1274,7 +1199,6 @@ msgid "login: "
 msgstr "логін: "
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "Перевищено максимальну кількість спроб (%d)\n"
 
@@ -1323,7 +1247,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "Використання: id\n"
 
@@ -1360,7 +1283,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s: група %s не існує\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: невірне ім'я користувача '%s'\n"
 
@@ -1393,12 +1315,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s: рядок %d: не можу оновити пароль\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s: рядок %d: mkdir не виконався\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s: рядок %d: chown не виконався\n"
 
@@ -1407,33 +1327,6 @@ msgid "%s: line %d: can't update entry\n
 msgstr "%s: рядок %d: не можу оновити запис\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: passwd [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     report password status on all accounts\n"
-#| "  -d, --delete                  delete the password for the named "
-#| "account\n"
-#| "  -e, --expire                  force expire the password for the named "
-#| "account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --keep-tokens             change password only if expired\n"
-#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --lock                    lock the named account\n"
-#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -q, --quiet                   quiet mode\n"
-#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
-#| "  -S, --status                  report password status on the named "
-#| "account\n"
-#| "  -u, --unlock                  unlock the named account\n"
-#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1553,17 +1446,14 @@ msgid "The password for %s is unchanged.
 msgstr "Пароль для %s не змінено.\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "Пароль змінено."
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Застереження про прострочення пароля"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "Використання: %s [-q] [-r] [-s] [пароль [shadow]]\n"
 
@@ -1572,7 +1462,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1591,42 +1480,34 @@ msgid "invalid user name '%s'\n"
 msgstr "невірне ім'я користувача '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "невірне ім'я користувача '%s'\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "користувач %s: не має групи %u\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "користувач %s: тека %s не існує\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "користувач %s: програма %s не існує\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: не можу створити теку %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: не можу створити теку %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: не можу створити теку %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: не можу заблокувати файл %s\n"
 
@@ -1654,17 +1535,14 @@ msgid "user %s: last password change in 
 msgstr "користувач %s: остання зміна пароля у майбутньому\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: не можу відкрити файл %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "Використання: id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: не можу переписати файл\n"
 
@@ -1673,7 +1551,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "Використання: id\n"
 
@@ -1693,7 +1570,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: не можу заблокувати файл %s\n"
 
@@ -1768,12 +1644,10 @@ msgstr ""
 "(Ігнорую)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s: PAM автентифікація не пройшла\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Ви не авторизовані для su %s\n"
 
@@ -1818,12 +1692,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s: не можу відкрити новий файл із значеннями по замовчуванню\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: рядок %d: chown не виконався\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s: перейменування: %s"
 
@@ -1836,7 +1708,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: вказано забагато груп (макс %d).\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1988,7 +1859,6 @@ msgid "Setting mailbox file permissions"
 msgstr "Встановлюються права доступу на файл поштової скриньки"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s: користувач %s існує\n"
 
@@ -2004,12 +1874,10 @@ msgid "%s: can't create user\n"
 msgstr "%s: не можу створити %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u не є унікальним\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: не можу створити теку %s\n"
 
@@ -2045,14 +1913,11 @@ msgstr ""
 "\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: не можу видалити групу %s яка є первинною групою іншого користувача.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: застереження: не можу видалити "
 
@@ -2065,17 +1930,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
@@ -2088,7 +1950,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s: користувач %s на даний момент у системі\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: невірна домашня тека \"%s\"\n"
 
@@ -2171,7 +2032,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: користувач %s існує\n"
 
@@ -2188,7 +2048,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "Член вже існує\n"
 
@@ -2203,7 +2062,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: не можу створити теку %s\n"
 
@@ -2241,7 +2099,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2264,31 +2121,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s не змінено\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "не можу перейменувати поштову скриньку"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "Не можу блокувати файл"
 
@@ -2296,7 +2146,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
@@ -2307,27 +2156,22 @@ msgid "Couldn't make backup"
 msgstr "Не можу зробити резервну копію"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "Неможливо відкрити файл груп\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: поля занадто довгі\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "не можу перейменувати поштову скриньку"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "не можу змінити власника поштової скриньки"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "не можу перейменувати поштову скриньку"
 
@@ -2336,10 +2180,91 @@ msgid "%s: can't restore %s: %s (your ch
 msgstr "%s: не можу відновити %s: %s (ваші зміни у %s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: невірна базова тека \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s є невірна оболонка.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [вхідні_данні]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: не можу створити %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: не можу змінити власника %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Використання: vipw [параметри]\n"
+"\n"
+"Параметри:\n"
+"  -g, --group                   редагувати базу даних груп\n"
+"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
+"  -p, --passwd                  редагувати базу даних паролів\n"
+"  -q, --quiet                   тихий режим\n"
+"  -s, --shadow                  редагувати базу даних shadow або gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2375,20 +2300,6 @@ msgstr "%s: невірна базова 
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "Використання: %s [вхідні_данні]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: не можу створити %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: не можу змінити власника %s\n"
-
-#, fuzzy
 #~| msgid ""
 #~| "Usage: faillog [options]\n"
 #~| "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/vi.po 1:4.1.4.2+svn3283-2ubuntu1/po/vi.po
--- 1:4.1.4.2+svn3283-2/po/vi.po	2010-08-29 16:54:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/vi.po	2010-11-24 14:47:24.000000000 +0000
@@ -10,10 +10,10 @@ msgstr ""
 "PO-Revision-Date: 2009-09-29 22:09+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
@@ -21,8 +21,8 @@ msgstr ""
 msgid ""
 "Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
 msgstr ""
-"Có nhiều mục nhập tên « %s » trong %s. Hãy sửa chữa trường hợp này, dùng "
-"pwck hoặc grpck.\n"
+"Có nhiều mục nhập tên « %s » trong %s. Hãy sửa chữa trường hợp này, dùng pwck "
+"hoặc grpck.\n"
 
 #, c-format
 msgid "crypt method not supported by libcrypt? (%s)\n"
@@ -51,17 +51,14 @@ msgid "%s: out of memory\n"
 msgstr "%s: tràn bộ nhớ\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s: không thể xoá %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s home directory (%s) not found\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s: %s không tìm thấy thư mục chính (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: không thể gỡ bỏ mục nhập « %s » khỏi %s\n"
 
@@ -70,57 +67,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: không thể tạo thư mục %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "lastlog: Không thể lấy kích cỡ của %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s: cảnh báo : không thể gỡ bỏ %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s: thay tên: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s: không thể thay đổi lại tên thư mục %s thành %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s: không thể thay đổi lại tên thư mục %s thành %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s\n"
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s: cảnh báo : không thể gỡ bỏ %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s: không thể tạo thư mục %s\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "lastlog: Không thể lấy kích cỡ của %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot delete %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s: không thể xoá %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: (line %d, user %s) password not changed\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s: (dòng %d, người dùng %s) mật khẩu chưa thay đổi\n"
 
@@ -131,12 +117,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s: thay tên: %s: %s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s: không thể mở %s\n"
 
@@ -188,7 +172,6 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s: lỗi mở khoá %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s: %s\n"
 
@@ -219,8 +202,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -238,8 +221,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, c-format
@@ -651,7 +634,6 @@ msgstr ""
 "Tuỳ chọn:\n"
 
 #, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
 msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
 msgstr "  -c, --crypt-method            phương pháp mật mã (một của %s)\n"
 
@@ -709,17 +691,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Mục nhập không hợp lệ: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s: %s là một trình bao không hợp lệ.\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user '%s' does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s: người dùng « %s » không tồn tại\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: cảnh báo : %s không phải được %s sở hữu\n"
 
@@ -734,9 +713,6 @@ msgstr ""
 "dùng\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -l, --lock-time SEC           after failed login lock account for SEC "
-#| "seconds\n"
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
@@ -812,10 +788,6 @@ msgid "faillog: Cannot get the size of %
 msgstr "faillog: không thể lấy kích cỡ của %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] GROUP\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -826,7 +798,6 @@ msgstr ""
 "Tuỳ chọn:\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
 msgstr "  -g, --gid GID                 thay đổi mã số nhóm sang GID này\n"
 
@@ -837,8 +808,6 @@ msgid "  -r, --remove-password         r
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr ""
@@ -848,10 +817,6 @@ msgid "  -M, --members USER,...        s
 msgstr ""
 
 #, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
@@ -861,7 +826,6 @@ msgstr ""
 "Trừ hai tuỳ chọn « -A » và « -M », không thể tổ hợp các tuỳ chọn.\n"
 
 #, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Không thể tổ hợp các tuỳ chọn.\n"
 
@@ -928,8 +892,8 @@ msgid ""
 "exists,\n"
 "                                and cancel -g if the GID is already used\n"
 msgstr ""
-"  -f, --force                   thoát thành công nếu nhóm đã có, và hủy bỏ « "
-"-g » nếu GID đã được dùng\n"
+"  -f, --force                   thoát thành công nếu nhóm đã có, và hủy bỏ « -"
+"g » nếu GID đã được dùng\n"
 
 msgid "  -g, --gid GID                 use GID for the new group\n"
 msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
@@ -1009,10 +973,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s: Không đủ bộ nhớ. Không thể cập nhật %s.\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1023,10 +983,6 @@ msgstr ""
 "Tuỳ chọn:\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
@@ -1041,7 +997,6 @@ msgid "Actions:\n"
 msgstr ""
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
@@ -1052,12 +1007,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -p, --purge                   purge all members from the group\n"
 msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -l, --list                    list the members of the group\n"
 msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
 
@@ -1537,8 +1490,8 @@ msgid ""
 "account.\n"
 msgstr ""
 "%s: mở khoá mật khẩu thì gây ra một tài khoản không có mật khẩu.\n"
-"Bạn nên đặt một mật khẩu dùng câu lệnh « usermod -p » để mở khoá mật khẩu "
-"của tài khoản này.\n"
+"Bạn nên đặt một mật khẩu dùng câu lệnh « usermod -p » để mở khoá mật khẩu của "
+"tài khoản này.\n"
 
 #, c-format
 msgid "%s: repository %s not supported\n"
@@ -1570,7 +1523,6 @@ msgid "%s: password expiry information c
 msgstr "%s: thông tin đã thay đổi về sự hết hạn sử dụng mật khẩu.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr ""
 "Sử dụng: %s [-q] [-r] [-s] [passwd [shadow]]\n"
@@ -1619,22 +1571,18 @@ msgid "user '%s': program '%s' does not 
 msgstr "người dùng « %s »: chương trình « %s » không tồn tại\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s: không thể tạo thư mục %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s: không thể tạo thư mục %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s: không thể tạo thư mục %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s: không thể mở %s\n"
 
@@ -1697,7 +1645,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s: không thể quyết định tên người dùng của bạn.\n"
 
@@ -1840,10 +1787,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s: ghi rõ quá nhiều nhóm (tối đa %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -2011,8 +1954,8 @@ msgstr "Đang tạo tập tin hộp thư
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
-"Không tìm thấy nhóm « mail » (thư tín). Vì thế đang tạo tập tin hộp thư "
-"người dùng với chế độ 0600.\n"
+"Không tìm thấy nhóm « mail » (thư tín). Vì thế đang tạo tập tin hộp thư người "
+"dùng với chế độ 0600.\n"
 
 msgid "Setting mailbox file permissions"
 msgstr "Đang đặt quyền truy cập tập tin hộp thư"
@@ -2036,7 +1979,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %lu không phải duy nhất\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s: không thể tạo thư mục %s\n"
 
@@ -2089,17 +2031,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s: lỗi bỏ quyền truy cập (%s)\n"
 
 #, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "lastlog: Không thể lấy kích cỡ của %s: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s: không thể gỡ bỏ mục nhập « %s » khỏi %s\n"
 
@@ -2118,8 +2057,8 @@ msgstr "%s: %s không tìm thấy thư m
 #, c-format
 msgid "%s: not removing directory %s (would remove home of user %s)\n"
 msgstr ""
-"%s: sẽ không gỡ bỏ thư mục %s (vì cũng gỡ bỏ thư mục chính của người dùng "
-"%s)\n"
+"%s: sẽ không gỡ bỏ thư mục %s (vì cũng gỡ bỏ thư mục chính của người dùng %"
+"s)\n"
 
 #, c-format
 msgid "%s: error removing directory %s\n"
@@ -2229,7 +2168,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s: không thể tạo thư mục %s\n"
 
@@ -2244,14 +2182,14 @@ msgstr "%s: không thể thay đổi láº
 #, c-format
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: không sao chép được mục nhập lastlog của người dùng %lu sang người dùng "
-"%lu: %s\n"
+"%s: không sao chép được mục nhập lastlog của người dùng %lu sang người dùng %"
+"lu: %s\n"
 
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr ""
-"%s: không sao chép được mục nhập faillog của người dùng %lu sang người dùng "
-"%lu: %s\n"
+"%s: không sao chép được mục nhập faillog của người dùng %lu sang người dùng %"
+"lu: %s\n"
 
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
@@ -2274,10 +2212,6 @@ msgstr ""
 "Hãy sử dụng câu lệnh « %s » để làm như thế.\n"
 
 #, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2288,30 +2222,24 @@ msgstr ""
 "Tuỳ chọn:\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -g, --group                   edit group database\n"
 msgstr "  -g, --gid GID                 thay đổi mã số nhóm sang GID này\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -r, --system                  tạo các tài khoản hệ thống\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
 
 #, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -a, --all                     hiển thị các mục ghi faillog cho mọi người "
 "dùng\n"
 
 #, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
 
@@ -2324,12 +2252,10 @@ msgid "%s: %s is unchanged\n"
 msgstr "%s: %s chưa thay đổi\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "lỗi thay đổi tên của hộp thư"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s: lỗi bỏ quyền truy cập (%s)\n"
 
@@ -2340,7 +2266,6 @@ msgid "setfscreatecon () failed"
 msgstr "setfscreatecon () bị lỗi"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s: lỗi bỏ quyền truy cập (%s)\n"
 
@@ -2351,27 +2276,22 @@ msgid "Couldn't make backup"
 msgstr "Không thể sao lưu"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to open scratch file"
 msgstr "lỗi thay đổi tên của hộp thư"
 
 #, fuzzy
-#| msgid "%s: failed to unlock %s\n"
 msgid "failed to unlink scratch file"
 msgstr "%s: lỗi mở khoá %s\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "lỗi thay đổi tên của hộp thư"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "lỗi thay đổi chủ hộp thư"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "lỗi thay đổi tên của hộp thư"
 
@@ -2380,10 +2300,117 @@ msgid "%s: can't restore %s: %s (your ch
 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, c-format
-#| msgid "%s: invalid base directory '%s'\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: thư mục cơ ban không hợp lệ « %s »\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s là hệ vỏ không hợp lệ.\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+"Sử dụng: %s [tuỳ_chọn] NHÓM\n"
+"\n"
+"Tuỳ chọn:\n"
+"  -a, --add NGƯỜI_DÙNG\tthêm người dùng này vào NHÓM\n"
+"  -d, --delete NGƯỜI_DÙNG   \tgỡ bỏ người dùng này khỏi NHÓM\n"
+"  -r, --remove-password         \tgỡ bỏ mật khẩu của NHÓM\n"
+"  -R, --restrict \t\t\t\thạn chế truy cập đến NHÓM thành các thành viên của "
+"nó\n"
+"  -M, --members NGƯỜI_DÙNG,...\t\tđặt danh sách các thành viên của NHÓM\n"
+"%s\n"
+"\n"
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+"Sử dụng: groupmems [tuỳ_chọn ...] [hành_vi]\n"
+"\n"
+"Tuỳ chọn:\n"
+"  -g, --group TÊN_NHÓM    thay đổi tên của nhóm này thay cho nhóm của người "
+"dùng (chỉ người chủ)\n"
+"\n"
+"Hành vi:\n"
+"  -a, --add TÊN\t\t\tthêm tên người dùng này vào nhóm\n"
+"  -d, --delete TÊN         \tgỡ bỏ tên này khỏi nhóm\n"
+"  -p, --purge                   \ttẩy mọi người ra nhóm\n"
+"  -l, --list                    \t\tliệt kê những người trong nhóm\n"
+"\n"
+
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sử dụng: useradd [tuỳ_chọn ...] ĐĂNG_NHẬP\n"
+"\n"
+"Tuỳ chọn:\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s: không thể tạo %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s: không thể chown (thay đổi quyền sở hữu) %s\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"Sử dụng: vipw [tùy_chọn...]\n"
+"\n"
+"Tùy chọn:\n"
+"  -g, --group                   sửa đổi cơ sở dữ liệu _nhóm_\n"
+"  -h, --help                    hiển thị _trợ giúp_ này rồi thoát\n"
+"  -p, --passwd                  sửa đổi cơ sở dữ liệu passwd\n"
+"  -q, --quiet                   chế độ _im_ (không hiển thị chi tiết)\n"
+"  -s, --shadow                  sửa đổi cơ sở dữ liệu shadow hay gshadow\n"
+"\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
@@ -2416,71 +2443,3 @@ msgstr "%s: thÆ° mục cÆ¡ ban không há
 #~ "  -q, --quiet                   chế độ im (không xuất chi tiết)\n"
 #~ "  -s, --shadow                  sửa đổi cơ sở dữ liệu shadow hay gshadow\n"
 #~ "\n"
-
-#~ msgid ""
-#~ "Usage: %s [option] GROUP\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -a, --add USER                add USER to GROUP\n"
-#~ "  -d, --delete USER             remove USER from GROUP\n"
-#~ "  -r, --remove-password         remove the GROUP's password\n"
-#~ "  -R, --restrict                restrict access to GROUP to its members\n"
-#~ "  -M, --members USER,...        set the list of members of GROUP\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Sử dụng: %s [tuỳ_chọn] NHÓM\n"
-#~ "\n"
-#~ "Tuỳ chọn:\n"
-#~ "  -a, --add NGƯỜI_DÙNG\tthêm người dùng này vào NHÓM\n"
-#~ "  -d, --delete NGƯỜI_DÙNG   \tgỡ bỏ người dùng này khỏi NHÓM\n"
-#~ "  -r, --remove-password         \tgỡ bỏ mật khẩu của NHÓM\n"
-#~ "  -R, --restrict \t\t\t\thạn chế truy cập đến NHÓM thành các thành viên "
-#~ "của nó\n"
-#~ "  -M, --members NGƯỜI_DÙNG,...\t\tđặt danh sách các thành viên của NHÓM\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: groupmems [options] [action]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -g, --group groupname         change groupname instead of the user's "
-#~ "group\n"
-#~ "                                (root only)\n"
-#~ "\n"
-#~ "Actions:\n"
-#~ "  -a, --add username            add username to the members of the group\n"
-#~ "  -d, --delete username         remove username from the members of the "
-#~ "group\n"
-#~ "  -p, --purge                   purge all members from the group\n"
-#~ "  -l, --list                    list the members of the group\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Sử dụng: groupmems [tuỳ_chọn ...] [hành_vi]\n"
-#~ "\n"
-#~ "Tuỳ chọn:\n"
-#~ "  -g, --group TÊN_NHÓM    thay đổi tên của nhóm này thay cho nhóm của "
-#~ "người dùng (chỉ người chủ)\n"
-#~ "\n"
-#~ "Hành vi:\n"
-#~ "  -a, --add TÊN\t\t\tthêm tên người dùng này vào nhóm\n"
-#~ "  -d, --delete TÊN         \tgỡ bỏ tên này khỏi nhóm\n"
-#~ "  -p, --purge                   \ttẩy mọi người ra nhóm\n"
-#~ "  -l, --list                    \t\tliệt kê những người trong nhóm\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr ""
-#~ "Sử dụng: useradd [tuỳ_chọn ...] ĐĂNG_NHẬP\n"
-#~ "\n"
-#~ "Tuỳ chọn:\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s: không thể tạo %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s: không thể chown (thay đổi quyền sở hữu) %s\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/zh_CN.po 1:4.1.4.2+svn3283-2ubuntu1/po/zh_CN.po
--- 1:4.1.4.2+svn3283-2/po/zh_CN.po	2010-08-29 16:54:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/zh_CN.po	2010-11-24 14:47:24.000000000 +0000
@@ -12,10 +12,10 @@ msgstr ""
 "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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
@@ -50,17 +50,14 @@ msgid "%s: out of memory\n"
 msgstr "%s:内存溢出\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s:无法更新文件 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s is neither a directory, nor a symlink.\n"
 msgstr "%s:无效的家目录“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s:无法将目录 %s 改名为 %s\n"
 
@@ -69,57 +66,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s:无法创建目录 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s:警告:无法删除"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s:警告:无法删除"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s:改名:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s:无法将目录 %s 改名为 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s:无法将目录 %s 改名为 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s:警告:无法删除"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s:无法创建目录 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s:警告:无法删除"
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot execute %s"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s:无法执行 %s"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s:无法更新影子文件\n"
 
@@ -130,12 +116,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s:改名:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s:无法打开文件 %s\n"
 
@@ -178,17 +162,14 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "无法改变 tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s:字段太长\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "%s: "
 msgstr "%s:%s\n"
 
@@ -219,8 +200,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -237,8 +218,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -295,7 +276,6 @@ msgid "passwd: %s\n"
 msgstr "passwd:%s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "密码未更改。"
 
@@ -339,7 +319,6 @@ msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) 失败\n"
 
 #, fuzzy
-#| msgid "No\n"
 msgid "No"
 msgstr "否\n"
 
@@ -453,12 +432,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s:PAM 验证失败\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s:无法锁定文件,请稍后再试。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s:无法打开文件 %s\n"
 
@@ -467,7 +444,6 @@ msgid "%s: failure while writing changes
 msgstr "%s:fork 失败:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr "%s:无法降低权限(%s)\n"
 
@@ -507,7 +483,6 @@ msgid "Full Name"
 msgstr "全名"
 
 #, fuzzy, c-format
-#| msgid "%s: %s\n"
 msgid "\t%s: %s\n"
 msgstr "%s:%s\n"
 
@@ -551,7 +526,6 @@ msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s:无效的家庭电话:“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "%s: '%s' contains illegal characters\n"
 msgid "%s: '%s' contains non-ASCII characters\n"
 msgstr "%s:“%s”包含非法字符\n"
 
@@ -625,12 +599,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s:第 %d 行:缺少新密码\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s:%s 组不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s:第 %d 行:无法更新条目\n"
 
@@ -639,7 +611,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s:发现错误,忽略改动\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -688,7 +659,6 @@ msgid "Login Shell"
 msgstr "登录 Shell"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "您不能为 %s 更改 shell。\n"
 
@@ -701,17 +671,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s:无效的条目:%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s 是无效的 shell。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s:用户 %s 不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s:警告:%s 不属于 %s\n"
 
@@ -752,7 +719,6 @@ msgid "Login       Failures Maximum Late
 msgstr "登录        失败次数  最多   最近                     于\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [还剩 %lds]"
 
@@ -777,7 +743,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "未知用户:%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s:无法打开文件 %s\n"
 
@@ -786,7 +751,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -815,12 +779,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "无法更改 %s 的密码。\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "无法更改 %s 的密码。\n"
 
@@ -829,7 +791,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s:-A 需要影子组密码\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s:%s 组不存在\n"
 
@@ -871,7 +832,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s:不是 tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -904,12 +864,10 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s:%s 不是有效的组名\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid group %s\n"
 msgid "%s: invalid group ID '%s'\n"
 msgstr "%s:无效组名 %s\n"
 
@@ -918,12 +876,10 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s:-K 需要 KEY=VALUE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s:%s 组已存在\n"
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: GID '%lu' already exists\n"
 msgstr "成员已经存在\n"
 
@@ -931,7 +887,6 @@ msgid "Usage: groupdel group\n"
 msgstr "用法:groupdel 组\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s:无法将目录 %s 改名为 %s\n"
 
@@ -940,12 +895,10 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s:不能在 NIS 客户端上修改用户“%s”。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s:%s 组不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group '%s' is a NIS group.\n"
 msgid "%s: group '%s' is a NIS group\n"
 msgstr "%s:“%s”组是一个 NIS 组。\n"
 
@@ -954,7 +907,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s:%s 是 NIS 管理员\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s:用户 %s 是 NIS 用户\n"
 
@@ -963,7 +915,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s:update_group 内存溢出\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1059,7 +1010,6 @@ msgid "invalid group name '%s'\n"
 msgstr "无效的组名“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "invalid group name '%s'\n"
 msgid "invalid group ID '%lu'\n"
 msgstr "无效的组名“%s”\n"
 
@@ -1111,17 +1061,14 @@ msgid "%s: no changes\n"
 msgstr "%s:无改变\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "用法:groupdel 组\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "用法:groupdel 组\n"
 
 #, fuzzy, c-format
-#| msgid "%s: Cannot execute %s"
 msgid "%s: cannot delete %s\n"
 msgstr "%s:无法执行 %s"
 
@@ -1210,9 +1157,6 @@ msgstr ""
 "[忽略断线要求 -- 允许 root 登录。]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1239,7 +1183,6 @@ msgid "login: "
 msgstr "用户名:"
 
 #, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
 msgid "Maximum number of tries exceeded (%u)\n"
 msgstr "已经超过最大尝试次数 (%d)\n"
 
@@ -1288,7 +1231,6 @@ msgstr ""
 "\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "用法:id\n"
 
@@ -1325,7 +1267,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s:%s 组不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s:无效的用户名“%s”\n"
 
@@ -1358,12 +1299,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s:第 %d 行:无法更新密码\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s:第 %d 行:创建目录失败\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s:第 %d 行:改变所有者或组别失败\n"
 
@@ -1488,17 +1427,14 @@ msgid "The password for %s is unchanged.
 msgstr "%s 的密码未被改变。\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "密码未更改。"
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "密码过期警告"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "用法:%s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1507,7 +1443,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1526,42 +1461,34 @@ msgid "invalid user name '%s'\n"
 msgstr "无效的用户名“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "无效的用户名“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "用户 %s:无 %u 组\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "用户 %s:目录 %s 不存在\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "用户 %s:程序 %s 不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s:无法创建目录 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s:无法创建目录 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s:无法创建目录 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s:无法锁定文件 %s\n"
 
@@ -1589,17 +1516,14 @@ msgid "user %s: last password change in 
 msgstr "用户 %s:最近一次密码改动\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s:无法打开文件 %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "用法:id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s:无法重写文件\n"
 
@@ -1608,7 +1532,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "用法:id\n"
 
@@ -1628,7 +1551,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s:无法锁定文件 %s\n"
 
@@ -1703,12 +1625,10 @@ msgstr ""
 "(忽略)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s:PAM 验证失败\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "您没有被授权 su %s\n"
 
@@ -1753,12 +1673,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s:无法打开新的默认文件\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s:第 %d 行:改变所有者或组别失败\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s:改名:%s"
 
@@ -1771,7 +1689,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s:指定了过多组(最多 %d)。\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1921,7 +1838,6 @@ msgid "Setting mailbox file permissions"
 msgstr "正在设置信箱文件访问权限"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s:用户 %s 已存在\n"
 
@@ -1935,12 +1851,10 @@ msgid "%s: can't create user\n"
 msgstr "%s:无法创建 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: UID %u is not unique\n"
 msgid "%s: UID %lu is not unique\n"
 msgstr "%s:UID %u 并不唯一\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s:无法创建目录 %s\n"
 
@@ -1968,13 +1882,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s:不能删除 %s 组,因为它是另外一个用户的主组。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s:警告:无法删除"
 
@@ -1987,17 +1898,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s:无法降低权限(%s)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s:无法将目录 %s 改名为 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s:无法将目录 %s 改名为 %s\n"
 
@@ -2010,7 +1918,6 @@ msgid "%s: user %s is currently logged i
 msgstr "%s:用户 %s 目前已登录\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s:无效的家目录“%s”\n"
 
@@ -2082,7 +1989,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s:用户 %s 已存在\n"
 
@@ -2099,7 +2005,6 @@ msgid "%s: the -L, -p, and -U flags are 
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "成员已经存在\n"
 
@@ -2114,7 +2019,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s:无法创建目录 %s\n"
 
@@ -2152,7 +2056,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2175,31 +2078,24 @@ msgid "  -u, --user                    w
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "%s: failed to remove %s\n"
 msgstr "%s:无法降低权限(%s)\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s:%s 没有更改\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "无法为信箱改名"
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
 msgstr "%s:无法降低权限(%s)\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "无法锁定文件"
 
@@ -2207,7 +2103,6 @@ msgid "setfscreatecon () failed"
 msgstr ""
 
 #, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to gain privileges"
 msgstr "%s:无法降低权限(%s)\n"
 
@@ -2218,27 +2113,22 @@ msgid "Couldn't make backup"
 msgstr "无法备份"
 
 #, fuzzy
-#| msgid "Unable to open group file\n"
 msgid "failed to open scratch file"
 msgstr "无法打开组文件\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s:字段太长\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "无法为信箱改名"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "改变信箱所有者失败"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "无法为信箱改名"
 
@@ -2250,6 +2140,89 @@ msgstr "%s:无法恢复 %s:%s (您çš
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s:无效的主目录“%s”\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s 是无效的 shell。\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "用法:%s [输入]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s:无法创建 %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s:无法改变 %s 的所有者和组别\n"
+
+#, fuzzy
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+"用法:vipw [选项]\n"
+"\n"
+"选项:\n"
+"  -g, --group\t\t\t编辑组数据库\n"
+"  -h, --help\t\t\t显示此帮助信息并退出\n"
+"  -p, --passwd\t\t\t编辑 passwd 数据库\n"
+"  -q, --quiet\t\t\t安静模式\n"
+"  -s, --shadow\t\t\t编辑 shadow 或 gshadow 数据库\n"
+"\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
@@ -2274,20 +2247,6 @@ msgstr "%s:无效的主目录“%s”\
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "用法:%s [输入]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s:无法创建 %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s:无法改变 %s 的所有者和组别\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
diff -pruN 1:4.1.4.2+svn3283-2/po/zh_TW.po 1:4.1.4.2+svn3283-2ubuntu1/po/zh_TW.po
--- 1:4.1.4.2+svn3283-2/po/zh_TW.po	2010-08-29 16:54:00.000000000 +0100
+++ 1:4.1.4.2+svn3283-2ubuntu1/po/zh_TW.po	2010-11-24 14:47:24.000000000 +0000
@@ -11,10 +11,10 @@ msgstr ""
 "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"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
@@ -52,7 +52,6 @@ msgid "%s: out of memory\n"
 msgstr "%s:記憶體不足\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot stat %s: %s\n"
 msgstr "%s:無法更新檔案 %s\n"
 
@@ -61,7 +60,6 @@ msgid "%s: %s is neither a directory, no
 msgstr "%s:無效的主目錄“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
@@ -70,57 +68,46 @@ msgid "%s: Suspiciously long symlink: %s
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s:無法建立目錄 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owner of %s: %s\n"
 msgstr "%s:警告:無法刪除"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change mode of %s: %s\n"
 msgstr "%s:警告:無法刪除"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: unlink: %s: %s\n"
 msgstr "%s:更名:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove directory %s: %s\n"
 msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot rename %s to %s: %s\n"
 msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot remove %s: %s\n"
 msgstr "%s:警告:無法刪除"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Cannot create symbolic link %s: %s\n"
 msgstr "%s:無法建立目錄 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: Cannot change owners of %s: %s\n"
 msgstr "%s:警告:無法刪除"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot lstat %s: %s\n"
 msgstr "%s:無法更新檔案 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't update shadow file\n"
 msgid "%s: Warning, user %s has no tcb shadow file.\n"
 msgstr "%s:無法更新shadow檔案\n"
 
@@ -131,12 +118,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: mkdir: %s: %s\n"
 msgstr "%s:更名:%s"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: Cannot open %s: %s\n"
 msgstr "%s:無法打開檔案 %s\n"
 
@@ -179,12 +164,10 @@ msgid "Cannot open audit interface - abo
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Unable to change tty %s"
 msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "無法改變 tty %s"
 
 #, fuzzy, c-format
-#| msgid "%s: fields too long\n"
 msgid "%s: failed to unlock %s\n"
 msgstr "%s:字段太長\n"
 
@@ -219,8 +202,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -237,8 +220,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%"
+"lu)\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -296,7 +279,6 @@ msgid "passwd: %s\n"
 msgstr "passwd:%s\n"
 
 #, fuzzy
-#| msgid "Password changed."
 msgid "passwd: password unchanged\n"
 msgstr "密碼已更改。"
 
@@ -452,12 +434,10 @@ msgid "%s: PAM authentication failed\n"
 msgstr "%s:PAM 驗証失敗\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't lock files, try again later\n"
 msgid "%s: cannot lock %s; try again later.\n"
 msgstr "%s:無法鎖定檔案,請稍後再試。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot open %s\n"
 msgstr "%s:無法打開檔案 %s\n"
 
@@ -601,7 +581,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: do not include \"l\" with other flags\n"
 msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s:請不要與其它標誌一同使用“l”\n"
 
@@ -622,12 +601,10 @@ msgid "%s: line %d: missing new password
 msgstr "%s:第 %d 行:缺少新密碼\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s:%s 群組不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: can't update entry\n"
 msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "%s:第 %d 行:無法更新項目\n"
 
@@ -636,7 +613,6 @@ msgid "%s: error detected, changes ignor
 msgstr "%s:發現錯誤,忽略更動\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -679,7 +655,6 @@ msgid "Login Shell"
 msgstr "登入 Shell"
 
 #, fuzzy, c-format
-#| msgid "You may not change the shell for %s.\n"
 msgid "You may not change the shell for '%s'.\n"
 msgstr "您不能為 %s 更改 shell。\n"
 
@@ -692,17 +667,14 @@ msgid "%s: Invalid entry: %s\n"
 msgstr "%s:無效的項目:%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s is an invalid shell.\n"
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s 是無效的 shell。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s does not exist\n"
 msgid "%s: Warning: %s does not exist\n"
 msgstr "%s:使用者 %s 不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: %s not owned by %s\n"
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s:警告:%s 不屬於 %s\n"
 
@@ -743,7 +715,6 @@ msgid "Login       Failures Maximum Late
 msgstr "登入        失敗     最多    最後                     在\n"
 
 #, fuzzy, c-format
-#| msgid " [%lds left]"
 msgid " [%lus left]"
 msgstr " [還剩 %lds]"
 
@@ -768,7 +739,6 @@ msgid "lastlog: Unknown user or range: %
 msgstr "未知使用者:%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "faillog: Cannot open %s: %s\n"
 msgstr "%s:無法打開檔案 %s\n"
 
@@ -777,7 +747,6 @@ msgid "faillog: Cannot get the size of %
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -806,12 +775,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "無法更改 %s 的密碼。\n"
 
 #, fuzzy
-#| msgid "The password for %s cannot be changed.\n"
 msgid "The options cannot be combined.\n"
 msgstr "無法更改 %s 的密碼。\n"
 
@@ -820,7 +787,6 @@ msgid "%s: shadow group passwords requir
 msgstr "%s:-A 需要shadow群組密碼\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist in %s\n"
 msgstr "%s:%s 群組不存在\n"
 
@@ -862,7 +828,6 @@ msgid "%s: Not a tty\n"
 msgstr "%s:不是 tty\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
@@ -895,7 +860,6 @@ msgid "  -r, --system                  c
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s:%s 不是有效的群組名\n"
 
@@ -908,7 +872,6 @@ msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s:-O 需要 NAME=VALUE\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s exists\n"
 msgid "%s: group '%s' already exists\n"
 msgstr "%s:%s 群組已存在\n"
 
@@ -920,7 +883,6 @@ msgid "Usage: groupdel group\n"
 msgstr "用法:groupdel 群組\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
@@ -929,7 +891,6 @@ msgid "%s: cannot remove the primary gro
 msgstr "%s:不能在 NIS 用戶端上修改使用者“%s”。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: group %s does not exist\n"
 msgid "%s: group '%s' does not exist\n"
 msgstr "%s:%s 群組不存在\n"
 
@@ -942,7 +903,6 @@ msgid "%s: %s is the NIS master\n"
 msgstr "%s:%s 是 NIS 管理員\n"
 
 #, fuzzy, c-format
-#| msgid "%s: user %s is a NIS user\n"
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s:使用者 %s 是 NIS 使用者\n"
 
@@ -951,7 +911,6 @@ msgid "%s: Out of memory. Cannot update 
 msgstr "%s:update_group 時記憶體不足\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
@@ -1098,17 +1057,14 @@ msgid "%s: no changes\n"
 msgstr "%s:無改變\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpconv\n"
 msgstr "用法:groupdel 群組\n"
 
 #, fuzzy
-#| msgid "Usage: groupdel group\n"
 msgid "Usage: grpunconv\n"
 msgstr "用法:groupdel 群組\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s:無法更新檔案 %s\n"
 
@@ -1196,9 +1152,6 @@ msgstr ""
 "[忽略斷線要求 -- 允許 root 登入。]"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
@@ -1276,7 +1229,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: logoutd\n"
 msgstr "用法:id\n"
 
@@ -1313,7 +1265,6 @@ msgid "%s: group '%s' is a shadow group,
 msgstr "%s:%s 群組不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s:無效使用者名稱“%s”\n"
 
@@ -1346,12 +1297,10 @@ msgid "%s: line %d: can't update passwor
 msgstr "%s:第 %d 行:無法更新密碼\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: mkdir failed\n"
 msgid "%s: line %d: mkdir %s failed: %s\n"
 msgstr "%s:第 %d 行:建立目錄失敗\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line %d: chown %s failed: %s\n"
 msgstr "%s:第 %d 行:改變擁有者或群組失敗\n"
 
@@ -1468,17 +1417,14 @@ msgid "The password for %s is unchanged.
 msgstr "%s 的密碼未被改變。\n"
 
 #, fuzzy, c-format
-#| msgid "Password changed."
 msgid "%s: password changed.\n"
 msgstr "密碼已更改。"
 
 #, fuzzy, c-format
-#| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "密碼過期警告"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgid "Usage: %s [-q] [-r] [passwd]\n"
 msgstr "用法:%s [-q] [-r] [-s] [passwd [shadow]]\n"
 
@@ -1487,7 +1433,6 @@ msgid "Usage: %s [-q] [-r] [-s] [passwd 
 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"
 
@@ -1506,42 +1451,34 @@ msgid "invalid user name '%s'\n"
 msgstr "無效的使用者名稱“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
 msgid "invalid user ID '%lu'\n"
 msgstr "無效的使用者名稱“%s”\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: no group %u\n"
 msgid "user '%s': no group %lu\n"
 msgstr "使用者 %s:無 %u 群組\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: directory %s does not exist\n"
 msgid "user '%s': directory '%s' does not exist\n"
 msgstr "使用者 %s:目錄 %s 不存在\n"
 
 #, fuzzy, c-format
-#| msgid "user %s: program %s does not exist\n"
 msgid "user '%s': program '%s' does not exist\n"
 msgstr "使用者 %s:程式 %s 不存在\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "no tcb directory for %s\n"
 msgstr "%s:無法建立目錄 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "create tcb directory for %s?"
 msgstr "%s:無法建立目錄 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "failed to create tcb directory for %s\n"
 msgstr "%s:無法建立目錄 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: cannot lock %s.\n"
 msgstr "%s:無法鎖定檔案 %s\n"
 
@@ -1569,17 +1506,14 @@ msgid "user %s: last password change in 
 msgstr "使用者 %s:最近一次密碼更動\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s:無法打開檔案 %s\n"
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwconv\n"
 msgstr "用法:id\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s:無法重寫檔案\n"
 
@@ -1588,7 +1522,6 @@ msgid "%s: failed to change the mode of 
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: id\n"
 msgid "Usage: pwunconv\n"
 msgstr "用法:id\n"
 
@@ -1608,7 +1541,6 @@ msgid " ...waiting for child to terminat
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot lock file %s\n"
 msgid "%s: Cannot fork user shell\n"
 msgstr "%s:無法鎖定檔案 %s\n"
 
@@ -1672,12 +1604,10 @@ msgstr ""
 "(忽略)\n"
 
 #, fuzzy, c-format
-#| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
 msgstr "%s:PAM 驗証失敗\n"
 
 #, fuzzy, c-format
-#| msgid "You are not authorized to su %s\n"
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "您沒有被授權 su %s\n"
 
@@ -1722,12 +1652,10 @@ msgid "%s: cannot open new defaults file
 msgstr "%s:無法打開新的預設檔案\n"
 
 #, fuzzy, c-format
-#| msgid "%s: line %d: chown failed\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s:第 %d 行:改變擁有者或群組失敗\n"
 
 #, fuzzy, c-format
-#| msgid "%s: rename: %s"
 msgid "%s: rename: %s: %s"
 msgstr "%s:更名:%s"
 
@@ -1740,7 +1668,6 @@ msgid "%s: too many groups specified (ma
 msgstr "%s:指定了過多群組(最多 %d)。\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
@@ -1890,7 +1817,6 @@ msgid "Setting mailbox file permissions"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists\n"
 msgstr "%s:使用者 %s 已存在\n"
 
@@ -1909,7 +1835,6 @@ msgid "%s: UID %lu is not unique\n"
 msgstr "%s:gid %u 並不唯一\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to create tcb directory for %s\n"
 msgstr "%s:無法建立目錄 %s\n"
 
@@ -1939,7 +1864,6 @@ msgid "%s: group %s is the primary group
 msgstr "%s:不能刪除使用者的主群組。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s:警告:無法刪除"
 
@@ -1952,17 +1876,14 @@ msgid "%s: Can't allocate memory, tcb en
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot update file %s\n"
 msgid "%s: Cannot drop privileges: %s\n"
 msgstr "%s:無法更新檔案 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove the content of %s: %s\n"
 msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot rename directory %s to %s\n"
 msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
@@ -2026,7 +1947,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: user %s exists\n"
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s:使用者 %s 已存在\n"
 
@@ -2057,7 +1977,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
 msgid "%s: Failed to change ownership of the home directory"
 msgstr "%s:無法建立目錄 %s\n"
 
@@ -2095,7 +2014,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
@@ -2122,16 +2040,12 @@ msgid "%s: failed to remove %s\n"
 msgstr "%s:無效的工作電話:“%s”\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "%s: %s is unchanged\n"
 msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s:%s 沒有更改\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create scratch directory"
 msgstr "無法為信箱改名"
 
@@ -2140,7 +2054,6 @@ msgid "failed to drop privileges"
 msgstr "%s:無效的工作電話:“%s”\n"
 
 #, fuzzy
-#| msgid "Couldn't lock file"
 msgid "Couldn't get file context"
 msgstr "無法鎖定檔案"
 
@@ -2161,22 +2074,18 @@ msgid "failed to open scratch file"
 msgstr "%s:無法打開群組檔案\n"
 
 #, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "failed to unlink scratch file"
 msgstr "%s:字段太長\n"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to stat edited file"
 msgstr "無法為信箱改名"
 
 #, fuzzy
-#| msgid "failed to change mailbox owner"
 msgid "failed to allocate memory"
 msgstr "改變信箱所有者失敗"
 
 #, fuzzy
-#| msgid "failed to rename mailbox"
 msgid "failed to create backup file"
 msgstr "無法為信箱改名"
 
@@ -2188,6 +2097,79 @@ msgstr "%s:無法復原 %s:%s (您çš
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s:無效的主目錄“%s”\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s 是無效的 shell。\n"
+
+msgid ""
+"  -l, --lock-time SEC           after failed login lock account for SEC "
+"seconds\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
+
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
+
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+msgstr "用法:%s [輸入]\n"
+
+#, c-format
+msgid "%s: can't create %s\n"
+msgstr "%s:無法建立 %s\n"
+
+#, c-format
+msgid "%s: can't chown %s\n"
+msgstr "%s:無法改變 %s 的所有者和群組\n"
+
+msgid ""
+"Usage: vipw [options]\n"
+"\n"
+"Options:\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
+"\n"
+msgstr ""
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
@@ -2210,20 +2192,6 @@ msgstr "%s:無效的主目錄“%s”\
 #~ "\n"
 
 #, fuzzy
-#~| msgid "Usage: %s [input]\n"
-#~ msgid ""
-#~ "Usage: useradd [options] LOGIN\n"
-#~ "\n"
-#~ "Options:\n"
-#~ msgstr "用法:%s [輸入]\n"
-
-#~ msgid "%s: can't create %s\n"
-#~ msgstr "%s:無法建立 %s\n"
-
-#~ msgid "%s: can't chown %s\n"
-#~ msgstr "%s:無法改變 %s 的所有者和群組\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"


More information about the Pkg-shadow-devel mailing list