From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NCKtg-00022P-E4 for mharc-grub-devel@gnu.org; Sun, 22 Nov 2009 17:27:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCKte-000225-Jk for grub-devel@gnu.org; Sun, 22 Nov 2009 17:27:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCKta-00020Q-4J for grub-devel@gnu.org; Sun, 22 Nov 2009 17:27:06 -0500 Received: from [199.232.76.173] (port=37083 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCKtZ-00020N-Nb for grub-devel@gnu.org; Sun, 22 Nov 2009 17:27:01 -0500 Received: from 197.red-80-32-81.staticip.rima-tde.net ([80.32.81.197]:56107 helo=mail.pina.cat) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCKtZ-00016G-9A for grub-devel@gnu.org; Sun, 22 Nov 2009 17:27:01 -0500 Received: from pinux (82-45-164-87.cable.ubr06.hari.blueyonder.co.uk [82.45.164.87]) by mail.pina.cat (Postfix) with ESMTP id 292FA288FBA1E for ; Sun, 22 Nov 2009 23:27:00 +0100 (CET) Received: by pinux (Postfix, from userid 1000) id 3385B9621; Sun, 22 Nov 2009 22:27:05 +0000 (GMT) Date: Sun, 22 Nov 2009 22:27:05 +0000 From: Carles Pina i Estany To: The development of GNU GRUB Message-ID: <20091122222705.GA5440@pina.cat> References: <20091121212712.GA25254@pina.cat> <20091121220054.GA29354@thorin> <20091121221410.GA26442@pina.cat> <20091121230904.GA29740@thorin> <20091122124632.GA30899@pina.cat> <20091122170715.GC11942@pina.cat> <20091122184519.GA14931@pina.cat> <20091122212636.GA13110@thorin> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091122212636.GA13110@thorin> User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: merging of gettext branch X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Nov 2009 22:27:06 -0000 Hello, On Nov/22/2009, Robert Millan wrote: > On Sun, Nov 22, 2009 at 06:45:19PM +0000, Carles Pina i Estany wrote: > > /* NOTE: Do not remove the trailing space characters. > > They are required to clear the line. */ > > - char *msg = " The highlighted entry will be booted automatically in %ds. "; > > + const char *msg = _(" The highlighted entry will be booted automatically in %ds. "); > > char *msg_end = grub_strchr (msg, '%'); > > This string isn't suitable for translation in its current state. > Someone should split the "trailing space hack" from the actual > translatable string first. Ok, I will do it soon. > (I suggest that you just exclude this from your initial merge, it can be > fixed later when we want to enable it). yeap! > > + if (locale_dir == NULL) > > + { > > + grub_printf ("locale_dir variable is not setted up."); > > + return; > > + } > > s/setted/set/g > > The rest is fine. Once this is fixed it can be merged in trunk. Nice > work, Carles. merged. Thanks! -- Carles Pina i Estany http://pinux.info