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

Decrease number of strings to translate.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-18 07:26:13 +01:00
parent 74fa9417e5
commit 57a691b7e7
12 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
util/grub-install.c
View file

@ -1176,7 +1176,7 @@ main (int argc, char *argv[])
if (grub_strcmp (fs->name, "hfs") != 0
&& grub_strcmp (fs->name, "hfsplus") != 0
&& !is_guess)
grub_util_error (_("%s is neither hfs nor hfsplue"),
grub_util_error (_("%s is neither hfs nor hfsplus"),
macppcdir);
if (grub_strcmp (fs->name, "hfs") == 0
|| grub_strcmp (fs->name, "hfsplus") == 0)

7
util/grub-mkimagexx.c
View file

@ -842,7 +842,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
sym_addr -= offset;
sym_addr -= SUFFIX (entry_point);
if (!grub_arm_64_check_xxxx26_offset (sym_addr))
grub_util_error ("%s", _("CALL26 Relocation out of range"));
grub_util_error ("%s", "CALL26 Relocation out of range");
grub_arm64_set_xxxx26_offset((grub_uint32_t *)target,
sym_addr);
@ -1201,7 +1201,7 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out,
case R_AARCH64_JUMP26:
break;
default:
grub_util_error (_("fixup for relocation %u is not implemented yet"),
grub_util_error (_("relocation 0x%x is not implemented yet"),
(unsigned int) ELF_R_TYPE (info));
break;
}
@ -1239,7 +1239,8 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out,
}
break;
default:
grub_util_error (_("fixup for relocation 0x%x not implemented"), ELF_R_TYPE (info));
grub_util_error (_("relocation 0x%x is not implemented yet"),
(unsigned int) ELF_R_TYPE (info));
break;
}
break;

2
util/grub-mknetdir.c
View file

@ -79,7 +79,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
struct argp argp = {
options, argp_parser, N_("[OPTION]"),
options, argp_parser, NULL,
"\v"N_("copies GRUB images into net_directory/subdir/target_cpu-platform."),
NULL, grub_install_help_filter, NULL
};

2
util/grub-mkstandalone.c
View file

@ -42,7 +42,7 @@ static struct argp_option options[] = {
{"output", 'o', N_("FILE"),
0, N_("save output in FILE [required]"), 2},
{"format", 'O', N_("FILE"), 0, 0, 2},
{"compression", 'C', N_("xz|none|auto"), OPTION_HIDDEN, 0, 2},
{"compression", 'C', "xz|none|auto", OPTION_HIDDEN, 0, 2},
{0, 0, 0, 0, 0, 0}
};

12
util/grub-syslinux2cfg.c
View file

@ -56,15 +56,15 @@ struct arguments
static struct argp_option options[] = {
{"target-root", 't', N_("DIR"), 0,
N_("root directory as it will be seen on runtime (default /)."), 0},
N_("root directory as it will be seen on runtime [default=/]."), 0},
{"root", 'r', N_("DIR"), 0,
N_("root directory of the syslinux disk (default /)."), 0},
N_("root directory of the syslinux disk [default=/]."), 0},
{"target-cwd", 'T', N_("DIR"), 0,
N_("current directory as it will be seen on runtime (default $pwd)."), 0},
N_("current directory as it will be seen on runtime [default=$pwd]."), 0},
{"cwd", 'c', N_("DIR"), 0,
N_("current directory of the syslinux disk (default $pwd)."), 0},
N_("current directory of the syslinux disk [default=$pwd]."), 0},
{"output", 'o', N_("FILE"), 0, N_("write output to FILE (default stdout)."), 0},
{"output", 'o', N_("FILE"), 0, N_("write output to FILE [default=stdout]."), 0},
{"isolinux", 'i', 0, 0, N_("assume isolinux."), 0},
{"pxelinux", 'p', 0, 0, N_("assume pxelinux."), 0},
{"syslinux", 's', 0, 0, N_("assume syslinux."), 0},
@ -137,7 +137,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
}
static struct argp argp = {
options, argp_parser, N_("[OPTIONS] FILE ROOT"),
options, argp_parser, N_("FILE"),
N_("Transform syslinux config into GRUB one."),
NULL, NULL, NULL
};

10
util/mkimage.c
View file

@ -859,7 +859,7 @@ grub_arm_reloc_thm_call (grub_uint16_t *target, Elf32_Addr sym_addr)
somewhere else. */
if (offset < -0x200000 || offset >= 0x200000)
return grub_error (GRUB_ERR_BAD_MODULE,
N_("THM_CALL Relocation out of range."));
"THM_CALL Relocation out of range.");
grub_dprintf ("dl", " relative destination = %p",
(char *) target + offset);
@ -879,7 +879,7 @@ grub_arm_reloc_thm_jump19 (grub_uint16_t *target, Elf32_Addr sym_addr)
if (!(sym_addr & 1))
return grub_error (GRUB_ERR_BAD_MODULE,
N_("Relocation targeting wrong execution state"));
"Relocation targeting wrong execution state");
offset = grub_arm_thm_jump19_get_offset (target);
@ -888,7 +888,7 @@ grub_arm_reloc_thm_jump19 (grub_uint16_t *target, Elf32_Addr sym_addr)
if (!grub_arm_thm_jump19_check_offset (offset))
return grub_error (GRUB_ERR_BAD_MODULE,
N_("THM_JUMP19 Relocation out of range."));
"THM_JUMP19 Relocation out of range.");
grub_arm_thm_jump19_set_offset (target, offset);
@ -907,14 +907,14 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
if (sym_addr & 1)
return grub_error (GRUB_ERR_BAD_MODULE,
N_("Relocation targeting wrong execution state"));
"Relocation targeting wrong execution state");
offset = grub_arm_jump24_get_offset (target);
offset += sym_addr;
if (!grub_arm_jump24_check_offset (offset))
return grub_error (GRUB_ERR_BAD_MODULE,
N_("JUMP24 Relocation out of range."));
"JUMP24 Relocation out of range.");
grub_arm_jump24_set_offset (target, offset);