From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NCJxL-0004xx-OP for mharc-grub-devel@gnu.org; Sun, 22 Nov 2009 16:26:51 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCJxK-0004xr-GV for grub-devel@gnu.org; Sun, 22 Nov 2009 16:26:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCJxG-0004xF-6E for grub-devel@gnu.org; Sun, 22 Nov 2009 16:26:50 -0500 Received: from [199.232.76.173] (port=34051 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCJxG-0004xA-0u for grub-devel@gnu.org; Sun, 22 Nov 2009 16:26:46 -0500 Received: from xvm-190-8.ghst.net ([217.70.190.8]:42881 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NCJxF-00015X-MQ for grub-devel@gnu.org; Sun, 22 Nov 2009 16:26:45 -0500 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1NCJxA-0006Na-GO for grub-devel@gnu.org; Sun, 22 Nov 2009 22:26:42 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1NCJx6-0003QV-M1 for grub-devel@gnu.org; Sun, 22 Nov 2009 22:26:36 +0100 Date: Sun, 22 Nov 2009 22:26:36 +0100 From: Robert Millan To: The development of GNU GRUB Message-ID: <20091122212636.GA13110@thorin> 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091122184519.GA14931@pina.cat> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) 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 21:26:50 -0000 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. (I suggest that you just exclude this from your initial merge, it can be fixed later when we want to enable it). > + 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. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."