From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VujEK-0004Vt-CY for mharc-grub-devel@gnu.org; Sun, 22 Dec 2013 08:38:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VujED-0004VX-99 for grub-devel@gnu.org; Sun, 22 Dec 2013 08:38:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VujE7-0007UK-SX for grub-devel@gnu.org; Sun, 22 Dec 2013 08:37:57 -0500 Received: from mail-ea0-x22a.google.com ([2a00:1450:4013:c01::22a]:38281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VujE7-0007UD-Hu for grub-devel@gnu.org; Sun, 22 Dec 2013 08:37:51 -0500 Received: by mail-ea0-f170.google.com with SMTP id k10so1905406eaj.1 for ; Sun, 22 Dec 2013 05:37:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type; bh=Yzb+PB4ysFK2RmloX3WuKIdhjf5FRoZpqQ/IhINAS+4=; b=LQYRUfhRoIs/oq8x6l/j/FXkSLr6X+rJ+SI/eeFbMA2XS3NgL0REQxE+bqtCJWPj9b 8IW5V3J1iMeRTfa7UsBI/OXHfcOdwEaSKt+j3I3A7STTB/GNv4f2DFng1SSY/AH2e4p4 /QI9HoXf4JTFxM8/O5zp671JzFlYwUJA6z2yi78YdNlcC65gx5qYoX7bl3Eeb6JUg4yL h7Qr/tcXdElnORuU1rCrwrmUKjNyHSUp/iIUnQnCuMSWAREexltbBgJn/X8Fs9kEnR3Q 3dRzXGZnIBxO2AOTf0CnQ9/0iWq5Hv9auppY+O3i/JItHSKSoISmKhnpkX730kz4/rOz /aVg== X-Received: by 10.14.32.132 with SMTP id o4mr16295073eea.14.1387719470751; Sun, 22 Dec 2013 05:37:50 -0800 (PST) Received: from [192.168.1.16] (85-188.196-178.cust.bluewin.ch. [178.196.188.85]) by mx.google.com with ESMTPSA id h3sm36506211eem.15.2013.12.22.05.37.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 22 Dec 2013 05:37:49 -0800 (PST) Message-ID: <52B6EB2C.6060102@gmail.com> Date: Sun, 22 Dec 2013 14:37:48 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131103 Icedove/17.0.10 MIME-Version: 1.0 To: Andrey Borzenkov Subject: Re: please attempt to minimize string changes References: <1387665282.17387.62428913.56FD8AA4@webmail.messagingengine.com> <52B62A82.1010500@gmail.com> <1387688151.918.19.camel@opensuse.site> <52B6CD81.3090807@gmail.com> <1387718646.918.23.camel@opensuse.site> In-Reply-To: <1387718646.918.23.camel@opensuse.site> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="P14AdFOOC5e1OaG1g8s6rEmdwX3racTs1" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22a Cc: The development of GNU GRUB , Benno Schulenberg X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 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 Dec 2013 13:38:02 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --P14AdFOOC5e1OaG1g8s6rEmdwX3racTs1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 22.12.2013 14:24, Andrey Borzenkov wrote: > =D0=92 =D0=92=D1=81, 22/12/2013 =D0=B2 12:31 +0100, Vladimir '=CF=86-co= der/phcoder' Serbinenko > =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >> N_ is not a function, it only marks string for translation for gettext= =2E >> argp will see the whole string with no indication how N_ was used. It >> will resplit the string at \v and pass both halves to gettext which wi= ll >> fail to find the second half in the catalog >> >=20 > OK, I see. In this case verbatim replacement using separately > translatable strings would be patch below (I actually tested it using > old catalog, which works with exception of sentence in question, which > changed too much). Is there any reason "xorriso ..." is not part of > string? It would make it even more simple. >=20 It's bad idea to have commands as part of translatable strings. Suppose command changes, then the string will become fuzzy. If unfuzzying is done too quickly we may end up with a wrong command altogether. Patch is good for me. @Benne: does it address your concern? > From: Andrey Borzenkov > Subject: [PATCH] split grub-mkresecue help text to facilitate translati= ons >=20 > Reported by Benno Schulenberg >=20 > --- > util/grub-mkrescue.c | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) >=20 > diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c > index ad45f9c..ad132ef 100644 > --- a/util/grub-mkrescue.c > +++ b/util/grub-mkrescue.c > @@ -119,8 +119,22 @@ help_filter (int key, const char *text, void *inpu= t __attribute__ ((unused))) > { > switch (key) > { > + case ARGP_KEY_HELP_PRE_DOC: > + /* TRANSLATORS: it generates one single image which is bootable = through any method. */ > + return strdup (_("Make GRUB CD-ROM, disk, pendrive and floppy bo= otable image.")); > case ARGP_KEY_HELP_POST_DOC: > - return xasprintf (text, "xorriso -as mkisofs -help"); > + { > + char *p1, *out; > + > + p1 =3D xasprintf (_("Generates a bootable CD/USB/floppy image. Argum= ents other than options to this program" > + " are passed to xorriso, and indicate source files, source direc= tories, or any of the " > + "mkisofs options listed by the output of `%s'."), "xorriso -as m= kisofs -help"); > + out =3D xasprintf ("%s\n\n%s\n\n%s", p1, > + _("Option -- switches to native xorriso command mode."), > + _("Mail xorriso support requests to .")); > + free (p1); > + return out; > + } > default: > return grub_install_help_filter (key, text, input); > } > @@ -214,14 +228,7 @@ argp_parser (int key, char *arg, struct argp_state= *state) > =20 > struct argp argp =3D { > options, argp_parser, N_("[OPTION] SOURCE..."), > - /* TRANSLATORS: it generates one single image which is bootable thro= ugh any method. */ > - N_("Make GRUB CD-ROM, disk, pendrive and floppy bootable image.")"\v= " > - N_("Generates a bootable CD/USB/floppy image. Arguments other than = options to this program" > - " are passed to xorriso, and indicate source files, source direct= ories, or any of the " > - "mkisofs options listed by the output of `%s'.\n\n" > - "Option -- switches to native xorriso command mode.\n\n" > - "Mail xorriso support requests to ."),=20 > - NULL, help_filter, NULL > + NULL, NULL, help_filter, NULL > }; > =20 > static void >=20 --P14AdFOOC5e1OaG1g8s6rEmdwX3racTs1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iF4EAREKAAYFAlK26ywACgkQmBXlbbo5nOv0TAEAixajUmPv8S2PoG0u7Ut3TjPB FYJ4FcqgosDb8g1uGrUBAJJN+epVFAkaRsL87g/ljI8v79ui4kDQnWC/S/+lVP3M =iTcB -----END PGP SIGNATURE----- --P14AdFOOC5e1OaG1g8s6rEmdwX3racTs1--