vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Another round of string clarification and adding TRANSLATORS comments.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 17:28:05 +01:00
parent ad7b7b8527
commit 67093bc0ed
56 changed files with 131 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/loader/i386/bsd.c
View file

@ -99,7 +99,7 @@ static const struct grub_arg_option freebsd_opts[] =
{"dual", 'D', 0, N_("Display output on all consoles."), 0, 0},
{"serial", 'h', 0, N_("Use serial console."), 0, 0},
{"askname", 'a', 0, N_("Ask for file name to reboot from."), 0, 0},
{"cdrom", 'C', 0, N_("Use CDROM as root."), 0, 0},
{"cdrom", 'C', 0, N_("Use CD-ROM as root."), 0, 0},
{"config", 'c', 0, N_("Invoke user configuration routing."), 0, 0},
{"kdb", 'd', 0, N_("Enter in KDB on boot."), 0, 0},
{"gdb", 'g', 0, N_("Use GDB remote debugger instead of DDB."), 0, 0},
@ -1399,7 +1399,7 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
kern_chunk_src, &openbsd_ramdisk);
}
else
return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch dependent ELF magic"));
return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF magic"));
}
static grub_err_t
@ -2082,6 +2082,8 @@ GRUB_MOD_INIT (bsd)
cmd_openbsd_ramdisk = grub_register_command ("kopenbsd_ramdisk",
grub_cmd_openbsd_ramdisk, 0,
/* TRANSLATORS: ramdisk isn't identifier,
it can be translated. */
N_("Load kOpenBSD ramdisk."));
my_mod = mod;

4
grub-core/loader/i386/bsdXX.c
View file

@ -43,10 +43,10 @@ read_headers (grub_file_t file, const char *filename, Elf_Ehdr *e, char **shdr)
|| e->e_ident[EI_MAG3] != ELFMAG3
|| e->e_ident[EI_VERSION] != EV_CURRENT
|| e->e_version != EV_CURRENT)
return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch independent ELF magic"));
return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-independent ELF magic"));
if (e->e_ident[EI_CLASS] != SUFFIX (ELFCLASS))
return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch dependent ELF magic"));
return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF magic"));
*shdr = grub_malloc (e->e_shnum * e->e_shentsize);
if (! *shdr)

12
grub-core/loader/i386/linux.c
View file

@ -814,9 +814,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
case GRUB_LINUX_VID_MODE_NORMAL:
grub_env_set ("gfxpayload", "text");
grub_printf_ (N_("%s is deprecated. "
"Use set gfxpayload=text before "
"linux command instead.\n"),
argv[i]);
"Use set gfxpayload=%s before "
"linux command instead.\n"), "text",
argv[i]);
break;
case 1:
@ -824,9 +824,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
/* FIXME: support 80x50 text. */
grub_env_set ("gfxpayload", "text");
grub_printf_ (N_("%s is deprecated. "
"Use set gfxpayload=text before "
"linux command instead.\n"),
argv[i]);
"Use set gfxpayload=%s before "
"linux command instead.\n"), "text",
argv[i]);
break;
default:
/* Ignore invalid values. */

6
grub-core/loader/i386/pc/plan9.c
View file

@ -49,6 +49,12 @@ static grub_uint32_t eip = 0xffffffff;
static const struct grub_arg_option options[] =
{
{"map", 'm', GRUB_ARG_OPTION_REPEATABLE,
/* TRANSLATORS: it's about guessing which GRUB disk
is which Plan9 disk. If your language has no
word "mapping" you can use another word which
means that the GRUBDEVICE and PLAN9DEVICE are
actually the same device, just named differently
in OS and GRUB. */
N_("Override guessed mapping of Plan9 devices."),
N_("GRUBDEVICE=PLAN9DEVICE"),
ARG_TYPE_STRING},

4
grub-core/loader/ia64/efi/linux.c
View file

@ -372,13 +372,13 @@ grub_load_elf64 (grub_file_t file, void *buffer, const char *filename)
|| ehdr->e_ident[EI_MAG3] != ELFMAG3
|| ehdr->e_ident[EI_DATA] != ELFDATA2LSB)
return grub_error(GRUB_ERR_UNKNOWN_OS,
N_("invalid arch independent ELF magic"));
N_("invalid arch-independent ELF magic"));
if (ehdr->e_ident[EI_CLASS] != ELFCLASS64
|| ehdr->e_version != EV_CURRENT
|| ehdr->e_machine != EM_IA_64)
return grub_error (GRUB_ERR_UNKNOWN_OS,
N_("invalid arch dependent ELF magic"));
N_("invalid arch-dependent ELF magic"));
if (ehdr->e_type != ET_EXEC)
return grub_error (GRUB_ERR_UNKNOWN_OS,

2
grub-core/loader/mips/linux.c
View file

@ -323,7 +323,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
if (grub_elf_is_elf64 (elf))
err = grub_linux_load64 (elf, argv[0], &extra, size);
else
err = grub_error (GRUB_ERR_BAD_OS, N_("invalid arch dependent ELF magic"));
err = grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF magic"));
grub_elf_close (elf);

2
grub-core/loader/multiboot.c
View file

@ -171,7 +171,7 @@ grub_multiboot_load_elf (grub_file_t file, const char *filename,
else if (grub_multiboot_is_elf64 (buffer))
return grub_multiboot_load_elf64 (file, filename, buffer);
return grub_error (GRUB_ERR_UNKNOWN_OS, N_("invalid arch dependent ELF magic"));
return grub_error (GRUB_ERR_UNKNOWN_OS, N_("invalid arch-dependent ELF magic"));
}
grub_err_t

4
grub-core/loader/multiboot_elfxx.c
View file

@ -62,11 +62,11 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, const char *filename, voi
|| ehdr->e_ident[EI_MAG2] != ELFMAG2
|| ehdr->e_ident[EI_MAG3] != ELFMAG3
|| ehdr->e_ident[EI_DATA] != ELFDATA2LSB)
return grub_error(GRUB_ERR_UNKNOWN_OS, N_("invalid arch independent ELF magic"));
return grub_error(GRUB_ERR_UNKNOWN_OS, N_("invalid arch-independent ELF magic"));
if (ehdr->e_ident[EI_CLASS] != ELFCLASSXX || ehdr->e_machine != E_MACHINE
|| ehdr->e_version != EV_CURRENT)
return grub_error (GRUB_ERR_UNKNOWN_OS, N_("invalid arch dependent ELF magic"));
return grub_error (GRUB_ERR_UNKNOWN_OS, N_("invalid arch-dependent ELF magic"));
if (ehdr->e_type != ET_EXEC && ehdr->e_type != ET_DYN)
return grub_error (GRUB_ERR_UNKNOWN_OS, N_("this ELF file is not of the right type"));

2
grub-core/loader/powerpc/ieee1275/linux.c
View file

@ -280,7 +280,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
grub_linux_load64 (elf, argv[0]);
else
{
grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("invalid arch dependent ELF magic"));
grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("invalid arch-dependent ELF magic"));
goto out;
}

2
grub-core/loader/sparc64/ieee1275/linux.c
View file

@ -330,7 +330,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
grub_linux_load64 (elf, argv[0]);
else
{
grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("invalid arch dependent ELF magic"));
grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("invalid arch-dependent ELF magic"));
goto out;
}

5
grub-core/loader/xnu.c
View file

@ -1460,8 +1460,11 @@ GRUB_MOD_INIT(xnu)
GNU/Linux runlevels.
*/
N_("DIRECTORY [OSBundleRequired]"),
/* TRANSLATORS: There are many extensions
in extension directory. */
N_("Load XNU extension directory."));
cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0,
/* TRANSLATORS: ramdisk here isn't identifier. It can be translated. */
N_("Load XNU ramdisk. "
"It will be available in OS as md0."));
cmd_splash = grub_register_extcmd ("xnu_splash",
@ -1472,7 +1475,7 @@ GRUB_MOD_INIT(xnu)
#ifndef GRUB_MACHINE_EMU
cmd_resume = grub_register_command ("xnu_resume", grub_cmd_xnu_resume,
0, N_("Load an image of hibernated"
" XNU image."));
" XNU."));
#endif
grub_cpu_xnu_init ();