thr3ads.net - Adduser devel - [Adduser-devel] Bug#260265: adduser: English tidy-up [Jul 2004]

If this information is useful, please help other people find it:
Share via:

Adam D. Barratt

2004-Jul-19 16:35 UTC

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

Package: adduser
Severity: minor
Version: 3.57

Hi,

Please consider applying the attached patch which removes some awkward
phrasing from the English strings and unifies some of the phrasing used.

I haven''t attempted to update the translations, as I wasn''t
sure where the
master copies are stored.

Regards,

Adam

Marc Haber

2004-Jul-20 10:52 UTC

head link

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

tags #260265 patch confirmed
thanks

On Mon, Jul 19, 2004 at 05:35:48PM +0100, Adam D. Barratt
wrote:> Please consider applying the attached patch which removes some awkward
> phrasing from the English strings and unifies some of the phrasing used.
The patch will be applied in the next upload.

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don''t trust Computers. They | Mailadresse
im Header
Karlsruhe, Germany |  lose things."    Winona Ryder | Fon: *49 721 966 32
15
Nordisch by Nature |  How to make an American Quilt | Fax: *49 721 966 31 29

Debian Bug Tracking System

2004-Jul-20 11:03 UTC

head link

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

Processing commands for control@bugs.debian.org:
> tags #260265 patch confirmedBug#260265: adduser: English tidy-up
Tags were: patch
Tags added: patch, confirmed
> thanksStopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)

Adam D. Barratt

2004-Jul-20 19:20 UTC

head link

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

--=-Eourhwb+I3tB3VX5R3CI
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Tue, 2004-07-20 at 11:52, Marc Haber wrote:> tags #260265 patch confirmed
> thanks
> 
> On Mon, Jul 19, 2004 at 05:35:48PM +0100, Adam D. Barratt wrote:
> > Please consider applying the attached patch which removes some awkward
> > phrasing from the English strings and unifies some of the phrasing
used.
> 
> The patch will be applied in the next upload.
Thanks. I''ve attached an updated (final, I promise ;->) version of
the
patch which includes a few more unifying changes - primarily making all
messages use definite articles and making the quoting of messages
consistent: always `'' around strings, never around numbers.

If at all possible, could this version please be used in place of the
earlier patch?

Thanks,

Adam

--=-Eourhwb+I3tB3VX5R3CI
Content-Disposition: attachment; filename=adduser2.diff
Content-Type: text/x-patch; name=adduser2.diff; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

diff -Nru adduser-3.57/adduser adduser-3.57.new/adduser
--- adduser-3.57/adduser	2004-06-20 13:55:15.000000000 +0100
+++ adduser-3.57.new/adduser	2004-07-20 20:01:49.000000000 +0100
@@ -175,7 +175,7 @@
     } elsif ($arg eq "--conf") {
 	die "$0: ",_("--conf requires an argument.\n")
 	    if (!defined($defaults = shift(@ARGV)));
-	dief (_("`%s'' doesn''t exist.\n",$defaults))
+	dief (_("`%s'' does not exist.\n",$defaults))
 	    if (! -f $defaults);
     } elsif ($arg eq "--no-create-home") {
 	$no_create_home = 1;
@@ -233,7 +233,7 @@
 	$action = "addgroup";
     }
 }
-die "$0: ",_("--group, --ingroup, and --gid options are mutually
exclusive.\n") if
+die "$0: ",_("The --group, --ingroup, and --gid options are
mutually exclusive.\n") if
     ($action ne "addgroup" &&
      defined($found_group_opt) +defined($ingroup_name) +defined($new_gid) >
1);
 
@@ -279,12 +279,12 @@
 if ($action eq "addsysgroup") {
     # Check if requested group already exists and we can exit safely
     if (existing_group_ok($new_name, $new_gid)) {
-	printf (_("Group %s does already exist as a system group.
Exiting...\n"), $new_name) if $verbose;
+	printf (_("The group `%s'' already exists as a system group.
Exiting...\n"), $new_name) if $verbose;
 	exit 0;
     }
     dief (_("The group `%s'' already exists.\n"),$new_name)
 	if (defined getgrnam($new_name));
-    dief (_("The GID `%s'' is already in use.\n"),$new_gid)
+    dief (_("The GID %s is already in use.\n"),$new_gid)
 	if (defined($new_gid) && defined(getgrgid($new_gid)));
     if (!defined($new_gid)) {
         $new_gid = &first_avail_id($config{"first_system_gid"},
@@ -295,11 +295,11 @@
             print STDERR "$0: ",_("No GID is available in the
range "),
             "$config{\"first_system_gid\"} -
$config{\"last_system_gid\"}\n",
             "(FIRST_SYS_GID - LAST_SYS_GID).  ";
-            dief (_("Group `%s'' not created.\n"),$new_name);
+            dief (_("The group `%s'' was not
created.\n"),$new_name);
         }
     }
 
-    printf (_("Adding group %s (%s)...\n"),$new_name,$new_gid) if
$verbose;
+    printf (_("Adding group `%s''
(%s)...\n"),$new_name,$new_gid) if $verbose;
     &invalidate_nscd("group");
     &systemcall(''/usr/sbin/groupadd'',
''-g'', $new_gid, $new_name);
     &invalidate_nscd("group");
@@ -314,7 +314,7 @@
 if ($action eq "addgroup") {
     dief (_("The group `%s'' already exists.\n"),$new_name)
 	if (defined getgrnam($new_name));
-    dief (_("The GID `%s'' is already in use.\n"),$new_gid)
+    dief (_("The GID %s is already in use.\n"),$new_gid)
 	if (defined($new_gid) && defined(getgrgid($new_gid)));
     if (!defined($new_gid)) {
         $new_gid = &first_avail_id($config{"first_gid"},
@@ -325,11 +325,11 @@
             print STDERR "$0: ",_("No GID is available in the
range "),
             "$config{\"first_gid\"} -
$config{\"last_gid\"}\n",
             "(FIRST_GID - LAST_GID).  ";
-            dief (_("Group `%s'' not created.\n"),$new_name);
+            dief (_("The group `%s'' was not
created.\n"),$new_name);
         }
     }
 
-    printf (_("Adding group %s (%s)...\n"),$new_name,$new_gid) if
$verbose;
+    printf (_("Adding group `%s''
(%s)...\n"),$new_name,$new_gid) if $verbose;
     &invalidate_nscd("group");
     &systemcall(''/usr/sbin/groupadd'',
''-g'', $new_gid, $new_name);
     &invalidate_nscd("group");
@@ -342,17 +342,17 @@
 ## addusertogroup ##
 ####################
 elsif ($action eq "addusertogroup") {
-    dief (_("The user `%s'' doesn''t
exist.\n"),$existing_user)
+    dief (_("The user `%s'' does not
exist.\n"),$existing_user)
 	if (!defined getpwnam($existing_user));
-    dief (_("The group `%s'' doesn''t
exist.\n"),$existing_group)
+    dief (_("The group `%s'' does not
exist.\n"),$existing_group)
 	if (!defined getgrnam($existing_group));
     if (&user_is_member($existing_user, $existing_group)) {
-	printf _("The user `%s'' is already a member of %s.\n"),
+	printf _("The user `%s'' is already a member of
`%s''.\n"),
                 $existing_user,$existing_group if $verbose;
 	exit 0;			# not really an error
     }
 
-    printf _("Adding user %s to group
%s...\n"),$existing_user,$existing_group
+    printf _("Adding user `%s'' to group
`%s''...\n"),$existing_user,$existing_group
 	if $verbose;
     &invalidate_nscd();
     # FIXME - the next line has a race condition.
@@ -374,13 +374,13 @@
 ################
 elsif ($action eq "addsysuser") {
     if (existing_user_ok($new_name, $new_uid)) {
-	printf (_("User %s does already exist as a system user.
Exiting...\n"), $new_name) if $verbose;
+	printf (_("The user `%s'' already exists as a system user.
Exiting...\n"), $new_name) if $verbose;
 	exit 0;
     }
     $new_gid = $nogroup_id
 	if (!$ingroup_name && !defined($new_gid) &&
!$make_group_also);
     check_user_group(1);
-    printf (_("Adding system user %s...\n"),$new_name) if $verbose;
+    printf (_("Adding system user `%s''...\n"),$new_name) if
$verbose;
 
     if (!defined($new_uid) && $make_group_also) {
 	$new_uid = &first_avail_id($config{"first_system_uid"},
@@ -390,7 +390,7 @@
             print STDERR "$0: ",_("No UID/GID pair is available
in the range "),
             "$config{\"first_system_uid\"} -
$config{\"last_system_uid\"}\n",
             "(FIRST_SYS_UID - LAST_SYS_UID).  ";
-            dief (_("User `%s'' not created.\n"),$new_name);
+            dief (_("The user `%s'' was not
created.\n"),$new_name);
         }
         $new_gid = $new_uid;
 	$ingroup_name = $new_name;
@@ -403,7 +403,7 @@
             print STDERR "$0: ",_("No UID is available in the
range "),
             "$config{\"first_system_uid\"} -
$config{\"last_system_uid\"}\n",
             "(FIRST_SYS_UID - LAST_SYS_UID).  ";
-            &dief (_("User `%s'' not
created.\n"),$new_name);
+            &dief (_("The user `%s'' was not
created.\n"),$new_name);
         }
         if (defined($new_gid)) { $ingroup_name = getgrgid($new_gid); }
 	elsif ($ingroup_name) { $new_gid = getgrnam($ingroup_name); }
@@ -418,13 +418,13 @@
 
     &invalidate_nscd();
     # if we reach this point, and the group does already exist, we can use it.
-    if ($make_group_also && !getgrnam($new_name)) {printf
_("Adding new group %s (%s).\n"),$new_name,$new_gid if $verbose;
+    if ($make_group_also && !getgrnam($new_name)) {printf
_("Adding new group `%s'' (%s).\n"),$new_name,$new_gid if
$verbose;
 	$undogroup = $new_name;
 	&systemcall(''/usr/sbin/groupadd'',
''-g'', $new_gid, $new_name);
 	&invalidate_nscd("group");
     }
 
-    printf _("Adding new user %s (%s) with group
%s.\n"),$new_name,$new_uid,$ingroup_name
+    printf _("Adding new user `%s'' (%s) with group
`%s''.\n"),$new_name,$new_uid,$ingroup_name
 	if $verbose;
     $home_dir = $special_home || &homedir($new_name, $ingroup_name);
 	$shell = $special_shell || ''/bin/false'';
@@ -440,9 +440,9 @@
     if ($no_create_home) {
 	print _("Not creating home directory.\n") if $verbose;
     } elsif (-e $home_dir) {
-	printf _("Home directory %s already exists.\n"),$home_dir if
$verbose;
+	printf _("Home directory `%s'' already exists.\n"),$home_dir
if $verbose;
     } else {
-	printf _("Creating home directory %s.\n"),$home_dir if $verbose;
+	printf _("Creating home directory `%s''.\n"),$home_dir if
$verbose;
 	$undohome = $home_dir;
 	&mktree($home_dir) || &cleanup("Couldn''t create
$home_dir: $!.\n");
 	chown($new_uid, $new_gid, $home_dir)
@@ -467,7 +467,7 @@
     check_user_group(0);
     $first_uid = $new_firstuid || $config{"first_uid"};
     $last_uid = $new_lastuid || $config{"last_uid"};
-    printf _("Adding user %s...\n"),$new_name if $verbose;
+    printf _("Adding user `%s''...\n"),$new_name if $verbose;
 
     if (!defined($new_uid) && $make_group_also) {
 	$new_uid = &first_avail_id($first_uid,
@@ -477,7 +477,7 @@
             print STDERR "$0: ",_("No UID/GID pair is available
in the range "),
             "$first_uid - $last_uid\n",
             "(FIRST_UID - LAST_UID).  ";
-            dief(_("User `%s'' not created.\n"),$new_name);
+            dief(_("The user `%s'' was not
created.\n"),$new_name);
         }
 	$new_gid = $new_uid;
 	$ingroup_name = $new_name;
@@ -490,7 +490,7 @@
             print STDERR "$0: ",_("No UID is available in the
range "),
             "$config{\"first_uid\"} -
$config{\"last_uid\"}\n",
             "(FIRST_UID - LAST_UID).  ";
-            dief(_("User `%s'' not created.\n"),$new_name);
+            dief(_("The user `%s'' was not
created.\n"),$new_name);
         }
 	if (defined($new_gid)) { $ingroup_name = getgrgid($new_gid); }
 	elsif ($ingroup_name) { $new_gid = getgrnam($ingroup_name); }
@@ -505,13 +505,13 @@
 
     &invalidate_nscd();
     if ($make_group_also) {
-	printf _("Adding new group %s (%s).\n"),$new_name,$new_gid if
$verbose;
+	printf _("Adding new group `%s''
(%s).\n"),$new_name,$new_gid if $verbose;
 	$undogroup = $new_name;
 	&systemcall(''/usr/sbin/groupadd'',
''-g'', $new_gid, $new_name);
 	&invalidate_nscd();
     }
 
-    printf _("Adding new user %s (%s) with group
%s.\n"),$new_name,$new_uid,$ingroup_name
+    printf _("Adding new user `%s'' (%s) with group
`%s''.\n"),$new_name,$new_uid,$ingroup_name
 	if $verbose;
     $home_dir = $special_home || &homedir($new_name, $ingroup_name);
 	$shell = $special_shell || $config{"dshell"};
@@ -521,13 +521,13 @@
     &invalidate_nscd();
 
     if (-e $home_dir) {
-	printf _("Home directory %s already exists.  Not copying from
%s\n"),
+	printf _("The home directory `%s'' already exists.  Not copying
from `%s''\n"),
         $home_dir,$config{skel} if $verbose && !$no_create_home;
     } elsif ($no_create_home) {
 	print "Not creating $home_dir.\n" if $verbose;
     }
     else {
-	printf _("Creating home directory %s.\n"),$home_dir if $verbose;
+	printf _("Creating home directory `%s''.\n"),$home_dir if
$verbose;
 	$undohome = $home_dir;
 	&mktree($home_dir) || &cleanup("Couldn''t create
$home_dir: $!.\n");
 	chown($new_uid, $new_gid, $home_dir)
@@ -537,7 +537,7 @@
 	    &cleanup("chmod $dir_mode $home_dir: $!\n");
 
 	if ($config{"skel"}) {
-	    printf _("Copying files from %s\n"),$config{skel} if $verbose;
+	    printf _("Copying files from `%s''\n"),$config{skel} if
$verbose;
 	    open(FIND, "cd $config{skel}; find .  ! -name
''*.dpkg-*'' -print |")
 		|| &cleanup("fork for find: $!\n");
 	    while (<FIND>) {
@@ -570,7 +570,7 @@
     }
 
     if ($config{"quotauser"}) {
-	printf _("Setting quota from %s.\n"),$config{quotauser};
+	printf _("Setting quota from `%s''.\n"),$config{quotauser};
 	&systemcall(''/usr/sbin/edquota'', ''-p'',
$config{quotauser}, $new_name);
     }
 
@@ -656,26 +656,26 @@
     if( !$system || !existing_user_ok($new_name, $new_uid) ) {
 	if( defined getpwnam($new_name) ) {
 	    if( $system ) {
-		dief(_("The user %s\'' already exists, and is not a system
user.\n"),$new_name);
+		dief(_("The user `%s'' already exists, and is not a system
user.\n"),$new_name);
 	    } else {
-		dief(_("The user %s\'' already exists.\n"),$new_name);
+		dief(_("The user `%s'' already exists.\n"),$new_name);
 	    }
 	}
-	dief(_("The UID %s'' already exists.\n"),$new_uid)
+	dief(_("The UID %s is already in use.\n"),$new_uid)
 	  if (defined($new_uid) && getpwuid($new_uid));
     }
     if ($make_group_also) {
 	if( !$system || !existing_group_ok($new_name, $new_uid) ) {
-	    dief(_("The group %s'' already exists.\n"),$new_name)
+	    dief(_("The group `%s'' already exists.\n"),$new_name)
 	      if (defined getgrnam($new_name));
-	    dief(_("The GID %s'' already exists.\n"),$new_uid)
+	    dief(_("The GID %s is already in use.\n"),$new_uid)
 	      if (defined($new_uid) && defined(getgrgid($new_uid)));
 	}
     }
     else {
-	dief(_("The group `%s'' doesn''t
exist.\n"),$ingroup_name)
+	dief(_("The group `%s'' does not exist.\n"),$ingroup_name)
 	    if ($ingroup_name && !defined(getgrnam($ingroup_name)));
-	dief(_("The GID `%s'' doesn''t exist.\n"),$new_gid)
+	dief(_("The GID %s does not exist.\n"),$new_gid)
 	    if (defined($new_gid) && !defined(getgrgid($new_gid)));
     }
 }
@@ -722,7 +722,7 @@
 	print STDERR
 "$0: ",_("To avoid problems, the username should consist of a
letter or
 underscore followed by letters, digits, underscores, and dashes. For
-compatibility with Samba machine accounts also \$ is supported at the
+compatibility with Samba machine accounts \$ is also supported at the
 end of the username\n");
 	exit 1;
     }
diff -Nru adduser-3.57/deluser adduser-3.57.new/deluser
--- adduser-3.57/deluser	2004-06-20 13:55:15.000000000 +0100
+++ adduser-3.57.new/deluser	2004-07-20 20:06:08.000000000 +0100
@@ -147,7 +147,7 @@
     } elsif($arg eq "--conf" || $arg eq "-c") {
         die "$0: ",_("--conf requires an argument.\n")
             if (!($defaults = shift(@ARGV)));
-        dief (_("`%s'' doesn''t exist.\n"),$defaults)
+        dief (_("`%s'' does not exist.\n"),$defaults)
             if (! -f $defaults);
     } elsif($arg eq "--system") {
        $pconfig{"system"} = 1;
@@ -250,21 +250,21 @@
 	if( ($dummy1,$dummy2,$uid) = getpwnam($user) ) {
 	    if ( ($uid < $config{"first_system_uid"} ||
 		$uid > $config{"last_system_uid" } ) ) {
-		printf (_("User %s is not a system account... Exiting.\n"), $user)
if $verbose;
+		printf (_("The user `%s'' is not a system account...
Exiting.\n"), $user) if $verbose;
 		exit 0;
 	    }
         } else {
-	    printf (_("User %s does not exist, but --system is given...
Exiting.\n"), $user) if $verbose;
+	    printf (_("The user `%s'' does not exist, but --system was
given... Exiting.\n"), $user) if $verbose;
 	    exit 0;
 	}
     }
     
     unless(exist_user($user)) {
-	dief (_("`%s'' does not exist.\n"),$user);
+	dief (_("The user `%s'' does not exist.\n"),$user);
     }
 
     if($config{"remove_home"} && ($config{"home"}
ne "") && ($config{"home"} ne $pw_homedir)) {
-	dief (_("passwd home dir %s'' does not match command line home
dir, aborting.\n"),$pw_homedir,$config{"home"});
+	dief (_("passwd home dir `%s'' does not match command line home
dir, aborting.\n"),$pw_homedir,$config{"home"});
     } elsif($config{"remove_home"} ||
$config{"remove_all_files"}) {
 	s_print(_("Looking for files to backup/remove...\n"));
 	my(@files,@dirs);
@@ -318,7 +318,7 @@
 	}
     }
 
-    s_printf(_("Removing user %s...\n"),$user);
+    s_printf(_("Removing user `%s''...\n"),$user);
     systemcall("/usr/sbin/userdel", $user);
     &invalidate_nscd();
 
@@ -329,7 +329,7 @@
 } elsif($action eq "delgroup") {
     &invalidate_nscd();
     unless(exist_group($group)) {
-	dief (_("`%s'' does not exist.\n"),$group);
+	dief (_("The group `%s'' does not exist.\n"),$group);
     }
     my($dummy,$gid,$members);
     if( !(($dummy, $dummy, $gid, $members ) = getgrnam($group)) ) {
@@ -338,19 +338,19 @@
     if( $config{"system"} && 
 	($gid < $config{"first_system_gid"} ||
 	 $gid > $config{"last_system_gid" } )) {
-        printf (_("Group %s is not a system group... Exiting.\n"),
$group) if $verbose;
+        printf (_("The group `%s'' is not a system group...
Exiting.\n"), $group) if $verbose;
 	exit 0;
     }
     if( $config{"only-if-empty"} && $members ne "")
{
-	dief (_("`%s'' is not empty!\n"),$group);
+	dief (_("The group `%s'' is not empty!\n"),$group);
     }
     
     # This needs to be fixed - we need use getpwent here.
     if(system("grep", "-q",
"^.*:.*:.*:$gr_gid:.*:.*:.*\$", "/etc/passwd") == 0) {
-	dief (_("There are users having `%s'' as primary
group!\n"),$group);
+	dief (_("There are users with `%s'' as their primary
group!\n"),$group);
     }
 
-    s_printf(_("Removing group %s...\n"),$group);
+    s_printf(_("Removing group `%s''...\n"),$group);
     systemcall("/usr/sbin/groupdel",$group);
     &invalidate_nscd();
     s_print(_("done.\n"));
@@ -359,10 +359,10 @@
 {
     &invalidate_nscd();
     unless(exist_user($user)) {
-	dief (_("`%s'' does not exist.\n"),$user);
+	dief (_("The user `%s'' does not exist.\n"),$user);
     }
     unless(exist_group($group)) {
-	dief (_("`%s'' does not exist.\n"),$group);
+	dief (_("The group `%s'' does not exist.\n"),$group);
     }
     if($maingroup eq $group) {
 	die "$0: ",_("You may not remove the user from his/her primary
group.\n");
@@ -379,10 +379,10 @@
     }
 
     unless($ismember) {
-	dief(_("%s is not a member of group %s.\n"),$user,$group);
+	dief(_("The user `%s'' is not a member of group
`%s''.\n"),$user,$group);
     }
 
-    s_printf(_("Removing user %s from group %s...\n"),$user,$group);
+    s_printf(_("Removing user `%s'' from group
`%s''...\n"),$user,$group);
     #systemcall("usermod","-G",
join(",",@groups), $user );
     systemcall(''/usr/bin/gpasswd'',''-M'',
join('','',@members), $group);
     &invalidate_nscd();

--=-Eourhwb+I3tB3VX5R3CI--

Marc Haber

2004-Jul-22 19:05 UTC

head link

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

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?

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don''t trust Computers. They | Mailadresse
im Header
Karlsruhe, Germany |  lose things."    Winona Ryder | Fon: *49 721 966 32
15
Nordisch by Nature |  How to make an American Quilt | Fax: *49 721 966 31 29

Adam D. Barratt

2004-Jul-25 15:11 UTC

head link

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

--=-sb9X8zvjm0UaoRSGm9WB
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Thu, 2004-07-22 at 20:05, Marc Haber 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?
As discussed on irc, I''ve attached an updated patch which includes
updates to the English strings in the po files. In case it gets mangled,
it''s also available at
http://adsl.funky-badger.org/~adam/adduser_final.diff

There was only one string that was not modified 1:1 by the patch, and
thus broke the first version of the po files - in deluser, four
occurrences of "`%s'' does not exist" have become two
occurrences each of
"The {user,group} `%s'' does not exist". For each translation,
I''ve
simply copied-and-pasted the original translation, modified the comment
and changed the msgid to the appropriate English version. I hope this is
acceptable.

(i.e. both English strings are currently translated to the original
translation of "`%s'' does not exist").

Regards,

Adam

--=-sb9X8zvjm0UaoRSGm9WB
Content-Disposition: inline; filename=adduser_final.diff
Content-Type: text/x-patch; name=adduser_final.diff; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

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

--=-sb9X8zvjm0UaoRSGm9WB--

Adam D. Barratt

2004-Jul-26 14:25 UTC

head link

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

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

Marc Haber

2004-Jul-26 15:32 UTC

head link

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

On Mon, Jul 26, 2004 at 03:25:34PM +0100, Adam D. Barratt
wrote:> Resending patch as attachment, as requested.
The patch resulted in two duplicate string definitions for each
translation which has been fixed in the version committed to SVN.

Greetings
Marc

Debian Bug Tracking System

2004-Jul-26 20:03 UTC

head link

[Adduser-devel] Bug#260265: marked as done (adduser: English tidy-up)

Your message dated Mon, 26 Jul 2004 15:47:17 -0400
with message-id <E1BpBRN-00067m-00@newraff.debian.org>
and subject line Bug#260265: fixed in adduser 3.58
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 19 Jul 2004 16:36:29
+0000>From debian-bts@adam-barratt.org.uk Mon Jul 19 09:36:29 2004Return-path: <debian-bts@adam-barratt.org.uk>
Received: from mail0.avcosystems.co.uk [195.224.236.86] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Bmb7t-0002n6-00; Mon, 19 Jul 2004 09:36:29 -0700
Received: from lexx.avco ([192.168.0.1] helo=andromeda)
	by mail0.avcosystems.co.uk with smtp (Exim 4.34 #1 (Debian))
	id 1Bmb4K-0004PF-3P
	for <submit@bugs.debian.org>; Mon, 19 Jul 2004 17:32:48 +0100
Message-ID: <039101c46dae$77bd5390$eb00010a@andromeda>
From: "Adam D. Barratt" <debian-bts@adam-barratt.org.uk>
To: <submit@bugs.debian.org>
Subject: adduser: English tidy-up
Date: Mon, 19 Jul 2004 17:35:48 +0100
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_038E_01C46DB6.D411AC60"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.50.4922.1500
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4939.300
X-AVCO-Scan-Signature: 32da1010a3527e4aa92968e9046375a0
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.1 required=4.0 tests=BAYES_44,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

This is a multi-part message in MIME format.

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

Package: adduser
Severity: minor
Version: 3.57

Hi,

Please consider applying the attached patch which removes some awkward
phrasing from the English strings and unifies some of the phrasing used.

I haven''t attempted to update the translations, as I wasn''t
sure where the
master copies are stored.

Regards,

Adam

------=_NextPart_000_038E_01C46DB6.D411AC60
Content-Type: application/octet-stream;
	name="adduser.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="adduser.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-19 16:34:37.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@@ -279,7 +279,7
@@=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 (_("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@@ -342,9
+342,9 @@=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@@ -374,7 +374,7 @@=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 (_("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@@ -661,21 +661,21 @@=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 	      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     }=0Adiff
-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-19
16:29:47.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@@ -254,7 +254,7 @@=0A 		exit 0;=0A 	   
}=0A         } else {=0A-	    printf (_("User %s does not exist, but
--system is given... Exiting.\n"), $user) if $verbose;=0A+	    printf
(_("User %s does not exist, but --system was given... Exiting.\n"),
$user) if $verbose;=0A 	    exit 0;=0A 	}=0A     }=0A@@ -347,7 +347,7 @@=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
------=_NextPart_000_038E_01C46DB6.D411AC60--


---------------------------------------
Received: (at 260265-close) by bugs.debian.org; 26 Jul 2004 19:50:58
+0000>From katie@ftp-master.debian.org Mon Jul 26 12:50:58 2004Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1BpBUv-0004yv-00; Mon, 26 Jul 2004 12:50:57 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
	id 1BpBRN-00067m-00; Mon, 26 Jul 2004 15:47:17 -0400
From: Marc Haber <mh+debian-packages@zugschlus.de>
To: 260265-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#260265: fixed in adduser 3.58
Message-Id: <E1BpBRN-00067m-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Mon, 26 Jul 2004 15:47:17 -0400
Delivered-To: 260265-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 2

Source: adduser
Source-Version: 3.58

We believe that the bug you reported is fixed in the latest version of
adduser, which is due to be installed in the Debian FTP archive:

adduser_3.58.dsc
  to pool/main/a/adduser/adduser_3.58.dsc
adduser_3.58.tar.gz
  to pool/main/a/adduser/adduser_3.58.tar.gz
adduser_3.58_all.deb
  to pool/main/a/adduser/adduser_3.58_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 260265@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Marc Haber <mh+debian-packages@zugschlus.de> (supplier of updated adduser
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Mon, 26 Jul 2004 21:11:40 +0200
Source: adduser
Binary: adduser
Architecture: source all
Version: 3.58
Distribution: unstable
Urgency: low
Maintainer: Debian Adduser Developers
<adduser-devel@lists.alioth.debian.org>
Changed-By: Marc Haber <mh+debian-packages@zugschlus.de>
Description: 
 adduser    - Add and remove users and groups
Closes: 259000 260265 261236 261338
Changes: 
 adduser (3.58) unstable; urgency=low
 .
   * fix inconsistent hyphenation in man pages. Thanks to Clint Adams.
     (mh) Closes: #259000.
   * Applied patch for German debconf translation by Florian Ernst.
     (rb) Closes: #261236.
   * Applied patch for Dutch debconf translation by cobaco.
     (mh) Closes: #261338.
   * Applied patch to tidy up the English program translations. Thanks
     to Adam D. Barratt. A request e-mail to the translators asking them to
     review the changes to their translation has been sent out.
     (mh) Closes: #260265.
   * Updated Catalan translations by Jordi Mallach <jordi@debian.org>.
Files: 
 78f9be1fd8be3592937cbc75b0042449 636 base important adduser_3.58.dsc
 8fe8a1e7b4733c981b38d6773ab57d59 96048 base important adduser_3.58.tar.gz
 2f17be17ae6a4cccad2a9a7ff5912e30 91966 base important adduser_3.58_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iEYEARECAAYFAkEFWAUACgkQgZalRGu6PISq7QCeOVtsZR6l0AtawDutbhv98gtL
OgoAn0tawP11ifUDLPKxJjKzmk3WX1o7
=NneP
-----END PGP SIGNATURE-----

Adduser devel - Jul 2004 - Bug#260265: adduser: English tidy-up

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

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

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

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

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

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

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

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

[Adduser-devel] Bug#260265: marked as done (adduser: English tidy-up)