Another round of string clarification and adding TRANSLATORS comments.
This commit is contained in:
parent
ad7b7b8527
commit
67093bc0ed
56 changed files with 131 additions and 71 deletions
|
@ -72,13 +72,13 @@ GRUB_MOD_INIT(configfile)
|
|||
cmd_extractor_source =
|
||||
grub_register_command ("extract_entries_source", grub_cmd_source,
|
||||
N_("FILE"),
|
||||
N_("Load another config file without changing context but take only menuentries.")
|
||||
N_("Load another config file without changing context but take only menu entries.")
|
||||
);
|
||||
|
||||
cmd_extractor_configfile =
|
||||
grub_register_command ("extract_entries_configfile", grub_cmd_source,
|
||||
N_("FILE"),
|
||||
N_("Load another config file without changing context but take only menuentries.")
|
||||
N_("Load another config file without changing context but take only menu entries.")
|
||||
);
|
||||
|
||||
cmd_dot =
|
||||
|
|
|
@ -36,6 +36,10 @@ static grub_uint32_t *const int13slot = (grub_uint32_t *) (4 * 0x13);
|
|||
|
||||
/* Remember to update enum opt_idxs accordingly. */
|
||||
static const struct grub_arg_option options[] = {
|
||||
/* TRANSLATORS: In this file "mapping" refers to a change GRUB makes so if
|
||||
your language doesn't have an equivalent of "mapping" you can
|
||||
use the word like "rerouting".
|
||||
*/
|
||||
{"list", 'l', 0, N_("Show the current mappings."), 0, 0},
|
||||
{"reset", 'r', 0, N_("Reset all mappings to the default values."), 0, 0},
|
||||
{"swap", 's', 0, N_("Perform both direct and reverse mappings."), 0, 0},
|
||||
|
|
|
@ -183,6 +183,8 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
|
|||
|
||||
if (argc < 1)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
/* TRANSLATORS: it's musical notes, not the notes
|
||||
you take. */
|
||||
N_("filename or tempo and notes expected"));
|
||||
|
||||
if (argc == 1)
|
||||
|
|
|
@ -100,6 +100,7 @@ GRUB_MOD_INIT(keystatus)
|
|||
{
|
||||
cmd = grub_register_extcmd ("keystatus", grub_cmd_keystatus, 0,
|
||||
"[--shift] [--ctrl] [--alt]",
|
||||
/* TRANSLATORS: there are 3 modifiers. */
|
||||
N_("Check key modifier status."),
|
||||
options);
|
||||
}
|
||||
|
|
|
@ -808,7 +808,7 @@ GRUB_MOD_INIT(legacycfg)
|
|||
cmd_check_password = grub_register_command ("legacy_check_password",
|
||||
grub_cmd_legacy_check_password,
|
||||
N_("[--md5] PASSWD [FILE]"),
|
||||
N_("Simulate grub-legacy `password' command in menuentry mode"));
|
||||
N_("Simulate grub-legacy `password' command in menu entry mode"));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -197,8 +197,8 @@ disp_acpi_rsdpv2 (struct grub_acpi_rsdp_v20 *rsdp)
|
|||
}
|
||||
|
||||
static const struct grub_arg_option options[] = {
|
||||
{"v1", '1', 0, N_("Show v1 tables only."), 0, ARG_TYPE_NONE},
|
||||
{"v2", '2', 0, N_("Show v2 and v3 tables only."), 0, ARG_TYPE_NONE}
|
||||
{"v1", '1', 0, N_("Show version 1 tables only."), 0, ARG_TYPE_NONE},
|
||||
{"v2", '2', 0, N_("Show version 2 and version 3 tables only."), 0, ARG_TYPE_NONE}
|
||||
};
|
||||
|
||||
static grub_err_t
|
||||
|
|
|
@ -292,7 +292,7 @@ grub_menu_init (void)
|
|||
cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
|
||||
GRUB_COMMAND_FLAG_BLOCKS
|
||||
| GRUB_COMMAND_FLAG_EXTRACTOR,
|
||||
N_("BLOCK"), N_("Define a menuentry."), options);
|
||||
N_("BLOCK"), N_("Define a menu entry."), options);
|
||||
cmd_sub = grub_register_extcmd ("submenu", grub_cmd_menuentry,
|
||||
GRUB_COMMAND_FLAG_BLOCKS
|
||||
| GRUB_COMMAND_FLAG_EXTRACTOR,
|
||||
|
|
|
@ -57,6 +57,9 @@ grub_cmd_lsspd (grub_command_t cmd __attribute__ ((unused)),
|
|||
{
|
||||
struct grub_smbus_spd spd;
|
||||
grub_memset (&spd, 0, sizeof (spd));
|
||||
/* TRANSLATORS: it's shown in a report in a way
|
||||
like number 1: ... number 2: ...
|
||||
*/
|
||||
grub_printf_ (N_("RAM slot number %d\n"), i);
|
||||
err = grub_cs5536_read_spd (smbbase, i, &spd);
|
||||
if (err)
|
||||
|
|
|
@ -139,6 +139,10 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
|
|||
grub_free (pass->salt);
|
||||
grub_free (pass);
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
/* TRANSLATORS: it means that the string which
|
||||
was supposed to be a password hash doesn't
|
||||
have a correct format, not to password
|
||||
mismatch. */
|
||||
N_("invalid PBKDF2 password"));
|
||||
}
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
|||
static const struct grub_arg_option options[] =
|
||||
{
|
||||
{"verbose", 'v', 0, N_("Verbose countdown."), 0, 0},
|
||||
{"interruptible", 'i', 0, N_("Interruptible with ESC."), 0, 0},
|
||||
{"interruptible", 'i', 0, N_("Allow to interrupt with ESC."), 0, 0},
|
||||
{0, 0, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ hook (const struct grub_video_mode_info *info)
|
|||
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP)
|
||||
grub_xputs (_("Monochrome "));
|
||||
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_UNKNOWN)
|
||||
grub_xputs (_("Unknown "));
|
||||
grub_xputs (_("Unknown video mode "));
|
||||
|
||||
grub_xputs ("\n");
|
||||
|
||||
|
|
|
@ -465,7 +465,7 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
|
|||
int i;
|
||||
|
||||
if (cmd)
|
||||
return grub_error (GRUB_ERR_WRITE_ERROR, N_("cannot write to cdrom"));
|
||||
return grub_error (GRUB_ERR_WRITE_ERROR, N_("cannot write to CD-ROM"));
|
||||
|
||||
for (i = 0; i < GRUB_BIOSDISK_CDROM_RETRY_COUNT; i++)
|
||||
if (! grub_biosdisk_rw_int13_extensions (0x42, data->drive, dap))
|
||||
|
@ -589,7 +589,7 @@ grub_biosdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
|
|||
struct grub_biosdisk_data *data = disk->data;
|
||||
|
||||
if (data->flags & GRUB_BIOSDISK_FLAG_CDROM)
|
||||
return grub_error (GRUB_ERR_IO, N_("cannot write to cdrom"));
|
||||
return grub_error (GRUB_ERR_IO, N_("cannot write to CD-ROM"));
|
||||
|
||||
while (size)
|
||||
{
|
||||
|
|
|
@ -962,7 +962,9 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
|
|||
#endif
|
||||
if (lv->size < *nsectors)
|
||||
return grub_error (GRUB_ERR_OUT_OF_RANGE,
|
||||
N_("your LDM embed Partition is too small;"
|
||||
/* TRANSLATORS: it's a partition for embedding,
|
||||
not a partition embed into something. */
|
||||
N_("your LDM embedding Partition is too small;"
|
||||
" embedding won't be possible"));
|
||||
*nsectors = lv->size;
|
||||
*sectors = grub_malloc (*nsectors * sizeof (**sectors));
|
||||
|
@ -976,6 +978,8 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
|
|||
}
|
||||
|
||||
return grub_error (GRUB_ERR_FILE_NOT_FOUND,
|
||||
/* TRANSLATORS: it's a partition for embedding,
|
||||
not a partition embed into something. */
|
||||
N_("this LDM has no Embedding Partition;"
|
||||
" embedding won't be possible"));
|
||||
}
|
||||
|
|
|
@ -719,7 +719,7 @@ grub_scsi_write (grub_disk_t disk __attribute((unused)),
|
|||
scsi = disk->data;
|
||||
|
||||
if (scsi->devtype == grub_scsi_devtype_cdrom)
|
||||
return grub_error (GRUB_ERR_IO, N_("cannot write to cdrom"));
|
||||
return grub_error (GRUB_ERR_IO, N_("cannot write to CD-ROM"));
|
||||
|
||||
while (size)
|
||||
{
|
||||
|
|
|
@ -153,11 +153,11 @@ print_vdev_info (char *nvlist, int tab)
|
|||
print_tabs (tab);
|
||||
if (!child)
|
||||
{
|
||||
grub_printf_ (N_("Mirror element %d isn't correct\n"), i);
|
||||
grub_printf_ (N_("Mirror element number %d isn't correct\n"), i);
|
||||
continue;
|
||||
}
|
||||
|
||||
grub_printf_ (N_("Mirror element %d:\n"), i);
|
||||
grub_printf_ (N_("Mirror element number %d:\n"), i);
|
||||
print_vdev_info (child, tab + 1);
|
||||
|
||||
grub_free (child);
|
||||
|
@ -299,6 +299,9 @@ grub_cmd_zfsinfo (grub_command_t cmd __attribute__ ((unused)), int argc,
|
|||
nv = grub_zfs_nvlist_lookup_nvlist (nvlist, ZPOOL_CONFIG_VDEV_TREE);
|
||||
|
||||
if (!nv)
|
||||
/* TRANSLATORS: There are undetermined number of virtual devices
|
||||
in a device tree, not just one.
|
||||
*/
|
||||
grub_puts_ (N_("No virtual device tree available"));
|
||||
else
|
||||
print_vdev_info (nv, 1);
|
||||
|
@ -401,7 +404,7 @@ GRUB_MOD_INIT (zfsinfo)
|
|||
N_("Print ZFS info about DEVICE."));
|
||||
cmd_bootfs = grub_register_command ("zfs-bootfs", grub_cmd_zfs_bootfs,
|
||||
N_("FILESYSTEM [VARIABLE]"),
|
||||
N_("Print ZFS-BOOTFSOBJ or set it to VARIABLE"));
|
||||
N_("Print ZFS-BOOTFSOBJ or store it into VARIABLE"));
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI (zfsinfo)
|
||||
|
|
|
@ -391,6 +391,10 @@ GRUB_MOD_INIT (gettext)
|
|||
|
||||
grub_register_command_p1 ("gettext", grub_cmd_translate,
|
||||
N_("STRING"),
|
||||
/* TRANSLATORS: It refers to passing the string through gettext.
|
||||
So it's "translate" in the same meaning as in what you're
|
||||
doing now.
|
||||
*/
|
||||
N_("Translates the string with the current settings."));
|
||||
|
||||
/* Reload .mo file information if lang changes. */
|
||||
|
|
|
@ -224,7 +224,7 @@ grub_dl_check_header (void *ehdr, grub_size_t size)
|
|||
|| 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"));
|
||||
|
||||
err = grub_arch_dl_check_header (ehdr);
|
||||
if (err)
|
||||
|
|
|
@ -40,7 +40,7 @@ grub_elf_check_header (grub_elf_t elf)
|
|||
|| 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"));
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
@ -772,6 +772,7 @@ grub_hostdisk_os_dev_to_grub_drive (const char *os_disk, int add)
|
|||
return NULL;
|
||||
|
||||
if (i == ARRAY_SIZE (map))
|
||||
/* TRANSLATORS: it refers to the lack of free slots. */
|
||||
grub_util_error ("%s", _("device count exceeds limit"));
|
||||
|
||||
map[i].device = xstrdup (os_disk);
|
||||
|
@ -1192,7 +1193,7 @@ read_device_map (const char *dev_map)
|
|||
/* Find a free slot. */
|
||||
drive = find_free_slot ();
|
||||
if (drive < 0)
|
||||
show_error (_("Map table size exceeded"));
|
||||
show_error (_("device count exceeds limit"));
|
||||
|
||||
e = p;
|
||||
p = strchr (p, ')');
|
||||
|
|
|
@ -85,6 +85,7 @@ grub_machine_fini (void)
|
|||
static struct argp_option options[] = {
|
||||
{"root", 'r', N_("DEVICE_NAME"), 0, N_("Set root device."), 2},
|
||||
{"device-map", 'm', N_("FILE"), 0,
|
||||
/* TRANSLATORS: There are many devices in device map. */
|
||||
N_("use FILE as the device map [default=%s]"), 0},
|
||||
{"directory", 'd', N_("DIR"), 0,
|
||||
N_("use GRUB files in the directory DIR [default=%s]"), 0},
|
||||
|
@ -143,7 +144,8 @@ argp_parser (int key, char *arg, struct argp_state *state)
|
|||
case ARGP_KEY_ARG:
|
||||
{
|
||||
/* Too many arguments. */
|
||||
fprintf (stderr, _("Unknown extra argument `%s'.\n"), arg);
|
||||
fprintf (stderr, _("Unknown extra argument `%s'."), arg);
|
||||
fprintf (stderr, "\n");
|
||||
argp_usage (state);
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -70,7 +70,7 @@ grub_util_warn (const char *fmt, ...)
|
|||
{
|
||||
va_list ap;
|
||||
|
||||
fprintf (stderr, _("%s: warn:"), program_name);
|
||||
fprintf (stderr, _("%s: warning:"), program_name);
|
||||
fprintf (stderr, " ");
|
||||
va_start (ap, fmt);
|
||||
vfprintf (stderr, fmt, ap);
|
||||
|
|
|
@ -33,7 +33,7 @@ grub_arch_dl_check_header (void *ehdr)
|
|||
if (e->e_ident[EI_CLASS] != ELFCLASS32
|
||||
|| e->e_ident[EI_DATA] != ELFDATA2LSB
|
||||
|| e->e_machine != EM_386)
|
||||
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"));
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ grub_arch_dl_check_header (void *ehdr)
|
|||
if (e->e_ident[EI_CLASS] != ELFCLASS64
|
||||
|| e->e_ident[EI_DATA] != ELFDATA2LSB
|
||||
|| e->e_machine != EM_IA_64)
|
||||
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"));
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ grub_arch_dl_check_header (void *ehdr)
|
|||
|| e->e_ident[EI_DATA] != ELFDATA2LSB
|
||||
|| e->e_machine != EM_MIPS)
|
||||
#endif
|
||||
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"));
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ grub_arch_dl_check_header (void *ehdr)
|
|||
if (e->e_ident[EI_CLASS] != ELFCLASS32
|
||||
|| e->e_ident[EI_DATA] != ELFDATA2MSB
|
||||
|| e->e_machine != EM_PPC)
|
||||
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"));
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ grub_arch_dl_check_header (void *ehdr)
|
|||
if (e->e_ident[EI_CLASS] != ELFCLASS64
|
||||
|| e->e_ident[EI_DATA] != ELFDATA2MSB
|
||||
|| e->e_machine != EM_SPARCV9)
|
||||
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"));
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ grub_arch_dl_check_header (void *ehdr)
|
|||
if (e->e_ident[EI_CLASS] != ELFCLASS64
|
||||
|| e->e_ident[EI_DATA] != ELFDATA2LSB
|
||||
|| e->e_machine != EM_X86_64)
|
||||
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"));
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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},
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"));
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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 ();
|
||||
|
|
|
@ -174,7 +174,7 @@ gpt_partition_map_embed (struct grub_disk *disk_, unsigned int *nsectors,
|
|||
|
||||
if (len == 0)
|
||||
return grub_error (GRUB_ERR_FILE_NOT_FOUND,
|
||||
N_("this GPT partition label has no BIOS Boot Partition;"
|
||||
N_("this GPT partition label contains no BIOS Boot Partition;"
|
||||
" embedding won't be possible"));
|
||||
|
||||
if (len < *nsectors)
|
||||
|
|
|
@ -167,6 +167,8 @@ grub_script_return (grub_command_t cmd __attribute__((unused)),
|
|||
|
||||
if (! scope || argc > 1)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
/* TRANSLATORS: it's about not being
|
||||
inside a function. */
|
||||
N_("not in function scope"));
|
||||
|
||||
if (argc == 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue