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

[Adam D. Barratt]

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=
     }=0A=
diff -Nru adduser-3.57/deluser adduser-3.57.new/deluser=0A=
--- adduser-3.57/deluser	2004-06-20 13:55:15.000000000 +0100=0A=
+++ adduser-3.57.new/deluser	2004-07-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--