From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Vuj14-0001uH-1a for mharc-grub-devel@gnu.org; Sun, 22 Dec 2013 08:24:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vuj0x-0001tF-2K for grub-devel@gnu.org; Sun, 22 Dec 2013 08:24:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vuj0r-00049x-NC for grub-devel@gnu.org; Sun, 22 Dec 2013 08:24:14 -0500 Received: from mail-lb0-x236.google.com ([2a00:1450:4010:c04::236]:43562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vuj0r-00049r-AE for grub-devel@gnu.org; Sun, 22 Dec 2013 08:24:09 -0500 Received: by mail-lb0-f182.google.com with SMTP id l4so1879136lbv.13 for ; Sun, 22 Dec 2013 05:24:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:mime-version; bh=Gth4Shpt5ltyt8r0Fx82aSokh21H2AozzB3Hd4IlPGk=; b=wkiMZiVMvGuOIjxzs+sYXIkAoysZfQUKM/Dd0dLim88G0Hoe+tMCIYpWNXckFmeE98 2UnqmXxGfJrcekAs4ybG4maKVEB18xpjbYy9bcQQvOFZ5El7p44goE+X8qaImjeNwyQN IyFdp7AeRxHsWQkYHatZyP3b6LUVJUQ8rmASU9FlcHWcrnZlTjf7O59ukeCqZ0aCRGRv oEoZqdET8GhB/NtXT5T9IAEpzyOQ5ejW5f2yw9Eyt4WyT+9lw2fwHnSHT14HXpH3hwc7 R6jzxjyMoWC6FUPS8P+H+E+8VTO7+4veP+BXQ6MifeAjXA8fF9gtOadrfBsufsxnVB7D wS5Q== X-Received: by 10.112.219.99 with SMTP id pn3mr7978585lbc.24.1387718647803; Sun, 22 Dec 2013 05:24:07 -0800 (PST) Received: from [192.168.1.44] (ppp91-76-134-134.pppoe.mtu-net.ru. [91.76.134.134]) by mx.google.com with ESMTPSA id qx1sm9232987lbb.15.2013.12.22.05.24.06 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Sun, 22 Dec 2013 05:24:06 -0800 (PST) Message-ID: <1387718646.918.23.camel@opensuse.site> Subject: Re: please attempt to minimize string changes From: Andrey Borzenkov To: Vladimir =?UTF-8?Q?=27=CF=86-coder/phcoder=27?= Serbinenko Date: Sun, 22 Dec 2013 17:24:06 +0400 In-Reply-To: <52B6CD81.3090807@gmail.com> References: <1387665282.17387.62428913.56FD8AA4@webmail.messagingengine.com> <52B62A82.1010500@gmail.com> <1387688151.918.19.camel@opensuse.site> <52B6CD81.3090807@gmail.com> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-1P0lWxMLMwRJlz8KqEjb" X-Mailer: Evolution 3.10.2 Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::236 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:24:20 -0000 --=-1P0lWxMLMwRJlz8KqEjb Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable =D0=92 =D0=92=D1=81, 22/12/2013 =D0=B2 12:31 +0100, Vladimir '=CF=86-coder/= 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. > 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 will > 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. From: Andrey Borzenkov Subject: [PATCH] split grub-mkresecue help text to facilitate translations Reported by Benno Schulenberg --- util/grub-mkrescue.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) 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 *input __= attribute__ ((unused))) { switch (key) { + case ARGP_KEY_HELP_PRE_DOC: + /* TRANSLATORS: it generates one single image which is bootable thro= ugh any method. */ + return strdup (_("Make GRUB CD-ROM, disk, pendrive and floppy bootab= le 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. Arguments= other than options to this program" + " are passed to xorriso, and indicate source files, source directori= es, or any of the " + "mkisofs options listed by the output of `%s'."), "xorriso -as mkiso= fs -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 *st= ate) =20 struct argp argp =3D { options, argp_parser, N_("[OPTION] SOURCE..."), - /* TRANSLATORS: it generates one single image which is bootable through = 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 opti= ons to this program" - " are passed to xorriso, and indicate source files, source directorie= s, 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 tg: (bf08219..) u/grub-mkrescue-i18n (depends on: master) --=-1P0lWxMLMwRJlz8KqEjb Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEABECAAYFAlK25/YACgkQR6LMutpd94xotQCgwhR06TTqYgb8GKmGJVM9Dvbs iggAn0Ew0qcBAOhhUkAIGGX6ohYVNiOh =baFL -----END PGP SIGNATURE----- --=-1P0lWxMLMwRJlz8KqEjb--