On 22.12.2013 05:55, Andrey Borzenkov wrote: > В Вс, 22/12/2013 в 00:55 +0100, Vladimir 'φ-coder/phcoder' Serbinenko > пишет: >>> >>> While updating the Dutch translations of grub's messages, I notice that >>> some strings have changed in unnecessary ways. The change that makes >>> me write this mail is the one in util/grub-mkrescue.c, lines 215-217. >>> Those three lines were gettextized separately, which was very well, >>> because they are separate paragrahs. Now they are a single string, >>> which is not only unwieldy, and ungraspable in one view, but also every >>> translator has to concatenate her three previous separate translations >>> into a single one. Unneeded work. Please gettextize those paragraphs >>> again separately, so the translations need to be tweaked only slightly. >>> >> grub-mkrescue was rewritten in C and current segmentation is imposed by >> argp. I don't know if there is a way to put old strings there. >> Perhaps someone more familiar with srgp could help? > > Will below patch help? It also removes trailing dot on the first > paragraph which was not present before. Compile tested. > >>> >>> By the way, in grub-core/commands/terminal.c, couldn't >>> "[--append|--remove] [TERMINAL1] [TERMINAL2] ..." >>> simply be: >>> "[--append|--remove] [TERMINAL...]"? >>> >> I find second less clear since it's more difficult to guess that the >> "..." stands for ("[TERMINAL3]",...) >> > > I usually use [TERMINAL ...] (with extra spaces). I find it established > enough practice at least in UNIX manuals. > > From: Andrey Borzenkov <arvidj...@gmail.com> > Subject: [PATCH] split grub-mkresecue help text to keep existing translations > > Reported by Benno Schulenberg > > --- > util/grub-mkrescue.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c > index ad45f9c..635ae63 100644 > --- a/util/grub-mkrescue.c > +++ b/util/grub-mkrescue.c > @@ -218,9 +218,9 @@ struct argp argp = { > 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 directories, > 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 <bug-xorr...@gnu.org>."), > + "mkisofs options listed by the output of `%s'\n") "\n" > + N_("Option -- switches to native xorriso command mode.") "\n\n" > + N_("Mail xorriso support requests to <bug-xorr...@gnu.org>."), 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
> NULL, help_filter, NULL > }; > > > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel >
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel