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

Debian Bug Tracking System owner@bugs.debian.org
Mon, 26 Jul 2004 13:03:12 -0700

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 2004
Return-path: <debian-bts@adam-barratt.org.uk>
Received: from mail0.avcosystems.co.uk [] 
	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 ([] 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;
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

This is a multi-part message in MIME format.

Content-Type: text/plain;
Content-Transfer-Encoding: 7bit

Package: adduser
Severity: minor
Version: 3.57


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.



Content-Type: application/octet-stream;
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;

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=
     dief (_("The group `%s' already exists.\n"),$new_name)=0A=
@@ -342,9 +342,9 @@=0A=
 ## addusertogroup ##=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=
 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=
     $new_gid =3D $nogroup_id=0A=
@@ -661,21 +661,21 @@=0A=
 		dief(_("The user %s\' already exists.\n"),$new_name);=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=
     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=
     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=
@@ -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=
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=
         } 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=
@@ -347,7 +347,7 @@=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=
     s_printf(_("Removing group %s...\n"),$group);=0A=


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 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [] (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-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:

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

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

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
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)

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>
 adduser    - Add and remove users and groups
Closes: 259000 260265 261236 261338
 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>.
 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

Version: GnuPG v1.2.4 (GNU/Linux)