diff -pruN 3.118/adduser 3.118ubuntu5/adduser
--- 3.118/adduser	2017-08-12 16:43:21.000000000 +0000
+++ 3.118ubuntu5/adduser	2020-12-02 10:15:26.000000000 +0000
@@ -103,6 +103,8 @@ our $no_create_home = undef;
 our $special_home = undef;
 our $special_shell = undef;
 our $add_extra_groups = 0;
+our $use_extrausers = 0;
+our $encrypt_home = undef;
 
 # Global variables we need later
 my $existing_user = undef;
@@ -140,7 +142,9 @@ unless ( GetOptions ("quiet|q" => sub {
 	    "gid=i" => \$new_gid,
 	    "conf=s" => \$configfile,
 	    "no-create-home" => \$no_create_home,
+	    "encrypt-home" => \$encrypt_home,
             "add_extra_groups" => \$add_extra_groups,
+        "extrausers" => \$use_extrausers,
 	    "debug" => sub { $verbose = 2 } ) ) {
     &usage();
     exit RET_INVALID_CALL;
@@ -222,6 +226,11 @@ if ($found_group_opt) {
     }
 }
 
+my $ecryptfs_setup_private;
+if (defined($encrypt_home)) {
+	$ecryptfs_setup_private = &which('ecryptfs-setup-private');
+}
+
 
 $ENV{"VERBOSE"} = $verbose;
 $ENV{"DEBUG"}   = $verbose;
@@ -230,7 +239,7 @@ $ENV{"DEBUG"}   = $verbose;
 # preseed configuration data and then read the config file
 preseed_config(\@defaults,\%config);
 
-&checkname($new_name) if defined $new_name;
+&checkname($new_name, $found_sys_opt) if defined $new_name;
 $SIG{'INT'} = $SIG{'QUIT'} = $SIG{'HUP'} = 'handler';
 
 #####
@@ -300,7 +309,11 @@ if ($action eq "addsysgroup") {
     printf (gtx("Adding group `%s' (GID %d) ...\n"),$new_name,$new_gid) if $verbose;
     &invalidate_nscd("group");
     my $groupadd = &which('groupadd');
-    &systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
     &invalidate_nscd("group");
     print (gtx("Done.\n")) if $verbose;
     exit RET_OK;
@@ -329,7 +342,11 @@ if ($action eq "addgroup") {
     printf (gtx("Adding group `%s' (GID %d) ...\n"),$new_name,$new_gid) if $verbose;
     &invalidate_nscd("group");
     my $groupadd = &which('groupadd');
-    &systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
     &invalidate_nscd("group");
     print (gtx("Done.\n")) if $verbose;
     exit RET_OK;
@@ -354,7 +371,11 @@ if ($action eq "addusertogroup") {
 	if $verbose;
     &invalidate_nscd();
     my $gpasswd = &which('gpasswd');
-    &systemcall($gpasswd, '-a',$existing_user,$existing_group);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($gpasswd, '--extrausers', '-a',$existing_user,$existing_group);
+    } else {
+        &systemcall($gpasswd, '-a',$existing_user,$existing_group);
+    }
     &invalidate_nscd();
     print (gtx("Done.\n")) if $verbose;
     exit RET_OK;
@@ -424,7 +445,11 @@ if ($action eq "addsysuser") {
 	printf (gtx("Adding new group `%s' (GID %d) ...\n"),$new_name,$new_gid) if $verbose;
 	$undogroup = $new_name;
        my $groupadd = &which('groupadd');
-	&systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
 	&invalidate_nscd("group");
     }
 
@@ -434,8 +459,13 @@ if ($action eq "addsysuser") {
     $shell = $special_shell || '/usr/sbin/nologin';
     $undouser = $new_name;
     my $useradd = &which('useradd');
-    &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
-		$shell, '-u', $new_uid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($useradd, '--extrausers', '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    } else {
+        &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    }
     if(!$disabled_login) {
         my $usermod = &which('usermod');
         &systemcall($usermod, '-p', '*', $new_name);
@@ -514,7 +544,11 @@ if ($action eq "adduser") {
 	printf (gtx("Adding new group `%s' (%d) ...\n"),$new_name,$new_gid) if $verbose;
 	$undogroup = $new_name;
         my $groupadd = &which('groupadd');
-	&systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
 	&invalidate_nscd();
     }
 
@@ -524,8 +558,13 @@ if ($action eq "adduser") {
 	$shell = $special_shell || $config{"dshell"};
     $undouser = $new_name;
     my $useradd = &which('useradd');
-    &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
-		$shell, '-u', $new_uid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($useradd, '--extrausers', '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    } else {
+        &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    }
     &invalidate_nscd();
 
     create_homedir (1); # copy skeleton data
@@ -574,7 +613,11 @@ if ($action eq "adduser") {
 	my $noexpr = langinfo(NOEXPR());
 	for (;;) {
            my $chfn = &which('chfn');
-	    &systemcall($chfn, $new_name);
+        if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+    	    &systemcall($chfn, '--extrausers', $new_name);
+        } else {
+    	    &systemcall($chfn, $new_name);
+        }
 	    # Translators: [y/N] has to be replaced by values defined in your
 	    # locale.  You can see by running "locale yesexpr" which regular
 	    # expression will be checked to find positive answer.
@@ -602,9 +645,15 @@ if ($action eq "adduser") {
                 if $verbose;
             &invalidate_nscd();
             my $gpasswd = &which('gpasswd');
-            &systemcall($gpasswd, '-M',
-                        join(',', get_group_members($newgrp), $new_name),
-                        $newgrp);
+            if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+                &systemcall($gpasswd, '--extrausers', '-M',
+                            join(',', get_group_members($newgrp), $new_name),
+                            $newgrp);
+            } else {
+                &systemcall($gpasswd, '-M',
+                            join(',', get_group_members($newgrp), $new_name),
+                            $newgrp);
+            }
             &invalidate_nscd();
         }
     }
@@ -671,6 +720,21 @@ sub create_homedir {
       chmod ($dir_mode, $home_dir) ||
 	  &cleanup("chmod $dir_mode $home_dir: $!\n");
 
+      if ($action eq "adduser") {
+          # Mute the command
+          system('sh' => ( '-c' => '"$@" >/dev/null 2>&1', '--', '/usr/sbin/zsysctl', 'userdata', 'create', $new_name, $home_dir,));
+          chown($new_uid, $new_gid, $home_dir)
+    	  || &cleanup("chown $new_uid:$new_gid $home_dir: $!\n");
+          $dir_mode = get_dir_mode($make_group_also);
+          chmod ($dir_mode, $home_dir) ||
+    	  &cleanup("chmod $dir_mode $home_dir: $!\n");
+      }
+
+      if (defined($encrypt_home)) {
+	printf gtx("Setting up encryption ...\n") if $verbose;
+	&systemcall($ecryptfs_setup_private, '-b', '-u', $new_name);
+      }
+
       if ($config{"skel"} && $copy_skeleton) {
 	  printf gtx("Copying files from `%s' ...\n"),$config{skel} if $verbose;
 	  open(my $FIND, "cd $config{skel}; find .  -print |")
@@ -683,6 +747,10 @@ sub create_homedir {
 			    $new_gid, ($config{"setgid_home"} =~ /yes/i));
 	  }
       }
+
+      if (defined($encrypt_home)) {
+	  &systemcall("/bin/umount", $home_dir);
+      }
   }
 }
 
@@ -858,11 +926,12 @@ sub copy_to_dir {
 
 # checkname: perform some sanity checks
 # parameters:
-#   none
+#   name: the name to check
+#   system: 0 if the user isn't a system user, 1 otherwise
 # return values:
 #   none (exits on error)
 sub checkname {
-    my ($name) = @_;
+    my ($name, $system) = @_;
     if ($name !~ /^[_.A-Za-z0-9][-\@_.A-Za-z0-9]*\$?$/) {
 	printf STDERR
 (gtx("%s: To avoid problems, the username should consist only of
@@ -871,14 +940,16 @@ a dash (as defined by IEEE Std 1003.1-20
 machine accounts \$ is also supported at the end of the username\n"), $0);
         exit RET_INVALID_CHARS_IN_NAME;;
     }
-    if ($name !~ qr/$config{"name_regex"}/) {
+    if ($system
+        ? $name !~ qr/$config{"name_regex_system"}/
+        : $name !~ qr/$config{"name_regex"}/) {
       if ($allow_badname) {
 	print (gtx("Allowing use of questionable username.\n")) if ($verbose);
       }
       else {
         printf STDERR
 (gtx("%s: Please enter a username matching the regular expression configured
-via the NAME_REGEX configuration variable.  Use the `--force-badname'
+via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-badname'
 option to relax this check or reconfigure NAME_REGEX.\n"), $0);
         exit RET_INVALID_CHARS_IN_NAME;
       }
@@ -929,17 +1000,31 @@ sub ch_gecos {
 	  my($gecos_name,$gecos_room,$gecos_work,$gecos_home,$gecos_other)
 	    = split(/,/,$gecos);
 
-	  &systemcall($chfn, '-f', $gecos_name, '-r', $gecos_room, $new_name);
-	  &systemcall($chfn,'-w',$gecos_work,$new_name)
-	    if(defined($gecos_work));
-	  &systemcall($chfn,'-h',$gecos_home,$new_name)
-	    if(defined($gecos_home));
-	  &systemcall($chfn,'-o',$gecos_other,$new_name)
-	    if(defined($gecos_other));
+        if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+            &systemcall($chfn, '--extrausers', '-f', $gecos_name, '-r', $gecos_room, $new_name);
+            &systemcall($chfn,'--extrausers','-w',$gecos_work,$new_name)
+                if(defined($gecos_work));
+            &systemcall($chfn,'--extrausers','-h',$gecos_home,$new_name)
+                if(defined($gecos_home));
+            &systemcall($chfn,'--extrausers','-o',$gecos_other,$new_name)
+                if(defined($gecos_other));
+        } else {
+            &systemcall($chfn, '-f', $gecos_name, '-r', $gecos_room, $new_name);
+            &systemcall($chfn,'-w',$gecos_work,$new_name)
+                if(defined($gecos_work));
+            &systemcall($chfn,'-h',$gecos_home,$new_name)
+                if(defined($gecos_home));
+            &systemcall($chfn,'-o',$gecos_other,$new_name)
+                if(defined($gecos_other));
+        } 
       }
     else
       {
-	  &systemcall($chfn, '-f', $gecos, $new_name);
+        if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+            &systemcall($chfn, '--extrausers', '-f', $gecos, $new_name);
+        } else {
+            &systemcall($chfn, '-f', $gecos, $new_name);
+        }
       }
 }
 
@@ -1005,7 +1090,8 @@ sub usage {
     printf gtx(
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]
 [--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]
-[--disabled-password] [--disabled-login] [--add_extra_groups] USER
+[--disabled-password] [--disabled-login] [--add_extra_groups]
+[--encrypt-home] USER
    Add a normal user
 
 adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]
@@ -1026,7 +1112,8 @@ adduser USER GROUP
 general options:
   --quiet | -q      don't give process information to stdout
   --force-badname   allow usernames which do not match the
-                    NAME_REGEX configuration variable
+                    NAME_REGEX[_SYSTEM] configuration variable
+  --extrausers      uses extra users as the database
   --help | -h       usage message
   --version | -v    version number and copyright
   --conf | -c FILE  use FILE as configuration file\n\n");
diff -pruN 3.118/AdduserCommon.pm 3.118ubuntu5/AdduserCommon.pm
--- 3.118/AdduserCommon.pm	2016-11-26 20:26:30.000000000 +0000
+++ 3.118ubuntu5/AdduserCommon.pm	2018-09-15 22:14:20.000000000 +0000
@@ -208,10 +208,12 @@ sub preseed_config {
   $configref->{"setgid_home"} = "no";
   $configref->{"no_del_paths"} = "^/$ ^/lost+found/.* ^/media/.* ^/mnt/.* ^/etc/.* ^/bin/.* ^/boot/.* ^/dev/.* ^/lib/.* ^/proc/.* ^/root/.* ^/sbin/.* ^/tmp/.* ^/sys/.* ^/srv/.* ^/opt/.* ^/initrd/.* ^/usr/.* ^/var/.*";
   $configref->{"name_regex"} = "^[a-z][-a-z0-9_]*\$";
+  $configref->{"name_regex_system"} = "^[A-Za-z][-A-Za-z0-9_]*\$";
   $configref->{"exclude_fstypes"} = "(proc|sysfs|usbfs|devpts|tmpfs)";
   $configref->{"skel_ignore_regex"} = "dpkg-(old|new|dist)\$";
   $configref->{"extra_groups"} = "dialout cdrom floppy audio video plugdev users";
   $configref->{"add_extra_groups"} = 0;
+  $configref->{"use_extrausers"} = 0;
 
   foreach( @$conflistref ) {
       read_config($_,$configref);
diff -pruN 3.118/adduser.conf 3.118ubuntu5/adduser.conf
--- 3.118/adduser.conf	2016-06-26 20:20:46.000000000 +0000
+++ 3.118ubuntu5/adduser.conf	2020-12-14 00:16:15.000000000 +0000
@@ -53,7 +53,7 @@ USERS_GID=100
 
 # If DIR_MODE is set, directories will be created with the specified
 # mode. Otherwise the default mode 0755 will be used.
-DIR_MODE=0755
+DIR_MODE=0750
 
 # If SETGID_HOME is "yes" home directories for users with their own
 # group the setgid bit will be set. This was the default for
@@ -83,3 +83,6 @@ SKEL_IGNORE_REGEX="dpkg-(old|new|dist|sa
 
 # check user and group names also against this regular expression.
 #NAME_REGEX="^[a-z][-a-z0-9_]*\$"
+
+# use extrausers by default
+#USE_EXTRAUSERS=1
diff -pruN 3.118/debian/changelog 3.118ubuntu5/debian/changelog
--- 3.118/debian/changelog	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/changelog	2021-01-06 06:16:50.000000000 +0000
@@ -1,3 +1,54 @@
+adduser (3.118ubuntu5) hirsute; urgency=medium
+
+  * Enable private home directories by default (LP: #48734)
+    - Set DIR_MODE=0750 in the default adduser.conf
+    - Change the description and default value to select private home
+      directories by default in debconf template
+    - Change the DIR_MODE when private home directories is configured via
+      debconf from 0751 to 0750 to ensure files are truly private
+
+ -- Alex Murray <alex.murray@canonical.com>  Wed, 06 Jan 2021 16:46:50 +1030
+
+adduser (3.118ubuntu4) hirsute; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * Drop support for extrausers in deluser, not available yet.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 10 Dec 2020 16:53:10 +0000
+
+adduser (3.118ubuntu3) hirsute; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * Add support for extrausers in gpasswd
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 02 Dec 2020 10:16:44 +0000
+
+adduser (3.118ubuntu2) focal; urgency=medium
+
+  * Add support for ZFS home directories:
+    - Home directories are created as ZFS dataset if zsysctl is installed. If
+      the command is not installed or fails, the user will be created as usual
+      without a dedicated dataset (LP: #1873263)
+
+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@ubuntu.com>  Thu, 16 Apr 2020 16:12:53 +0200
+
+adduser (3.118ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - AdduserCommon.pm, adduser, adduser.8, adduser.conf.5: Allow uppercase
+      letters in the names of system users. This is done by having a separate
+      NAME_REGEX_SYSTEM configuration setting which applies when --system is
+      specified. (Soren Hansen)
+    - Add support for encrypting home directories:
+      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
+        for the hard work.
+      + doc/adduser.8: document the --encrypt-home option
+      + debian/control: suggest ecryptfs-utils >= 67-1
+      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
+    - extrausers support for adduser.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 Feb 2019 12:01:22 -0800
+
 adduser (3.118) unstable; urgency=low
 
   * Team upload
@@ -22,6 +73,23 @@ adduser (3.118) unstable; urgency=low
 
  -- Afif Elghraoui <afif@debian.org>  Sat, 15 Sep 2018 15:12:39 -0400
 
+adduser (3.117ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - AdduserCommon.pm, adduser, adduser.8, adduser.conf.5: Allow uppercase
+      letters in the names of system users. This is done by having a separate
+      NAME_REGEX_SYSTEM configuration setting which applies when --system is
+      specified. (Soren Hansen)
+    - Add support for encrypting home directories:
+      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
+        for the hard work.
+      + doc/adduser.8: document the --encrypt-home option
+      + debian/control: suggest ecryptfs-utils >= 67-1
+      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
+    - extrausers support for adduser.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 14 May 2018 22:18:11 -0700
+
 adduser (3.117) unstable; urgency=medium
 
   [ Marc Haber ]
@@ -34,6 +102,27 @@ adduser (3.117) unstable; urgency=medium
 
  -- Marc Haber <mh+debian-packages@zugschlus.de>  Fri, 02 Feb 2018 17:42:15 +0100
 
+adduser (3.116ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - AdduserCommon.pm, adduser, adduser.8, adduser.conf.5: Allow uppercase
+      letters in the names of system users. This is done by having a separate
+      NAME_REGEX_SYSTEM configuration setting which applies when --system is
+      specified. (Soren Hansen)
+    - Add support for encrypting home directories:
+      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
+        for the hard work.
+      + doc/adduser.8: document the --encrypt-home option
+      + debian/control: suggest ecryptfs-utils >= 67-1
+      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
+    - extrausers support for adduser.
+  * Dropped changes, included in Debian:
+    - Add autopkgtest.
+    - testsuite/runsuite.sh: Add the testsuite directory to @INC, so it can
+      find the tests.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 05 Dec 2017 08:57:20 -0800
+
 adduser (3.116) unstable; urgency=medium
 
   * Advise installation of 'perl' rather than 'perl-modules'
@@ -129,6 +218,52 @@ adduser (3.114) unstable; urgency=medium
 
  -- Niels Thykier <niels@thykier.net>  Sat, 12 Mar 2016 15:53:58 +0000
 
+adduser (3.113+nmu3ubuntu5) zesty; urgency=medium
+
+  * testsuite/runsuite.sh: Add the testsuite directory to @INC, so it can find
+    the tests.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Mon, 31 Oct 2016 14:53:46 +0000
+
+adduser (3.113+nmu3ubuntu4) wily; urgency=medium
+
+  * extrausers support for adduser (LP: #1323732)
+
+ -- Sergio Schvezov <sergio.schvezov@canonical.com>  Fri, 26 Jun 2015 17:34:29 -0300
+
+adduser (3.113+nmu3ubuntu3) trusty; urgency=low
+
+  * Add autopkgtest. (LP: #1246331)
+
+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@canonical.com>  Wed, 30 Oct 2013 14:51:16 +0100
+
+adduser (3.113+nmu3ubuntu2) saucy; urgency=low
+
+  * Move ecryptfs-utils from recommends, to suggests. (LP: #1188108)
+    Adduser has moved from required to minimal set, and thus started to
+    pull ecryptfs-utils and cryptsetup into minimal installs, which is an
+    undesired effect.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Fri, 07 Jun 2013 11:24:08 +0100
+
+adduser (3.113+nmu3ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - AdduserCommon.pm, adduser, adduser.8, adduser.conf.5: Allow uppercase
+      letters in the names of system users. This is done by having a separate
+      NAME_REGEX_SYSTEM configuration setting which applies when --system is
+      specified. (Soren Hansen)
+    - Add support for encrypting home directories:
+      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
+        for the hard work.
+      + doc/adduser.8: document the --encrypt-home option
+      + debian/control: recommend ecryptfs-utils >= 67-1
+      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
+  * Dropped changes, included in Debian:
+    - Mark adduser Multi-Arch: foreign.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 24 Oct 2012 17:07:33 -0700
+
 adduser (3.113+nmu3) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -146,6 +281,23 @@ adduser (3.113+nmu2) unstable; urgency=l
 
  -- Bastian Blank <waldi@debian.org>  Mon, 14 May 2012 13:47:27 +0000
 
+adduser (3.113+nmu1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - AdduserCommon.pm, adduser, adduser.8, adduser.conf.5: Allow uppercase
+      letters in the names of system users. This is done by having a separate
+      NAME_REGEX_SYSTEM configuration setting which applies when --system is
+      specified. (Soren Hansen)
+    - Add support for encrypting home directories:
+      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
+        for the hard work.
+      + doc/adduser.8: document the --encrypt-home option
+      + debian/control: recommend ecryptfs-utils >= 67-1
+      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
+    - Mark adduser Multi-Arch: foreign.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 30 Apr 2012 22:52:15 -0700
+
 adduser (3.113+nmu1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -159,6 +311,34 @@ adduser (3.113+nmu1) unstable; urgency=l
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 21 Jan 2012 09:00:03 +0100
 
+adduser (3.113ubuntu2) precise; urgency=low
+
+  * Fix a typo in the usage info for NAME_REGEX_SYSTEM.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 19 Oct 2011 14:52:33 -0700
+
+adduser (3.113ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing, cleaning up a mess of missing translations
+    due to previous .po file mismerging.
+  * Remaining changes:
+    - AdduserCommon.pm, adduser, adduser.8, adduser.conf.5: Allow uppercase
+      letters in the names of system users. This is done by having a separate
+      NAME_REGEX_SYSTEM configuration setting which applies when --system is
+      specified. (Soren Hansen)
+    - Add support for encrypting home directories:
+      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
+        for the hard work.
+      + doc/adduser.8: document the --encrypt-home option
+      + debian/control: recommend ecryptfs-utils >= 67-1
+      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
+  * Dropped changes, included in Debian:
+    - deluser: added missing linebreak at line 338
+    - deluser: Remove symlinks to directories with rm, not rmdir
+  * Mark adduser Multi-Arch: foreign.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 19 Oct 2011 14:34:19 -0700
+
 adduser (3.113) unstable; urgency=low
 
   * Warning to STDERR (closes: #561864)
@@ -215,6 +395,51 @@ adduser (3.112+nmu2) unstable; urgency=l
 
  -- David Prévot <david@tilapin.org>  Sun, 21 Nov 2010 17:13:00 -0400
 
+adduser (3.112+nmu1ubuntu5) natty; urgency=low
+
+  * debian/control: fix an often-duplicated bug, which causes apt to try
+    and remove ecryptfs-utils, even though it is in use; have adduser
+    recommend, rather than suggest ecryptfs-utils, LP: #653628
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 09 Mar 2011 11:16:13 +0000
+
+adduser (3.112+nmu1ubuntu4) natty; urgency=low
+
+  * And fix a typo in the last patch.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 06 Jan 2011 22:05:54 +0100
+
+adduser (3.112+nmu1ubuntu3) natty; urgency=low
+
+  * deluser: Remove symlinks to directories with rm, not rmdir (Jim Cheetham).
+    LP: #34299.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 06 Jan 2011 21:48:21 +0100
+
+adduser (3.112+nmu1ubuntu2) natty; urgency=low
+
+  * deluser: added missing linebreak at line 338 (LP: #613204)
+    thanks to knopwob@googlemail.com and Mohamed Amine IL Idrissi for the
+    patch
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 23 Nov 2010 12:40:28 +0100
+
+adduser (3.112+nmu1ubuntu1) natty; urgency=low
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - AdduserCommon.pm, adduser, adduser.8, adduser.conf.5: Allow uppercase
+      letters in the names of system users. This is done by having a separate
+      NAME_REGEX_SYSTEM configuration setting which applies when --system is
+      specified. (Soren Hansen)
+    - Add support for encrypting home directories:
+      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
+        for the hard work.
+      + doc/adduser.8: document the --encrypt-home option
+      + debian/control: suggest ecryptfs-utils >= 67-1
+      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 12 Oct 2010 15:47:22 +0200
+
 adduser (3.112+nmu1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -1901,80 +2126,49 @@ adduser (2.00) unstable; urgency=medium
  -- Christoph Lameter <clameter@debian.org>  Sun, 22 Sep 1996 09:00:00 +0800
 
 Wed May 29 10:11:38 CDT 1996	Steve Phillips  <sjp@cvfn.org>  
-
 	* Added part of patch from Miquel van Smoorenburg
 		<miquels@cistron.nl> that I missed somehow.
-
 Fri May 17 16:48:28 CDT 1996  	Steve Phillips  <sjp@cvfn.org>  
-
 	* Added patch from Miquel van Smoorenburg <miquels@cistron.nl> 
 		Fixes Bug#2286 and Bug#3017
-
 	* Updated adduser manpage for --ingroup option
-
 	* Added --ingroup option to addsysuser task as well as
 		adduser.
-
 Thu May 16 14:31:42 MET DST 1996  Miquel van Smoorenburg <miquels@cistron.nl>
-
 	* Added new command line option --ingroup
-
 	* Added options to adduser.conf to allow homedirectory
 	  construct of /home/u/user or /home/users/user
-
 	* Default NIS entry (+::::::) was not kept at the end
-
 Tue May  7 14:09:30 CDT 1996	Steve Phillips	<sjp@cvfn.org>
-
 	* Finished fixing Bug #1534
-
 	* Fixed Bug #2285
-
 	* Fixed Bug #2361
-
 	* Changed man pages so they get their version numbers plugged
 	  in from the makefile
-
 	* Fixed some minor perl syntax errors
-
 Tue Oct 24 22:21:29 1995  Sven Rudolph  <sr1@inf.tu-dresden.de>
-
 	* uploaded files were incorrect, therefore reuploading
-
 	* debian.Changelog: corrected a description
-
 	* debian.control: added Section: field
-
 Mon Oct 23 22:16:19 1995  Sven Rudolph  <sr1@inf.tu-dresden.de>
-
 	* Makefile: moved symlink creation from postinst/prerm into 
 		    the build stage
-
 	* debian.postinst, debian.prerm: deleted
-	
 	* adduser.8: changed documentation for --home feature
-
 	* adduser.pl: fixed some file locking races (Bug#1720)
-
 	* adduser.pl: create home directory with setgid bit when 
 		      using usergroups (Bug#1544)
-
 	* adduser.pl: corrected permissions for copies of /etc/skel
 		      files (Bug#1544)
-
 	* adduser.pl: run /usr/local/sbin/adduser.local if it exists
 		      (patch for this feature provided in Bug#1544)
-
 	* adduser.pl: now always does chown before chmod
 		      (Bug#1544, Bug#1720)
-
 	* adduser.pl: now correctly copies dot files from /etc/skel
 		      (Bug#1500)
-
 	* adduser.pl: now gives informative message when called from
 		      a non-root user (Bug#1350)
-
 	* adduser.pl: enforces that user names are never longer than
                       8 characters (Bug#1241)
-
 	* adduser.pl: now copies everything below /etc/skel (Bug#1542)
+
diff -pruN 3.118/debian/config 3.118ubuntu5/debian/config
--- 3.118/debian/config	2016-06-26 20:00:56.000000000 +0000
+++ 3.118ubuntu5/debian/config	2020-12-14 03:09:23.000000000 +0000
@@ -17,13 +17,13 @@ fi
 
 if [ -z "$CUR_DIRMODE" ]
 then
-	CUR_DIRMODE="0755" # this is adduser's default
+	CUR_DIRMODE="0750" # this is adduser's default
 fi
 
 if [ "$CUR_DIRMODE" = "0755" ] || [ "$CUR_DIRMODE" = "755" ]
 then
 	db_set adduser/homedir-permission true
-elif [ "$CUR_DIRMODE" = "0751" ] || [ "$CUR_DIRMODE" = "751" ]
+elif [ "$CUR_DIRMODE" = "0750" ] || [ "$CUR_DIRMODE" = "750" ]
 then
 	db_set adduser/homedir-permission false
 else
diff -pruN 3.118/debian/control 3.118ubuntu5/debian/control
--- 3.118/debian/control	2018-09-15 19:03:57.000000000 +0000
+++ 3.118ubuntu5/debian/control	2020-12-14 00:23:03.000000000 +0000
@@ -1,20 +1,21 @@
 Source: adduser
 Section: admin
 Priority: important
-Maintainer: Debian Adduser Developers <adduser@packages.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Adduser Developers <adduser@packages.debian.org>
 Uploaders: Marc Haber <mh+debian-packages@zugschlus.de>
 Standards-Version: 4.2.1
 Build-Depends: po-debconf, debhelper (>= 9)
 Build-Depends-Indep: gettext, po4a
-Vcs-Browser: https://salsa.debian.org/debian/adduser
-Vcs-Git: https://salsa.debian.org/debian/adduser.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/debian/adduser
+XS-Debian-Vcs-Git: https://salsa.debian.org/debian/adduser.git
 
 Package: adduser
 Architecture: all
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: passwd, ${misc:Depends}
-Suggests: liblocale-gettext-perl, perl
+Suggests: liblocale-gettext-perl, perl, ecryptfs-utils (>= 67-1)
 Description: add and remove users and groups
  This package includes the 'adduser' and 'deluser' commands for creating
  and removing users.
diff -pruN 3.118/debian/po/ar.po 3.118ubuntu5/debian/po/ar.po
--- 3.118/debian/po/ar.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/ar.po	2021-01-06 06:16:50.000000000 +0000
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.104\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:06+0200\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -43,14 +43,10 @@ msgstr "هل ترغب بجعل الأد
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"عادة، يمكن لأي مستخدم عرض الأدلة المنزلية على النظام. إن أردت زيادة مستوى "
-"الأمن والخصوصويّة على نظامك، قد ترغب بجعل الأدلّة المنزليّة مقروءة فقط من قبل "
-"المستخدمين المالكين لها. إن لم تكن متأكّداً، فاترك هذا الخيار مُمكّناً."
 
 #. Type: boolean
 #. Description
@@ -61,3 +57,13 @@ msgid ""
 msgstr ""
 "سوف يؤثر هذا فقط على أدلة المستخدمين المنزليّة الذي يضافون باستخدام برنامج "
 "adduser لاحقاً."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "عادة، يمكن لأي مستخدم عرض الأدلة المنزلية على النظام. إن أردت زيادة مستوى "
+#~ "الأمن والخصوصويّة على نظامك، قد ترغب بجعل الأدلّة المنزليّة مقروءة فقط من "
+#~ "قبل المستخدمين المالكين لها. إن لم تكن متأكّداً، فاترك هذا الخيار مُمكّناً."
diff -pruN 3.118/debian/po/be.po 3.118ubuntu5/debian/po/be.po
--- 3.118/debian/po/be.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/be.po	2021-01-06 06:16:50.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser_3.105_templates\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2007-10-14 15:04+0300\n"
 "Last-Translator: Pavel Piatruk <berserker@neolocation.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -33,15 +33,10 @@ msgstr "Ці хочаце вы, каб 
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Прадвызначана хатнія каталогі карыстальнікаў чытэльныя ўсімі карыстальнікамі "
-"сістэмы. Калі вы хочаце павялічыць бяспеку і сакрэтнасць, вам трэба "
-"задзейнічаць чытанне хатніх каталогаў толькі для іх уладальнікаў. Калі ж не, "
-"то пакіньце гэтую наладу ўключанай."
 
 #. Type: boolean
 #. Description
@@ -52,3 +47,14 @@ msgid ""
 msgstr ""
 "Гэта паўплывае толькі на хатнія каталогі карыстальнікаў, што будуць створаны "
 "адгэтуль камандай adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Прадвызначана хатнія каталогі карыстальнікаў чытэльныя ўсімі "
+#~ "карыстальнікамі сістэмы. Калі вы хочаце павялічыць бяспеку і сакрэтнасць, "
+#~ "вам трэба задзейнічаць чытанне хатніх каталогаў толькі для іх "
+#~ "уладальнікаў. Калі ж не, то пакіньце гэтую наладу ўключанай."
diff -pruN 3.118/debian/po/ca.po 3.118ubuntu5/debian/po/ca.po
--- 3.118/debian/po/ca.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/ca.po	2021-01-06 06:16:50.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.112+nmu1\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2010-10-23 12:59+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -32,15 +32,10 @@ msgstr "Voleu que els directoris persona
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Per defecte, els directoris personals dels usuaris sn llegibles per tots "
-"els usuaris del sistema. Si voleu incrementar la seguretat i privacitat, "
-"podeu crear els directoris personals amb lectura noms per al seu "
-"propietari. Si esteu insegur, deixeu aquesta opci habilitada."
 
 #. Type: boolean
 #. Description
@@ -51,3 +46,14 @@ msgid ""
 msgstr ""
 "Aquesta opci noms afecta a directoris d'usuari afegits a partir d'ara amb "
 "l'ordre adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Per defecte, els directoris personals dels usuaris sn llegibles per tots "
+#~ "els usuaris del sistema. Si voleu incrementar la seguretat i privacitat, "
+#~ "podeu crear els directoris personals amb lectura noms per al seu "
+#~ "propietari. Si esteu insegur, deixeu aquesta opci habilitada."
diff -pruN 3.118/debian/po/cs.po 3.118ubuntu5/debian/po/cs.po
--- 3.118/debian/po/cs.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/cs.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.104\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:05+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -40,15 +40,10 @@ msgstr "Chcete domovské adresáře čit
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Standardně mohou všichni uživatelé systému prohlížet domovské adresáře "
-"ostatních uživatelů. Pokud chcete zvýšit bezpečnost/soukromí, můžete "
-"nastavit, aby si domovské adresáře mohli prohlížet pouze jejich vlastníci. "
-"Jestliže si nejste jisti, odpovězte kladně."
 
 #. Type: boolean
 #. Description
@@ -59,3 +54,14 @@ msgid ""
 msgstr ""
 "Toto nastavení ovlivní pouze domovské adresáře uživatelů založených od této "
 "chvíle."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Standardně mohou všichni uživatelé systému prohlížet domovské adresáře "
+#~ "ostatních uživatelů. Pokud chcete zvýšit bezpečnost/soukromí, můžete "
+#~ "nastavit, aby si domovské adresáře mohli prohlížet pouze jejich "
+#~ "vlastníci. Jestliže si nejste jisti, odpovězte kladně."
diff -pruN 3.118/debian/po/da.po 3.118ubuntu5/debian/po/da.po
--- 3.118/debian/po/da.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/da.po	2021-01-06 06:16:50.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.112+nmu2\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:07+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@@ -33,16 +33,10 @@ msgstr "Ønsker du globalt læsbare hjem
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Som standard kan indholdet af brugernes hjemmemapper læses af samtlige "
-"brugere på systemet. Hvis du ønsker at øge sikkerheden og brugernes "
-"privatliv, kan det være ønskværdigt at gøre hver brugers hjemmemappe læsbar "
-"kun for brugeren selv. Hvis du er i tvivl, så efterlad denne indstilling "
-"aktiveret."
 
 #. Type: boolean
 #. Description
@@ -53,3 +47,15 @@ msgid ""
 msgstr ""
 "Dette vil kun få indflydelse på hjemmemapper for brugere der tilføjes fra nu "
 "af med kommandoen adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Som standard kan indholdet af brugernes hjemmemapper læses af samtlige "
+#~ "brugere på systemet. Hvis du ønsker at øge sikkerheden og brugernes "
+#~ "privatliv, kan det være ønskværdigt at gøre hver brugers hjemmemappe "
+#~ "læsbar kun for brugeren selv. Hvis du er i tvivl, så efterlad denne "
+#~ "indstilling aktiveret."
diff -pruN 3.118/debian/po/de.po 3.118ubuntu5/debian/po/de.po
--- 3.118/debian/po/de.po	2018-09-15 19:02:59.000000000 +0000
+++ 3.118ubuntu5/debian/po/de.po	2021-01-06 06:16:50.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.117\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-02-02 16:43+0000\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2018-05-06 08:46+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -34,16 +34,10 @@ msgstr "Wünschen Sie systemweit lesbare
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Standardmäßig können die Home-Verzeichnisse von allen Benutzern eines "
-"Systems eingesehen werden. Falls Sie die Sicherheit/Privatsphäre Ihres "
-"Systems erhöhen wollen, sollten Sie einstellen, dass die Home-Verzeichnisse "
-"nur vom jeweiligen Besitzer eingesehen werden können. Falls Sie sich nicht "
-"sicher sind, lassen Sie diese Option aktiviert."
 
 #. Type: boolean
 #. Description
@@ -54,3 +48,15 @@ msgid ""
 msgstr ""
 "Dies wird lediglich die Home-Verzeichnisse von Benutzern betreffen, die ab "
 "jetzt mit dem Programm »adduser« hinzugefügt werden."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Standardmäßig können die Home-Verzeichnisse von allen Benutzern eines "
+#~ "Systems eingesehen werden. Falls Sie die Sicherheit/Privatsphäre Ihres "
+#~ "Systems erhöhen wollen, sollten Sie einstellen, dass die Home-"
+#~ "Verzeichnisse nur vom jeweiligen Besitzer eingesehen werden können. Falls "
+#~ "Sie sich nicht sicher sind, lassen Sie diese Option aktiviert."
diff -pruN 3.118/debian/po/el.po 3.118ubuntu5/debian/po/el.po
--- 3.118/debian/po/el.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/el.po	2021-01-06 06:16:50.000000000 +0000
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.51\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:03+0200\n"
 "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -36,36 +36,39 @@ msgstr ""
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid "Do you want system wide readable home directories?"
 msgid "Do you want system-wide readable home directories?"
 msgstr "Θέλετε οι κατάλογοι των χρηστών να είναι αναγνώσιμοι από όλους;"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#, fuzzy
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Κανονικά, οι κατάλογοι των χρηστών είναι αναγνώσιμοι από όλους τους χρήστες "
-"στο σύστημα. Αν θέλετε να αυξήσετε την ασφάλεια στο σύστημά σας, μπορείτε να "
-"καταστήσετε τους καταλόγους των χρηστών αναγνώσιμους μόνο από τους "
-"ίδιοκτήτες τους. Αν δεν είστε βέβαιοι απαντήστε καταφατικά για να επιτρέψετε "
-"πρόσβαση ανάγνωσης στους καταλόγους χρηστών από όλους τους χρήστες."
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid ""
-#| "This will only affect home directories of users added with the adduser "
-#| "program later."
 msgid ""
 "This will only affect home directories of users added from now on with the "
 "adduser command."
 msgstr ""
 "Αυτή η ρύθμιση θα έχει ισχύ μόνο για τους χρήστες που θα προστεθούν "
 "μελλοντικά με την εντολή adduser."
+
+#, fuzzy
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Κανονικά, οι κατάλογοι των χρηστών είναι αναγνώσιμοι από όλους τους "
+#~ "χρήστες στο σύστημα. Αν θέλετε να αυξήσετε την ασφάλεια στο σύστημά σας, "
+#~ "μπορείτε να καταστήσετε τους καταλόγους των χρηστών αναγνώσιμους μόνο από "
+#~ "τους ίδιοκτήτες τους. Αν δεν είστε βέβαιοι απαντήστε καταφατικά για να "
+#~ "επιτρέψετε πρόσβαση ανάγνωσης στους καταλόγους χρηστών από όλους τους "
+#~ "χρήστες."
diff -pruN 3.118/debian/po/es.po 3.118ubuntu5/debian/po/es.po
--- 3.118/debian/po/es.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/es.po	2021-01-06 06:16:50.000000000 +0000
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.103\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:08+0200\n"
 "Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -49,16 +49,10 @@ msgstr "¿Desea que los directorios pers
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"De manera predeterminada los directorios personales de los usuarios son "
-"legibles por todos los usuarios del sistema. Si desea incrementar la "
-"seguridad y privacidad del sistema puede querer que los directorios "
-"personales sólo sean legibles por sus respectivos dueños. Si no está seguro, "
-"se recomienda que deje esta opción activada."
 
 #. Type: boolean
 #. Description
@@ -69,3 +63,15 @@ msgid ""
 msgstr ""
 "Esto sólo afectará a los directorios personales de los usuarios que añada a "
 "partir de ahora con el programa «adduser»."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "De manera predeterminada los directorios personales de los usuarios son "
+#~ "legibles por todos los usuarios del sistema. Si desea incrementar la "
+#~ "seguridad y privacidad del sistema puede querer que los directorios "
+#~ "personales sólo sean legibles por sus respectivos dueños. Si no está "
+#~ "seguro, se recomienda que deje esta opción activada."
diff -pruN 3.118/debian/po/eu.po 3.118ubuntu5/debian/po/eu.po
--- 3.118/debian/po/eu.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/eu.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.107\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:09+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
@@ -41,15 +41,10 @@ msgstr "Etxe karpetak sistema osoarentza
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Lehenespen bezala, erabiltzaileen etxe karpetak sistema osoko erabiltzaileek "
-"irakur ditzakete. Baina zuk segurtasuna eta pribatasuna areagotu nahi "
-"baduzu, karpetaren jabeak bakarrik irakurzeko ezarri nahi ditzakezu . Ziur "
-"ez bazaude sistema osoarentzat irakurketa gaitzea gomendatzen da."
 
 #. Type: boolean
 #. Description
@@ -60,3 +55,15 @@ msgid ""
 msgstr ""
 "Aldaketa honek hemendik aurrera eta adduser erabiliaz sortutako kontuen etxe "
 "direktorioetan eragingo du."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Lehenespen bezala, erabiltzaileen etxe karpetak sistema osoko "
+#~ "erabiltzaileek irakur ditzakete. Baina zuk segurtasuna eta pribatasuna "
+#~ "areagotu nahi baduzu, karpetaren jabeak bakarrik irakurzeko ezarri nahi "
+#~ "ditzakezu . Ziur ez bazaude sistema osoarentzat irakurketa gaitzea "
+#~ "gomendatzen da."
diff -pruN 3.118/debian/po/fi.po 3.118ubuntu5/debian/po/fi.po
--- 3.118/debian/po/fi.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/fi.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.105\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:09+0200\n"
 "Last-Translator: Sami Kallio <xaicawa@yahoo.com>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -40,15 +40,10 @@ msgstr "Voivatko kaikki järjestelmän k
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Oletuksena kotihakemistot ovat kaikkien käyttäjien luettavissa. Jos haluat "
-"lisätä järjestelmäsi tietoturvaa ja yksityisyyden suojaa, voit antaa "
-"lukuoikeuden vain hakemiston omistajalle. Jos olet epävarma, jätä tämä "
-"valinta oletusarvoiseksi."
 
 #. Type: boolean
 #. Description
@@ -58,3 +53,14 @@ msgid ""
 "adduser command."
 msgstr ""
 "Tämä vaikuttaa vain adduser-ohjelmalla luotujen käyttäjien kotihakemistoihin."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Oletuksena kotihakemistot ovat kaikkien käyttäjien luettavissa. Jos "
+#~ "haluat lisätä järjestelmäsi tietoturvaa ja yksityisyyden suojaa, voit "
+#~ "antaa lukuoikeuden vain hakemiston omistajalle. Jos olet epävarma, jätä "
+#~ "tämä valinta oletusarvoiseksi."
diff -pruN 3.118/debian/po/fr.po 3.118ubuntu5/debian/po/fr.po
--- 3.118/debian/po/fr.po	2018-09-15 18:59:12.000000000 +0000
+++ 3.118ubuntu5/debian/po/fr.po	2021-01-06 06:16:50.000000000 +0000
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.50\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-02-02 16:43+0000\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2018-06-08 11:03+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -43,16 +43,10 @@ msgstr "Voulez-vous des répertoires per
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Les répertoires personnels sont par défaut lisibles par tous les "
-"utilisateurs du système. Si vous voulez améliorer la sécurité et la "
-"confidentialité, vous pouvez décider que les répertoires personnels ne "
-"seront lisibles que par leur propriétaire. Dans le doute, cependant, vous "
-"devriez laisser cette option active."
 
 #. Type: boolean
 #. Description
@@ -63,3 +57,15 @@ msgid ""
 msgstr ""
 "Cela ne concernera que les répertoires personnels des utilisateurs qui "
 "seront ajoutés dans le futur, avec la commande « adduser »."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Les répertoires personnels sont par défaut lisibles par tous les "
+#~ "utilisateurs du système. Si vous voulez améliorer la sécurité et la "
+#~ "confidentialité, vous pouvez décider que les répertoires personnels ne "
+#~ "seront lisibles que par leur propriétaire. Dans le doute, cependant, vous "
+#~ "devriez laisser cette option active."
diff -pruN 3.118/debian/po/gl.po 3.118ubuntu5/debian/po/gl.po
--- 3.118/debian/po/gl.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/gl.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.104\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:10+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -40,15 +40,10 @@ msgstr "¿Quere directorios de usuario l
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Por defecto, os directorios iniciais dos usuarios son lexibles para tódolos "
-"usuarios do sistema. Se quere aumentar a seguridade e a intimidade, pode que "
-"prefira que os directorios iniciais só sexan lexibles aos seus propietarios. "
-"Se ten dúbidas, deixe activada esta opción."
 
 #. Type: boolean
 #. Description
@@ -59,3 +54,15 @@ msgid ""
 msgstr ""
 "Isto só ha afectar aos directorios dos usuarios engadidos a partires de "
 "agora coa orde \"adduser\"."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Por defecto, os directorios iniciais dos usuarios son lexibles para "
+#~ "tódolos usuarios do sistema. Se quere aumentar a seguridade e a "
+#~ "intimidade, pode que prefira que os directorios iniciais só sexan "
+#~ "lexibles aos seus propietarios. Se ten dúbidas, deixe activada esta "
+#~ "opción."
diff -pruN 3.118/debian/po/hy.po 3.118ubuntu5/debian/po/hy.po
--- 3.118/debian/po/hy.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/hy.po	2021-01-06 06:16:50.000000000 +0000
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.103\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:10+0200\n"
 "Last-Translator: Vardan Gevorgyan <vgevorgyan@debian.am>\n"
 "Language-Team: Armenian <translation-team-hy@lists.sourceforge.net>\n"
@@ -24,7 +24,6 @@ msgstr ""
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid "Do you want system wide readable home directories?"
 msgid "Do you want system-wide readable home directories?"
 msgstr ""
 "Դուք ցանկանում ե՞ք, որ տնային թղթապանակները հասանելի լինեն ամբողջ համակարգի "
@@ -33,32 +32,31 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#, fuzzy
-#| msgid ""
-#| "Normally, home directories can be viewed by all users on the system. If "
-#| "you want to increase the security/privacy on your system, you might want "
-#| "your home directories only readable by the user. If you are unsure, "
-#| "enable system wide readable home directories."
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Օգտագործողների տնային թղթապանակները կարող են դիտվել բոլոր օգտագործողների "
-"կողմից։ Ապահովությունից ելնելով դուք կարող եք թղթապանակների պարունակությունը "
-"հասանելի դարձնել միայն իրենց տերերին։ Բայց եթե վստահ չեք պատասխանեք \"Այո\"։"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid ""
-#| "This will only affect home directories of users added with the adduser "
-#| "program later."
 msgid ""
 "This will only affect home directories of users added from now on with the "
 "adduser command."
 msgstr ""
 "Սա կվերաբերվի միայն այն օգտագործողների տնային թղթապանակներին, որոնք, այս "
 "պահից, կավելացվեն adduser հրամանի միջոցով։"
+
+#, fuzzy
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Օգտագործողների տնային թղթապանակները կարող են դիտվել բոլոր օգտագործողների "
+#~ "կողմից։ Ապահովությունից ելնելով դուք կարող եք թղթապանակների "
+#~ "պարունակությունը հասանելի դարձնել միայն իրենց տերերին։ Բայց եթե վստահ չեք "
+#~ "պատասխանեք \"Այո\"։"
diff -pruN 3.118/debian/po/it.po 3.118ubuntu5/debian/po/it.po
--- 3.118/debian/po/it.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/it.po	2021-01-06 06:16:50.000000000 +0000
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.103 (templates)\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2007-07-08 12:10+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -27,15 +27,10 @@ msgstr "Si vuole che le directory home s
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Con la configurazione predefinita le directory home degli utenti sono "
-"leggibili da tutti gli utenti del sistema. Per incrementare sicurezza e "
-"privacy sul sistema è possibile rendere le directory home leggibili solo dai "
-"legittimi proprietari. Se non si è sicuri, lasciare attiva questa opzione."
 
 #. Type: boolean
 #. Description
@@ -46,3 +41,15 @@ msgid ""
 msgstr ""
 "Questa modifica ha effetto solo sulle directory home degli utenti che "
 "verranno creati con il comando adduser da adesso in poi."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Con la configurazione predefinita le directory home degli utenti sono "
+#~ "leggibili da tutti gli utenti del sistema. Per incrementare sicurezza e "
+#~ "privacy sul sistema è possibile rendere le directory home leggibili solo "
+#~ "dai legittimi proprietari. Se non si è sicuri, lasciare attiva questa "
+#~ "opzione."
diff -pruN 3.118/debian/po/ja.po 3.118ubuntu5/debian/po/ja.po
--- 3.118/debian/po/ja.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/ja.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.103\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2007-06-30 22:33+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -40,15 +40,10 @@ msgstr "ホームディレクトリを
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"デフォルトではユーザのホームディレクトリはシステム上の全ユーザから読み取るこ"
-"とができます。 システムのセキュリティやプライバシーを改善するために、ホーム"
-"ディレクトリをその所有者のみ読み取り可能にしたいと思うかもしれません。しか"
-"し、よくわからなければ、この選択肢は「はい」のままにしておいてください。"
 
 #. Type: boolean
 #. Description
@@ -59,3 +54,15 @@ msgid ""
 msgstr ""
 "これは、現時点以降に adduser コマンドで追加したユーザのホームディレクトリにの"
 "み影響します。"
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "デフォルトではユーザのホームディレクトリはシステム上の全ユーザから読み取る"
+#~ "ことができます。 システムのセキュリティやプライバシーを改善するために、"
+#~ "ホームディレクトリをその所有者のみ読み取り可能にしたいと思うかもしれませ"
+#~ "ん。しかし、よくわからなければ、この選択肢は「はい」のままにしておいてくだ"
+#~ "さい。"
diff -pruN 3.118/debian/po/ko.po 3.118ubuntu5/debian/po/ko.po
--- 3.118/debian/po/ko.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/ko.po	2021-01-06 06:16:50.000000000 +0000
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.104\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:11+0200\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -28,14 +28,10 @@ msgstr "홈 디렉토리를 시스템 
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"홈 디렉토리는 기본적으로 시스템의 모든 사용자가 볼 수 있습니다. 시스템의 보"
-"안 수준이나 사생활 보호 수준을 높이길 원한다면 홈 디렉토리를 본인만 볼 수 있"
-"도록 설정하기를 원할 것입니다. 확실하지 않다면 기본값 그대로 두십시오."
 
 #. Type: boolean
 #. Description
@@ -46,3 +42,14 @@ msgid ""
 msgstr ""
 "이 설정은 추후에 adduser 프로그램으로 추가된 사용자의 홈 디렉토리에만 영향을 "
 "줍니다."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "홈 디렉토리는 기본적으로 시스템의 모든 사용자가 볼 수 있습니다. 시스템의 "
+#~ "보안 수준이나 사생활 보호 수준을 높이길 원한다면 홈 디렉토리를 본인만 볼 "
+#~ "수 있도록 설정하기를 원할 것입니다. 확실하지 않다면 기본값 그대로 두십시"
+#~ "오."
diff -pruN 3.118/debian/po/lt.po 3.118ubuntu5/debian/po/lt.po
--- 3.118/debian/po/lt.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/lt.po	2021-01-06 06:16:50.000000000 +0000
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.87\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2006-06-18 17:55+0300\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -26,40 +26,37 @@ msgstr ""
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid "Do you want system wide readable home directories?"
 msgid "Do you want system-wide readable home directories?"
 msgstr "Ar norite, kad visi galėtų skaityti naudotojų namų katalogus?"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#, fuzzy
-#| msgid ""
-#| "Normally, home directories can be viewed by all users on the system. If "
-#| "you want to increase the security/privacy on your system, you might want "
-#| "your home directories only readable by the user. If you are unsure, "
-#| "enable system wide readable home directories."
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Paprastai namų katalogus gali skaityti visi sistemos naudotojai. Jei norite "
-"padidinti sistemos saugumą ar naudotojų privatumą, galite leisti namų "
-"katalogą skaityti tik šio katalogo savininkui. Jei nežinote ką pasirinkti, "
-"leiskite namų katalogus skaityti visiems."
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid ""
-#| "This will only affect home directories of users added with the adduser "
-#| "program later."
 msgid ""
 "This will only affect home directories of users added from now on with the "
 "adduser command."
 msgstr ""
 "Šis pasirinkimas turės įtakos namų katalogams, ateityje sukurtiems komanda "
 "„adduser“."
+
+#, fuzzy
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Paprastai namų katalogus gali skaityti visi sistemos naudotojai. Jei "
+#~ "norite padidinti sistemos saugumą ar naudotojų privatumą, galite leisti "
+#~ "namų katalogą skaityti tik šio katalogo savininkui. Jei nežinote ką "
+#~ "pasirinkti, leiskite namų katalogus skaityti visiems."
diff -pruN 3.118/debian/po/nb.po 3.118ubuntu5/debian/po/nb.po
--- 3.118/debian/po/nb.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/nb.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.63\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2007-07-14 00:27+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -40,15 +40,10 @@ msgstr "Vil du ha at hjemmekatalogene sk
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Vanligvis kan alle brukerne p systemet lese hjemmekatalogene til hverandre. "
-"Hvis du vil ke sikkerheten og fortroligheten, s vil du kanskje at "
-"hjemmekatalogene kun skal vre lesbare av eierne. Hvis du er usikker, la "
-"dette valget vre aktivert. "
 
 #. Type: boolean
 #. Description
@@ -59,3 +54,14 @@ msgid ""
 msgstr ""
 "Dette vil kun pvirke hjemmekataloger for brukere opprettede fra n av med "
 "adduser-kommandoen."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Vanligvis kan alle brukerne p systemet lese hjemmekatalogene til "
+#~ "hverandre. Hvis du vil ke sikkerheten og fortroligheten, s vil du "
+#~ "kanskje at hjemmekatalogene kun skal vre lesbare av eierne. Hvis du er "
+#~ "usikker, la dette valget vre aktivert. "
diff -pruN 3.118/debian/po/nl.po 3.118ubuntu5/debian/po/nl.po
--- 3.118/debian/po/nl.po	2018-09-15 18:59:29.000000000 +0000
+++ 3.118ubuntu5/debian/po/nl.po	2021-01-06 06:16:50.000000000 +0000
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.117\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-02-02 16:43+0000\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2018-04-30 22:03+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -41,22 +41,14 @@ msgstr "Adduser"
 msgid "Do you want system-wide readable home directories?"
 msgstr "Wilt u door iedereen leesbare thuismappen?"
 
-#  Type: boolean
-#  Description
 #. Type: boolean
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Standaard kunnen thuismappen door alle gebruikers op het systeem gelezen "
-"worden. Als u de veiligheid en privacy op uw systeem wilt verhogen, kunt u "
-"ervoor zorgen dat de thuismap van een gebruiker enkel leesbaar is voor die "
-"gebruiker zelf. Bij twijfel laat u de thuismappen best leesbaar voor "
-"iedereen."
 
 #. Type: boolean
 #. Description
@@ -67,3 +59,17 @@ msgid ""
 msgstr ""
 "Dit is slechts van toepassing op de thuismappen van gebruikers die u vanaf "
 "nu via het 'adduser'-commando aanmaakt."
+
+#  Type: boolean
+#  Description
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Standaard kunnen thuismappen door alle gebruikers op het systeem gelezen "
+#~ "worden. Als u de veiligheid en privacy op uw systeem wilt verhogen, kunt "
+#~ "u ervoor zorgen dat de thuismap van een gebruiker enkel leesbaar is voor "
+#~ "die gebruiker zelf. Bij twijfel laat u de thuismappen best leesbaar voor "
+#~ "iedereen."
diff -pruN 3.118/debian/po/pl.po 3.118ubuntu5/debian/po/pl.po
--- 3.118/debian/po/pl.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/pl.po	2021-01-06 06:16:50.000000000 +0000
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.112+nmu2\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:13+0200\n"
 "Last-Translator: Wojciech Zareba <wojtekz@comp.waw.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -43,16 +43,10 @@ msgstr "Czy katalogi domowe mog by prz
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Domylnie katalogi domowe mog by przegldane przez wszystkich uytkownikw "
-"systemu. Jeli chcesz zwikszy bezpieczestwo i prywatno, moesz wskaza, "
-"by katalogi domowe byy tylko do odczytu przez ich wacicieli. Jeli nie "
-"jeste pewien, co wybra, pozostaw wczon opcj przegldania przez "
-"wszystkich."
 
 #. Type: boolean
 #. Description
@@ -63,3 +57,15 @@ msgid ""
 msgstr ""
 "Opcja ta dotyczy katalogw domowych nowych uytkownikw dodanych od teraz "
 "poleceniem adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Domylnie katalogi domowe mog by przegldane przez wszystkich "
+#~ "uytkownikw systemu. Jeli chcesz zwikszy bezpieczestwo i prywatno, "
+#~ "moesz wskaza, by katalogi domowe byy tylko do odczytu przez ich "
+#~ "wacicieli. Jeli nie jeste pewien, co wybra, pozostaw wczon opcj "
+#~ "przegldania przez wszystkich."
diff -pruN 3.118/debian/po/pt_BR.po 3.118ubuntu5/debian/po/pt_BR.po
--- 3.118/debian/po/pt_BR.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/pt_BR.po	2021-01-06 06:16:50.000000000 +0000
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.103\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 17:58+0200\n"
 "Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
 "Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -45,15 +45,10 @@ msgstr "Você deseja que os diretórios
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Por padrão, os diretórios home são lidos por todos os usuários do sistema. "
-"Se você quer aumentar a segurança e a privacidade, você pode querer que os "
-"diretórios home sejam lidos apenas pelos seus donos. Mas se você está em "
-"dúvida, deixe essa opção habilitada."
 
 #. Type: boolean
 #. Description
@@ -64,3 +59,14 @@ msgid ""
 msgstr ""
 "Isto irá afetar somente os diretórios home dos usuários adicionados a partir "
 "de agora com o comando adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Por padrão, os diretórios home são lidos por todos os usuários do "
+#~ "sistema. Se você quer aumentar a segurança e a privacidade, você pode "
+#~ "querer que os diretórios home sejam lidos apenas pelos seus donos. Mas se "
+#~ "você está em dúvida, deixe essa opção habilitada."
diff -pruN 3.118/debian/po/pt.po 3.118ubuntu5/debian/po/pt.po
--- 3.118/debian/po/pt.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/pt.po	2021-01-06 06:16:50.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.104\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2007-07-14 22:36+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -32,15 +32,10 @@ msgstr "Deseja directórios 'home' que p
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Por omissão, os directórios 'home' dos utilizadores são legíveis por todos "
-"os utilizadores no sistema. Se deseja aumentar a segurança e privacidade, "
-"você pode querer que os directórios 'home' sejam legíveis apenas pelos "
-"próprios donos. Em caso de dúvida, deixe esta opção habilitada."
 
 #. Type: boolean
 #. Description
@@ -51,3 +46,15 @@ msgid ""
 msgstr ""
 "Isto irá afectar apenas os directórios 'home' de utilizadores adicionados a "
 "partir de agora com o commando adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Por omissão, os directórios 'home' dos utilizadores são legíveis por "
+#~ "todos os utilizadores no sistema. Se deseja aumentar a segurança e "
+#~ "privacidade, você pode querer que os directórios 'home' sejam legíveis "
+#~ "apenas pelos próprios donos. Em caso de dúvida, deixe esta opção "
+#~ "habilitada."
diff -pruN 3.118/debian/po/ro.po 3.118ubuntu5/debian/po/ro.po
--- 3.118/debian/po/ro.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/ro.po	2021-01-06 06:16:50.000000000 +0000
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.110\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:00+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -44,16 +44,10 @@ msgstr "Doriți ca directoarele acasă s
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"În mod implicit, directoarele acasă pot fi citite de către toți utilizatorii "
-"sistemului. Dacă doriți să măriți securitatea și secretizarea, probabil veți "
-"dori să faceți ca directoarele acasă să fie citibile doar pentru "
-"utilizatorul proprietar. Dacă vă îndoiți în legătură cu această decizie, , "
-"lăsați activată această opțiune."
 
 #. Type: boolean
 #. Description
@@ -64,3 +58,15 @@ msgid ""
 msgstr ""
 "Acest lucru va afecta directoarele acasă pentru utilizatorii care vor fi "
 "adăugați de acum înainte cu comanda adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "În mod implicit, directoarele acasă pot fi citite de către toți "
+#~ "utilizatorii sistemului. Dacă doriți să măriți securitatea și "
+#~ "secretizarea, probabil veți dori să faceți ca directoarele acasă să fie "
+#~ "citibile doar pentru utilizatorul proprietar. Dacă vă îndoiți în legătură "
+#~ "cu această decizie, , lăsați activată această opțiune."
diff -pruN 3.118/debian/po/ru.po 3.118ubuntu5/debian/po/ru.po
--- 3.118/debian/po/ru.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/ru.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.103\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 17:57+0200\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -43,15 +43,10 @@ msgstr "Сделать домашние
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"По умолчанию, домашние каталоги пользователей могут просматриваться всеми "
-"пользователями системы. В целях повышения безопасности и конфиденциальности "
-"вы можете сделать так, чтобы содержимое домашних каталогов было доступно "
-"только их владельцам. Но если не уверены, ответьте \"Да\"."
 
 #. Type: boolean
 #. Description
@@ -62,3 +57,15 @@ msgid ""
 msgstr ""
 "Это коснётся только домашних каталогов пользователей, которые будут "
 "добавлены в систему с помощью команды adduser начиная с этого момента."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "По умолчанию, домашние каталоги пользователей могут просматриваться всеми "
+#~ "пользователями системы. В целях повышения безопасности и "
+#~ "конфиденциальности вы можете сделать так, чтобы содержимое домашних "
+#~ "каталогов было доступно только их владельцам. Но если не уверены, "
+#~ "ответьте \"Да\"."
diff -pruN 3.118/debian/po/sk.po 3.118ubuntu5/debian/po/sk.po
--- 3.118/debian/po/sk.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/sk.po	2021-01-06 06:16:50.000000000 +0000
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.106\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 17:57+0200\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -27,15 +27,10 @@ msgstr "Želáte si domovské adresáre
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Štandardne sú domovské adresáre používateľov čitateľné pre všetkých "
-"používateľov systému. Ak chcete zvýšiť bezpečnosť a súkromie, možno budete "
-"chcieť, aby domovské adresáre boli čitateľné iba pre ich vlastníkov. Ale ak "
-"ste na pochybách, nechajte túto voľbu zapnutú."
 
 #. Type: boolean
 #. Description
@@ -46,3 +41,14 @@ msgid ""
 msgstr ""
 "Táto voľba ovplyvní iba používateľské účty pridané od tejto chvíle príkazom "
 "adduser."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Štandardne sú domovské adresáre používateľov čitateľné pre všetkých "
+#~ "používateľov systému. Ak chcete zvýšiť bezpečnosť a súkromie, možno "
+#~ "budete chcieť, aby domovské adresáre boli čitateľné iba pre ich "
+#~ "vlastníkov. Ale ak ste na pochybách, nechajte túto voľbu zapnutú."
diff -pruN 3.118/debian/po/sr@latin.po 3.118ubuntu5/debian/po/sr@latin.po
--- 3.118/debian/po/sr@latin.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/sr@latin.po	2021-01-06 06:16:50.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.113+nmu1\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:13+0200\n"
 "Last-Translator: Zlatan Todoric <zlatan.todoric@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,15 +33,10 @@ msgstr "Da li želite da cijeli sistem o
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Podrazumijevano je, da su korisnički direktorijumi čitljivi svim korisnicima."
-"Ako želite da povećate sigurnost i privatnost, možda biste željeli da "
-"korisničkidirekotorijumi budu čitljivi samo za vlasnike. Ako ste u "
-"nedoumici, ostaviteovu opciju omogućenom."
 
 #. Type: boolean
 #. Description
@@ -52,3 +47,14 @@ msgid ""
 msgstr ""
 "Ovo će uticati samo na korisničke direktorijume korisnika koji će biti "
 "pridodatiod sada <adduser> komandom."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Podrazumijevano je, da su korisnički direktorijumi čitljivi svim "
+#~ "korisnicima.Ako želite da povećate sigurnost i privatnost, možda biste "
+#~ "željeli da korisničkidirekotorijumi budu čitljivi samo za vlasnike. Ako "
+#~ "ste u nedoumici, ostaviteovu opciju omogućenom."
diff -pruN 3.118/debian/po/sr.po 3.118ubuntu5/debian/po/sr.po
--- 3.118/debian/po/sr.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/sr.po	2021-01-06 06:16:50.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.113+nmu1\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:14+0200\n"
 "Last-Translator: Zlatan Todoric <zlatan.todoric@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,15 +33,10 @@ msgstr "Да ли желите да ци
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Подразумијевано је, да су кориснички директоријуми читљиви свим корисницима."
-"Ако желите да повећате сигурност и приватност, можда бисте жељели да "
-"корисничкидирекоторијуми буду читљиви само за власнике. Ако сте у недоумици, "
-"оставитеову опцију омогућеном."
 
 #. Type: boolean
 #. Description
@@ -52,3 +47,14 @@ msgid ""
 msgstr ""
 "Ово ће утицати само на корисничке директоријуме корисника који ће бити "
 "придодатиод сада <adduser> командом."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Подразумијевано је, да су кориснички директоријуми читљиви свим "
+#~ "корисницима.Ако желите да повећате сигурност и приватност, можда бисте "
+#~ "жељели да корисничкидирекоторијуми буду читљиви само за власнике. Ако сте "
+#~ "у недоумици, оставитеову опцију омогућеном."
diff -pruN 3.118/debian/po/sv.po 3.118ubuntu5/debian/po/sv.po
--- 3.118/debian/po/sv.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/sv.po	2021-01-06 06:16:50.000000000 +0000
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser_3.107_sv\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:14+0200\n"
 "Last-Translator: Martin Bagge <martin.bagge@bthstudent.se>\n"
 "Language-Team: swedish <sv@li.org>\n"
@@ -43,15 +43,10 @@ msgstr "Vill du att hemkataloger ska var
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Vanligtvis kan hemkataloger läsas av alla användare på systemet. Om du vill "
-"öka säkerheten/avskildheten i ditt system kan du överväga att ha dina "
-"hemkataloger läsbara enbart av användaren. Om du är osäker bör du svara ja "
-"för att göra hemkatalogerna läsbara för hela systemet."
 
 #. Type: boolean
 #. Description
@@ -62,3 +57,14 @@ msgid ""
 msgstr ""
 "Detta kommer endast att påverka hemkataloger tillhörande användare som läggs "
 "till med adduser senare."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Vanligtvis kan hemkataloger läsas av alla användare på systemet. Om du "
+#~ "vill öka säkerheten/avskildheten i ditt system kan du överväga att ha "
+#~ "dina hemkataloger läsbara enbart av användaren. Om du är osäker bör du "
+#~ "svara ja för att göra hemkatalogerna läsbara för hela systemet."
diff -pruN 3.118/debian/po/templates.pot 3.118ubuntu5/debian/po/templates.pot
--- 3.118/debian/po/templates.pot	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/templates.pot	2021-01-06 06:16:50.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,10 +33,9 @@ msgstr ""
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
 
 #. Type: boolean
diff -pruN 3.118/debian/po/tr.po 3.118ubuntu5/debian/po/tr.po
--- 3.118/debian/po/tr.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/tr.po	2021-01-06 06:16:50.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.113+nmu3\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:02+0200\n"
 "Last-Translator: Atila KOÇ <akoc@artielektronik.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -32,16 +32,10 @@ msgstr "Ev dizinlerinin herkes tarafınd
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Öntanımlı olarak, kullanıcıların ev dizinlerine sistemdeki tüm "
-"kullanıcıların okuma erişimi yapmasına izin verilir. Daha yüksek güvenlik ve "
-"gizlilik için, ev dizinlerinin yalnızca sahipleri tarafından okunabilmesini "
-"isteyebilirsiniz. Şüpheye düştüğünüzde, 'Evet' diyerek ev dizinlerinin "
-"herkes tarafından okunabilir olmasını sağlayınız."
 
 #. Type: boolean
 #. Description
@@ -52,3 +46,15 @@ msgid ""
 msgstr ""
 "Bu yalnızca bundan sonra 'adduser' komutu ile eklenecek kullanıcıların ev "
 "dizinlerini etkileyecektir."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Öntanımlı olarak, kullanıcıların ev dizinlerine sistemdeki tüm "
+#~ "kullanıcıların okuma erişimi yapmasına izin verilir. Daha yüksek güvenlik "
+#~ "ve gizlilik için, ev dizinlerinin yalnızca sahipleri tarafından "
+#~ "okunabilmesini isteyebilirsiniz. Şüpheye düştüğünüzde, 'Evet' diyerek ev "
+#~ "dizinlerinin herkes tarafından okunabilir olmasını sağlayınız."
diff -pruN 3.118/debian/po/uk.po 3.118ubuntu5/debian/po/uk.po
--- 3.118/debian/po/uk.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/uk.po	2021-01-06 06:16:50.000000000 +0000
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.59\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 18:16+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -38,40 +38,38 @@ msgstr ""
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid "Do you want system wide readable home directories?"
 msgid "Do you want system-wide readable home directories?"
 msgstr "Чи бажаєте ви зробити домашні директорії доступними для читання всім?"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#, fuzzy
-#| msgid ""
-#| "Normally, home directories can be viewed by all users on the system. If "
-#| "you want to increase the security/privacy on your system, you might want "
-#| "your home directories only readable by the user. If you are unsure, "
-#| "enable system wide readable home directories."
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Звичайно, домашні директорії можуть переглядати всі користувачі в системі. З "
-"метою підвищення безпечності/конфіденційності в вашій системі, ви, можливо, "
-"захочете зробити, щоб директорії користувачів могли читати лише вони самі. "
-"Якщо ви не впевнені, зробіть домашні директорії доступними на читання всім."
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
 #, fuzzy
-#| msgid ""
-#| "This will only affect home directories of users added with the adduser "
-#| "program later."
 msgid ""
 "This will only affect home directories of users added from now on with the "
 "adduser command."
 msgstr ""
 "Це відноситься тільки до домашніх директорій користувачів, що будуть "
 "створені програмою adduser в майбутньому."
+
+#, fuzzy
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Звичайно, домашні директорії можуть переглядати всі користувачі в "
+#~ "системі. З метою підвищення безпечності/конфіденційності в вашій системі, "
+#~ "ви, можливо, захочете зробити, щоб директорії користувачів могли читати "
+#~ "лише вони самі. Якщо ви не впевнені, зробіть домашні директорії "
+#~ "доступними на читання всім."
diff -pruN 3.118/debian/po/vi.po 3.118ubuntu5/debian/po/vi.po
--- 3.118/debian/po/vi.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/vi.po	2021-01-06 06:16:50.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-05-30 08:12+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
@@ -36,15 +36,10 @@ msgstr ""
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"Mặc định là thư mục riêng của mỗi người dùng cho phép mọi người trên cùng hệ "
-"thống đọc. Nếu bạn muốn nâng cấp bảo mật và sự riêng tư, bạn có thể đặt thư "
-"mục riêng của người dùng chỉ cho người sở hữu đọc. Nếu vẫn còn lưỡng lự thì "
-"hãy bật tùy chọn."
 
 #. Type: boolean
 #. Description
@@ -55,3 +50,14 @@ msgid ""
 msgstr ""
 "Hành động này sẽ chỉ có tác động thư mục riêng của người dùng được thêm kể "
 "từ lúc này bằng lệnh “adduser”."
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "Mặc định là thư mục riêng của mỗi người dùng cho phép mọi người trên cùng "
+#~ "hệ thống đọc. Nếu bạn muốn nâng cấp bảo mật và sự riêng tư, bạn có thể "
+#~ "đặt thư mục riêng của người dùng chỉ cho người sở hữu đọc. Nếu vẫn còn "
+#~ "lưỡng lự thì hãy bật tùy chọn."
diff -pruN 3.118/debian/po/zh_CN.po 3.118ubuntu5/debian/po/zh_CN.po
--- 3.118/debian/po/zh_CN.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/debian/po/zh_CN.po	2021-01-06 06:16:50.000000000 +0000
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.9\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2018-09-15 15:13-0400\n"
+"POT-Creation-Date: 2021-01-06 16:49+1030\n"
 "PO-Revision-Date: 2016-06-17 17:57+0200\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <debian-chinese-gb@lists.debian.org>\n"
@@ -43,14 +43,10 @@ msgstr "您希望让主目录全局可
 #. Description
 #: ../templates:3001
 msgid ""
-"By default, users' home directories are readable by all users on the system. "
-"If you want to increase security and privacy, you might want home "
-"directories to be readable only for their owners. But if in doubt, leave "
-"this option enabled."
+"By default, users' home directories are readable only by their owners. To "
+"allow files to be easily shared with other users you might want to make them "
+"readable by all other users."
 msgstr ""
-"默认设置下，用户的主目录对系统所有用户都可读。如果您想要提高系统的安全性或私"
-"密性，您也许想让用户的主目录只有该用户自己可读。如果您不确定，保持本选项开"
-"启。"
 
 #. Type: boolean
 #. Description
@@ -59,3 +55,13 @@ msgid ""
 "This will only affect home directories of users added from now on with the "
 "adduser command."
 msgstr "这只会影响到以后使用 adduser 程序添加的用户的主目录。"
+
+#~ msgid ""
+#~ "By default, users' home directories are readable by all users on the "
+#~ "system. If you want to increase security and privacy, you might want home "
+#~ "directories to be readable only for their owners. But if in doubt, leave "
+#~ "this option enabled."
+#~ msgstr ""
+#~ "默认设置下，用户的主目录对系统所有用户都可读。如果您想要提高系统的安全性或"
+#~ "私密性，您也许想让用户的主目录只有该用户自己可读。如果您不确定，保持本选项"
+#~ "开启。"
diff -pruN 3.118/debian/postinst 3.118ubuntu5/debian/postinst
--- 3.118/debian/postinst	2016-06-26 20:00:56.000000000 +0000
+++ 3.118ubuntu5/debian/postinst	2020-12-14 03:09:33.000000000 +0000
@@ -15,7 +15,7 @@ then
 		db_get adduser/homedir-permission || RET="true"
 		if [ "$RET" = "false" ]
 		then
-			NEW_PERMISSION="0751"
+			NEW_PERMISSION="0750"
 		else
 			NEW_PERMISSION="0755"
 		fi
diff -pruN 3.118/debian/templates 3.118ubuntu5/debian/templates
--- 3.118/debian/templates	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/debian/templates	2021-01-06 06:15:43.000000000 +0000
@@ -13,12 +13,11 @@ _Description: Adduser
 
 Template: adduser/homedir-permission
 Type: boolean
-Default: true
+Default: false
 _Description: Do you want system-wide readable home directories?
- By default, users' home directories are readable by all users on the
- system. If you want to increase security and privacy, you might want
- home directories to be readable only for their owners. But if in doubt,
- leave this option enabled.
+ By default, users' home directories are readable only by their owners.
+ To allow files to be easily shared with other users you might want to
+ make them readable by all other users.
  .
  This will only affect home directories of users added from now
  on with the adduser command.
diff -pruN 3.118/deluser 3.118ubuntu5/deluser
--- 3.118/deluser	2016-11-24 08:58:17.000000000 +0000
+++ 3.118ubuntu5/deluser	2020-12-10 16:53:07.000000000 +0000
@@ -285,9 +285,26 @@ if($action eq "deluser") {
 	  push(@dirs, $File::Find::name)
 	    if(-d $File::Find::name);
 	} # sub home_match
-	
+
+	# collect ecryptfs config files not stored in $HOME
+	sub ecryptfs_match {
+	  if ( $File::Find::name !~ m[^/var/lib/ecryptfs/\Q$user] &&  $File::Find::name !~ m[^/home/\.ecryptfs/\Q$user]) {
+	    $File::Find::prune=1;
+	    return;
+	  }
+	  push(@files, $File::Find::name)
+	    if(-f $File::Find::name || -l $File::Find::name);
+	  push(@dirs, $File::Find::name)
+	    if(-d $File::Find::name);
+	} # sub ecryptfs_match
+
 	File::Find::find({wanted => \&home_match, untaint => 1, no_chdir => 1}, $pw_homedir)
 	  if(-d "$pw_homedir");
+	if(-d "/var/lib/ecryptfs/$user") {
+	  File::Find::find({wanted => \&ecryptfs_match, untaint => 1, no_chdir => 1}, "/var/lib/ecryptfs/$user");
+	} elsif (-d "/home/.ecryptfs/$user") {
+	  File::Find::find({wanted => \&ecryptfs_match, untaint => 1, no_chdir => 1}, "/home/.ecryptfs/$user");
+	}
 	push(@files, "/var/mail/$user")
 	  if(-e "/var/mail/$user");
       } else {
diff -pruN 3.118/doc/adduser.8 3.118ubuntu5/doc/adduser.8
--- 3.118/doc/adduser.8	2017-08-12 16:43:21.000000000 +0000
+++ 3.118ubuntu5/doc/adduser.8	2018-09-15 22:14:20.000000000 +0000
@@ -10,7 +10,7 @@
 .SH NAME
 adduser, addgroup \- add a user or group to the system
 .SH SYNOPSIS
-.BR adduser " [options] [\-\-home DIR] [\-\-shell SHELL] [\-\-no-create-home] [\-\-uid ID] [\-\-firstuid ID] [\-\-lastuid ID] [\-\-ingroup GROUP | \-\-gid ID] [\-\-disabled-password] [\-\-disabled-login] [\-\-gecos GECOS] [\-\-add_extra_groups] user"
+.BR adduser " [options] [\-\-home DIR] [\-\-shell SHELL] [\-\-no-create-home] [\-\-uid ID] [\-\-firstuid ID] [\-\-lastuid ID] [\-\-ingroup GROUP | \-\-gid ID] [\-\-disabled-password] [\-\-disabled-login] [\-\-gecos GECOS] [\-\-add_extra_groups] [\-\-encrypt-home] user"
 .PP
 .BR adduser " \-\-system [options] [\-\-home DIR] [\-\-shell SHELL] [\-\-no-create-home] [\-\-uid ID] [\-\-group | \-\-ingroup GROUP | \-\-gid ID] [\-\-disabled-password] [\-\-disabled-login] [\-\-gecos GECOS] user"
 .PP
@@ -99,6 +99,10 @@ password is set. The
 .B \-\-disabled-password
 option will not set a password, but login is still possible (for example
 with SSH RSA keys).
+To set up an encrypted home directory for the new user, add the
+.B \-\-encrypt-home
+option.  For more information, refer to the \-b option of
+.B ecryptfs-setup-private(1).
 
 If the file
 .B /usr/local/sbin/adduser.local
@@ -204,7 +208,12 @@ SSH RSA keys) but not using password aut
 .B \-\-force\-badname
 By default, user and group names are checked against the configurable
 regular expression 
-.B NAME_REGEX 
+.B NAME_REGEX
+(or
+.B NAME_REGEX_SYSTEM
+if
+.B --system
+is specified)
 specified in the configuration file. This option forces
 .B adduser
 and 
diff -pruN 3.118/doc/adduser.conf.5 3.118ubuntu5/doc/adduser.conf.5
--- 3.118/doc/adduser.conf.5	2016-06-26 20:53:15.000000000 +0000
+++ 3.118ubuntu5/doc/adduser.conf.5	2018-09-15 22:14:20.000000000 +0000
@@ -122,6 +122,15 @@ User and group names are checked against
 doesn't match this regexp, user and group creation in adduser is refused unless
 --force-badname is set. With --force-badname set, only weak checks are
 performed. The default is the most conservative ^[a-z][-a-z0-9]*$.
+When --system is specified, NAME_REGEX_SYSTEM is used instead.
+.TP
+\fBNAME_REGEX_SYSTEM\fB
+Names of system users are checked against this regular expression.
+If --system is supplied and the name
+doesn't match this regexp, user creation in adduser is refused unless
+--force-badname is set. With --force-badname set, only weak checks are
+performed. The default is as for the default NAME_REGEX but also
+allowing uppercase letters.
 .TP
 \fBSKEL_IGNORE_REGEX\fB
 Files in /etc/skel/ are checked against this regex, and not copied to
diff -pruN 3.118/doc/po4a/po/adduser.pot 3.118ubuntu5/doc/po4a/po/adduser.pot
--- 3.118/doc/po4a/po/adduser.pot	2017-12-24 03:03:40.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/adduser.pot	2020-04-16 14:12:53.000000000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,7 +57,7 @@ msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] "
 "[--disabled-password] [--disabled-login] [--gecos GECOS] "
-"[--add_extra_groups] user"
+"[--add_extra_groups] [--encrypt-home] user"
 msgstr ""
 
 #. type: Plain text
@@ -168,18 +168,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -187,63 +189,63 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid "The environment variable VERBOSE is set according to the following rule:"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
 msgstr ""
 
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -253,7 +255,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -262,7 +264,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or "
@@ -271,22 +273,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
-"system user will have the shell I</usr/sbin/nologin> (unless overridden with the "
-"B<--shell> option), and have logins disabled.  Skeletal configuration files "
-"are not copied."
+"system user will have the shell I</usr/sbin/nologin> (unless overridden with "
+"the B<--shell> option), and have logins disabled.  Skeletal configuration "
+"files are not copied."
 msgstr ""
 
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the "
 "B<--system> option, or B<addgroup> is called respectively, a user group will "
@@ -294,7 +296,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -302,25 +304,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr ""
 
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -328,110 +330,111 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
 msgstr ""
 
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -440,24 +443,24 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -465,26 +468,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -493,124 +496,124 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from ( B<LAST_UID> "
 ")"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr ""
 
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -619,13 +622,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -634,7 +637,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -642,54 +645,54 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr ""
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr ""
 
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
 msgstr ""
 
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -697,14 +700,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -931,23 +934,40 @@ msgid "B<NAME_REGEX>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
 "checks are performed. The default is the most conservative "
-"^[a-z][-a-z0-9]*$."
+"^[a-z][-a-z0-9]*$.  When --system is specified, NAME_REGEX_SYSTEM is used "
+"instead."
 msgstr ""
 
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr ""
+
+#. type: Plain text
+#: ../adduser.conf.5:134
+msgid ""
+"Names of system users are checked against this regular expression.  If "
+"--system is supplied and the name doesn't match this regexp, user creation "
+"in adduser is refused unless --force-badname is set. With --force-badname "
+"set, only weak checks are performed. The default is as for the default "
+"NAME_REGEX but also allowing uppercase letters."
+msgstr ""
+
+#. type: TP
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -956,13 +976,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -970,13 +990,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users "
@@ -984,19 +1004,19 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr ""
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1006,19 +1026,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), "
 "B<deluser.conf>(5)"
@@ -1371,13 +1391,13 @@ msgstr ""
 
 #. type: Plain text
 #: ../deluser.8:180
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 
 #. type: TP
 #: ../deluser.8:180
 #, no-wrap
-msgid "/usr/local/sbin/deluser.local"
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr ""
 
 #. type: Plain text
diff -pruN 3.118/doc/po4a/po/da.po 3.118ubuntu5/doc/po4a/po/da.po
--- 3.118/doc/po4a/po/da.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/da.po	2020-04-16 14:12:53.000000000 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 20:33+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -52,10 +52,12 @@ msgstr "SYNOPSIS"
 
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [tilvalg] [--home MAPPE] [--shell SKAL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPPE | --gid ID] [--disabled-"
@@ -205,14 +207,17 @@ msgstr ""
 "brugerens hjemmemappe vil have den korrekte gruppe."
 
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> vil kopiere filerne fra B<SKEL> ind i hjemmemappen og spørge om "
 "finger-information (gecos) og en adgangskode. Gecos'en kan også angives med "
@@ -222,7 +227,7 @@ msgstr ""
 "er stadig mulig (for eksempel med SSH RSA-nøgler)."
 
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -233,51 +238,51 @@ msgstr ""
 "opsætning. Argumenterne sendt til B<adduser.local> er:"
 
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "username uid gid home-directory"
 
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr "Miljøvaribalen VERBOSE angives jævnfør følgende regel:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr "0 hvis "
 
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr "B<--quiet> er angivet"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr "1 hvis hverken "
 
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "B<--quiet> eller B<--debug> er angivet"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr "2 hvis "
 
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr "B<--debug> er angivet"
 
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -286,13 +291,13 @@ msgstr ""
 "fjernet i en senere version af B<adduser>)."
 
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Tilføj en systembruger"
 
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -307,7 +312,7 @@ msgstr ""
 "advarsel. Denne advarsel kan undertrykkes ved at tilføje »B<--quiet>«."
 
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -320,7 +325,7 @@ msgstr ""
 "B<--uid>."
 
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -333,7 +338,7 @@ msgstr ""
 "med den samme id så brug tilvalget B<--group>."
 
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -346,13 +351,13 @@ msgstr ""
 "Skeletkonfigurationsfiler kopieres ikke."
 
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Tilføj en brugergruppe"
 
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -363,7 +368,7 @@ msgstr ""
 "tilføjet."
 
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -374,18 +379,18 @@ msgstr ""
 "kan du angive GID'en med tilvalget B<--gid>."
 
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "Gruppen oprettes med ingen brugere."
 
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Tilføj en systemgruppe"
 
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -394,7 +399,7 @@ msgstr ""
 "blive tilføjet."
 
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -405,13 +410,13 @@ msgstr ""
 "den mekanisme kan du give GID'en med tilvalget B<--gid>."
 
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Tilføj en eksisterende bruger til en eksisterende gruppe"
 
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -420,30 +425,30 @@ msgstr ""
 "eksisterende bruger til en eksisterende gruppe."
 
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "TILVALG"
 
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf FIL>"
 
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Brug FIL i stedet for I</etc/adduser.conf>."
 
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -452,13 +457,13 @@ msgstr ""
 "sin konto før adgangskoden er angivet."
 
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -467,33 +472,34 @@ msgstr ""
 "nøgler) men uden at bruge adgangskodegodkendelse."
 
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
+#, fuzzy
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Som standard kontrolleres bruger- og gruppenavne mod det konfigurerbare "
 "regulære udtryk B<NAME_REGEX> angivet i konfigurationsfilen. Denne "
 "indstilling tvinger B<adduser> og B<addgroup> til kun at bruge en svag "
-"kontrol af validiteten for navnet. B<NAME_REGEX> er beskrevet i B<adduser."
-"conf>(5)."
+"kontrol af validiteten for navnet."
 
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -502,13 +508,13 @@ msgstr ""
 "fingerinformation hvis dette tilvalg er angivet."
 
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -518,13 +524,13 @@ msgstr ""
 "brugeren i den gruppe."
 
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -537,24 +543,24 @@ msgstr ""
 "igangsættes som B<addgroup>."
 
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Vis korte instruktioner."
 
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home MAPPE>"
 
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -565,13 +571,13 @@ msgstr ""
 "kopieres."
 
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell SKAL>"
 
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -580,13 +586,13 @@ msgstr ""
 "konfigurationsfilen."
 
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GRUPPE>"
 
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -598,59 +604,59 @@ msgstr ""
 "tilvalget B<add_extra_groups>."
 
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Opret ikke hjemmemappen, selv om den ikke findes."
 
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr "Undertryk informative beskeder, vis kun advarsler og fejl."
 
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
 "Vær uddybdende, mest nyttig hvis du ønsker at finde et problem med adduser."
 
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Opret en systembruger eller -gruppe."
 
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -659,13 +665,13 @@ msgstr ""
 "bruger-id'et allerede er optaget."
 
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -674,13 +680,13 @@ msgstr ""
 "B<FIRST_UID> angivet i konfigurationsfilen)."
 
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -688,41 +694,41 @@ msgstr ""
 "Overskriv den sidste uid i intervallet som uid'en vælges fra (B<LAST_UID>)."
 
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr "Tilføj ny bruger til ekstra grupper defineret i konfigurationsfilen."
 
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Vis version og information om ophavsret."
 
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "SLUTVÆRDIER"
 
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -735,13 +741,13 @@ msgstr ""
 "endnu engang med de samme parametre som før også returnere 0."
 
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -754,7 +760,7 @@ msgstr ""
 "adduser.conf(5). Adduser er blevet afbrudt af et signal."
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -764,41 +770,41 @@ msgstr ""
 "Du kan overveje at fjerne B<--quiet> for at gøre adduser mere uddybende."
 
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "FILER"
 
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "Standardkonfigurationsfil for adduser og addgroup"
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr "/usr/local/sbin/adduser.local"
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr "Valgfrie tilpassede udvidelser."
 
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SE OGSÅ"
 
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -807,13 +813,13 @@ msgstr ""
 "B<usermod>(8), Debianpolitik 9.2.2."
 
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "OPHAVSRET"
 
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -823,7 +829,7 @@ msgstr ""
 "Marc Haber. Yderligere rettelser af Joerg Hoh og Stephen Gran."
 
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -832,7 +838,7 @@ msgstr ""
 "B<adduser>"
 
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1105,12 +1111,36 @@ msgid "B<NAME_REGEX>"
 msgstr "B<NAME_REGEX>"
 
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
+msgstr ""
+"Bruger- og gruppenavne kontrolleres mod dette regulære udtryk. Hvis navnet "
+"ikke matcher dette regulære udtryk, så nægtes bruger- og gruppeoprettelse i "
+"adduser med mindre --force-badname er angivet. Med --force-badname angivet, "
+"så foretages der kun svage kontroller. Standarden er den mest konservative "
+"^[a-z][-a-z0-9]*$."
+
+#. type: TP
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
 msgstr ""
 "Bruger- og gruppenavne kontrolleres mod dette regulære udtryk. Hvis navnet "
 "ikke matcher dette regulære udtryk, så nægtes bruger- og gruppeoprettelse i "
@@ -1119,13 +1149,13 @@ msgstr ""
 "^[a-z][-a-z0-9]*$."
 
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1138,13 +1168,13 @@ msgstr ""
 "konfigurationsfiler (dpkg-(old|new|dist))."
 
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1155,13 +1185,13 @@ msgstr ""
 "grupper defineret af EXTRA_GROUPS (nedenfor)."
 
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1171,19 +1201,19 @@ msgstr ""
 "video plugdev users games«."
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "BEMÆRKNINGER"
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<VALID NAMES>"
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1198,7 +1228,7 @@ msgstr ""
 "brugernavne (for at hænge sammmen med samba)."
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1207,12 +1237,12 @@ msgstr ""
 "til at kræve en lokal politik."
 
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1632,18 +1662,15 @@ msgstr ""
 
 #. type: Plain text
 #: ../deluser.8:180
-#, fuzzy
-#| msgid ""
-#| "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "I</etc/deluser.conf> - standardkonfigurationsfil for deluser og delgroup"
 
 #. type: TP
 #: ../deluser.8:180
-#, fuzzy, no-wrap
-#| msgid "I</usr/local/sbin/deluser.local>"
-msgid "/usr/local/sbin/deluser.local"
+#, no-wrap
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr "I</usr/local/sbin/deluser.local>"
 
 #. type: Plain text
@@ -1852,3 +1879,199 @@ msgstr "I</etc/deluser.conf>"
 #: ../deluser.conf.5:89
 msgid "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 msgstr "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
+
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [tilvalg] [--home MAPPE] [--shell SKAL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPPE | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] bruger"
+
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> vil kopiere filerne fra B<SKEL> ind i hjemmemappen og spørge "
+#~ "om finger-information (gecos) og en adgangskode. Gecos'en kan også "
+#~ "angives med tilvalget B<--gecos>. Med tilvalget B<--disabled-login> vil "
+#~ "kontoen blive oprettet, men vil være deaktiveret indtil en adgangskode er "
+#~ "angivet. Tilvalget B<--disabled-password> vil ikke angive en adgangskode, "
+#~ "men logind er stadig mulig (for eksempel med SSH RSA-nøgler)."
+
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Som standard kontrolleres bruger- og gruppenavne mod det konfigurerbare "
+#~ "regulære udtryk B<NAME_REGEX> angivet i konfigurationsfilen. Denne "
+#~ "indstilling tvinger B<adduser> og B<addgroup> til kun at bruge en svag "
+#~ "kontrol af validiteten for navnet. B<NAME_REGEX> er beskrevet i B<adduser."
+#~ "conf>(5)."
+
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Bruger- og gruppenavne kontrolleres mod dette regulære udtryk. Hvis "
+#~ "navnet ikke matcher dette regulære udtryk, så nægtes bruger- og "
+#~ "gruppeoprettelse i adduser med mindre --force-badname er angivet. Med --"
+#~ "force-badname angivet, så foretages der kun svage kontroller. Standarden "
+#~ "er den mest konservative ^[a-z][-a-z0-9]*$."
+
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "I</etc/deluser.conf> - standardkonfigurationsfil for deluser og delgroup"
+
+#, fuzzy
+#~ msgid "/usr/local/sbin/deluser.local"
+#~ msgstr "I</usr/local/sbin/deluser.local>"
+
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Som standard får hver bruger i Debian GNU/Linux en tilsvarende gruppe med "
+#~ "det samme navn. Brugergrupper tillader at skrivbare mapper for grupper "
+#~ "nemt kan vedligeholdes ved at placere de passende brugere i den nye "
+#~ "gruppe, angive set-group-ID-bit i mappen og sikre at alle brugere bruger "
+#~ "en umask på 002. Hvis denne indstilling slukkes ved at angive "
+#~ "B<USERGROUP> til I<no>, så sættes alle brugeres GID'er til B<USERS_GID>. "
+#~ "Brugeres primære grupper kan også overskrives fra kommandolinjen med "
+#~ "tilvalgene B<--gid> eller B<--ingroup> for at sætte gruppen per id eller "
+#~ "navn, respektivt. Brugere kan også tilføjes til en eller flere grupper "
+#~ "defineret i adduser.conf enten ved at sætte ADD_EXTRA_GROUPS til 1 i "
+#~ "adduser.conf, eller ved at medtage -add_extra_groups på kommandolinjen."
+
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0 hvis --quiet er angivet"
+
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1 hvis hverken --quiet eller --debug er angivet"
+
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2 hvis --debug er angivet"
+
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(Det samme gælder for variablerne DEBUG, men DEBUG er forældet og vil "
+#~ "blive fjernet i en senere version af adduser)."
+
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Hvis kaldt med et argument uden tilvalg og tilvalget B<--system>, så vil "
+#~ "B<adduser> tilføje en systembruger. Hvis en bruger med det samme navn "
+#~ "allerde findes i systemets uid-interval (eller hvis uid'en er angivet, "
+#~ "hvis en bruger med det uid allerede findes), så vil adduser afsluttes med "
+#~ "en advarsel. Denne advarsel kan undertrykkes ved at tilføje »--quiet«."
+
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "En hjemmemappe oprettes med de samme regler som for normale brugere. Den "
+#~ "nye systembruger vil have skallen I</bin/false> (med mindre overskrevet "
+#~ "med tilvalget B<--shell>), og have logind'er deaktiveret. "
+#~ "Skeletkonfigurationsfiler kopieres ikke."
+
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Tilføj den nye bruger til GRUPPE i stedet for en brugergruppe eller "
+#~ "standardgruppen defineret af B<USERS_GID> i konfigurationsfilen. Dette "
+#~ "påvirker brugerens primære gruppe. For at tilføje yderligere grupper, så "
+#~ "se tilvalget B<add_extra_groups>."
+
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), "
+#~ "Debianpolitik 9.2.2."
+
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "angiv et inkluderende interval af UID'er hvorfra normale brugeres UID'er "
+#~ "dynamisk kan allokeres. Standard er I<1000> - I<29999>."
+
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "angiv et inkluderende interval af GID'er hvorfra normale gruppers GID'er "
+#~ "dynamisk kan allokeres. Standard er I<1000> - I<29999>."
+
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Dette er listen over grupper som nye brugere, der ikke er systembrugere, "
+#~ "vil blive tilføjet til. Som standard er denne liste »dialout cdrom floppy "
+#~ "audio video plugdev users games«."
+
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
+#~ msgid "/etc/deluser.conf"
+#~ msgstr "/etc/deluser.conf"
+
+#~ msgid "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
+#~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
+
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "deluser(8) og delgroup(8) læser også /etc/adduser.conf, se adduser."
+#~ "conf(8); indstillinger i deluser.conf kan overskrive indstillinger i "
+#~ "adduser.conf."
+
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Slet kun en gruppe hvis der ikke er en bruger, som tilhører denne gruppe. "
+#~ "Standard er 0."
+
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
diff -pruN 3.118/doc/po4a/po/de.po 3.118ubuntu5/doc/po4a/po/de.po
--- 3.118/doc/po4a/po/de.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/de.po	2020-04-16 14:12:53.000000000 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 19:16+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -55,10 +55,12 @@ msgstr "ÜBERSICHT"
 
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [Optionen] [--home VERZEICHNIS] [--shell SHELL] [--no-create-"
 "home] [--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPPE | --gid "
@@ -216,14 +218,17 @@ msgstr ""
 
 # http://de.wikipedia.org/wiki/Benutzer:Gecos
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> wird Dateien von B<SKEL> in das Home-Verzeichnis kopieren und zur "
 "Eingabe von Finger-Informationen (Gecos) und eines Passworts auffordern. Die "
@@ -234,7 +239,7 @@ msgstr ""
 "RSA-Schlüsseln)."
 
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -245,51 +250,51 @@ msgstr ""
 "vorzunehmen. An B<adduser.local> werden die folgenden Argumente übergeben:"
 
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "Benutzername, UID, GID und Home-Verzeichnis."
 
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr "Die Umgebungsvariable VERBOSE wird mit der folgenden Regel gesetzt:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr "0 wenn "
 
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr "B<--quiet> angegeben wurde"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr "1 wenn weder "
 
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "B<--quiet> noch B<--debug> angegeben wurde"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr "2 wenn "
 
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr "B<--debug> angegeben wurde"
 
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -298,14 +303,14 @@ msgstr ""
 "in einer zukünftigen Version von B<adduser> entfernt werden.)"
 
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Einen System-Benutzer einrichten"
 
 # Ja. Es ist unscharf. Der Benutzer ist eigentlich ein Konto.
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -322,7 +327,7 @@ msgstr ""
 "wählen."
 
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -335,7 +340,7 @@ msgstr ""
 "können Sie diese mit der Option B<--uid> festlegen."
 
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -349,7 +354,7 @@ msgstr ""
 "das Richtige für Sie."
 
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -363,13 +368,13 @@ msgstr ""
 "keine Konfigurationsdateien aus /etc/skel kopiert."
 
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Eine Benutzergruppe einrichten"
 
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -380,7 +385,7 @@ msgstr ""
 "eingerichtet."
 
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -391,18 +396,18 @@ msgstr ""
 "Kraft setzen, indem Sie die GID mit der Option B<--gid> festlegen."
 
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "Die erzeugte Gruppe ist leer, hat also keine Mitglieder."
 
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Eine Systemgruppe einrichten"
 
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -411,7 +416,7 @@ msgstr ""
 "Systemgruppe eingerichtet."
 
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -423,14 +428,14 @@ msgstr ""
 "gid> festlegen."
 
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Einen bestehenden Benutzer zu einer bestehenden Gruppe hinzufügen"
 
 # FIXME: non-option -> non-optional
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -439,30 +444,30 @@ msgstr ""
 "bestehender Benutzer zu einer bestehenden Gruppe hinzugefügt."
 
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf DATEI>"
 
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "DATEI anstelle von I</etc/adduser.conf> benutzen"
 
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -471,13 +476,13 @@ msgstr ""
 "nachdem ein Passwort vergeben wurde."
 
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -486,33 +491,34 @@ msgstr ""
 "Schlüsseln), aber nicht mittels Passwort."
 
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
+#, fuzzy
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Benutzer- und Gruppennamen werden standardmäßig mit dem konfigurierbaren "
 "regulären Ausdruck B<NAME_REGEX> verglichen, der in der Konfigurationsdatei "
-"festgelegt ist. Diese Option zwingt B<adduser> und B<addgroup>, nur eine "
-"schwache Kontrolle für die Gültigkeit der Namen durchzuführen. B<NAME_REGEX> "
-"ist in B<adduser.conf>(5) beschrieben."
+"festgelegt ist. Diese Option zwingt B<adduser> und B<addgroup> nur eine "
+"schwache Kontrolle für die Gültigkeit der Name durchzuführen."
 
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -521,13 +527,13 @@ msgstr ""
 "wird nicht nach Finger-Informationen fragen, wenn diese Option gewählt ist."
 
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -537,13 +543,13 @@ msgstr ""
 "zu einem Mitglied der Gruppe."
 
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -557,24 +563,24 @@ msgstr ""
 "B<addgroup> aufgerufen wird."
 
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Kurzanleitung anzeigen"
 
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home VERZEICHNIS>"
 
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -585,13 +591,13 @@ msgstr ""
 "wird es erzeugt und Dateien aus /etc/skel dorthin kopiert."
 
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell SHELL>"
 
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -600,13 +606,13 @@ msgstr ""
 "Konfigurationsdatei festgelegten Vorgabe."
 
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GRUPPE>"
 
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -619,38 +625,38 @@ msgstr ""
 "Gruppen zugeordnet werden."
 
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # FIXME: bad English
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "kein Home-Verzeichnis einrichten, auch wenn es nicht existiert"
 
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr ""
 "Meldungen mit Informationscharakter unterdrücken, nur Warnungen und Fehler "
 "anzeigen"
 
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
@@ -658,24 +664,24 @@ msgstr ""
 "gelöst werden sollen"
 
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "einen neuen Systembenutzer oder eine neue Systemgruppe einrichten"
 
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -684,13 +690,13 @@ msgstr ""
 "B<Adduser> wird fehlschlagen, wenn die Benutzer-ID bereits vergeben ist."
 
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -699,56 +705,56 @@ msgstr ""
 "(also B<FIRST_UID> in der Konfigurationsdatei)."
 
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
 msgstr "analog zu B<--firstuid ID>; überschreibt B<LAST_UID>"
 
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Macht den neuen Benutzer zum Mitglied weiterer Gruppen, die in der "
 "Konfigurationsdatei festgelegt sind."
 
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Anzeige der Version und von Copyright-Informationen"
 
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "RÜCKGABEWERTE"
 
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -762,13 +768,13 @@ msgstr ""
 "auch 0 zurückgeben."
 
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -782,7 +788,7 @@ msgstr ""
 "Interrupt) abgebrochen."
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -793,41 +799,41 @@ msgstr ""
 "B<adduser> ohne B<--quiet> aufrufen, um mehr Einzelheiten auszugeben."
 
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "Standard-Konfigurationsdatei für B<adduser> und B<addgroup>"
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr "/usr/local/sbin/adduser.local"
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr "Optionale benutzerspezifische Add-Ons."
 
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -836,13 +842,13 @@ msgstr ""
 "B<usermod>(8), Debian Policy 9.2.2."
 
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -853,7 +859,7 @@ msgstr ""
 "Gran."
 
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -862,7 +868,7 @@ msgstr ""
 "Debian-Version von B<adduser>."
 
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1147,12 +1153,14 @@ msgid "B<NAME_REGEX>"
 msgstr "B<NAME_REGEX>"
 
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
 msgstr ""
 "Benutzer- und Gruppennamen werden mit diesem regulären Ausdruck überprüft. "
 "Wenn der Name nicht zum regulären Ausdruck passt, verweigert Adduser die "
@@ -1162,13 +1170,36 @@ msgstr ""
 "^[az][-a-z0-9]*$."
 
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
+msgstr ""
+"Benutzer- und Gruppennamen werden mit diesem regulären Ausdruck überprüft. "
+"Wenn der Name nicht zum regulären Ausdruck passt, verweigert Adduser die "
+"Erstellung von Benutzer und Gruppe - es sei denn, die Option B<--force-"
+"badname> wurde gewählt. Das Setzen von B<--force-badname> lässt Adduser nur "
+"schwache Kontrollen durchführen. Der Standardwert ist der konservativste "
+"^[az][-a-z0-9]*$."
+
+#. type: TP
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1182,13 +1213,13 @@ msgstr ""
 "übrig blieben (dpkg-(old|new|dist))."
 
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1199,13 +1230,13 @@ msgstr ""
 "(unten) angegebenen Gruppen machen."
 
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1215,19 +1246,19 @@ msgstr ""
 "plugdev users games«."
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "ANMERKUNGEN"
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<VALID NAMES>"
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1242,7 +1273,7 @@ msgstr ""
 "Ende von Benutzernamen erlaubt (zwecks Samba-Konformität)."
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1251,12 +1282,12 @@ msgstr ""
 "eingeführt werden, um eine lokale Richtlinie durchzusetzen."
 
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1691,18 +1722,15 @@ msgstr ""
 
 #. type: Plain text
 #: ../deluser.8:180
-#, fuzzy
-#| msgid ""
-#| "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "I</etc/deluser.conf> - Standard-Konfigurationsdatei für deluser und delgroup"
 
 #. type: TP
 #: ../deluser.8:180
-#, fuzzy, no-wrap
-#| msgid "I</usr/local/sbin/deluser.local>"
-msgid "/usr/local/sbin/deluser.local"
+#, no-wrap
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr "I</usr/local/sbin/deluser.local>"
 
 #. type: Plain text
@@ -1918,9 +1946,225 @@ msgstr "I</etc/deluser.conf>"
 msgid "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 msgstr "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [Optionen] [--home VERZEICHNIS] [--shell SHELL] [--no-create-"
+#~ "home] [--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPPE | --gid "
+#~ "ID] [--disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] Benutzer"
+
+# http://de.wikipedia.org/wiki/Benutzer:Gecos
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> wird Dateien von B<SKEL> in das Home-Verzeichnis kopieren und "
+#~ "zur Eingabe von Finger-Informationen (Gecos) und eines Passworts "
+#~ "auffordern. Die Gecos können auch mit der Option B<--Gecos> übergeben "
+#~ "werden. Mit der Option B<--disabled-login> wird das Benutzerkonto "
+#~ "erstellt, aber bis zur Festlegung eines Passworts deaktiviert. Die Option "
+#~ "B<--disabled-password> legt kein Passwort fest, aber eine Anmeldung ist "
+#~ "dennoch möglich (zum Beispiel mit SSH-RSA-Schlüsseln)."
+
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Benutzer- und Gruppennamen werden standardmäßig mit dem konfigurierbaren "
+#~ "regulären Ausdruck B<NAME_REGEX> verglichen, der in der "
+#~ "Konfigurationsdatei festgelegt ist. Diese Option zwingt B<adduser> und "
+#~ "B<addgroup>, nur eine schwache Kontrolle für die Gültigkeit der Namen "
+#~ "durchzuführen. B<NAME_REGEX> ist in B<adduser.conf>(5) beschrieben."
+
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Benutzer- und Gruppennamen werden mit diesem regulären Ausdruck "
+#~ "überprüft. Wenn der Name nicht zum regulären Ausdruck passt, verweigert "
+#~ "Adduser die Erstellung von Benutzer und Gruppe - es sei denn, die Option "
+#~ "B<--force-badname> wurde gewählt. Das Setzen von B<--force-badname> lässt "
+#~ "Adduser nur schwache Kontrollen durchführen. Der Standardwert ist der "
+#~ "konservativste ^[az][-a-z0-9]*$."
+
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "I</etc/deluser.conf> - Standard-Konfigurationsdatei für deluser und "
+#~ "delgroup"
+
+#, fuzzy
+#~ msgid "/usr/local/sbin/deluser.local"
+#~ msgstr "I</usr/local/sbin/deluser.local>"
+
+# FIXME?: markup error B<--add_extra_groups>
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Standardmäßig wird jedem Benutzer in Debian GNU/Linux eine Gruppe mit dem "
+#~ "gleichen Namen zugeordnet. Benutzergruppen ermöglichen die einfache "
+#~ "Einrichtung von Verzeichnissen, für die mehrere Benutzer Schreibrechte "
+#~ "haben. Es müssen nur die betreffenden Benutzer zu Mitgliedern einer "
+#~ "Gruppe erklärt, das Set-Group-ID-Bit des Verzeichnisses gesetzt und "
+#~ "sichergestellt werden, dass alle Benutzer eine Umask von 002 verwenden. "
+#~ "Wird diese Option deaktiviert, indem Sie auf B<USERGROUPS> auf I<no> "
+#~ "setzen, werden die GIDs aller Nutzer auf B<USERS_GID> gesetzt. Die "
+#~ "anfängliche Gruppenzugehörigkeit eines Benutzers kann auch auf der "
+#~ "Befehlszeile mit den Optionen B<--gid> oder B<--ingroup> überschrieben "
+#~ "werden, um die Gruppen-ID oder den Gruppennamen zu setzen. Außerdem "
+#~ "können Nutzer zu einer oder mehreren in adduser.conf definierten Gruppen "
+#~ "hinzugefügt werden, indem entweder in adduser.conf ADD_EXTRA_GROUPS auf 1 "
+#~ "gesetzt oder auf der Befehlszeile B<--add_extra_groups> übergeben wird."
+
+# FIXME: markup error ?
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0, wenn B<--quiet> angegeben wurde"
+
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1, wenn weder B<--quiet> noch B<--debug> angegeben wurde"
+
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2, wenn B<--debug> angegeben wurde"
+
+# FIXME: markup error?
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(Das gleiche gilt für die Variable DEBUG, aber DEBUG ist veraltet und "
+#~ "wird in einer zukünftigen Version von B<adduser> entfernt werden.)"
+
+# Ja. Es ist unscharf. Der Benutzer ist eigentlich ein Konto.
+# FIXME: Markup?
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Wird B<adduser> ohne die Option B<--system> und mit einem nicht "
+#~ "optionalen Argument aufgerufen, richtet B<adduser> einen System-Benutzer "
+#~ "ein. Wenn schon ein Benutzer mit demselben Namen existiert und seine UID "
+#~ "in den Systembereich fällt (oder wenn eine UID angegeben wird, diese "
+#~ "schon an einen Benutzer vergeben ist), wird sich adduser beenden und eine "
+#~ "Warnung ausgeben. Diese Warnung kann unterdrückt werden, indem Sie die "
+#~ "Option B<--quiet> wählen."
+
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "Das Home-Verzeichnis wird nach den gleichen Regeln wie denen für einfache "
+#~ "Benutzer erzeugt. Dem neuen Benutzer wird als Shell I</bin/false> "
+#~ "zugewiesen (Es sei denn, das wird durch die Option B<--shell> geändert) "
+#~ "und normale Anmeldungen werden deaktiviert. In sein Home-Verzeichnis "
+#~ "werden keine Konfigurationsdateien aus /etc/skel kopiert."
+
+# FIXME: Missing period.
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Der neue Benutzer wird Mitglied von GRUPPE; Vorgaben der "
+#~ "Konfigurationsdatei bezüglich einer Benutzergruppe oder der durch "
+#~ "B<USERS_GID> festgelegten Standardgruppe kommen nicht zum Tragen. Dies "
+#~ "betrifft die primäre Gruppe des Benutzers. Mit der Option "
+#~ "B<add_extra_groups> kann der Benutzer weiteren Gruppen zugeordnet werden."
+
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "B<adduser.conf>(5), B<deluser>(8), B<useradd>(8), B<groupadd>(8), "
+#~ "B<usermod>(8), Debian Policy 9.2.2"
+
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "geben einen Bereich von UIDs (einschließlich der beiden Konstanten mit "
+#~ "den Standardwerten I<1000> und I<29999>) an, aus dem Benutzer-IDs "
+#~ "dynamisch zugewiesen werden können."
+
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "geben einen Bereich von Gruppen-IDs (einschließlich der beiden Konstanten "
+#~ "mit den Standardwerten I<1000> und I<29999>) an, aus dem Gruppen-IDs "
+#~ "dynamisch zugewiesen werden können."
+
+# FIXME: Punctuation
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Die neu eingerichteten Nicht-System-Benutzer werden diesen Gruppen "
+#~ "zugeordnet. Die Standardgruppen sind »dialout cdrom floppy audio video "
+#~ "plugdev users games«."
+
+# FIXME: order
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr ""
+#~ "B<deluser.conf>(5), B<addgroup>(8), B<adduser>(8), B<delgroup>(8), "
+#~ "B<deluser>(8)"
+
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
 # FIXME: Order of manpages
 #~ msgid "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 #~ msgstr "deluser.conf(5), adduser(8), groupdel(8), userdel(8)"
+
+# FIXME: adduser.conf(5)
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "B<deluser>(8) und B<delgroup>(8) lesen auch /etc/adduser.conf, siehe "
+#~ "B<adduser.conf>(5). Einstellungen in deluser.conf können Einstellungen "
+#~ "aus adduser.conf überschreiben."
+
+# FIXME: bad english
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Eine Gruppe wird nur gelöscht, wenn diese Gruppe keine Mitglieder hat. "
+#~ "Der Standardwert ist 0."
+
+# FIXME: order of manpages
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr " B<adduser.conf>(5), B<deluser>(8), B<delgroup>(8)"
diff -pruN 3.118/doc/po4a/po/es.po 3.118ubuntu5/doc/po4a/po/es.po
--- 3.118/doc/po4a/po/es.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/es.po	2020-04-16 14:12:53.000000000 +0000
@@ -27,7 +27,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.113\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2011-07-16 16:59+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -82,10 +82,12 @@ msgstr "SINOPSIS"
 # type: Plain text
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [opciones] [--home DIRECTORIO] [--shell CONSOLA] [--no-create-"
 "home] [--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPO | --gid ID] "
@@ -210,18 +212,6 @@ msgstr ""
 #. type: Plain text
 #: ../adduser.8:74
 #, fuzzy
-#| msgid ""
-#| "By default, each user in Debian GNU/Linux is given a corresponding group "
-#| "with the same name.  Usergroups allow group writable directories to be "
-#| "easily maintained by placing the appropriate users in the new group, "
-#| "setting the set-group-ID bit in the directory, and ensuring that all "
-#| "users use a umask of 002.  If this option is turned off by setting "
-#| "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
-#| "primary groups can also be overridden from the command line with the B<--"
-#| "gid> or B<--ingroup> options to set the group by id or name, "
-#| "respectively.  Also, users can be added to one or more groups defined in "
-#| "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
-#| "by passing --add_extra_groups on the commandline."
 msgid ""
 "By default, each user in Debian GNU/Linux is given a corresponding group "
 "with the same name.  Usergroups allow group writable directories to be "
@@ -269,14 +259,17 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> copiará los ficheros desde B<SKEL> en el directorio personal y "
 "preguntará por la información del campo gecos y por la clave. El campo gecos "
@@ -288,7 +281,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -300,62 +293,56 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "nombre-usuario UID GID directorio-personal"
 
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr ""
 "La variable de entorno VERBOSE se define de acuerdo a la siguiente regla:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, fuzzy
-#| msgid "0 if --quiet is specified"
 msgid "B<--quiet> is specified"
 msgstr "0 si se define --quiet"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, fuzzy
-#| msgid "1 if neither --quiet nor --debug is specified"
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "1 si no se definen ni --quiet ni --debug"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 #, fuzzy
-#| msgid "2 if --debug is specified"
 msgid "B<--debug> is specified"
 msgstr "2 si se define --debug"
 
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 #, fuzzy
-#| msgid ""
-#| "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
-#| "be removed in a later version of adduser.)"
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -365,21 +352,15 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Añadir un usuario del sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 #, fuzzy
-#| msgid ""
-#| "If called with one non-option argument and the B<--system> option, "
-#| "B<adduser> will add a system user. If a user with the same name already "
-#| "exists in the system uid range (or, if the uid is specified, if a user "
-#| "with that uid already exists), adduser will exit with a warning. This "
-#| "warning can be suppressed by adding \"--quiet\"."
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -395,7 +376,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -409,7 +390,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -423,7 +404,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -437,14 +418,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Añadir un grupo de usuarios"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -455,7 +436,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -467,20 +448,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "El grupo se creará sin usuarios."
 
 # type: SS
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Añadir un grupo del sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -490,7 +471,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -503,14 +484,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Añadir un usuario existente a un grupo existente"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -520,34 +501,34 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPCIONES"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf FICHERO>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Usa FICHERO en vez de I</etc/adduser.conf>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -557,14 +538,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -574,25 +555,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, fuzzy
-#| msgid ""
-#| "By default, user and group names are checked against the configurable "
-#| "regular expression B<NAME_REGEX> specified in the configuration file. "
-#| "This option forces B<adduser> and B<addgroup> to apply only a weak check "
-#| "for validity of the name."
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Por omisión, el nombre de usuario y grupo se comparan con la expresión "
 "regular configurable B<NAME_REGEX> definida en el fichero de configuración. "
@@ -601,14 +578,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -618,14 +595,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -635,14 +612,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -656,27 +633,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Muestra unas instrucciones breves."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home DIRECTORIO>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -688,14 +665,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell CONSOLA>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -705,20 +682,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GRUPO>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, fuzzy
-#| msgid ""
-#| "Add the new user to GROUP instead of a usergroup or the default group "
-#| "defined by B<USERS_GID> in the configuration file.  This affects the "
-#| "users primary group.  To add additional groups, see the "
-#| "B<add_extra_groups> option"
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -731,38 +703,38 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "No crea el directorio personal, incluso si no existe."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr "Elimina los mensajes informativos, sólo muestra avisos y errores."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
@@ -771,27 +743,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Crea un usuario del sistema o grupo."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -801,14 +773,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -818,14 +790,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -834,13 +806,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Añade un nuevo usuario a los grupos adicionales definidos en el fichero de "
@@ -848,31 +820,31 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Muestra la versión e información acerca del copyright."
 
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "VALORES DE SALIDA"
 
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -885,13 +857,13 @@ msgstr ""
 "los mismos parámetros también devuelve 0."
 
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -904,7 +876,7 @@ msgstr ""
 "adduser.conf(5). Una señal ha cancelado la ejecución de adduser."
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -916,49 +888,46 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "FICHEROS"
 
 # type: Plain text
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "El fichero de configuración predeterminado de adduser y addgroup."
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VÉASE TAMBIÉN"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 #, fuzzy
-#| msgid ""
-#| "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
-#| "Policy 9.2.2."
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -968,14 +937,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -986,7 +955,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -996,7 +965,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1306,12 +1275,14 @@ msgid "B<NAME_REGEX>"
 msgstr "B<NAME_REGEX>"
 
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
 msgstr ""
 "Los nombres de grupo y usuario se comparan con esta expresión regular. Si el "
 "nombre no coincide con la expresión regular, adduser rechazará crear "
@@ -1321,13 +1292,30 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+#. type: Plain text
+#: ../adduser.conf.5:134
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
+msgstr ""
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1341,13 +1329,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1359,18 +1347,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, fuzzy
-#| msgid ""
-#| "This is the list of groups that new non-system users will be added to.  "
-#| "By default, this list is 'dialout cdrom floppy audio video plugdev users "
-#| "games'"
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1380,19 +1364,19 @@ msgstr ""
 "games»."
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTAS"
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<VALID NAMES>"
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1407,7 +1391,7 @@ msgstr ""
 "«$» al final de nombres de usuario (en conformidad con samba)."
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1417,15 +1401,14 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 #, fuzzy
-#| msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1882,10 +1865,8 @@ msgstr ""
 #. type: Plain text
 #: ../deluser.8:180
 #, fuzzy
-#| msgid ""
-#| "/etc/deluser.conf - configuration file for B<deluser(8)> and "
-#| "B<delgroup(8)>."
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "/etc/deluser.conf - Fichero de configuración para B<deluser(8)> y "
 "B<delgroup(8)>"
@@ -1893,14 +1874,13 @@ msgstr ""
 #. type: TP
 #: ../deluser.8:180
 #, no-wrap
-msgid "/usr/local/sbin/deluser.local"
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
 #: ../deluser.8:189
 #, fuzzy
-#| msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
 msgid "B<adduser>(8), B<deluser.conf>(5), B<groupdel>(8), B<userdel>(8)"
 msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
 
@@ -1967,10 +1947,6 @@ msgstr ""
 #. type: Plain text
 #: ../deluser.conf.5:35
 #, fuzzy
-#| msgid ""
-#| "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
-#| "conf(8); settings in deluser.conf may overwrite settings made in adduser."
-#| "conf."
 msgid ""
 "B<deluser(8)> and B<delgroup(8)> also read I</etc/adduser.conf,> see "
 "B<adduser.conf(5);> settings in I<deluser.conf> may overwrite settings made "
@@ -2096,9 +2072,6 @@ msgstr "B<ONLY_IF_EMPTY>"
 #. type: Plain text
 #: ../deluser.conf.5:80
 #, fuzzy
-#| msgid ""
-#| "Only delete a group if there are no user who belong to this group. "
-#| "Defaults to 0."
 msgid ""
 "Only delete a group if there are no users belonging to this group. Defaults "
 "to 0."
@@ -2133,11 +2106,196 @@ msgstr "I</etc/deluser.conf>"
 #. type: Plain text
 #: ../deluser.conf.5:89
 #, fuzzy
-#| msgid "deluser(8), delgroup(8), adduser.conf(5)"
 msgid "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 msgstr "deluser(8), delgroup(8), adduser.conf(5)"
 
 # type: Plain text
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [opciones] [--home DIRECTORIO] [--shell CONSOLA] [--no-create-"
+#~ "home] [--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPO | --gid "
+#~ "ID] [--disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] USUARIO"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> copiará los ficheros desde B<SKEL> en el directorio personal y "
+#~ "preguntará por la información del campo gecos y por la clave. El campo "
+#~ "gecos también se puede definir con la opción B<--gecos>. Con la opción "
+#~ "B<--disabled-login>, la cuenta se creará pero estará deshabilitada hasta "
+#~ "que se proporcione una clave. La opción B<--disabled-password> no "
+#~ "establecerá la clave, pero todavía será posible trabajar con la cuenta, "
+#~ "por ejemplo mediante claves SSH RSA."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Por omisión, el nombre de usuario y grupo se comparan con la expresión "
+#~ "regular configurable B<NAME_REGEX> definida en el fichero de "
+#~ "configuración. Esta opción fuerza a B<adduser> y B<addgroup> a ser más "
+#~ "indulgente en sus comprobaciones de la validez de un nombre."
+
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Los nombres de grupo y usuario se comparan con esta expresión regular. Si "
+#~ "el nombre no coincide con la expresión regular, adduser rechazará crear "
+#~ "usuarios y grupos a menos que se defina «--force-badname». Si se define "
+#~ "«--force-badname», sólo se realizarán comprobaciones débiles. El valor "
+#~ "por omisión, más conservador, es ^[a-z][-a-z0-9]*$."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "/etc/deluser.conf - Fichero de configuración para B<deluser(8)> y "
+#~ "B<delgroup(8)>"
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Por omisión, cada usuario en Debian GNU/Linux tiene su grupo "
+#~ "correspondiente con el mismo nombre. Los grupos de usuarios permiten "
+#~ "mantener directorios con permisos de escritura para un grupo de usuarios "
+#~ "de forma sencilla añadiendo los usuarios apropiados al nuevo grupo, "
+#~ "habilitando después el bit set-group-ID en el directorio, y comprobando "
+#~ "que todos los usuarios tengan un umask de 002. Si esta opción se "
+#~ "deshabilita definiendo B<USERGROUPS> como I<no>, todos los GID de usuario "
+#~ "corresponderán a B<USERS_GID>. Los grupos primarios de usuario también se "
+#~ "pueden deshabilitar usando las opciones de la línea de órdenes B<--gid> o "
+#~ "B<--ingroup> para establecer el grupo por id o por nombre, "
+#~ "respectivamente. Así mismo, se pueden añadir usuarios a uno o más grupos "
+#~ "definidos en «adduser.conf», bien definiendo ADD_EXTRA_GROUPS como 1 en "
+#~ "«adduser.conf», o introduciendo «--add_extra_groups» en la línea de "
+#~ "órdenes."
+
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0 si se define --quiet"
+
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1 si no se definen ni --quiet ni --debug"
+
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2 si se define --debug"
+
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(Se aplica lo mismo a la variable DEBUG, pero DEBUG está obsoleto y se "
+#~ "eliminará en un versión futura de adduser.)"
+
+# type: Plain text
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Si se invoca con un argumento que no es ninguna opción y la opción B<--"
+#~ "system>, B<adduser> añadirá un un usuario del sistema. Si ya existe un "
+#~ "usuario con el mismo nombre en el rango del sistema de UID (o si se "
+#~ "especifica el UID y ya existe un usuario con ese UID), adduser abandonará "
+#~ "con un aviso. Puede suprimir este aviso añadiendo «--quiet»."
+
+# type: Plain text
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "El directorio personal se crea con las mismas normas que para los "
+#~ "usuarios normales. Los nuevos usuarios del sistema tendrán como consola "
+#~ "I</bin/false> (a menos que se modifique con la opción B<--shell>), y "
+#~ "tienen la clave deshabilitada. Los ficheros de configuración esqueleto no "
+#~ "se copian."
+
+# type: Plain text
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Añade el nuevo usuario al GRUPO en vez de al grupo del usuario o el grupo "
+#~ "predeterminado definido por B<USERS_GID> en el fichero de configuración. "
+#~ "Afecta al grupo principal de usuarios. Para añadir grupos adicionales, "
+#~ "use la opción B<add_extra_groups>."
+
+# type: Plain text
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Normas "
+#~ "de Debian 9.2.2."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "especifica un rango dinámico de identificadores para usuarios normales "
+#~ "(ambos incluidos). Por omisión es I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "define un rango inclusivo de números GID del cual se pueden asignar "
+#~ "dinámicamente números GID de grupo normales. El valor por omisión es "
+#~ "I<1000> - I<29999>."
+
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "La lista de grupos a la que se añadirán usuarios no del sistema. Por "
+#~ "omisión, esta lista es «dialout cdrom floppy audio video plugdev users "
+#~ "games»."
+
+# type: Plain text
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
+# type: Plain text
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
@@ -2145,6 +2303,26 @@ msgstr "deluser(8), delgroup(8), adduser
 #~ msgid "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 #~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "deluser(8) y delgroup(8) también leen «/etc/adduser.conf», consulte "
+#~ "adduser.conf(8); las opciones de configuración en «deluser.conf» pueden "
+#~ "anular la configuración en «adduser.conf»."
+
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Sólo elimina un grupo si ningún usuario pertenece a él. El valor "
+#~ "predeterminado es cero."
+
+# type: Plain text
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
+
 # type: Plain text
 #~ msgid "B<adduser> --group [options] [--gid ID] group"
 #~ msgstr "B<adduser> --group [opciones] [--gid ID] grupo"
diff -pruN 3.118/doc/po4a/po/fr.po 3.118ubuntu5/doc/po4a/po/fr.po
--- 3.118/doc/po4a/po/fr.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/fr.po	2020-04-16 14:12:53.000000000 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 19:17+0200\n"
 "Last-Translator: Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -65,10 +65,12 @@ msgstr "SYNOPSIS"
 # type: Plain text
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [options] [--home REP] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUPE | --gid ID] [--disabled-"
@@ -241,14 +243,17 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> copiera les fichiers de B<SKEL> (le squelette) dans le répertoire "
 "personnel et demandera les informations du champ gecos (utilisées par "
@@ -260,7 +265,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -272,57 +277,57 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "nom_utilisateur uid gid répertoire_personnel"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr ""
 "La variable d'environnement VERBOSE est positionnée de la façon suivante :"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr "B<0> si "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr "B<--quiet> est spécifiée"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr "B<1> si ni "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "B<--quiet> ni B<--debug> ne sont spécifiées"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr "B<2> si"
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr "B<--debug> est spécifiée"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -332,14 +337,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Ajouter un utilisateur système."
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -357,7 +362,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -371,7 +376,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -386,7 +391,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -401,14 +406,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Ajouter un groupe utilisateur."
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -420,7 +425,7 @@ msgstr ""
 # NOTE: is it really system GIDS?
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -433,20 +438,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "Le groupe est créé sans utilisateur."
 
 # type: SS
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Ajouter un groupe système."
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -456,7 +461,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -469,14 +474,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Ajouter un utilisateur existant à un groupe existant."
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -486,34 +491,34 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf> I<FICHIER>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Utilise I<FICHIER> plutôt que I</etc/adduser.conf>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -523,14 +528,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -541,36 +546,37 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
+#, fuzzy
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Par défaut, les utilisateurs et les groupes sont comparés à l'expression "
 "rationnelle configurable B<NAME_REGEX> indiquée dans le fichier de "
 "configuration. Cette option oblige B<adduser> et B<addgroup> à ne réaliser "
-"qu'une faible vérification du nom. B<NAME_REGEX> est décrite dans B<adduser."
-"conf>(5)."
+"qu'une faible vérification du nom."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos> I<GECOS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -580,14 +586,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid> I<ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -598,14 +604,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -619,27 +625,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Affiche un résumé des instructions."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home> I<REP>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -651,14 +657,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell> I<SHELL>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -668,14 +674,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup> I<GROUPE>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -689,27 +695,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Ne crée pas le répertoire personnel, même s'il n'existe pas."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr ""
 "Supprime les messages d'information, n'affiche que les avertissements et les "
@@ -717,41 +723,41 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr "Mode bavard, utile pour l'investigation d'un problème avec B<adduser>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Crée un utilisateur ou groupe système."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid> I<ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -762,14 +768,14 @@ msgstr ""
 # NOTE: ce serait mieux d'avoir exactement la même chaîne que dans deluser
 # type: TP
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid> I<ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -779,7 +785,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid> I<ID>"
@@ -787,7 +793,7 @@ msgstr "B<--lastuid> I<ID>"
 # NOTE: espaces
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -795,14 +801,14 @@ msgstr "Force la borne supérieure du do
 
 # type: TP
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Ajoute l'utilisateur aux groupes supplémentaires définis dans le fichier de "
@@ -810,27 +816,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Affiche la version et le copyright."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "VALEURS DE RETOUR"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
@@ -838,7 +844,7 @@ msgstr "B<0>"
 # NOTE: lourd
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -852,14 +858,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -874,7 +880,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -886,7 +892,7 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -894,38 +900,38 @@ msgstr "FICHIERS"
 # NOTE: manque format .I
 # type: Plain text
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "Fichier de configuration par défaut d'B<adduser>(8) et B<addgroup>(8)."
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr "/usr/local/sbin/adduser.local"
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr "Options personnelles supplémentaires."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -935,14 +941,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -954,7 +960,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -964,7 +970,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1275,12 +1281,14 @@ msgstr "B<NAME_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
 msgstr ""
 "Les noms des utilisateurs et de groupes sont comparés à cette expression "
 "rationnelle. Si le nom ne correspond pas à cette expression rationnelle, la "
@@ -1291,14 +1299,39 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+# type: Plain text
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
+msgstr ""
+"Les noms des utilisateurs et de groupes sont comparés à cette expression "
+"rationnelle. Si le nom ne correspond pas à cette expression rationnelle, la "
+"création de l'utilisateur ou du groupe est refusée par adduser, à moins que "
+"--force-badname ne soit utilisé. Avec l'option --force-badname, seules de "
+"très simples vérifications sont réalisées. La valeur par défaut est ^[a-z][-"
+"a-z0-9]*$."
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1313,14 +1346,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1332,14 +1365,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1350,14 +1383,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTES"
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<VÉRIFICATION DES NOMS>"
@@ -1365,7 +1398,7 @@ msgstr "B<VÉRIFICATION DES NOMS>"
 # NOTE: may no start => may not start
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1382,7 +1415,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1392,13 +1425,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1883,19 +1916,16 @@ msgstr ""
 # type: Plain text
 #. type: Plain text
 #: ../deluser.8:180
-#, fuzzy
-#| msgid ""
-#| "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "I</etc/deluser.conf> - Fichier de configuration de B<deluser>(8) et "
 "B<delgroup>(8)."
 
 #. type: TP
 #: ../deluser.8:180
-#, fuzzy, no-wrap
-#| msgid "I</usr/local/sbin/deluser.local>"
-msgid "/usr/local/sbin/deluser.local"
+#, no-wrap
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr "I</usr/local/sbin/deluser.local>"
 
 # type: Plain text
@@ -2135,6 +2165,206 @@ msgid "B<adduser.conf>(5), B<delgroup>(8
 msgstr "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 
 # type: Plain text
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [options] [--home REP] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUPE | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] utilisateur"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> copiera les fichiers de B<SKEL> (le squelette) dans le "
+#~ "répertoire personnel et demandera les informations du champ gecos "
+#~ "(utilisées par finger) et un mot de passe. Le champ gecos peut aussi être "
+#~ "donné par l'option B<--gecos>. Avec l'option B<--disabled-login>, le "
+#~ "compte est créé mais il est désactivé tant que le mot de passe n'est pas "
+#~ "configuré. L'option B<--disabled-password> ne configure pas le mot de "
+#~ "passe non plus, mais une connexion est toujours possible (par exemple par "
+#~ "SSH avec une clé RSA)."
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Par défaut, les utilisateurs et les groupes sont comparés à l'expression "
+#~ "rationnelle configurable B<NAME_REGEX> indiquée dans le fichier de "
+#~ "configuration. Cette option oblige B<adduser> et B<addgroup> à ne "
+#~ "réaliser qu'une faible vérification du nom. B<NAME_REGEX> est décrite "
+#~ "dans B<adduser.conf>(5)."
+
+# type: Plain text
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Les noms des utilisateurs et de groupes sont comparés à cette expression "
+#~ "rationnelle. Si le nom ne correspond pas à cette expression rationnelle, "
+#~ "la création de l'utilisateur ou du groupe est refusée par adduser, à "
+#~ "moins que --force-badname ne soit utilisé. Avec l'option --force-badname, "
+#~ "seules de très simples vérifications sont réalisées. La valeur par défaut "
+#~ "est ^[a-z][-a-z0-9]*$."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "I</etc/deluser.conf> - Fichier de configuration de B<deluser>(8) et "
+#~ "B<delgroup>(8)."
+
+#, fuzzy
+#~ msgid "/usr/local/sbin/deluser.local"
+#~ msgstr "I</usr/local/sbin/deluser.local>"
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Par défaut, chaque utilisateur d'un système Debian GNU/Linux se voit "
+#~ "attribuer un groupe avec son propre nom. Les groupes d'utilisateurs "
+#~ "facilitent la gestion des répertoires qui sont accessibles en écriture "
+#~ "pour un groupe : les utilisateurs appropriés sont placés dans le nouveau "
+#~ "groupe, le bit SGID du répertoire est positionné, et on s'assure que tous "
+#~ "les utilisateurs ont un masque de création de fichiers (« umask ») de "
+#~ "002. Si cette option est désactivée en configurant B<USERGROUPS> à I<no>, "
+#~ "tous les identifiants de groupe des utilisateurs seront B<USERS_GID>. Le "
+#~ "groupe primaire des utilisateurs peut aussi être forcé en ligne de "
+#~ "commande avec l'option B<--gid> ou B<--ingroup> respectivement pour "
+#~ "l'identifiant numérique et le nom du groupe. De plus, les utilisateurs "
+#~ "peuvent être ajoutés à un ou des groupes définis dans adduser.conf, soit "
+#~ "en positionnant ADD_EXTRA_GROUPS à 1 dans adduser.conf, soit en utilisant "
+#~ "l'option --add_extra_groups en ligne de commande."
+
+# type: TP
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0 si --quiet est spécifiée"
+
+# type: TP
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1 si ni --quiet ni --debug ne sont spécifiées"
+
+# type: TP
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2 si --debug est spécifiée"
+
+# type: Plain text
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(Ceci s'applique également à la variable DEBUG, mais DEBUG est "
+#~ "déconseillée et sera supprimée dans une version ultérieure d'adduser)."
+
+# type: Plain text
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Lorsqu'il est appelé avec un seul paramètre qui n'est pas une option et "
+#~ "avec l'option B<--system>, B<adduser> ajoute un utilisateur système. Si "
+#~ "un utilisateur ayant le même nom existe déjà et possède un identifiant "
+#~ "dans l'intervalle affecté au système (ou, quand l'identifiant est "
+#~ "spécifié, si l'utilisateur avec cet identifiant existe déjà), B<adduser> "
+#~ "quittera avec un message d'avertissement. Ce message d'avertissement peut "
+#~ "être supprimé avec l'option B<--quiet>."
+
+# type: Plain text
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "Un répertoire personnel est créé avec les mêmes règles que pour les "
+#~ "utilisateurs normaux. Le nouvel utilisateur système aura I</bin/false> "
+#~ "comme interpréteur de commandes (à moins qu'un autre interpréteur soit "
+#~ "fourni avec l'option B<--shell>), et aura un compte désactivé. Les "
+#~ "fichiers du squelette ne sont pas copiés."
+
+# type: Plain text
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Ajoute le nouvel utilisateur au I<GROUPE> plutôt qu'à un groupe "
+#~ "utilisateur ou qu'au groupe par défaut défini par B<USERS_GID> dans le "
+#~ "fichier de configuration. Cette option concerne le groupe primaire des "
+#~ "utilisateurs. Pour ajouter des groupes supplémentaires, consultez "
+#~ "l'option B<add_extra_groups>."
+
+# type: Plain text
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "B<adduser.conf>(5), B<deluser>(8), B<useradd>(8), B<groupadd>(8), "
+#~ "B<usermod>(8), Charte Debian 9.2.2."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "Définit l'intervalle fermé des UID pour les utilisateurs réguliers "
+#~ "attribués dynamiquement. La valeur par défaut est I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "Définit l'intervalle fermé des GID pour les groupes normaux attribués "
+#~ "dynamiquement. La valeur par défaut est I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "La liste des groupes auxquels seront ajoutés les utilisateurs non-"
+#~ "système. Par défaut, la liste est « dialout cdrom floppy audio video "
+#~ "plugdev users games »."
+
+# type: Plain text
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
+# type: Plain text
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "I</etc/deluser.conf>"
 
@@ -2143,6 +2373,28 @@ msgstr "B<adduser.conf>(5), B<delgroup>(
 #~ msgstr "B<deluser.conf>(5), B<adduser>(8), B<userdel>(8), B<groupdel>(8)"
 
 # type: Plain text
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "B<deluser>(8) et B<delgroup>(8) lisent aussi /etc/adduser.conf, consultez "
+#~ "B<adduser.conf>(8); les paramètres de deluser.conf peuvent surcharger des "
+#~ "paramètres de adduser.conf."
+
+# type: Plain text
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Ne supprime un groupe que s'il n'y a plus aucun utilisateur appartenant à "
+#~ "ce groupe. La valeur par défaut est 0."
+
+# type: Plain text
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "B<deluser>(8), B<delgroup>(8), B<adduser.conf>(5)"
+
+# type: Plain text
 #, fuzzy
 #~| msgid "B<addgroup> [options] [--gid ID] group"
 #~ msgid "B<adduser> --group [options] [--gid ID] group"
diff -pruN 3.118/doc/po4a/po/it.po 3.118ubuntu5/doc/po4a/po/it.po
--- 3.118/doc/po4a/po/it.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/it.po	2020-04-16 14:12:53.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 19:22+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -60,10 +60,12 @@ msgstr "SINTASSI"
 # type: Plain text
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [opzioni] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPPO | --gid ID] [--disabled-"
@@ -231,14 +233,17 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> copia i file da B<SKEL> nella directory home e richiede le "
 "informazioni per finger (gecos) e la password. Il valore per il campo gecos "
@@ -250,7 +255,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -262,13 +267,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "nomeutente, uid, gid e directory-home"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr ""
@@ -276,44 +281,44 @@ msgstr ""
 "seguenti regole:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr "0 se "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr "è stata usata l'opzione B<--quiet>"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr "1 se "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "non sono state usate le opzioni B<--quiet> e B<--debug>"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr "2 se "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr "è stata usata l'opzione B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -323,14 +328,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Aggiunta di un utente di sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -346,7 +351,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -360,7 +365,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -374,7 +379,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -388,14 +393,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Aggiunta di un gruppo"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -406,7 +411,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -418,20 +423,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "Il gruppo viene creato senza alcun utente al suo interno."
 
 # type: SS
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Aggiunta di un gruppo di sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -441,7 +446,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -453,14 +458,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Aggiunta di un utente esistente a un gruppo esistente"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -470,34 +475,34 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPZIONI"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf FILE>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Usa FILE al posto di I</etc/adduser.conf>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -507,14 +512,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -524,36 +529,37 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
+#, fuzzy
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "I nomi di utenti e gruppi sono controllati usando l'espressione regolare "
 "configurabile B<NAME_REGEX> specificata nel file di configurazione. Questa "
 "opzione obbliga B<adduser> e B<addgroup> ad applicare un controllo più "
-"debole sulla validità del nome. L'uso di B<NAME_REGEX> è descritto in "
-"B<adduser.conf>(5)."
+"debole sulla validità del nome."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -563,14 +569,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -581,14 +587,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -602,27 +608,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Mostra le informazioni sull'uso del programma."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home DIR>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -634,14 +640,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell SHELL>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -651,14 +657,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GRUPPO>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -671,40 +677,40 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Non crea la directory home, anche se non esiste."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr "Nasconde i messaggi informativi, mostra solo avvertimenti ed errori."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
@@ -713,27 +719,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Crea un utente o un gruppo di sistema."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -743,14 +749,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -761,14 +767,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -778,14 +784,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Inserisce il nuovo utente ai gruppi aggiuntivi definiti nel file di "
@@ -793,34 +799,34 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Visualizza le informazioni su versione e copyright del programma."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "VALORI DI USCITA"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -834,14 +840,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -855,7 +861,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -867,45 +873,45 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "FILE"
 
 # type: Plain text
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "File di configurazione predefinito per adduser e addgroup"
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr "/usr/local/sbin/adduser.local"
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr "Componenti aggiuntivi opzionali e personalizzati"
 
 # type: SH
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEDERE ANCHE"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -915,14 +921,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -933,7 +939,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -943,7 +949,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1258,12 +1264,14 @@ msgstr "B<NAME_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
 msgstr ""
 "I nomi di utenti e gruppi sono controllati usando questa espressione "
 "regolare. La creazione dell'utente e del gruppo viene rifiutata se il nome "
@@ -1274,14 +1282,39 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+# type: Plain text
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
+msgstr ""
+"I nomi di utenti e gruppi sono controllati usando questa espressione "
+"regolare. La creazione dell'utente e del gruppo viene rifiutata se il nome "
+"non soddisfa questa espressione regolare, a meno che non sia attivata "
+"l'opzione --force-badname; in questo caso viene effettuato un controllo più "
+"debole. Il valore predefinito, scelto con molta prudenza, è ^[a-z][-a-z0-9]*"
+"$."
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1295,14 +1328,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1313,14 +1346,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1331,21 +1364,21 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTE"
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<VALID NAMES>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1362,7 +1395,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1372,13 +1405,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1853,19 +1886,16 @@ msgstr ""
 # type: Plain text
 #. type: Plain text
 #: ../deluser.8:180
-#, fuzzy
-#| msgid ""
-#| "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "I</etc/deluser.conf> File di configurazione predefinito per deluser e "
 "delgroup."
 
 #. type: TP
 #: ../deluser.8:180
-#, fuzzy, no-wrap
-#| msgid "I</usr/local/sbin/deluser.local>"
-msgid "/usr/local/sbin/deluser.local"
+#, no-wrap
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr "I</usr/local/sbin/deluser.local>"
 
 # type: Plain text
@@ -2104,6 +2134,205 @@ msgid "B<adduser.conf>(5), B<delgroup>(8
 msgstr "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 
 # type: Plain text
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [opzioni] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPPO | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] utente"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> copia i file da B<SKEL> nella directory home e richiede le "
+#~ "informazioni per finger (gecos) e la password. Il valore per il campo "
+#~ "gecos può essere inserito anche usando l'opzione B<--gecos>. Con "
+#~ "l'opzione B<--disabled-login> l'account viene creato ma non è possibile "
+#~ "accedere fino a quando non viene impostata una password. Con l'opzione "
+#~ "B<--disabled-password> non viene impostata la password, è comunque "
+#~ "possibile accedere al sistema (per esempio tramite SSH con chiavi RSA)."
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "I nomi di utenti e gruppi sono controllati usando l'espressione regolare "
+#~ "configurabile B<NAME_REGEX> specificata nel file di configurazione. "
+#~ "Questa opzione obbliga B<adduser> e B<addgroup> ad applicare un controllo "
+#~ "più debole sulla validità del nome. L'uso di B<NAME_REGEX> è descritto in "
+#~ "B<adduser.conf>(5)."
+
+# type: Plain text
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "I nomi di utenti e gruppi sono controllati usando questa espressione "
+#~ "regolare. La creazione dell'utente e del gruppo viene rifiutata se il "
+#~ "nome non soddisfa questa espressione regolare, a meno che non sia "
+#~ "attivata l'opzione --force-badname; in questo caso viene effettuato un "
+#~ "controllo più debole. Il valore predefinito, scelto con molta prudenza, è "
+#~ "^[a-z][-a-z0-9]*$."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "I</etc/deluser.conf> File di configurazione predefinito per deluser e "
+#~ "delgroup."
+
+#, fuzzy
+#~ msgid "/usr/local/sbin/deluser.local"
+#~ msgstr "I</usr/local/sbin/deluser.local>"
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Normalmente su Debian GNU/Linux a ciascun utente viene assegnato un "
+#~ "gruppo con lo stesso nome. B<USERGROUPS> permette di gestire facilmente "
+#~ "le directory su cui il gruppo ha il permesso di scrittura, infatti "
+#~ "inserisce gli utenti nel nuovo gruppo, attiva il bit set-group-ID sulla "
+#~ "directory e assicura che tutti gli utenti abbiano la umask a 002. Se "
+#~ "questa opzione è disattivata, cioè il valore di B<USERGROUPS> è I<no>, il "
+#~ "valore del GID per tutti i nuovi utenti è B<USERS_GID>. I gruppi primari "
+#~ "degli utenti possono anche essere cambiati dalla riga di comando con le "
+#~ "opzioni B<--gid> o B<--ingroup> che permettono di impostare "
+#~ "rispettivamente l'ID oppure il nome del gruppo. Inoltre gli utenti "
+#~ "possono essere aggiunti a uno o più gruppi definiti in adduser.conf, "
+#~ "impostando ADD_EXTRA_GROUPS a 1 in adduser.conf oppure usando --"
+#~ "add_extra_groups sulla riga di comando."
+
+# type: TP
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0 se è stata usata l'opzione --quiet"
+
+# type: TP
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1 se non sono state usate le opzioni --quiet e --debug"
+
+# type: TP
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2 se è stata usata l'opzione --debug"
+
+# type: Plain text
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(Le stesse regole si applicano alla variabile DEBUG, però l'uso di DEBUG "
+#~ "è deprecato e sarà rimosso nelle prossime versioni di adduser)."
+
+# type: Plain text
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Se eseguito con un solo argomento e con l'opzione B<--system>, B<adduser> "
+#~ "aggiunge un utente di sistema. Se già esiste un utente con lo stesso nome "
+#~ "nell'intervallo degli UID di sistema (oppure, se è specificato lo UID, se "
+#~ "già esiste un utente con lo stesso UID), adduser esce mostrando un "
+#~ "messaggio d'avviso. È possibile non ricevere l'avviso aggiungendo \"--"
+#~ "quiet\"."
+
+# type: Plain text
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "La directory home è creata secondo le stesse regole degli utenti normali. "
+#~ "Il nuovo utente di sistema ha come shell I</bin/false> (a meno che non "
+#~ "sia specificato un valore diverso usando l'opzione B<--shell>) e non può "
+#~ "eseguire il login. Lo scheletro dei file di configurazione non viene "
+#~ "copiato."
+
+# type: Plain text
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Il nuovo utente viene aggiunto al gruppo GRUPPO anziché al gruppo user o "
+#~ "al gruppo predefinito dato dal valore di USERS_GID nel file di "
+#~ "configurazione. Questo influenza il gruppo primario degli utenti. Per "
+#~ "aggiungere l'utente ad altri gruppi, consultare l'opzione "
+#~ "B<add_extra_groups>."
+
+# type: Plain text
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "specifica l'intervallo (estremi compresi) in cui possono essere allocati "
+#~ "dinamicamente gli UID degli utenti normali. Il valore predefinito è "
+#~ "I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "specifica l'intervallo (estremi compresi) in cui possono essere allocati "
+#~ "dinamicamente i GID dei gruppi normali. Il valore predefinito è I<1000> - "
+#~ "I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Elenco dei gruppi a cui vengono aggiunti gli utenti normali al momento "
+#~ "della loro creazione. Il valore predefinito è \"dialout cdrom floppy "
+#~ "audio video plugdev users games\"."
+
+# type: Plain text
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
+# type: Plain text
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
@@ -2112,6 +2341,28 @@ msgstr "B<adduser.conf>(5), B<delgroup>(
 #~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 
 # type: Plain text
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "deluser(8) e delgroup(8) leggono anche /etc/adduser.conf, si veda adduser."
+#~ "conf(8); le impostazioni in deluser.conf possono prevalere sulle "
+#~ "impostazioni in adduser.conf."
+
+# type: Plain text
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Rimuove un gruppo solo se non ci sono utenti che appartengono a questo "
+#~ "gruppo. Il valore predefinito è 0."
+
+# type: Plain text
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
+
+# type: Plain text
 #~ msgid "B<adduser> --group [options] [--gid ID] group"
 #~ msgstr "B<adduser> --group [opzioni] [--gid ID] gruppo"
 
diff -pruN 3.118/doc/po4a/po/pl.po 3.118ubuntu5/doc/po4a/po/pl.po
--- 3.118/doc/po4a/po/pl.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/pl.po	2020-04-16 14:12:53.000000000 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.112+nmu2\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 19:19+0200\n"
 "Last-Translator: Łukasz Dulny <BartekChom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -53,12 +53,15 @@ msgstr "adduser, addgroup - dodaje użyt
 msgid "SYNOPSIS"
 msgstr "SKŁADNIA"
 
+# type: Plain text
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [opcje] [--home KATALOG] [--shell PROWŁOKA] [--no-create-home] [--"
 "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPA | --gid ID] [--"
@@ -213,15 +216,19 @@ msgstr ""
 "powoduje, że jakikolwiek plik utworzony w tym katalogu będzie miał "
 "przydzieloną właściwą grupę."
 
+# type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> skopiuje pliki z katalogu B<SKEL> do katalogu domowego "
 "użytkownika, poprosi o dane użytkownika (GECOS) oraz o hasło. Dane "
@@ -232,7 +239,7 @@ msgstr ""
 "będzie możliwy (na przykład przez użycie programu SSH z kluczami RSA)."
 
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -244,51 +251,51 @@ msgstr ""
 "następujące:"
 
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "nazwa-użytkownika uid gid katalog-domowy"
 
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr "Zmienna środowiskowa VERBOSE jest ustawiana na:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr "0 jeśli "
 
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr "podano opcję B<--quiet>"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr "1 jeśli nie "
 
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "podano żadnej z opcji B<--quiet> i B<--debug>"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr "2 jeśli "
 
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr "podano opcję B<--debug>"
 
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -297,13 +304,13 @@ msgstr ""
 "zostanie usunięta w którejś z przyszłych wersji programu B<adduser>.)"
 
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Dodawanie użytkowników systemowych"
 
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -320,7 +327,7 @@ msgstr ""
 "opcji B<--quiet>."
 
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -333,7 +340,7 @@ msgstr ""
 "uid>."
 
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -347,7 +354,7 @@ msgstr ""
 "B<--group>."
 
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -360,13 +367,13 @@ msgstr ""
 "hasło. Pliki z katalogu B<SKEL> nie zostaną skopiowane."
 
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Dodawanie zwykłych grup"
 
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -377,7 +384,7 @@ msgstr ""
 "użytkowników."
 
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -388,19 +395,19 @@ msgstr ""
 "jednakże może zostać nadpisany opcją B<--gid>."
 
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr ""
 "Utworzenie grupy nie powoduje przypisania do niej żadnych użytkowników."
 
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Dodawanie grup systemowych"
 
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -409,7 +416,7 @@ msgstr ""
 "utworzona nowa grupa systemowa."
 
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -421,13 +428,13 @@ msgstr ""
 "B<--gid>."
 
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Przydzielanie istniejącego użytkownika do istniejącej grupy"
 
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -436,30 +443,30 @@ msgstr ""
 "istniejącego użytkownika do istniejącej grupy."
 
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPCJE"
 
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf PLIK>"
 
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Użyje pliku PLIK zamiast I</etc/adduser.conf>."
 
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -468,13 +475,13 @@ msgstr ""
 "mógł używać swojego konta, dopóki hasło nie zostanie nadane."
 
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -484,32 +491,35 @@ msgstr ""
 "hasła."
 
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
+# type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
+#, fuzzy
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Domyślnie nazwy użytkowników i grup są walidowane względem konfigurowalnego "
 "wyrażenia regularnego B<NAME_REGEX> podanego w pliki konfiguracyjnym. Użycie "
 "tej opcji spowoduje, że B<adduser> i B<addgroup> będą mniej restrykcyjne w "
-"odniesieniu do tych nazw. B<NAME_REGEX> jest opisane w B<adduser.conf>(5)."
+"odniesieniu do tych nazw."
 
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -518,13 +528,13 @@ msgstr ""
 "jest użyta, to B<adduser> nie będzie prosił o podanie tych informacji."
 
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -534,13 +544,13 @@ msgstr ""
 "użytkownika w zadanej grupie."
 
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -554,24 +564,24 @@ msgstr ""
 "jako B<addgroup>."
 
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Wyświetla krótką instrukcję używania programu."
 
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home KATALOG>"
 
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -583,13 +593,13 @@ msgstr ""
 "I<SKEL>."
 
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell POWŁOKA>"
 
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -598,13 +608,13 @@ msgstr ""
 "wartość określoną w pliku konfiguracyjnym."
 
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GRUPA>"
 
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -616,35 +626,35 @@ msgstr ""
 "zobaczyć opis opcji B<add_extra_groups>."
 
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Nie tworzy katalogu domowego, nawet jeżeli on nie istnieje."
 
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr "Pomija informacje, pokazuje tylko ostrzeżenia i błędy."
 
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
@@ -652,24 +662,24 @@ msgstr ""
 "adduser."
 
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Tworzy użytkownika systemowego lub grupę systemową."
 
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -678,13 +688,13 @@ msgstr ""
 "zakończy się błędem, jeżeli taki identyfikator jest już zajęty."
 
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -693,13 +703,13 @@ msgstr ""
 "(nadpisuje B<FIRST_UID> podany w pliku konfiguracyjnym)."
 
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -708,43 +718,43 @@ msgstr ""
 "(B<LAST_UID>)."
 
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Dodaje nowego użytkownika do grup dodatkowych zdefiniowanych w pliku "
 "konfiguracyjnym."
 
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Wyświetla informację o wersji i prawach autorskich."
 
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "WARTOŚCI ZWRACANE"
 
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -757,13 +767,13 @@ msgstr ""
 "zwróci 0."
 
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -777,7 +787,7 @@ msgstr ""
 "został zabity sygnałem."
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -788,41 +798,41 @@ msgstr ""
 "quiet>, aby adduser wypisał więcej informacji."
 
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "PLIKI"
 
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "Domyślny plik konfiguracyjny programów adduser i addgroup."
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr "/usr/local/sbin/adduser.local"
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr "Opcjonalne dodatki."
 
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAKŻE"
 
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -831,13 +841,13 @@ msgstr ""
 "B<usermod>(8), punkt 9.2.2 dokumentu Debian Policy."
 
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "PRAWA AUTORSKIE"
 
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -848,7 +858,7 @@ msgstr ""
 "Stephena Grana."
 
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -857,7 +867,7 @@ msgstr ""
 "B<adduser> z Debiana."
 
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1136,28 +1146,53 @@ msgstr ""
 msgid "B<NAME_REGEX>"
 msgstr "B<NAME_REGEX>"
 
+# type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
+msgstr ""
+"Nazwy użytkowników są sprawdzane tym wyrażeniem regularnym. Jeżeli nazwa nie "
+"pasuje do wyrażenia, użytkownik nie zostanie utworzony, chyba że podano --"
+"force-badname. Jeżeli podano --force-badname, to są dokonywane tylko bardzo "
+"podstawowe sprawdzenia. Wartością domyślną jest skromne ^[a-z][-a-z0-9]*$."
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+# type: Plain text
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
 msgstr ""
 "Nazwy użytkowników są sprawdzane tym wyrażeniem regularnym. Jeżeli nazwa nie "
-"pasuje do wyrażenia, użytkownik lub grupa nie zostaną utworzony, chyba że "
-"podano --force-badname. Jeżeli podano --force-badname, to są dokonywane "
-"tylko bardzo podstawowe sprawdzenia. Wartością domyślną jest ^[a-z][-a-z0-9]*"
-"$."
+"pasuje do wyrażenia, użytkownik nie zostanie utworzony, chyba że podano --"
+"force-badname. Jeżeli podano --force-badname, to są dokonywane tylko bardzo "
+"podstawowe sprawdzenia. Wartością domyślną jest skromne ^[a-z][-a-z0-9]*$."
 
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1170,13 +1205,13 @@ msgstr ""
 "dist))."
 
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1187,13 +1222,13 @@ msgstr ""
 "grup zdefiniowanych w EXTRA_GROUPS (patrz niżej)."
 
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1203,19 +1238,19 @@ msgstr ""
 "plugdev users games\"."
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "UWAGI"
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<POPRAWNE NAZWY>"
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1230,7 +1265,7 @@ msgstr ""
 "zgodności z Sambą, nazwy użytkowników mogą kończyć się znakiem \"$\"."
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1239,12 +1274,12 @@ msgstr ""
 "za pomocą parametru konfiguracji NAME_REGEX."
 
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1665,19 +1700,16 @@ msgstr ""
 
 #. type: Plain text
 #: ../deluser.8:180
-#, fuzzy
-#| msgid ""
-#| "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "I</etc/deluser.conf> Domyślny plik konfiguracyjny programów deluser and "
 "delgroup"
 
 #. type: TP
 #: ../deluser.8:180
-#, fuzzy, no-wrap
-#| msgid "I</usr/local/sbin/deluser.local>"
-msgid "/usr/local/sbin/deluser.local"
+#, no-wrap
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr "I</usr/local/sbin/deluser.local>"
 
 #. type: Plain text
@@ -1892,8 +1924,208 @@ msgstr "I</etc/deluser.conf>"
 msgid "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 msgstr "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [opcje] [--home KATALOG] [--shell PROWŁOKA] [--no-create-home] "
+#~ "[--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPA | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] użytkownik"
+
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> skopiuje pliki z katalogu B<SKEL> do katalogu domowego "
+#~ "użytkownika, poprosi o dane użytkownika (GECOS) oraz o hasło. Dane "
+#~ "użytkownika mogą być także ustawione opcją B<--gecos>. Podanie opcji B<--"
+#~ "disabled-login> spowoduje utworzenie konta użytkownika, które będzie "
+#~ "niedostępne (zablokowane), dopóki nie zostanie ustawione hasło. Opcja B<--"
+#~ "disabled-password> nie ustawi hasła, ale dostęp użytkownika do systemu "
+#~ "będzie możliwy (na przykład przez użycie programu SSH z kluczami RSA)."
+
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Domyślnie nazwy użytkowników i grup są walidowane względem "
+#~ "konfigurowalnego wyrażenia regularnego B<NAME_REGEX> podanego w pliki "
+#~ "konfiguracyjnym. Użycie tej opcji spowoduje, że B<adduser> i B<addgroup> "
+#~ "będą mniej restrykcyjne w odniesieniu do tych nazw. B<NAME_REGEX> jest "
+#~ "opisane w B<adduser.conf>(5)."
+
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Nazwy użytkowników są sprawdzane tym wyrażeniem regularnym. Jeżeli nazwa "
+#~ "nie pasuje do wyrażenia, użytkownik lub grupa nie zostaną utworzony, "
+#~ "chyba że podano --force-badname. Jeżeli podano --force-badname, to są "
+#~ "dokonywane tylko bardzo podstawowe sprawdzenia. Wartością domyślną jest "
+#~ "^[a-z][-a-z0-9]*$."
+
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "I</etc/deluser.conf> Domyślny plik konfiguracyjny programów deluser and "
+#~ "delgroup"
+
+#, fuzzy
+#~ msgid "/usr/local/sbin/deluser.local"
+#~ msgstr "I</usr/local/sbin/deluser.local>"
+
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Domyślnie każdemu użytkownikowi w systemie Debian GNU/Linux zostaje "
+#~ "przypisana grupa mająca tę samą nazwę i identyfikator, co użytkownik. "
+#~ "Umieszczanie każdego użytkownika w grupie o tej samej nazwie pozwala na "
+#~ "łatwe zarządzanie katalogami dostępnymi do zapisu dla grupy poprzez "
+#~ "dodanie odpowiednich użytkowników do nowej grupy, ustawienie flagi set-"
+#~ "group-ID na katalogu i ustawienie każdemu użytkownikowi wartości umask "
+#~ "równej 002. Jeżeli ta opcja zostanie wyłączona przez ustawienie "
+#~ "B<USERGROUPS> na I<no>, wszyscy nowo tworzeni użytkownicy będą mieli "
+#~ "identyfikator grupy ustawiony na B<USERS_GID>. Podstawowe grupy "
+#~ "użytkowników mogą zostać również nadpisane przez podanie w linii poleceń "
+#~ "opcji B<--gid> lub B<--ingroup>, które ustawiają grupę przez podanie, "
+#~ "odpowiednio, jej id lub nazwy. Ponadto użytkowników można dodać do jednej "
+#~ "lub większej liczby grup zdefiniowanych w adduser.conf albo przez "
+#~ "ustawienie ADD_EXTRA_GROUPS na 1 w adduser.conf, albo przez podanie opcji "
+#~ "linii poleceń --add_extra_groups."
+
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0, jeśli podano opcję --quiet"
+
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1, jeśli nie podano żadnej z opcji --quiet i --debug"
+
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2, jeśli podano opcję --debug"
+
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(To samo dotyczy zmiennej DEBUG, jednak ta zmienna jest przestarzała i "
+#~ "zostanie usunięta w którejś z przyszłych wesji programu adduser)."
+
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "B<adduser>, gdy zostanie uruchomiony z jednym argumentem, nie będącym "
+#~ "opcją, oraz z opcją B<--system>, doda użytkownika systemowego. Jeżeli "
+#~ "taki użytkownik z identyfikatorem użytkownika (uid) mieszczącym się w "
+#~ "zakresie identyfikatorów użytkowników systemowych (lub jeżeli uid jest "
+#~ "podany w linii poleceń, to z tym identyfikatorem) już istnieje, adduser "
+#~ "wyświetli ostrzeżenie i zakończy działanie. Ostrzeżenie to można "
+#~ "wyłączyć, używając opcji \"--quiet\""
+
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "Katalog domowy jest tworzony zgodnie z tymi samymi zasadami, co dla "
+#~ "zwykłych użytkowników. Nowy użytkownik systemowy będzie miał powłokę I</"
+#~ "bin/false> (chyba że zostanie to nadpisane opcją B<--shell>) oraz "
+#~ "wyłączone hasło. Pliki z katalogu B<SKEL> nie zostaną skopiowane."
+
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Umieszcza nowego użytkownika w grupie GRUPA, zamiast w grupie określonej "
+#~ "przez opcję B<USERS_GID> w pliku adduser.conf. Dotyczy to tylko "
+#~ "podstawowej grupy użytkownika. Aby dodać użytkownika do dodatkowych grup, "
+#~ "prosimy zobaczyć opis opcji B<add_extra_groups>."
+
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), punkt "
+#~ "9.2.2 dokumentu Debian Policy."
+
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "Określają domknięty zakres identyfikatorów UID, w którym będą "
+#~ "przydzielane identyfikatory zwykłych użytkowników. Wartość domyślna to "
+#~ "I<1000> - I<29999>."
+
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "Określają domknięty zakres identyfikatorów GID, w którym będą "
+#~ "przydzielane identyfikatory zwykłych grup. Wartość domyślna to I<1000> - "
+#~ "I<29999>."
+
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Lista grup, do których będą dodawanie nowo tworzeni użytkownicy "
+#~ "niesystemowi. Domyślną wartością jest \"dialout cdrom floppy audio video "
+#~ "plugdev users games\"."
+
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
 #~ msgid "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 #~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
+
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "deluser(8) and delgroup(8) czytają także plik /etc/adduser.conf, patrz "
+#~ "adduser.conf(8); ustawienia w pliku deluser.conf mogą nadpisywać "
+#~ "ustawienia z pliku adduser.conf."
+
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Usuwa grupę, tylko wtedy gdy nie należy do niej żaden użytkownik. "
+#~ "Wartością domyślną jest 0."
+
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
diff -pruN 3.118/doc/po4a/po/pt_BR.po 3.118ubuntu5/doc/po4a/po/pt_BR.po
--- 3.118/doc/po4a/po/pt_BR.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/pt_BR.po	2020-04-16 14:12:53.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.113+nmu3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 18:31+0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -62,15 +62,11 @@ msgstr "SINOPSE"
 #. type: Plain text
 #: ../adduser.8:14
 #, fuzzy
-#| msgid ""
-#| "B<adduser> [options] [--home DIR] [--shell|-s SHELL] [--no-create-home] "
-#| "[--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
-#| "disabled-password] [--disabled-login] [--gecos GECOS] [--"
-#| "add_extra_groups] user"
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [opções] [--home DIR] [--shell|-s SHELL] [--no-create-home] [--"
 "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPO | --gid ID] [--"
@@ -195,18 +191,6 @@ msgstr ""
 #. type: Plain text
 #: ../adduser.8:74
 #, fuzzy
-#| msgid ""
-#| "By default, each user in Debian GNU/Linux is given a corresponding group "
-#| "with the same name.  Usergroups allow group writable directories to be "
-#| "easily maintained by placing the appropriate users in the new group, "
-#| "setting the set-group-ID bit in the directory, and ensuring that all "
-#| "users use a umask of 002.  If this option is turned off by setting "
-#| "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
-#| "groups can also be overridden from the command line with the B<--gid> or "
-#| "B<--ingroup> options to set the group by id or name, respectively.  Also, "
-#| "users can be added to one or more groups defined in adduser.conf either "
-#| "by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or by passing --"
-#| "add_extra_groups on the commandline."
 msgid ""
 "By default, each user in Debian GNU/Linux is given a corresponding group "
 "with the same name.  Usergroups allow group writable directories to be "
@@ -252,14 +236,17 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> irá copiar arquivos do B<SKEL> para o diretório \"home\" e "
 "perguntar informações para o finger (gecos) e uma senha. O gecos também pode "
@@ -270,7 +257,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -282,67 +269,61 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "nome-do-usuário uid gid diretório-home"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr ""
 "A variável de ambiente VERBOSE é definida de acordo com a seguinte regra:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr ""
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, fuzzy
-#| msgid "0 if --quiet is specified"
 msgid "B<--quiet> is specified"
 msgstr "0 se --quiet for especificado"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr ""
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, fuzzy
-#| msgid "1 if neither --quiet nor --debug is specified"
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "1 se nem --quiet or --debug for especificado"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr ""
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 #, fuzzy
-#| msgid "2 if --debug is specified"
 msgid "B<--debug> is specified"
 msgstr "2 se --debug for especificado"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 #, fuzzy
-#| msgid ""
-#| "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
-#| "be removed in a later version of adduser.)"
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -352,20 +333,15 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Adicionar um usuário de sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 #, fuzzy
-#| msgid ""
-#| "If called with one non-option argument and the B<--system> option, "
-#| "B<adduser> will add a system user. If a user with the same name already "
-#| "exists in the system uid range (or, if the uid is specified, if a user "
-#| "with that uid already exists), adduser will exit with a warning."
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -380,12 +356,8 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 #, fuzzy
-#| msgid ""
-#| "B<adduser> will choose the first available UID from the range specified "
-#| "for system users in the configuration file.  The UID can be overridden "
-#| "with the B<--uid> option."
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -398,7 +370,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -412,7 +384,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -426,14 +398,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Adicionar um grupo de usuários"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -444,11 +416,8 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 #, fuzzy
-#| msgid ""
-#| "A GID will be chosen from the range specified for system GIDS in the "
-#| "configuration file.  The GID can be overridden with the B<--gid> option."
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -460,20 +429,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "O grupo é criado sem nenhum usuário."
 
 # type: SS
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Adicionar um grupo de sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -483,11 +452,8 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 #, fuzzy
-#| msgid ""
-#| "A GID will be chosen from the range specified for system GIDS in the "
-#| "configuration file.  The GID can be overridden with the B<--gid> option."
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -499,14 +465,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Adicionar um usuário existente a um grupo existente"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -516,34 +482,34 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPÇÕES"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf ARQUIVO>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Use ARQUIVO em vez de I</etc/adduser.conf>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -553,14 +519,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -570,24 +536,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, fuzzy
-#| msgid ""
-#| "By default, user and group names are checked against a configurable "
-#| "regular expression. This option forces B<adduser> and B<addgroup> to "
-#| "apply only a weak check for validity of the name."
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Por padrão, nomes de usuário e grupo são verificados contra uma expressão "
 "regular configurável. Esta opção força B<adduser> e B<addgroup> a aplicar "
@@ -595,18 +558,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, fuzzy
-#| msgid ""
-#| "Set the gecos field for the new entry generated.  adduser will not ask "
-#| "for finger information if this option is given."
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -616,14 +576,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -634,14 +594,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -655,27 +615,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Mostra informações de uso."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home DIR>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -687,14 +647,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell SHELL>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -704,18 +664,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GRUOP>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, fuzzy
-#| msgid ""
-#| "Add the new user to GROUP instead of a usergroup or the default group "
-#| "defined by USERS_GID in the adduser.conf file."
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -726,40 +683,40 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Não cria o diretório home, mesmo se ele não existir."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr "Suprime mensagens de informação, exibe apenas avisos e erros."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
@@ -767,33 +724,29 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, fuzzy
-#| msgid "Create a system user."
 msgid "Create a system user or group."
 msgstr "Cria um usuário de sistema."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, fuzzy
-#| msgid ""
-#| "Force the new userid to be the given number.  adduser will fail if the "
-#| "userid is already taken."
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -803,16 +756,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, fuzzy
-#| msgid "Override the first uid in the range that the uid is chosen from."
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -820,16 +772,15 @@ msgstr "Sobrescreve o primeiro uid do in
 
 # type: TP
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, fuzzy
-#| msgid "Override the last uid in the range that the uid is chosen from."
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -837,49 +788,47 @@ msgstr "Sobrescreve o último uid do int
 
 # type: TP
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 #, fuzzy
-#| msgid "Add new user to extra groups defined in adduser.conf"
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr "Adiciona um novo usuário a grupos extra definidos em adduser.conf"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Mostra a versão e informações de copyright."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, fuzzy, no-wrap
-#| msgid "RETURN VALUE"
 msgid "EXIT VALUES"
 msgstr "VALOR DE RETORNO"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -889,13 +838,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -904,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -913,55 +862,49 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "ARQUIVOS"
 
 # type: Plain text
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, fuzzy
-#| msgid ""
-#| "/etc/adduser.conf - configuration file for B<adduser(8)> and "
-#| "B<addgroup(8)>."
 msgid "Default configuration file for adduser and addgroup"
 msgstr ""
 "/etc/adduser.conf - arquivo de configuração para B<adduser(8)> e "
 "B<addgroup(8)>."
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 #, fuzzy
-#| msgid ""
-#| "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
-#| "Policy 9.2.2."
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -971,18 +914,15 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 #, fuzzy
-#| msgid ""
-#| "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
-#| "Bauerschmidt and Marc Haber."
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -993,7 +933,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -1003,7 +943,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1033,13 +973,6 @@ msgstr ""
 #. type: Plain text
 #: ../adduser.conf.5:28
 #, fuzzy
-#| msgid ""
-#| "The file I</etc/adduser.conf> contains defaults for the programs "
-#| "B<adduser(8)> , B<addgroup(8)> , B<deluser(8)> and B<delgroup(8)>.  Each "
-#| "line holds a single value pair in the form I<option> = I<value>.  Double "
-#| "or single quotes are allowed around the value, as is whitespace around "
-#| "the equals sign.  Comment lines must have a hash sign (#) in the first "
-#| "line."
 msgid ""
 "The file I</etc/adduser.conf> contains defaults for the programs "
 "B<adduser(8)> , B<addgroup(8)> , B<deluser(8)> and B<delgroup(8)>.  Each "
@@ -1187,7 +1120,6 @@ msgstr ""
 #. type: TP
 #: ../adduser.conf.5:74
 #, fuzzy, no-wrap
-#| msgid "B<FIRST_SYSTEM_UID> and B<LAST_SYSTEM_UID>"
 msgid "B<FIRST_SYSTEM_GID> and B<LAST_SYSTEM_GID>"
 msgstr "B<FIRST_SYSTEM_UID> e B<LAST_SYSTEM_UID>"
 
@@ -1195,9 +1127,6 @@ msgstr "B<FIRST_SYSTEM_UID> e B<LAST_SYS
 #. type: Plain text
 #: ../adduser.conf.5:79
 #, fuzzy
-#| msgid ""
-#| "specify an inclusive range of UIDs from which normal user's UIDs can be "
-#| "dynamically allocated. Default to I<1000> - I<59999>."
 msgid ""
 "specify an inclusive range of GIDs from which system GIDs can be dynamically "
 "allocated.  Default to I<100> - I<999.>"
@@ -1209,7 +1138,6 @@ msgstr ""
 #. type: TP
 #: ../adduser.conf.5:79
 #, fuzzy, no-wrap
-#| msgid "B<FIRST_UID> and B<LAST_UID>"
 msgid "B<FIRST_GID> and B<LAST_GID>"
 msgstr "B<FIRST_UID> e B<LAST_UID>"
 
@@ -1217,9 +1145,6 @@ msgstr "B<FIRST_UID> e B<LAST_UID>"
 #. type: Plain text
 #: ../adduser.conf.5:84
 #, fuzzy
-#| msgid ""
-#| "specify an inclusive range of UIDs from which normal user's UIDs can be "
-#| "dynamically allocated. Default to I<1000> - I<59999>."
 msgid ""
 "specify an inclusive range of GIDs from which normal group's GIDs can be "
 "dynamically allocated. Default to I<1000> - I<59999>."
@@ -1274,9 +1199,6 @@ msgstr "B<DIR_MODE>"
 #. type: Plain text
 #: ../adduser.conf.5:105
 #, fuzzy
-#| msgid ""
-#| "If set to a valid value (e.g. 0755 or 755), directories created will have "
-#| "the specified permissions. Otherwise 0755 is used as default."
 msgid ""
 "If set to a valid value (e.g. 0755 or 755), directories created will have "
 "the specified permissions as umask. Otherwise 0755 is used as default."
@@ -1334,18 +1256,14 @@ msgstr "B<NAME_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
 #, fuzzy
-#| msgid ""
-#| "User names are checked against this regular expression. If the name "
-#| "doesn't match this regexp, user creation is refused unless --force-"
-#| "badname is set. With --force-badname set, only weak checks are performed. "
-#| "The default is the most conservative ^[a-z][-a-z0-9]*$."
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
 msgstr ""
 "Nomes de usuários são checados contra esta expressão regular. Se o nome não "
 "corresponder a esta expressão regular, a criação do usuário é recusada a "
@@ -1355,14 +1273,38 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+# type: Plain text
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
+msgstr ""
+"Nomes de usuários são checados contra esta expressão regular. Se o nome não "
+"corresponder a esta expressão regular, a criação do usuário é recusada a "
+"menos que --force-badname seja definido. Com --force-badname definido, "
+"apenas verificações simples são realizadas. O padrão é o mais conservativo "
+"^[a-z][-a-z0-9]*$."
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1377,14 +1319,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1396,18 +1338,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, fuzzy
-#| msgid ""
-#| "This is the list of groups that new non-system users will be added to.  "
-#| "By default, this list is 'dialout cdrom floppy audio src video lp users'"
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1417,19 +1356,19 @@ msgstr ""
 "video lp users'"
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr ""
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1439,7 +1378,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1447,15 +1386,14 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 #, fuzzy
-#| msgid "adduser(8), addgroup(8), deluser(8), delgroup(8)"
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1478,9 +1416,6 @@ msgstr "deluser, delgroup - remove um us
 #. type: Plain text
 #: ../deluser.8:14
 #, fuzzy
-#| msgid ""
-#| "B<deluser> [options] [--remove-home] [--remove-all-files] [--backup] [--"
-#| "backup-to DIR] user"
 msgid ""
 "B<deluser> [options] [--force] [--remove-home] [--remove-all-files] [--"
 "backup] [--backup-to DIR] user"
@@ -1668,7 +1603,6 @@ msgstr ""
 #. type: Plain text
 #: ../deluser.8:106
 #, fuzzy
-#| msgid "Use FILE instead of I</etc/deluser.conf>."
 msgid ""
 "Use FILE instead of the default files I</etc/deluser.conf> and I</etc/"
 "adduser.conf>"
@@ -1720,7 +1654,6 @@ msgstr ""
 #. type: TP
 #: ../deluser.8:126
 #, fuzzy, no-wrap
-#| msgid "B<--group>"
 msgid "B<--backup>"
 msgstr "B<--group>"
 
@@ -1735,7 +1668,6 @@ msgstr ""
 #. type: TP
 #: ../deluser.8:130
 #, fuzzy, no-wrap
-#| msgid "B<--group>"
 msgid "B<--backup-to>"
 msgstr "B<--group>"
 
@@ -1750,7 +1682,6 @@ msgstr ""
 #. type: TP
 #: ../deluser.8:133
 #, fuzzy, no-wrap
-#| msgid "B<--no-create-home>"
 msgid "B<--remove-home>"
 msgstr "B<--no-create-home>"
 
@@ -1765,7 +1696,6 @@ msgstr ""
 #. type: TP
 #: ../deluser.8:137
 #, fuzzy, no-wrap
-#| msgid "B<--no-create-home>"
 msgid "B<--remove-all-files>"
 msgstr "B<--no-create-home>"
 
@@ -1835,7 +1765,6 @@ msgstr "B<4>"
 #. type: Plain text
 #: ../deluser.8:161
 #, fuzzy
-#| msgid "There is no such user. No action was performed."
 msgid "Internal error. No action was performed."
 msgstr "Não há tal usuário. Nenhuma ação foi realizada."
 
@@ -1863,7 +1792,6 @@ msgstr "B<6>"
 #. type: Plain text
 #: ../deluser.8:167
 #, fuzzy
-#| msgid "The user does not belong to the specified group."
 msgid ""
 "The user does not belong to the specified group. No action was performed."
 msgstr "O usuário não pertence ao grupo especificado."
@@ -1879,7 +1807,6 @@ msgstr "B<7>"
 #. type: Plain text
 #: ../deluser.8:170
 #, fuzzy
-#| msgid "You cannot remove a user from its primary group."
 msgid ""
 "You cannot remove a user from its primary group. No action was performed."
 msgstr "Você não pode remover um usuário de seu grupo primário."
@@ -1914,10 +1841,8 @@ msgstr ""
 #. type: Plain text
 #: ../deluser.8:180
 #, fuzzy
-#| msgid ""
-#| "/etc/deluser.conf - configuration file for B<deluser(8)> and "
-#| "B<delgroup(8)>."
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "/etc/deluser.conf - arquivo de configuração para B<deluser(8)> e "
 "B<delgroup(8)>."
@@ -1925,14 +1850,13 @@ msgstr ""
 #. type: TP
 #: ../deluser.8:180
 #, no-wrap
-msgid "/usr/local/sbin/deluser.local"
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
 #: ../deluser.8:189
 #, fuzzy
-#| msgid "adduser(8), addgroup(8), deluser(8), delgroup(8)"
 msgid "B<adduser>(8), B<deluser.conf>(5), B<groupdel>(8), B<userdel>(8)"
 msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8)"
 
@@ -1986,11 +1910,6 @@ msgstr ""
 #. type: Plain text
 #: ../deluser.conf.5:23
 #, fuzzy
-#| msgid ""
-#| "The file I</etc/deluser.conf> contains defaults for the programs "
-#| "B<deluser(8)> and B<delgroup(8)>.  Each option takes the form I<option> = "
-#| "I<value>.  Double or single quotes are allowed around the value.  Comment "
-#| "lines must have a pound sign (#) at the beginning of the line."
 msgid ""
 "The file I</etc/deluser.conf> contains defaults for the programs "
 "B<deluser(8)> and B<delgroup(8)>.  Each option takes the form I<option> = "
@@ -2021,9 +1940,6 @@ msgstr "B<REMOVE_HOME>"
 #. type: Plain text
 #: ../deluser.conf.5:41
 #, fuzzy
-#| msgid ""
-#| "Removes the home directory and mail spool of the user to be removed.  "
-#| "Value may be 0 or 1."
 msgid ""
 "Removes the home directory and mail spool of the user to be removed.  Value "
 "may be 0 (don't delete) or 1 (do delete)."
@@ -2131,9 +2047,6 @@ msgstr "B<ONLY_IF_EMPTY>"
 #. type: Plain text
 #: ../deluser.conf.5:80
 #, fuzzy
-#| msgid ""
-#| "Only delete a group if there are no user who belong to this group. "
-#| "Defaults to 0."
 msgid ""
 "Only delete a group if there are no users belonging to this group. Defaults "
 "to 0."
@@ -2170,11 +2083,202 @@ msgstr "I</etc/deluser.conf>"
 #. type: Plain text
 #: ../deluser.conf.5:89
 #, fuzzy
-#| msgid "deluser(8), delgroup(8), adduser.conf(5)"
 msgid "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 msgstr "deluser(8), delgroup(8), adduser.conf(5)"
 
 # type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [opções] [--home DIR] [--shell|-s SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPO | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] usuário"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> irá copiar arquivos do B<SKEL> para o diretório \"home\" e "
+#~ "perguntar informações para o finger (gecos) e uma senha. O gecos também "
+#~ "pode ser configurado com a opção B<--gecos>.  Com a opção B<--disabled-"
+#~ "login>, a conta será criada mas é desativada até que uma senha seja "
+#~ "definida. A opção B<--disabled-password> não configura uma senha, mas o "
+#~ "login ainda é possível (por exemplo através de chaves SSH RSA)."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Por padrão, nomes de usuário e grupo são verificados contra uma expressão "
+#~ "regular configurável. Esta opção força B<adduser> e B<addgroup> a aplicar "
+#~ "apenas verificações simples para validar o nome."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Nomes de usuários são checados contra esta expressão regular. Se o nome "
+#~ "não corresponder a esta expressão regular, a criação do usuário é "
+#~ "recusada a menos que --force-badname seja definido. Com --force-badname "
+#~ "definido, apenas verificações simples são realizadas. O padrão é o mais "
+#~ "conservativo ^[a-z][-a-z0-9]*$."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "/etc/deluser.conf - arquivo de configuração para B<deluser(8)> e "
+#~ "B<delgroup(8)>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Por padrão, para cada usuário no Debian GNU/Linux é dado um grupo "
+#~ "correspondente com o mesmo nome. Grupos de usuários (\"usergroups\") "
+#~ "permitem que diretórios com acesso de escrita ao grupo sejam facilmente "
+#~ "mantidos colocando os usuários apropriados no novo grupo, configurando o "
+#~ "bit set-group-ID no diretório, e assegurando que todos os usuários usem "
+#~ "uma umask de 002. Se esta opção for desligada configurando o "
+#~ "B<USERGROUPS> para I<no>, todos os GIDs dos usuários serão configurados "
+#~ "para B<USERS_GID>.  Grupos de usuários também podem ser sobrescritos a "
+#~ "partir da linha de comando com as opções B<--gid> ou B<--ingroup> para "
+#~ "configurar o grupo por id ou nome, respectivamente.  Além disso, usuários "
+#~ "podem ser adicionados em um ou mais grupos definidos no adduser.conf "
+#~ "tanto definindo ADD_EXTRA_GROUPS para 1 no adduser.conf, como passando --"
+#~ "add_extra_groups na linha de comando."
+
+# type: TP
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0 se --quiet for especificado"
+
+# type: TP
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1 se nem --quiet or --debug for especificado"
+
+# type: TP
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2 se --debug for especificado"
+
+# type: Plain text
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(O mesmo se aplica para a variável DEBUG, mas DEBUG está depreciado e "
+#~ "será removido numa versão futura do adduser)."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Se chamado com um argumento não-opção e a opção B<--system>, B<adduser> "
+#~ "irá adicionar um usuário de sistema. Se um usuário com o mesmo nome já "
+#~ "existir na faixa de uid do sistema (ou, se o uid foi especificado, se um "
+#~ "usuário com este uid já existir), adduser sairá com um aviso."
+
+# type: Plain text
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "Um diretório home é criado pelas mesmas regras de um usuário normal.  O "
+#~ "novo usuário do sistema terá o shell I</bin/false> (a menos que seja "
+#~ "sobrescrito com a opção B<--shell> ), e os logins desativados. O "
+#~ "esqueleto (skel) dos arquivos de configuração não é copiado."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Adiciona um novo usuário ao grupo GROUP em vez do usergroup ou um grupo "
+#~ "padrão definido pelo USERS_GID no arquivo adduser.conf."
+
+# type: Plain text
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "especifica um intervalo usado para alocação dinâmica dos UIDs dos "
+#~ "usuários normais. O padrão é I<1000> - I<29999>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "especifica um intervalo usado para alocação dinâmica dos UIDs dos "
+#~ "usuários normais. O padrão é I<1000> - I<29999>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Esta é a lista de grupos nos quais novos usuários comuns (\"non-system\") "
+#~ "serão adicionados. Por padrão, esta lista é 'dialout cdrom floppy audio "
+#~ "src video lp users'"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8)"
+
+# type: Plain text
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
@@ -2183,6 +2287,18 @@ msgstr "deluser(8), delgroup(8), adduser
 #~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 
 # type: Plain text
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Somente remova um grupo se não há nenhum usuário que pertença a este "
+#~ "grupo. O padrão é 0."
+
+# type: Plain text
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
+
+# type: Plain text
 #~ msgid "B<adduser> --group [options] [--gid ID] group"
 #~ msgstr "B<adduser> --group [opções] [--gid ID] grupo"
 
diff -pruN 3.118/doc/po4a/po/pt.po 3.118ubuntu5/doc/po4a/po/pt.po
--- 3.118/doc/po4a/po/pt.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/pt.po	2020-04-16 14:12:53.000000000 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser-manpage 3.115\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 19:20+0200\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -60,10 +60,12 @@ msgstr "SINOPSE"
 # type: Plain text
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [opções] [--home DIRECTÓRIO] [--shell|-s SHELL] [--no-create-"
 "home] [--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPO | --gid ID] "
@@ -232,14 +234,17 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> irá copiar ficheiros de B<SKEL> para o directório home e irá "
 "pedir informação do finger (gecos) e uma palavra-passe. A gecos também pode "
@@ -250,7 +255,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -262,57 +267,57 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "nome-de-utilizador uid gid directório-home"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr ""
 "A variável de ambiente VERBOSE é definida de acordo com a seguinte regra:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr "0 se "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr "B<--quiet> for especificado"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr "1 se nenhum "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "B<--quiet> nem B<--debug> for especificado"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr "2 se "
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr "B<--debug> for especificado"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -322,14 +327,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Adicionar um utilizador de sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -345,7 +350,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -359,7 +364,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -373,7 +378,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -387,14 +392,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Adicionar um grupo de utilizadores"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -406,7 +411,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -418,20 +423,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "O grupo é criado sem nenhum utilizador."
 
 # type: SS
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Adicionar um grupo de sistema"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -441,7 +446,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -453,14 +458,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Adicionar um utilizador existente a um grupo existente"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -470,34 +475,34 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPÇÕES"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf FICHEIRO>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Usa FICHEIRO em vez de I</etc/adduser.conf>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -507,14 +512,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -524,36 +529,37 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
+#, fuzzy
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Por predefinição, os nomes de utilizadores e grupos são verificados contra "
 "uma expressão regular configurável B<NAME_REGEX> especificada no ficheiro de "
 "configuração. Esta opção força B<adduser> e B<addgroup> a aplicar apenas uma "
-"verificação fraca para validade do nome. B<NAME_REGEX> está descrito em "
-"B<adduser.conf>(5)."
+"verificação fraca para validade do nome."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -563,14 +569,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -580,14 +586,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -601,27 +607,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Mostra instruções breves."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home DIR>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -633,14 +639,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell SHELL>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -650,14 +656,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GROUP>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -670,67 +676,67 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Não cria o directório home, mesmo que este não exista."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr "Suprime mensagens informativas, apenas mostra avisos e erros."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr "É detalhado, muito útil de deseja descobrir um problema com o adduser."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Cria um utilizador ou grupo de sistema."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -740,14 +746,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -757,14 +763,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -774,14 +780,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Adiciona o novo utilizador aos grupos extra definidos no ficheiro de "
@@ -789,33 +795,33 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Mostra informação de versão e copyright."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "VALORES DE SAÍDA"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -829,13 +835,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -848,7 +854,7 @@ msgstr ""
 "veja adduser.conf(5). Adduser foi abortado por um sinal."
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -860,45 +866,45 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "FICHEIROS"
 
 # type: Plain text
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "Ficheiro de configuração predefinida para o adduser e addgroup"
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr "/usr/local/sbin/adduser.local"
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr "Adições personalizadas opcionais"
 
 # type: SH
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -908,14 +914,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -926,7 +932,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -936,7 +942,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1251,12 +1257,38 @@ msgstr "B<NAME_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
+msgstr ""
+"Os nomes de utilizadores e grupos são verificados contra esta expressão "
+"regular. Se o nome não condizer com esta expressão regular, a criação do "
+"utilizador e grupo é recusada a menos que se defina --force-badname. Com --"
+"force-badname definido, apenas são executadas verificações fracas. A "
+"predefinição é a mais conservadora ^[a-z][-a-z0-9]*$."
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+# type: Plain text
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
 msgstr ""
 "Os nomes de utilizadores e grupos são verificados contra esta expressão "
 "regular. Se o nome não condizer com esta expressão regular, a criação do "
@@ -1266,14 +1298,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1288,14 +1320,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1307,14 +1339,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1324,19 +1356,19 @@ msgstr ""
 "video plugdev users games'."
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTAS"
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<NOMES VÁLIDOS>"
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1351,7 +1383,7 @@ msgstr ""
 "nomes de utilizadores (para conformidade com o samba)."
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1361,13 +1393,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1832,19 +1864,16 @@ msgstr ""
 # type: Plain text
 #. type: Plain text
 #: ../deluser.8:180
-#, fuzzy
-#| msgid ""
-#| "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "I</etc/deluser.conf> Ficheiro de configuração predefinido para deluser e "
 "delgroup"
 
 #. type: TP
 #: ../deluser.8:180
-#, fuzzy, no-wrap
-#| msgid "I</usr/local/sbin/deluser.local>"
-msgid "/usr/local/sbin/deluser.local"
+#, no-wrap
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr "I</usr/local/sbin/deluser.local>"
 
 # type: Plain text
@@ -2081,6 +2110,202 @@ msgid "B<adduser.conf>(5), B<delgroup>(8
 msgstr "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 
 # type: Plain text
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [opções] [--home DIRECTÓRIO] [--shell|-s SHELL] [--no-create-"
+#~ "home] [--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPO | --gid "
+#~ "ID] [--disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] utilizador"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> irá copiar ficheiros de B<SKEL> para o directório home e irá "
+#~ "pedir informação do finger (gecos) e uma palavra-passe. A gecos também "
+#~ "pode ser definida com a opção B<--gecos>. Com a opção B<--disabled-"
+#~ "login>, a conta será criada mas irá ficar desactivada até que se defina "
+#~ "uma palavra-passe. A opção B<--disabled-password> não irá definir uma "
+#~ "palavra-passe, mas o login continua a ser possível (por exemplo com "
+#~ "chaves SSH RSA)."
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Por predefinição, os nomes de utilizadores e grupos são verificados "
+#~ "contra uma expressão regular configurável B<NAME_REGEX> especificada no "
+#~ "ficheiro de configuração. Esta opção força B<adduser> e B<addgroup> a "
+#~ "aplicar apenas uma verificação fraca para validade do nome. B<NAME_REGEX> "
+#~ "está descrito em B<adduser.conf>(5)."
+
+# type: Plain text
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Os nomes de utilizadores e grupos são verificados contra esta expressão "
+#~ "regular. Se o nome não condizer com esta expressão regular, a criação do "
+#~ "utilizador e grupo é recusada a menos que se defina --force-badname. Com "
+#~ "--force-badname definido, apenas são executadas verificações fracas. A "
+#~ "predefinição é a mais conservadora ^[a-z][-a-z0-9]*$."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "I</etc/deluser.conf> Ficheiro de configuração predefinido para deluser e "
+#~ "delgroup"
+
+#, fuzzy
+#~ msgid "/usr/local/sbin/deluser.local"
+#~ msgstr "I</usr/local/sbin/deluser.local>"
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Por predefinição, cada utilizador em Debian GNU/Linux recebe um grupo "
+#~ "correspondente com o mesmo nome. Grupos-de-utilizadores permitem que "
+#~ "directórios com acesso de escrita para grupos sejam mantidos facilmente "
+#~ "ao colocar os utilizadores apropriados no novo grupo, definindo o bit set-"
+#~ "group-ID no directório, e assegurando que todos os utilizadores usam uma "
+#~ "umask de 002. Se esta opção for desligada ao definir B<USERGROUPS> para "
+#~ "I<no>, todos os GIDs de utilizadores são definidos para B<USERS_GID>. Os "
+#~ "grupos principais de utilizadores também podem ser sobrepostos a partir "
+#~ "da linha de comandos com as opções B<--gid> ou B<--ingroup> para definir "
+#~ "o grupo por id ou nome, respectivamente. Também, utilizadores podem ser "
+#~ "adicionados a um ou mais grupos definidos em adduser.conf seja ao definir "
+#~ "ADD_EXTRA_GROUPS para 1 em adduser.conf,ou passando --add_extra_groups na "
+#~ "linha de comandos."
+
+# type: TP
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0 se --quiet for especificado"
+
+# type: TP
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1 se --quiet e --debug não forem especificados"
+
+# type: TP
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2 se --debug for especificado"
+
+# type: Plain text
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(O mesmo aplica-se à variável DEBUG, mas DEBUG está obsoleto e será "
+#~ "removido numa versão futura do adduser.)"
+
+# type: Plain text
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Se chamado com um argumento não-opção e a opção B<--system>, o B<adduser> "
+#~ "irá adicionar um utilizador de sistema. Se já existir um utilizador com o "
+#~ "mesmo nome dentro do alcance uid do sistema (ou, se o uid for "
+#~ "especificado e já existir um utilizador com esse uid), o adduser irá "
+#~ "terminar com um aviso. Este aviso pode ser suprimido ao adicionar \"--"
+#~ "quiet\"."
+
+# type: Plain text
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "É criado um directório home pelas mesmas regras como para utilizadores "
+#~ "normais. O novo utilizador de sistema irá ter a shell I</bin/false> (a "
+#~ "menos que seja sobreposto pela opção B<--shell>), e irá ter os logins "
+#~ "desactivados. Os ficheiros de configuração esqueleto não são copiados."
+
+# type: Plain text
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Adiciona o novo utilizador ao GRUPO em vez a um grupo-de-utilizador ou ao "
+#~ "grupo predefinido por B<USERS_GID> no ficheiro de configuração. Isto "
+#~ "afecta o grupo principal dos utilizadores. Para adicionar grupos "
+#~ "adicionais, veja a opção B<add_extra_groups>"
+
+# type: Plain text
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "especifica um alcance inclusivo de UIDs a partir do qual os UIDs de "
+#~ "utilizadores normais podem ser alocados dinamicamente. A predefinição é "
+#~ "I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "especifica um alcance inclusivo de GIDs a partir do qual os GIDs de "
+#~ "grupos normais podem ser alocados dinamicamente. A predefinição é I<1000> "
+#~ "- I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Isto é a lista de grupos à qual os novos utilizadores não-do-sistema "
+#~ "serão adicionados. Por predefinição, esta lista é 'dialout cdrom floppy "
+#~ "audio video plugdev users games'"
+
+# type: Plain text
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
+# type: Plain text
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
@@ -2088,6 +2313,27 @@ msgstr "B<adduser.conf>(5), B<delgroup>(
 #~ msgid "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 #~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "deluser(8) e delgroup(8) também lêem /etc/adduser.conf, veja adduser."
+#~ "conf(8); as definições em deluser.conf podem sobrepor as definições "
+#~ "feitas em adduser.conf."
+
+# type: Plain text
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Apenas apaga um grupo se não existirem utilizadores pertencentes a este "
+#~ "grupo. A predefinição é 0."
+
+# type: Plain text
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
+
 # type: Plain text
 #~ msgid "B<adduser> --group [options] [--gid ID] group"
 #~ msgstr "B<adduser> --group [opções] [--gid ID] grupo"
diff -pruN 3.118/doc/po4a/po/ru.po 3.118ubuntu5/doc/po4a/po/ru.po
--- 3.118/doc/po4a/po/ru.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/ru.po	2020-04-16 14:12:53.000000000 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2016-06-17 19:21+0200\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -62,10 +62,12 @@ msgstr "СИНТАКСИС"
 # type: Plain text
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [параметры] [--home КАТ] [--shell ОБОЛОЧКА] [--no-create-home] [--"
 "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup ГРУППА | --gid ID] [--"
@@ -233,14 +235,17 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> копирует файлы из B<SKEL> в домашний каталог, запрашивает "
 "информацию для finger (gecos) и пароль. Gecos также может быть задан с "
@@ -252,7 +257,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -264,57 +269,57 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "имя_пользователя uid gid домашний_каталог"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr ""
 "Значение переменной среды VERBOSE устанавливается по следующему правилу:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr "0, если"
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 msgid "B<--quiet> is specified"
 msgstr "указан B<--quiet>"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr "1, если не указан"
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "B<--quiet> или B<--debug>"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr "2, если указан"
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 msgid "B<--debug> is specified"
 msgstr "B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -324,14 +329,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Добавление системного пользователя"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -348,7 +353,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -362,7 +367,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -377,7 +382,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -391,14 +396,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Добавление пользовательской группы"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -410,7 +415,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -422,20 +427,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "Группа создаётся без пользователей."
 
 # type: SS
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Добавление системной группы"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -445,7 +450,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -457,14 +462,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Добавление существующего пользователя в существующую группу"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -474,34 +479,34 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "ПАРАМЕТРЫ"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf ФАЙЛ>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Использовать ФАЙЛ вместо I</etc/adduser.conf>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -511,14 +516,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -528,36 +533,37 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
+#, fuzzy
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "По умолчанию, имена пользователя и группы проверяются согласно заданному "
 "регулярному выражению B<NAME_REGEX>, указанному в файле настройки. Этот "
 "параметр заставляет B<adduser> и B<addgroup> выполнять только слабую "
-"проверку правильности имени. Описание B<NAME_REGEX> приведено в B<adduser."
-"conf>(5)."
+"проверку правильности имени."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -567,14 +573,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -584,14 +590,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -605,27 +611,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Показать краткую инструкцию."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home КАТ>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -637,14 +643,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell ОБОЛОЧКА>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -654,14 +660,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup ГРУППА>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -674,27 +680,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Не создавать домашний каталог, даже если он не существует."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr ""
 "Не выводить информационные сообщения, показывать только предупреждения и "
@@ -702,14 +708,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr ""
@@ -718,27 +724,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Создать системного пользователя или группу."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -748,14 +754,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -765,14 +771,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -782,14 +788,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Добавить нового пользователя в дополнительные группы, указанные в файле "
@@ -797,34 +803,34 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Показать номер версии и информацию об авторском праве."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -837,14 +843,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -858,7 +864,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -870,45 +876,45 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "ФАЙЛЫ"
 
 # type: Plain text
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "Файл настройки по умолчанию для adduser и addgroup"
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr "/usr/local/sbin/adduser.local"
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr "Необязательные пользовательские добавления."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "СМОТРИТЕ ТАКЖЕ"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -918,14 +924,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "АВТОРСКОЕ ПРАВО"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -937,7 +943,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -947,7 +953,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1260,30 +1266,55 @@ msgstr "B<NAME_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
+msgstr ""
+"Данным регулярным выражением проверяется допустимость имени пользователя или "
+"группы. Если имя не подпадает под регулярное выражение, то adduser не "
+"создаёт учётную запись или группу, если не указан параметр --force-badname. "
+"При указании параметра --force-badname выполняется только слабая проверка. "
+"По умолчанию используется наиболее консервативное ^[a-z][-a-z0-9]*$."
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+# type: Plain text
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
 msgstr ""
 "Данным регулярным выражением проверяется допустимость имени пользователя или "
 "группы. Если имя не подпадает под регулярное выражение, то adduser не "
 "создаёт учётную запись или группу, если не указан параметр --force-badname. "
 "При указании параметра --force-badname выполняется только слабая проверка. "
-"По умолчанию используется наиболее консервативное выражение ^[a-z][-a-z0-9]*"
-"$."
+"По умолчанию используется наиболее консервативное ^[a-z][-a-z0-9]*$."
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1297,14 +1328,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1316,14 +1347,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1334,21 +1365,21 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "ЗАМЕЧАНИЯ"
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<ДОПУСТИМЫЕ ИМЕНА>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1364,7 +1395,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1374,13 +1405,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1853,17 +1884,14 @@ msgstr ""
 # type: Plain text
 #. type: Plain text
 #: ../deluser.8:180
-#, fuzzy
-#| msgid ""
-#| "I</etc/deluser.conf> Default configuration file for deluser and delgroup"
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr "I</etc/deluser.conf> - файл настройки для deluser и delgroup"
 
 #. type: TP
 #: ../deluser.8:180
-#, fuzzy, no-wrap
-#| msgid "I</usr/local/sbin/deluser.local>"
-msgid "/usr/local/sbin/deluser.local"
+#, no-wrap
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr "I</usr/local/sbin/deluser.local>"
 
 # type: Plain text
@@ -2098,6 +2126,200 @@ msgid "B<adduser.conf>(5), B<delgroup>(8
 msgstr "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 
 # type: Plain text
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [параметры] [--home КАТ] [--shell ОБОЛОЧКА] [--no-create-home] "
+#~ "[--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup ГРУППА | --gid ID] "
+#~ "[--disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] пользователь"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> копирует файлы из B<SKEL> в домашний каталог, запрашивает "
+#~ "информацию для finger (gecos) и пароль. Gecos также может быть задан с "
+#~ "помощью параметра B<--gecos>. При задании параметра B<--disabled-login>, "
+#~ "учётная запись будет создана, но пока не будет определён пароль, доступ "
+#~ "через неё останется заблокированным. При задании параметра B<--disabled-"
+#~ "password> пароль не нужен, но вход в систему всё равно возможен (например "
+#~ "с помощью SSH RSA ключей)."
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "По умолчанию, имена пользователя и группы проверяются согласно заданному "
+#~ "регулярному выражению B<NAME_REGEX>, указанному в файле настройки. Этот "
+#~ "параметр заставляет B<adduser> и B<addgroup> выполнять только слабую "
+#~ "проверку правильности имени. Описание B<NAME_REGEX> приведено в B<adduser."
+#~ "conf>(5)."
+
+# type: Plain text
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Данным регулярным выражением проверяется допустимость имени пользователя "
+#~ "или группы. Если имя не подпадает под регулярное выражение, то adduser не "
+#~ "создаёт учётную запись или группу, если не указан параметр --force-"
+#~ "badname. При указании параметра --force-badname выполняется только слабая "
+#~ "проверка. По умолчанию используется наиболее консервативное выражение ^[a-"
+#~ "z][-a-z0-9]*$."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr "I</etc/deluser.conf> - файл настройки для deluser и delgroup"
+
+#, fuzzy
+#~ msgid "/usr/local/sbin/deluser.local"
+#~ msgstr "I</usr/local/sbin/deluser.local>"
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "По умолчанию, каждый пользователь в Debian GNU/Linux входит в "
+#~ "соответствующую группу с тем же именем. Объединение пользователей в "
+#~ "группы позволяет групповую запись в каталог, что легко достигается "
+#~ "посредством помещения соответствующих пользователей в новую группу, "
+#~ "установкой set-group-ID бита на каталог и проверкой того, что все "
+#~ "пользователи используют значение umask со значением 002. Если данную "
+#~ "возможность выключить, задав параметру B<USERGROUPS> значение I<no>, то "
+#~ "все GID пользователей будут устанавливаться в B<USERS_GID>. Первичные "
+#~ "группы пользователей также могут быть изменены из командной строки с "
+#~ "помощью параметров B<--gid> или B<--ingroup>, которые задают группу по id "
+#~ "или по имени, соответственно. Также, пользователей можно добавить в одну "
+#~ "или более групп, указанных в adduser.conf, установкой ADD_EXTRA_GROUPS "
+#~ "равной 1 в adduser.conf, или указав --add_extra_groups в командной строке."
+
+# type: TP
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0, если указан --quiet"
+
+# type: TP
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1, если не указан --quiet или --debug"
+
+# type: TP
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2, если указан --debug"
+
+# type: Plain text
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(Это же правило применяется к переменной DEBUG, но DEBUG лучше не "
+#~ "использовать, так как она будет удалена в следующей версии adduser.)"
+
+# type: Plain text
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "При запуске с одним параметром без аргументов и параметром B<--system>, "
+#~ "B<adduser> добавляет системного пользователя. Если пользователь с тем же "
+#~ "именем уже существует в диапазоне системных uid (или, если задан uid, "
+#~ "если пользователь с таким uid уже существует), то adduser завершает "
+#~ "работу с выдачей предупреждения. Это предупреждение отключить указав "
+#~ "параметр «--quiet»."
+
+# type: Plain text
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "Домашний каталог создаётся по тем же правилам что и для обычных "
+#~ "пользователей. Новый системный пользователь имеет оболочку I</bin/false> "
+#~ "(если не указан параметр B<--shell>) и заблокированный пароль. Начальные "
+#~ "файлы настроек не копируются."
+
+# type: Plain text
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Добавить нового пользователя в ГРУППУ, а не в группу с тем же именем или "
+#~ "группу по умолчанию, определяемую B<USERS_GID> в файле настройки. Это "
+#~ "влияет на первичную группу пользователей. Для указания дополнительных "
+#~ "групп, смотрите описание параметра B<add_extra_groups>."
+
+# type: Plain text
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "определяют границы (включительно) диапазона динамически выделяемых UID "
+#~ "обычных пользователей. По умолчанию I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "определяют границы (включительно) диапазона GID, из которого могут "
+#~ "динамически выделяться обычные пользовательские GID. По умолчанию I<1000> "
+#~ "- I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Это список групп, в которые будут добавлены новые не системные "
+#~ "пользователи. По умолчанию, список равен «dialout cdrom floppy audio "
+#~ "video plugdev users games»."
+
+# type: Plain text
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
+# type: Plain text
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
@@ -2106,6 +2328,27 @@ msgstr "B<adduser.conf>(5), B<delgroup>(
 #~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 
 # type: Plain text
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "Команды deluser(8) и delgroup(8) также читают /etc/adduser.conf, смотрите "
+#~ "adduser.conf(8); настройки в deluser.conf могут быть изменены настройками "
+#~ "из adduser.conf."
+
+# type: Plain text
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Удалять группу, только если в ней нет пользователей. По умолчанию 0."
+
+# type: Plain text
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
+
+# type: Plain text
 #, fuzzy
 #~| msgid "B<addgroup> [options] [--gid ID] group"
 #~ msgid "B<adduser> --group [options] [--gid ID] group"
diff -pruN 3.118/doc/po4a/po/sv.po 3.118ubuntu5/doc/po4a/po/sv.po
--- 3.118/doc/po4a/po/sv.po	2018-09-15 19:12:39.000000000 +0000
+++ 3.118ubuntu5/doc/po4a/po/sv.po	2020-04-16 14:12:53.000000000 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.83 manual\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-04-16 16:24+0200\n"
 "PO-Revision-Date: 2010-11-12 18:06+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedihs@lists.debian.org>\n"
@@ -61,10 +61,12 @@ msgstr "SYNOPSIS"
 # type: Plain text
 #. type: Plain text
 #: ../adduser.8:14
+#, fuzzy
 msgid ""
 "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--disabled-"
-"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] user"
+"password] [--disabled-login] [--gecos GECOS] [--add_extra_groups] [--encrypt-"
+"home] user"
 msgstr ""
 "B<adduser> [flaggor] [--home KATALOG] [--shell SKAL] [--no-create-home] [--"
 "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPP | --gid ID] [--"
@@ -186,18 +188,6 @@ msgstr ""
 #. type: Plain text
 #: ../adduser.8:74
 #, fuzzy
-#| msgid ""
-#| "By default, each user in Debian GNU/Linux is given a corresponding group "
-#| "with the same name.  Usergroups allow group writable directories to be "
-#| "easily maintained by placing the appropriate users in the new group, "
-#| "setting the set-group-ID bit in the directory, and ensuring that all "
-#| "users use a umask of 002.  If this option is turned off by setting "
-#| "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
-#| "primary groups can also be overridden from the command line with the B<--"
-#| "gid> or B<--ingroup> options to set the group by id or name, "
-#| "respectively.  Also, users can be added to one or more groups defined in "
-#| "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
-#| "by passing --add_extra_groups on the commandline."
 msgid ""
 "By default, each user in Debian GNU/Linux is given a corresponding group "
 "with the same name.  Usergroups allow group writable directories to be "
@@ -243,14 +233,17 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:102
+#: ../adduser.8:106
+#, fuzzy
 msgid ""
 "B<adduser> will copy files from B<SKEL> into the home directory and prompt "
 "for finger (gecos) information and a password.  The gecos may also be set "
 "with the B<--gecos> option.  With the B<--disabled-login> option, the "
 "account will be created but will be disabled until a password is set. The "
 "B<--disabled-password> option will not set a password, but login is still "
-"possible (for example with SSH RSA keys)."
+"possible (for example with SSH RSA keys).  To set up an encrypted home "
+"directory for the new user, add the B<--encrypt-home> option.  For more "
+"information, refer to the -b option of B<ecryptfs-setup-private(1).>"
 msgstr ""
 "B<adduser> kommer att kopiera filer från B<SKEL> till hemkatalogen och fråga "
 "efter fingerinformation (gecos) och ett lösenord.  Gecos kan också ställas "
@@ -261,7 +254,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:109
+#: ../adduser.8:113
 msgid ""
 "If the file B</usr/local/sbin/adduser.local> exists, it will be executed "
 "after the user account has been set up in order to do any local setup.  The "
@@ -273,66 +266,60 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:111 ../deluser.8:83
+#: ../adduser.8:115 ../deluser.8:83
 msgid "username uid gid home-directory"
 msgstr "användarnamn uid gid hemkatalog"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:113
+#: ../adduser.8:117
 msgid ""
 "The environment variable VERBOSE is set according to the following rule:"
 msgstr "Miljövariabeln VERBOSE ställs in enligt följande regel:"
 
 #. type: TP
-#: ../adduser.8:113
+#: ../adduser.8:117
 #, no-wrap
 msgid "0 if "
 msgstr ""
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, fuzzy
-#| msgid "0 if --quiet is specified"
 msgid "B<--quiet> is specified"
 msgstr "0 om --quiet angivs"
 
 #. type: TP
-#: ../adduser.8:117
+#: ../adduser.8:121
 #, no-wrap
 msgid "1 if neither "
 msgstr ""
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, fuzzy
-#| msgid "1 if neither --quiet nor --debug is specified"
 msgid "B<--quiet> nor B<--debug> is specified"
 msgstr "1 om varken --quiet eller --debug är angivna"
 
 #. type: TP
-#: ../adduser.8:123
+#: ../adduser.8:127
 #, no-wrap
 msgid "2 if "
 msgstr ""
 
 # type: TP
 #. type: Plain text
-#: ../adduser.8:127
+#: ../adduser.8:131
 #, fuzzy
-#| msgid "2 if --debug is specified"
 msgid "B<--debug> is specified"
 msgstr "2 om --debug angivs"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:130
+#: ../adduser.8:134
 #, fuzzy
-#| msgid ""
-#| "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
-#| "be removed in a later version of adduser.)"
 msgid ""
 "(The same applies to the variable DEBUG, but DEBUG is deprecated and will be "
 "removed in a later version of B<adduser>.)"
@@ -342,21 +329,15 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:131
+#: ../adduser.8:135
 #, no-wrap
 msgid "Add a system user"
 msgstr "Lägg till en systemanvändare"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:138
+#: ../adduser.8:142
 #, fuzzy
-#| msgid ""
-#| "If called with one non-option argument and the B<--system> option, "
-#| "B<adduser> will add a system user. If a user with the same name already "
-#| "exists in the system uid range (or, if the uid is specified, if a user "
-#| "with that uid already exists), adduser will exit with a warning. This "
-#| "warning can be suppressed by adding \"--quiet\"."
 msgid ""
 "If called with one non-option argument and the B<--system> option, "
 "B<adduser> will add a system user. If a user with the same name already "
@@ -372,7 +353,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:144
+#: ../adduser.8:148
 msgid ""
 "B<adduser> will choose the first available UID from the range specified for "
 "system users in the configuration file (FIRST_SYSTEM_UID and "
@@ -386,7 +367,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:154
+#: ../adduser.8:158
 msgid ""
 "By default, system users are placed in the B<nogroup> group.  To place the "
 "new system user in an already existing group, use the B<--gid> or B<--"
@@ -400,7 +381,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:162
+#: ../adduser.8:166
 msgid ""
 "A home directory is created by the same rules as for normal users.  The new "
 "system user will have the shell I</usr/sbin/nologin> (unless overridden with "
@@ -414,14 +395,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:162
+#: ../adduser.8:166
 #, no-wrap
 msgid "Add a user group"
 msgstr "Lägg till en användargrupp"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:167
+#: ../adduser.8:171
 msgid ""
 "If B<adduser> is called with the B<--group> option and without the B<--"
 "system> option, or B<addgroup> is called respectively, a user group will be "
@@ -433,7 +414,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:173
+#: ../adduser.8:177
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_GID, LAST_GID). To override that mechanism you can "
@@ -445,20 +426,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:175 ../adduser.8:186
+#: ../adduser.8:179 ../adduser.8:190
 msgid "The group is created with no users."
 msgstr "Gruppen skapas utan några användare."
 
 # type: SS
 #. type: SS
-#: ../adduser.8:175
+#: ../adduser.8:179
 #, no-wrap
 msgid "Add a system group"
 msgstr "Lägg till en systemgrupp"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:179
+#: ../adduser.8:183
 msgid ""
 "If B<addgroup> is called with the B<--system> option, a system group will be "
 "added."
@@ -468,7 +449,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:184
+#: ../adduser.8:188
 msgid ""
 "A GID will be chosen from the range specified for system GIDS in the "
 "configuration file (FIRST_SYSTEM_GID, LAST_SYSTEM_GID). To override that "
@@ -479,14 +460,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: ../adduser.8:186
+#: ../adduser.8:190
 #, no-wrap
 msgid "Add an existing user to an existing group"
 msgstr "Lägg till en existerande användare till en existerande grupp"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:190
+#: ../adduser.8:194
 msgid ""
 "If called with two non-option arguments, B<adduser> will add an existing "
 "user to an existing group."
@@ -496,34 +477,34 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:190 ../deluser.8:99
+#: ../adduser.8:194 ../deluser.8:99
 #, no-wrap
 msgid "OPTIONS"
 msgstr "FLAGGOR"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:191 ../deluser.8:100
+#: ../adduser.8:195 ../deluser.8:100
 #, no-wrap
 msgid "B<--conf FILE>"
 msgstr "B<--conf FIL>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:195
+#: ../adduser.8:199
 msgid "Use FILE instead of I</etc/adduser.conf>."
 msgstr "Använd FIL istället för I</etc/adduser.conf>."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:195
+#: ../adduser.8:199
 #, no-wrap
 msgid "B<--disabled-login>"
 msgstr "B<--disabled-login>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:199
+#: ../adduser.8:203
 msgid ""
 "Do not run passwd to set the password.  The user won't be able to use her "
 "account until the password is set."
@@ -533,14 +514,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:199
+#: ../adduser.8:203
 #, no-wrap
 msgid "B<--disabled-password>"
 msgstr "B<--disabled-password>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:203
+#: ../adduser.8:207
 msgid ""
 "Like --disabled-login, but logins are still possible (for example using SSH "
 "RSA keys) but not using password authentication."
@@ -550,25 +531,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:203
+#: ../adduser.8:207
 #, no-wrap
 msgid "B<--force-badname>"
 msgstr "B<--force-badname>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, fuzzy
-#| msgid ""
-#| "By default, user and group names are checked against the configurable "
-#| "regular expression B<NAME_REGEX> specified in the configuration file. "
-#| "This option forces B<adduser> and B<addgroup> to apply only a weak check "
-#| "for validity of the name."
 msgid ""
 "By default, user and group names are checked against the configurable "
-"regular expression B<NAME_REGEX> specified in the configuration file. This "
-"option forces B<adduser> and B<addgroup> to apply only a weak check for "
-"validity of the name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
+"regular expression B<NAME_REGEX> (or B<NAME_REGEX_SYSTEM> if B<--system> is "
+"specified)  specified in the configuration file. This option forces "
+"B<adduser> and B<addgroup> to apply only a weak check for validity of the "
+"name.  B<NAME_REGEX> is described in B<adduser.conf>(5)."
 msgstr ""
 "Som standard kontrolleras användare och gruppnamn mot ett konfigurerbart "
 "reguljärt uttryck B<NAME_REGEX>.  Denna flagga tvingar B<adduser> och "
@@ -576,14 +553,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:216
+#: ../adduser.8:225
 #, no-wrap
 msgid "B<--gecos GECOS>"
 msgstr "B<--gecos GECOS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:221
+#: ../adduser.8:230
 msgid ""
 "Set the gecos field for the new entry generated.  B<adduser> will not ask "
 "for finger information if this option is given."
@@ -593,14 +570,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:221
+#: ../adduser.8:230
 #, no-wrap
 msgid "B<--gid ID>"
 msgstr "B<--gid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:226
+#: ../adduser.8:235
 msgid ""
 "When creating a group, this option forces the new groupid to be the given "
 "number.  When creating a user, this option will put the user in that group."
@@ -611,14 +588,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:226 ../deluser.8:106
+#: ../adduser.8:235 ../deluser.8:106
 #, no-wrap
 msgid "B<--group>"
 msgstr "B<--group>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:236
+#: ../adduser.8:245
 msgid ""
 "When combined with B<--system>, a group with the same name and ID as the "
 "system user is created.  If not combined with B<--system>, a group with the "
@@ -632,27 +609,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:236 ../deluser.8:111
+#: ../adduser.8:245 ../deluser.8:111
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:239 ../deluser.8:114
+#: ../adduser.8:248 ../deluser.8:114
 msgid "Display brief instructions."
 msgstr "Visa korta instruktioner."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:239
+#: ../adduser.8:248
 #, no-wrap
 msgid "B<--home DIR>"
 msgstr "B<--home KATALOG>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:244
+#: ../adduser.8:253
 msgid ""
 "Use DIR as the user's home directory, rather than the default specified by "
 "the configuration file.  If the directory does not exist, it is created and "
@@ -664,14 +641,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:244
+#: ../adduser.8:253
 #, no-wrap
 msgid "B<--shell SHELL>"
 msgstr "B<--shell SKAL>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:248
+#: ../adduser.8:257
 msgid ""
 "Use SHELL as the user's login shell, rather than the default specified by "
 "the configuration file."
@@ -681,20 +658,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:248
+#: ../adduser.8:257
 #, no-wrap
 msgid "B<--ingroup GROUP>"
 msgstr "B<--ingroup GRUPP>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, fuzzy
-#| msgid ""
-#| "Add the new user to GROUP instead of a usergroup or the default group "
-#| "defined by B<USERS_GID> in the configuration file.  This affects the "
-#| "users primary group.  To add additional groups, see the "
-#| "B<add_extra_groups> option"
 msgid ""
 "Add the new user to GROUP instead of a usergroup or the default group "
 "defined by B<USERS_GID> in the configuration file.  This affects the users "
@@ -707,67 +679,67 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:257
+#: ../adduser.8:266
 #, no-wrap
 msgid "B<--no-create-home>"
 msgstr "B<--no-create-home>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:260
+#: ../adduser.8:269
 msgid "Do not create the home directory, even if it doesn't exist."
 msgstr "Skapa inte hemkatalogen även om den inte existerar."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:260 ../deluser.8:114
+#: ../adduser.8:269 ../deluser.8:114
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:263
+#: ../adduser.8:272
 msgid "Suppress informational messages, only show warnings and errors."
 msgstr "Visa inte informativa meddelanden, visa endast varningar och fel."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:263
+#: ../adduser.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:266
+#: ../adduser.8:275
 msgid ""
 "Be verbose, most useful if you want to nail down a problem with adduser."
 msgstr "Var informativ, mycket användbar om du vill hitta problem med adduser."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:266 ../deluser.8:117
+#: ../adduser.8:275 ../deluser.8:117
 #, no-wrap
 msgid "B<--system>"
 msgstr "B<--system>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:269
+#: ../adduser.8:278
 msgid "Create a system user or group."
 msgstr "Skapa en systemanvändare eller -grupp."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:269
+#: ../adduser.8:278
 #, no-wrap
 msgid "B<--uid ID>"
 msgstr "B<--uid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:274
+#: ../adduser.8:283
 msgid ""
 "Force the new userid to be the given number.  B<adduser> will fail if the "
 "userid is already taken."
@@ -777,14 +749,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:274
+#: ../adduser.8:283
 #, no-wrap
 msgid "B<--firstuid ID>"
 msgstr "B<--firstuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:279
+#: ../adduser.8:288
 msgid ""
 "Override the first uid in the range that the uid is chosen from (overrides "
 "B<FIRST_UID> specified in the configuration file)."
@@ -794,14 +766,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:279
+#: ../adduser.8:288
 #, no-wrap
 msgid "B<--lastuid ID>"
 msgstr "B<--lastuid ID>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:284
+#: ../adduser.8:293
 msgid ""
 "Override the last uid in the range that the uid is chosen from "
 "( B<LAST_UID> )"
@@ -810,47 +782,47 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:284
+#: ../adduser.8:293
 #, no-wrap
 msgid "B<--add_extra_groups>"
 msgstr "B<--add_extra_groups>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:287
+#: ../adduser.8:296
 msgid "Add new user to extra groups defined in the configuration file."
 msgstr ""
 "Lägg till nya användare till extragrupper definierade i inställningsfilen."
 
 # type: TP
 #. type: TP
-#: ../adduser.8:287 ../deluser.8:142
+#: ../adduser.8:296 ../deluser.8:142
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:290 ../deluser.8:145
+#: ../adduser.8:299 ../deluser.8:145
 msgid "Display version and copyright information."
 msgstr "Visa version och information om copyright."
 
 # type: SH
 #. type: SH
-#: ../adduser.8:291
+#: ../adduser.8:300
 #, no-wrap
 msgid "EXIT VALUES"
 msgstr "RETURVÄRDEN"
 
 # type: TP
 #. type: TP
-#: ../adduser.8:293 ../deluser.8:146
+#: ../adduser.8:302 ../deluser.8:146
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
 
 #. type: Plain text
-#: ../adduser.8:296
+#: ../adduser.8:305
 msgid ""
 "The user exists as specified. This can have 2 causes: The user was created "
 "by adduser or the user was already present on the system before adduser was "
@@ -864,13 +836,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.8:296 ../deluser.8:149
+#: ../adduser.8:305 ../deluser.8:149
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
 
 #. type: Plain text
-#: ../adduser.8:299
+#: ../adduser.8:308
 msgid ""
 "Creating the user or group failed because it was already present with other "
 "UID/GID than specified. The username or groupname was rejected because of a "
@@ -883,7 +855,7 @@ msgstr ""
 "uttrycket, läs adduser.conf(5). Adduser avbröts av en signal."
 
 #. type: Plain text
-#: ../adduser.8:303
+#: ../adduser.8:312
 msgid ""
 "Or for many other yet undocumented reasons which are printed to console "
 "then. You may then consider to remove B<--quiet> to make adduser more "
@@ -895,49 +867,46 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:304 ../adduser.conf.5:147 ../deluser.8:177 ../deluser.conf.5:84
+#: ../adduser.8:313 ../adduser.conf.5:156 ../deluser.8:177 ../deluser.conf.5:84
 #, no-wrap
 msgid "FILES"
 msgstr "FILER"
 
 # type: Plain text
 #. type: TP
-#: ../adduser.8:305
+#: ../adduser.8:314
 #, no-wrap
 msgid "/etc/adduser.conf"
 msgstr "/etc/adduser.conf"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:308
+#: ../adduser.8:317
 msgid "Default configuration file for adduser and addgroup"
 msgstr "Standard konfigurationsfil för adduser och addgroup"
 
 #. type: TP
-#: ../adduser.8:308
+#: ../adduser.8:317
 #, no-wrap
 msgid "/usr/local/sbin/adduser.local"
 msgstr ""
 
 #. type: Plain text
-#: ../adduser.8:311 ../deluser.8:183
+#: ../adduser.8:320 ../deluser.8:183
 msgid "Optional custom add-ons."
 msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:312 ../adduser.conf.5:149 ../deluser.8:184 ../deluser.conf.5:86
+#: ../adduser.8:321 ../adduser.conf.5:158 ../deluser.8:184 ../deluser.conf.5:86
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SE OCKSÅ"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:319
+#: ../adduser.8:328
 #, fuzzy
-#| msgid ""
-#| "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
-#| "Policy 9.2.2."
 msgid ""
 "B<adduser.conf>(5), B<deluser>(8), B<groupadd>(8), B<useradd>(8), "
 "B<usermod>(8), Debian Policy 9.2.2."
@@ -947,14 +916,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ../adduser.8:320 ../deluser.8:190
+#: ../adduser.8:329 ../deluser.8:190
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:323
+#: ../adduser.8:332
 msgid ""
 "Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland "
 "Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen "
@@ -966,7 +935,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:327 ../deluser.8:200
+#: ../adduser.8:336 ../deluser.8:200
 msgid ""
 "Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original "
 "Debian B<adduser>"
@@ -976,7 +945,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.8:333
+#: ../adduser.8:342
 msgid ""
 "Copyright (C) 1994 Ian Murdock.  B<adduser> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions.  There is "
@@ -1285,12 +1254,14 @@ msgstr "B<NAME_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy
 msgid ""
 "User and group names are checked against this regular expression. If the "
 "name doesn't match this regexp, user and group creation in adduser is "
 "refused unless --force-badname is set. With --force-badname set, only weak "
-"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*$."
+"checks are performed. The default is the most conservative ^[a-z][-a-z0-9]*"
+"$.  When --system is specified, NAME_REGEX_SYSTEM is used instead."
 msgstr ""
 "Namn på användare och grupper kontrolleras mot detta reguljära uttryck. Om "
 "namnet inte matchar detta reguljära uttryck kommer skapandet att vägras om "
@@ -1300,14 +1271,38 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:125
+#: ../adduser.conf.5:126
+#, fuzzy, no-wrap
+msgid "B<NAME_REGEX_SYSTEM>"
+msgstr "B<NAME_REGEX>"
+
+# type: Plain text
+#. type: Plain text
+#: ../adduser.conf.5:134
+#, fuzzy
+msgid ""
+"Names of system users are checked against this regular expression.  If --"
+"system is supplied and the name doesn't match this regexp, user creation in "
+"adduser is refused unless --force-badname is set. With --force-badname set, "
+"only weak checks are performed. The default is as for the default NAME_REGEX "
+"but also allowing uppercase letters."
+msgstr ""
+"Namn på användare och grupper kontrolleras mot detta reguljära uttryck. Om "
+"namnet inte matchar detta reguljära uttryck kommer skapandet att vägras om "
+"inte --force-badname är satt. Med --force-badname satt kommer bara svaga "
+"kontroller att utföras. Standardvärdet är det mest konservativa ^[a-z][-a-"
+"z0-9]*$."
+
+# type: TP
+#. type: TP
+#: ../adduser.conf.5:134
 #, no-wrap
 msgid "B<SKEL_IGNORE_REGEX>"
 msgstr "B<SKEL_IGNORE_REGEX>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 msgid ""
 "Files in /etc/skel/ are checked against this regex, and not copied to the "
 "newly created home directory if they match.  This is by default set to the "
@@ -1321,14 +1316,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:131
+#: ../adduser.conf.5:140
 #, no-wrap
 msgid "B<ADD_EXTRA_GROUPS>"
 msgstr "B<ADD_EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 msgid ""
 "Setting this to something other than 0 (the default) will cause adduser to "
 "add newly created non-system users to the list of groups defined by "
@@ -1340,19 +1335,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ../adduser.conf.5:136
+#: ../adduser.conf.5:145
 #, no-wrap
 msgid "B<EXTRA_GROUPS>"
 msgstr "B<EXTRA_GROUPS>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, fuzzy
-#| msgid ""
-#| "This is the list of groups that new non-system users will be added to.  "
-#| "By default, this list is 'dialout cdrom floppy audio video plugdev users "
-#| "games'"
 msgid ""
 "This is the list of groups that new non-system users will be added to.  By "
 "default, this list is 'dialout cdrom floppy audio video plugdev users games'."
@@ -1362,19 +1353,19 @@ msgstr ""
 "plugdev users games\""
 
 #. type: SH
-#: ../adduser.conf.5:140
+#: ../adduser.conf.5:149
 #, no-wrap
 msgid "NOTES"
 msgstr "ANTECKNINGAR"
 
 #. type: TP
-#: ../adduser.conf.5:141
+#: ../adduser.conf.5:150
 #, no-wrap
 msgid "B<VALID NAMES>"
 msgstr "B<VALID NAMES>"
 
 #. type: Plain text
-#: ../adduser.conf.5:144
+#: ../adduser.conf.5:153
 msgid ""
 "adduser and addgroup enforce conformity to IEEE Std 1003.1-2001, which "
 "allows only the following characters to appear in group and user names: "
@@ -1389,7 +1380,7 @@ msgstr ""
 "av användarnamn (för att överrensstämma med samba)."
 
 #. type: Plain text
-#: ../adduser.conf.5:146
+#: ../adduser.conf.5:155
 msgid ""
 "An additional check can be adjusted via the configuration parameter "
 "NAME_REGEX to enforce a local policy."
@@ -1399,15 +1390,14 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:149
+#: ../adduser.conf.5:158
 msgid "I</etc/adduser.conf>"
 msgstr "I</etc/adduser.conf>"
 
 # type: Plain text
 #. type: Plain text
-#: ../adduser.conf.5:154
+#: ../adduser.conf.5:163
 #, fuzzy
-#| msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
 msgid ""
 "B<addgroup>(8), B<adduser>(8), B<delgroup>(8), B<deluser>(8), B<deluser."
 "conf>(5)"
@@ -1868,24 +1858,21 @@ msgstr ""
 #. type: Plain text
 #: ../deluser.8:180
 #, fuzzy
-#| msgid ""
-#| "/etc/deluser.conf - configuration file for B<deluser(8)> and "
-#| "B<delgroup(8)>."
-msgid "/etc/deluser.conf Default configuration file for deluser and delgroup"
+msgid ""
+"I</etc/deluser.conf> Default configuration file for deluser and delgroup"
 msgstr ""
 "/etc/deluser.conf - konfigurationsfil för B<deluser(8)> och B<delgroup(8)>."
 
 #. type: TP
 #: ../deluser.8:180
 #, no-wrap
-msgid "/usr/local/sbin/deluser.local"
+msgid "I</usr/local/sbin/deluser.local>"
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
 #: ../deluser.8:189
 #, fuzzy
-#| msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
 msgid "B<adduser>(8), B<deluser.conf>(5), B<groupdel>(8), B<userdel>(8)"
 msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
 
@@ -1951,10 +1938,6 @@ msgstr ""
 #. type: Plain text
 #: ../deluser.conf.5:35
 #, fuzzy
-#| msgid ""
-#| "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
-#| "conf(8); settings in deluser.conf may overwrite settings made in adduser."
-#| "conf."
 msgid ""
 "B<deluser(8)> and B<delgroup(8)> also read I</etc/adduser.conf,> see "
 "B<adduser.conf(5);> settings in I<deluser.conf> may overwrite settings made "
@@ -2081,9 +2064,6 @@ msgstr "B<ONLY_IF_EMPTY>"
 #. type: Plain text
 #: ../deluser.conf.5:80
 #, fuzzy
-#| msgid ""
-#| "Only delete a group if there are no user who belong to this group. "
-#| "Defaults to 0."
 msgid ""
 "Only delete a group if there are no users belonging to this group. Defaults "
 "to 0."
@@ -2120,14 +2100,220 @@ msgstr "I</etc/deluser.conf>"
 #. type: Plain text
 #: ../deluser.conf.5:89
 #, fuzzy
-#| msgid "deluser(8), delgroup(8), adduser.conf(5)"
 msgid "B<adduser.conf>(5), B<delgroup>(8), B<deluser(8)>"
 msgstr "deluser(8), delgroup(8), adduser.conf(5)"
 
 # type: Plain text
+#~ msgid ""
+#~ "B<adduser> [options] [--home DIR] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] user"
+#~ msgstr ""
+#~ "B<adduser> [flaggor] [--home KATALOG] [--shell SKAL] [--no-create-home] "
+#~ "[--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GRUPP | --gid ID] [--"
+#~ "disabled-password] [--disabled-login] [--gecos GECOS] [--"
+#~ "add_extra_groups] användare"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<adduser> will copy files from B<SKEL> into the home directory and "
+#~ "prompt for finger (gecos) information and a password.  The gecos may also "
+#~ "be set with the B<--gecos> option.  With the B<--disabled-login> option, "
+#~ "the account will be created but will be disabled until a password is set. "
+#~ "The B<--disabled-password> option will not set a password, but login is "
+#~ "still possible (for example with SSH RSA keys)."
+#~ msgstr ""
+#~ "B<adduser> kommer att kopiera filer från B<SKEL> till hemkatalogen och "
+#~ "fråga efter fingerinformation (gecos) och ett lösenord.  Gecos kan också "
+#~ "ställas in med flaggan B<--gecos>.  Med flaggan B<--disabled-login> "
+#~ "kommer kontot att skapas men inaktiveras tills ett lösenord är satt.  "
+#~ "Flaggan B<--disabled-password> kommer inte att sätta ett lösenord men "
+#~ "inloggning är fortfarande möjlig (till exempel genom SSH RSA-nycklar)."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "By default, user and group names are checked against the configurable "
+#~ "regular expression B<NAME_REGEX> specified in the configuration file. "
+#~ "This option forces B<adduser> and B<addgroup> to apply only a weak check "
+#~ "for validity of the name.  B<NAME_REGEX> is described in B<adduser."
+#~ "conf>(5)."
+#~ msgstr ""
+#~ "Som standard kontrolleras användare och gruppnamn mot ett konfigurerbart "
+#~ "reguljärt uttryck B<NAME_REGEX>.  Denna flagga tvingar B<adduser> och "
+#~ "B<addgroup> att bara genomföra en svag kontroll för namnets giltighet."
+
+# type: Plain text
+#~ msgid ""
+#~ "User and group names are checked against this regular expression. If the "
+#~ "name doesn't match this regexp, user and group creation in adduser is "
+#~ "refused unless --force-badname is set. With --force-badname set, only "
+#~ "weak checks are performed. The default is the most conservative ^[a-z][-a-"
+#~ "z0-9]*$."
+#~ msgstr ""
+#~ "Namn på användare och grupper kontrolleras mot detta reguljära uttryck. "
+#~ "Om namnet inte matchar detta reguljära uttryck kommer skapandet att "
+#~ "vägras om inte --force-badname är satt. Med --force-badname satt kommer "
+#~ "bara svaga kontroller att utföras. Standardvärdet är det mest "
+#~ "konservativa ^[a-z][-a-z0-9]*$."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "/etc/deluser.conf Default configuration file for deluser and delgroup"
+#~ msgstr ""
+#~ "/etc/deluser.conf - konfigurationsfil för B<deluser(8)> och "
+#~ "B<delgroup(8)>."
+
+# type: Plain text
+#~ msgid ""
+#~ "By default, each user in Debian GNU/Linux is given a corresponding group "
+#~ "with the same name.  Usergroups allow group writable directories to be "
+#~ "easily maintained by placing the appropriate users in the new group, "
+#~ "setting the set-group-ID bit in the directory, and ensuring that all "
+#~ "users use a umask of 002.  If this option is turned off by setting "
+#~ "B<USERGROUPS> to I<no>, all users' GIDs are set to B<USERS_GID>.  Users' "
+#~ "primary groups can also be overridden from the command line with the B<--"
+#~ "gid> or B<--ingroup> options to set the group by id or name, "
+#~ "respectively.  Also, users can be added to one or more groups defined in "
+#~ "adduser.conf either by setting ADD_EXTRA_GROUPS to 1 in adduser.conf, or "
+#~ "by passing --add_extra_groups on the commandline."
+#~ msgstr ""
+#~ "Som standard ges varje användare i Debian GNU/Linux en motsvarande grupp "
+#~ "med samma namn. Användargrupper låter kataloger vara skrivbara för "
+#~ "grupper som är lätthanterliga genom att placera lämpliga användare i nya "
+#~ "gruppen, sätta set-group-id-biten på katalogen och se till att alla "
+#~ "användare använder en umask på 002. Om denna funktion är inaktiverad "
+#~ "genom att ställa in B<USERGROUPS> till I<no> ställs alla användares GID "
+#~ "in till B<USERS_GID>.  Användarnas grupper kan också åsidosättas från "
+#~ "kommandoraden med flaggorna B<--gid> eller B<--ingroup> för att ställa in "
+#~ "grupp efter id eller namn, respektive.  Användare kan även läggas till i "
+#~ "en eller flera grupper som definierats i adduser.conf, antingen genom att "
+#~ "ställa in ADD_EXTRA_GROUPS till 1 i adduser.conf eller genom att skicka "
+#~ "med --add_extra_groups på kommandoraden."
+
+# type: TP
+#~ msgid "0 if --quiet is specified"
+#~ msgstr "0 om --quiet angivs"
+
+# type: TP
+#~ msgid "1 if neither --quiet nor --debug is specified"
+#~ msgstr "1 om varken --quiet eller --debug är angivna"
+
+# type: TP
+#~ msgid "2 if --debug is specified"
+#~ msgstr "2 om --debug angivs"
+
+# type: Plain text
+#~ msgid ""
+#~ "(The same applies to the variable DEBUG, but DEBUG is deprecated and will "
+#~ "be removed in a later version of adduser.)"
+#~ msgstr ""
+#~ "(Samma gäller för varibeln DEBUG men DEBUG bör inte användas och kommer "
+#~ "att tas bort i en senare version av adduser.)"
+
+# type: Plain text
+#~ msgid ""
+#~ "If called with one non-option argument and the B<--system> option, "
+#~ "B<adduser> will add a system user. If a user with the same name already "
+#~ "exists in the system uid range (or, if the uid is specified, if a user "
+#~ "with that uid already exists), adduser will exit with a warning. This "
+#~ "warning can be suppressed by adding \"--quiet\"."
+#~ msgstr ""
+#~ "Om anropad med ett icke-flagga-argument och flaggan B<--system> kommer "
+#~ "B<adduser> att lägga till en systemanvändare. Om en användare med samma "
+#~ "namn redan existrerar i system-UID-intervallet (eller, om UID angavs, om "
+#~ "en användare med det UID redan existerar) kommer adduser att avslutas med "
+#~ "en varning. Denna varning kan gömmas med \"--quiet\"."
+
+# type: Plain text
+#~ msgid ""
+#~ "A home directory is created by the same rules as for normal users.  The "
+#~ "new system user will have the shell I</bin/false> (unless overridden with "
+#~ "the B<--shell> option), and have logins disabled.  Skeletal configuration "
+#~ "files are not copied."
+#~ msgstr ""
+#~ "En hemkatalog skapas med samma regler som för vanliga användare.  Den nya "
+#~ "systemanvändaren kommer att ha skalet I</bin/false> (om den inte "
+#~ "åsidosätts med flaggan B<--shell>) och ha möjligheten för inloggning "
+#~ "avstängd.  Skelettkonfigurationsfiler kopieras inte."
+
+# type: Plain text
+#~ msgid ""
+#~ "Add the new user to GROUP instead of a usergroup or the default group "
+#~ "defined by B<USERS_GID> in the configuration file.  This affects the "
+#~ "users primary group.  To add additional groups, see the "
+#~ "B<add_extra_groups> option"
+#~ msgstr ""
+#~ "Lägg till den nya användaren i GRUPP istället för en användargrupp eller "
+#~ "den förvalda gruppen definierad av B<USERS_GID> i inställningsfilen. "
+#~ "Detta påverkar användarens primära grupp. För att lägga till extra "
+#~ "grupper läs vidare om B<add_extra_groups>."
+
+# type: Plain text
+#~ msgid ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+#~ msgstr ""
+#~ "adduser.conf(5), deluser(8), useradd(8), groupadd(8), usermod(8), Debian "
+#~ "Policy 9.2.2."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of UIDs from which normal user's UIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "ange ett intervall av uid från vilka vanliga användares uid dynamiskt kan "
+#~ "allokeras från. Standardvärdet är I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "specify an inclusive range of GIDs from which normal group's GIDs can be "
+#~ "dynamically allocated. Default to I<1000> - I<29999>."
+#~ msgstr ""
+#~ "ange ett intervall av GID från vilka vanliga användares GID dynamiskt kan "
+#~ "allokeras från. Standardvärdet är I<1000> - I<29999>."
+
+# type: Plain text
+#~ msgid ""
+#~ "This is the list of groups that new non-system users will be added to.  "
+#~ "By default, this list is 'dialout cdrom floppy audio video plugdev users "
+#~ "games'"
+#~ msgstr ""
+#~ "Detta är listan på grupper som nya icke-systemanvändare kommer att läggas "
+#~ "till i.  Som standard är denna lista \"dialout cdrom floppy audio video "
+#~ "plugdev users games\""
+
+# type: Plain text
+#~ msgid "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+#~ msgstr "adduser(8), addgroup(8), deluser(8), delgroup(8), deluser.conf(5)"
+
+# type: Plain text
 #~ msgid "/etc/deluser.conf"
 #~ msgstr "/etc/deluser.conf"
 
 # type: Plain text
 #~ msgid "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
 #~ msgstr "deluser.conf(5), adduser(8), userdel(8), groupdel(8)"
+
+#~ msgid ""
+#~ "deluser(8) and delgroup(8) also read /etc/adduser.conf, see adduser."
+#~ "conf(8); settings in deluser.conf may overwrite settings made in adduser."
+#~ "conf."
+#~ msgstr ""
+#~ "deluser(8) och delgroup(8) läs också /etc/adduser.conf, läs även adduser."
+#~ "conf(8). inställningar i deluser.conf kan överlagra inställningar i "
+#~ "adduser.conf."
+
+# type: Plain text
+#~ msgid ""
+#~ "Only delete a group if there are no user who belong to this group. "
+#~ "Defaults to 0."
+#~ msgstr ""
+#~ "Ta endast bort en grupp om det inte finns några som tillhör denna grupp. "
+#~ "Standardvärde är 0."
+
+# type: Plain text
+#~ msgid "deluser(8), delgroup(8), adduser.conf(5)"
+#~ msgstr "deluser(8), delgroup(8), adduser.conf(5)"
diff -pruN 3.118/po/adduser.pot 3.118ubuntu5/po/adduser.pot
--- 3.118/po/adduser.pot	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/adduser.pot	2020-12-10 16:53:10.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,322 +18,326 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr ""
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr ""
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr ""
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr ""
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr ""
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr ""
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr ""
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr ""
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr ""
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr ""
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr ""
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr ""
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr ""
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr ""
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr ""
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr ""
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr ""
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr ""
 
-#: ../adduser:376
+#: ../adduser:397
 #, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
 msgstr ""
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr ""
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 msgstr ""
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr ""
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr ""
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr ""
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr ""
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr ""
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr ""
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr ""
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr ""
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
 "set. Continuing.\n"
 msgstr ""
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr ""
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr ""
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr ""
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr ""
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr ""
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr ""
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr ""
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr ""
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr ""
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr ""
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr ""
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr ""
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr ""
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr ""
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
 "currently creating.\n"
 msgstr ""
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr ""
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr ""
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr ""
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr ""
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr ""
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr ""
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr ""
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr ""
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr ""
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
 "It is not a dir, file, or symlink.\n"
 msgstr ""
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -343,63 +347,64 @@ msgid ""
 "machine accounts $ is also supported at the end of the username\n"
 msgstr ""
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr ""
 
-#: ../adduser:880
+#: ../adduser:951
 #, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr ""
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr ""
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr ""
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr ""
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr ""
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr ""
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr ""
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
 "\n"
 msgstr ""
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -409,7 +414,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -422,11 +427,12 @@ msgid ""
 "General Public License, /usr/share/common-licenses/GPL, for more details.\n"
 msgstr ""
 
-#: ../adduser:1006
+#: ../adduser:1091
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -448,7 +454,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -531,88 +538,88 @@ msgstr ""
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr ""
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr ""
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr ""
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr ""
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr ""
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr ""
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr ""
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr ""
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr ""
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr ""
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr ""
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr ""
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr ""
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
 "\n"
 msgstr ""
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr ""
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 msgstr ""
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 msgstr ""
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
diff -pruN 3.118/po/ca.po 3.118ubuntu5/po/ca.po
--- 3.118/po/ca.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/ca.po	2020-12-10 16:53:10.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.113\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 19:05+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -17,59 +17,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Només el superusuari pot afegir un usuari o grup al sistema.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Només es permeten un o dos noms.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Especifiqueu només un nom en aquest mode.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Les opcions --group, --ingroup i --gid són mútuament exclusives.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "El directori personal ha de ser una ruta absoluta.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Avís: el directori personal %s que heu especificat ja existeix.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Avís: el directori personal %s que heu especificat no és accessible: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "El grup «%s» ja existeix com a grup del sistema. S'està eixint.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "El grup «%s» ja existeix i no és un grup del sistema. S'està eixint.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "L'usuari «%s» ja existeix, però té un GID diferent. S'està eixint.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "El GID «%s» ja està en ús.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -77,67 +77,67 @@ msgstr ""
 "No hi ha cap GID disponible en el rang %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "No s'ha creat el grup «%s».\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "S'està afegint el grup %s (GID %d)…\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Fet.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "El grup «%s» ja existeix.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "No hi ha cap GID disponible en el rang %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "L'usuari «%s» no existeix.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "El grup «%s» no existeix.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "L'usuari «%s» ja és membre del grup «%s».\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "S'està afegint l'usuari «%s» al grup «%s»…\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "L'usuari del sistema «%s» ja existeix. S'està eixint.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "L'usuari «%s» ja existeix. S'està eixint.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "L'usuari «%s» ja existeix com a usuari del sistema. S'està eixint.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "L'usuari «%s» ja existeix amb un UID diferent. S'està eixint.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -146,12 +146,12 @@ msgstr ""
 "No hi ha cap parella UID/GID disponible en el rang %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "L'usuari «%s» no s'ha creat.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -161,36 +161,36 @@ msgstr ""
 
 # Jo Tarzan, tu Jane? jm (dedicat a ivb :)
 # Bah, ho canvie... jm
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "S'ha produït un error intern"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "S'està afegint l'usuari del sistema «%s» (UID %d)…\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "S'està afegint el grup nou %s (GID %d)…\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "S'està afegint l'usuari nou «%s» (UID %d) amb grup «%s»…\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "«%s» ha tornat el codi d'error %d. S'està eixint.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "«%s» ha eixit pel senyal %d. S'està eixint.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -199,12 +199,12 @@ msgstr ""
 "%s ha fallat amb codi de retorn 15, shadow no habilitat, no es pot establir "
 "la caducitat de la contrasenya. S'està continuant.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "S'està afegint l'usuari «%s»…\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -212,84 +212,84 @@ msgstr ""
 "No hi ha cap parella UID/GID disponible en el rang %d-%d (FIRST_UID - "
 "LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "No hi ha cap UID disponible en el rang  %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "S'està afegint el grup nou %s (%d)…\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "S'està afegint el nou usuari %s (%d) amb grup %s…\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Permís denegat\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "combinació d'opcions invàlida\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "s'ha produït una fallada inesperada. No s'ha fet res\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "s'ha produït una fallada inesperada. Manca el fitxer passwd\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "El fitxer passwd és ocupat, proveu-ho de nou\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "argument invàlid per a l'opció\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Voleu tornar-ho a provar? [s/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "És aquesta informació correcta? [S/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "S'està afegint l'usuari nou «%s» als grups extra…\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "S'està establint la quota de l'usuari «%s» als valors de l'usuari «%s»…\n"
 
 # "No s'ha creat"? jm
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "No es crea el directori personal «%s».\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "El directori personal «%s» ja existeix. No es copiarà des de «%s».\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -297,52 +297,56 @@ msgid ""
 msgstr ""
 "Avís: el directori personal «%s» no pertany a l'usuari que esteu creant.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "S'està creant el directori personal «%s»…\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "No s'ha pogut crear el directori personal «%s»: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "S'estan copiant els fitxers des de «%s»…\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "Ha fallat el «fork» de «find»: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "L'usuari «%s» ja existeix, i no és un usuari del sistema.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "L'usuari «%s» ja existeix.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "L'UID %d ja està en ús.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "El GID %d ja està en ús.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "El GID %d no existeix.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -351,7 +355,7 @@ msgstr ""
 "No es pot gestionar %s.\n"
 "No és un directori, fitxer o enllaç simbòlic.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -366,15 +370,16 @@ msgstr ""
 "IEEE 1003.1-2001). Per compatibilitat amb els comptes de servidor\n"
 "del Samba, també es permet el signe «$» al final del nom de l'usuari\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "S'està permentent l'ús d'un nom poc fiable.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Introduïu un nom d'usuari que concorde amb l'expressió\n"
@@ -382,44 +387,44 @@ msgstr ""
 "Useu l'opció «--force-badname» per relaxar aquesta comprovació,\n"
 "o redefiniu «NAME_REGEX».\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "S'està seleccionant un UID del rang %d a %d…\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "S'està seleccionant un GID del rang %d a %d…\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "S'ha aturat: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "S'està suprimint el directori «%s»…\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "S'està suprimint l'usuari «%s»…\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "S'està suprimint el grup «%s»…\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "S'ha capturat un SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -428,7 +433,7 @@ msgstr ""
 "adduser versió %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -444,7 +449,7 @@ msgstr ""
 "                 Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -470,11 +475,13 @@ msgstr ""
 "PER UN PROPÒSIT PARTICULAR.  Vegeu la Llicència Pública General GNU,\n"
 "/usr/share/common-licenses/GPL, per obtenir-ne més detalls.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -496,7 +503,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -504,13 +512,13 @@ msgid ""
 msgstr ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID ]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USUARI\n"
+"[--disabled-password] [--disabled-login] USUARI\n"
 "   Afegeix un usuari normal\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
 "ID ]\n"
 "[--gecos GECOS] [--group | --ingroup GRUP | --gid ID] [--disabled-password]\n"
-"[--disabled-login] [--add_extra_groups] USUARI\n"
+"[--disabled-login] USUARI\n"
 "   Afegeix un usuari del sistema\n"
 "\n"
 "adduser --group [--gid ID] GRUP\n"
@@ -615,64 +623,64 @@ msgstr "No es fa una còpia/suprimeix «
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "No es fa una còpia/suprimeix «%s», concorda amb %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "No es pot gestionar el fitxer especial %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "S'està fent una còpia de seguretat dels fitxers a suprimir en %s…\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "S'estan suprimint els fitxers…\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "S'està suprimint el crontab…\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Avís: el grup «%s» no té més membres.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "Ha fallat «getgrnam %s». Això no hauria de passar.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "El grup «%s» no és un grup del sistema. S'està eixint.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "El grup «%s» no és buit.\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "«%s» encara té «%s» com el grup primari!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "No podeu suprimir l'usuari del seu grup primari.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "L'usuari «%s» no és membre del grup «%s».\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "S'està suprimint l'usuari «%s» del grup «%s»…\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -681,11 +689,11 @@ msgstr ""
 "deluser versió %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Suprimeix usuaris i grups del sistema.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -693,7 +701,7 @@ msgstr ""
 "Copyright © 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -703,7 +711,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> i Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -792,6 +800,96 @@ msgstr "La variable «%s» en %s, línia
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "No s'ha trobat el programa anomenat «%s» al $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "L'usuari «%s» ja existeix. S'està eixint.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Introduïu un nom d'usuari que concorde amb l'expressió\n"
+#~ "regular especificada a la variable de configuració «NAME_REGEX».\n"
+#~ "Useu l'opció «--force-badname» per relaxar aquesta comprovació,\n"
+#~ "o redefiniu «NAME_REGEX».\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID ]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USUARI\n"
+#~ "   Afegeix un usuari normal\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID ]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USUARI\n"
+#~ "   Afegeix un usuari del sistema\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUP\n"
+#~ "addgroup [--gid ID] GRUP\n"
+#~ "   Afegeix un grup d'usuari\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUP\n"
+#~ "   Afegeix un grup del sistema\n"
+#~ "\n"
+#~ "adduser USUARI GRUP\n"
+#~ "   Afegeix un usuari existent a un grup existent\n"
+#~ "\n"
+#~ "opcions generals:\n"
+#~ "  --quiet | -q        no dones informació del procés a l'eixida "
+#~ "estàndard\n"
+#~ "  --force-badname     permet noms d'usuari que no concorden amb la "
+#~ "variable\n"
+#~ "                      de configuració NAME_REGEX\n"
+#~ "  --help | -h         mostra aquest missatge d'ajuda\n"
+#~ "  --version | -v      mostra el número de versió i el copyright\n"
+#~ "  --conf | -c FITXER  empra FITXER com a fitxer de configuració\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Per a utilitzar les funcionalitats --remove-home, --remove-all-files i --"
+#~ "backup\n"
+#~ "cal que instal·leu el paquet «perl-modules». Per fer això, executeu\n"
+#~ "apt-get install perl-modules.\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Avís: el directori personal que heu especificat no existeix.\n"
 
diff -pruN 3.118/po/cs.po 3.118ubuntu5/po/cs.po
--- 3.118/po/cs.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/cs.po	2020-12-10 16:53:10.000000000 +0000
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:22+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -16,125 +16,125 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Pouze root může do systému přidávat uživatele a skupiny.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Povolena jsou pouze jedno nebo dvě jména.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "V tomto režimu můžete zadat pouze jedno jméno.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Volby --group, --ingroup a --gid se navzájem vylučují.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Domovský adresář musí být absolutní cesta.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Varování: Zadaný domovský adresář %s již existuje.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Varování: Zadaný domovský adresář %s není přístupný: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Skupina „%s“ již existuje jako systémová skupina. Končím.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Skupina „%s“ již existuje a není systémová skupina. Končím.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Skupina „%s“ již existuje, ale má odlišné GID. Končím.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "GID „%s“ je již používáno.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Již není volné žádné GID z rozsahu %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Skupina „%s“ nebyla vytvořena.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Přidávám skupinu „%s“ (GID %d)…\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Hotovo.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Skupina „%s“ již existuje.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Již není volné žádné GID z rozsahu %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Uživatel „%s“ neexistuje.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Skupina „%s“ neexistuje.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Uživatel „%s“ je již členem „%s“.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Přidávám uživatele „%s“ do skupiny „%s“…\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Systémový uživatel „%s“ již existuje. Končím.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Uživatel „%s“ již existuje. Končím.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "Uživatel „%s“ již existuje jako systémový uživatel. Končím.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Uživatel „%s“ již existuje s odlišným UID. Končím.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -142,48 +142,48 @@ msgid ""
 msgstr ""
 "Již není volný pár UID/GID z rozsahu %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Uživatel „%s“ nebyl vytvořen.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr ""
 "Již není volné žádné UID z rozsahu %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Přidávám systémového uživatele „%s“ (UID %d)…\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Přidávám novou skupinu „%s“ (GID %d)…\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Přidávám nového uživatele „%s“ (UID %d) se skupinou „%s“…\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "„%s“ vrátil chybový kód %d. Končím.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "„%s“ byl ukončen signálem %d. Končím.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -192,92 +192,92 @@ msgstr ""
 "%s selhal s návratovým kódem 15, stínová hesla nejsou povolena, stárnutí "
 "hesel nebude nastaveno. Pokračuji.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Přidávám uživatele „%s“…\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Již není volný pár UID/GID z rozsahu %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Již není volné žádné UID z rozsahu %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Přidávám novou skupinu „%s“ (%d)…\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Přidávám nového uživatele „%s“ (%d) se skupinou „%s“…\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Přístup odmítnut\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "neplatná kombinace voleb\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "neočekávaná chyba, nic nedělám\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "neočekávaná chyba, soubor passwd chybí\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "souboru passwd je zaneprázdněn, zkuste to znovu\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "neplatný argument pro volbu\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Zkusit znovu? [a/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Jsou informace správné? [A/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Přidávám nového uživatele „%s“ do dalších skupin…\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "Nastavuji kvótu uživatele „%s“ stejnou, jako má uživatel „%s“…\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Nevytvářím domovský adresář „%s“.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Domovský adresář „%s“ již existuje. Nekopíruji z „%s“.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -286,52 +286,56 @@ msgstr ""
 "Varování: zadaný domovský adresář „%s“ nepatří uživateli, kterého právě "
 "vytváříte.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Vytvářím domovský adresář „%s“…\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Nelze vytvořit domovský adresář „%s“: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopíruji soubory z „%s“…\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "fork programu find selhal: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Uživatel „%s“ již existuje a není to systémový uživatel.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Uživatel „%s“ již existuje.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "UID %d je již používáno.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "GID %d je již používáno.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "GID %d neexistuje.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -340,7 +344,7 @@ msgstr ""
 "Nemohu pracovat s %s.\n"
 "Nejedná se o adresář, soubor ani symbolický odkaz.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -354,15 +358,16 @@ msgstr ""
 "nemělo by začínat pomlčkou (definováno v IEEE standardu 1003.1-2001).\n"
 "Pro kompatibilitu se Sambou je na konci jména podporován také znak $.\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Povoluji použití sporného uživatelského jména.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Zadejte prosím uživatelské jméno odpovídající regulárnímu výrazu\n"
@@ -370,44 +375,44 @@ msgstr ""
 "kontroly použijte volbu „--force-badname“, nebo změňte proměnnou\n"
 "NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Vybírám UID z rozsahu %d-%d…\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Vybírám GID z rozsahu %d-%d…\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Zastaven: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Odstraňuji adresář „%s“…\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Odstraňuji uživatele „%s“…\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Odstraňuji skupinu „%s“…\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Zachycen SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -416,7 +421,7 @@ msgstr ""
 "adduser verze %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -432,7 +437,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -452,11 +457,13 @@ msgstr ""
 "JAKÉKOLIV ZÁRUKY. Pro více podrobností si přečtěte GNU General\n"
 "Public License v /usr/share/common-licenses/GPL.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -478,7 +485,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -487,14 +495,14 @@ msgstr ""
 "adduser [--home ADRESÁŘ] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup SKUPINA | --gid "
 "ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] UŽIVATEL\n"
+"[--disabled-password] [--disabled-login] UŽIVATEL\n"
 "   Přidá běžného uživatele\n"
 "\n"
 "adduser --system [--home ADRESÁŘ] [--shell SHELL] [--no-create-home] [--uid "
 "ID]\n"
 "[--gecos GECOS] [--group | --ingroup SKUPINA | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] UŽIVATEL\n"
+"[--disabled-login] UŽIVATEL\n"
 "   Přidá systémového uživatele\n"
 "\n"
 "adduser --group [--gid ID] SKUPINA\n"
@@ -596,64 +604,64 @@ msgstr "Nezálohuji/neodstraňuji „%s
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "Nezálohuji/neodstraňuji „%s“, shoduje se s %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Nelze zpracovat speciální soubor %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Zálohuji soubory k odstranění do %s…\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Odstraňuji soubory…\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Odstraňuji crontab…\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Varování: skupina „%s“ už nemá žádné členy.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam „%s“ selhal. To se nemělo stát.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Skupina „%s“ není systémovou skupinou. Končím.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Skupina „%s“ není prázdná!.\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "Účet „%s“ stále používá „%s“ jako svou primární skupinu!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Nemůžete odstranit účet z jeho primární skupiny.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Uživatel „%s“ není členem skupiny „%s“.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Odstraňuji uživatele „%s“ ze skupiny „%s“…\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -662,11 +670,11 @@ msgstr ""
 "deluser verze %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Odstraňuje ze systému uživatele a skupiny.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -674,7 +682,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -684,7 +692,7 @@ msgstr ""
 "Guy Maor <maor@debian.org>, Ian Murdock <imurdock@gnu.ai.mit.edu>\n"
 "a Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -772,6 +780,95 @@ msgstr "Neznámá proměnná „%s“ v
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "V $PATH neexistuje program jménem „%s“.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Uživatel „%s“ již existuje. Končím.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Zadejte prosím uživatelské jméno odpovídající regulárnímu výrazu\n"
+#~ "nastavenému v konfigurační proměnné NAME_REGEX. Pro obejití této\n"
+#~ "kontroly použijte volbu „--force-badname“, nebo změňte proměnnou\n"
+#~ "NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home ADRESÁŘ] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup SKUPINA | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] UŽIVATEL\n"
+#~ "   Přidá běžného uživatele\n"
+#~ "\n"
+#~ "adduser --system [--home ADRESÁŘ] [--shell SHELL] [--no-create-home] [--"
+#~ "uid ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup SKUPINA | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] UŽIVATEL\n"
+#~ "   Přidá systémového uživatele\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] SKUPINA\n"
+#~ "addgroup [--gid ID] SKUPINA\n"
+#~ "   Přidá uživatelskou skupinu\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] SKUPINA\n"
+#~ "   Přidá systémovou skupinu\n"
+#~ "\n"
+#~ "adduser UŽIVATEL SKUPINA\n"
+#~ "   Přidá existujícího uživatele do existující skupiny\n"
+#~ "\n"
+#~ "obecné volby:\n"
+#~ "  --quiet | -q        nebude vypisovat informace o průběhu\n"
+#~ "  --force-badname     povolí uživatelská jména, která neodpovídají\n"
+#~ "                      konfigurační proměnné NAME_REGEX\n"
+#~ "  --help | -h         tato nápověda\n"
+#~ "  --version | -v      číslo verze a copyright\n"
+#~ "  --conf | -c SOUBOR  jako konfigurační soubor použije SOUBOR\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Abyste mohli využívat volby --remove-home, --remove-all-files a --"
+#~ "backup,\n"
+#~ "musíte nainstalovat balík „perl-modules“. Toho dosáhnete třeba příkazem\n"
+#~ "apt-get install perl-modules.\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Varování: Zadaný domovský adresář neexistuje.\n"
 
diff -pruN 3.118/po/da.po 3.118ubuntu5/po/da.po
--- 3.118/po/da.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/da.po	2020-12-10 16:53:10.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:23+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -18,125 +18,125 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Kun root må tilføje en bruger eller gruppe til systemet.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Kun et eller to navne er tilladt.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Specificer kun et navn i denne tilstand.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "--group, --ingroup og --gid kan ikke bruges sammen.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Hjemmemappen skal være en absolut sti.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Advarsel: Den hjemmemappe %s du angav findes allerede.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Advarsel: Den hjemmemappe %s du angav kan ikke tilgås: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Gruppen »%s« findes allerede som en systemgruppe. Afslutter.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Gruppen »%s« findes allerede og er ikke en systemgruppe. Afslutter.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Brugeren »%s« findes allerede, men har en anderledes GID. Afslutter.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "GID'et »%s« er allerede i brug.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Intet GID er ledigt i intervallet %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Gruppe »%s« ikke tilføjet.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Tilføjer gruppe »%s« (GID %d)...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Færdig.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Gruppen »%s« findes allerede.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Intet GID er ledigt i intervallet %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Brugeren »%s« findes ikke.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Gruppen »%s« findes ikke.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Brugeren »%s« er allerede et medlem af »%s«.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Tilføjer bruger »%s« til gruppen »%s«...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Systembrugeren »%s« findes allerede. Afslutter.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Brugeren »%s« findes allerede. Afslutter.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "Brugeren »%s« findes allerede, og er ikke en systembruger.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Brugeren »%s« findes allerede med en anden UID. Afslutter.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -145,47 +145,47 @@ msgstr ""
 "Intet UID-/GID-par er ledigt i intervallet %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Bruger »%s« blev ikke tilføjet.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr "Intet UID ledigt i intervallet %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Tilføjer systembruger »%s« (UID %d)...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Tilføjer ny gruppe »%s« (GID %d)...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Tilføjer ny bruger »%s« (UID %d) med gruppe »%s«...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "»%s« returnerede fejlkode %d. Afslutter.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "»%s« afsluttede fra signal %d. Afslutter.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -194,93 +194,93 @@ msgstr ""
 "%s fejlede med returkode 15, skygge ikke aktiveret, adgangskodeforfald kan "
 "ikke angives. Fortsætter.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Tilføjer bruger »%s«...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Intet UID-/GID-par er ledigt i intervallet %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Intet UID ledigt i intervallet %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Tilføjer ny gruppe »%s« (%d)...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Tilføjer ny bruger »%s« (%d) med gruppe »%s«...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Tilladelse nægtet\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "ugyldig kombination af tilvalg\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "uventet fejl, intet gjort\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "uventet fejl, adgangskodefil mangler\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "adgangskodefil optaget, forsøg igen\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "ugyldigt argument for tilvalg\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Forsøg igen? [j/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Er informationerne korrekte? [J/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Tilføjer ny bruger »%s« til ekstra grupper...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "Angiver kvota for bruger »%s« til værdier af bruger »%s«...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Opretter ikke hjemmemappe »%s«.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Hjemmemappen »%s« findes allerede. Kopierer ikke fra »%s«.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -288,52 +288,56 @@ msgid ""
 msgstr ""
 "Advarsel: Hjemmemappen »%s« tilhører ikke brugeren, du er ved at oprette.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Opretter hjemmemappe »%s«...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Kunne ikke oprette hjemmemappe »%s«: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopierer filer fra »%s«...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "forgrening for »find« mislykkedes: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Brugeren »%s« findes allerede, og er ikke en systembruger.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Brugeren »%s« findes allerede.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "GID'et %d er allerede i brug.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "GID'et %d er allerede i brug.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "GID %d findes ikke.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -342,7 +346,7 @@ msgstr ""
 "Kan ikke håndtere %s.\n"
 "Det er ikke en mappe, fil eller symbolsk henvisning.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -357,59 +361,60 @@ msgstr ""
 "(som defineret af IEEE Std 1003.1-2001). For kompatibilitet med\n"
 "Sambamaskinkonti er $ også understøttet i slutningen af brugernavnet\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Tillader brug af tvivlsomt brugernavn.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Indtast venligst et brugernavn der matcher det regulære udtryk\n"
 "konfigureret via konfigurationsvariablen NAME_REGEX. Brug tilvalget\n"
 "»--force-badname« til at slække dette tjek eller rekonfigurer NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Vælger UID fra intervallet %d til %d...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Vælger GID fra intervallet %d til %d...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Stoppet: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Fjerner mappe »%s«...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Fjerner bruger »%s«...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Fjerner gruppe »%s«...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Fangede et SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -418,7 +423,7 @@ msgstr ""
 "adduser version %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -434,7 +439,7 @@ msgstr ""
 "               Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -457,11 +462,13 @@ msgstr ""
 "læses i GNU General Public License. Se /usr/share/common-licenses/GPL, for\n"
 "yderligere detaljer.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -483,35 +490,39 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
 "\n"
 msgstr ""
 "adduser [--home MAPPE] [--shell SKAL] [--no-create-home] [--uid ID]\n"
-"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPPE | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] BRUGER\n"
+"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPPE | --gid "
+"ID]\n"
+"[--disabled-password] [--disabled-login] bruger\n"
 "   Tilføjer en normal bruger\n"
 "\n"
-"adduser --system [--home MAPPE] [--shell SKAL] [--no-create-home] [--uid ID]\n"
+"adduser --system [--home MAPPE] [--shell SKAL] [--no-create-home] [--uid "
+"ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPPE | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] BRUGER\n"
+"[--disabled-login] BRUGER\n"
 "   Tilføj en systembruger\n"
 "\n"
 "adduser --group [--gid ID] GRUPPE\n"
 "addgroup [--gid ID] GRUPPE\n"
 "   Tilføjer en brugergruppe\n"
 "\n"
-"adduser --system [--gid ID] GRUPPE\n"
+"adduser --group --system [--gid ID] gruppe\n"
+"addgroup --system [--gid ID] gruppe\n"
 "   Tilføj en systemgruppe\n"
 "\n"
 "adduser BRUGER GRUPPE\n"
 "   Tilføj en eksisterende bruger til en eksisterende gruppe\n"
 "\n"
 "Generelle tilvalg:\n"
-"  --quiet | -q     giv ikke procesinformation til standardud\n"
+"  --quiet | -q     giv ikke procesinformation til stdout\n"
 "  --force-badname  tillad brugernavne som ikke matcher\n"
 "                   konfigurationsvariablen NAME_REGEX\n"
 "  --help | -h      hjælpetekst\n"
@@ -601,64 +612,64 @@ msgstr "Laver ikke sikkerhedskopi/fjerne
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "Laver ikke sikkerhedskopi/fjerne »%s«, den matcher %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Kan ikke håndtere specialfilen %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Laver sikkerhedskopi af filer, der skal fjernes, til %s....\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Fjerner filer...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Fjerner crontab...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Advarsel: Gruppe »%s« har ikke flere medlemmer.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam »%s« mislykkedes. Dette burde ikke ske.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Gruppen »%s« er ikke en systemgruppe. Afslutter.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Gruppen »%s« er ikke tom!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "»%s« har stadig »%s« som deres primære gruppe!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Du må ikke fjerne brugeren fra dennes primære gruppe.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Brugeren »%s« er ikke et medlem af gruppen »%s«.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Fjerner bruger »%s« fra gruppe »%s«...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -667,11 +678,11 @@ msgstr ""
 "deluser version %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Fjerner brugere og grupper fra systemet.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -679,7 +690,7 @@ msgstr ""
 "Ophavsret 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -689,7 +700,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> og Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -775,3 +786,90 @@ msgstr "Ukendt variabel »%s« på »%s
 #, perl-format
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Kunne ikke finde program med navnet »%s« i $PATH.\n"
+
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Brugeren »%s« findes allerede. Afslutter.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Indtast venligst et brugernavn der matcher det regulære udtryk\n"
+#~ "konfigureret via konfigurationsvariablen NAME_REGEX. Brug tilvalget\n"
+#~ "»--force-badname« til at slække dette tjek eller rekonfigurer "
+#~ "NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home MAPPE] [--shell SKAL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPPE | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] BRUGER\n"
+#~ "   Tilføjer en normal bruger\n"
+#~ "\n"
+#~ "adduser --system [--home MAPPE] [--shell SKAL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPPE | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] BRUGER\n"
+#~ "   Tilføj en systembruger\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPPE\n"
+#~ "addgroup [--gid ID] GRUPPE\n"
+#~ "   Tilføjer en brugergruppe\n"
+#~ "\n"
+#~ "adduser --system [--gid ID] GRUPPE\n"
+#~ "   Tilføj en systemgruppe\n"
+#~ "\n"
+#~ "adduser BRUGER GRUPPE\n"
+#~ "   Tilføj en eksisterende bruger til en eksisterende gruppe\n"
+#~ "\n"
+#~ "Generelle tilvalg:\n"
+#~ "  --quiet | -q     giv ikke procesinformation til standardud\n"
+#~ "  --force-badname  tillad brugernavne som ikke matcher\n"
+#~ "                   konfigurationsvariablen NAME_REGEX\n"
+#~ "  --help | -h      hjælpetekst\n"
+#~ "  --version | -v   versionnummer og ophavsret\n"
+#~ "  --conf | -c FIL  brug FIL som konfigurationsfil\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "For at bruge funktionerne --remove-home, --remove-all-files og --backup,\n"
+#~ "skal du installere pakken »perl-modules«. For at udføre dette, kør\n"
+#~ "apt-get install perl-modules.\n"
diff -pruN 3.118/po/de.po 3.118ubuntu5/po/de.po
--- 3.118/po/de.po	2018-09-15 19:03:57.000000000 +0000
+++ 3.118ubuntu5/po/de.po	2020-12-10 16:53:10.000000000 +0000
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.116\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2017-12-19 10:27+0100\n"
 "Last-Translator: Dr. Tobias Quathamer <toddy@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -18,132 +18,134 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Nur root darf Benutzer oder Gruppen zum System hinzufügen.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Nur ein oder zwei Namen erlaubt.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Geben Sie in diesem Modus nur einen Namen an.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr ""
 "Die Optionen --group, --ingroup und --gid schließen sich gegenseitig aus.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Das Home-Verzeichnis muss ein absoluter Pfad sein.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr ""
 "Warnung: Das von Ihnen angegebene Home-Verzeichnis %s existiert bereits.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Warnung: Auf das von Ihnen angegebene Home-Verzeichnis %s kann nicht "
 "zugegriffen werden: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Die Gruppe »%s« existiert bereits als Systemgruppe. Programmende.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 "Die Gruppe »%s« existiert bereits und ist keine Systemgruppe. Programmende.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr ""
 "Die Gruppe »%s« existiert bereits, hat aber eine andere GID. Programmende.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "Die GID »%s« wird bereits verwendet.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Es ist keine GID im Bereich %d-%d verfügbar (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Gruppe »%s« wurde nicht angelegt.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Lege Gruppe »%s« (GID %d) an ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Fertig.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Die Gruppe »%s« existiert bereits.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Es ist keine GID im Bereich %d-%d verfügbar (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Der Benutzer »%s« existiert nicht.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Die Gruppe »%s« existiert nicht.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Der Benutzer »%s« ist bereits ein Mitglied der Gruppe »%s«.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Füge Benutzer »%s« der Gruppe »%s« hinzu ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Der Systembenutzer »%s« existiert bereits. Programmende.\n"
 
-#: ../adduser:376
+#: ../adduser:397
 #, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Der Benutzer »%s« existiert bereits. Programmende.\n"
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr ""
+"Der Benutzer »%s« existiert bereits, ist aber kein Systembenutzer. "
+"Programmende.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr ""
 "Der Benutzer »%s« existiert bereits mit einer anderen UID. Programmende.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -152,48 +154,48 @@ msgstr ""
 "Es ist kein UID/GID-Paar im Bereich %d-%d verfügbar (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Benutzer »%s« wurde nicht angelegt.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr ""
 "Es ist keine UID im Bereich %d-%d verfügbar (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Lege Systembenutzer »%s« (UID %d) an ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Lege neue Gruppe »%s« (GID %d) an ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Lege neuen Benutzer »%s« (UID %d) mit Gruppe »%s« an ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "»%s« gab den Fehlercode %d zurück. Programmende.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "»%s« wurde durch das Signal %d beendet. Programmende.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -202,96 +204,96 @@ msgstr ""
 "%s schlug mit dem Rückgabewert 15 fehl, shadow ist nicht aktiviert, das "
 "Altern von Passwörtern kann nicht eingestellt werden. Programm fährt fort.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Lege Benutzer »%s« an ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Es ist kein UID/GID-Paar im Bereich %d-%d verfügbar (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Es ist keine UID im Bereich %d-%d verfügbar (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Lege neue Gruppe »%s« (%d) an ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Lege neuen Benutzer »%s« (%d) mit Gruppe »%s« an ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Zugriff verweigert\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "Ungültige Kombination von Optionen\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "Unerwarteter Fehler, nichts geändert\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "Unerwarteter Fehler, die Datei passwd fehlt\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "Die Datei passwd wird gerade benutzt, versuchen Sie es erneut\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "Ungültiger Parameter zur Option\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Nochmal versuchen? [j/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Sind die Informationen korrekt? [J/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Füge neuen Benutzer »%s« zu den zusätzlichen Gruppen hinzu ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "Setze Quota für den Benutzer »%s« auf die Werte des Benutzers »%s« ...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Erstelle Home-Verzeichnis »%s« nicht.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr ""
 "Das Home-Verzeichnis »%s« existiert bereits. Kopiere keine Dateien aus "
 "»%s«.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -300,52 +302,56 @@ msgstr ""
 "Warnung: Das Home-Verzeichnis »%s« gehört nicht dem Benutzer, den Sie gerade "
 "anlegen.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Erstelle Home-Verzeichnis »%s« ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Konnte Home-Verzeichnis »%s« nicht erstellen: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopiere Dateien aus »%s« ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "Der Fork für »find« schlug fehl: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Der Benutzer »%s« existiert bereits und ist kein Systembenutzer.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Der Benutzer »%s« existiert bereits.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "Die UID %d wird bereits verwendet.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "Die GID %d wird bereits verwendet.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "Die GID %d existiert nicht.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -354,7 +360,7 @@ msgstr ""
 "Kann mit »%s« nicht umgehen.\n"
 "Es ist kein Verzeichnis, keine Datei und kein Symlink.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -370,15 +376,16 @@ msgstr ""
 "festgelegt). Zur Kompatibilität mit Konten auf Samba-Rechnern wird\n"
 "außerdem $ am Ende des Benutzernamens unterstützt\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Verwendung eines zweifelhaften Benutzernamens wird erlaubt.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Bitte geben Sie einen Benutzernamen ein, der die Kriterien des\n"
@@ -386,44 +393,44 @@ msgstr ""
 "NAME_REGEX festgelegt ist. Verwenden Sie die Option »--force-badname«, um\n"
 "die Überprüfung weniger strikt durchzuführen, oder ändern Sie NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Wähle UID aus dem Bereich von %d bis %d aus ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Wähle GID aus dem Bereich von %d bis %d aus ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Beendet: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Entferne Verzeichnis »%s« ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Entferne Benutzer »%s« ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Entferne Gruppe »%s« ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Das Signal SIG%s wurde empfangen.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -432,7 +439,7 @@ msgstr ""
 "adduser version %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -448,7 +455,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -473,11 +480,13 @@ msgstr ""
 "Details finden Sie in der GNU General Public License\n"
 "(/usr/share/common-licenses/GPL).\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -499,7 +508,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -508,14 +518,14 @@ msgstr ""
 "adduser [--home VERZ] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPPE | --gid "
 "ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] BENUTZER\n"
+"[--disabled-password] [--disabled-login] BENUTZER\n"
 "   Fügt einen normalen Benutzer hinzu\n"
 "\n"
 "adduser --system [--home VERZ] [--shell SHELL] [--no-create-home] [--uid "
 "ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPPE | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] BENUTZER\n"
+"[--disabled-login] BENUTZER\n"
 "   Fügt einen Systembenutzer hinzu\n"
 "\n"
 "adduser --group [--gid ID] GRUPPE\n"
@@ -629,64 +639,64 @@ msgstr "»%s« wurde nicht gesichert/gel
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "»%s« wurde nicht gesichert/gelöscht, da es mit %s übereinstimmt.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Die spezielle Datei %s kann nicht bearbeitet werden\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Die zu löschenden Dateien werden nach %s gesichert ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Dateien werden gelöscht ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Entferne crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Warnung: Die Gruppe »%s« hat keine Mitglieder mehr.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam »%s« schlug fehl. Das sollte nicht passieren.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Die Gruppe »%s« ist keine Systemgruppe. Programmende.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Die Gruppe »%s« ist nicht leer!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "»%s« hat immer noch »%s« als primäre Gruppe!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Sie dürfen den Benutzer nicht aus seiner primären Gruppe entfernen.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Der Benutzer »%s« ist kein Mitglied der Gruppe »%s«.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Entferne Benutzer »%s« aus Gruppe »%s« ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -695,11 +705,11 @@ msgstr ""
 "deluser version %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Entfernt Benutzer und Gruppen vom System.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -707,7 +717,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -717,7 +727,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> und Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -806,7 +816,94 @@ msgstr "Unbekannte Variable »%s« in »
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Kein Programm mit dem Namen »%s« in Verzeichnisliste $PATH gefunden.\n"
 
-#~ msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Der Benutzer »%s« existiert bereits. Programmende.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Bitte geben Sie einen Benutzernamen ein, der die Kriterien des\n"
+#~ "regulären Ausdrucks erfüllt, welcher in der Konfigurationsvariablen "
+#~ "NAME_REGEX festgelegt ist. Verwenden Sie die Option »--force-badname«, "
+#~ "um\n"
+#~ "die Überprüfung weniger strikt durchzuführen, oder ändern Sie "
+#~ "NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home VERZ] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPPE | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] BENUTZER\n"
+#~ "   Fügt einen normalen Benutzer hinzu\n"
+#~ "\n"
+#~ "adduser --system [--home VERZ] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPPE | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] BENUTZER\n"
+#~ "   Fügt einen Systembenutzer hinzu\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPPE\n"
+#~ "addgroup [--gid ID] GRUPPE\n"
+#~ "   Fügt eine Benutzergruppe hinzu\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUPPE\n"
+#~ "   Fügt eine Systemgruppe hinzu\n"
+#~ "\n"
+#~ "adduser BENUTZER GRUPPE\n"
+#~ "   Fügt einen existierenden Benutzer einer existierenden Gruppe hinzu\n"
+#~ "\n"
+#~ "Allgemeine Optionen:\n"
+#~ "  --quiet | -q      Keine Prozessinformationen an stdout senden\n"
+#~ "  --force-badname   Benutzernamen erlauben, die nicht dem regulären "
+#~ "Ausdruck\n"
+#~ "                    der Konfigurationsvariablen NAME_REGEX entsprechen\n"
+#~ "  --help | -h       Hilfstext zur Verwendung\n"
+#~ "  --version | -v    Versionsnummer und Copyright\n"
+#~ "  --conf | -c DATEI benutze DATEI als Konfigurationsdatei\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
 #~ msgstr ""
-#~ "Der Benutzer »%s« existiert bereits, ist aber kein Systembenutzer. "
-#~ "Programmende.\n"
+#~ "Um die Optionen --remove-home, --remove-all-files und --backup nutzen zu\n"
+#~ "können, müssen Sie das »perl-modules«-Paket installieren. Um dies zu "
+#~ "tun,\n"
+#~ "führen Sie den Befehl »apt-get install perl-modules« aus.\n"
diff -pruN 3.118/po/es.po 3.118ubuntu5/po/es.po
--- 3.118/po/es.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/es.po	2020-12-10 16:53:10.000000000 +0000
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.109\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 19:06+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -56,126 +56,126 @@ msgstr ""
 "X-POFile-SpellExtra: GECOS firstuid root\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Sólo root puede añadir un usuario o un grupo al sistema.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Sólo se permiten uno o dos nombres.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Especifique sólo un nombre en este modo.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Las opciones --group, --ingroup y --gid son mutuamente excluyentes.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "El directorio personal debe ser una ruta absoluta.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Aviso: El directorio personal %s que especificó ya existe.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Aviso: No se puede acceder al directorio personal %s que especificó: %s.\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "El grupo `%s' ya existe como grupo del sistema. Saliendo.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "El grupo `%s' ya existe y no es un grupo del sistema. Saliendo.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "El grupo `%s' ya existe, pero tiene un GID distinto. Saliendo.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "Ya se está utilizando el GID `%s'.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "No hay un GID disponible en el rango %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "No se ha creado el grupo `%s'.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Añadiendo el grupo `%s' (GID %d) ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Hecho.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "El grupo `%s' ya existe.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "No hay un GID disponible en el rango %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "El usuario `%s' no existe.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "El grupo `%s' no existe.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "El usuario `%s' ya es un miembro de `%s'.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Añadiendo al usuario `%s' al grupo `%s' ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Ya existe el usuario del sistema `%s'. Saliendo.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Ya existe el usuario `%s'. Saliendo.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "El grupo `%s' ya existe como usuario del sistema. Saliendo.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "El grupo `%s' ya existe pero con un UID distinto. Saliendo.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -184,48 +184,48 @@ msgstr ""
 "No hay un par UID/GID disponible en el rango %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "No se ha creado el usuario `%s'.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr ""
 "No hay un UID disponible en el rango %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Error interno"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Añadiendo el usuario del sistema `%s' (UID %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Añadiendo un nuevo grupo `%s' (GID %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Añadiendo un nuevo usuario `%s' (UID %d) con grupo `%s' ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "`%s' devolvió el código de error %d. Saliendo.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "`%s' salió generando una señal %d. Saliendo.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -235,93 +235,93 @@ msgstr ""
 "ocultas, no se puede configurar la expiración de las contraseñas. "
 "Continuando.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Añadiendo el usuario `%s' ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "No hay un par UID/GID disponible en el rango %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "No hay un UID disponible en el rango %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Añadiendo el nuevo grupo `%s' (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Añadiendo el nuevo usuario `%s' (%d) con grupo `%s' ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Permiso denegado\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "combinación de opciones inválida\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "fallo inesperado, no se hizo nada\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "fallo inesperado, el fichero «passwd» no existe\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "el fichero «passwd» está ocupado, inténtelo de nuevo\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "argumento no válido para la opción\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "¿Intentar de nuevo? [s/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "¿Es correcta la información? [S/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Añadiendo al nuevo usuario `%s' a grupos adicionales ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "Fijando la cuota del usuario `%s' a los valores del usuario `%s' ...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "No se crea el directorio personal `%s'.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "El directorio personal `%s' ya existe.  No se copiará desde `%s'.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -330,52 +330,56 @@ msgstr ""
 "Aviso: El directorio personal `%s' no pertenece al usuario que está creando "
 "ahora.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Creando el directorio personal `%s' ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "No se pudo crear el directorio personal `%s': %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Copiando los ficheros desde `%s' ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "falló el «fork» para `find': %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "El usuario `%s' ya existe, y no es un usuario del sistema.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "El usuario `%s' ya existe.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "Ya se está utilizando el UID %d.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "Ya se está utilizando el GID %d.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "El GID %d no existe.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -384,7 +388,7 @@ msgstr ""
 "No se pudo tratar %s.\n"
 "No es un directorio, fichero o enlace simbólico.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -401,66 +405,67 @@ msgstr ""
 "Se permite «$» al final de un nombre de usuario por compatibilidad con las \n"
 "cuentas de equipo de Samba\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Permitiendo el uso de un nombre de usuario dudoso.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Introduzca un nombre de usuario que se ajuste a la expresión regular\n"
 "configurada en la variable de configuración NAME_REGEX. Utilice la opción\n"
 "«--force-badname» para relajar esta comprobación o reconfigure NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Seleccionando un UID del rango %d a %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Seleccionando un GID del rango %d a %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Detenido: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Eliminando el directorio personal `%s' ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Eliminando al usuario `%s' ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Eliminando al grupo `%s' ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Recibió una señal SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
 "\n"
 msgstr "versión de adduser %s\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -476,7 +481,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -500,11 +505,13 @@ msgstr ""
 "Licencia Pública General de GNU, en /usr/share/common-licenses/GPL,\n"
 "para más detalles.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -526,7 +533,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -534,14 +542,14 @@ msgid ""
 msgstr ""
 "adduser [--home DIRECTORIO] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPO | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USUARIO\n"
+"[--disabled-password] [--disabled-login] USUARIO\n"
 "   Añade un usuario normal\n"
 "\n"
 "adduser --system [--home DIRECTORIO] [--shell SHELL] [--no-create-home] [--"
 "uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPO | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] USUARIO\n"
+"[--disabled-login] USUARIO\n"
 "   Añade un usuario del sistema\n"
 "\n"
 "adduser --group [--gid ID] GRUPO\n"
@@ -590,8 +598,7 @@ msgid ""
 "you need to install the `perl' package. To accomplish that, run\n"
 "apt-get install perl.\n"
 msgstr ""
-"Tiene que instalar el paquete «perl» si quiere utilizar las "
-"funciones\n"
+"Tiene que instalar el paquete «perl» si quiere utilizar las funciones\n"
 "--remove-home, --remove-all-files y --backup. Para hacer esto ejecute \n"
 "«apt-get install perl».\n"
 
@@ -653,64 +660,64 @@ msgstr ""
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "No se hará una copia de seguridad o eliminará «%s», coincide con %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "No se puede gestionar el archivo especial «%s»\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Guardando copia de seguridad de los ficheros a eliminar en %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Eliminando archivos ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Eliminando el «crontab» ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Aviso: el grupo `%s' no tiene más miembros.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "falló getprnam `%s'. Esto no debería pasar.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "El grupo `%s' no es un grupo del sistema. Saliendo.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "¡El grupo `%s' no está vacío!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "¡`%s' aún tiene a `%s' como su grupo primario!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "No puede eliminar al usuario de su grupo primario.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "El usuario `%s' no es un miembro del grupo %s.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Eliminando al usuario `%s' del grupo `%s' ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -719,11 +726,11 @@ msgstr ""
 "versión de deluser %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Eliminan usuarios y grupos del sistema.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -731,7 +738,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -740,7 +747,7 @@ msgstr ""
 "deluser está basado en adduser, de Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> y Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -831,6 +838,100 @@ msgstr "Variable desconocida `%s' en `%s
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "No se pudo encontrar el programa llamado «%s» en $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Ya existe el usuario `%s'. Saliendo.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Introduzca un nombre de usuario que se ajuste a la expresión regular\n"
+#~ "configurada en la variable de configuración NAME_REGEX. Utilice la "
+#~ "opción\n"
+#~ "«--force-badname» para relajar esta comprobación o reconfigure "
+#~ "NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIRECTORIO] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPO | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USUARIO\n"
+#~ "   Añade un usuario normal\n"
+#~ "\n"
+#~ "adduser --system [--home DIRECTORIO] [--shell SHELL] [--no-create-home] "
+#~ "[--uid ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPO | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USUARIO\n"
+#~ "   Añade un usuario del sistema\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPO\n"
+#~ "addgroup [--gid ID] GRUPO\n"
+#~ "   Añade un grupo de usuarios\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUPO\n"
+#~ "   Añade un grupo del sistema\n"
+#~ "\n"
+#~ "adduser USUARIO GRUPO\n"
+#~ "   Añade un usuario existente a un grupo existente\n"
+#~ "\n"
+#~ "\n"
+#~ "opciones generales:\n"
+#~ "  --quiet | -q         no mostrar información del proceso en \n"
+#~ "                       la salida estándar\n"
+#~ "  --force-badname      permitir nombres de usuarios que no \n"
+#~ "                       coincidan con la variable de configuración\n"
+#~ "                       NAME_REGEX\n"
+#~ "  --help | -h          mensaje de uso\n"
+#~ "  --version | -v       número de versión y copyright\n"
+#~ "  --conf | -c FICHERO  usa FICHERO como fichero de configuración\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Tiene que instalar el paquete «perl-modules» si quiere utilizar las "
+#~ "funciones\n"
+#~ "--remove-home, --remove-all-files y --backup. Para hacer esto ejecute \n"
+#~ "«apt-get install perl-modules».\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Aviso: El directorio personal que especificó no existe.\n"
 
diff -pruN 3.118/po/eu.po 3.118ubuntu5/po/eu.po
--- 3.118/po/eu.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/eu.po	2020-12-10 16:53:10.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:21+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
@@ -19,129 +19,131 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr ""
 "root erabiltzaileak bakarrik gehitu ditzake talde edo erabiltzaileak "
 "sistemari\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Izen bat edo bi bakarrik onartzen dira.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Zehaztu izen bat bakarrik modu honetan.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "--group, --ingroup, eta --gid aukerak ezin dira batera erabili.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Karpeta nagusia bide-izen absolutua izan behar da.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Abisua: ezarri duzun %s karpeta nagusia badago lehendik ere.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Abisua: ezarri duzun %s karpeta nagusia ezin da atzitu: %s.\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "'%s' taldea badago lehendik ere sistemako talde gisa. Irteten.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 "'%s' taldea badago lehendik ere eta ez da sistemako talde bat. Irteten.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr ""
 "'%s' taldea badago lehendik ere, baina GID desberdin bat du. Irteten.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "'%s' GIDa dagoeneko erabilita dago.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Ez dago GID erabilgarririk %d-%d barrutian (LEHEN_SIS_GID - AZKEN_SIS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "'%s' taldea ez da sortu.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "'%s' (%d GIDa) taldea gehitzen...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Eginda.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "'%s' taldea badago lehendik ere.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Ez dago GID erabilgarririk %d-%d barrutian (LEHEN_GID - AZKEN_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "'%s' erabiltzailea ez dago.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "'%s' taldea ez dago.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "'%s' erabiltzailea dagoeneko '%s' taldeko kide da.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "'%s' erabiltzailea '%s' taldeari gehitzen...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Sistemako '%s' erabiltzailea badago lehendik ere. Irteten.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "'%s' erabiltzailea badago lehendik ere, Irteten.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr ""
+"'%s' erabiltzailea badago lehendik ere, eta ez da sistemako erabiltzaile "
+"bat.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "'%s' erabiltzailea bestelako UID batekin dago. Irteten.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -150,48 +152,48 @@ msgstr ""
 "Ez dago UID/GID bikote erabilgarririk %d-%d barrutian (LEHEN_SIS_UID - "
 "AZKEN_SIS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "'%s' erabiltzailea ez da sortu.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr ""
 "Ez dago UID erabilgarririk %d-%d barrutian (LEHEN_SIS_UID - AZKEN_SIS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Barneko errorea"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "'%s' sistemako erabiltzailea gehitzen (%d UIDa)...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "'%s' talde berria gehitzen (%d GIDa) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "'%s' erabiltzaile berria (%d UIDa) '%s' taldearekin gehitzen...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "'%s'(e)k %d errore-kodea itzuli du. Irteten.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "'%s' %d seinalearekin irten da. Irteten.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -200,12 +202,12 @@ msgstr ""
 "%s(e)k huts egin du itzulerako 15 kodearekin, shadow ez dago gaituta, ezin "
 "da pasahitzaren iraungitze-data ezarri. Jarraitzen.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "'%s' erabiltzailea gehitzen...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -213,83 +215,83 @@ msgstr ""
 "Ez dago UID/GID bikote erabilgarririk %d-%d barrutian (LEHEN_UID - "
 "AZKEN_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Ez dago UID erabilgarririk %d-%d barrutian (LEHEN_UID - AZKEN_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "'%s' (%d) talde berria gehitzen...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "'%s' (%d) erabiltzaile berria '%s' taldearekin gehitzen...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Baimena ukatuta\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "aukeren konbinazioa baliogabea\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "hustekabeko hutsegitea, ez da ezer egin\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "hustekabeko hutsegitea, pasahitzen fitxategia falta da\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "pasahitzen fitxategia lanpetuta, saiatu berriro\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "aukeraren argumentua baliogabea\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Saiatu berriro? [b/E] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Informazioa zuzena da? [B/e] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "'%s' erabiltzaile berria talde gehigarriei gehitzen...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "'%s' erabiltzailearen kuota '%s' erabiltzailearen balioetara ezartzen...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Ez da '%s' karpeta nagusia sortuko.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr ""
 "'%s' karpeta nagusia badago lehendik ere. Ez da '%s'(e)tik kopiatuko.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -298,54 +300,58 @@ msgstr ""
 "Abisua: '%s' karpeta nagusia ez da unean sortzen ari zaren "
 "erabiltzailearena.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "'%s' karpeta nagusia sortzen...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Ezin izan da '%s' karpeta nagusia sortu: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "'%s'(e)tik fitxategiak kopiatzen...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "huts egin du 'find' sardetzean: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr ""
 "'%s' erabiltzailea badago lehendik ere, eta ez da sistemako erabiltzaile "
 "bat.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "'%s' erabiltzailea badago lehendik ere.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "%d UIDa dagoeneko erabilita dago.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "%d GIDa dagoeneko erabilita dago.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "%d GIDa ez dago.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -354,7 +360,7 @@ msgstr ""
 "Ezin da %s tratatu.\n"
 "Hau ez da direktorio, fitxategi edo esteka sinboliko bat.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -369,59 +375,60 @@ msgstr ""
 "Samba sistemarekin bateragarritasuna mantentzeko\n"
 "'$' ere onartzen da erabiltzaile-izenaren amaieran\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Segurtasun urriko erabiltzaile-izenak gaitzen.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: idatzi NAME_REGEX konfigurazioko aldagaian ezarritako adierazpen\n"
 "erregularra betetzen duen erabiltzaile-izen bat. Erabili '--force-badname'\n"
 "aukera hau zabaltzeko edo NAME_REGEX birkonfiguratzeko.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "UIDa hautatzen %d - %d barrutitik...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "GIDa hautatzen %d - %d barrutitik...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Geldituta: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "'%s' direktorioa kentzen...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "'%s' erabiltzailea kentzen...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "'%s' taldea kentzen...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "SIG%s seinalea jaso da.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -430,7 +437,7 @@ msgstr ""
 "adduser %s bertsioa\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -446,7 +453,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -468,11 +475,13 @@ msgstr ""
 "MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO.\n"
 "Argibide gehiago nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -494,22 +503,24 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
 "\n"
 msgstr ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
-"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup TALDEA | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] ERABILTZAILEA\n"
+"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup TALDEA | --gid "
+"ID]\n"
+"[--disabled-password] [--disabled-login] ERABILTZAILEA\n"
 "   Gehitu erabiltzaile arrunt bat\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
-"[--gecos GECOS] [--group | --ingroup TALDEA | --gid ID]"
-" [--disabled-password]\n"
-"[--disabled-login] [--add_extra_groups] ERABILTZAILEA\n"
-"   Gehitu sistemako erabiltzaile bat\n"
+"[--gecos GECOS] [--group | --ingroup TALDEA | --gid ID] [--disabled-"
+"password]\n"
+"[--disabled-login] ERABILTZAILEA\n"
+"   Gehitu erabiltzaile arrunt bat\n"
 "\n"
 "adduser --group [--gid ID] TALDEA\n"
 "addgroup [--gid ID] TALDEA\n"
@@ -521,14 +532,15 @@ msgstr ""
 "adduser ERABILTZAILEA TALDEA\n"
 "   Gehitu existitzen den erabiltzaile bat existitzen den talde bati\n"
 "\n"
-"aukera orokorraks:\n"
-"  --quiet | -q      ez erakutsi prozesuaren informazioa irteera\n"
+"aukera orokorrak:\n"
+"  --quiet | -q     ez erakutsi prozesuaren informazioa irteera\n"
 "                             estandarrean (sdtout)\n"
-"  --force-badname NAME_REGEX konfigurazioko aldagaiarekin\n"
-"                                 bat ez datozen erabiltzaile-izenak baimendu\n"
-"  --help | -h       erabileraren mezua\n"
+"  --force-badname  NAME_REGEX konfigurazioko aldagaiarekin\n"
+"                                 bat ez datozten erabiltzaile-izenak "
+"baimendu\n"
+"  --help | -h         erabileraren mezua\n"
 "  --version | -v    bertsioaren zenbakia eta copyright-a\n"
-"  --conf | -c FITXATEGIA  erabili FITXATEGIA konfigurazioko fitxategi "
+"  --conf | -c FITXATEGIA      erabili FITXATEGIA konfigurazioko fitxategi "
 "gisa\n"
 "\n"
 
@@ -558,8 +570,7 @@ msgid ""
 "you need to install the `perl' package. To accomplish that, run\n"
 "apt-get install perl.\n"
 msgstr ""
-"'perl' paketea instalatu behar da --remove-home, --remove-all-"
-"files,\n"
+"'perl' paketea instalatu behar da --remove-home, --remove-all-files,\n"
 "eta --backup aukerak erabiltzeko. Horretarako, exekutatu honako komandoa:\n"
 "apt-get install perl\n"
 
@@ -619,64 +630,64 @@ msgid "Not backing up/removing `%s', it
 msgstr ""
 "Ez da '%s'(r)en babeskopiarik/ezabatzerik egingo, %s(r)ekin bat dator.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Ezin da %s fitxategi berezia kudeatu\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Ezabatuko diren fitxategien babeskopia %s(e)n egiten...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Fitxategiak ezabatzen...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "crontab kentzen...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Abisua: '%s' taldeak ez du kide gehiago.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "huts egin du getgrnam '%s' funtzioak. Hau ez zen gertatu beharko.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "'%s' taldea ez da sistemako talde bat. Irteten.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "'%s' taldea ez dago hutsik!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "'%s'(e)k '%s' talde nagusi bezala du!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Ez zenuke erabiltzailea bere talde nagusitik ezabatu behar.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "'%s' erabiltzailea ez da '%s' taldeko kide.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "'%s' erabiltzailea '%s' taldetik kentzen...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -685,11 +696,11 @@ msgstr ""
 "deluser %s bertsioa\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Sistematik erabiltzaile eta taldeak kentzen ditu.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -697,7 +708,7 @@ msgstr ""
 "Copyright-a (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -708,7 +719,7 @@ msgstr ""
 "oinarrituta dago\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -799,4 +810,96 @@ msgstr "'%s' aldagaia ezezaguna '%s'(e)k
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Ezin izan da '%s' izeneko programarik aurkitu $PATH bide-izenean.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "'%s' erabiltzailea badago lehendik ere, Irteten.\n"
 
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: idatzi NAME_REGEX konfigurazioko aldagaian ezarritako adierazpen\n"
+#~ "erregularra betetzen duen erabiltzaile-izen bat. Erabili '--force-"
+#~ "badname'\n"
+#~ "aukera hau zabaltzeko edo NAME_REGEX birkonfiguratzeko.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup TALDEA | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] "
+#~ "ERABILTZAILEA\n"
+#~ "   Gehitu erabiltzaile arrunt bat\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup TALDEA | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] ERABILTZAILEA\n"
+#~ "   Gehitu sistemako erabiltzaile bat\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] TALDEA\n"
+#~ "addgroup [--gid ID] TALDEA\n"
+#~ "   Gehitu erabiltzeren talde bat\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] TALDEA\n"
+#~ "   Gehitu sistemako talde bat\n"
+#~ "\n"
+#~ "adduser ERABILTZAILEA TALDEA\n"
+#~ "   Gehitu existitzen den erabiltzaile bat existitzen den talde bati\n"
+#~ "\n"
+#~ "aukera orokorraks:\n"
+#~ "  --quiet | -q      ez erakutsi prozesuaren informazioa irteera\n"
+#~ "                             estandarrean (sdtout)\n"
+#~ "  --force-badname NAME_REGEX konfigurazioko aldagaiarekin\n"
+#~ "                                 bat ez datozen erabiltzaile-izenak "
+#~ "baimendu\n"
+#~ "  --help | -h       erabileraren mezua\n"
+#~ "  --version | -v    bertsioaren zenbakia eta copyright-a\n"
+#~ "  --conf | -c FITXATEGIA  erabili FITXATEGIA konfigurazioko fitxategi "
+#~ "gisa\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "'perl-modules' paketea instalatu behar da --remove-home, --remove-all-"
+#~ "files,\n"
+#~ "eta --backup aukerak erabiltzeko. Horretarako, exekutatu honako "
+#~ "komandoa:\n"
+#~ "apt-get install perl-modules\n"
diff -pruN 3.118/po/fr.po 3.118ubuntu5/po/fr.po
--- 3.118/po/fr.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/fr.po	2020-12-10 16:53:10.000000000 +0000
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.112+nmu2\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:25+0200\n"
 "Last-Translator: Jean-Baka Domelevo-Entfellner <domelevo@gmail.com>\n"
 "Language-Team: Debian French Team <debian-l10n-french@lists.debian.org>\n"
@@ -21,69 +21,69 @@ msgstr ""
 
 # type: Plain text
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr ""
 "Seul le superutilisateur est autorisé à ajouter un utilisateur ou un groupe "
 "au système.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Un ou deux noms maximum.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Ne fournir qu'un nom dans ce mode.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Les options --group, --ingroup et --gid s'excluent mutuellement.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Le répertoire personnel doit être un chemin absolu.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr ""
 "Attention ! Le répertoire personnel que vous avez indiqué (%s) existe déjà.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Attention ! Impossible d'accéder au répertoire personnel que vous avez "
 "indiqué (%s) : %s.\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr ""
 "Le groupe « %s » existe déjà en tant que groupe système. Fin de la "
 "procédure.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 "Le groupe « %s » existe déjà, sans être un groupe système. Fin de la "
 "procédure.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr ""
 "Le groupe « %s » existe déjà, mais avec un identifiant différent. Fin de la "
 "procédure.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "Le GID « %s » est déjà utilisé.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -91,71 +91,71 @@ msgstr ""
 "Aucun GID n'est disponible dans la plage %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Le groupe « %s » n'a pas été créé.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Ajout du groupe « %s » (GID %d)...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Fait.\n"
 
 # type: Plain text
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Le groupe « %s » existe déjà.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "Aucun GID n'est disponible dans la plage %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "L'utilisateur « %s » n'existe pas.\n"
 
 # type: Plain text
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Le groupe « %s » n'existe pas.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "L'utilisateur « %s » appartient déjà au groupe « %s ».\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Ajout de l'utilisateur « %s » au groupe « %s »...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "L'utilisateur système « %s » existe déjà. Fin de la procédure.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "L'utilisateur « %s » existe déjà. Fin de la procédure.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "L'utilisateur `%s' existe déjà comme utilisateur système. Abandon.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr ""
 "L'utilisateur « %s » existe déjà avec un identifiant différent. Abandon.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -164,12 +164,12 @@ msgstr ""
 "Aucune paire UID/GID n'est disponible dans la plage %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "L'utilisateur « %s » n'a pas été créé.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -177,38 +177,38 @@ msgstr ""
 "Aucun identifiant d'utilisateur n'est disponible dans la plage %d-%d "
 "(FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Ajout de l'utilisateur système « %s » (UID %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Ajout du nouveau groupe « %s » (GID %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr ""
 "Ajout du nouvel utilisateur « %s » (UID %d) avec pour groupe d'appartenance "
 "« %s » ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "« %s » a retourné le code d'erreur %d. Abandon.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "« %s » a terminé sur le signal %d. Abandon.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -218,12 +218,12 @@ msgstr ""
 "passe n'est pas activé, impossible de leur attribuer une durée de vie. "
 "Poursuite de la procédure...\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Ajout de l'utilisateur « %s » ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -231,88 +231,88 @@ msgstr ""
 "Aucune paire d'identifiants d'utilisateur et de groupe n'est disponible dans "
 "la plage %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Aucun identifiant utilisateur n'est disponible dans la plage %d-%d "
 "(FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Ajout du nouveau groupe « %s » (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Ajout du nouvel utilisateur « %s » (%d) avec le groupe « %s » ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Permission refusée\n"
 
 # type: Plain text
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "Combinaison d'options invalide\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "Erreur inattendue, rien n'a été fait.\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "Erreur inattendue, fichier de mots de passe manquant.\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "Fichier de mots de passe occupé, merci de réessayer.\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "Argument invalide sur une option.\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Essayer à nouveau ? [o/N]"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Cette information est-elle correcte ? [O/n]"
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Ajout du nouvel utilisateur « %s » aux groupes supplémentaires...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "Paramétrage des quotas pour l'utilisateur « %s » identique à celui en "
 "vigueur pour « %s »...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Le répertoire personnel « %s » n'a pas été créé.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr ""
 "Le répertoire personnel « %s » existe déjà.  Rien n'est copié depuis "
 "« %s ».\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -321,55 +321,59 @@ msgstr ""
 "Attention ! Le répertoire personnel « %s » n'appartient pas à l'utilisateur "
 "que vous êtes en train de créer.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Création du répertoire personnel « %s »...\n"
 
 # type: Plain text
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Impossible de créer le répertoire personnel « %s » : %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Copie des fichiers depuis « %s »...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "Le fork de « find » a échoué : %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "L'utilisateur « %s » existe déjà, sans être un utilisateur système.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "L'utilisateur « %s » existe déjà.\n"
 
 # type: Plain text
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "L'identifiant utilisateur %d est déjà utilisé.\n"
 
 # type: Plain text
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "L'identifiant de groupe %d est déjà utilisé.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "L'identifiant de groupe %d n'existe pas.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -378,7 +382,7 @@ msgstr ""
 "Impossible d'utiliser %s.\n"
 "Ce n'est ni un répertoire, ni un fichier, ni un lien symbolique.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -396,15 +400,16 @@ msgstr ""
 "Pour des raisons de compatibilité avec les comptes de machines Samba, le "
 "signe dollar est aussi acceptable en fin de nom d'utilisateur.\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Autorise l'usage de noms d'utilisateur critiquables.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s : Merci de bien vouloir indiquer un nom d'utilisateur qui corresponde à "
@@ -413,45 +418,45 @@ msgstr ""
 "« --force-badname »\n"
 "pour outrepasser cette vérification, ou bien reconfigurer NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr ""
 "Choix d'un identifiant utilisateur dans la plage allant de %d à %d...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Choix d'un identifiant de groupe dans la plage allant de %d à %d...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Arrêté : %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Suppression du répertoire « %s »...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Suppression de l'utilisateur « %s »...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Suppression du groupe « %s »...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Capture d'un SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -460,7 +465,7 @@ msgstr ""
 "adduser version %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -476,7 +481,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -502,11 +507,13 @@ msgstr ""
 "merci de vous référer à la Licence Publique Générale GNU, /usr/share/common-"
 "licenses/GPL.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -528,7 +535,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -536,13 +544,13 @@ msgid ""
 msgstr ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] USER\n"
 "   Ajoute un utilisateur normal\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-login] USER\n"
 "   Ajoute un utilisateur système\n"
 "\n"
 "adduser --group [--gid ID] GROUP\n"
@@ -595,8 +603,8 @@ msgid ""
 msgstr ""
 "Afin de pouvoir utiliser les options --remove-home, --remove-all-files, et --"
 "backup,\n"
-"vous devez d'abord installer le paquet « perl ». Pour ce faire, "
-"lancez la commande\n"
+"vous devez d'abord installer le paquet « perl ». Pour ce faire, lancez la "
+"commande\n"
 "« apt-get install perl ».\n"
 
 #: ../deluser:219
@@ -664,65 +672,65 @@ msgid "Not backing up/removing `%s', it
 msgstr ""
 "Pas de sauvegarde ni de suppression pour « %s », qui correspond à %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Impossible de traiter le fichier spécial %s.\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Sauvegarde des fichiers à supprimer vers %s...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Suppression des fichiers...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Suppression du crontab...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Attention ! Le groupe « %s » ne contient plus aucun membre.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam « %s » a échoué. Ceci ne devrait pas se produire.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Le groupe « %s » n'est pas un groupe système. Fin de la procédure.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Le groupe « %s » n'est pas vide !\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "« %s » possèdent toujours « %s » en tant que groupe primaire !\n"
 
 # type: SS
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Impossible de retirer un utilisateur de son groupe primaire.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "L'utilisateur « %s » n'est pas membre du groupe « %s ».\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Suppression de l'utilisateur « %s » du groupe « %s »...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -732,11 +740,11 @@ msgstr ""
 "\n"
 
 # type: Plain text
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Supprime des utilisateurs ou des groupes du système.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -744,7 +752,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -754,7 +762,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -850,6 +858,99 @@ msgstr "Variable inconnue « %s » dan
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Impossible de trouver un programme du nom de « %s » dans $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "L'utilisateur « %s » existe déjà. Fin de la procédure.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s : Merci de bien vouloir indiquer un nom d'utilisateur qui corresponde "
+#~ "à l'expression rationnelle spécifiée\n"
+#~ "via la variable de configuration NAME_REGEX. Vous pouvez utiliser "
+#~ "l'option « --force-badname »\n"
+#~ "pour outrepasser cette vérification, ou bien reconfigurer NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Ajoute un utilisateur normal\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Ajoute un utilisateur système\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Ajoute un groupe utilisateur\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Ajoute un groupe système\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Ajoute un utilisateur existant à un groupe existant\n"
+#~ "\n"
+#~ "options générales :\n"
+#~ "  --quiet | -q      ne pas délivrer sur la sortie standard des "
+#~ "informations sur le processus\n"
+#~ "  --force-badname   autoriser l'utilisation de noms d'utilisateur ne "
+#~ "correspondant pas\n"
+#~ "                    à la variable de configuration NAME_REGEX\n"
+#~ "  --help | -h       obtenir de l'aide sur la syntaxe de la commande\n"
+#~ "  --version | -v    numéro de version et copyright\n"
+#~ "  --conf | -c FICHIER  utiliser le fichier de configuration indiqué\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Afin de pouvoir utiliser les options --remove-home, --remove-all-files, "
+#~ "et --backup,\n"
+#~ "vous devez d'abord installer le paquet « perl-modules ». Pour ce faire, "
+#~ "lancez la commande\n"
+#~ "« apt-get install perl-modules ».\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr ""
 #~ "Attention ! Le répertoire personnel que vous avez indiqué n'existe pas.\n"
diff -pruN 3.118/po/hu.po 3.118ubuntu5/po/hu.po
--- 3.118/po/hu.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/hu.po	2020-12-10 16:53:10.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.103\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:21+0200\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -20,60 +20,60 @@ msgstr ""
 "X-Generator: Poedit 1.8.8\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr ""
 "Csak root joggal lehet új felhasználót vagy csoportot létrehozni a "
 "rendszeren.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Csak egy vagy két név engedélyezett.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Csak 1 nevet adj meg e módban.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "A --group, --ingroup és --gid lehetőségek kizárják egymást.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "A saját könyvtárat a teljes elérési úttal kell megadni.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Figyelem: A megadott saját könyvtár %s már létezik.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Figyelem: A megadott saját könyvtár %s nem hozzáférhető: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "A csoport (%s) már létező rendszercsoport. Kilépek...\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "A csoport (%s) már létezik és nem rendszercsoport. Kilépek...\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "`%s' csoport már létezik egy másik csoport-azonosítóval. Kilépek...\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "A csoport-azonosító (%s) már foglalt.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -81,70 +81,70 @@ msgstr ""
 "Nincs szabad csoport-azonosító e tartományban: %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "A megadott csoport (%s) nem jött létre.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Csoport hozzáadása: %s (csoport-azonosító %d) ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Kész.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "`%s' csoport már létezik.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "Nincs szabad csoport-azonosító e tartományban: %d-%d (FIRST_GID - "
 "LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "`%s' felhasználó nem létezik.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "`%s' csoport nem létezik.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "`%s' felhasználó már tagja a e csoportnak: %s.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "%s felhasználó hozzáadása e csoporthoz: %s ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "`%s' rendszerfelhasználó már létezik. Kilépek...\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "`%s' felhasználó már létezik. Kilépek...\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "%s már létező rendszer-felhasználó. Kilépek...\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr ""
 "`%s' felhasználó már létezik más felhasználói azonosítóval. Kilépek...\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -153,12 +153,12 @@ msgstr ""
 "Nincs szabad felhasználó- és csoport-azonosító pár e tartományban: %d-%d "
 "(FIRST_SYS_UID - LAST_SYS_UID)\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "%s felhasználó nem jött létre.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -166,41 +166,41 @@ msgstr ""
 "Nincs szabad felhasználó-azonosító e tartományban: %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr ""
 "`%s' rendszerfelhasználó hozzáadása (%d felhasználói azonosítóval) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "`%s' nevű új csoport hozzáadása (%d csoport azonosítóval) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr ""
 "`%s' nevű felhasználó létrehozása (%d felhasználói azonosítóval) e "
 "csoportban: `%s' ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "`%s' hibakódot adott: %d. Kilépek...\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr ""
 "`%s' kilépett a következő szignál miatt: %d. Kilépek...\n"
 "\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -209,12 +209,12 @@ msgstr ""
 "A(z) %s 15-ös hibakóddal meghiúsult, a shadow nincs engedélyezve, a "
 "jelszóöregedés nem állítható be. Folytatás.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "`%s' nevű felhasználó hozzáadása...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -222,83 +222,83 @@ msgstr ""
 "Nincs szabad felhasználó- és csoport-azonosító e tartományban: %d-%d "
 "(FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Nincs szabad felhasználó-azonosító e tartományban: %d-%d (FIRST_UID - "
 "LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "`%s' (%d) nevű új csoport hozzáadása...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "`%s' (%d) nevű felhasználó létrehozása e csoportban: `%s' ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Hozzáférés megtagadva\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "Érvénytelen kapcsoló kombináció.\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "Váratlan hiba, semmilyen módosítás nem került végrehajtásra\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "Váratlan hiba, a passwd fájl hiányzik\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "a passwd fájl foglalt, próbáld újra\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "a kapcsoló argumentuma helytelen\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Újra (I/N)?"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Helyesek a megadott adatok? (I/N)"
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "`%s' új felhasználó hozzáadása további csoportokhoz ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "%s felhasználói korlát beállítása ezen felhasználóéhoz: %s ...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Nem hozom létre e saját könyvtárat: `%s'.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "`%s' saját könyvtár már létezik. Nem másolok innen: `%s'.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -307,52 +307,56 @@ msgstr ""
 "Figyelem: a megadott saját könyvtár `%s' nem a jelenleg készülő "
 "felhasználóhoz tartozik.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "`%s' saját könyvtár létrehozása ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Nem tudtam létrehozni e saját könyvtárat `%s': `%s'.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Fájlok másolása innen: `%s' ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "A `find' feldolgozása miatti fork hívás meghiúsult: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "`%s' felhasználó már létezik és nem rendszerfelhasználó.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "`%s' felhasználó már létezik.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "A felhasználó-azonosító (%d) már foglalt.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "A csoport-azonosító (%d) már foglalt.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "%d csoport-azonosító nem létezik.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -361,7 +365,7 @@ msgstr ""
 "Nem tudom feldolgozni: %s.\n"
 "Nem könyvtár, nem állomány, sem nem szimbolikus kapcsolat.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -376,61 +380,62 @@ msgstr ""
 "megfelelően).\n"
 "A Samba-kompatibilitás miatt lehet $ a felhasználónév végén\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr ""
 "Kompatibilitás szempontjából problémás felhasználónevek engedélyezése.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
-"%s: Csak olyan felhasználónevet adj meg, amely illeszkedik a NAME_REGEX\n"
+"Csak olyan felhasználónevet adj meg, amely illeszkedik a name_regex\n"
 "nevű konfigurációs változó által megadott reguláris kifejezésre. \n"
-"Használd a `--force-badname' opciót vagy állítsd át a NAME_REGEX változót,\n"
+"Használd a `--force-badname' opciót vagy állítsd át a name_regex változót,\n"
 "ha ezt a korlátozást fel szeretnéd oldani.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Felhasználói azonosító választása e tartományból: %d-%d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Csoport-azonosító választása e tartományból: %d-%d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Megállítva: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "`%s' könyvtár eltávolítása ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "`%s' felhasználó eltávolítása ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "`%s' csoport eltávolítása ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "SIG%s szignált kapott.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -439,7 +444,7 @@ msgstr ""
 "adduser verzió %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -455,7 +460,7 @@ msgstr ""
 "\tTed Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -478,16 +483,16 @@ msgstr ""
 "További részletekért lásd a GNU General Public License\n"
 "dokumentumot vagy az /usr/share/common-licenses/GPL állományt.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
-"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
-"ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
-"adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
-"ID]\n"
+"adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
 "password]\n"
 "[--disabled-login] [--add_extra_groups] USER\n"
@@ -506,7 +511,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -516,35 +522,28 @@ msgstr ""
 "uid AZONOSÍTÓ]\n"
 "[--firstuid AZONOSÍTÓ] [--lastuid AZONOSÍTÓ] [--gecos GECOS] [--ingroup "
 "CSOPORT | --gid AZONOSÍTÓ]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] FELHASZNÁLÓ\n"
+"[--disabled-password] [--disabled-login] felhasználó\n"
 "   Felhasználó hozzáadása\n"
 "\n"
 "adduser --system [--home KÖNYVTÁR] [--shell PARANCSÉRTELMEZŐ] [--no-create-"
 "home] [--uid AZONOSÍTÓ]\n"
 "[--gecos GECOS] [--group | --ingroup CSOPORT | --gid CSOPORT ] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] FELHASZNÁLÓ\n"
+"[--disabled-login] felhasználó\n"
 "   Rendszerfelhasználó hozzáadása\n"
 "\n"
-"adduser --group [--gid AZONOSÍTÓ] CSOPORT\n"
-"addgroup [--gid AZONOSÍTÓ] CSOPORT\n"
+"adduser --group [--gid AZONOSÍTÓ] csoport\n"
+"addgroup [--gid AZONOSÍTÓ] csoport\n"
 "   Felhasználói csoport hozzáadása\n"
 "\n"
-"addgroup --system [--gid AZONOSÍTÓ] CSOPORT\n"
+"addgroup --system [--gid AZONOSÍTÓ] csoport\n"
 "   Rendszercsoport hozzáadása\n"
 "\n"
-"adduser FELHASZNÁLÓ CSOPORT\n"
+"adduser felhasználó csoport\n"
 "   Egy meglévő felhasználó hozzáadása egy meglévő csoporthoz\n"
 "\n"
-"További paraméterek:\n"
-"  --quiet | -q\tne mutasson feldolgozási információkat az stdout-ra\n"
-"  --force-badname\tengedjen meg olyan felhasználóneveket,\n"
-"\t\t\tamelyek nem illeszkednek a NAME_REGEX konfigurációs változóban\n"
-"\t\t\tmegadottakhoz\n"
-"  --help | -h\tfelhasználási segítség\n"
-"  --version | -v\tverziószám és szerzői jogok kiíratása\n"
-"  --conf | -c FÁJL\thasználja a FÁJL-t konfigurációs fájlként\n"
-"\n"
+"További paraméterek: [--quiet] [--force-badname] [--help] [--version] \n"
+"[--conf FÁJL].\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
 #: ../deluser:99
@@ -605,8 +604,7 @@ msgstr ""
 #: ../deluser:236
 msgid "If you really want this, call deluser with parameter --force\n"
 msgstr ""
-"Ha valóban ezt szeretnéd, add ki a deluser parancsot a --force "
-"paraméterrel\n"
+"Ha valóban ezt szeretnéd, add ki a deluser parancsot a --force paraméterrel\n"
 
 #: ../deluser:237
 msgid "Stopping now without having performed any action\n"
@@ -636,64 +634,64 @@ msgstr "%s csatolási pont, ezért nem k
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "%s illeszkedik erre: %s, így nem kerül eltávolításra/archiválásra.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Nem tudom feldolgozni a %s speciális állományt\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Az eltávolítandó fájlok archiválása ide: %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Fájlok eltávolítása...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "A crontab törlése ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Figyelem: a megadott csoportnak (%s) nincsenek további tagjai.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "A getgrnam `%s' meghiúsult. Ennek nem lenne szabad megtörténnie.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "`%s' csoport nem rendszercsoport. Kilépek.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "`%s' csoport nem üres!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "`%s' elsődleges csoportja még mindig `%s'!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "A felhasználó nem távolítható el az elsődleges csoportjából.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "`%s' felhasználó nem tagja e csoportnak: `%s'.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "`%s' felhasználó eltávolítása e csoportból: `%s'...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -702,11 +700,11 @@ msgstr ""
 "deluser verzió %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Felhasználók és csoportok eltávolítása a rendszerből.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -714,7 +712,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -725,7 +723,7 @@ msgstr ""
 "<tedhajek@boombox.micro.umn.edu> által készített\n"
 "adduser-re épül\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -812,6 +810,100 @@ msgstr "Ismeretlen `%s' változó itt: `
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Nem található %s nevű program a $PATH-ban.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "`%s' felhasználó már létezik. Kilépek...\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Csak olyan felhasználónevet adj meg, amely illeszkedik a NAME_REGEX\n"
+#~ "nevű konfigurációs változó által megadott reguláris kifejezésre. \n"
+#~ "Használd a `--force-badname' opciót vagy állítsd át a NAME_REGEX "
+#~ "változót,\n"
+#~ "ha ezt a korlátozást fel szeretnéd oldani.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home KÖNYVTÁR] [--shell PARANCSÉRTELMEZŐ] [--no-create-home] "
+#~ "[--uid AZONOSÍTÓ]\n"
+#~ "[--firstuid AZONOSÍTÓ] [--lastuid AZONOSÍTÓ] [--gecos GECOS] [--ingroup "
+#~ "CSOPORT | --gid AZONOSÍTÓ]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] "
+#~ "FELHASZNÁLÓ\n"
+#~ "   Felhasználó hozzáadása\n"
+#~ "\n"
+#~ "adduser --system [--home KÖNYVTÁR] [--shell PARANCSÉRTELMEZŐ] [--no-"
+#~ "create-home] [--uid AZONOSÍTÓ]\n"
+#~ "[--gecos GECOS] [--group | --ingroup CSOPORT | --gid CSOPORT ] [--"
+#~ "disabled-password]\n"
+#~ "[--disabled-login] [--add_extra_groups] FELHASZNÁLÓ\n"
+#~ "   Rendszerfelhasználó hozzáadása\n"
+#~ "\n"
+#~ "adduser --group [--gid AZONOSÍTÓ] CSOPORT\n"
+#~ "addgroup [--gid AZONOSÍTÓ] CSOPORT\n"
+#~ "   Felhasználói csoport hozzáadása\n"
+#~ "\n"
+#~ "addgroup --system [--gid AZONOSÍTÓ] CSOPORT\n"
+#~ "   Rendszercsoport hozzáadása\n"
+#~ "\n"
+#~ "adduser FELHASZNÁLÓ CSOPORT\n"
+#~ "   Egy meglévő felhasználó hozzáadása egy meglévő csoporthoz\n"
+#~ "\n"
+#~ "További paraméterek:\n"
+#~ "  --quiet | -q\tne mutasson feldolgozási információkat az stdout-ra\n"
+#~ "  --force-badname\tengedjen meg olyan felhasználóneveket,\n"
+#~ "\t\t\tamelyek nem illeszkednek a NAME_REGEX konfigurációs változóban\n"
+#~ "\t\t\tmegadottakhoz\n"
+#~ "  --help | -h\tfelhasználási segítség\n"
+#~ "  --version | -v\tverziószám és szerzői jogok kiíratása\n"
+#~ "  --conf | -c FÁJL\thasználja a FÁJL-t konfigurációs fájlként\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Ha használni szeretnéd a --remove-home, --remove-all-files és --backup \n"
+#~ "szolgáltatásokat, telepítened kell a `perl-modules' csomagot.\n"
+#~ "Futtasd az apt-get install perl-modules parancsot a csomag\n"
+#~ "telepítéséhez\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Figyelem: A megadott saját könyvtár nem létezik.\n"
 
diff -pruN 3.118/po/it.po 3.118ubuntu5/po/it.po
--- 3.118/po/it.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/it.po	2020-12-10 16:53:10.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:25+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -17,58 +17,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Solo l'utente root può aggiungere un utente o un gruppo al sistema.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Sono consentiti solo uno o due nomi.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "In questa modalità è possibile specificare solo un nome.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Le opzioni --group, --ingroup e --gid sono mutuamente esclusive.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "La directory home deve essere un percorso assoluto.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Attenzione: la directory home %s indicata già esiste.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Attenzione: impossibile accedere alla directory home %s indicata: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Il gruppo «%s» già esiste come gruppo di sistema. Uscita.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Il gruppo «%s» già esiste e non è un gruppo di sistema. Uscita.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Il gruppo «%s» già esiste con un GID diverso. Uscita.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "Il GID «%s» è già utilizzato.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -76,68 +76,68 @@ msgstr ""
 "Nessun GID è disponibile nell'intervallo %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Il gruppo «%s» non è stato creato.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Aggiunta del gruppo «%s» (GID %d) ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Fatto.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Il gruppo «%s» già esiste.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "Nessun GID è disponibile nell'intervallo %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "L'utente «%s» non esiste.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Il gruppo «%s» non esiste.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "L'utente «%s» fa già parte del gruppo «%s».\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Aggiunta dell'utente «%s» al gruppo «%s» ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "L'utente di sistema «%s» già esiste. Uscita.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "L'utente «%s» già esiste. Uscita.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "L'utente «%s» già esiste come utente di sistema. Uscita.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "L'utente «%s» già esiste con un UID diverso. Uscita.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -146,12 +146,12 @@ msgstr ""
 "Nessuna coppia UID/GID è disponibile nell'intervallo %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "L'utente «%s» non è stato creato.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -159,36 +159,36 @@ msgstr ""
 "Nessun UID è disponibile nell'intervallo %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Aggiunta dell'utente di sistema «%s» (UID %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Aggiunta del nuovo gruppo «%s» (GID %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Aggiunta del nuovo utente «%s» (UID %d) con gruppo «%s» ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "«%s» ha restituito l'errore con codice %d. Uscita.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "«%s» uscito a causa del segnale %d. Uscita.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -197,12 +197,12 @@ msgstr ""
 "%s non riuscito restituendo il codice 15, shadow non abilitato, non può "
 "essere abilitata la scadenza delle password. Continuo.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Aggiunta dell'utente «%s» ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -210,84 +210,84 @@ msgstr ""
 "Nessuna coppia UID/GID è disponibile nell'intervallo %d-%d (FIRST_UID - "
 "LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Nessun UID è disponibile nell'intervallo %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Aggiunta del nuovo gruppo «%s» (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Aggiunta del nuovo utente «%s» (%d) con gruppo «%s» ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Permesso negato\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "combinazione di opzioni non valida\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "errore inaspettato, nessuna modifica apportata\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "errore inaspettato, manca il file passwd\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "il file passwd è occupato, riprovare\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "argomento dell'opzione non valido\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Riprovare? [s/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Le informazioni sono corrette? [S/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Aggiunta del nuovo utente «%s» ai gruppi extra ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "Impostazione della quota per l'utente «%s» con la configurazione dell'utente "
 "«%s» ...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "La directory home «%s» non è stata creata.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "La directory home «%s» già esiste. Copia da «%s» non effettuata.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -296,52 +296,56 @@ msgstr ""
 "Attenzione: la directory home «%s» non appartiene all'utente che si sta "
 "creando.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Creazione della directory home «%s» ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Impossibile creare la directory home «%s»: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Copia dei file da «%s» ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "fallito il fork di «find»: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "L'utente «%s» già esiste e non è un utente di sistema.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "L'utente «%s» già esiste.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "Lo UID %d è già utilizzato.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "Il GID %d è già utilizzato.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "Il GID %d non esiste.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -350,7 +354,7 @@ msgstr ""
 "Impossibile gestire %s.\n"
 "Non è una directory, né un file né un collegamento simbolico.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -366,59 +370,60 @@ msgstr ""
 "Samba è supportato l'uso del carattere dollaro ($) come carattere finale\n"
 "del nome utente.\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Consentito l'uso di nomi utente discutibili.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: inserire un nome utente che soddisfi l'espressione regolare configurata\n"
 "tramite la variabile NAME_REGEX. Per evitare questo controllo, utilizzare\n"
 "l'opzione «--force-badname» oppure riconfigurare NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Scelta dell'UID nell'intervallo da %d a %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Scelta del GID nell'intervallo da %d a %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Fermato: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Cancellazione della directory «%s» ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Rimozione dell'utente «%s» ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Rimozione del gruppo «%s» ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Ricevuto SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -427,7 +432,7 @@ msgstr ""
 "adduser versione %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -443,7 +448,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -466,11 +471,13 @@ msgstr ""
 "la\n"
 "GNU General Public License (/usr/share/common-licenses/GPL).\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -492,7 +499,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -501,13 +509,13 @@ msgstr ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPPO | --gid "
 "ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] UTENTE\n"
+"[--disabled-password] [--disabled-login] UTENTE\n"
 "   Aggiunge un utente normale\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPPO | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] UTENTE\n"
+"[--disabled-login] UTENTE\n"
 "   Aggiunge un utente di sistema\n"
 "\n"
 "adduser --group [--gid ID] GRUPPO\n"
@@ -614,66 +622,66 @@ msgstr ""
 "Il backup o la rimozione di «%s» non è stata effettuata, poiché verifica "
 "%s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Impossibile gestire il file speciale %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Backup dei file da cancellare in %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Cancellazione dei file ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Rimozione di crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Attenzione: il gruppo «%s» non ha alcun membro.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam «%s» non riuscito. Non dovrebbe accadere.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Il gruppo «%s» non è un gruppo di sistema. Uscita.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Il gruppo «%s» non è vuoto.\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "L'utente «%s» ha ancora «%s» come gruppo primario.\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr ""
 "Potrebbe non essere possibile rimuovere l'utente dal proprio gruppo "
 "primario.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "L'utente «%s» non fa parte del gruppo «%s».\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Rimozione dell'utente «%s» dal gruppo «%s» ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -682,11 +690,11 @@ msgstr ""
 "deluser versione %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Rimuove utenti e gruppi dal sistema.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -694,7 +702,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -704,7 +712,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> e Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -792,6 +800,97 @@ msgstr "Variabile «%s» sconosciuta in
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Nessun programma con nome «%s» in $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "L'utente «%s» già esiste. Uscita.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: inserire un nome utente che soddisfi l'espressione regolare "
+#~ "configurata\n"
+#~ "tramite la variabile NAME_REGEX. Per evitare questo controllo, "
+#~ "utilizzare\n"
+#~ "l'opzione «--force-badname» oppure riconfigurare NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPPO | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] UTENTE\n"
+#~ "   Aggiunge un utente normale\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPPO | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] UTENTE\n"
+#~ "   Aggiunge un utente di sistema\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPPO\n"
+#~ "addgroup [--gid ID] GRUPPO\n"
+#~ "   Aggiunge un gruppo\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUPPO\n"
+#~ "   Aggiunge un gruppo di sistema\n"
+#~ "\n"
+#~ "adduser UTENTE GRUPPO\n"
+#~ "   Aggiunge un utente esistente a un gruppo esistente\n"
+#~ "\n"
+#~ "opzioni generali:\n"
+#~ "  --quiet | -q      non mostra le informazioni sul processo sullo stdout\n"
+#~ "  --force-badname   permette l'uso di nomi utente che non verificano la\n"
+#~ "                    variabile di configurazione NAME_REGEX\n"
+#~ "  --help | -h       informazioni sull'uso del programma\n"
+#~ "  --version | -v    versione e copyright\n"
+#~ "  --conf | -c FILE  usa FILE come file di configurazione\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Per permettere l'uso delle funzionalità --remove-home, --remove-all-"
+#~ "files\n"
+#~ "e --backup è necessario installare il pacchetto «perl-modules», per "
+#~ "farlo,\n"
+#~ "eseguire apt-get install perl-modules.\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Attenzione: la directory home indicata non esiste.\n"
 
diff -pruN 3.118/po/ja.po 3.118ubuntu5/po/ja.po
--- 3.118/po/ja.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/ja.po	2020-12-10 16:53:10.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-01 08:32+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -18,63 +18,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "root だけがシステムにユーザまたはグループを追加できます。\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "1つまたは2つの名前だけが許可されます。\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "このモードでは1つだけ名前を指定してください。\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "--group, --ingroup, --gid オプションは同時に複数指定できません。\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "ホームディレクトリは絶対パスでなければなりません。\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "警告: 指定されたホームディレクトリ %s はすでに存在しています。\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "警告: 指定されたホームディレクトリ %s にアクセスできません: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr ""
 "グループ `%s' はシステムグループとしてすでに存在しています。終了します。\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 "グループ `%s' はすでに存在しており、システムグループではありません。終了しま"
 "す。\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr ""
 "グループ `%s' はすでに存在していますが、異なるグループ ID を持っています。終"
 "了します。\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "グループ ID `%s' はすでに使用されています。\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -82,68 +82,68 @@ msgstr ""
 "範囲 %d-%d (FIRST_SYS_GID - LAST_SYS_GID) の範囲には利用可能な GID がありませ"
 "ん。\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "`%s' グループは作成されませんでした。\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "グループ `%s' (グループ ID %d) を追加しています...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "完了。\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "グループ `%s' はすでに存在しています。\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "範囲 %d-%d (FIRST_GID - LAST_GID) の範囲には利用可能な GID がありません。\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "ユーザ `%s' は存在しません。\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "グループ `%s' が存在しません。\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "ユーザ `%s' はすでにグループ `%s' のメンバーです。\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "ユーザ `%s' をグループ `%s' に追加しています...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "システムユーザ `%s' はすでに存在しています。終了します。\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "ユーザ `%s' はすでに存在しています。終了します。\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "ユーザ `%s' はすでに存在しており、システムユーザではありません。\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "ユーザ `%s' はすでに異なるユーザ ID で存在します。終了します。\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -152,12 +152,12 @@ msgstr ""
 "範囲 %d-%d (FIRST_SYS_UID - LAST_SYS_UID) の範囲には利用可能な UID/GID のペア"
 "がありません。\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "ユーザ `%s' は作成されませんでした。\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -165,36 +165,36 @@ msgstr ""
 "範囲 %d-%d (FIRST_SYS_UID - LAST_SYS_UID) の範囲には利用可能な UID がありませ"
 "ん。\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "システムユーザ `%s' (UID %d) を追加しています...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "新しいグループ `%s' (GID %d) を追加しています...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "新しいユーザ `%s' (UID %d) をグループ `%s' に追加しています...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "`%s' はエラーコード %d を返しました。終了します。\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "`%s' はシグナル %d で終了しました。終了します。\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -203,12 +203,12 @@ msgstr ""
 "%s は戻り値 15 で失敗しました。shadow は有効でなく、パスワードの時効は設定で"
 "きません。継続します。\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "ユーザ `%s' を追加しています...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -216,83 +216,83 @@ msgstr ""
 "範囲 %d-%d (FIRST_UID - LAST_UID) の範囲には利用可能な UID/GID のペアがありま"
 "せん。\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "範囲 %d-%d (FIRST_UID - LAST_UID) の範囲には利用可能な UID がありません。\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "新しいグループ `%s' (%d) を追加しています...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "新しいユーザ `%s' (%d) をグループ `%s' として追加しています...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "権限がありません\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "無効なオプションの組み合わせです\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "予期せぬ失敗です。何も行われませんでした\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "予期せぬ失敗です。パスワードファイルがありません\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "passwd ファイルがビジーです。再試行してください\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "オプションへの無効な引数です\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "もう一度試しますか? [y/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "以上で正しいですか? [Y/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "別のグループに新しいユーザ '%s' を追加しています...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "ユーザ `%s' のクォータをユーザ `%s' の値に設定しています...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "ホームディレクトリ `%s' は作成しません。\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr ""
 "ホームディレクトリ `%s' はすでに存在します。`%s' からのコピーを行いません。\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -301,52 +301,56 @@ msgstr ""
 "警告: ホームディレクトリ `%s' は、現在作成中のユーザの所属になっていませ"
 "ん。\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "ホームディレクトリ `%s' を作成しています...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "ホームディレクトリ `%s' を作成できませんでした: %s\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "`%s' からファイルをコピーしています...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "`find' の fork に失敗しました: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "ユーザ `%s' はすでに存在しており、システムユーザではありません。\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "ユーザ `%s' はすでに存在しています。\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "ユーザ ID %d はすでに使用されています。\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "グループ ID %d はすでに使用されています。\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "グループ ID %d は存在しません。\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -355,7 +359,7 @@ msgstr ""
 "%s を処理できません。\n"
 "ディレクトリでもファイルでもシンボリックリンクでもありません。\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -372,15 +376,16 @@ msgstr ""
 "に、\n"
 "ユーザ名の最後に $ を置くこともサポートされています。\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "不審なユーザ名の使用を許可しています。\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: NAME_REGEX 設定値で設定された正規表現に適合するユーザ名を入力してくださ"
@@ -389,44 +394,44 @@ msgstr ""
 "定\n"
 "してください。\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "%d から %d の範囲でユーザ ID を選択しています...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "%d から %d の範囲でグループ ID を選択しています...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "停止しました: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "ディレクトリ `%s' を削除しています...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "ユーザ `%s' を削除しています...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "グループ `%s' を削除しています...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "SIG%s を受け取りました。\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -435,7 +440,7 @@ msgstr ""
 "adduser バージョン %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -451,7 +456,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -473,11 +478,13 @@ msgstr ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License, /usr/share/common-licenses/GPL, for more details.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -499,7 +506,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -507,12 +515,13 @@ msgid ""
 msgstr ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] <ユーザ名>\n"
+"[--disabled-password] [--disabled-login] <ユーザ名>\n"
 "   一般ユーザの追加\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
-"[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-password]\n"
-"[--disabled-login] [--add_extra_groups] <ユーザ名>\n"
+"[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+"password]\n"
+"[--disabled-login] <ユーザ名>\n"
 "   システムユーザの追加\n"
 "\n"
 "adduser --group [--gid ID] <グループ名>\n"
@@ -618,65 +627,65 @@ msgstr "`%s' はバックアップ/削
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "`%s' はバックアップ/削除しません。これは %s にマッチします。\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "特殊ファイル %s を操作できません\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "削除されるファイルを %s にバックアップしています...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "ファイルを削除しています...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "crontab を削除しています...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "警告: グループ `%s' にはもうメンバーはいません。\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam `%s' に失敗しました。これは本来起こらないはずです。\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "グループ `%s' はシステムグループではありません。終了します。\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "グループ `%s' は空ではありません!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "`%s' はまだ `%s' を第一のグループとしています!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr ""
 "ユーザを、そのユーザが属する第一のグループから削除することはできません。\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "ユーザ `%s' はグループ `%s' のメンバーではありません。\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "ユーザ `%s' をグループ `%s' から削除しています...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -685,11 +694,11 @@ msgstr ""
 "deluser バージョン %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "ユーザとグループをシステムから削除します。\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -697,7 +706,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -708,7 +717,7 @@ msgstr ""
 "Ted Hajek <tedhajek@boombox.micro.umn.edu> による adduser を元にしていま"
 "す。\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -795,3 +804,92 @@ msgstr "不明な変数 `%s' が `%s' 
 #, perl-format
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "$PATH に `%s' という名前のプログラムが見つかりませんでした。\n"
+
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "ユーザ `%s' はすでに存在しています。終了します。\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: NAME_REGEX 設定値で設定された正規表現に適合するユーザ名を入力してくだ"
+#~ "さい。\n"
+#~ "このチェックを回避するためには `--force-badname' を使うか、NAME_REGEX を再"
+#~ "設定\n"
+#~ "してください。\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] <ユーザ名>\n"
+#~ "   一般ユーザの追加\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] <ユーザ名>\n"
+#~ "   システムユーザの追加\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] <グループ名>\n"
+#~ "addgroup [--gid ID] <グループ名>\n"
+#~ "   ユーザグループの追加\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] <グループ名>\n"
+#~ "   システムグループの追加\n"
+#~ "\n"
+#~ "adduser <ユーザ名> <グループ名>\n"
+#~ "   既存のユーザを既存のグループに追加\n"
+#~ "\n"
+#~ "一般オプション:\n"
+#~ "  --quiet | -q      標準出力に処理情報を表示しない\n"
+#~ "  --force-badname   NAME_REGEX 設定値に適合しないユーザ名を許可する\n"
+#~ "  --help | -h       使用方法\n"
+#~ "  --version | -v    バージョン番号と著作権\n"
+#~ "  --conf | -c <ファイル名>  <ファイル名> を設定ファイルとして使う\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "--remove-home, --remove-all-files, --backup の機能を使うには、\n"
+#~ "`perl-modules' パッケージをインストールする必要があります。これを行うに"
+#~ "は、\n"
+#~ "apt-get install perl-modules を実行してください。\n"
diff -pruN 3.118/po/ko.po 3.118ubuntu5/po/ko.po
--- 3.118/po/ko.po	2018-09-15 19:03:57.000000000 +0000
+++ 3.118ubuntu5/po/ko.po	2020-12-10 16:53:10.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.37\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:26+0200\n"
 "Last-Translator: Eungkyu Song <eungkyu@sparcs.org>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -17,330 +17,334 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Ʈ ڳ ׷ ýۿ ߰  ֽϴ.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr ""
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr " 쿡   ̸   ֽϴ.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr ""
 "--group, --ingroup, ׸ --gid ɼ       ֽϴ.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Ȩ 丮  θ  մϴ.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, fuzzy, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr ":  Ȩ 丮 ̹ մϴ.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, fuzzy, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ":  Ȩ 丮 ̹ մϴ.\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, fuzzy, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, fuzzy, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, fuzzy, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, fuzzy, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "`%s' GID ̹ Դϴ.\n"
 
 # (FIXME) ̷   ..
-#: ../adduser:294
+#: ../adduser:303
 #, fuzzy, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr "    ִ GID ϴ "
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "`%s' ׷  ʾҽϴ.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, fuzzy, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "׷ %s (%s) ߰...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Ϸ.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
 # (FIXME) ̷   ..
-#: ../adduser:324
+#: ../adduser:337
 #, fuzzy, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "    ִ GID ϴ "
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "`%s' ڰ ϴ.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "`%s' ׷ ϴ.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "`%s' ڴ ̹ %s ϿԴϴ.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, fuzzy, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "%s ڸ %s ׷쿡 ߰...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, fuzzy, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
-#: ../adduser:376
+#: ../adduser:397
 #, fuzzy, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, fuzzy, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
 # (FIXME) ̷   ..
-#: ../adduser:394
+#: ../adduser:415
 #, fuzzy, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 msgstr "    ִ UID/GID  ϴ "
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "`%s' ڰ  ʾҽϴ.\n"
 
 # (FIXME) ̷   ..
-#: ../adduser:406
+#: ../adduser:427
 #, fuzzy, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr "    ִ UID ϴ "
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr " "
 
-#: ../adduser:419
+#: ../adduser:440
 #, fuzzy, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "ý  %s ߰...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, fuzzy, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr " ׷ %s (%s) ߰.\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, fuzzy, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "ο  %s (%s) () ׷ %s() ߰մϴ.\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr ""
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr ""
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
 "set. Continuing.\n"
 msgstr ""
 
-#: ../adduser:478
+#: ../adduser:508
 #, fuzzy, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr " %s ߰...\n"
 
 # (FIXME) ̷   ..
-#: ../adduser:486
+#: ../adduser:516
 #, fuzzy, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "    ִ UID/GID  ϴ "
 
 # (FIXME) ̷   ..
-#: ../adduser:498
+#: ../adduser:528
 #, fuzzy, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "    ִ UID ϴ "
 
-#: ../adduser:514
+#: ../adduser:544
 #, fuzzy, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr " ׷ %s (%s) ߰.\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, fuzzy, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "ο  %s (%s) () ׷ %s() ߰մϴ.\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr ""
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr ""
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr ""
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr ""
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr ""
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr ""
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr ""
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 #, fuzzy
 msgid "Is the information correct? [Y/n] "
 msgstr "  ½ϱ? [y/N] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, fuzzy, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "ο  %s (%s) () ׷ %s() ߰մϴ.\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, fuzzy, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "%s ڸ %s ׷쿡 ߰...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, fuzzy, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Ȩ 丮  ʽϴ.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, fuzzy, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Ȩ 丮 %s() ̹ մϴ.  %s  ʽϴ\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
 "currently creating.\n"
 msgstr ""
 
-#: ../adduser:665
+#: ../adduser:714
 #, fuzzy, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Ȩ 丮 %s () ϴ.\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, fuzzy, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Ȩ 丮  ʽϴ.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, fuzzy, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "%s  \n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr ""
 
-#: ../adduser:782
+#: ../adduser:850
 #, fuzzy, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, fuzzy, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "`%s' ׷ ̹ մϴ.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, fuzzy, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "`%s' GID ̹ Դϴ.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, fuzzy, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "`%s' GID ̹ Դϴ.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, fuzzy, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "`%s' ڰ ϴ.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
 "It is not a dir, file, or symlink.\n"
 msgstr ""
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -350,63 +354,64 @@ msgid ""
 "machine accounts $ is also supported at the end of the username\n"
 msgstr ""
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr ""
 
-#: ../adduser:880
+#: ../adduser:951
 #, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 
-#: ../adduser:896
+#: ../adduser:967
 #, fuzzy, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "%s ũ  մϴ.\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, fuzzy, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "%s ũ  մϴ.\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr ""
 
-#: ../adduser:960
+#: ../adduser:1045
 #, fuzzy, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Ȩ 丮 %s () ϴ.\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, fuzzy, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr " %s ߰...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, fuzzy, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "׷ %s (%s) ߰...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr ""
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
 "\n"
 msgstr ""
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -416,7 +421,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -429,11 +434,12 @@ msgid ""
 "General Public License, /usr/share/common-licenses/GPL, for more details.\n"
 msgstr ""
 
-#: ../adduser:1006
+#: ../adduser:1091
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -455,7 +461,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -541,91 +548,91 @@ msgstr ""
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr ""
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr ""
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr ""
 
-#: ../deluser:343
+#: ../deluser:360
 #, fuzzy
 msgid "Removing files ...\n"
 msgstr " %s ߰...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 #, fuzzy
 msgid "Removing crontab ...\n"
 msgstr "׷ %s (%s) ߰...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, fuzzy, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "`%s' ׷  ʾҽϴ.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr ""
 
-#: ../deluser:388
+#: ../deluser:405
 #, fuzzy, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "`%s' ׷ ϴ.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, fuzzy, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "`%s' ׷ ϴ.\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr ""
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr ""
 
-#: ../deluser:436
+#: ../deluser:453
 #, fuzzy, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "`%s' ڴ ̹ %s ϿԴϴ.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, fuzzy, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "%s ڸ %s ׷쿡 ߰...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
 "\n"
 msgstr ""
 
-#: ../deluser:459
+#: ../deluser:476
 #, fuzzy
 msgid "Removes users and groups from the system.\n"
 msgstr "Ʈ ڳ ׷ ýۿ ߰  ֽϴ.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 msgstr ""
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 msgstr ""
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -684,6 +691,10 @@ msgid "Could not find program named `%s'
 msgstr ""
 
 #, fuzzy
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "`%s' ׷ ̹ մϴ.\n"
+
+#, fuzzy
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr ":  Ȩ 丮 ̹ մϴ.\n"
 
diff -pruN 3.118/po/nb.po 3.118ubuntu5/po/nb.po
--- 3.118/po/nb.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/nb.po	2020-12-10 16:53:10.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.95\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:21+0200\n"
 "Last-Translator: Hans F. Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -19,63 +19,63 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Kun root får opprette en bruker eller gruppe på systemet.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Bare ett eller to navn er tillatt.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Angi kun ett navn i dette modus.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "--group, --ingroup, og --gid opsjonene er gjensidig ekskluderende.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Hjemmekatalogen må være en absolutt sti.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr ""
 "Advarsel: Hjemmekatalogen %s som du spesifiserte eksisterer allerede.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Advarsel: Ingen tilgang til hjemmekatalogen %s som du spesifiserte: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Gruppen «%s» eksisterer allerede som en systemgruppe. Avslutter.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 "Gruppen «%s» eksisterer allerede og er ikke en systemgruppe. Avslutter.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr ""
 "Gruppen «%s» eksisterer allerede, men har forskjellig gruppe-ID (GID). "
 "Avslutter.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "Gruppe-ID-en (GID) «%s» er allerede i bruk.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -83,68 +83,68 @@ msgstr ""
 "Ingen gruppe-ID (GID) er ledig i intervallet %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Gruppe «%s» ikke opprettet.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Oppretter gruppe «%s» (GID %d)...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Ferdig.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Gruppen «%s» eksisterer allerede.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "Ingen gruppe-ID (GID) er ledig i intervallet %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Brukeren «%s» eksisterer ikke.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Gruppen «%s» eksisterer ikke.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Brukeren «%s» er allerede et medlem av «%s».\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Oppretter bruker «%s» i gruppe «%s»...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Systembrukeren «%s» eksisterer allerede. Avslutter.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Brukeren «%s» eksisterer allerede. Avslutter.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "Brukeren «%s» eksisterer allerede som en systembruker. Avslutter.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Brukeren «%s» eksisterer allerede med en annen UID. Avslutter.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -153,47 +153,47 @@ msgstr ""
 "Intet UID/GID par er ledig i intervallet %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Bruker «%s» ikke opprettet.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr "Intet UID ledig i intervallet %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Oppretterl systembruker  «%s» (UID %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Oppretter ny gruppe «%s» (GID %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Oppretter ny bruker «%s» (UID %d) med gruppe «%s».\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "«%s» gir feilkode %d. Avslutter.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "«%s» avsluttet med signal %d. Avslutter.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -202,93 +202,93 @@ msgstr ""
 "%s gav feilkode 15, shadow ikke aktivet, passordaldring kan ikke settes. "
 "Fortsetter.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Oppretter bruker  «%s» ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Intet UID/GID par er ledig i intervallet %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Intet UID ledig i intervallet %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Oppretter ny gruppe «%s» (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Oppretter ny bruker «%s» (%d) med gruppe «%s» ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Tilgang nektet\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "ugyldig kombinasjon av valg\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "uventet feil, ingenting utrettet\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "uventet feil, passwd-fil mangler\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "passwd-fil opptatt, prøv igjen\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "ugyldig argument til valg\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Prøv igjen? [j/N]"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Er informasjonen korrekt? [J/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Legger til ny bruker «%s» til ekstra grupper ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "Setter quota for bruker «%s» til verdien for bruker «%s»...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Oppretter ikke hjemmemappe «%s».\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Hjemmemappen «%s» eksisterer allerede. Kopierer ikke fra «%s».\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -297,52 +297,56 @@ msgstr ""
 "Advarsel: Hjemmemappa «%s» tilhører ikke den brukeren du for øyeblikket "
 "oppretter.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Oppretter hjemmemappe «%s» ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Klarte ikke opprette hjemmemappe «%s»: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopierer filer fra «%s» ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "forgrening for «find» feilet: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Brukeren «%s» eksisterer allerede, og er ikke en systembruker.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Brukeren «%s» eksisterer allerede.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "Bruker-ID-en (UID) %d er allerede i bruk.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "Gruppe-ID-en (GID) %d er allerede i bruk.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "Gruppe-ID-en (GID) %d eksisterer ikke.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -351,7 +355,7 @@ msgstr ""
 "Kan ikke jobbe med %s.\n"
 "Det er ikke en mappe, fil eller symbolsk lenke.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -365,59 +369,60 @@ msgstr ""
 "bindestrek (som definert av IEEE Std 1003.1-2001). For samspill med\n"
 "Samba-kontoer er også $ støttet som siste tegn i brukernavnet.\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Tillat bruk av tvilsomme brukernavn.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Skriv inn et brukernavn som samsvarer med det regulære uttrykket satt\n"
 "via NAME_REGEX-konfigurasjonsvariablen. Bruk «--force-badname»-valget\n"
 "for å overstyre denne kontrollen eller rekonfigurer NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Velger UID fra intervall %d til %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Velger GID fra intervall %d til %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Stoppet: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Fjerner katalog «%s» ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Fjerner bruker «%s» ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Fjerner gruppe «%s» ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Fikk signalet SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -426,7 +431,7 @@ msgstr ""
 "adduser versjon %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -442,7 +447,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -464,11 +469,13 @@ msgstr ""
 "EGNETHET FOR NOEN SPESIELL ANVENDELSE.  Se «GNU General Public License»,\n"
 "/usr/share/common-licenses/GPL, for flere detaljer.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -490,7 +497,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -498,14 +506,14 @@ msgid ""
 msgstr ""
 "adduser [--home MAPPE] [--shell SKALL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] bruker\n"
+"[--disabled-password] [--disabled-login] bruker\n"
 "   Legg til en vanlig bruker\n"
 "\n"
 "adduser --system [--home MAPPE] [--shell SKALL] [--no-create-home] [--uid "
 "ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPPE | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] bruker\n"
+"[--disabled-login] bruker\n"
 "   Legg til en systembruker\n"
 "\n"
 "adduser --group [--gid ID] gruppe\n"
@@ -612,64 +620,64 @@ msgstr ""
 "Ingen sikkerhetskopiering eller sletting av «%s» siden det samsvarer med "
 "%s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Klarte ikke behandle spesialfil %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Sikkerhetskopierer filer som skal fjernes til %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Fjerner filer ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Fjerner crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Advarsel: Gruppe «%s» har ingen medlemmer.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam «%s» feilet. Dette skal ikke skje.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Gruppen «%s» er ikke en systemgruppe. Avslutter.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Gruppen «%s» er ikke tom!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "«%s» har fortsatt «%s» som primær gruppe!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Du får ikke fjernet brukeren fra han/hennes primære gruppe.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Brukeren «%s» er ikke medlem av gruppen «%s».\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Fjerner bruker «%s» fra gruppe «%s» ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -678,11 +686,11 @@ msgstr ""
 "deluser versjon %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Fjerner brukere og grupper fra systemet.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -690,7 +698,7 @@ msgstr ""
 "Opphavsrett (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -700,7 +708,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> og Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -787,6 +795,95 @@ msgstr "Ukjent variabel «%s» på «%s
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Klarte ikke finne programmet med navn «%s» i $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Brukeren «%s» eksisterer allerede. Avslutter.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Skriv inn et brukernavn som samsvarer med det regulære uttrykket "
+#~ "satt\n"
+#~ "via NAME_REGEX-konfigurasjonsvariablen. Bruk «--force-badname»-valget\n"
+#~ "for å overstyre denne kontrollen eller rekonfigurer NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home MAPPE] [--shell SKALL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] bruker\n"
+#~ "   Legg til en vanlig bruker\n"
+#~ "\n"
+#~ "adduser --system [--home MAPPE] [--shell SKALL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPPE | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] bruker\n"
+#~ "   Legg til en systembruker\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] gruppe\n"
+#~ "addgroup [--gid ID] gruppe\n"
+#~ "   Legg til en brukergruppe\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] gruppe\n"
+#~ "   Legg til en systemgruppe\n"
+#~ "\n"
+#~ "adduser bruker gruppe\n"
+#~ "   Legg til en eksisterende bruker til en eksisterende gruppe\n"
+#~ "\n"
+#~ "generelle valg:\n"
+#~ "  --quiet | -q      ingen prosessinformasjon til standard utkanal\n"
+#~ "  --force-badname   tillatter brukernavn som ikke samsvarer med\n"
+#~ "                    NAME_REGEX konfigurasjonsvariablen\n"
+#~ "  --help | -h       bruksmelding\n"
+#~ "  --version | -v    versjonsnummer og opphavsrett\n"
+#~ "  --conf | -c FIL   bruk FIL som konfigurasjonsfil\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "For å kunne bruke --remove-home, --remove-all-files, og --backup "
+#~ "opsjonene,\n"
+#~ "må du installere «perl-modules»-pakken. For å gjøre det, kjør\n"
+#~ "«apt-get install perl-modules».\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Advarsel: Hjemmekatalogen du spesifiserte eksisterer ikke.\n"
 
diff -pruN 3.118/po/nl.po 3.118ubuntu5/po/nl.po
--- 3.118/po/nl.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/nl.po	2020-12-10 16:53:10.000000000 +0000
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.41\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 19:07+0200\n"
 "Last-Translator: Remco Rijnders <remco@webconquest.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -18,132 +18,132 @@ msgstr ""
 "X-Poedit-Country: NETHERLANDS\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Alleen root mag een gebruiker of groep aan het systeem toevoegen.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Er zijn maar n of twee namen toegestaan.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Specifieer slechts n naam in deze modus.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "De --group, --ingroup en --gid opties zijn onverenigbaar.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "De homedir moet een absoluut pad zijn.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr ""
 "Waarschuwing: De home-directory  %s die u specificeerde bestaat reeds.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Waarschuwing: De home-directory %s die u specificeerde is niet toegankelijk: "
 "%s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "De groep `%s' bestaat reeds als systeemgroep. Gestopt.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 "De groep `%s' bestaat reeds en is geen systeemgroep. Programma wordt "
 "verlaten.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr ""
 "De group `%s' bestaat reeds, maar heeft een ander groepsnummer. Gestopt.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "De GID `%s' is reeds in gebruik.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Geen GID is beschikbaar in het bereik %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Groep `%s' is niet aangemaakt.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Toevoegen groep `%s' (groepsnummer %d)...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Klaar.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "De groep `%s' bestaat reeds.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Geen GID is beschikbaar in het bereik %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "De gebruiker `%s' bestaat niet.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "De groep `%s' bestaat niet.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "De gebruiker `%s' is reeds lid van `%s'.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Toevoegen gebruiker `%s' aan groep `%s'...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "De gebruiker `%s' bestaat reeds. Programma wordt verlaten.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "De gebruiker `%s' bestaat reeds. Programma wordt verlaten.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "De group `%s' bestaat reeds als een systeemgebruiker. Gestopt.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr ""
 "De group `%s' bestaat reeds met een andere gebruikersnummer. Gestopt.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -152,12 +152,12 @@ msgstr ""
 "Geen gebruikersnummer/groepsnummer paar is beschikbaar in het bereik %d-%d "
 "(FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Gebruiker `%s' is niet aangemaakt.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -165,37 +165,37 @@ msgstr ""
 "Geen gebruikersnummer beschikbaar in het bereik %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Toevoegen systeemgebruiker `%s' (Groepsnummer %d)...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Toevoegen nieuwe groep `%s' (Groepsnummer %d).\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr ""
 "Toevoegen nieuwe gebruiker `%s' (Gebruikersnummer %d) met groep `%s'.\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "`%s' gaf error code %d terug. Gestopt.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "`%s' stopte van signaal %d. Gestopt.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -204,12 +204,12 @@ msgstr ""
 "%s gefaald met code 15, shadow staat niet aan, wachtwoord kan niet worden "
 "gezet. Gaat verder.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Toevoegen van gebruiker `%s'...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -217,83 +217,83 @@ msgstr ""
 "Geen gebruikersnummer/groepsnummer paar is beschikbaar in het bereik %d-%d "
 "(FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Geen groepsnummer beschikbaar in het bereik %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Toevoegen nieuwe groep `%s' (%d).\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Toevoegen nieuwe gebruiker `%s' (%d) met groep `%s'.\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Toegang geweigerd\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "ongeldige combinatie van opties\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "onbekende fout, niets gedaan\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "onverwachte fout, passwd-file niet aanwezig\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "passwd-file in gebruik, probeer later nog eens\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "ongeldig argument bij de opties\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Opnieuw proberen? [y/N]"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Is deze informatie correct? [Y/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Toevoegen nieuwe gebruiker `%s' aan extra groepen.\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "De quota voor gebruiker `%s', aan waarden van gebruiker `%s', is gezet...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Gebruikersmap `%s' is niet aangemaakt.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Gebruikersmap `%s' bestaat reeds.  Wordt niet gekopieerd van `%s'.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -302,52 +302,56 @@ msgstr ""
 "Waarschuwing: deze gebruikersmap `%s' is niet van de gebruiker die u aan het "
 "aanmaken bent.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Aanmaken gebruikersmap `%s'...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Aanmaken gebruikersmap `%s' is niet gelukt: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopiren bestanden van `%s' ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "fork voor `find' heeft gefaalt: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "De gebruiker `%s' bestaat reeds, en is geen systeemgebruiker.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "De groep `%s' bestaat reeds.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "Het gebruikersnummer `%d' is reeds in gebruik.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "Het groepsnummer `%d' is reeds in gebruik.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "Het groepsnummer `%d' bestaat niet.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -356,7 +360,7 @@ msgstr ""
 "Kan niet omgaan met %s.\n"
 "Het is geen map, bestand of symlink.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -373,15 +377,16 @@ msgstr ""
 "Samba machine-accounts $ is ook ondersteund aan het eind van de "
 "gebruikersnaam\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Toelaten van het gebruik van rare gebruikersnaam.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Voer alstublieft een gebruikersnaam in die aan de regular expressie "
@@ -389,44 +394,44 @@ msgstr ""
 "`--force-badname'\n"
 "optie om toch deze naam door te voeren of herconfigureer de NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Selecteren gebruikersnummer tussen %d en %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Selecteren groepsnummer tussen %d en %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Gestopt: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Verwijderen gebruikersmap `%s'.\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Verwijderen gebruiker `%s'...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Verwijderen groep `%s'...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "SIG%s ontvangen.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -435,7 +440,7 @@ msgstr ""
 "adduser versie %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -452,7 +457,7 @@ msgstr ""
 "\n"
 
 #
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -476,11 +481,13 @@ msgstr ""
 "HET WERKT of HET GOED IS VOOR EEN DOEL. Bekijk de GNU\n"
 "General Public License, /usr/share/common-licenses/GPL, voor meer details.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -502,7 +509,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -510,13 +518,13 @@ msgid ""
 msgstr ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] GEBRUIKERSNAAM\n"
+"[--disabled-password] [--disabled-login] GEBRUIKERSNAAM\n"
 "   Voeg een normale gebruiker toe\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] GEBRUIKERSNAAM\n"
+"[--disabled-login] GEBRUIKERSNAAM\n"
 "   Voeg een systeemgebruiker toe\n"
 "\n"
 "adduser --group [--gid ID] GROEP\n"
@@ -625,64 +633,64 @@ msgstr "`%s' niet gebackuped/verwijderd,
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "`%s' niet gebackuped/verwijderd, het komt overeen met %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Kan het speciale bestand %s niet verwerken\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Maken backup van te verwijderen bestanden naar %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Verwijderen bestanden...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Verwijderen crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Waarschuwing: Groep `%s' heeft geen leden meer.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam `%s' gefaalt. Dit zou niet moeten gebeuren.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "De groep `%s' is geen systeemgroep... Gestopt.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "De groep `%s' is niet leeg!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "`%s' heeft nog steeds `%s' als primaire groep!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Je mag geen gebruiker verwijderen van zijn/haar primaire groep.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Gebruiker `%s' is geen lid van groep `%s'.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Verwijderen gebruiker `%s' van groep `%s'...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -691,11 +699,11 @@ msgstr ""
 "deluser: versie %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Verwijderd van gebruikers en groepen van het systeem.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -703,7 +711,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -713,7 +721,7 @@ msgstr ""
 "Murdock\n"
 "<imurdock@gnu.ai.mit.edu> en Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -803,6 +811,96 @@ msgstr "Onbekende variabele `%s' in `%s'
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Kon geen programma met de naam `%s' vinden in $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "De gebruiker `%s' bestaat reeds. Programma wordt verlaten.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Voer alstublieft een gebruikersnaam in die aan de regular expressie "
+#~ "voldoet die ingesteld is via de name_regex configuratie variable. Gebruik "
+#~ "de `--force-badname'\n"
+#~ "optie om toch deze naam door te voeren of herconfigureer de NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] "
+#~ "GEBRUIKERSNAAM\n"
+#~ "   Voeg een normale gebruiker toe\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] GEBRUIKERSNAAM\n"
+#~ "   Voeg een systeemgebruiker toe\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROEP\n"
+#~ "addgroup [--gid ID] GROEP\n"
+#~ "   Voeg een gebruikersgroep toe\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROEP\n"
+#~ "   Voeg een systeemgebruikersgoep toe\n"
+#~ "\n"
+#~ "adduser GEBRUIKERSNAAM GROEP\n"
+#~ "   Voeg een bestaande gebruiker toe aan een bestaande groep\n"
+#~ "\n"
+#~ "Algemene opties:\n"
+#~ "  --quiet | -q      Geef geen proces-inforamtie weer\n"
+#~ "  --force-badname   sta gebruikersnamen toe die niet voldoen aan de\n"
+#~ "                    NAME_REGEX configuratie-variabele\n"
+#~ "  --help | -h       help bericht\n"
+#~ "  --version | -v    versienummer en auteursrecht\n"
+#~ "  --conf | -c FILE  gebruik BESTAND als configuratie-bestand\n"
+
+#
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Om de --remove-home, --remove-all-files en --backup opties te gebruiken\n"
+#~ "moet je het `perl-modules' pakket installeren. Om deze te installeren "
+#~ "draai\n"
+#~ "apt-get install perl-modules.\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Waarschuwing: De homedir die u specifieerde bestaat reeds.\n"
 
diff -pruN 3.118/po/pl.po 3.118ubuntu5/po/pl.po
--- 3.118/po/pl.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/pl.po	2020-12-10 16:53:10.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.112+nmu2\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-02 19:42+0100\n"
 "Last-Translator: Łukasz Dulny <BartekChom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -15,130 +15,130 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10"
-" || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Tylko administrator może dodawać użytkownika lub grupę do systemu.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Dozwolone podanie tylko jednej lub dwóch nazw.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "W tym trybie można podać tylko jedną nazwę.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Opcje --group, --ingroup oraz --gid są wzajemnie wykluczające się.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Katalog domowy musi być podany jako ścieżka bezwzględna.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Ostrzeżenie: Podany katalog domowy %s już istnieje.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Ostrzeżenie: Brak dostępu do podanego katalogu domowego %s: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Grupa \"%s\" już istnieje jako grupa systemowa. Kończenie.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Grupa \"%s\" już istnieje i nie jest grupą systemową. Kończenie.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Grupa \"%s\" już istnieje, ale ma inny GID. Kończenie.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "GID \"%s\" jest już używany.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Brak dostępnego numeru GID w zakresie %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Nie utworzono grupy \"%s\".\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Dodawanie grupy \"%s\" (GID %d)...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Gotowe.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Grupa \"%s\" już istnieje.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Brak dostępnego numeru GID w zakresie %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Użytkownik \"%s\" nie istnieje.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Grupa \"%s\" nie istnieje.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Użytkownik \"%s\" jest już członkiem grupy \"%s\".\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Dodawanie użytkownika \"%s\" do grupy \"%s\"...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Użytkownik systemowy \"%s\" już istnieje. Kończenie.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Użytkownik \"%s\" już istnieje. Kończenie.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "Użytkownik \"%s\" już istnieje i nie jest użytkownikiem systemowym.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Użytkownik \"%s\" już istnieje, ale ma inny UID. Kończenie.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -146,47 +146,47 @@ msgid ""
 msgstr ""
 "Brak dostępnego UID/GID w zakresie %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Nie utworzono użytkownika \"%s\".\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr "Brak dostępnego UID w zakresie %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Dodawanie użytkownika systemowego \"%s\" (UID %d)...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Dodawanie nowej grupy \"%s\" (GID %d)...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Dodawanie nowego użytkownika \"%s\" (UID %d) w grupie \"%s\"...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "\"%s\" zwrócił kod błędu %d. Kończenie.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "\"%s\" zakończony z powodu sygnału %d. Kończenie.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -195,95 +195,95 @@ msgstr ""
 "Niepowodzenie %s - kod wyjścia 15, maskowane hasła nie są włączone, nie "
 "można ustawić wieku hasła. Kontynuowanie.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Dodawanie użytkownika \"%s\"...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Brak dostępnego UID/GID w zakresie %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Brak dostępnego UID w zakresie %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Dodawanie nowej grupy \"%s\" (%d)...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Dodawanie nowego użytkownika \"%s\" (%d) w grupie \"%s\"...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Dostęp zabroniony\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "niepoprawna kombinacja opcji\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "niespodziewany błąd, nic nie zrobiono\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "niespodziewany błąd, brak pliku passwd\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "plik passwd zajęty, proszę spróbować ponownie\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "niepoprawny argument opcji\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Spróbować ponownie? [t/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Czy informacja jest poprawna? [T/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Dodawanie nowego użytkownika \"%s\" do grup dodatkowych...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "Ustawianie kwot dyskowych dla użytkownika \"%s\" na wartości takie, jak ma "
 "użytkownik \"%s\"...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Nie utworzono katalogu domowego \"%s\".\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr ""
 "Katalog domowy \"%s\" już istnieje. Nie zostanie skopiowany z \"%s\".\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -292,52 +292,56 @@ msgstr ""
 "Ostrzeżenie: katalog domowy \"%s\" nie należy do właśnie tworzonego "
 "użytkownika\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Tworzenie katalogu domowego \"%s\"...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Nie utworzono katalogu domowego \"%s\": %s\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopiowanie plików z \"%s\" ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "niepowodzenie fork dla polecenia \"find\": %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Użytkownik \"%s\" już istnieje i nie jest użytkownikiem systemowym.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Użytkownik \"%s\" już istnieje.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "UID %d jest już używany.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "GID %d jest już używany.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "GID %d nie istnieje.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -346,7 +350,7 @@ msgstr ""
 "Nie można przetworzyć %s.\n"
 "Nie jest to ani katalog, ani plik, ani dowiązanie symboliczne.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -361,59 +365,60 @@ msgstr ""
 "się od myślnika (patrz IEEE Std 1003.1-2001). W celu zachowania zgodności\n"
 "z kontami Samby, znak $ jest także wspierany na końcu nazwy użytkownika\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Pozwolenie na użycie kiepskiej jakości nazwy użytkownika.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Proszę wprowadzić nazwę użytkownika pasującą do wyrażenia regularnego\n"
 "ustawionego w zmiennej konfiguracji NAME_REGEX. Proszę użyć opcji\n"
 "\"--force-badname\", aby rozluźnić to sprawdzanie, lub zmienić NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Wybieranie UID z zakresu od %d do %d...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Wybieranie GID z zakresu od %d do %d...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Zatrzymano: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Usuwanie katalogu \"%s\" ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Usuwanie użytkownika \"%s\" ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Usuwanie grupy \"%s\" ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Otrzymano sygnał SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -422,7 +427,7 @@ msgstr ""
 "adduser w wersji %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -438,7 +443,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -460,11 +465,13 @@ msgstr ""
 "DO SPRZEDAŻY ani DO KONKRETNYCH CELÓW. Szczegóły można znaleźć w Ogólnej\n"
 "Licencji Publicznej GNU w pliku /usr/share/common-licenses/GPL.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -486,7 +493,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -494,13 +502,14 @@ msgid ""
 msgstr ""
 "adduser [--home KATALOG] [--shell POWŁOKA] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPA | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] użytkownik\n"
+"[--disabled-password] [--disabled-login] użytkownik\n"
 "   Dodaje zwykłego użytkownika\n"
 "\n"
-"adduser --system [--home KATALOG] [--shell POWŁOKA] [--no-create-home] [--uid"
-" ID]\n"
-"[--gecos GECOS] [--group | --ingroup GRUPA | --gid ID] [--disabled-password]\n"
-"[--disabled-login] [--add_extra_groups] UŻYTKOWNIK\n"
+"adduser --system [--home KATALOG] [--shell POWŁOKA] [--no-create-home] [--"
+"uid ID]\n"
+"[--gecos GECOS] [--group | --ingroup GRUPA | --gid ID] [--disabled-"
+"password]\n"
+"[--disabled-login] UŻYTKOWNIK\n"
 "   Dodaje użytkownika systemowego\n"
 "\n"
 "adduser --group [--gid ID] GRUPA\n"
@@ -521,7 +530,6 @@ msgstr ""
 "  --help | -h       informacje o użyciu programu\n"
 "  --version | -v    numer wersji i prawa autorskie\n"
 "  --conf | -c PLIK  używa PLIKU jako pliku konfiguracji\n"
-"\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
 #: ../deluser:99
@@ -605,64 +613,64 @@ msgstr ""
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "\"%s\" nie będzie archiwizowany/usuwany, gdyż pasuje do %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Nie można obsłużyć pliku specjalnego %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Tworzenie kopii bezpieczeństwa usuwanych plików %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Usuwanie plików ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Usuwanie pliku crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Ostrzeżenie: grupa \"%s\" nie ma już żadnych członków.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "niepowodzenie getgrnam \"%s\". Nie powinno się to było zdarzyć.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Grupa \"%s\" nie jest grupą systemową. Kończenie.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Grupa \"%s\" nie jest pusta!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "\"%s\" wciąż ma \"%s\" jako grupę podstawową!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Nie można usunąć użytkownika z jego/jej podstawowej grupy.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Użytkownik \"%s\" nie jest członkiem grupy \"%s\".\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Usuwanie użytkownika \"%s\" z grupy \"%s\" ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -671,11 +679,11 @@ msgstr ""
 "deluser w wersji %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Usuwa użytkowników i grup z systemu.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -683,7 +691,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -693,7 +701,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> i Teda Hajeka <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -781,3 +789,92 @@ msgstr "Nieznana zmienna \"%s\" w \"%s\"
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "W zmiennej $PATH nie znaleziono programu \"%s\".\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Użytkownik \"%s\" już istnieje. Kończenie.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Proszę wprowadzić nazwę użytkownika pasującą do wyrażenia "
+#~ "regularnego\n"
+#~ "ustawionego w zmiennej konfiguracji NAME_REGEX. Proszę użyć opcji\n"
+#~ "\"--force-badname\", aby rozluźnić to sprawdzanie, lub zmienić "
+#~ "NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home KATALOG] [--shell POWŁOKA] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPA | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] użytkownik\n"
+#~ "   Dodaje zwykłego użytkownika\n"
+#~ "\n"
+#~ "adduser --system [--home KATALOG] [--shell POWŁOKA] [--no-create-home] [--"
+#~ "uid ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPA | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] UŻYTKOWNIK\n"
+#~ "   Dodaje użytkownika systemowego\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPA\n"
+#~ "addgroup [--gid ID] grupa\n"
+#~ "   Dodaje zwykłą grupę\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUPA\n"
+#~ "  Dodaje grupę systemową\n"
+#~ "\n"
+#~ "adduser UŻYTKOWNIK GRUPA\n"
+#~ "   Dodaje istniejącego użytkownika do istniejącej grupy\n"
+#~ "\n"
+#~ "Opcje ogólne:\n"
+#~ "  --quiet | -q      nie wypisuje informacji na stdout\n"
+#~ "  --force-badname   dopuszcza nazwy użytkowników, które\n"
+#~ "                    nie pasują do wyrażenia regularnego\n"
+#~ "                    podanego w zmiennej konf. NAME_REGEX\n"
+#~ "  --help | -h       informacje o użyciu programu\n"
+#~ "  --version | -v    numer wersji i prawa autorskie\n"
+#~ "  --conf | -c PLIK  używa PLIKU jako pliku konfiguracji\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Aby użyć opcji --remove-home, --remove-all-files oraz --backup,\n"
+#~ "należy zainstalować pakiet \"perl-modules\". W tym celu uruchom\n"
+#~ "apt-get install perl-modules\n"
diff -pruN 3.118/po/pt_BR.po 3.118ubuntu5/po/pt_BR.po
--- 3.118/po/pt_BR.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/pt_BR.po	2020-12-10 16:53:10.000000000 +0000
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.105\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:20+0200\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -34,127 +34,127 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Somente root pode acrescentar um usuário ou grupo ao sistema.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Somente um ou dois nomes permitidos.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Especifique somente um nome neste modo.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "As opções --group, --ingroup e --gid são mutuamente exclusivas.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "O diretório pessoal deve ser um caminho absoluto.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Alerta: o diretório pessoal %s que você especificou já existe.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Alerta: o diretório pessoal %s que você especificou não pode ser acessado: "
 "%s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "O grupo '%s' já existe como um grupo de sistema. Saindo.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "O grupo '%s' já existe e não é um grupo de sistema. Saindo.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "O grupo '%s' já existe, mas tem um GID diferente. Saindo.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "O GID '%s' já está em uso.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Nenhum GID está disponível na faixa %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "O grupo '%s' não foi criado.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Adicionando grupo '%s' (GID %d) ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Concluído.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "O grupo '%s' já existe.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Nenhum GID está disponível na faixa %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "O usuário '%s' não existe.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "O grupo '%s' não existe.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "O usuário '%s' já é um membro de '%s'.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Adicionando usuário '%s' ao grupo '%s' ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "O usuário de sistema '%s' já existe. Saindo.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "O usuário '%s' já existe. Saindo.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "O usuário '%s' já existe, e não é um usuário de sistema.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "O usuário '%s' já existe com um UID diferente. Saindo.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -163,48 +163,48 @@ msgstr ""
 "Nenhum par UID/GID está disponível na faixa %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "O usuário '%s' não foi criado.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr ""
 "Nenhum UID está disponível na faixa %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Adicionando usuário de sistema '%s' (UID %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Adicionando novo grupo '%s' (GID %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Adicionando novo usuário '%s' (UID %d) com grupo '%s' ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "'%s' retornou código de erro %d. Saindo.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "'%s' saiu a partir do sinal %d. Saindo.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -213,93 +213,93 @@ msgstr ""
 "%s falhou com código de retorno 15, shadow não habilitado, idade da senha "
 "não pode ser definida. Continuando.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Adicionando usuário '%s' ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Nenhum par UID/GID está disponível na faixa %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Nenhum UID está disponível na faixa %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Adicionando novo grupo '%s' (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Adicionando novo usuário '%s' (%d) com grupo '%s' ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Permissão negada\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "combinação de opções inválida\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "falha inesperada, nada a ser feito\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "falha inesperada, arquivo passwd faltando\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "arquivo passwd ocupado, tente novamente\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "argumento invalido para opção\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Tentar novamente? [s/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "A informação está correta? [S/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Adicionando novo usuário '%s' a grupos extra ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "Definindo cota para usuário '%s' para valores de usuário '%s' ...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Não criando diretório pessoal '%s'.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "O diretório pessoal '%s' já existe. Não copiando de '%s'.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -308,52 +308,56 @@ msgstr ""
 "Alerta: o diretório pessoal '%s' não pertence ao usuário que você está "
 "criando atualmente.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Criando diretório pessoal '%s' ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Não foi possível criar diretório pessoal '%s': %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Copiando arquivos de '%s' ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "fork para 'find' falhou: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "O usuário '%s' já existe, e não é um usuário de sistema.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "O usuário '%s' já existe.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "O UID %d já está em uso.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "O GID %d já está em uso.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "O GID %d não existe.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -362,7 +366,7 @@ msgstr ""
 "Não é possível lidar com %s.\n"
 "Não é um diretório, arquivo ou link simbólico.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -378,15 +382,16 @@ msgstr ""
 "com contas de máquinas Samba o uso do caractere $ também é\n"
 "suportado no final do nome do usuário\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Permitindo o uso de nome de usuário questionável.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Por favor, informe um nome de usuário compatível com a expressão\n"
@@ -394,44 +399,44 @@ msgstr ""
 "a opção '--force-badname' para aliviar esta verificação ou reconfigure\n"
 "NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Selecionando UID da faixa %d a %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Selecionando GID da faixa %d a %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Parou: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Removendo diretório '%s' ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Removendo usuário '%s' ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Removendo grupo '%s' ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Capturou um SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -440,7 +445,7 @@ msgstr ""
 "adduser versão %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -456,7 +461,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -478,11 +483,13 @@ msgstr ""
 "OU ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. Consulte a Licença Pública\n"
 "Geral do GNU, /usr/share/common-licenses/GPL, para mais detalhes.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -504,7 +511,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -512,13 +520,13 @@ msgid ""
 msgstr ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USUÁRIO\n"
+"[--disabled-password] [--disabled-login] USUÁRIO\n"
 "   Adiciona um usuário normal\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPO | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] USUÁRIO\n"
+"[--disabled-login] USUÁRIO\n"
 "   Adiciona um usuário de sistema\n"
 "\n"
 "adduser --group [--gid ID] GRUPO\n"
@@ -566,8 +574,7 @@ msgid ""
 msgstr ""
 "Para que seja possível utilizar as opções --remove-home, --remove-all-files "
 "e\n"
-"--backup, você precisa instalar o pacote 'perl'. Para fazê-lo, "
-"execute\n"
+"--backup, você precisa instalar o pacote 'perl'. Para fazê-lo, execute\n"
 "apt-get install perl.\n"
 
 #: ../deluser:219
@@ -623,64 +630,64 @@ msgstr "Não realizando backup/removendo
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "Não realizando backup/removendo '%s', ele combina com %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Não pode manipular o arquivo especial %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Realizando backup de arquivos a serem removidos para %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Removendo arquivos ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Removendo crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Alerta: o grupo '%s' não tem mais membros.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam '%s' falhou. Isto não deveria acontecer.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "O grupo '%s' não é um grupo de sistema. Saindo.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "O grupo '%s' não está vazio!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "'%s' ainda tem '%s' como seu grupo primário!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Você não pode remover o usuário de seu grupo primário.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "O usuário '%s' não é um membro do grupo '%s'.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Removendo usuário '%s' do grupo '%s' ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -689,11 +696,11 @@ msgstr ""
 "deluser versão %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Remove usuários e grupos do sistema.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -701,7 +708,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -711,7 +718,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> e Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -798,3 +805,93 @@ msgstr "Variável '%s' desconhecida em '
 #, perl-format
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Não foi possível encontrar o programa de nome '%s' em $PATH.\n"
+
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "O usuário '%s' já existe. Saindo.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Por favor, informe um nome de usuário compatível com a expressão\n"
+#~ "regular configurada através da variável de configuração NAME_REGEX. Use\n"
+#~ "a opção '--force-badname' para aliviar esta verificação ou reconfigure\n"
+#~ "NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USUÁRIO\n"
+#~ "   Adiciona um usuário normal\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPO | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USUÁRIO\n"
+#~ "   Adiciona um usuário de sistema\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPO\n"
+#~ "addgroup [--gid ID] GRUPO\n"
+#~ "   Adiciona um grupo de usuário\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUPO\n"
+#~ "   Adiciona um grupo de sistema\n"
+#~ "\n"
+#~ "adduser USUÁRIO GRUPO\n"
+#~ "   Adiciona um usuário existente a um grupo existente\n"
+#~ "\n"
+#~ "opções gerais:\n"
+#~ "  --quiet | -q      não passa informações de processo para stdout\n"
+#~ "  --force-badname   permite nomes de usuário que não combinam com\n"
+#~ "                    a variável de configuração NAME_REGEX\n"
+#~ "  --help | -h       mensagem de utilização\n"
+#~ "  --version | -v    número de versão e copyright\n"
+#~ "  --conf | -c FILE  usa ARQUIVO como arquivo de configuração\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Para que seja possível utilizar as opções --remove-home, --remove-all-"
+#~ "files e\n"
+#~ "--backup, você precisa instalar o pacote 'perl-modules'. Para fazê-lo, "
+#~ "execute\n"
+#~ "apt-get install perl-modules.\n"
diff -pruN 3.118/po/pt.po 3.118ubuntu5/po/pt.po
--- 3.118/po/pt.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/pt.po	2020-12-10 16:53:10.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:19+0200\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -20,60 +20,60 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr ""
 "Apenas o utilizador root pode adicionar um grupo ou um utilizador ao "
 "sistema.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Apenas são permitidos um ou dois nomes.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Especifique apenas um nome neste modo.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "As opções --group, --ingroup e --gid são mutuamente exclusivas.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "O directório home tem de ser um caminho absoluto.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Aviso: O directório home %s que especificou já existe.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Aviso: O directório home %s que especificou não pode ser acedido: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "O grupo `%s' já existe como um grupo de sistema. A terminar.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "O grupo `%s' já existe e não é um grupo de sistema. Saindo.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "O grupo `%s' já existe, mas tem um GID diferente. A terminar.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "O GID `%s' já está a ser usado.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -81,69 +81,70 @@ msgstr ""
 "Não há nenhum GID disponível no intervalo %d-%d (PRIMEIRO_GID_SISTEMA - "
 "ULTIMO_GID_SISTEMA).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "O grupo `%s' não foi criado.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "A adicionar o grupo `%s' (GID %d) ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Concluído.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "O grupo `%s' já existe.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "Não há nenhum GID disponível no intervalo %d-%d (PRIMEIRO_GID - "
 "ULTIMO_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "O utilizador `%s' não existe.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "O grupo `%s' não existe.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "O utilizador `%s' já é um membro de `%s'.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "A adicionar o utilizador `%s' ao grupo `%s' ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "O utilizador de sistema `%s' já existe. A terminar\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "O utilizador `%s' já existe. A terminar\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr ""
+"O utilizador `%s' já existe como um utilizador do sistema. A terminar.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "O utilizador `%s' já existe com um UID diferente. A terminar.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -152,12 +153,12 @@ msgstr ""
 "Nenhum par UID/GID disponível no intervalo %d-%d (PRIMEIRO_UID_SISTEMA - "
 "ULTIMO_UID_SISTEMA).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "O utilizador `%s' não foi criado.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -165,36 +166,36 @@ msgstr ""
 "Nenhum UID disponível no intervalo %d-%d (PRIMEIRO_UID_SISTEMA - "
 "ULTIMO_UID_SISTEMA).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "A adicionar o utilizador de sistema `%s' (UID %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "A adicionar o novo grupo `%s' (GID %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "A adicionar o novo utilizador `%s' (UID %d) com grupo `%s' ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "`%s' devolveu o código de erro %d. A terminar.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "`%s' saiu pelo sinal %d. A terminar.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -203,12 +204,12 @@ msgstr ""
 "%s falhou com código de retorno 15, shadow não activado, envelhecimento da "
 "palavra-passe não pode ser definido. A continuar.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "A adicionar o utilizador `%s' ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -216,84 +217,84 @@ msgstr ""
 "Nenhum par UID/GID disponível no intervalo %d-%d (PRIMEIRO_UID - "
 "ULTIMO_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Nenhum UID disponível no intervalo %d-%d (PRIMEIRO_UID - ULTIMO_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "A adicionar o novo grupo `%s' (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "A adicionar o novo utilizador `%s' (%d) com grupo `%s' ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Permissão negada\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "combinação inválida de opções\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "erro inesperado, nada feito\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "falha inesperada, ficheiro passwd em falta\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "ficheiro passwd ocupado, tente de novo\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "argumento inválido para a opção\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Tentar de novo? [y/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Esta informação é correcta? [Y/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "A adicionar o novo utilizador `%s' aos grupos extra ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "A definir quota para o utilizador `%s' com os valores do utilizador `"
 "%s' ...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "A não criar o directório home `%s'.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "O directório home `%s' já existe. A não copiar de `%s'.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -302,52 +303,56 @@ msgstr ""
 "Aviso: O directório home '%s' não pertence ao utilizador que está "
 "actualmente a criar.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "A criar directório home `%s' ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Não se conseguiu criar o directório home `%s': %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "A copiar ficheiros de `%s' ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "fork para `find' falhou: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "O utilizador `%s' já existe, e não é um utilizador de sistema.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "O utilizador `%s' já existe.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "O UID %d já está a ser usado.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "O GID %d já está a ser usado.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "O GID %d não existe.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -356,7 +361,7 @@ msgstr ""
 "Não é possível lidar com %s.\n"
 "Não é um directório, ficheiro ou link simbólico.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -370,15 +375,16 @@ msgstr ""
 "um traço (como definido pelo IEEE Std 1003.1-2001). Para compatibilidade\n"
 "com contas Samba o $ também é suportado no fim do nome de utilizador\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "A permitir o uso dum nome de utilizador questionável.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Por favor introduza um nome de utilizador compatível com a expressão\n"
@@ -386,44 +392,44 @@ msgstr ""
 "`--force-badname' para relaxar esta verificação ou reconfigure a "
 "NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "A seleccionar um UID no intervalo %d a %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "A seleccionar um GID no intervalo %d a %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Parado: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "A remover o directório `%s' ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "A remover o utilizador `%s' ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "A remover o grupo `%s' ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Apanhado um SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -432,7 +438,7 @@ msgstr ""
 "adduser versão %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -448,7 +454,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -470,11 +476,13 @@ msgstr ""
 "ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Para mais detalhes, veja a\n"
 "GNU General Public License em /usr/share/common-licenses/GPL.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -496,7 +504,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -504,14 +513,14 @@ msgid ""
 msgstr ""
 "adduser [--home DIRECTÓRIO] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPO | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] UTILIZADOR\n"
+"[--disabled-password] [--disabled-login] UTILIZADOR\n"
 "   Adiciona um utilizador normal\n"
 "\n"
 "adduser --system [--home DIRECTÓRIO] [--shell SHELL] [--no-create-home] [--"
 "uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPO | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] UTILIZADOR\n"
+"[--disabled-login] UTILIZADOR\n"
 "   Adiciona um utilizador de sistema\n"
 "\n"
 "adduser --group [--gid ID] GRUPO\n"
@@ -616,64 +625,64 @@ msgstr "A não salvaguardar/remover `%s'
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "A não salvaguardar/remover `%s', coincide com %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Incapaz de lidar com o ficheiro especial %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "A salvaguardar ficheiros a serem removidos em %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "A remover ficheiros ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "A remover crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Aviso: O grupo `%s' não tem mais membros.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam `%s' falhou. Isto não devia acontecer.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "O grupo `%s' não é um grupo de sistema. A terminar.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "O grupo `%s' não está vazio!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "`%s' ainda tem `%s' como seu grupo principal!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Não pode remover o utilizador do seu grupo principal.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "O utilizador `%s' não é um membro do grupo `%s'.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "A remover utilizador `%s' do grupo `%s' ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -682,11 +691,11 @@ msgstr ""
 "deluser versão %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Remove utilizadores e grupos do sistema.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -694,7 +703,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -704,7 +713,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> e Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -792,6 +801,96 @@ msgstr "Variável desconhecida `%s' em `
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Não foi possível encontrar o programa chamado `%s' na $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "O utilizador `%s' já existe. A terminar\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Por favor introduza um nome de utilizador compatível com a expressão\n"
+#~ "regular definida na variável de configuração NAME_REGEX. Use a opção\n"
+#~ "`--force-badname' para relaxar esta verificação ou reconfigure a "
+#~ "NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home DIRECTÓRIO] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPO | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] UTILIZADOR\n"
+#~ "   Adiciona um utilizador normal\n"
+#~ "\n"
+#~ "adduser --system [--home DIRECTÓRIO] [--shell SHELL] [--no-create-home] "
+#~ "[--uid ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPO | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] UTILIZADOR\n"
+#~ "   Adiciona um utilizador de sistema\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPO\n"
+#~ "addgroup [--gid ID] GRUPO\n"
+#~ "   Adiciona um grupo de utilizador\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUPO\n"
+#~ "   Adiciona um grupo de sistema\n"
+#~ "\n"
+#~ "adduser UTILIZADOR GRUPO\n"
+#~ "   Adiciona um utilizador existente a um grupo existente\n"
+#~ "\n"
+#~ "opções gerais:\n"
+#~ "  --quiet | -q      não passa informação de processo para o stdout\n"
+#~ "  --force-badname   permite nomes de utilizadores não conformes com a\n"
+#~ "                    variável de configuração NAME_REGEX\n"
+#~ "  --help | -h       mensagem de utilização\n"
+#~ "  --version | -v    número de versão e copyright\n"
+#~ "  --conf | -c FICHEIRO  usa FICHEIRO como ficheiro de configuração\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Para usar as funcionalidades --remove-home, --remove-all-files e --"
+#~ "backup,\n"
+#~ "precisa de instalar o pacote `perl-modules'. Para fazer isso, execute\n"
+#~ "apt-get install perl-modules.\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Aviso: O directório home que especificou não existe.\n"
 
diff -pruN 3.118/po/ru.po 3.118ubuntu5/po/ru.po
--- 3.118/po/ru.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/ru.po	2020-12-10 16:53:10.000000000 +0000
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:adduser 3.115\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:18+0200\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -22,127 +22,128 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr ""
 "Только суперпользователь может добавить пользователя или группу в систему.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Можно указать только одно или два имени.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Только одно имя можно указать в этом режиме.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Параметры --group, --ingroup и --gid взаимно исключаемые.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Домашний каталог должен задаваться в виде абсолютного пути.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Предупреждение: указанный вами домашний каталог %s уже существует.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Предупреждение: указанный вами домашний каталог %s недоступен: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Группа «%s» уже существует и является системной. Завершение работы.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr ""
 "Группа «%s» уже существует и не является системной. Завершение работы.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Группа «%s» уже существует, но имеет другой GID. Завершение работы.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "GID «%s» уже используется.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr "Нет свободного GID в диапазоне %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Группа «%s» не создана.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Добавляется группа «%s» (GID %d) ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Готово.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Группа «%s» уже существует.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Нет свободного GID в диапазоне %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Пользователь «%s» не существует.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Группа «%s» не существует.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Пользователь «%s» уже является членом группы «%s».\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Добавляется пользователь «%s» в группу «%s» ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Системный пользователь «%s» уже существует. Завершение работы.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Пользователь «%s» уже существует. Завершение работы.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr ""
+"Пользователь `%s' уже существует и является системным. Завершение работы.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr ""
 "Пользователь «%s» уже существует, но имеет другой UID. Завершение работы.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -151,47 +152,47 @@ msgstr ""
 "Нет свободной UID/GID пары в диапазоне %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Пользователь «%s» не создан.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr "Нет свободного UID в диапазоне %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Добавляется системный пользователь «%s» (UID %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Добавляется новая группа «%s» (GID %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Добавляется новый пользователь «%s» (UID %d) в группу «%s» ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "Работа «%s» завершилась с кодом ошибки %d. Завершение работы.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "«%s» завершился по сигналу %d. Завершение работы.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -200,92 +201,92 @@ msgstr ""
 "%s не выполнен (вернул код ошибки 15), теневые пароли не включены, "
 "устаревание пароля не может быть задано. Продолжение работы.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Добавляется пользователь «%s» ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Нет свободной UID/GID пары в диапазоне %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Нет свободного UID в диапазоне %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Добавляется новая группа «%s» (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Добавляется новый пользователь «%s» (%d) в группу «%s» ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Недостаточно прав\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "недопустимая комбинация параметров\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "неожиданный сбой, ничего не сделано\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "неожиданный сбой, отсутствует файл passwd\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "файл passwd заблокирован, попробуйте ещё раз\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "недопустимое значение параметра\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Попробовать ещё раз? [y/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Данная информация корректна? [Y/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Добавляется новый пользователь «%s» в дополнительные группы ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "Настраиваются квоты для пользователя «%s» как у пользователя «%s»...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Не создаётся домашний каталог «%s».\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Домашний каталог «%s» уже существует. Не копируется из «%s».\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -294,52 +295,56 @@ msgstr ""
 "Предупреждение: домашний каталог «%s» не принадлежит пользователю, который "
 "сейчас создаётся.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Создаётся домашний каталог «%s» ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Не удалось создать домашний каталог «%s»: «%s».\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Копирование файлов из «%s» ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "ошибка при вызове fork для команды find: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Пользователь «%s» уже существует и не является системным.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Пользователь «%s» уже существует.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "UID %d уже используется.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "GID %d уже используется.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "GID %d не существует.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -348,7 +353,7 @@ msgstr ""
 "Непонятно что делать с %s.\n"
 "Это не каталог, не файл и не символическая ссылка.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -362,15 +367,16 @@ msgstr ""
 "с тире (так определено в IEEE Std 1003.1-2001). Для совместимости с Samba\n"
 "также можно указывать $ в конце имени пользователя\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Разрешить использование не везде корректных имён.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Вводите имя пользователя в соответствии с регулярным выражением, "
@@ -379,44 +385,44 @@ msgstr ""
 "параметр --force-badname, чтобы выключить эту проверку или\n"
 "настройте NAME_REGEX под свои правила.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Выбирается UID из диапазона от %d по %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Выбирается GID из диапазона от %d по %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Останов: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Удаляется каталог «%s» ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Удаляется пользователь «%s» ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Удаляется группа «%s» ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Получен сигнал SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -425,7 +431,7 @@ msgstr ""
 "adduser версия %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -441,7 +447,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -463,11 +469,13 @@ msgstr ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License, /usr/share/common-licenses/GPL, for more details.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -489,22 +497,24 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
 "\n"
 msgstr ""
 "adduser [--home КАТ] [--shell ОБОЛОЧКА] [--no-create-home] [--uid ID]\n"
-"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup ГРУППА | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] ПОЛЬЗОВАТЕЛЬ\n"
+"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup ГРУППА | --gid "
+"ID]\n"
+"[--disabled-password] [--disabled-login] ПОЛЬЗОВАТЕЛЬ\n"
 "   Добавить обычного пользователя\n"
 "\n"
 "adduser --system [--home КАТ] [--shell ОБОЛОЧКА] [--no-create-home] [--uid "
 "ID]\n"
-"[--gecos GECOS] [--group | --ingroup ГРУППА | --gid ID] "
-"[--disabled-password]\n"
-"[--disabled-login] [--add_extra_groups] ПОЛЬЗОВАТЕЛЬ\n"
+"[--gecos GECOS] [--group | --ingroup ГРУППА | --gid ID] [--disabled-"
+"password]\n"
+"[--disabled-login] ПОЛЬЗОВАТЕЛЬ\n"
 "   Добавить системного пользователя\n"
 "\n"
 "adduser --group [--gid ID] ГРУППА\n"
@@ -520,11 +530,11 @@ msgstr ""
 "общие параметры:\n"
 "  --quiet | -q              не выводить информацию при работе в stdout\n"
 "  --force-badname           разрешить имена пользователей, которые не\n"
-"                            удовлетворяют настроечной переменной\n"
+"                            удовлетворяют конфигурационной переменной\n"
 "                            NAME_REGEX\n"
 "  --help | -h               показать справку об использовании\n"
 "  --version | -v            показать версию и авторские права\n"
-"  --conf | -c ФАЙЛ          использовать ФАЙЛ в качестве настроечного\n"
+"  --conf | -c ФАЙЛ          использовать ФАЙЛ в качестве конфигурационного\n"
 "\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
@@ -618,64 +628,64 @@ msgid "Not backing up/removing `%s', it
 msgstr ""
 "Нельзя выполнить резервное копирование/удаление «%s», совпадает с %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Не удалось обработать специальный файл %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Создание резервных копий файлов перед удалением из %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Удаляются файлы ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Удаляется crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Предупреждение: в группе «%s» нет больше членов.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "ошибка при выполнении getgrnam «%s». Этого не должно случиться.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Группа «%s» не является системной. Завершение работы.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Группа «%s» не пуста!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "У пользователя«%s» в качестве первичной указана группа «%s»!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Вы не можете удалить учётную запись из её первичной группы.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Пользователь «%s» не является членом группы «%s».\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Удаляется пользователь «%s» из группы «%s» ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -684,11 +694,11 @@ msgstr ""
 "deluser версия %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Удаление пользователей и групп из системы.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -696,7 +706,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -707,7 +717,7 @@ msgstr ""
 "Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -795,6 +805,98 @@ msgstr "Неизвестная пере
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Невозможно найти программу с именем «%s» в $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Пользователь «%s» уже существует. Завершение работы.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Вводите имя пользователя в соответствии с регулярным выражением, "
+#~ "заданным\n"
+#~ "в конфигурационной переменной NAME_REGEX. Используйте\n"
+#~ "параметр --force-badname, чтобы выключить эту проверку или\n"
+#~ "настройте NAME_REGEX под свои правила.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home КАТ] [--shell ОБОЛОЧКА] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup ГРУППА | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--"
+#~ "add_extra_groups] ПОЛЬЗОВАТЕЛЬ\n"
+#~ "   Добавить обычного пользователя\n"
+#~ "\n"
+#~ "adduser --system [--home КАТ] [--shell ОБОЛОЧКА] [--no-create-home] [--"
+#~ "uid ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup ГРУППА | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] ПОЛЬЗОВАТЕЛЬ\n"
+#~ "   Добавить системного пользователя\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] ГРУППА\n"
+#~ "addgroup [--gid ID] ГРУППА\n"
+#~ "   Добавить пользовательскую группу\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] ГРУППА\n"
+#~ "   Добавить системную группу\n"
+#~ "\n"
+#~ "adduser ПОЛЬЗОВАТЕЛЬ ГРУППА\n"
+#~ "   Добавить существующего пользователя в существующую группу\n"
+#~ "\n"
+#~ "общие параметры:\n"
+#~ "  --quiet | -q              не выводить информацию при работе в stdout\n"
+#~ "  --force-badname           разрешить имена пользователей, которые не\n"
+#~ "                            удовлетворяют настроечной переменной\n"
+#~ "                            NAME_REGEX\n"
+#~ "  --help | -h               показать справку об использовании\n"
+#~ "  --version | -v            показать версию и авторские права\n"
+#~ "  --conf | -c ФАЙЛ          использовать ФАЙЛ в качестве настроечного\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Чтобы использовать параметры --remove-home, --remove-all-files и --"
+#~ "backup\n"
+#~ "вам требуется установить пакет perl-modules. Для этого выполните:\n"
+#~ "apt-get install perl-modules\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Предупреждение: указанный вами домашний каталог не существует.\n"
 
diff -pruN 3.118/po/sk.po 3.118ubuntu5/po/sk.po
--- 3.118/po/sk.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/sk.po	2020-12-10 16:53:10.000000000 +0000
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.112\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:18+0200\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: x\n"
@@ -16,127 +16,127 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Iba root môže pridať používateľa alebo skupinu do systému.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Sú povolené iba jedno alebo dve mená.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "V tomto režime uveďte iba jedno meno.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Voľby --group, --ingroup a --gid sa vzájomne vylučujú.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Domovský adresár musí byť absolútna cesta.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Upozornenie: Domovský adresár %s, ktorý ste uviedli, už existuje.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Upozornenie: Do domovského adresára %s, ktorý ste uviedli, nie je možné "
 "pristupovať: %s.\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Skupina „%s“ už existuje ako systémová skupina. Koniec.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Skupina „%s“ už existuje a nie je systémová skupina. Koniec.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Skupina „%s“ už existuje, ale má odlišný GID. Koniec.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "GID „%s“ sa už používa.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr ""
 "Nie je dostupný žiadny GID v rozsahu %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Skupina „%s“ nebola vytvorená.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Pridáva sa skupina „%s“ (GID %d)...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Hotovo.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Skupina „%s“ už existuje.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Nie je dostupný žiadny GID v rozsahu %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Používateľ „%s“ neexistuje.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Skupina „%s“ neexistuje.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Používateľ „%s“ už je členom „%s“ .\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Pridáva sa používateľ „%s“ do skupiny „%s“...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Systémový používateľ „%s“ už existuje. Koniec.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Používateľ „%s“ už existuje. Koniec.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "Používateľ „%s“ už existuje ako systémový používateľ. Koniec.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Používateľ „%s“ už existuje s odlišným UID. Koniec.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -145,48 +145,48 @@ msgstr ""
 "Nie je dostupný žiadny UID/GID pár v rozsahu %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Používateľ „%s“ nebol vytvorený.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr ""
 "Nie je dostupný žiadny UID v rozsahu %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Pridáva sa systémový používateľ „%s“ (UID %d)...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Pridáva sa nová skupina „%s“ (GID %d)...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Pridáva sa nový používateľ „%s“ (UID %d) so skupinou „%s“...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "„%s“ vrátil chybový kód %d. Koniec.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "„%s“ skončil na signál %d. Koniec.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -195,93 +195,93 @@ msgstr ""
 "„%s“ zlyhal s chybovým kódom 15, shadow nie je zapnutý, nie je možné "
 "nastaviť starnutie hesiel. Pokračujem.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Pridáva sa používateľ „%s“...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Nie je dostupný žiadny UID/GID pár v rozsahu %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Nie je dostupný žiadny UID v rozsahu %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Pridáva sa nová skupina „%s“ (%d)...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Pridáva sa nový používateľ „%s“ (%d) so skupinou „%s“...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Oprávnenie zamietnuté\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "neplatná kombinácia volieb\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "neočakávané zlyhanie, nerobím nič\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "neočakávané zlyhanie, chýba súbor passwd\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "súbor passwd sa používa, skúste znova\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "neplatný argument voľby\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Skúsiť znova? [á/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Sú tieto informácie správne? [Á/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Pridáva sa nový používateľ „%s“ do ďalších skupín...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr "Nastavuje sa kvóta používateľa „%s“ na hodnoty používateľa „%s“...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Nevytvára sa domovský adresár „%s“.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Domovský adresár „%s“ už existuje. Nekopíruje sa z „%s“.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -290,52 +290,56 @@ msgstr ""
 "Upozornenie: Domovský adresár „%s“ nepatrí používateľovi, ktorého práve "
 "vytvárate.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Vytvára sa domovský adresár „%s“...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Nebolo možné vytvoriť domovský adresár „%s“: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopírujú sa súbory z „%s“...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "fork príkazu „find“ zlyhal: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Používateľ „%s“ už existuje a nie je systémový používateľ.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Používateľ „%s“ už existuje.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "UID %d sa už používa.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "GID %d sa už používa.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "GID %d neexistuje.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -344,7 +348,7 @@ msgstr ""
 "Nevieme si poradiť s %s.\n"
 "Nie je to adresár, súbor ani symbolický odkaz.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -360,59 +364,60 @@ msgstr ""
 "účtami\n"
 "stroja Samba sa tiež podporuje $ na konci používateľského mena\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Povoľuje sa použitie pochybného používateľského mena.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Prosím zadajte meno používateľa zodpovedajúce regulárnemu výrazu\n"
 "nastavenému premennou NAME_REGEX. Pomocou voľby „--force-badname“\n"
 "je možné relaxovať túto kontrolu alebo rekonfigurovať NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Vyberá sa UID z rozsahu %d až %d...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Vyberá sa GID z rozsahu %d až %d...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Zastavené: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Odstraňuje sa adresár „%s“...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Odstraňuje sa používateľ „%s“...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Odstraňuje sa skupina „%s“...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Zachytený SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -421,7 +426,7 @@ msgstr ""
 "adduser verzia %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -437,7 +442,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -459,11 +464,13 @@ msgstr ""
 "NA URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte GNU General Public License.\n"
 "\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -485,7 +492,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -494,13 +502,13 @@ msgstr ""
 "adduser [--home ADR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup SKUPINA | --gid "
 "ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] POUŽÍVATEĽ\n"
+"[--disabled-password] [--disabled-login] POUŽÍVATEĽ\n"
 "   Pridať bežného používateľa\n"
 "\n"
 "adduser --system [--home ADR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--gecos GECOS] [--group | --ingroup SKUPINA | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] POUŽÍVATEĽ\n"
+"[--disabled-login] POUŽÍVATEĽ\n"
 "   Pridať systémového používateľa\n"
 "\n"
 "adduser --group [--gid ID] SKUPINA\n"
@@ -514,12 +522,12 @@ msgstr ""
 "   Pridať existujúceho používateľa do existujúcej skupiny\n"
 "\n"
 "všeobecné voľby:\n"
-"  --quiet | -q       neposielať informácie o priebehu na štand. výstup\n"
-"  --force-badname    povoliť používateľské mená, ktoré\n"
-"                     nezodpovedajú konfiguračnej premennej NAME_REGEX\n"
-"  --help | -h        informácie o použití\n"
-"  --version | -v     verzia a autorské práva\n"
-"  --conf | -c SÚBOR  použiť SÚBOR ako konfiguračný súbor\n"
+"  --quiet | -q      neposielať informácie o pribehu na štand. výstup\n"
+"  --force-badname   povoliť používateľské mená, ktoré\n"
+"                    nezodpovedajú konfiguračnej premennej NAME_REGEX\n"
+"  --help | -h       informácie o použití\n"
+"  --version | -v    verzia a autorské práva\n"
+"  --conf | -c SÚBOR použiť SÚBOR ako konfiguračný súbor\n"
 "\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
@@ -606,64 +614,64 @@ msgstr "Nezálohuje/neodstraňuje sa „
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "Nezálohuje/neodstraňuje sa „%s“, zodpovedá %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Nedá sa pracovať so špeciálnym súborom %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Zálohujú sa súbory, ktoré sa majú odstrániť, %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Odstraňujú sa súbory...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Odstraňuje sa crontab...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Upozornenie: Skupina „%s“ už nemá ďalších členov.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam „%s“ zlyhalo. Toto by sa nemalo stať.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Skupina „%s“ nie je systémová skupina. Koniec.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Skupina „%s“ nie je prázdna!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "„%s“ stále má „%s“ ako primárnu skupinu!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Nemožete odstrániť používateľa z jeho primárnej skupiny.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Používateľ „%s“  nie je členom skupiny „%s“.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Odstraňuje sa používateľ „%s“ zo skupiny „%s“...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -672,11 +680,11 @@ msgstr ""
 "deluser verzia %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Odstraňuje používateľov a skupiny zo systému.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -684,7 +692,7 @@ msgstr ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -695,7 +703,7 @@ msgstr ""
 "Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -784,6 +792,94 @@ msgstr "Neznáma premenná „%s“ v 
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Nenašiel sa program s názvom „%s“ v $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Používateľ „%s“ už existuje. Koniec.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Prosím zadajte meno používateľa zodpovedajúce regulárnemu výrazu\n"
+#~ "nastavenému premennou NAME_REGEX. Pomocou voľby „--force-badname“\n"
+#~ "je možné relaxovať túto kontrolu alebo rekonfigurovať NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home ADR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup SKUPINA | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] POUŽÍVATEĽ\n"
+#~ "   Pridať bežného používateľa\n"
+#~ "\n"
+#~ "adduser --system [--home ADR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup SKUPINA | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] POUŽÍVATEĽ\n"
+#~ "   Pridať systémového používateľa\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] SKUPINA\n"
+#~ "addgroup [--gid ID] SKUPINA\n"
+#~ "   Pridať používateľskú skupinu\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] SKUPINA\n"
+#~ "   Pridať systémovú skupinu\n"
+#~ "\n"
+#~ "adduser POUŽÍVATEĽ SKUPINA\n"
+#~ "   Pridať existujúceho používateľa do existujúcej skupiny\n"
+#~ "\n"
+#~ "všeobecné voľby:\n"
+#~ "  --quiet | -q       neposielať informácie o priebehu na štand. výstup\n"
+#~ "  --force-badname    povoliť používateľské mená, ktoré\n"
+#~ "                     nezodpovedajú konfiguračnej premennej NAME_REGEX\n"
+#~ "  --help | -h        informácie o použití\n"
+#~ "  --version | -v     verzia a autorské práva\n"
+#~ "  --conf | -c SÚBOR  použiť SÚBOR ako konfiguračný súbor\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Aby ste mohli použiť voľby --remove-home, --remove-all-files a --backup "
+#~ "features,\n"
+#~ "musíte nainštalovať balík „perl-modules“. Ak tak chcete urobiť, spustite\n"
+#~ "apt-get install perl-modules.\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Upozornenie: Domovský adresár, ktorý ste uviedli, neexistuje.\n"
 
diff -pruN 3.118/po/sv.po 3.118ubuntu5/po/sv.po
--- 3.118/po/sv.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/sv.po	2020-12-10 16:53:10.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.110\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-05-29 07:48+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-10 13:28+0200\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -19,58 +19,58 @@ msgstr ""
 "X-Generator: Poedit 1.8.8\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Endast root får lägga till användare eller grupper i systemet.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Endast ett eller två namn tillåts.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Ange endast ett namn i detta läge.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Flaggorna --group, --ingroup och --gid är ömsesidigt exklusiva.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Hemkatalogen måste vara en absolut sökväg.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Varning: Hemkatalogen %s som du angav finns redan.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Varning: Hemkatalogen %s som du angav kan inte kommas åt: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Gruppen \"%s\" finns redan som en systemgrupp. Avslutar.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Gruppen \"%s\" finns redan och är inte en systemgrupp. Avslutar.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Gruppen \"%s\" finns redan men har ett annat gid. Avslutar.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "Gid \"%s\" används redan.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -78,69 +78,69 @@ msgstr ""
 "Inget gid är tillgängligt i intervallet %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Gruppen \"%s\" skapades inte.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Lägger till gruppen \"%s\" (gid %d) ...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Klar.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Gruppen \"%s\" finns redan.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "Inget gid är tillgängligt i intervallet %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Användaren \"%s\" finns inte.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Gruppen \"%s\" finns inte.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Användaren \"%s\" är redan medlem av \"%s\".\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Lägger till användaren \"%s\" till gruppen \"%s\" ...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Systemanvändaren \"%s\" finns redan. Avslutar.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Användaren \"%s\" finns redan. Avslutar.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "Användaren \"%s\" finns redan som en systemanvändare. Avslutar.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Användaren \"%s\" finns redan med ett annat uid. Avslutar.\n"
 
 # Samma sak med denna
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -149,12 +149,12 @@ msgstr ""
 "Inga uid/gid-par är tillgängliga i intervallet %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Användaren \"%s\" skapades inte.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -162,36 +162,36 @@ msgstr ""
 "Inget uid är tillgängligt i intervallet %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Lägger till systemanvändaren \"%s\" (uid %d) ...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Lägger till nya gruppen \"%s\" (gid %d) ...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Lägger till nya användaren \"%s\" (uid %d) med gruppen \"%s\" ...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "\"%s\" returnerade felkoden %d. Avslutar.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "\"%s\" avslutades från signal %d. Avslutar.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -200,12 +200,12 @@ msgstr ""
 "%s misslyckades med felkod 15, shadow inte aktiverat, lösenordsföråldring "
 "kan inte ställas in. Fortsätter.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Lägger till användaren \"%s\" ...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -213,84 +213,84 @@ msgstr ""
 "Inga uid/gid-par är tillgängliga i intervallet %d-%d (FIRST_UID - "
 "LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Inget uid är tillgängligt i intervallet %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Lägger till nya gruppen \"%s\" (%d) ...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Lägger till nya användaren \"%s\" (%d) med gruppen \"%s\" ...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Åtkomst nekad\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "ogiltig kombination av flaggor\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "oväntat fel, ingenting genomfört\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "oväntat fel, filen passwd-filen saknas\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "filen passwd är upptagen, försök igen\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "ogiltigt argument till flagga\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Försök igen? [j/N] "
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Är informationen korrekt? [J/n] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Lägger till nya användaren \"%s\" till extragrupper ...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "Ställer in diskkvot för användaren \"%s\" till värden för användaren \"%s"
 "\" ...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Skapar inte hemkatalogen \"%s\".\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Hemkatalogen \"%s\" finns redan.  Ingen kopiering från \"%s\".\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -299,52 +299,56 @@ msgstr ""
 "Varning: Hemkatalogen \"%s\" tillhör inte den användare som du för "
 "närvarande skapar.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Skapar hemkatalogen \"%s\" ...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Kunde inte skapa hemkatalogen \"%s\": %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Kopierar filer från \"%s\" ...\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "processgrening för \"find\" misslyckades: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Användaren \"%s\" finns redan och är inte en systemanvändare.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Användaren \"%s\" finns redan.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "Uid %d används redan.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "Gid %d används redan.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "Gid %d finns inte.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -353,7 +357,7 @@ msgstr ""
 "Kan inte hantera %s.\n"
 "Den är varken en katalog, fil eller symlänk.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -369,59 +373,60 @@ msgstr ""
 "kompatibilitet\n"
 "med Samba-maskinkonton finns också stöd för $ i slutet av användarnamnet\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Tillåter användning av tvivelaktiga användarnamn.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Ange ett användarnamn som matchar det reguljära uttrycket som är\n"
 "konfigurerat via variabeln NAME_REGEX.  För att släppa på denna kontroll\n"
 "använd flaggan \"--force-badname\" eller konfigurera om NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Väljer uid från intervallet %d till %d ...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Väljer gid från intervallet %d till %d ...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Stoppad: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Tar bort katalogen \"%s\" ...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Tar bort användaren \"%s\" ...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Tar bort gruppen \"%s\" ...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Fångade en SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -430,7 +435,7 @@ msgstr ""
 "adduser version %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -446,7 +451,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -473,11 +478,13 @@ msgstr ""
 "General Public License, /usr/share/common-licenses/GPL för ytterligare "
 "information.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -499,7 +506,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -507,14 +515,14 @@ msgid ""
 msgstr ""
 "adduser [--home KATALOG] [--shell SKAL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] användare\n"
+"[--disabled-password] [--disabled-login] användare\n"
 "   Lägg till en normal användare\n"
 "\n"
 "adduser --system [--home KATALOG] [--shell SKAL] [--no-create-home] [--uid "
 "ID]\n"
 "[--gecos GECOS] [--group | --ingroup GRUPP | --gid ID] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups]  användare\n"
+"[--disabled-login] användare\n"
 "   Lägg till en systemanvändare\n"
 "\n"
 "adduser --group [--gid ID] GRUPP\n"
@@ -561,8 +569,7 @@ msgid ""
 "apt-get install perl.\n"
 msgstr ""
 "För att kunna använda funktionerna --remove-home, --remove-all-files och\n"
-"--backup behöver du installera paketet \"perl\". För att göra detta, "
-"kör\n"
+"--backup behöver du installera paketet \"perl\". För att göra detta, kör\n"
 "apt-get install perl.\n"
 
 #: ../deluser:219
@@ -621,64 +628,64 @@ msgstr ""
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "Säkerhetskopierar inte/tar inte bort \"%s\", den matchar %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Kan inte hantera specialfil %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Säkerhetskopierar filer som ska tas bort till %s ...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Tar bort filer ...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Tar bort crontab ...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Varning: Gruppen \"%s\" har inga fler medlemmar.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam \"%s\" misslyckades. Detta ska inte hända.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Gruppen \"%s\" är inte en systemgrupp. Avslutar.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Gruppen \"%s\" är inte tom!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "\"%s\" har fortfarande \"%s\" som sin primära grupp!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Du får inte ta bort användaren från sin primära grupp.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Användaren \"%s\" är inte medlem av gruppen \"%s\".\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Tar bort användaren \"%s\" från gruppen \"%s\" ...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -687,11 +694,11 @@ msgstr ""
 "deluser version %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Tar bort användare och grupper från systemet.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -699,7 +706,7 @@ msgstr ""
 "Copyright © 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -709,7 +716,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> och Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -796,6 +803,94 @@ msgstr "Okänd variabel \"%s\" vid \"%s}
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Kunde inte hitta programmet med namnet \"%s\" i $PATH.\n"
 
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Användaren \"%s\" finns redan. Avslutar.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Ange ett användarnamn som matchar det reguljära uttrycket som är\n"
+#~ "konfigurerat via variabeln NAME_REGEX.  För att släppa på denna kontroll\n"
+#~ "använd flaggan \"--force-badname\" eller konfigurera om NAME_REGEX.\n"
+
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home KATALOG] [--shell SKAL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GRUPP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] användare\n"
+#~ "   Lägg till en normal användare\n"
+#~ "\n"
+#~ "adduser --system [--home KATALOG] [--shell SKAL] [--no-create-home] [--"
+#~ "uid ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GRUPP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups]  användare\n"
+#~ "   Lägg till en systemanvändare\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GRUPP\n"
+#~ "addgroup [--gid ID] GRUPP\n"
+#~ "   Lägg till en användargrupp\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GRUPP\n"
+#~ "   Lägg till en systemgrupp\n"
+#~ "\n"
+#~ "adduser ANVÄNDARE GRUPP\n"
+#~ "   Lägg till en befintlig användare till en befintlig grupp\n"
+#~ "\n"
+#~ "allmänna flaggor:\n"
+#~ "  --quiet | -q      skicka inte processinformation till standard ut\n"
+#~ "  --force-badname   tillåt användarnamn som inte matchar\n"
+#~ "                    konfigurationsvariabeln NAME_REGEX\n"
+#~ "  --help | -h       meddelande om användning\n"
+#~ "  --version | -v    versionsnummer och copyright\n"
+#~ "  --conf | -c FIL   använd FIL som konfigurationsfil\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "För att kunna använda funktionerna --remove-home, --remove-all-files och\n"
+#~ "--backup behöver du installera paketet \"perl-modules\". För att göra "
+#~ "detta, kör\n"
+#~ "apt-get install perl-modules.\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Varning: Hemkatalogen du angav finns inte.\n"
 
diff -pruN 3.118/po/uk.po 3.118ubuntu5/po/uk.po
--- 3.118/po/uk.po	2018-09-15 19:03:57.000000000 +0000
+++ 3.118ubuntu5/po/uk.po	2020-12-10 16:53:10.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.96\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 18:17+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -21,124 +21,124 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr "Тільки root може додавати користувачів або групи до системи.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Можна вказувати тільки одне чи два імені.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Вкажіть тільки одне ім'я в цьому режимі.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Опції --group, --ingroup та --gid несумісні.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "До домашньої директорії повинен бути заданий абсолютний шлях.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, fuzzy, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Попередження: вказана вами домашня директорія вже існує.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, fuzzy, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr "Попередження: вказана вами домашня директорія вже існує.\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Група \"%s\" вже існує як системна група. Виходимо.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, fuzzy, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Група \"%s\" вже існує як системна група. Виходимо.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Група \"%s\" вже існує але має інший GID. Виходимо.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "GID \"%s\" вже використовується.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 msgstr "Немає вільних GID в проміжку %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Група \"%s\" не була створена.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Додається група \"%s\" (GID %d)...\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Завершено.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Група \"%s\" вже існує.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr "Немає вільних GID в проміжку %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Користувач \"%s\" не існує.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Група \"%s\" не існує.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Користувач \"%s\" вже є членом \"%s\".\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Додається користувач \"%s\" до групи \"%s\"...\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, fuzzy, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Користувач \"%s\" вже існує.\n"
 
-#: ../adduser:376
+#: ../adduser:397
 #, fuzzy, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Користувач \"%s\" вже існує.\n"
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr "Користувач \"%s\" вже існує як системний користувач. Виходимо.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Користувач \"%s\" вже існує але має інший UID. Виходимо.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -147,47 +147,47 @@ msgstr ""
 "Немає вільної пари UID/GID на проміжку %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Користувач \"%s\" не був створений.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 msgstr "Немає вільного UID на проміжку %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Додається системний користувач \"%s\" (UID %d)...\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Додається нова група \"%s\" (GID %d)...\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Додається новий користувач \"%s\" (UID %d) з групою \"%s\"...\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "Команда \"%s\" повернула код помилки %d. Виходимо.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "Команда \"%s\" завершилась через сигнал %d. Виходимо.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -196,61 +196,61 @@ msgstr ""
 "Команда %s завершилась невдачею з кодом помилки 15, shadow не дозволено, не "
 "можна встановити застарівання пароля. Продовжуємо.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Додається користувач \"%s\"...\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Немає вільної пари UID/GID на проміжку %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr "Немає вільного UID на проміжку %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Додається нова група \"%s\" (%d)...\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Додається новий користувач \"%s\" (%d) з групою \"%s\"...\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "У доступі відмовлено\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "неприпустима комбінація параметрів\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "неочікувана помилка, нічого не зроблено\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "неочікувана помилка, відсутній файл паролів\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "файл passwd зайнятий, спробуйте знову\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "неприпустимий аргумент для параметра\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 #, fuzzy
 msgid "Try again? [y/N] "
 msgstr "Спробувати знову? [Т/н]"
@@ -258,34 +258,34 @@ msgstr "Спробувати знову?
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 #, fuzzy
 msgid "Is the information correct? [Y/n] "
 msgstr "Чи вірні ці дані? [т/Н] "
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Новий користувач \"%s\" додається до додаткових груп...\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "Квота для користувача \"%s\" встановлюється у значення для користувача \"%s"
 "\"...\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Домашня директорія \"%s\" не створюється.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Домашня директорія \"%s\" вже існує. Не копіюється з \"%s\".\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, fuzzy, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
@@ -294,52 +294,56 @@ msgstr ""
 "Увага: ця домашня директорія не належить користувачу якого ви зараз "
 "створюєте.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Створюється домашня директорія \"%s\"...\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Неможливо створити домашню директорію \"%s\": %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Копіюються файли з \"%s\"..\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "Не вдалося зробити fork для \"find\": %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr "Користувач \"%s\" вже існує і не є системним користувачем.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Користувач \"%s\" вже існує.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "UID %d вже використовується.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "GID %d вже використовується.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "GID %d не існує.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -348,7 +352,7 @@ msgstr ""
 "Неможна нічого зробити з %s.\n"
 "Це не директорія, файл або символьне посилання.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, fuzzy, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -362,15 +366,16 @@ msgstr ""
 "повинно починатися з дефісу (як визначено у IEEE Std 1003.1-2001). Для\n"
 "сумісності з Samba, в кінці імені користувача також може знаходитись знак $\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Дозволяється використання сумнівного імені користувача.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Введіть, будь ласка, ім'я користувача що підходить під шаблон, що "
@@ -379,44 +384,44 @@ msgstr ""
 "\"\n"
 "щоб пом'якшити цю перевірку, або перевстановіть NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Вибір UID з проміжку з %d до %d...\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Вибір GID з проміжку з %d до %d...\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Зупинено: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Видаляється директорія \"%s\"...\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Видаляється користувач \"%s\"...\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Видаляється група \"%s\"...\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Отримано сигнал SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -425,7 +430,7 @@ msgstr ""
 "adduser, версія %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -441,7 +446,7 @@ msgstr ""
 "                    Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -465,44 +470,13 @@ msgstr ""
 "ЗАСТОСУВАННЮ. Зверніться до Загальної Публічної Ліцензії GNU,\n"
 "/usr/share/common-licenses/GPL, за подробицями.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
 #, fuzzy
-#| msgid ""
-#| "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
-#| "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
-#| "ID]\n"
-#| "[--disabled-password] [--disabled-login] USER\n"
-#| "   Add a normal user\n"
-#| "\n"
-#| "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
-#| "ID]\n"
-#| "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
-#| "password]\n"
-#| "[--disabled-login] USER\n"
-#| "   Add a system user\n"
-#| "\n"
-#| "adduser --group [--gid ID] GROUP\n"
-#| "addgroup [--gid ID] GROUP\n"
-#| "   Add a user group\n"
-#| "\n"
-#| "addgroup --system [--gid ID] GROUP\n"
-#| "   Add a system group\n"
-#| "\n"
-#| "adduser USER GROUP\n"
-#| "   Add an existing user to an existing group\n"
-#| "\n"
-#| "general options:\n"
-#| "  --quiet | -q      don't give process information to stdout\n"
-#| "  --force-badname   allow usernames which do not match the\n"
-#| "                    NAME_REGEX configuration variable\n"
-#| "  --help | -h       usage message\n"
-#| "  --version | -v    version number and copyright\n"
-#| "  --conf | -c FILE  use FILE as configuration file\n"
-#| "\n"
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -524,7 +498,8 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
@@ -640,64 +615,64 @@ msgstr "\"%s\" не зберігаєть
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "\"%s\" не зберігається/видаляється - підходить під шаблон %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr ""
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Копії файлів копіюються у %s перед видаленням...\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Видаляються файли...\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Видаляється crontab...\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, fuzzy, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Група \"%s\" не була створена.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam \"%s\" завершилося невдало. Цього не повинно було статися.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Група \"%s\" не є системною групою. Виходимо.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Група \"%s\" не порожня!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "\"%s\" все ще має \"%s\" своєю основною групою!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Не можна видалити користувача з його основної групи.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Користувач \"%s\" не є членом групи \"%s\".\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Видаляється користувач \"%s\" з групи \"%s\"...\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -706,11 +681,11 @@ msgstr ""
 "deluser, версія %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Видаляє користувачів і групи з системи.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -718,7 +693,7 @@ msgstr ""
 "Авторські права (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -728,7 +703,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> і Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -817,6 +792,96 @@ msgstr "Невідома змінна \"
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Неможливо знайти програму з назвою \"%s\" в $PATH.\n"
 
+#, fuzzy
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Користувач \"%s\" вже існує.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Введіть, будь ласка, ім'я користувача що підходить під шаблон, що "
+#~ "вказаний\n"
+#~ "конфігураційною змінною NAME_REGEX. Використовуйте опцію \"--force-badname"
+#~ "\"\n"
+#~ "щоб пом'якшити цю перевірку, або перевстановіть NAME_REGEX.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
+#~ "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid "
+#~ "ID]\n"
+#~ "[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a normal user\n"
+#~ "\n"
+#~ "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid "
+#~ "ID]\n"
+#~ "[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+#~ "password]\n"
+#~ "[--disabled-login] [--add_extra_groups] USER\n"
+#~ "   Add a system user\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] GROUP\n"
+#~ "addgroup [--gid ID] GROUP\n"
+#~ "   Add a user group\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] GROUP\n"
+#~ "   Add a system group\n"
+#~ "\n"
+#~ "adduser USER GROUP\n"
+#~ "   Add an existing user to an existing group\n"
+#~ "\n"
+#~ "general options:\n"
+#~ "  --quiet | -q      don't give process information to stdout\n"
+#~ "  --force-badname   allow usernames which do not match the\n"
+#~ "                    NAME_REGEX configuration variable\n"
+#~ "  --help | -h       usage message\n"
+#~ "  --version | -v    version number and copyright\n"
+#~ "  --conf | -c FILE  use FILE as configuration file\n"
+#~ "\n"
+#~ msgstr ""
+#~ "adduser [--home ДИРЕКТОРІЯ] [--shell ОБОЛОНКА] [--no-create-home]\n"
+#~ "[--uid ID] [--firstuid ID] [--lastuid ID] [--gecos GECOS]\n"
+#~ "[--ingroup ГРУПА | --gid ID] [--disabled-password]\n"
+#~ "[--disabled-login] КОРИСТУВАЧ\n"
+#~ "   Додати звичайного користувача\n"
+#~ "\n"
+#~ "adduser --system [--home ДИРЕКТОРІЯ] [--shell ОБОЛОНКА] [--no-create-"
+#~ "home]\n"
+#~ "[--uid ID] [--gecos GECOS] [--group | --ingroup ГРУПА | --gid ID]\n"
+#~ "[--disabled-password] [--disabled-login] КОРИСТУВАЧ\n"
+#~ "   Додати системного користувача\n"
+#~ "\n"
+#~ "adduser --group [--gid ID] ГРУПА\n"
+#~ "addgroup [--gid ID] ГРУПА\n"
+#~ "   Додати групу користувачів\n"
+#~ "\n"
+#~ "addgroup --system [--gid ID] ГРУПА\n"
+#~ "   Додати системну групу\n"
+#~ "\n"
+#~ "adduser КОРИСТУВАЧ ГРУПА\n"
+#~ "   Додати існуючого користувача до існуючої групи\n"
+#~ "\n"
+#~ "Загальні параметри:\n"
+#~ "  --quiet | -q      не видавати інформацію на stdout\n"
+#~ "  --force-badname   дозволити імена користувачів які не підходять\n"
+#~ "                    під шаблон заданий NAME_REGEX\n"
+#~ "  --help | -h       інформація про використання\n"
+#~ "  --version | -v    номер версії і авторські права\n"
+#~ "  --conf | -c ФАЙЛ  використати ФАЙЛ як конфігураційний\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "In order to use the --remove-home, --remove-all-files, and --backup "
+#~ "features,\n"
+#~ "you need to install the `perl-modules' package. To accomplish that, run\n"
+#~ "apt-get install perl-modules.\n"
+#~ msgstr ""
+#~ "Щоб використовувати можливості --remove-home, --remove-all-files\n"
+#~ "і --backup, потрібно встановити пакунок \"perl-modules. Щоб це\n"
+#~ "зробити, запустіть \"apt-get install perl-modules\".\n"
+
 #~ msgid "Warning: The home dir you specified does not exist.\n"
 #~ msgstr "Попередження: вказана вами домашня директорія не існує.\n"
 
diff -pruN 3.118/po/vi.po 3.118ubuntu5/po/vi.po
--- 3.118/po/vi.po	2018-06-29 04:21:20.000000000 +0000
+++ 3.118ubuntu5/po/vi.po	2020-12-10 16:53:10.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adduser 3.114\n"
 "Report-Msgid-Bugs-To: adduser@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-17 18:51+0200\n"
+"POT-Creation-Date: 2020-12-10 16:53+0000\n"
 "PO-Revision-Date: 2016-06-17 19:08+0200\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
@@ -20,60 +20,60 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
-#: ../adduser:150
+#: ../adduser:154
 msgid "Only root may add a user or group to the system.\n"
 msgstr ""
 "Chỉ siêu quản trị có quyền thêm vào hệ thống một người dùng hay nhóm.\n"
 
-#: ../adduser:176 ../deluser:137
+#: ../adduser:180 ../deluser:137
 msgid "Only one or two names allowed.\n"
 msgstr "Chỉ cho phép một hay hai tên thôi.\n"
 
 #. must be addusertogroup
-#: ../adduser:181
+#: ../adduser:185
 msgid "Specify only one name in this mode.\n"
 msgstr "Trong chế độ này thì chỉ đưa ra một tên.\n"
 
-#: ../adduser:197
+#: ../adduser:201
 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n"
 msgstr "Ba tùy chọn “--group”, “--ingroup” và “--gid options” xung đột nhau.\n"
 
-#: ../adduser:202
+#: ../adduser:206
 msgid "The home dir must be an absolute path.\n"
 msgstr "Thư mục chính phải là một đường dẫn tuyệt đối.\n"
 
-#: ../adduser:206
+#: ../adduser:210
 #, perl-format
 msgid "Warning: The home dir %s you specified already exists.\n"
 msgstr "Cảnh báo: bạn đã ghi rõ một thư mục chính %s đã có.\n"
 
-#: ../adduser:208
+#: ../adduser:212
 #, perl-format
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 "Cảnh báo: bạn đã ghi rõ một thư mục chính %s không cho truy cập được: %s\n"
 
-#: ../adduser:270
+#: ../adduser:279
 #, perl-format
 msgid "The group `%s' already exists as a system group. Exiting.\n"
 msgstr "Nhóm “%s” đã có như là một nhóm ở mức hệ thống nên thoát.\n"
 
-#: ../adduser:276
+#: ../adduser:285
 #, perl-format
 msgid "The group `%s' already exists and is not a system group. Exiting.\n"
 msgstr "Nhóm “%s” đã có và không phải là một nhóm ở mức hệ thống nên thoát.\n"
 
-#: ../adduser:282
+#: ../adduser:291
 #, perl-format
 msgid "The group `%s' already exists, but has a different GID. Exiting.\n"
 msgstr "Nhóm “%s” đã có với một GID khác nên thoát.\n"
 
-#: ../adduser:286 ../adduser:316
+#: ../adduser:295 ../adduser:329
 #, perl-format
 msgid "The GID `%s' is already in use.\n"
 msgstr "GID “%s” đang được dùng.\n"
 
-#: ../adduser:294
+#: ../adduser:303
 #, perl-format
 msgid ""
 "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"
@@ -81,68 +81,69 @@ msgstr ""
 "Không có GID nào sẵn sàng trong phạm vi %d-%d (FIRST_SYS_GID - "
 "LAST_SYS_GID).\n"
 
-#: ../adduser:295 ../adduser:325
+#: ../adduser:304 ../adduser:338
 #, perl-format
 msgid "The group `%s' was not created.\n"
 msgstr "Chưa tạo nhóm “%s”.\n"
 
-#: ../adduser:300 ../adduser:329
+#: ../adduser:309 ../adduser:342
 #, perl-format
 msgid "Adding group `%s' (GID %d) ...\n"
 msgstr "Đang thêm nhóm “%s” (GID %d) …\n"
 
-#: ../adduser:305 ../adduser:334 ../adduser:359 ../deluser:370 ../deluser:407
-#: ../deluser:444
+#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424
+#: ../deluser:461
 msgid "Done.\n"
 msgstr "Hoàn tất.\n"
 
-#: ../adduser:314 ../adduser:792
+#: ../adduser:327 ../adduser:860
 #, perl-format
 msgid "The group `%s' already exists.\n"
 msgstr "Nhóm “%s” đã có.\n"
 
-#: ../adduser:324
+#: ../adduser:337
 #, perl-format
 msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"
 msgstr ""
 "Không có GID nào sẵn sàng trong phạm vi %d-%d (FIRST_GID - LAST_GID).\n"
 
-#: ../adduser:343 ../deluser:229 ../deluser:416
+#: ../adduser:360 ../deluser:229 ../deluser:433
 #, perl-format
 msgid "The user `%s' does not exist.\n"
 msgstr "Người dùng “%s” không tồn tại.\n"
 
-#: ../adduser:345 ../adduser:591 ../adduser:799 ../deluser:378 ../deluser:419
+#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436
 #, perl-format
 msgid "The group `%s' does not exist.\n"
 msgstr "Nhóm “%s” không tồn tại.\n"
 
-#: ../adduser:348 ../adduser:595
+#: ../adduser:365 ../adduser:638
 #, perl-format
 msgid "The user `%s' is already a member of `%s'.\n"
 msgstr "Người dùng “%s” đã thuộc về “%s”.\n"
 
-#: ../adduser:353 ../adduser:601
+#: ../adduser:370 ../adduser:644
 #, perl-format
 msgid "Adding user `%s' to group `%s' ...\n"
 msgstr "Đang thêm người dung “%s” vào nhóm “%s” …\n"
 
-#: ../adduser:373
+#: ../adduser:394
 #, perl-format
 msgid "The system user `%s' already exists. Exiting.\n"
 msgstr "Người dùng ở mức hệ thống “%s” đã có nên thoát.\n"
 
-#: ../adduser:376
-#, perl-format
-msgid "The user `%s' already exists. Exiting.\n"
-msgstr "Người dùng “%s” đã có nên thoát.\n"
+#: ../adduser:397
+#, fuzzy, perl-format
+msgid "The user `%s' already exists, but is not a system user. Exiting.\n"
+msgstr ""
+"Người dùng “%s” đã có và không phải là một người dùng ở mức hệ thống.\n"
 
-#: ../adduser:380
+#: ../adduser:401
 #, perl-format
 msgid "The user `%s' already exists with a different UID. Exiting.\n"
 msgstr "Người dùng “%s” đã có với một UID khác nên thoát.\n"
 
-#: ../adduser:394
+#: ../adduser:415
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - "
@@ -151,12 +152,12 @@ msgstr ""
 "Không có cặp UID/GID nào sẵn sàng trong phạm vi %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:395 ../adduser:407 ../adduser:487 ../adduser:499
+#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529
 #, perl-format
 msgid "The user `%s' was not created.\n"
 msgstr "Chưa tạo người dùng “%s”.\n"
 
-#: ../adduser:406
+#: ../adduser:427
 #, perl-format
 msgid ""
 "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"
@@ -164,36 +165,36 @@ msgstr ""
 "Không có UID nào sẵn sàng trong phạm vi %d-%d (FIRST_SYS_UID - "
 "LAST_SYS_UID).\n"
 
-#: ../adduser:411 ../adduser:417 ../adduser:503 ../adduser:509
+#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539
 msgid "Internal error"
 msgstr "Lỗi nội bộ"
 
-#: ../adduser:419
+#: ../adduser:440
 #, perl-format
 msgid "Adding system user `%s' (UID %d) ...\n"
 msgstr "Đang thêm người dùng ở mức hệ thống “%s” (UID %d) …\n"
 
-#: ../adduser:424
+#: ../adduser:445
 #, perl-format
 msgid "Adding new group `%s' (GID %d) ...\n"
 msgstr "Đang thêm nhóm mới “%s” (GID %d) …\n"
 
-#: ../adduser:431
+#: ../adduser:456
 #, perl-format
 msgid "Adding new user `%s' (UID %d) with group `%s' ...\n"
 msgstr "Đang thêm người dùng mới “%s” (UID %d) với nhóm “%s” …\n"
 
-#: ../adduser:449 ../AdduserCommon.pm:162
+#: ../adduser:479 ../AdduserCommon.pm:162
 #, perl-format
 msgid "`%s' returned error code %d. Exiting.\n"
 msgstr "“%s” trả lại mã lỗi %d nên thoát.\n"
 
-#: ../adduser:451 ../AdduserCommon.pm:164
+#: ../adduser:481 ../AdduserCommon.pm:164
 #, perl-format
 msgid "`%s' exited from signal %d. Exiting.\n"
 msgstr "“%s” bị chấm dứt do tín hiệu %d nên thoát.\n"
 
-#: ../adduser:453
+#: ../adduser:483
 #, perl-format
 msgid ""
 "%s failed with return code 15, shadow not enabled, password aging cannot be "
@@ -202,12 +203,12 @@ msgstr ""
 "%s bị lỗi với mã trả lại 15, bóng không phải được hiệu lực, không thể lập "
 "thời gian sử dụng mật khẩu. Đang tiếp tục.\n"
 
-#: ../adduser:478
+#: ../adduser:508
 #, perl-format
 msgid "Adding user `%s' ...\n"
 msgstr "Đang thêm người dùng “%s” …\n"
 
-#: ../adduser:486
+#: ../adduser:516
 #, perl-format
 msgid ""
 "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
@@ -215,136 +216,140 @@ msgstr ""
 "Không có cặp UID/GID nào sẵn sàng trong phạm vi %d-%d (FIRST_UID - "
 "LAST_UID).\n"
 
-#: ../adduser:498
+#: ../adduser:528
 #, perl-format
 msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n"
 msgstr ""
 "Không có UID nào sẵn sàng trong phạm vi %d-%d (FIRST_UID - LAST_UID).\n"
 
-#: ../adduser:514
+#: ../adduser:544
 #, perl-format
 msgid "Adding new group `%s' (%d) ...\n"
 msgstr "Đang thêm nhóm mới “%s” (%d) …\n"
 
-#: ../adduser:521
+#: ../adduser:555
 #, perl-format
 msgid "Adding new user `%s' (%d) with group `%s' ...\n"
 msgstr "Đang thêm người dung mới “%s” (%d) với nhóm “%s” …\n"
 
 #. hm, error, should we break now?
-#: ../adduser:545
+#: ../adduser:584
 msgid "Permission denied\n"
 msgstr "Không đủ quyền\n"
 
-#: ../adduser:546
+#: ../adduser:585
 msgid "invalid combination of options\n"
 msgstr "sai kết hợp các tùy chọn\n"
 
-#: ../adduser:547
+#: ../adduser:586
 msgid "unexpected failure, nothing done\n"
 msgstr "bị lỗi bất thường mà không làm gì\n"
 
-#: ../adduser:548
+#: ../adduser:587
 msgid "unexpected failure, passwd file missing\n"
 msgstr "bị lỗi bất thường, tập tin mật khẩu passwd còn thiếu\n"
 
-#: ../adduser:549
+#: ../adduser:588
 msgid "passwd file busy, try again\n"
 msgstr "Tập tin mật khẩu passwd đang bận, hãy thử lại\n"
 
-#: ../adduser:550
+#: ../adduser:589
 msgid "invalid argument to option\n"
 msgstr "sai lập đối số tới tùy chọn\n"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale noexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:555
+#: ../adduser:594
 msgid "Try again? [y/N] "
 msgstr "Thử lại ? [c/K]"
 
 #. Translators: [y/N] has to be replaced by values defined in your
 #. locale.  You can see by running "locale yesexpr" which regular
 #. expression will be checked to find positive answer.
-#: ../adduser:581
+#: ../adduser:624
 msgid "Is the information correct? [Y/n] "
 msgstr "Thông tin này có đúng chưa? [c/K]"
 
-#: ../adduser:588
+#: ../adduser:631
 #, perl-format
 msgid "Adding new user `%s' to extra groups ...\n"
 msgstr "Đang thêm người dung mới “%s” vào các nhóm bổ sung …\n"
 
-#: ../adduser:614
+#: ../adduser:663
 #, perl-format
 msgid "Setting quota for user `%s' to values of user `%s' ...\n"
 msgstr ""
 "Đang lập hạn ngạch của người dùng “%s” thành giá trị của người dùng “%s” …\n"
 
-#: ../adduser:651
+#: ../adduser:700
 #, perl-format
 msgid "Not creating home directory `%s'.\n"
 msgstr "Không tạo thư mục chính “%s”.\n"
 
-#: ../adduser:654
+#: ../adduser:703
 #, perl-format
 msgid "The home directory `%s' already exists.  Not copying from `%s'.\n"
 msgstr "Thư mục chính “%s” đã có nên không sao chép từ “%s”.\n"
 
-#: ../adduser:660
+#: ../adduser:709
 #, perl-format
 msgid ""
 "Warning: The home directory `%s' does not belong to the user you are "
 "currently creating.\n"
 msgstr "Cảnh báo: thư mục chính “%s” không thuộc về người dùng bạn đang tạo.\n"
 
-#: ../adduser:665
+#: ../adduser:714
 #, perl-format
 msgid "Creating home directory `%s' ...\n"
 msgstr "Đang tạo thư mục chính “%s” …\n"
 
-#: ../adduser:667
+#: ../adduser:716
 #, perl-format
 msgid "Couldn't create home directory `%s': %s.\n"
 msgstr "Không thể tạo thư mục chính “%s”: %s.\n"
 
-#: ../adduser:675
+#: ../adduser:734
+msgid "Setting up encryption ...\n"
+msgstr ""
+
+#: ../adduser:739
 #, perl-format
 msgid "Copying files from `%s' ...\n"
 msgstr "Đang sao chép các tập tin từ “%s” …\n"
 
-#: ../adduser:677
+#: ../adduser:741
 #, perl-format
 msgid "fork for `find' failed: %s\n"
 msgstr "gặp lỗi khi phân nhánh tiến trình “find”: %s\n"
 
-#: ../adduser:782
+#: ../adduser:850
 #, perl-format
 msgid "The user `%s' already exists, and is not a system user.\n"
 msgstr ""
 "Người dùng “%s” đã có và không phải là một người dùng ở mức hệ thống.\n"
 
-#: ../adduser:784
+#: ../adduser:852
 #, perl-format
 msgid "The user `%s' already exists.\n"
 msgstr "Người dùng “%s” đã có.\n"
 
-#: ../adduser:787
+#: ../adduser:855
 #, perl-format
 msgid "The UID %d is already in use.\n"
 msgstr "UID %d đang được dùng.\n"
 
-#: ../adduser:794
+#: ../adduser:862
 #, perl-format
 msgid "The GID %d is already in use.\n"
 msgstr "GID %d đang được dùng.\n"
 
-#: ../adduser:801
+#: ../adduser:869
 #, perl-format
 msgid "The GID %d does not exist.\n"
 msgstr "GID %d không tồn tại.\n"
 
-#: ../adduser:848
+#: ../adduser:916
 #, perl-format
 msgid ""
 "Cannot deal with %s.\n"
@@ -353,7 +358,7 @@ msgstr ""
 "Không thể xử lý %s.\n"
 "Nó không phải là một thư mục, tập tin hoặc liên kết tượng trưng.\n"
 
-#: ../adduser:868
+#: ../adduser:937
 #, perl-format
 msgid ""
 "%s: To avoid problems, the username should consist only of\n"
@@ -369,60 +374,61 @@ msgstr ""
 "Để tương thích với tài khoản máy kiểu Samba\n"
 "thì cũng hỗ trợ có dấu đô-la ($) kết thúc tên người dùng.\n"
 
-#: ../adduser:876
+#: ../adduser:947
 msgid "Allowing use of questionable username.\n"
 msgstr "Đang cho phép sử dụng một tên người dùng đáng ngờ.\n"
 
-#: ../adduser:880
-#, perl-format
+#: ../adduser:951
+#, fuzzy, perl-format
 msgid ""
 "%s: Please enter a username matching the regular expression configured\n"
-"via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+"via the NAME_REGEX[_SYSTEM] configuration variable.  Use the `--force-"
+"badname'\n"
 "option to relax this check or reconfigure NAME_REGEX.\n"
 msgstr ""
 "%s: Hãy gõ một tên người dùng tương ứng với biểu thức chính quy\n"
 "được lập bằng biến cấu hình NAME_REGEX.\n"
-"Dùng tùy chọn “--force-badname” để tránh sự kiểm tra này\n"
+"Dùng tuỳ chọn « --force-badname » để tránh sự kiểm tra này\n"
 "hoặc để cấu hình lại NAME_REGEX.\n"
 
-#: ../adduser:896
+#: ../adduser:967
 #, perl-format
 msgid "Selecting UID from range %d to %d ...\n"
 msgstr "Đang lựa chọn UID trong phạm vi %d đến %d …\n"
 
-#: ../adduser:914
+#: ../adduser:985
 #, perl-format
 msgid "Selecting GID from range %d to %d ...\n"
 msgstr "Đang lựa chọn GID trong phạm vi %d đến %d …\n"
 
-#: ../adduser:958
+#: ../adduser:1043
 #, perl-format
 msgid "Stopped: %s\n"
 msgstr "Bị dừng: %s\n"
 
-#: ../adduser:960
+#: ../adduser:1045
 #, perl-format
 msgid "Removing directory `%s' ...\n"
 msgstr "Đang gỡ bỏ thư mục “%s” …\n"
 
-#: ../adduser:964 ../deluser:358
+#: ../adduser:1049 ../deluser:375
 #, perl-format
 msgid "Removing user `%s' ...\n"
 msgstr "Đang gỡ bỏ người dùng “%s” …\n"
 
-#: ../adduser:968 ../deluser:403
+#: ../adduser:1053 ../deluser:420
 #, perl-format
 msgid "Removing group `%s' ...\n"
 msgstr "Đang gỡ bỏ nhóm “%s” …\n"
 
 #. Translators: the variable %s is INT, QUIT, or HUP.
 #. Please do not insert a space character between SIG and %s.
-#: ../adduser:979
+#: ../adduser:1064
 #, perl-format
 msgid "Caught a SIG%s.\n"
 msgstr "Nhận được một tín hiệu SIG%s.\n"
 
-#: ../adduser:984
+#: ../adduser:1069
 #, perl-format
 msgid ""
 "adduser version %s\n"
@@ -431,7 +437,7 @@ msgstr ""
 "adduser phiên bản %s\n"
 "\n"
 
-#: ../adduser:985
+#: ../adduser:1070
 msgid ""
 "Adds a user or group to the system.\n"
 "  \n"
@@ -447,7 +453,7 @@ msgstr ""
 "                   Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../adduser:992 ../deluser:466
+#: ../adduser:1077 ../deluser:483
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -470,11 +476,13 @@ msgstr ""
 "Xem Giấy Phép Công Cộng GNU (/usr/share/common-licenses/GPL)\n"
 "để biết thêm chi tiết.\n"
 
-#: ../adduser:1006
+#: ../adduser:1091
+#, fuzzy
 msgid ""
 "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
 "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] USER\n"
+"[--disabled-password] [--disabled-login] [--add_extra_groups]\n"
+"[--encrypt-home] USER\n"
 "   Add a normal user\n"
 "\n"
 "adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n"
@@ -496,42 +504,45 @@ msgid ""
 "general options:\n"
 "  --quiet | -q      don't give process information to stdout\n"
 "  --force-badname   allow usernames which do not match the\n"
-"                    NAME_REGEX configuration variable\n"
+"                    NAME_REGEX[_SYSTEM] configuration variable\n"
+"  --extrausers      uses extra users as the database\n"
 "  --help | -h       usage message\n"
 "  --version | -v    version number and copyright\n"
 "  --conf | -c FILE  use FILE as configuration file\n"
 "\n"
 msgstr ""
-"adduser [--home THƯ_MỤC] [--shell HỆ_VỎ] [--no-create-home] [--uid MÃ_SỐ]\n"
+"adduser [--home THƯ_MỤC] [--shell TRÌNH_BAO] [--no-create-home] [--uid "
+"MÃ_SỐ]\n"
 "[--firstuid MÃ_SỐ] [--lastuid MÃ_SỐ] [--gecos GECOS] [--ingroup NHÓM | --gid "
 "MÃ_SỐ]\n"
-"[--disabled-password] [--disabled-login] [--add_extra_groups] NGƯỜI_DÙNG\n"
+"[--disabled-password] [--disabled-login] NGƯỜI_DÙNG\n"
 "   Thêm một người dùng thông thường\n"
 "\n"
-"adduser --system [--home THƯ_MỤC] [--shell HỆ_VỎ] [--no-create-home] [--uid "
-"MÃ_SỐ]\n"
+"adduser --system [--home THƯ_MỤC] [--shell TRÌNH_BAO] [--no-create-home] [--"
+"uid MÃ_SỐ]\n"
 "[--gecos GECOS] [--group | --ingroup NHÓM | --gid MÃ_SỐ] [--disabled-"
 "password]\n"
-"[--disabled-login] [--add_extra_groups] NGƯỜI_DÙNG\n"
-"   Thêm một người dùng ở mức hệ thống\n"
+"[--disabled-login] NGƯỜI_DÙNG\n"
+"   Thêm một người dùng cấp hệ thống\n"
 "\n"
 "adduser --group [--gid MÃ_SỐ] NHÓM\n"
 "addgroup [--gid MÃ_SỐ] NHÓM\n"
-"   Thêm một nhóm ở mức người dùng\n"
+"   Thêm một nhóm cấp người dùng\n"
 "\n"
 "addgroup --system [--gid MÃ_SỐ] NHÓM\n"
-"   Thêm một nhóm ở mức hệ thống\n"
+"   Thêm một nhóm cấp hệ thống\n"
 "\n"
 "adduser NGƯỜI_DÙNG NHÓM\n"
 "   Thêm vào một nhóm tồn tại một người dùng đã có\n"
 "\n"
-"Tùy chọn chung:\n"
-"  --quiet | -q      đừng gửi cho đầu xuất tiêu chuẩn thông tin về diễn biến\n"
+"Tuỳ chọn chung:\n"
+"  --quiet | -q      đừng gửi cho đầu xuất tiêu chuẩn thông tin về tiến "
+"trình\n"
 "  --force-badname   cho phép tên người dùng không tương ứng\n"
 "                    với biến cấu hình NAME_REGEX\n"
 "  --help | -h       trợ giúp này\n"
-"  --version | -v    hiển thị phiên bản và bản quyền\n"
-"  --conf | -c TẬP_TIN sử dụng tập tin này làm tập tin cấu hình\n"
+"  --version | -v    số thứ tự phiên bản và bản quyền\n"
+"  --conf | -c TỆP  sử dụng tập tin này làm tập tin cấu hình\n"
 "\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
@@ -619,64 +630,64 @@ msgstr "Không sao lưu hoặc gỡ bỏ
 msgid "Not backing up/removing `%s', it matches %s.\n"
 msgstr "Không sao lưu hoặc gỡ bỏ “%s” vì nó tương ứng với %s.\n"
 
-#: ../deluser:309
+#: ../deluser:326
 #, perl-format
 msgid "Cannot handle special file %s\n"
 msgstr "Không quản lý được tập tin đặc biệt %s\n"
 
-#: ../deluser:317
+#: ../deluser:334
 #, perl-format
 msgid "Backing up files to be removed to %s ...\n"
 msgstr "Đang sao lưu vào %s các tập tin cần gỡ bỏ …\n"
 
-#: ../deluser:343
+#: ../deluser:360
 msgid "Removing files ...\n"
 msgstr "Đang gỡ bỏ các tập tin …\n"
 
-#: ../deluser:355
+#: ../deluser:372
 msgid "Removing crontab ...\n"
 msgstr "Đang gỡ bỏ bảng định kỳ crontab …\n"
 
-#: ../deluser:361
+#: ../deluser:378
 #, perl-format
 msgid "Warning: group `%s' has no more members.\n"
 msgstr "Cảnh báo: nhóm “%s” không còn có bộ phận lại.\n"
 
-#: ../deluser:383
+#: ../deluser:400
 #, perl-format
 msgid "getgrnam `%s' failed. This shouldn't happen.\n"
 msgstr "getgrnam “%s” bị lỗi. Trường hợp này không nên xảy ra.\n"
 
-#: ../deluser:388
+#: ../deluser:405
 #, perl-format
 msgid "The group `%s' is not a system group. Exiting.\n"
 msgstr "Nhóm “%s” không phải là một nhóm ở mức hệ thống nên thoát.\n"
 
-#: ../deluser:392
+#: ../deluser:409
 #, perl-format
 msgid "The group `%s' is not empty!\n"
 msgstr "Nhóm “%s” không trống!\n"
 
-#: ../deluser:398
+#: ../deluser:415
 #, perl-format
 msgid "`%s' still has `%s' as their primary group!\n"
 msgstr "“%s” vẫn còn có “%s” là nhóm chính!\n"
 
-#: ../deluser:422
+#: ../deluser:439
 msgid "You may not remove the user from their primary group.\n"
 msgstr "Không cho phép gỡ bỏ người dùng khỏi nhóm chính của họ.\n"
 
-#: ../deluser:436
+#: ../deluser:453
 #, perl-format
 msgid "The user `%s' is not a member of group `%s'.\n"
 msgstr "Người dùng “%s” không thuộc về nhóm “%s”.\n"
 
-#: ../deluser:439
+#: ../deluser:456
 #, perl-format
 msgid "Removing user `%s' from group `%s' ...\n"
 msgstr "Đang gỡ bỏ người dùng %s khỏi nhóm “%s” …\n"
 
-#: ../deluser:458
+#: ../deluser:475
 #, perl-format
 msgid ""
 "deluser version %s\n"
@@ -685,11 +696,11 @@ msgstr ""
 "deluser phiên bản %s\n"
 "\n"
 
-#: ../deluser:459
+#: ../deluser:476
 msgid "Removes users and groups from the system.\n"
 msgstr "Gỡ bỏ khỏi hệ thống các người dùng và nhóm.\n"
 
-#: ../deluser:461
+#: ../deluser:478
 msgid ""
 "Copyright (C) 2000 Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
@@ -697,7 +708,7 @@ msgstr ""
 "Tác quyền © năm 2000 của Roland Bauerschmidt <roland@copyleft.de>\n"
 "\n"
 
-#: ../deluser:463
+#: ../deluser:480
 msgid ""
 "deluser is based on adduser by Guy Maor <maor@debian.org>, Ian Murdock\n"
 "<imurdock@gnu.ai.mit.edu> and Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
@@ -708,7 +719,7 @@ msgstr ""
 "<imurdock@gnu.ai.mit.edu> và Ted Hajek <tedhajek@boombox.micro.umn.edu>\n"
 "\n"
 
-#: ../deluser:479
+#: ../deluser:496
 msgid ""
 "deluser USER\n"
 "  remove a normal user from the system\n"
@@ -795,3 +806,94 @@ msgstr "Không rõ biến “%s” tại
 #, perl-format
 msgid "Could not find program named `%s' in $PATH.\n"
 msgstr "Không tìm thấy chương trình “%s” trên đường dẫn mặc định $PATH.\n"
+
+#~ msgid "The user `%s' already exists. Exiting.\n"
+#~ msgstr "Người dùng “%s” đã có nên thoát.\n"
+
+#~ msgid ""
+#~ "%s: Please enter a username matching the regular expression configured\n"
+#~ "via the NAME_REGEX configuration variable.  Use the `--force-badname'\n"
+#~ "option to relax this check or reconfigure NAME_REGEX.\n"
+#~ msgstr ""
+#~ "%s: Hãy gõ một tên người dùng tương ứng với biểu thức chính quy\n"
+#~ "đ