|
 |
f96e0b |
From c061433a9a81b4114e4ed2b9c5c7784917b5e0d4 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Tue, 7 May 2013 11:41:47 +0200
|
|
|
f96e0b |
Subject: [PATCH 433/482] Mark few forgotten strings for translation.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 4 ++++
|
|
|
f96e0b |
grub-core/commands/acpihalt.c | 4 ++--
|
|
|
f96e0b |
grub-core/commands/nativedisk.c | 2 +-
|
|
|
f96e0b |
grub-core/loader/i386/pc/freedos.c | 2 +-
|
|
|
f96e0b |
grub-core/normal/misc.c | 4 +++-
|
|
|
f96e0b |
util/grub-render-label.c | 6 +++---
|
|
|
f96e0b |
6 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index fc647b8..9c8a14a 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,9 @@
|
|
|
f96e0b |
2013-05-07 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ Mark few forgotten strings for translation.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2013-05-07 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* grub-core/loader/linux.c: Use grub_dprintf for debug statements
|
|
|
f96e0b |
rather than printf.
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
|
|
|
f96e0b |
index a8014de..6f156fd 100644
|
|
|
f96e0b |
--- a/grub-core/commands/acpihalt.c
|
|
|
f96e0b |
+++ b/grub-core/commands/acpihalt.c
|
|
|
f96e0b |
@@ -311,13 +311,13 @@ main (int argc, char **argv)
|
|
|
f96e0b |
buf = malloc (len);
|
|
|
f96e0b |
if (!buf)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
- printf ("Couldn't malloc buffer\n");
|
|
|
f96e0b |
+ printf (_("error: %s.\n"), _("out of memory"));
|
|
|
f96e0b |
fclose (f);
|
|
|
f96e0b |
return 2;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
if (fread (buf, 1, len, f) != len)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
- printf ("Read failed\n");
|
|
|
f96e0b |
+ printf (_("cannot read `%s': %s"), strerror (errno));
|
|
|
f96e0b |
free (buf);
|
|
|
f96e0b |
fclose (f);
|
|
|
f96e0b |
return 2;
|
|
|
f96e0b |
diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
|
|
|
f96e0b |
index 453faad..71d7bc4 100644
|
|
|
f96e0b |
--- a/grub-core/commands/nativedisk.c
|
|
|
f96e0b |
+++ b/grub-core/commands/nativedisk.c
|
|
|
f96e0b |
@@ -301,7 +301,7 @@ static grub_command_t cmd;
|
|
|
f96e0b |
|
|
|
f96e0b |
GRUB_MOD_INIT(nativedisk)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
- cmd = grub_register_command ("nativedisk", grub_cmd_nativedisk, "[MODULE1 MODULE2 ...]",
|
|
|
f96e0b |
+ cmd = grub_register_command ("nativedisk", grub_cmd_nativedisk, N_("[MODULE1 MODULE2 ...]"),
|
|
|
f96e0b |
N_("Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is used"));
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/grub-core/loader/i386/pc/freedos.c b/grub-core/loader/i386/pc/freedos.c
|
|
|
f96e0b |
index e685c6e..478f3c5 100644
|
|
|
f96e0b |
--- a/grub-core/loader/i386/pc/freedos.c
|
|
|
f96e0b |
+++ b/grub-core/loader/i386/pc/freedos.c
|
|
|
f96e0b |
@@ -145,7 +145,7 @@ grub_cmd_freedos (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f96e0b |
if (kernelsyssize > GRUB_FREEDOS_MAX_SIZE)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
grub_error (GRUB_ERR_BAD_OS,
|
|
|
f96e0b |
- N_("file `%s' is too large"), argv[0]);
|
|
|
f96e0b |
+ N_("the size of `%s' is too large"), argv[0]);
|
|
|
f96e0b |
goto fail;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/grub-core/normal/misc.c b/grub-core/normal/misc.c
|
|
|
f96e0b |
index bc6ce17..34d505e 100644
|
|
|
f96e0b |
--- a/grub-core/normal/misc.c
|
|
|
f96e0b |
+++ b/grub-core/normal/misc.c
|
|
|
f96e0b |
@@ -181,7 +181,9 @@ grub_normal_print_device_info (const char *name)
|
|
|
f96e0b |
else
|
|
|
f96e0b |
grub_printf (_(" - Total size %llu%sKiB"),
|
|
|
f96e0b |
(unsigned long long) (grub_disk_get_size (dev->disk) >> 1),
|
|
|
f96e0b |
- (grub_disk_get_size (dev->disk) & 1) ? ".5" : "");
|
|
|
f96e0b |
+ /* TRANSLATORS: Replace dot with appropriate decimal separator for
|
|
|
f96e0b |
+ your language. */
|
|
|
f96e0b |
+ (grub_disk_get_size (dev->disk) & 1) ? _(".5") : "");
|
|
|
f96e0b |
|
|
|
f96e0b |
grub_device_close (dev);
|
|
|
f96e0b |
}
|
|
|
f96e0b |
diff --git a/util/grub-render-label.c b/util/grub-render-label.c
|
|
|
f96e0b |
index 32d3774..1b28ab7 100644
|
|
|
f96e0b |
--- a/util/grub-render-label.c
|
|
|
f96e0b |
+++ b/util/grub-render-label.c
|
|
|
f96e0b |
@@ -55,7 +55,7 @@ static struct argp_option options[] = {
|
|
|
f96e0b |
{"bgcolor", 'b', N_("COLOR"), 0,
|
|
|
f96e0b |
N_("use COLOR for background"), 0},
|
|
|
f96e0b |
{"text", 't', N_("STR"), 0,
|
|
|
f96e0b |
- N_("supply the string."), 0},
|
|
|
f96e0b |
+ N_("set the label to render."), 0},
|
|
|
f96e0b |
{"output", 'o', N_("FILE"), 0,
|
|
|
f96e0b |
N_("set output filename. Default is STDOUT"), 0},
|
|
|
f96e0b |
{"font", 'f', N_("FILE"), 0,
|
|
|
f96e0b |
@@ -89,13 +89,13 @@ argp_parser (int key, char *arg, struct argp_state *state)
|
|
|
f96e0b |
case 'b':
|
|
|
f96e0b |
err = grub_video_parse_color (arg, &arguments->bgcolor);
|
|
|
f96e0b |
if (err)
|
|
|
f96e0b |
- grub_util_error (_("Invalud color `%s'"), arg);
|
|
|
f96e0b |
+ grub_util_error (_("invalid color specification `%s'"), arg);
|
|
|
f96e0b |
break;
|
|
|
f96e0b |
|
|
|
f96e0b |
case 'c':
|
|
|
f96e0b |
err = grub_video_parse_color (arg, &arguments->fgcolor);
|
|
|
f96e0b |
if (err)
|
|
|
f96e0b |
- grub_util_error (_("Invalud color `%s'"), arg);
|
|
|
f96e0b |
+ grub_util_error (_("invalid color specification `%s'"), arg);
|
|
|
f96e0b |
break;
|
|
|
f96e0b |
|
|
|
f96e0b |
case 'f':
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|