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

2
grub-core/kern/dl.c
View file

@ -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)

2
grub-core/kern/elf.c
View file

@ -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;
}

3
grub-core/kern/emu/hostdisk.c
View file

@ -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, ')');

4
grub-core/kern/emu/main.c
View file

@ -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;

2
grub-core/kern/emu/misc.c
View file

@ -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);

2
grub-core/kern/i386/dl.c
View file

@ -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;
}

2
grub-core/kern/ia64/dl.c
View file

@ -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;
}

2
grub-core/kern/mips/dl.c
View file

@ -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;
}

2
grub-core/kern/powerpc/dl.c
View file

@ -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;
}

2
grub-core/kern/sparc64/dl.c
View file

@ -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;
}

2
grub-core/kern/x86_64/dl.c
View file

@ -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;
}