Bug#260265: [Adduser-devel] Bug#260265: adduser: English tidy-up

Adam D. Barratt "Adam D. Barratt" <debian-bts@adam-barratt.org.uk>, 260265-maintonly@bugs.debian.org
Mon, 26 Jul 2004 15:25:34 +0100


This is a multi-part message in MIME format.

------=_NextPart_000_0729_01C47324.CBA2D680
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

On Thursday, July 22, 2004 8:05 PM, Marc Haber
<mh+debian-packages@zugschlus.de> wrote:

> On Tue, Jul 20, 2004 at 08:20:38PM +0100, Adam D. Barratt wrote:
>> If at all possible, could this version please be used in place of the
>> earlier patch?
>
> Changing so many english texts has a major impact on the 15
> translations that adduser has. I am pretty reluctant to make these
> changes because modifying the po files is quite error prone. Is there
> any automatic mechanism to help here?

Resending patch as attachment, as requested.

Regards,

Adam

------=_NextPart_000_0729_01C47324.CBA2D680
Content-Type: application/octet-stream;
	name="adduser_final.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="adduser_final.diff"

diff -Nru adduser-3.57/adduser adduser-3.57.new/adduser=0A=
--- adduser-3.57/adduser	2004-06-20 13:55:15.000000000 +0100=0A=
+++ adduser-3.57.new/adduser	2004-07-20 20:01:49.000000000 +0100=0A=
@@ -175,7 +175,7 @@=0A=
     } elsif ($arg eq "--conf") {=0A=
 	die "$0: ",_("--conf requires an argument.\n")=0A=
 	    if (!defined($defaults =3D shift(@ARGV)));=0A=
-	dief (_("`%s' doesn't exist.\n",$defaults))=0A=
+	dief (_("`%s' does not exist.\n",$defaults))=0A=
 	    if (! -f $defaults);=0A=
     } elsif ($arg eq "--no-create-home") {=0A=
 	$no_create_home =3D 1;=0A=
@@ -233,7 +233,7 @@=0A=
 	$action =3D "addgroup";=0A=
     }=0A=
 }=0A=
-die "$0: ",_("--group, --ingroup, and --gid options are mutually =
exclusive.\n") if=0A=
+die "$0: ",_("The --group, --ingroup, and --gid options are mutually =
exclusive.\n") if=0A=
     ($action ne "addgroup" &&=0A=
      defined($found_group_opt) +defined($ingroup_name) =
+defined($new_gid) > 1);=0A=
 =0A=
@@ -279,12 +279,12 @@=0A=
 if ($action eq "addsysgroup") {=0A=
     # Check if requested group already exists and we can exit safely=0A=
     if (existing_group_ok($new_name, $new_gid)) {=0A=
-	printf (_("Group %s does already exist as a system group. =
Exiting...\n"), $new_name) if $verbose;=0A=
+	printf (_("The group `%s' already exists as a system group. =
Exiting...\n"), $new_name) if $verbose;=0A=
 	exit 0;=0A=
     }=0A=
     dief (_("The group `%s' already exists.\n"),$new_name)=0A=
 	if (defined getgrnam($new_name));=0A=
-    dief (_("The GID `%s' is already in use.\n"),$new_gid)=0A=
+    dief (_("The GID %s is already in use.\n"),$new_gid)=0A=
 	if (defined($new_gid) && defined(getgrgid($new_gid)));=0A=
     if (!defined($new_gid)) {=0A=
         $new_gid =3D &first_avail_id($config{"first_system_gid"},=0A=
@@ -295,11 +295,11 @@=0A=
             print STDERR "$0: ",_("No GID is available in the range "),=0A=
             "$config{\"first_system_gid\"} - =
$config{\"last_system_gid\"}\n",=0A=
             "(FIRST_SYS_GID - LAST_SYS_GID).  ";=0A=
-            dief (_("Group `%s' not created.\n"),$new_name);=0A=
+            dief (_("The group `%s' was not created.\n"),$new_name);=0A=
         }=0A=
     }=0A=
 =0A=
-    printf (_("Adding group %s (%s)...\n"),$new_name,$new_gid) if =
$verbose;=0A=
+    printf (_("Adding group `%s' (%s)...\n"),$new_name,$new_gid) if =
$verbose;=0A=
     &invalidate_nscd("group");=0A=
     &systemcall('/usr/sbin/groupadd', '-g', $new_gid, $new_name);=0A=
     &invalidate_nscd("group");=0A=
@@ -314,7 +314,7 @@=0A=
 if ($action eq "addgroup") {=0A=
     dief (_("The group `%s' already exists.\n"),$new_name)=0A=
 	if (defined getgrnam($new_name));=0A=
-    dief (_("The GID `%s' is already in use.\n"),$new_gid)=0A=
+    dief (_("The GID %s is already in use.\n"),$new_gid)=0A=
 	if (defined($new_gid) && defined(getgrgid($new_gid)));=0A=
     if (!defined($new_gid)) {=0A=
         $new_gid =3D &first_avail_id($config{"first_gid"},=0A=
@@ -325,11 +325,11 @@=0A=
             print STDERR "$0: ",_("No GID is available in the range "),=0A=
             "$config{\"first_gid\"} - $config{\"last_gid\"}\n",=0A=
             "(FIRST_GID - LAST_GID).  ";=0A=
-            dief (_("Group `%s' not created.\n"),$new_name);=0A=
+            dief (_("The group `%s' was not created.\n"),$new_name);=0A=
         }=0A=
     }=0A=
 =0A=
-    printf (_("Adding group %s (%s)...\n"),$new_name,$new_gid) if =
$verbose;=0A=
+    printf (_("Adding group `%s' (%s)...\n"),$new_name,$new_gid) if =
$verbose;=0A=
     &invalidate_nscd("group");=0A=
     &systemcall('/usr/sbin/groupadd', '-g', $new_gid, $new_name);=0A=
     &invalidate_nscd("group");=0A=
@@ -342,17 +342,17 @@=0A=
 ## addusertogroup ##=0A=
 ####################=0A=
 elsif ($action eq "addusertogroup") {=0A=
-    dief (_("The user `%s' doesn't exist.\n"),$existing_user)=0A=
+    dief (_("The user `%s' does not exist.\n"),$existing_user)=0A=
 	if (!defined getpwnam($existing_user));=0A=
-    dief (_("The group `%s' doesn't exist.\n"),$existing_group)=0A=
+    dief (_("The group `%s' does not exist.\n"),$existing_group)=0A=
 	if (!defined getgrnam($existing_group));=0A=
     if (&user_is_member($existing_user, $existing_group)) {=0A=
-	printf _("The user `%s' is already a member of %s.\n"),=0A=
+	printf _("The user `%s' is already a member of `%s'.\n"),=0A=
                 $existing_user,$existing_group if $verbose;=0A=
 	exit 0;			# not really an error=0A=
     }=0A=
 =0A=
-    printf _("Adding user %s to group =
%s...\n"),$existing_user,$existing_group=0A=
+    printf _("Adding user `%s' to group =
`%s'...\n"),$existing_user,$existing_group=0A=
 	if $verbose;=0A=
     &invalidate_nscd();=0A=
     # FIXME - the next line has a race condition.=0A=
@@ -374,13 +374,13 @@=0A=
 ################=0A=
 elsif ($action eq "addsysuser") {=0A=
     if (existing_user_ok($new_name, $new_uid)) {=0A=
-	printf (_("User %s does already exist as a system user. =
Exiting...\n"), $new_name) if $verbose;=0A=
+	printf (_("The user `%s' already exists as a system user. =
Exiting...\n"), $new_name) if $verbose;=0A=
 	exit 0;=0A=
     }=0A=
     $new_gid =3D $nogroup_id=0A=
 	if (!$ingroup_name && !defined($new_gid) && !$make_group_also);=0A=
     check_user_group(1);=0A=
-    printf (_("Adding system user %s...\n"),$new_name) if $verbose;=0A=
+    printf (_("Adding system user `%s'...\n"),$new_name) if $verbose;=0A=
 =0A=
     if (!defined($new_uid) && $make_group_also) {=0A=
 	$new_uid =3D &first_avail_id($config{"first_system_uid"},=0A=
@@ -390,7 +390,7 @@=0A=
             print STDERR "$0: ",_("No UID/GID pair is available in the =
range "),=0A=
             "$config{\"first_system_uid\"} - =
$config{\"last_system_uid\"}\n",=0A=
             "(FIRST_SYS_UID - LAST_SYS_UID).  ";=0A=
-            dief (_("User `%s' not created.\n"),$new_name);=0A=
+            dief (_("The user `%s' was not created.\n"),$new_name);=0A=
         }=0A=
         $new_gid =3D $new_uid;=0A=
 	$ingroup_name =3D $new_name;=0A=
@@ -403,7 +403,7 @@=0A=
             print STDERR "$0: ",_("No UID is available in the range "),=0A=
             "$config{\"first_system_uid\"} - =
$config{\"last_system_uid\"}\n",=0A=
             "(FIRST_SYS_UID - LAST_SYS_UID).  ";=0A=
-            &dief (_("User `%s' not created.\n"),$new_name);=0A=
+            &dief (_("The user `%s' was not created.\n"),$new_name);=0A=
         }=0A=
         if (defined($new_gid)) { $ingroup_name =3D getgrgid($new_gid); }=0A=
 	elsif ($ingroup_name) { $new_gid =3D getgrnam($ingroup_name); }=0A=
@@ -418,13 +418,13 @@=0A=
 =0A=
     &invalidate_nscd();=0A=
     # if we reach this point, and the group does already exist, we can =
use it.=0A=
-    if ($make_group_also && !getgrnam($new_name)) {printf _("Adding new =
group %s (%s).\n"),$new_name,$new_gid if $verbose;=0A=
+    if ($make_group_also && !getgrnam($new_name)) {printf _("Adding new =
group `%s' (%s).\n"),$new_name,$new_gid if $verbose;=0A=
 	$undogroup =3D $new_name;=0A=
 	&systemcall('/usr/sbin/groupadd', '-g', $new_gid, $new_name);=0A=
 	&invalidate_nscd("group");=0A=
     }=0A=
 =0A=
-    printf _("Adding new user %s (%s) with group =
%s.\n"),$new_name,$new_uid,$ingroup_name=0A=
+    printf _("Adding new user `%s' (%s) with group =
`%s'.\n"),$new_name,$new_uid,$ingroup_name=0A=
 	if $verbose;=0A=
     $home_dir =3D $special_home || &homedir($new_name, $ingroup_name);=0A=
 	$shell =3D $special_shell || '/bin/false';=0A=
@@ -440,9 +440,9 @@=0A=
     if ($no_create_home) {=0A=
 	print _("Not creating home directory.\n") if $verbose;=0A=
     } elsif (-e $home_dir) {=0A=
-	printf _("Home directory %s already exists.\n"),$home_dir if $verbose;=0A=
+	printf _("Home directory `%s' already exists.\n"),$home_dir if =
$verbose;=0A=
     } else {=0A=
-	printf _("Creating home directory %s.\n"),$home_dir if $verbose;=0A=
+	printf _("Creating home directory `%s'.\n"),$home_dir if $verbose;=0A=
 	$undohome =3D $home_dir;=0A=
 	&mktree($home_dir) || &cleanup("Couldn't create $home_dir: $!.\n");=0A=
 	chown($new_uid, $new_gid, $home_dir)=0A=
@@ -467,7 +467,7 @@=0A=
     check_user_group(0);=0A=
     $first_uid =3D $new_firstuid || $config{"first_uid"};=0A=
     $last_uid =3D $new_lastuid || $config{"last_uid"};=0A=
-    printf _("Adding user %s...\n"),$new_name if $verbose;=0A=
+    printf _("Adding user `%s'...\n"),$new_name if $verbose;=0A=
 =0A=
     if (!defined($new_uid) && $make_group_also) {=0A=
 	$new_uid =3D &first_avail_id($first_uid,=0A=
@@ -477,7 +477,7 @@=0A=
             print STDERR "$0: ",_("No UID/GID pair is available in the =
range "),=0A=
             "$first_uid - $last_uid\n",=0A=
             "(FIRST_UID - LAST_UID).  ";=0A=
-            dief(_("User `%s' not created.\n"),$new_name);=0A=
+            dief(_("The user `%s' was not created.\n"),$new_name);=0A=
         }=0A=
 	$new_gid =3D $new_uid;=0A=
 	$ingroup_name =3D $new_name;=0A=
@@ -490,7 +490,7 @@=0A=
             print STDERR "$0: ",_("No UID is available in the range "),=0A=
             "$config{\"first_uid\"} - $config{\"last_uid\"}\n",=0A=
             "(FIRST_UID - LAST_UID).  ";=0A=
-            dief(_("User `%s' not created.\n"),$new_name);=0A=
+            dief(_("The user `%s' was not created.\n"),$new_name);=0A=
         }=0A=
 	if (defined($new_gid)) { $ingroup_name =3D getgrgid($new_gid); }=0A=
 	elsif ($ingroup_name) { $new_gid =3D getgrnam($ingroup_name); }=0A=
@@ -505,13 +505,13 @@=0A=
 =0A=
     &invalidate_nscd();=0A=
     if ($make_group_also) {=0A=
-	printf _("Adding new group %s (%s).\n"),$new_name,$new_gid if $verbose;=0A=
+	printf _("Adding new group `%s' (%s).\n"),$new_name,$new_gid if =
$verbose;=0A=
 	$undogroup =3D $new_name;=0A=
 	&systemcall('/usr/sbin/groupadd', '-g', $new_gid, $new_name);=0A=
 	&invalidate_nscd();=0A=
     }=0A=
 =0A=
-    printf _("Adding new user %s (%s) with group =
%s.\n"),$new_name,$new_uid,$ingroup_name=0A=
+    printf _("Adding new user `%s' (%s) with group =
`%s'.\n"),$new_name,$new_uid,$ingroup_name=0A=
 	if $verbose;=0A=
     $home_dir =3D $special_home || &homedir($new_name, $ingroup_name);=0A=
 	$shell =3D $special_shell || $config{"dshell"};=0A=
@@ -521,13 +521,13 @@=0A=
     &invalidate_nscd();=0A=
 =0A=
     if (-e $home_dir) {=0A=
-	printf _("Home directory %s already exists.  Not copying from %s\n"),=0A=
+	printf _("The home directory `%s' already exists.  Not copying from =
`%s'\n"),=0A=
         $home_dir,$config{skel} if $verbose && !$no_create_home;=0A=
     } elsif ($no_create_home) {=0A=
 	print "Not creating $home_dir.\n" if $verbose;=0A=
     }=0A=
     else {=0A=
-	printf _("Creating home directory %s.\n"),$home_dir if $verbose;=0A=
+	printf _("Creating home directory `%s'.\n"),$home_dir if $verbose;=0A=
 	$undohome =3D $home_dir;=0A=
 	&mktree($home_dir) || &cleanup("Couldn't create $home_dir: $!.\n");=0A=
 	chown($new_uid, $new_gid, $home_dir)=0A=
@@ -537,7 +537,7 @@=0A=
 	    &cleanup("chmod $dir_mode $home_dir: $!\n");=0A=
 =0A=
 	if ($config{"skel"}) {=0A=
-	    printf _("Copying files from %s\n"),$config{skel} if $verbose;=0A=
+	    printf _("Copying files from `%s'\n"),$config{skel} if $verbose;=0A=
 	    open(FIND, "cd $config{skel}; find .  ! -name '*.dpkg-*' -print |")=0A=
 		|| &cleanup("fork for find: $!\n");=0A=
 	    while (<FIND>) {=0A=
@@ -570,7 +570,7 @@=0A=
     }=0A=
 =0A=
     if ($config{"quotauser"}) {=0A=
-	printf _("Setting quota from %s.\n"),$config{quotauser};=0A=
+	printf _("Setting quota from `%s'.\n"),$config{quotauser};=0A=
 	&systemcall('/usr/sbin/edquota', '-p', $config{quotauser}, $new_name);=0A=
     }=0A=
 =0A=
@@ -656,26 +656,26 @@=0A=
     if( !$system || !existing_user_ok($new_name, $new_uid) ) {=0A=
 	if( defined getpwnam($new_name) ) {=0A=
 	    if( $system ) {=0A=
-		dief(_("The user %s\' already exists, and is not a system =
user.\n"),$new_name);=0A=
+		dief(_("The user `%s' already exists, and is not a system =
user.\n"),$new_name);=0A=
 	    } else {=0A=
-		dief(_("The user %s\' already exists.\n"),$new_name);=0A=
+		dief(_("The user `%s' already exists.\n"),$new_name);=0A=
 	    }=0A=
 	}=0A=
-	dief(_("The UID %s' already exists.\n"),$new_uid)=0A=
+	dief(_("The UID %s is already in use.\n"),$new_uid)=0A=
 	  if (defined($new_uid) && getpwuid($new_uid));=0A=
     }=0A=
     if ($make_group_also) {=0A=
 	if( !$system || !existing_group_ok($new_name, $new_uid) ) {=0A=
-	    dief(_("The group %s' already exists.\n"),$new_name)=0A=
+	    dief(_("The group `%s' already exists.\n"),$new_name)=0A=
 	      if (defined getgrnam($new_name));=0A=
-	    dief(_("The GID %s' already exists.\n"),$new_uid)=0A=
+	    dief(_("The GID %s is already in use.\n"),$new_uid)=0A=
 	      if (defined($new_uid) && defined(getgrgid($new_uid)));=0A=
 	}=0A=
     }=0A=
     else {=0A=
-	dief(_("The group `%s' doesn't exist.\n"),$ingroup_name)=0A=
+	dief(_("The group `%s' does not exist.\n"),$ingroup_name)=0A=
 	    if ($ingroup_name && !defined(getgrnam($ingroup_name)));=0A=
-	dief(_("The GID `%s' doesn't exist.\n"),$new_gid)=0A=
+	dief(_("The GID %s does not exist.\n"),$new_gid)=0A=
 	    if (defined($new_gid) && !defined(getgrgid($new_gid)));=0A=
     }=0A=
 }=0A=
@@ -722,7 +722,7 @@=0A=
 	print STDERR=0A=
 "$0: ",_("To avoid problems, the username should consist of a letter or=0A=
 underscore followed by letters, digits, underscores, and dashes. For=0A=
-compatibility with Samba machine accounts also \$ is supported at the=0A=
+compatibility with Samba machine accounts \$ is also supported at the=0A=
 end of the username\n");=0A=
 	exit 1;=0A=
     }=0A=
diff -Nru adduser-3.57/deluser adduser-3.57.new/deluser=0A=
--- adduser-3.57/deluser	2004-06-20 13:55:15.000000000 +0100=0A=
+++ adduser-3.57.new/deluser	2004-07-20 20:06:08.000000000 +0100=0A=
@@ -147,7 +147,7 @@=0A=
     } elsif($arg eq "--conf" || $arg eq "-c") {=0A=
         die "$0: ",_("--conf requires an argument.\n")=0A=
             if (!($defaults =3D shift(@ARGV)));=0A=
-        dief (_("`%s' doesn't exist.\n"),$defaults)=0A=
+        dief (_("`%s' does not exist.\n"),$defaults)=0A=
             if (! -f $defaults);=0A=
     } elsif($arg eq "--system") {=0A=
        $pconfig{"system"} =3D 1;=0A=
@@ -250,21 +250,21 @@=0A=
 	if( ($dummy1,$dummy2,$uid) =3D getpwnam($user) ) {=0A=
 	    if ( ($uid < $config{"first_system_uid"} ||=0A=
 		$uid > $config{"last_system_uid" } ) ) {=0A=
-		printf (_("User %s is not a system account... Exiting.\n"), $user) if =
$verbose;=0A=
+		printf (_("The user `%s' is not a system account... Exiting.\n"), =
$user) if $verbose;=0A=
 		exit 0;=0A=
 	    }=0A=
         } else {=0A=
-	    printf (_("User %s does not exist, but --system is given... =
Exiting.\n"), $user) if $verbose;=0A=
+	    printf (_("The user `%s' does not exist, but --system was given... =
Exiting.\n"), $user) if $verbose;=0A=
 	    exit 0;=0A=
 	}=0A=
     }=0A=
     =0A=
     unless(exist_user($user)) {=0A=
-	dief (_("`%s' does not exist.\n"),$user);=0A=
+	dief (_("The user `%s' does not exist.\n"),$user);=0A=
     }=0A=
 =0A=
     if($config{"remove_home"} && ($config{"home"} ne "") && =
($config{"home"} ne $pw_homedir)) {=0A=
-	dief (_("passwd home dir %s' does not match command line home dir, =
aborting.\n"),$pw_homedir,$config{"home"});=0A=
+	dief (_("passwd home dir `%s' does not match command line home dir, =
aborting.\n"),$pw_homedir,$config{"home"});=0A=
     } elsif($config{"remove_home"} || $config{"remove_all_files"}) {=0A=
 	s_print(_("Looking for files to backup/remove...\n"));=0A=
 	my(@files,@dirs);=0A=
@@ -318,7 +318,7 @@=0A=
 	}=0A=
     }=0A=
 =0A=
-    s_printf(_("Removing user %s...\n"),$user);=0A=
+    s_printf(_("Removing user `%s'...\n"),$user);=0A=
     systemcall("/usr/sbin/userdel", $user);=0A=
     &invalidate_nscd();=0A=
 =0A=
@@ -329,7 +329,7 @@=0A=
 } elsif($action eq "delgroup") {=0A=
     &invalidate_nscd();=0A=
     unless(exist_group($group)) {=0A=
-	dief (_("`%s' does not exist.\n"),$group);=0A=
+	dief (_("The group `%s' does not exist.\n"),$group);=0A=
     }=0A=
     my($dummy,$gid,$members);=0A=
     if( !(($dummy, $dummy, $gid, $members ) =3D getgrnam($group)) ) {=0A=
@@ -338,19 +338,19 @@=0A=
     if( $config{"system"} && =0A=
 	($gid < $config{"first_system_gid"} ||=0A=
 	 $gid > $config{"last_system_gid" } )) {=0A=
-        printf (_("Group %s is not a system group... Exiting.\n"), =
$group) if $verbose;=0A=
+        printf (_("The group `%s' is not a system group... =
Exiting.\n"), $group) if $verbose;=0A=
 	exit 0;=0A=
     }=0A=
     if( $config{"only-if-empty"} && $members ne "") {=0A=
-	dief (_("`%s' is not empty!\n"),$group);=0A=
+	dief (_("The group `%s' is not empty!\n"),$group);=0A=
     }=0A=
     =0A=
     # This needs to be fixed - we need use getpwent here.=0A=
     if(system("grep", "-q", "^.*:.*:.*:$gr_gid:.*:.*:.*\$", =
"/etc/passwd") =3D=3D 0) {=0A=
-	dief (_("There are users having `%s' as primary group!\n"),$group);=0A=
+	dief (_("There are users with `%s' as their primary group!\n"),$group);=0A=
     }=0A=
 =0A=
-    s_printf(_("Removing group %s...\n"),$group);=0A=
+    s_printf(_("Removing group `%s'...\n"),$group);=0A=
     systemcall("/usr/sbin/groupdel",$group);=0A=
     &invalidate_nscd();=0A=
     s_print(_("done.\n"));=0A=
@@ -359,10 +359,10 @@=0A=
 {=0A=
     &invalidate_nscd();=0A=
     unless(exist_user($user)) {=0A=
-	dief (_("`%s' does not exist.\n"),$user);=0A=
+	dief (_("The user `%s' does not exist.\n"),$user);=0A=
     }=0A=
     unless(exist_group($group)) {=0A=
-	dief (_("`%s' does not exist.\n"),$group);=0A=
+	dief (_("The group `%s' does not exist.\n"),$group);=0A=
     }=0A=
     if($maingroup eq $group) {=0A=
 	die "$0: ",_("You may not remove the user from his/her primary =
group.\n");=0A=
@@ -379,10 +379,10 @@=0A=
     }=0A=
 =0A=
     unless($ismember) {=0A=
-	dief(_("%s is not a member of group %s.\n"),$user,$group);=0A=
+	dief(_("The user `%s' is not a member of group `%s'.\n"),$user,$group);=0A=
     }=0A=
 =0A=
-    s_printf(_("Removing user %s from group %s...\n"),$user,$group);=0A=
+    s_printf(_("Removing user `%s' from group `%s'...\n"),$user,$group);=0A=
     #systemcall("usermod","-G", join(",",@groups), $user );=0A=
     systemcall('/usr/bin/gpasswd','-M', join(',',@members), $group);=0A=
     &invalidate_nscd();=0A=
diff -Nru adduser-3.57/po/ca.po adduser-3.57.new/po/ca.po=0A=
--- adduser-3.57/po/ca.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/ca.po	2004-07-25 15:47:40.000000000 +0100=0A=
@@ -66,7 +66,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "=AB%s=BB no existeix.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -99,7 +99,7 @@=0A=
 msgstr "Especifiqueu nom=E9s un nom en aquest mode.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "Les opcions --group, --ingroup i --gid s=F3n m=FAtuament =
exclusives.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -109,7 +109,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "El GID =AB%s=BB ja est=E0 en =FAs.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -118,7 +118,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "No s'ha creat el grup =AB%s=BB.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -132,22 +132,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "L'usuari =AB%s=BB no existeix.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "El grup =AB%s=BB no existeix.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "L'usuari =AB%s=BB ja =E9s membre de %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "S'est=E0 afegint l'usuari %s al grup %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -157,7 +157,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "S'est=E0 afegint l'usuari del sistema %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -166,7 +166,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "L'usuari =AB%s=BB no s'ha creat.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -196,27 +196,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "El directori personal %s ja existeix.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "S'est=E0 creant el directori personal %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "S'est=E0 afegint l'usuari %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "El directori personal %s ja existeix. No es copiar=E0 des de =
%s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "S'estan copiant els fitxers des de %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -229,7 +229,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "S'est=E0 establint la quota des de %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -249,7 +249,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "L'usuari =AB%s=BB no existeix.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -349,9 +349,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Es necessita un nom a eliminar.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "=AB%s=BB no existeix.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "=AB%s=BB no existeix.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -368,7 +373,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "S'est=E0 eliminant l'usuari %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -377,12 +382,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Hi ha usuaris amb =AB%s=BB com el grup primari!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "S'est=E0 eliminant el grup %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -391,12 +396,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s no =E9s membre del grup %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "S'est=E0 eliminant l'usuari %s del grup %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/cs.po adduser-3.57.new/po/cs.po=0A=
--- adduser-3.57/po/cs.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/cs.po	2004-07-25 15:49:32.000000000 +0100=0A=
@@ -64,7 +64,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "'%s' neexistuje.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -97,7 +97,7 @@=0A=
 msgstr "V tomto re=BEimu m=F9=BEete zadat pouze jedno jm=E9no.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "Volby --group, --ingroup a --gid se navz=E1jem vylu=E8uj=ED.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -107,7 +107,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "GID '%s' je ji=BE pou=BE=EDv=E1no.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -116,7 +116,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Skupina '%s' nebyla vytvo=F8ena.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -130,22 +130,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "U=BEivatel '%s' neexistuje.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "Skupina '%s' neexistuje.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "U=BEivatel '%s' je ji=BE =E8lenem %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "P=F8id=E1v=E1m u=BEivatele %s do skupiny %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -155,7 +155,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "P=F8id=E1v=E1m syst=E9mov=E9ho u=BEivatele %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -164,7 +164,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "U=BEivatel '%s' nebyl vytvo=F8en.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -191,27 +191,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Domovsk=FD adres=E1=F8 %s ji=BE existuje.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Vytv=E1=F8=EDm domovsk=FD adres=E1=F8 %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "P=F8id=E1v=E1m u=BEivatele %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Domovsk=FD adres=E1=F8 %s ji=BE existuje. Nekop=EDruji z %s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Kop=EDruji soubory z %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -224,7 +224,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Nastavuji kv=F3tu z %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -244,7 +244,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "U=BEivatel '%s' neexistuje.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -343,9 +343,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Pot=F8ebuji jm=E9no pro odstran=ECn=ED.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "'%s' neexistuje.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "'%s' neexistuje.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -362,7 +367,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Odstra=F2uji u=BEivatele %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -371,12 +376,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Existuj=ED u=BEivatel=E9, kte=F8=ED maj=ED nastavenu skupinu =
'%s' jako prim=E1rn=ED!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Odstra=F2uji skupinu %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -385,12 +390,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s nen=ED =E8lenem skupiny %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Odstra=F2uji u=BEivatele %s ze skupiny %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/da.po adduser-3.57.new/po/da.po=0A=
--- adduser-3.57/po/da.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/da.po	2004-07-25 15:50:03.000000000 +0100=0A=
@@ -64,7 +64,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -97,7 +97,7 @@=0A=
 msgstr "Specificer kun et navn i denne mode.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "--group, --ingroup, og --gid kan ikke bruges sammen.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -107,7 +107,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "GID'et `%s' er allerede i brug.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -116,7 +116,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Gruppe `%s' ikke tilf=C3=B8jet.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -130,22 +130,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "Brugeren `%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "Gruppen `%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "Brugeren `%s' er allerede et medlem af %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "F=C3=BCge Benutzer %s in Gruppe %s hinzu...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -155,7 +155,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "Tilf=C3=B8jer system bruger %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -164,7 +164,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "Bruger `%s' ikke tilf=C3=B8jet.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -191,27 +191,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Hjemmemappe %s eksisterer allerede.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Opretter hjemmemappe %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "Tilf=C3=B8jer bruger %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Hjemme mappe %s eksisterer allerede. Kopierer ikke fra %s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Kopierer filerne fra %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -224,7 +224,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "S=C3=A6tter kvota fra %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -244,7 +244,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "BID `%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -376,9 +376,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Jeg har brug for et navn at fjerne.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' eksisterer ikke.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -395,7 +400,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Fjerner bruger %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -404,12 +409,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Der er brugere der har %s som prim=C3=A6r gruppe!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Fjerner gruppe %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -418,12 +423,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s er ikke et medlem af gruppen %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Fjerner bruger %s fra gruppe %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/de.po adduser-3.57.new/po/de.po=0A=
--- adduser-3.57/po/de.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/de.po	2004-07-25 15:50:47.000000000 +0100=0A=
@@ -63,7 +63,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "=BB%s=AB existiert nicht.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -96,7 +96,7 @@=0A=
 msgstr "Geben Sie nur einen Namen in diesem Modus an.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr ""=0A=
 "Die Optionen --group, --ingroup und --gid schlie=DFen sich gegenseitig =
aus.\n"=0A=
 =0A=
@@ -107,7 +107,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "Die GID =BB%s=AB ist bereits in Benutzung.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -116,7 +116,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Gruppe =BB%s=AB wurde nicht angelegt.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -130,22 +130,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "Der Benutzer =BB%s=AB existiert nicht.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "Die Gruppe =BB%s=AB existiert nicht.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "Der Benutzer =BB%s=AB ist bereits ein Mitglied der Gruppe %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "F=FCge Benutzer %s in Gruppe %s hinzu...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -155,7 +155,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "Lege Systembenutzer %s an...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -164,7 +164,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "Benutzer =BB%s=AB wurde nicht angelegt.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -191,27 +191,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Homeverzeichnis %s existiert bereits.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Erstelle Homeverzeichnis %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "Lege Benutzer %s an...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Homeverzeichnis %s existiert bereits. Kopiere keine Dateien aus =
%s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Kopiere Dateien aus %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -224,7 +224,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Setze Quota vom %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -244,7 +244,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "Die GID =BB%s=AB existiert nicht.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -375,9 +375,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Ich ben=F6tige einen Namen, der entfernt werden soll.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "=BB%s=AB existiert nicht.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "=BB%s=AB existiert nicht.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -394,7 +399,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Entferne Benutzer %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -403,12 +408,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Es gibt Benutzer, die =BB%s=AB als prim=E4re Gruppe haben!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Entferne Gruppe %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -417,12 +422,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s ist kein Mitglied in der Gruppe %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Entferne Benutzer %s aus Gruppe %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/es.po adduser-3.57.new/po/es.po=0A=
--- adduser-3.57/po/es.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/es.po	2004-07-25 15:51:15.000000000 +0100=0A=
@@ -65,7 +65,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' no existe.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -98,7 +98,7 @@=0A=
 msgstr "Especifique s=F3lo un nombre en este modo.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "Las opciones --group, --ingroup y --gid son mutuamente =
excluyentes.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -108,7 +108,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "El GID `%s' ya est=E1 en uso.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -117,7 +117,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Grupo `%s' no creado.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -131,22 +131,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "El usuario `%s' no existe.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "El grupo `%s' no existe.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "El usuario `%s' ya es un miembro de %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "A=F1adiendo al usuario %s al grupo %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -156,7 +156,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "A=F1adiendo usuario del sistema %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -165,7 +165,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "Usuario `%s' no creado.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -192,27 +192,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "El directorio home %s ya existe.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Creando el directorio home %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "A=F1adiendo usuario %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "El directorio hogar %s ya existe.  No se lo copia desde %s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Copiando archivos desde %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -225,7 +225,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Configurando quota desde %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -245,7 +245,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "El usuario `%s' no existe.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -341,9 +341,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Necesito un nombre que eliminar.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' no existe.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' no existe.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -361,7 +366,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Eliminando usuario %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -370,12 +375,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "=A1Hay usuarios con `%s' como su grupo primario!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Eliminando el grupo %s ...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -384,12 +389,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s no es un miembro del grupo %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Sacando al usuario %s del grupo %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/fr.po adduser-3.57.new/po/fr.po=0A=
--- adduser-3.57/po/fr.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/fr.po	2004-07-25 15:51:47.000000000 +0100=0A=
@@ -67,7 +67,7 @@=0A=
 #: ../adduser:180=0A=
 #: ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "=AB=A0%s=A0=BB n'existe pas.\n"=0A=
 =0A=
 #: ../adduser:187=0A=
@@ -105,7 +105,7 @@=0A=
 msgstr "N'indiquez qu'un nom dans ce mode.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "Les options --group, --ingroup et --gid s'excluent =
mutuellement.\n"=0A=
 =0A=
 #: ../adduser:267=0A=
@@ -118,7 +118,7 @@=0A=
 #: ../adduser:269=0A=
 #: ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "Le GID =AB=A0%s=A0=BB est d=E9j=E0 utilis=E9.\n"=0A=
 =0A=
 #: ../adduser:277=0A=
@@ -129,7 +129,7 @@=0A=
 #: ../adduser:280=0A=
 #: ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Le groupe =AB=A0%s=A0=BB n'a pas =E9t=E9 cr=E9=E9.\n"=0A=
 =0A=
 #: ../adduser:284=0A=
@@ -146,23 +146,23 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "L'utilisateur =AB=A0%s=A0=BB n'existe pas.\n"=0A=
 =0A=
 #: ../adduser:329=0A=
 #: ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "Le groupe =AB=A0%s=A0=BB n'existe pas.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "L'utilisateur =AB=A0%s=A0=BB est d=E9j=E0 membre du groupe =
%s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "Ajout de l'utilisateur %s au groupe %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -172,7 +172,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "Ajout de l'utilisateur syst=E8me %s...\n"=0A=
 =0A=
 #: ../adduser:377=0A=
@@ -185,7 +185,7 @@=0A=
 #: ../adduser:467=0A=
 #: ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "L'utilisateur =AB=A0%s=A0=BB n'a pas =E9t=E9 cr=E9=E9.\n"=0A=
 =0A=
 #: ../adduser:390=0A=
@@ -218,28 +218,28 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Le r=E9pertoire personnel %s existe d=E9j=E0.\n"=0A=
 =0A=
 #: ../adduser:432=0A=
 #: ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Cr=E9ation du r=E9pertoire personnel %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "Ajout de l'utilisateur %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Le r=E9pertoire personnel %s existe d=E9j=E0. Pas de recopie de =
%s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Copie des fichiers depuis %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -252,7 +252,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Mise en place du quota =E0 partir de %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -272,7 +272,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "Le GID =AB=A0%s=A0=BB n'existe pas.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -405,11 +405,15 @@=0A=
 msgstr "Un nom =E0 supprimer doit =EAtre indiqu=E9.\n"=0A=
 =0A=
 #: ../deluser:204=0A=
-#: ../deluser:265=0A=
 #: ../deluser:281=0A=
+#, perl-format=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "=AB=A0%s=A0=BB n'existe pas.\n"=0A=
+=0A=
+#: ../deluser:265=0A=
 #: ../deluser:284=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "=AB=A0%s=A0=BB n'existe pas.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -426,7 +430,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Suppression de l'utilisateur %s...\n"=0A=
 =0A=
 #: ../deluser:261=0A=
@@ -437,12 +441,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Il existe des utilisateurs avec =AB=A0%s=A0=BB comme groupe =
principal=A0!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Suppression du groupe %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -451,12 +455,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "L'utilisateur %s n'est pas membre du groupe %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Suppression de l'utilisateur %s du groupe %s...\n"=0A=
 =0A=
 #: ../deluser:315=0A=
diff -Nru adduser-3.57/po/ja.po adduser-3.57.new/po/ja.po=0A=
--- adduser-3.57/po/ja.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/ja.po	2004-07-25 15:52:19.000000000 +0100=0A=
@@ -64,7 +64,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' =A4=AC=C2=B8=BA=DF=A4=B7=A4=DE=A4=BB=A4=F3=A1=A3\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -97,7 +97,7 @@=0A=
 msgstr =
"=A4=B3=A4=CE=A5=E2=A1=BC=A5=C9=A4=C7=A4=CF=A3=B1=A4=C4=A4=C0=A4=B1=CC=BE=
=C1=B0=A4=F2=BB=D8=C4=EA=A4=B7=A4=C6=B2=BC=A4=B5=A4=A4=A1=A3\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "--group, --ingroup, --gid =
=A5=AA=A5=D7=A5=B7=A5=E7=A5=F3=A4=CF=C6=B1=BB=FE=A4=CB=CA=A3=BF=F4=BB=D8=C4=
=EA=A4=C7=A4=AD=A4=DE=A4=BB=A4=F3=A1=A3\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -107,7 +107,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "=A5=B0=A5=EB=A1=BC=A5=D7 ID `%s' =
=A4=CF=B4=FB=A4=CB=BB=C8=CD=D1=A4=B5=A4=EC=A4=C6=A4=A4=A4=DE=A4=B9=A1=A3\=
n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -116,7 +116,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "`%s' =
=A5=B0=A5=EB=A1=BC=A5=D7=A4=CF=BA=EE=C0=AE=A4=B5=A4=EC=A4=DE=A4=BB=A4=F3=A4=
=C7=A4=B7=A4=BF=A1=A3\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -130,22 +130,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "=A5=E6=A1=BC=A5=B6 `%s' =
=A4=CF=C2=B8=BA=DF=A4=B7=A4=DE=A4=BB=A4=F3=A1=A3\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "=A5=B0=A5=EB=A1=BC=A5=D7 `%s' =
=A4=AC=C2=B8=BA=DF=A4=B7=A4=DE=A4=BB=A4=F3=A1=A3\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "=A5=E6=A1=BC=A5=B6 `%s' =
=A4=CF=B4=FB=A4=CB=A5=B0=A5=EB=A1=BC=A5=D7 `%s' =
=A4=CE=A5=E1=A5=F3=A5=D0=A1=BC=A4=C7=A4=B9=A1=A3\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "%s =A4=F2 %s =
=A4=CB=C4=C9=B2=C3=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -155,7 +155,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "=A5=B7=A5=B9=A5=C6=A5=E0=A5=E6=A1=BC=A5=B6 %s =
=A4=F2=C4=C9=B2=C3=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -164,7 +164,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "=A5=E6=A1=BC=A5=B6 `%s' =
=A4=CF=BA=EE=C0=AE=A4=B5=A4=EC=A4=DE=A4=BB=A4=F3=A4=C7=A4=B7=A4=BF=A1=A3\=
n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -191,27 +191,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "=A5=DB=A1=BC=A5=E0=A5=C7=A5=A3=A5=EC=A5=AF=A5=C8=A5=EA %s =
=A4=CF=B4=FB=A4=CB=C2=B8=BA=DF=A4=B7=A4=DE=A4=B9=A1=A3\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "=A5=DB=A1=BC=A5=E0=A5=C7=A5=A3=A5=EC=A5=AF=A5=C8=A5=EA %s =
=A4=F2=BA=EE=C0=AE=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9=A1=A3\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "=A5=E6=A1=BC=A5=B6 %s =
=A4=F2=C4=C9=B2=C3=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9=A1=C4\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "=A5=DB=A1=BC=A5=E0=A5=C7=A5=A3=A5=EC=A5=AF=A5=C8=A5=EA %s =
=A4=CF=B4=FB=A4=CB=C2=B8=BA=DF=A4=B7=A4=DE=A4=B9=A1=A3%s =
=A4=AB=A4=E9=A4=CE=A5=B3=A5=D4=A1=BC=A4=F2=A4=B7=A4=DE=A4=BB=A4=F3\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "%s =
=A4=AB=A4=E9=A5=D5=A5=A1=A5=A4=A5=EB=A4=F2=A5=B3=A5=D4=A1=BC=A4=B7=A4=C6=A4=
=A4=A4=DE=A4=B9\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -224,7 +224,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "%s =A4=AB=A4=E9 quota =
=A4=F2=C0=DF=C4=EA=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9=A1=A3\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -244,7 +244,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "=A5=B0=A5=EB=A1=BC=A5=D7 ID `%s' =
=A4=AC=C2=B8=BA=DF=A4=B7=A4=DE=A4=BB=A4=F3=A1=A3\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -365,9 +365,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr =
"=BA=EF=BD=FC=A4=B9=A4=EB=CC=BE=C1=B0=A4=AC=C9=AC=CD=D7=A4=C7=A4=B9=A1=A3=
\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' =A4=AC=C2=B8=BA=DF=A4=B7=A4=DE=A4=BB=A4=F3=A1=A3\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' =A4=AC=C2=B8=BA=DF=A4=B7=A4=DE=A4=BB=A4=F3=A1=A3\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -384,7 +389,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "=A5=E6=A1=BC=A5=B6 `%s' =
=A4=F2=BA=EF=BD=FC=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9=A1=A3\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -393,12 +398,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "`%s' =
=A4=F2=C2=E8=B0=EC=A4=CE=A5=B0=A5=EB=A1=BC=A5=D7=A4=C8=A4=B7=A4=C6=A4=A4=A4=
=EB=A5=E6=A1=BC=A5=B6=A4=AC=A4=A4=A4=DE=A4=B9!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "=A5=B0=A5=EB=A1=BC=A5=D7 `%s' =
=A4=F2=BA=EF=BD=FC=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9=A1=A3\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -408,12 +413,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "=A5=E6=A1=BC=A5=B6 `%s' =A4=CF=A5=B0=A5=EB=A1=BC=A5=D7 `%s' =
=A4=CE=A5=E1=A5=F3=A5=D0=A1=BC=A4=C7=A4=CF=A4=A2=A4=EA=A4=DE=A4=BB=A4=F3=A1=
=A3\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "=A5=E6=A1=BC=A5=B6 %s =A4=F2=A5=B0=A5=EB=A1=BC=A5=D7 %s =
=A4=AB=A4=E9=BA=EF=BD=FC=A4=B7=A4=C6=A4=A4=A4=DE=A4=B9...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/ko.po adduser-3.57.new/po/ko.po=0A=
--- adduser-3.57/po/ko.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/ko.po	2004-07-25 15:52:44.000000000 +0100=0A=
@@ -69,7 +69,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s'=C0=CC(=B0=A1) =BE=F8=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -103,7 +103,7 @@=0A=
 msgstr "=C0=CC =B0=E6=BF=EC=BF=A1=B4=C2 =C7=D1 =B0=B3=C0=C7 =
=C0=CC=B8=A7=B8=B8 =C1=F6=C1=A4=C7=D2 =BC=F6 =C0=D6=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr ""=0A=
 "--group, --ingroup, =B1=D7=B8=AE=B0=ED --gid =BF=C9=BC=C7=C0=BA =C7=D1 =
=B9=F8=BF=A1 =C7=D1 =B0=B3=B8=B8 =BE=B5 =BC=F6 =
=C0=D6=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
@@ -114,7 +114,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "`%s' GID=B4=C2 =C0=CC=B9=CC =
=BB=E7=BF=EB=C1=DF=C0=D4=B4=CF=B4=D9.\n"=0A=
 =0A=
 # (FIXME) =C0=CC=B7=B8=B0=D4 =BE=B2=B8=E9 =BE=C8 =B5=C7=C1=F6..=0A=
@@ -124,7 +124,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "`%s' =B1=D7=B7=EC=C0=CC =B8=B8=B5=E9=BE=EE=C1=F6=C1=F6 =
=BE=CA=BE=D2=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -138,22 +138,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "`%s' =BB=E7=BF=EB=C0=DA=B0=A1 =BE=F8=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' =B1=D7=B7=EC=C0=CC =BE=F8=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "`%s' =BB=E7=BF=EB=C0=DA=B4=C2 =C0=CC=B9=CC %s=C0=C7 =
=C0=CF=BF=F8=C0=D4=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "%s =BB=E7=BF=EB=C0=DA=B8=A6 %s =B1=D7=B7=EC=BF=A1 =
=C3=DF=B0=A1...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -163,7 +163,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "=BD=C3=BD=BA=C5=DB =BB=E7=BF=EB=C0=DA %s =C3=DF=B0=A1...\n"=0A=
 =0A=
 # (FIXME) =C0=CC=B7=B8=B0=D4 =BE=B2=B8=E9 =BE=C8 =B5=C7=C1=F6..=0A=
@@ -173,7 +173,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "`%s' =BB=E7=BF=EB=C0=DA=B0=A1 =B8=B8=B5=E9=BE=EE=C1=F6=C1=F6 =
=BE=CA=BE=D2=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 # (FIXME) =C0=CC=B7=B8=B0=D4 =BE=B2=B8=E9 =BE=C8 =B5=C7=C1=F6..=0A=
@@ -201,27 +201,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "=C8=A8 =B5=F0=B7=BA=C5=E4=B8=AE %s=C0=CC(=B0=A1) =C0=CC=B9=CC =
=C1=B8=C0=E7=C7=D5=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "=C8=A8 =B5=F0=B7=BA=C5=E4=B8=AE %s =C0=BB(=B8=A6) =
=B8=B8=B5=EC=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "=BB=E7=BF=EB=C0=DA %s =C3=DF=B0=A1...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "=C8=A8 =B5=F0=B7=BA=C5=E4=B8=AE %s=C0=CC(=B0=A1) =C0=CC=B9=CC =
=C1=B8=C0=E7=C7=D5=B4=CF=B4=D9.  %s=BF=A1=BC=AD =BA=B9=BB=E7=C7=CF=C1=F6 =
=BE=CA=BD=C0=B4=CF=B4=D9\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "%s=BF=A1=BC=AD =C6=C4=C0=CF =BA=B9=BB=E7\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -234,7 +234,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "%s=BF=A1=BC=AD =B5=F0=BD=BA=C5=A9 =C1=A6=C7=D1=C0=BB =
=BC=B3=C1=A4=C7=D5=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -254,7 +254,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "`%s' =BB=E7=BF=EB=C0=DA=B0=A1 =BE=F8=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -354,9 +354,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "=C3=DF=B0=A1=C7=D2 =C0=CC=B8=A7=C0=CC =
=C7=CA=BF=E4=C7=D5=B4=CF=B4=D9.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, fuzzy, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s'=C0=CC(=B0=A1) =BE=F8=BD=C0=B4=CF=B4=D9.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, fuzzy, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s'=C0=CC(=B0=A1) =BE=F8=BD=C0=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -374,7 +379,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, fuzzy, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "=BB=E7=BF=EB=C0=DA %s =C3=DF=B0=A1...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -384,12 +389,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr ""=0A=
 =0A=
 #: ../deluser:272=0A=
 #, fuzzy, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "=B1=D7=B7=EC %s (%s) =C3=DF=B0=A1...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -398,12 +403,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, fuzzy, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "`%s' =BB=E7=BF=EB=C0=DA=B4=C2 =C0=CC=B9=CC %s=C0=C7 =
=C0=CF=BF=F8=C0=D4=B4=CF=B4=D9.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, fuzzy, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "%s =BB=E7=BF=EB=C0=DA=B8=A6 %s =B1=D7=B7=EC=BF=A1 =
=C3=DF=B0=A1...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/nb.po adduser-3.57.new/po/nb.po=0A=
--- adduser-3.57/po/nb.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/nb.po	2004-07-25 15:53:08.000000000 +0100=0A=
@@ -64,7 +64,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -97,7 +97,7 @@=0A=
 msgstr "Angi kun ett navn i dette modus.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "--group, --ingroup, og --gid opsjonene er gjensidig =
ekskluderende.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -107,7 +107,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "GIDen `%s' er allerede i bruk.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -116,7 +116,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Gruppe `%s' ikke opprettet.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -130,22 +130,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "Brukeren `%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "Gruppen `%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "Brukeren `%s' er allerede et medlem av %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "Legger til bruker %s in Gruppe %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -155,7 +155,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "Oppretter systembruker %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -164,7 +164,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "Bruker `%s' ikke tilf=F8jet.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -191,27 +191,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Hjemmekatalog %s eksisterer allerede.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Oppretter hjemmekatalog %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "Oppretter bruker %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Hjemmekatalog %s eksisterer allerede. Kopierer ikke fra %s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Kopierer filene fra %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -224,7 +224,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Setter kvote fra %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -244,7 +244,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "Brukeren `%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -340,9 +340,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Jeg trenger navnet p=E5 brukeren som skal fjernes.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' eksisterer ikke.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' eksisterer ikke.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -359,7 +364,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Fjerner bruker %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -368,12 +373,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Det finnes brukere med %s som prim=E6r gruppe!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Fjerner gruppe %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -382,12 +387,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s er ikke medlem av gruppen %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Fjerner bruker %s fra gruppe %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/nl.po adduser-3.57.new/po/nl.po=0A=
--- adduser-3.57/po/nl.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/nl.po	2004-07-25 15:53:41.000000000 +0100=0A=
@@ -64,7 +64,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' bestaat niet.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -97,7 +97,7 @@=0A=
 msgstr "Specifieer slechts =E9=E9n naam in deze modus.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "--group, --ingroup, en --gid opties zijn onverenigbaar.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -107,7 +107,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "De GID `%d' is reeds in gebruik.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -116,7 +116,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Groep `%s' niet aangemaakt.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -130,22 +130,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "De gebruiker `%s' bestaat niet.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "De groep `%s' bestaat niet.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "De gebruiker `%s' is reeds lid van %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "Toevoegen gebruiker %s aan groep %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -155,7 +155,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "Toevoegen systeemgebruiker %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -164,7 +164,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "Gebruiker `%s' niet aangemaakt.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -191,27 +191,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Home directory %s bestaat reeds.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Aanmaken home directory %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "Toevoegen gebruiker %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Home directory %s bestaat reeds.  Wordt niet gekopieerd van =
%s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Kopi=EBren bestanden van %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -224,7 +224,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Instellen quota van %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -244,7 +244,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "De gebruiker `%s' bestaat niet.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -340,9 +340,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Ik heb een naam nodig om te verwijderen.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' bestaan niet.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' bestaan niet.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -359,7 +364,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Verwijderen gebruiker %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -368,12 +373,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Er zijn gebruikers met `%s' als primaire groep!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Verwijderen groep %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -382,12 +387,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s is geen lid van groep %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Verwijderen gebruiker %s van groep %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/pl.po adduser-3.57.new/po/pl.po=0A=
--- adduser-3.57/po/pl.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/pl.po	2004-07-25 15:54:09.000000000 +0100=0A=
@@ -65,7 +65,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' nie istnieje.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -98,7 +98,7 @@=0A=
 msgstr "W tym trybie mo=BFna poda=E6 tylko jedn=B1 nazw=EA.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "Opcje --group, --ingroup oraz --gid s=B1 wzajemnie =
wykluczaj=B1ce si=EA.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -108,7 +108,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "GID `%s' jest ju=BF u=BFywany.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -117,7 +117,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Nie utworzono grupy `%s'.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -131,22 +131,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "U=BFytkownik `%s' nie istnieje.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "Grupa `%s' nie istnieje.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "U=BFytkownik `%s' jest ju=BF cz=B3onkiem grupy %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "Dodawanie u=BFytkownika %s do grupy %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -156,7 +156,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "Dodawanie u=BFytkownika systemowego %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -165,7 +165,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "Nie utworzono u=BFytkownika `%s'.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -192,27 +192,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Katalog domowy %s ju=BF istnieje.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Tworzenie katalogu domowego %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, fuzzy, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "Dodawanie u=BFytkownika %s (%s).\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Katalog domowy %s ju=BF istnieje. %s nie zostanie =
przekopiowany.\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Kopiowanie plik=F3w z %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -225,7 +225,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Ustawianie udzia=B3=F3w dyskowych dla %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -245,7 +245,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "U=BFytkownik `%s' nie istnieje.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -341,9 +341,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Do usuni=EAcia potrzebna jest nazwa.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' nie istnieje.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' nie istnieje.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -360,7 +365,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Usuwanie u=BFytkownika %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -369,12 +374,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "Istniej=B1 u=BFytkownicy, kt=F3rzy posiadaj=B1 '%s' jako =
grup=EA podstawow=B1!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Usuwanie grupy %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -383,12 +388,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s nie jest cz=B3onkiem grupy %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Usuwanie u=BFytkownika %s z grupy %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/pt_BR.po adduser-3.57.new/po/pt_BR.po=0A=
--- adduser-3.57/po/pt_BR.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/pt_BR.po	2004-07-25 15:54:36.000000000 +0100=0A=
@@ -78,7 +78,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' n=E3o existe.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -111,7 +111,7 @@=0A=
 msgstr "Especifique somente um nome neste modo.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "Op=E7=F5es --group, --ingroup, e --gid s=E3o mutualmente =
exclusivas.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -121,7 +121,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "O GID `%s' j=E1 est=E1 em uso.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -130,7 +130,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "Grupo `%s' n=E3o criado.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -144,22 +144,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "O usu=E1rio `%s' n=E3o existe.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "O grupo `%s' n=E3o existe.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "O usu=E1rio `%s' j=E1 =E9 um membro de %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "Acrescentando usu=E1rio %s ao grupo %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -169,7 +169,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "Acrescentando usu=E1rio de sistema %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -178,7 +178,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "Usu=E1rio `%s' n=E3o criado.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -205,27 +205,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "Diret=F3rio pessoal %s j=E1 existe.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "Criando diret=F3rio pessoal %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "Acrescentando usu=E1rio %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "Diret=F3rio pessoal %s j=E1 existe.  N=E3o copiando de %s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "Copiando arquivos de %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -238,7 +238,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "Setando quota a partir de %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -258,7 +258,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "O GID `%s' n=E3o existe.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -390,9 +390,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "Eu preciso de um nome para remover.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' n=E3o existe.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' n=E3o existe.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -409,7 +414,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "Removendo usu=E1rio %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -418,12 +423,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "H=E1 usu=E1rios com `%s' como grupo prim=E1rio!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "Removendo grupo %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -432,12 +437,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s n=E3o =E9 um membro do grupo %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "Removendo usu=E1rio %s do grupo %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/ru.po adduser-3.57.new/po/ru.po=0A=
--- adduser-3.57/po/ru.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/ru.po	2004-07-25 15:55:00.000000000 +0100=0A=
@@ -68,7 +68,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "`%s' =CE=C5 =D3=D5=DD=C5=D3=D4=D7=D5=C5=D4.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -102,7 +102,7 @@=0A=
 msgstr "=F7 =DC=D4=CF=CD =D2=C5=D6=C9=CD=C5 =
=D5=CB=C1=DA=D9=D7=C1=C5=D4=D3=D1 =D4=CF=CC=D8=CB=CF =CF=C4=CE=CF =
=C9=CD=D1.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "=EF=D0=C3=C9=C9 --group, --ingroup =C9 -gid =
=D1=D7=CC=D1=C0=D4=D3=D1 =
=D7=DA=C1=C9=CD=CF=C9=D3=CB=CC=C0=DE=C1=C0=DD=C9=CD=C9.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -112,7 +112,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "GID `%s' =D5=D6=C5 =C9=D3=D0=CF=CC=D8=DA=D5=C5=D4=D3=D1.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -121,7 +121,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "=E7=D2=D5=D0=D0=C1 `%s' =CE=C5 =D3=CF=DA=C4=C1=CE=C1.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -135,22 +135,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "=F0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 `%s' =CE=C5 =
=D3=D5=DD=C5=D3=D4=D7=D5=C5=D4.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "=E7=D2=D5=D0=D0=C1 `%s' =CE=C5 =
=D3=D5=DD=C5=D3=D4=D7=D5=C5=D4.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "=F0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 `%s' =D5=D6=C5 =
=D1=D7=CC=D1=C5=D4=D3=D1 =DE=CC=C5=CE=CF=CD =C7=D2=D5=D0=D0=D9 %s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "=E4=CF=C2=C1=D7=CC=D1=C5=D4=D3=D1 =
=D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 %s =D7 =C7=D2=D5=D0=D0=D5 %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -160,7 +160,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "=E4=CF=C2=C1=D7=CC=D1=C5=D4=D3=D1 =D3=C9=D3=D4=C5=CD=CE=D9=CA =
=D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -169,7 +169,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr "=F0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 `%s' =CE=C5 =
=D3=CF=DA=C4=C1=CE.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -196,27 +196,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "=E4=CF=CD=C1=DB=CE=C9=CA =CB=C1=D4=C1=CC=CF=C7 %s =D5=D6=C5 =
=D3=D5=DD=C5=D3=D4=D7=D5=C5=D4.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "=F3=CF=DA=C4=C1=A3=D4=D3=D1 =C4=CF=CD=C1=DB=CE=C9=CA =
=CB=C1=D4=C1=CC=CF=C7 %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "=E4=CF=C2=C1=D7=CC=D1=C5=D4=D3=D1 =
=D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "=E4=CF=CD=C1=DB=CE=C9=CA =CB=C1=D4=C1=CC=CF=C7 %s =D5=D6=C5 =
=D3=D5=DD=C5=D3=D4=D7=D5=C5=D4. =EE=C5 =D5=C4=C1=CC=CF=D3=D8 =
=CB=CF=D0=C9=D2=CF=D7=C1=CE=C9=C5 =C9=DA %s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, fuzzy, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "=EB=CF=D0=C9=D2=D5=C0=D4=D3=D1 =C6=C1=CA=CC=D9 =C9=DA &s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -229,7 +229,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "=F5=D3=D4=C1=CE=C1=D7=CC=C9=D7=C1=C5=D4=D3=D1 =CB=D7=CF=D4=C1 =
=CF=D4 %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -249,7 +249,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "=F0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 `%s' =CE=C5 =
=D3=D5=DD=C5=D3=D4=D7=D5=C5=D4.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -347,9 +347,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "=E4=CC=D1 =D5=C4=C1=CC=C5=CE=C9=D1 =D4=D2=C5=C2=D5=C5=D4=D3=D1 =
=C9=CD=D1.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "`%s' =CE=C5 =D3=D5=DD=C5=D3=D4=D7=D5=C5=D4.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "`%s' =CE=C5 =D3=D5=DD=C5=D3=D4=D7=D5=C5=D4.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -367,7 +372,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "=F5=C4=C1=CC=D1=C5=D4=D3=D1 =
=D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -376,12 +381,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "=F3=D5=DD=C5=D3=D4=D7=D5=C0=D4 =
=D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=C9, =
=C9=D3=D0=CF=CC=D8=DA=D5=C0=DD=C9=C5 `%s' =CB=C1=CB =
=D0=C5=D2=D7=C9=DE=CE=D5=C0 =C7=D2=D5=D0=D0=D5!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "=F5=C4=C1=CC=D1=C5=D4=D3=D1 =C7=D2=D5=D0=D0=C1 %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -390,12 +395,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s =CE=C5 =D1=D7=CC=D1=C5=D4=D3=D1 =DE=CC=C5=CE=CF=CD =
=C7=D2=D5=D0=D0=D9 %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "=F5=C4=C1=CC=D1=C5=D4=D3=D1 =
=D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D8 %s =C9=DA =C7=D2=D5=D0=D0=D9 =
%s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/uk.po adduser-3.57.new/po/uk.po=0A=
--- adduser-3.57/po/uk.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/uk.po	2004-07-25 15:55:23.000000000 +0100=0A=
@@ -66,7 +66,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "\"%s\" =D0=BD=D0=B5 =D1=96=D1=81=D0=BD=D1=83=D1=94.\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -99,7 +99,7 @@=0A=
 msgstr "=D0=92=D0=BA=D0=B0=D0=B6=D1=96=D1=82=D1=8C =
=D1=82=D1=96=D0=BB=D1=8C=D0=BA=D0=B8 =D0=BE=D0=B4=D0=BD=D0=B5 =
=D1=96=D0=BC'=D1=8F =D0=B2 =D1=86=D1=8C=D0=BE=D0=BC=D1=83 =
=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D1=96.\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "=D0=9E=D0=BF=D1=86=D1=96=D1=97 --group, --ingroup =D1=82=D0=B0 =
--gid =D0=BD=D0=B5=D1=81=D1=83=D0=BC=D1=96=D1=81=D0=BD=D1=96.\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -109,7 +109,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "GID \"%s\" =D0=B2=D0=B6=D0=B5 =
=D0=B2=D0=B8=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D0=BE=D0=B2=D1=83=D1=94=D1=
=82=D1=8C=D1=81=D1=8F.\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -118,7 +118,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr "=D0=93=D1=80=D1=83=D0=BF=D1=83 \"%s\" =D0=BD=D0=B5 =
=D1=81=D1=82=D0=B2=D0=BE=D1=80=D0=B5=D0=BD=D0=BE.\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -132,22 +132,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr "=D0=9A=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87 =
\"%s\" =D0=BD=D0=B5 =D1=96=D1=81=D0=BD=D1=83=D1=94.\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "=D0=93=D1=80=D1=83=D0=BF=D0=B0 \"%s\" =D0=BD=D0=B5 =
=D1=96=D1=81=D0=BD=D1=83=D1=94.\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "=D0=9A=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87 =
\"%s\" =D0=B2=D0=B6=D0=B5 =D1=94 =D1=87=D0=BB=D0=B5=D0=BD=D0=BE=D0=BC =
%s.\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "=D0=94=D0=BE=D0=B4=D0=B0=D1=94=D1=82=D1=8C=D1=81=D1=8F =
=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87 %s =
=D0=B4=D0=BE =D0=B3=D1=80=D1=83=D0=BF=D0=B8 %s...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -157,7 +157,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr "=D0=94=D0=BE=D0=B4=D0=B0=D1=94=D1=82=D1=8C=D1=81=D1=8F =
=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=BD=D0=B8=D0=B9 =
=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87 %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -166,7 +166,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr =
"=D0=9A=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87=D0=B0 =
\"%s\" =D0=BD=D0=B5 =D1=81=D1=82=D0=B2=D0=BE=D1=80=D0=B5=D0=BD=D0=BE.\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -193,27 +193,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "=D0=94=D0=BE=D0=BC=D0=B0=D1=88=D0=BD=D1=8F =
=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D1=96=D1=8F %s =
=D0=B2=D0=B6=D0=B5 =D1=96=D1=81=D0=BD=D1=83=D1=94.\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr =
"=D0=A1=D1=82=D0=B2=D0=BE=D1=80=D1=8E=D1=94=D1=82=D1=8C=D1=81=D1=8F =
=D0=B4=D0=BE=D0=BC=D0=B0=D1=88=D0=BD=D1=8F =
=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D1=96=D1=8F %s.\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "=D0=94=D0=BE=D0=B4=D0=B0=D1=94=D1=82=D1=8C=D1=81=D1=8F =
=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87 %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "=D0=94=D0=BE=D0=BC=D0=B0=D1=88=D0=BD=D1=8F =
=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D1=96=D1=8F %s =
=D0=B2=D0=B6=D0=B5 =D1=96=D1=81=D0=BD=D1=83=D1=94.  =D0=9D=D0=B5 =
=D0=BA=D0=BE=D0=BF=D1=96=D1=8E=D1=8E =D0=B7 %s\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "=D0=9A=D0=BE=D0=BF=D1=96=D1=8E=D1=8E=D1=82=D1=8C=D1=81=D1=8F =
=D1=84=D0=B0=D0=B9=D0=BB=D0=B8 =D0=B7 %s\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -226,7 +226,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr =
"=D0=92=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D1=8E=D1=8E=D1=82=D1=8C=
=D1=81=D1=8F =D0=BE=D0=B1=D0=BC=D0=B5=D0=B6=D0=B5=D0=BD=D0=BD=D1=8F =
=D0=B7 %s.\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -246,7 +246,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr "GID \"%s\" =D0=BD=D0=B5 =D1=96=D1=81=D0=BD=D1=83=D1=94.\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -378,9 +378,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr "=D0=94=D0=BB=D1=8F =
=D0=B2=D0=B8=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=BD=D1=8F =
=D0=BF=D0=BE=D1=82=D1=80=D1=96=D0=B1=D0=BD=D0=BE =D1=96=D0=BC'=D1=8F.\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "\"%s\" =D0=BD=D0=B5 =D1=96=D1=81=D0=BD=D1=83=D1=94.\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "\"%s\" =D0=BD=D0=B5 =D1=96=D1=81=D0=BD=D1=83=D1=94.\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -397,7 +402,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr =
"=D0=92=D0=B8=D0=B4=D0=B0=D0=BB=D1=8F=D1=94=D1=82=D1=8C=D1=81=D1=8F =
=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87 %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -406,12 +411,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr "=D0=86=D1=81=D0=BD=D1=83=D1=8E=D1=82=D1=8C =
=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87=D1=96, =
=D1=8F=D0=BA=D1=96 =
=D0=B2=D0=B8=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D0=BE=D0=B2=D1=83=D1=8E=D1=
=82=D1=8C \"%s\" =D1=8F=D0=BA =
=D0=BF=D0=B5=D1=80=D0=B2=D0=B8=D0=BD=D0=BD=D1=83 =
=D0=B3=D1=80=D1=83=D0=BF=D1=83!\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr =
"=D0=92=D0=B8=D0=B4=D0=B0=D0=BB=D1=8F=D1=94=D1=82=D1=8C=D1=81=D1=8F =
=D0=B3=D1=80=D1=83=D0=BF=D0=B0 %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -420,12 +425,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "%s =D0=BD=D0=B5 =D1=94 =D1=87=D0=BB=D0=B5=D0=BD=D0=BE=D0=BC =
=D0=B3=D1=80=D1=83=D0=BF=D0=B8 %s.\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr =
"=D0=92=D0=B8=D0=B4=D0=B0=D0=BB=D1=8F=D1=94=D1=82=D1=8C=D1=81=D1=8F =
=D0=BA=D0=BE=D1=80=D0=B8=D1=81=D1=82=D1=83=D0=B2=D0=B0=D1=87 %s =
=D1=96=D0=B7 =D0=B3=D1=80=D1=83=D0=BF=D0=B8 %s...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=
diff -Nru adduser-3.57/po/zh_CN.po adduser-3.57.new/po/zh_CN.po=0A=
--- adduser-3.57/po/zh_CN.po	2004-06-20 13:55:16.000000000 +0100=0A=
+++ adduser-3.57.new/po/zh_CN.po	2004-07-25 15:55:49.000000000 +0100=0A=
@@ -65,7 +65,7 @@=0A=
 =0A=
 #: ../adduser:180 ../deluser:117=0A=
 #, perl-format=0A=
-msgid "`%s' doesn't exist.\n"=0A=
+msgid "`%s' does not exist.\n"=0A=
 msgstr "=E2=80=9C%s=E2=80=9D =E4=B8=8D=E5=AD=98=E5=9C=A8=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:187 ../deluser:126=0A=
@@ -98,7 +98,7 @@=0A=
 msgstr =
"=E8=BF=99=E4=B8=AA=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=8F=AA=E8=83=BD=E6=8C=87=
=E5=AE=9A=E4=B8=80=E4=B8=AA=E5=90=8D=E5=AD=97=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:231=0A=
-msgid "--group, --ingroup, and --gid options are mutually exclusive.\n"=0A=
+msgid "The --group, --ingroup, and --gid options are mutually =
exclusive.\n"=0A=
 msgstr "--group=EF=BC=8C--ingroup=EF=BC=8C=E5=92=8C --gid =
=E9=80=89=E9=A1=B9=E6=98=AF=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6=E4=BD=BF=E7=
=94=A8=E7=9A=84=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:267 ../adduser:297 ../adduser:603=0A=
@@ -108,7 +108,7 @@=0A=
 =0A=
 #: ../adduser:269 ../adduser:299=0A=
 #, perl-format=0A=
-msgid "The GID `%s' is already in use.\n"=0A=
+msgid "The GID %s is already in use.\n"=0A=
 msgstr "GID =
=E2=80=9C%s=E2=80=9D=E5=B7=B2=E7=BB=8F=E8=A2=AB=E4=BD=BF=E7=94=A8=E3=80=82=
\n"=0A=
 =0A=
 #: ../adduser:277 ../adduser:307=0A=
@@ -117,7 +117,7 @@=0A=
 =0A=
 #: ../adduser:280 ../adduser:310=0A=
 #, perl-format=0A=
-msgid "Group `%s' not created.\n"=0A=
+msgid "The group `%s' was not created.\n"=0A=
 msgstr =
"=E2=80=9C%s=E2=80=9D=E7=BB=84=E6=B2=A1=E6=9C=89=E8=A2=AB=E5=88=9B=E5=BB=BA=
=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:284 ../adduser:314=0A=
@@ -131,22 +131,22 @@=0A=
 =0A=
 #: ../adduser:327=0A=
 #, perl-format=0A=
-msgid "The user `%s' doesn't exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
 msgstr =
"=E7=94=A8=E6=88=B7=E2=80=9C%s=E2=80=9D=E4=B8=8D=E5=AD=98=E5=9C=A8=E3=80=82=
\n"=0A=
 =0A=
 #: ../adduser:329 ../adduser:609=0A=
 #, perl-format=0A=
-msgid "The group `%s' doesn't exist.\n"=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr =
"=E2=80=9C%s=E2=80=9D=E7=BB=84=E4=B8=8D=E5=AD=98=E5=9C=A8=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:332=0A=
 #, perl-format=0A=
-msgid "The user `%s' is already a member of %s.\n"=0A=
+msgid "The user `%s' is already a member of `%s'.\n"=0A=
 msgstr "=E7=94=A8=E6=88=B7=E2=80=9C%s=E2=80=9D=E5=B1=9E=E4=BA=8E %s =
=E7=BB=84=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:337=0A=
 #, perl-format=0A=
-msgid "Adding user %s to group %s...\n"=0A=
+msgid "Adding user `%s' to group `%s'...\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7 %s =
=E5=88=B0 %s =E7=BB=84...\n"=0A=
 =0A=
 #: ../adduser:364=0A=
@@ -156,7 +156,7 @@=0A=
 =0A=
 #: ../adduser:370=0A=
 #, perl-format=0A=
-msgid "Adding system user %s...\n"=0A=
+msgid "Adding system user `%s'...\n"=0A=
 msgstr =
"=E6=AD=A3=E5=9C=A8=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=
 %s...\n"=0A=
 =0A=
 #: ../adduser:377 ../adduser:464=0A=
@@ -165,7 +165,7 @@=0A=
 =0A=
 #: ../adduser:380 ../adduser:393 ../adduser:467 ../adduser:480=0A=
 #, perl-format=0A=
-msgid "User `%s' not created.\n"=0A=
+msgid "The user `%s' was not created.\n"=0A=
 msgstr =
"=E7=94=A8=E6=88=B7=E2=80=9C%s=E2=80=9D=E6=B2=A1=E6=9C=89=E8=A2=AB=E5=88=9B=
=E5=BB=BA=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:390 ../adduser:477=0A=
@@ -192,27 +192,27 @@=0A=
 =0A=
 #: ../adduser:430=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.\n"=0A=
+msgid "Home directory `%s' already exists.\n"=0A=
 msgstr "=E4=B8=BB=E7=9B=AE=E5=BD=95 %s =
=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:432 ../adduser:517=0A=
 #, perl-format=0A=
-msgid "Creating home directory %s.\n"=0A=
+msgid "Creating home directory `%s'.\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E5=88=9B=E5=BB=BA=E4=B8=BB=E7=9B=AE=E5=BD=95 =
%s=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:457=0A=
 #, perl-format=0A=
-msgid "Adding user %s...\n"=0A=
+msgid "Adding user `%s'...\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7 %s...\n"=0A=
 =0A=
 #: ../adduser:511=0A=
 #, perl-format=0A=
-msgid "Home directory %s already exists.  Not copying from %s\n"=0A=
+msgid "The home directory `%s' already exists.  Not copying from `%s'\n"=0A=
 msgstr "=E4=B8=BB=E7=9B=AE=E5=BD=95 %s =
=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8=E3=80=82=E6=B2=A1=E6=9C=89=E4=BB=8E =
%s =E5=A4=8D=E5=88=B6=E6=96=87=E4=BB=B6=E8=BF=87=E6=9D=A5=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:527=0A=
 #, perl-format=0A=
-msgid "Copying files from %s\n"=0A=
+msgid "Copying files from `%s'\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E4=BB=8E %s =
=E5=A4=8D=E5=88=B6=E6=96=87=E4=BB=B6\n"=0A=
 =0A=
 #: ../adduser:553=0A=
@@ -225,7 +225,7 @@=0A=
 =0A=
 #: ../adduser:560=0A=
 #, perl-format=0A=
-msgid "Setting quota from %s.\n"=0A=
+msgid "Setting quota from `%s'.\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E4=BB=8E %s =
=E8=AE=BE=E7=BD=AE=E7=A3=81=E7=9B=98=E9=99=90=E9=A2=9D(quota)=E3=80=82\n"=0A=
 =0A=
 #: ../adduser:599=0A=
@@ -245,7 +245,7 @@=0A=
 =0A=
 #: ../adduser:611=0A=
 #, fuzzy, perl-format=0A=
-msgid "The GID `%s' doesn't exist.\n"=0A=
+msgid "The GID %s does not exist.\n"=0A=
 msgstr =
"=E7=94=A8=E6=88=B7=E2=80=9C%s=E2=80=9D=E4=B8=8D=E5=AD=98=E5=9C=A8=E3=80=82=
\n"=0A=
 =0A=
 #: ../adduser:656=0A=
@@ -344,9 +344,14 @@=0A=
 msgid "I need a name to remove.\n"=0A=
 msgstr =
"=E6=88=91=E9=9C=80=E8=A6=81=E6=AC=B2=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=
=E7=9A=84=E5=90=8D=E5=AD=97=E3=80=82\n"=0A=
 =0A=
-#: ../deluser:204 ../deluser:265 ../deluser:281 ../deluser:284=0A=
+#: ../deluser:204 ../deluser:281=0A=
 #, perl-format=0A=
-msgid "`%s' does not exist.\n"=0A=
+msgid "The user `%s' does not exist.\n"=0A=
+msgstr "=E2=80=9C%s=E2=80=9D =E4=B8=8D=E5=AD=98=E5=9C=A8=E3=80=82\n"=0A=
+=0A=
+#: ../deluser:265 ../deluser:284=0A=
+#, perl-format=0A=
+msgid "The group `%s' does not exist.\n"=0A=
 msgstr "=E2=80=9C%s=E2=80=9D =E4=B8=8D=E5=AD=98=E5=9C=A8=E3=80=82\n"=0A=
 =0A=
 #: ../deluser:208=0A=
@@ -363,7 +368,7 @@=0A=
 =0A=
 #: ../deluser:254=0A=
 #, perl-format=0A=
-msgid "Removing user %s...\n"=0A=
+msgid "Removing user `%s'...\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7 %s...\n"=0A=
 =0A=
 #: ../deluser:261 ../deluser:275 ../deluser:308=0A=
@@ -372,12 +377,12 @@=0A=
 =0A=
 #: ../deluser:269=0A=
 #, perl-format=0A=
-msgid "There are users having `%s' as primary group!\n"=0A=
+msgid "There are users with `%s' as their primary group!\n"=0A=
 msgstr =
"=E6=9C=89=E4=BA=9B=E7=94=A8=E6=88=B7=E4=BB=A5=E2=80=9C%s=E2=80=9D=E4=B8=BA=
=E4=B8=BB=E8=A6=81=E7=BB=84=EF=BC=81\n"=0A=
 =0A=
 #: ../deluser:272=0A=
 #, perl-format=0A=
-msgid "Removing group %s...\n"=0A=
+msgid "Removing group `%s'...\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E5=88=A0=E9=99=A4=E7=BB=84 %s...\n"=0A=
 =0A=
 #: ../deluser:287=0A=
@@ -386,12 +391,12 @@=0A=
 =0A=
 #: ../deluser:301=0A=
 #, perl-format=0A=
-msgid "%s is not a member of group %s.\n"=0A=
+msgid "The user `%s' is not a member of group `%s'.\n"=0A=
 msgstr "=E2=80=9C%s =E4=B8=8D=E6=98=AF %s =
=E7=BB=84=E4=B8=AD=E7=9A=84=E6=88=90=E5=91=98=E3=80=82\n"=0A=
 =0A=
 #: ../deluser:304=0A=
 #, perl-format=0A=
-msgid "Removing user %s from group %s...\n"=0A=
+msgid "Removing user `%s' from group `%s'...\n"=0A=
 msgstr "=E6=AD=A3=E5=9C=A8=E5=B0=86=E7=94=A8=E6=88=B7 %s =E4=BB=8E %s =
=E7=BB=84=E4=B8=AD=E5=88=A0=E9=99=A4...\n"=0A=
 =0A=
 #: ../deluser:315 ../deluser:334=0A=

------=_NextPart_000_0729_01C47324.CBA2D680--