From bb51c6c647b01da2e6c1cae71b630ec498c3c69a Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Tue, 6 Mar 2012 14:11:10 +0100 Subject: [PATCH] * grub-core/commands/acpi.c: Add TRANSLATORS comments. * grub-core/commands/gptsync.c: Likewise. * grub-core/commands/hashsum.c: Likewise. * grub-core/commands/i386/pc/sendkey.c: Likewise. * grub-core/commands/legacycfg.c: Likewise. * grub-core/io/gzio.c: Likewise. * grub-core/net/net.c: Likewise. * grub-core/term/gfxterm.c: Likewise. * grub-core/term/terminfo.c: Likewise. * grub-core/tests/test_blockarg.c: Likewise. * grub-core/video/video.c: Likewise. * util/grub-install.in: Likewise. * util/grub-mkfont.c: Likewise. --- ChangeLog | 17 +++++++++++++++++ grub-core/commands/acpi.c | 1 + grub-core/commands/gptsync.c | 2 ++ grub-core/commands/hashsum.c | 3 +++ grub-core/commands/i386/pc/sendkey.c | 2 ++ grub-core/commands/legacycfg.c | 2 ++ grub-core/io/gzio.c | 2 ++ grub-core/net/net.c | 3 +++ grub-core/term/gfxterm.c | 2 +- grub-core/term/terminfo.c | 2 ++ grub-core/tests/test_blockarg.c | 2 ++ grub-core/video/video.c | 3 +++ util/grub-install.in | 2 ++ util/grub-mkfont.c | 17 +++++++++++++++-- 14 files changed, 57 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fbe0fcaa..29dd54504 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2012-03-06 Vladimir Serbinenko + + * grub-core/commands/acpi.c: Add TRANSLATORS comments. + * grub-core/commands/gptsync.c: Likewise. + * grub-core/commands/hashsum.c: Likewise. + * grub-core/commands/i386/pc/sendkey.c: Likewise. + * grub-core/commands/legacycfg.c: Likewise. + * grub-core/io/gzio.c: Likewise. + * grub-core/net/net.c: Likewise. + * grub-core/term/gfxterm.c: Likewise. + * grub-core/term/terminfo.c: Likewise. + * grub-core/tests/test_blockarg.c: Likewise. + * grub-core/video/video.c: Likewise. + * util/grub-install.in: Likewise. + * util/grub-mkfont.c: Likewise. + 2012-03-06 Vladimir Serbinenko * util/grub-mkimage.c (help_filter): Add missing capitalisation. @@ -5,6 +21,7 @@ 2012-03-06 Vladimir Serbinenko * grub-core/commands/search_wrap.c (options): Fix a typo. + Reported by: David Prévot. 2012-03-06 Vladimir Serbinenko diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c index 57e7003f4..daea0c990 100644 --- a/grub-core/commands/acpi.c +++ b/grub-core/commands/acpi.c @@ -54,6 +54,7 @@ static const struct grub_arg_option options[] = { N_("Set creator field of RSDP, XSDT and RSDT."), 0, ARG_TYPE_STRING}, {"oemtablecreatorrev", 'd', 0, N_("Set creator revision of RSDP, XSDT and RSDT."), 0, ARG_TYPE_INT}, + /* TRANSLATORS: "hangs" here is a noun, not a verb. */ {"no-ebda", 'e', 0, N_("Don't update EBDA. May fix failures or hangs on some." " BIOSes but makes it ineffective with OS not receiving RSDP from GRUB."), 0, ARG_TYPE_NONE}, diff --git a/grub-core/commands/gptsync.c b/grub-core/commands/gptsync.c index edc49dd1b..fbfcea05c 100644 --- a/grub-core/commands/gptsync.c +++ b/grub-core/commands/gptsync.c @@ -245,6 +245,8 @@ GRUB_MOD_INIT(gptsync) (void) mod; /* To stop warning. */ cmd = grub_register_command ("gptsync", grub_cmd_gptsync, N_("DEVICE [PARTITION[+/-[TYPE]]] ..."), + /* TRANSLATORS: MBR type is one-byte partition + type id. */ N_("Fill hybrid MBR of GPT drive DEVICE. " "Specified partitions will be a part " "of hybrid MBR. Up to 3 partitions are " diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c index 9593becc9..ca2984382 100644 --- a/grub-core/commands/hashsum.c +++ b/grub-core/commands/hashsum.c @@ -260,6 +260,9 @@ GRUB_MOD_INIT(hashsum) cmd = grub_register_extcmd ("hashsum", grub_cmd_hashsum, 0, N_("-h HASH [-c FILE [-p PREFIX]] " "[FILE1 [FILE2 ...]]"), + /* TRANSLATORS: "hash checksum" is just to + be a bit more precise, you can treat it as + just "hash". */ N_("Compute or check hash checksum."), options); cmd_md5 = grub_register_extcmd ("md5sum", grub_cmd_hashsum, 0, diff --git a/grub-core/commands/i386/pc/sendkey.c b/grub-core/commands/i386/pc/sendkey.c index ab1090672..dbc69d49f 100644 --- a/grub-core/commands/i386/pc/sendkey.c +++ b/grub-core/commands/i386/pc/sendkey.c @@ -371,6 +371,8 @@ GRUB_MOD_INIT (sendkey) { cmd = grub_register_extcmd ("sendkey", grub_cmd_sendkey, 0, N_("[KEYSTROKE1] [KEYSTROKE2] ..."), + /* TRANSLATORS: It can emulate multiple + keypresses. */ N_("Emulate a keystroke"), options); preboot_hook diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c index aab0e6323..3becaa6db 100644 --- a/grub-core/commands/legacycfg.c +++ b/grub-core/commands/legacycfg.c @@ -770,6 +770,8 @@ GRUB_MOD_INIT(legacycfg) = grub_register_command ("legacy_source", grub_cmd_legacy_source, N_("FILE"), + /* TRANSLATORS: "legacy config" means + "config as used by grub-legacy". */ N_("Parse legacy config in same context")); cmd_configfile = grub_register_command ("legacy_configfile", diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c index f88bda1cb..83c0b64cb 100644 --- a/grub-core/io/gzio.c +++ b/grub-core/io/gzio.c @@ -1174,6 +1174,8 @@ test_zlib_header (grub_gzio_t gzio) /* Check that compression method is DEFLATE. */ if ((cmf & 0xf) != DEFLATED) { + /* TRANSLATORS: It's about given file having some strange format, not + complete lack of gzip support. */ grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, N_("unsupported gzip format")); return 0; } diff --git a/grub-core/net/net.c b/grub-core/net/net.c index 4fc1b38b2..f1db81560 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -1494,6 +1494,8 @@ static grub_command_t cmd_lsaddr, cmd_slaac; GRUB_MOD_INIT(net) { cmd_addaddr = grub_register_command ("net_add_addr", grub_cmd_addaddr, + /* TRANSLATORS: HWADDRESS stands for + "hardware address". */ N_("SHORTNAME CARD ADDRESS [HWADDRESS]"), N_("Add a network address.")); cmd_slaac = grub_register_command ("net_ipv6_autoconf", @@ -1505,6 +1507,7 @@ GRUB_MOD_INIT(net) N_("SHORTNAME"), N_("Delete a network address.")); cmd_addroute = grub_register_command ("net_add_route", grub_cmd_addroute, + /* TRANSLATORS: "gw" is a keyword. */ N_("SHORTNAME NET [INTERFACE| gw GATEWAY]"), N_("Add a network route.")); cmd_delroute = grub_register_command ("net_del_route", grub_cmd_delroute, diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c index 96c57534f..41fe431c8 100644 --- a/grub-core/term/gfxterm.c +++ b/grub-core/term/gfxterm.c @@ -1102,7 +1102,7 @@ static const struct grub_arg_option background_image_cmd_options[] = { {"mode", 'm', 0, N_("Background image mode."), /* TRANSLATORS: This refers to background image mode (stretched or - in left-top conrner). Note that GRUB will accept only original + in left-top corner). Note that GRUB will accept only original keywords stretch and normal, not the translated ones. So please put both in translation e.g. stretch(=%STRETCH%)|normal(=%NORMAL). Since many people diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c index dd9541d13..7481a79b4 100644 --- a/grub-core/term/terminfo.c +++ b/grub-core/term/terminfo.c @@ -629,6 +629,8 @@ static const struct grub_arg_option options[] = {"visual-utf8", 'v', 0, N_("Terminal is visually-ordered UTF-8."), 0, ARG_TYPE_NONE}, {"geometry", 'g', 0, N_("Terminal has specified geometry."), + /* TRANSLATORS: "x" has to be entered in, like an identifier, so please don't + use better Unicode codepoints. */ N_("WIDTHxHEIGHT."), ARG_TYPE_STRING}, {0, 0, 0, 0, 0, 0} }; diff --git a/grub-core/tests/test_blockarg.c b/grub-core/tests/test_blockarg.c index ddd46e1f6..88bd968f3 100644 --- a/grub-core/tests/test_blockarg.c +++ b/grub-core/tests/test_blockarg.c @@ -44,6 +44,8 @@ GRUB_MOD_INIT(test_blockarg) cmd = grub_register_extcmd ("test_blockarg", test_blockarg, GRUB_COMMAND_FLAG_BLOCKS, N_("BLOCK"), + /* TRANSLATORS: this is the BLOCK-argument, not + environment block. */ N_("Print and execute block argument."), 0); } diff --git a/grub-core/video/video.c b/grub-core/video/video.c index a67e6bb4c..67de85ad9 100644 --- a/grub-core/video/video.c +++ b/grub-core/video/video.c @@ -540,6 +540,9 @@ grub_video_set_mode (const char *modestring, { grub_free (modevar); + /* TRANSLATORS: This doesn't imply that there is no available video + mode at all. All modes may have been filtered out by some criteria. + */ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("no suitable video mode found")); } diff --git a/util/grub-install.in b/util/grub-install.in index 44c68e743..a6b402504 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -101,6 +101,8 @@ usage () { printf " --grub-mkimage=%-9s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")" printf " --grub-mkrelpath=%-7s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkrelpath")" printf " --grub-probe=%-11s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-probe")" + # TRANSLATORS: "may break" doesn't just mean that option wouldn't have any + # effect but that it will make the resulting install unbootable from HDD. printf " --allow-floppy %s\n" "$(gettext "make the drive also bootable as floppy (default for fdX devices). May break on some BIOSes.")" printf " --recheck %s\n" "$(gettext "delete device map if it already exists")" printf " --force %s\n" "$(gettext "install even if problems are detected")" diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c index a30260f98..210dece68 100644 --- a/util/grub-mkfont.c +++ b/util/grub-mkfont.c @@ -142,6 +142,11 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face, printf (_("Freetype Error %d loading glyph 0x%x for U+0x%x%s"), err, glyph_idx, char_code & GRUB_FONT_CODE_CHAR_MASK, char_code & GRUB_FONT_CODE_RIGHT_JOINED + /* TRANSLATORS: These qualifiers are used for cursive typography, + mainly Arabic. Note that the terms refer to the visual position + and not logical order and if used in left-to-right script then + leftmost is initial but with right-to-left script like Arabic + rightmost is the initial. */ ? ((char_code & GRUB_FONT_CODE_LEFT_JOINED) ? _(" (medial)"): _(" (leftmost)")) : ((char_code & GRUB_FONT_CODE_LEFT_JOINED) ? _(" (rightmost)"): @@ -626,6 +631,7 @@ add_font (struct grub_font_info *font_info, FT_Face face, int nocut) for (j = 0; j < 4; j++) if (!grub_isgraph (str[j])) str[j] = '?'; + /* TRANSLATORS: It's gsub feature, not gsub font. */ printf (_("Unknown gsub font feature 0x%x (%s)\n"), feattag, str); } @@ -965,6 +971,7 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file) static struct argp_option options[] = { {"output", 'o', N_("FILE"), 0, N_("save output in FILE [required]"), 0}, + /* TRANSLATORS: bitmaps are images like e.g. in JPEG. */ {"ascii-bitmaps", 0x102, 0, 0, N_("save only the ASCII bitmaps"), 0}, {"width-spec", 0x103, 0, 0, /* TRANSLATORS: this refers to creating a file containing the width of @@ -975,8 +982,13 @@ static struct argp_option options[] = { This option is used to chose among them, the first face being '0'. Rarely used. */ N_("set face index"), 0}, - {"range", 'r', N_("FROM-TO[,FROM-TO]"), 0, N_("set font range"), 0}, - {"name", 'n', N_("NAME"), 0, N_("set font family name"), 0}, + {"range", 'r', N_("FROM-TO[,FROM-TO]"), 0, + /* TRANSLATORS: It refers to the range of characters in font. */ + N_("set font range"), 0}, + {"name", 'n', N_("NAME"), 0, + /* TRANSLATORS: "family name" for font is just a generic name without suffix + like "Bold". */ + N_("set font family name"), 0}, {"size", 's', N_("SIZE"), 0, N_("set font size"), 0}, {"desc", 'd', N_("NUM"), 0, N_("set font descent"), 0}, {"asce", 'c', N_("NUM"), 0, N_("set font ascent"), 0}, @@ -1056,6 +1068,7 @@ argp_parser (int key, char *arg, struct argp_state *state) a = strtoul (p, &p, 0); if (*p != '-') + /* TRANSLATORS: It refers to the range of characters in font. */ grub_util_error ("%s", _("invalid font range")); b = strtoul (p + 1, &p, 0); if ((arguments->font_info.num_range