From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10458 invoked by alias); 23 Dec 2010 04:38:32 -0000 Received: (qmail 10329 invoked by uid 22791); 23 Dec 2010 04:38:30 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 23 Dec 2010 04:38:26 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 441772BACC4; Wed, 22 Dec 2010 23:38:24 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 18qg99ICTATy; Wed, 22 Dec 2010 23:38:24 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 4EA1B2BACB4; Wed, 22 Dec 2010 23:38:23 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id 8C3741457B3; Thu, 23 Dec 2010 05:38:11 +0100 (CET) Date: Thu, 23 Dec 2010 05:27:00 -0000 From: Joel Brobecker To: Marc Khouzam Cc: 'Pedro Alves' , "'gdb-patches@sourceware.org'" , 'Tom Tromey' Subject: Re: segfault: what should happen when I remove an inferior that is running? Message-ID: <20101223043811.GT2596@adacore.com> References: <201012221210.30198.pedro@codesourcery.com> <201012221817.17271.pedro@codesourcery.com> <20101223033332.GN2596@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline In-Reply-To: <20101223033332.GN2596@adacore.com> User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-12/txt/msg00426.txt.bz2 --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 464 > Just a small nit that the ARI script discovered, we forgot the i18n > marker: > > error (_("cannot remore an active inferior")); > > (I also think that the proper spelling is `cannot' rather than > 'can not' - confirmed by wikipedia, even though they say that it is > occasionally spelled as two words) > > Would you mind making the obvious fix? Looks like Mark is away from the office, so I checked in the attached fix (HEAD & 7.2 branch) -- Joel --6TrnltStXW4iwmi0 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="i18n.diff" Content-length: 1185 commit f114e5b6d29ff343021bb67765d209fa98d675fb Author: Joel Brobecker Date: Thu Dec 23 08:27:37 2010 +0400 Add missing _() marker in error message. gdb/ChangeLog: * mi/mi-main.c (mi_cmd_remove_inferior): Use _() marker for error message. Change spelling of "can not" into "cannot". diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 24db449..4504f11 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2010-12-23 Joel Brobecker + + * mi/mi-main.c (mi_cmd_remove_inferior): Use _() marker for error + message. Change spelling of "can not" into "cannot". + 2010-12-23 Yao Qi * arm-tdep.c (arm_gdbarch_init): Remove invoke to diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 6f66e89..f713412 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1773,7 +1773,7 @@ mi_cmd_remove_inferior (char *command, char **argv, int argc) error ("the specified thread group does not exist"); if (inf->pid != 0) - error ("can not remove an active inferior"); + error (_("cannot remove an active inferior")); if (inf == current_inferior ()) { --6TrnltStXW4iwmi0--