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

* grub-core/commands/gptsync.c: Fix typographic quoting. 

* grub-core/commands/ieee1275/suspend.c: Likewise.
	* grub-core/commands/parttool.c: Likewise.
	* grub-core/commands/search_wrap.c: Likewise.
	* grub-core/commands/videoinfo.c: Likewise.
	* grub-core/gfxmenu/gui_label.c: Likewise.
	* grub-core/hello/hello.c: Likewise.
	* grub-core/kern/emu/main.c: Likewise.
	* grub-core/net/net.c: Likewise.
	* grub-core/normal/menu.c: Likewise.
	* grub-core/normal/menu_text.c: Likewise.
	* grub-core/normal/misc.c: Likewise.
	* util/grub-editenv.c: Likewise.
	* util/grub-install.in: Likewise.
	* util/grub-kbdcomp.in: Likewise.
	* util/grub-mkconfig.in: Likewise.
	* util/grub-mknetdir.in: Likewise.
	* util/grub-mkrescue.in: Likewise.
	* util/grub-mkstandalone.in: Likewise.
	* util/grub-reboot.in: Likewise.
	* util/grub-set-default.in: Likewise.
	* util/grub-setup.c: Likewise.
	* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-03 13:05:08 +01:00
parent 40211ab884
commit 805a8dccc8
24 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -1,3 +1,29 @@
2012-03-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/gptsync.c: Fix typographic quoting.
* grub-core/commands/ieee1275/suspend.c: Likewise.
* grub-core/commands/parttool.c: Likewise.
* grub-core/commands/search_wrap.c: Likewise.
* grub-core/commands/videoinfo.c: Likewise.
* grub-core/gfxmenu/gui_label.c: Likewise.
* grub-core/hello/hello.c: Likewise.
* grub-core/kern/emu/main.c: Likewise.
* grub-core/net/net.c: Likewise.
* grub-core/normal/menu.c: Likewise.
* grub-core/normal/menu_text.c: Likewise.
* grub-core/normal/misc.c: Likewise.
* util/grub-editenv.c: Likewise.
* util/grub-install.in: Likewise.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/grub-setup.c: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
2012-03-02 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/acpihalt.c: Add TRANSLATORS comments. * grub-core/commands/acpihalt.c: Add TRANSLATORS comments.

2
grub-core/commands/gptsync.c
View File

@ -232,7 +232,7 @@ grub_cmd_gptsync (grub_command_t cmd __attribute__ ((unused)),
return grub_errno; return grub_errno;
} }
grub_printf_ (N_("New MBR is written to '%s'\n"), args[0]); grub_printf_ (N_("New MBR is written to `%s'\n"), args[0]);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

2
grub-core/commands/ieee1275/suspend.c
View File

@ -31,7 +31,7 @@ grub_cmd_suspend (grub_command_t cmd __attribute__ ((unused)),
int argc __attribute__ ((unused)), int argc __attribute__ ((unused)),
char **args __attribute__ ((unused))) char **args __attribute__ ((unused)))
{ {
grub_puts_ (N_("Run 'go' to resume GRUB.")); grub_puts_ (N_("Run `go' to resume GRUB."));
grub_ieee1275_enter (); grub_ieee1275_enter ();
grub_cls (); grub_cls ();
return 0; return 0;

2
grub-core/commands/parttool.c
View File

@ -38,7 +38,7 @@ static int curhandle = 0;
static grub_dl_t mymod; static grub_dl_t mymod;
static char helpmsg[] = static char helpmsg[] =
N_("Perform COMMANDS on partition.\n" N_("Perform COMMANDS on partition.\n"
"Use \"parttool PARTITION help\" for the list " "Use `parttool PARTITION help' for the list "
"of available commands."); "of available commands.");
int int

2
grub-core/commands/search_wrap.c
View File

@ -191,7 +191,7 @@ GRUB_MOD_INIT(search)
" or filesystem UUID." " or filesystem UUID."
" If --set is specified, the first device found is" " If --set is specified, the first device found is"
" set to a variable. If no variable name is" " set to a variable. If no variable name is"
" specified, \"root\" is used."), " specified, `root' is used."),
options); options);
} }

2
grub-core/commands/videoinfo.c
View File

@ -162,7 +162,7 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
struct grub_video_mode_info info; struct grub_video_mode_info info;
struct grub_video_edid_info edid_info; struct grub_video_edid_info edid_info;
grub_printf_ (N_("Adapter '%s':\n"), adapter->name); grub_printf_ (N_("Adapter `%s':\n"), adapter->name);
if (!adapter->iterate) if (!adapter->iterate)
{ {

10
grub-core/gfxmenu/gui_label.c
View File

@ -181,14 +181,14 @@ label_set_property (void *vself, const char *name, const char *value)
{ {
if (grub_strcmp (value, "@KEYMAP_LONG@") == 0) if (grub_strcmp (value, "@KEYMAP_LONG@") == 0)
value = _("Press enter to boot the selected OS, " value = _("Press enter to boot the selected OS, "
"\'e\' to edit the commands before booting " "`e' to edit the commands before booting "
"or \'c\' for a command-line. ESC to return previous menu."); "or `c' for a command-line. ESC to return previous menu.");
else if (grub_strcmp (value, "@KEYMAP_MIDDLE@") == 0) else if (grub_strcmp (value, "@KEYMAP_MIDDLE@") == 0)
value = _("Press enter to boot the selected OS, " value = _("Press enter to boot the selected OS, "
"\'e\' to edit the commands before booting " "`e' to edit the commands before booting "
"or \'c\' for a command-line."); "or `c' for a command-line.");
else if (grub_strcmp (value, "@KEYMAP_SHORT@") == 0) else if (grub_strcmp (value, "@KEYMAP_SHORT@") == 0)
value = _("enter: boot, \'e\': options, \'c\': cmd-line"); value = _("enter: boot, `e': options, `c': cmd-line");
/* FIXME: Add more templates here if needed. */ /* FIXME: Add more templates here if needed. */
self->template = grub_strdup (value); self->template = grub_strdup (value);
self->text = grub_xasprintf (value, self->value); self->text = grub_xasprintf (value, self->value);

2
grub-core/hello/hello.c
View File

@ -42,7 +42,7 @@ static grub_extcmd_t cmd;
GRUB_MOD_INIT(hello) GRUB_MOD_INIT(hello)
{ {
cmd = grub_register_extcmd ("hello", grub_cmd_hello, 0, 0, cmd = grub_register_extcmd ("hello", grub_cmd_hello, 0, 0,
N_("Say \"Hello World\"."), 0); N_("Say `Hello World'."), 0);
} }
GRUB_MOD_FINI(hello) GRUB_MOD_FINI(hello)

3
grub-core/kern/emu/main.c
View File

@ -193,7 +193,8 @@ main (int argc, char *argv[])
hold = arguments.hold; hold = arguments.hold;
/* Wait until the ARGS.HOLD variable is cleared by an attached debugger. */ /* Wait until the ARGS.HOLD variable is cleared by an attached debugger. */
if (hold && verbosity > 0) if (hold && verbosity > 0)
printf (_("Run \"gdb %s %d\", and set ARGS.HOLD to zero.\n"), /* TRANSLATORS: In this case GRUB tells user what he has to do. */
printf (_("Run `gdb %s %d', and set ARGS.HOLD to zero.\n"),
program_name, (int) getpid ()); program_name, (int) getpid ());
while (hold) while (hold)
{ {

2
grub-core/net/net.c
View File

@ -1385,7 +1385,7 @@ grub_net_fs_read_real (grub_file_t file, char *buf, grub_size_t len)
else else
return total; return total;
} }
grub_error (GRUB_ERR_TIMEOUT, N_("timeout reading '%s'"), net->name); grub_error (GRUB_ERR_TIMEOUT, N_("timeout reading `%s'"), net->name);
return -1; return -1;
} }

4
grub-core/normal/menu.c
View File

@ -672,7 +672,7 @@ notify_booting (grub_menu_entry_t entry,
void *userdata __attribute__((unused))) void *userdata __attribute__((unused)))
{ {
grub_printf (" "); grub_printf (" ");
grub_printf_ (N_("Booting \'%s\'"), entry->title); grub_printf_ (N_("Booting `%s'"), entry->title);
grub_printf ("\n\n"); grub_printf ("\n\n");
} }
@ -684,7 +684,7 @@ notify_fallback (grub_menu_entry_t entry,
void *userdata __attribute__((unused))) void *userdata __attribute__((unused)))
{ {
grub_printf ("\n "); grub_printf ("\n ");
grub_printf_ (N_("Falling back to \'%s\'"), entry->title); grub_printf_ (N_("Falling back to `%s'"), entry->title);
grub_printf ("\n\n"); grub_printf ("\n\n");
grub_millisleep (DEFAULT_ENTRY_ERROR_DELAY_MS); grub_millisleep (DEFAULT_ENTRY_ERROR_DELAY_MS);
} }

8
grub-core/normal/menu_text.c
View File

@ -181,16 +181,16 @@ command-line or ESC to discard edits and return to the GRUB menu."),
{ {
ret += grub_print_message_indented_real ret += grub_print_message_indented_real
(_("Press enter to boot the selected OS, " (_("Press enter to boot the selected OS, "
"\'e\' to edit the commands before booting " "`e' to edit the commands before booting "
"or \'c\' for a command-line. ESC to return previous menu."), "or `c' for a command-line. ESC to return previous menu."),
STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run); STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
} }
else else
{ {
ret += grub_print_message_indented_real ret += grub_print_message_indented_real
(_("Press enter to boot the selected OS, " (_("Press enter to boot the selected OS, "
"\'e\' to edit the commands before booting " "`e' to edit the commands before booting "
"or \'c\' for a command-line."), "or `c' for a command-line."),
STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run); STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
} }
} }

2
grub-core/normal/misc.c
View File

@ -71,7 +71,7 @@ grub_normal_print_device_info (const char *name)
if (label && grub_strlen (label)) if (label && grub_strlen (label))
{ {
grub_xputs (" "); grub_xputs (" ");
grub_printf_ (N_("- Label \"%s\""), label); grub_printf_ (N_("- Label `%s'"), label);
} }
grub_free (label); grub_free (label);
} }

2
util/grub-editenv.c
View File

@ -102,7 +102,7 @@ struct argp argp = {
"\n"N_("\ "\n"N_("\
Tool to edit environment block.") Tool to edit environment block.")
"\v"N_("\ "\v"N_("\
If FILENAME is '-', the default value %s is used."), If FILENAME is `-', the default value %s is used."),
NULL, help_filter, NULL NULL, help_filter, NULL
}; };

2
util/grub-install.in
View File

@ -122,7 +122,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo "$1" echo "$1"

2
util/grub-kbdcomp.in
View File

@ -40,7 +40,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1

2
util/grub-mkconfig.in
View File

@ -65,7 +65,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1

2
util/grub-mknetdir.in
View File

@ -81,7 +81,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1

2
util/grub-mkrescue.in
View File

@ -84,7 +84,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1

2
util/grub-mkstandalone.in
View File

@ -77,7 +77,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1

2
util/grub-reboot.in
View File

@ -63,7 +63,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1

2
util/grub-set-default.in
View File

@ -63,7 +63,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1

4
util/grub-setup.c
View File

@ -444,14 +444,14 @@ setup (const char *dir,
if (dest_partmap && !dest_partmap->embed) if (dest_partmap && !dest_partmap->embed)
{ {
grub_util_warn (_("Partition style '%s' doesn't support embedding"), grub_util_warn (_("Partition style `%s' doesn't support embedding"),
dest_partmap->name); dest_partmap->name);
goto unable_to_embed; goto unable_to_embed;
} }
if (fs && !fs->embed) if (fs && !fs->embed)
{ {
grub_util_warn (_("File system '%s' doesn't support embedding"), grub_util_warn (_("File system `%s' doesn't support embedding"),
fs->name); fs->name);
goto unable_to_embed; goto unable_to_embed;
} }

2
util/powerpc/ieee1275/grub-mkrescue.in
View File

@ -64,7 +64,7 @@ argument () {
shift shift
if test $# -eq 0; then if test $# -eq 0; then
gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2 gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
exit 1 exit 1
fi fi
echo $1 echo $1