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

2009-11-22 Carles Pina i Estany <carles@pina.cat>

Browse source 
* normal/menu_text.c: Gettexttize but not print_timeout function.
	* normal/main.c: Gettexttize.
	* normal/menu_entry.c: Likewise.
This commit is contained in:
Carles Pina i Estany 2009-11-22 22:24:54 +00:00
parent 4baf87d9e4
commit 4d1f668fd9
4 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog.gettext2 Normal file
View file

@ -0,0 +1,5 @@
2009-11-22 Carles Pina i Estany <carles@pina.cat>
* normal/menu_text.c: Gettexttize but not print_timeout function.
* normal/main.c: Gettexttize.
* normal/menu_entry.c: Likewise.

5
normal/main.c
View file

@ -29,6 +29,7 @@
#include <grub/reader.h> #include <grub/reader.h>
#include <grub/menu_viewer.h> #include <grub/menu_viewer.h>
#include <grub/auth.h> #include <grub/auth.h>
#include <grub/i18n.h>
#define GRUB_DEFAULT_HISTORY_SIZE 50 #define GRUB_DEFAULT_HISTORY_SIZE 50
@ -508,10 +509,10 @@ grub_normal_reader_init (void)
grub_normal_init_page (); grub_normal_init_page ();
grub_setcursor (1); grub_setcursor (1);
grub_printf ("\ grub_printf (_("\
[ Minimal BASH-like line editing is supported. For the first word, TAB\n\ [ Minimal BASH-like line editing is supported. For the first word, TAB\n\
lists possible command completions. Anywhere else TAB lists possible\n\ lists possible command completions. Anywhere else TAB lists possible\n\
device/file completions.%s ]\n\n", device/file completions.%s ]\n\n"),
reader_nested ? " ESC at any time exits." : ""); reader_nested ? " ESC at any time exits." : "");
return 0; return 0;

5
normal/menu_entry.c
View file

@ -24,6 +24,7 @@
#include <grub/command.h> #include <grub/command.h>
#include <grub/parser.h> #include <grub/parser.h>
#include <grub/auth.h> #include <grub/auth.h>
#include <grub/i18n.h>
enum update_mode enum update_mode
{ {
@ -996,7 +997,7 @@ run (struct screen *screen)
} }
grub_cls (); grub_cls ();
grub_printf (" Booting a command list\n\n"); grub_printf (_(" Booting a command list\n\n"));
/* Execute the script, line for line. */ /* Execute the script, line for line. */
@ -1176,6 +1177,6 @@ grub_menu_entry_run (grub_menu_entry_t entry)
grub_cls (); grub_cls ();
grub_print_error (); grub_print_error ();
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;
grub_printf ("\nPress any key to continue..."); grub_printf (_("\nPress any key to continue..."));
(void) grub_getkey (); (void) grub_getkey ();
} }

20
normal/menu_text.c
View file

@ -39,7 +39,7 @@ static grub_uint8_t grub_color_menu_highlight;
void void
grub_wait_after_message (void) grub_wait_after_message (void)
{ {
grub_printf ("\nPress any key to continue..."); grub_printf (_("\nPress any key to continue..."));
(void) grub_getkey (); (void) grub_getkey ();
grub_putchar ('\n'); grub_putchar ('\n');
} }
@ -87,22 +87,22 @@ print_message (int nested, int edit)
if (edit) if (edit)
{ {
grub_printf ("\n\ grub_printf (_("\n\
Minimum Emacs-like screen editing is supported. TAB lists\n\ Minimum Emacs-like screen editing is supported. TAB lists\n\
completions. Press Ctrl-x to boot, Ctrl-c for a command-line\n\ completions. Press Ctrl-x to boot, Ctrl-c for a command-line\n\
or ESC to return menu."); or ESC to return menu."));
} }
else else
{ {
grub_printf (_("\n\ grub_printf (_("\n\
Use the %C and %C keys to select which entry is highlighted.\n"), Use the %C and %C keys to select which entry is highlighted.\n"),
(grub_uint32_t) GRUB_TERM_DISP_UP, (grub_uint32_t) GRUB_TERM_DISP_DOWN); (grub_uint32_t) GRUB_TERM_DISP_UP, (grub_uint32_t) GRUB_TERM_DISP_DOWN);
grub_printf ("\ grub_printf (_("\
Press enter to boot the selected OS, \'e\' to edit the\n\ Press enter to boot the selected OS, \'e\' to edit the\n\
commands before booting or \'c\' for a command-line."); commands before booting or \'c\' for a command-line."));
if (nested) if (nested)
grub_printf ("\n\ grub_printf (_("\n\
ESC to return previous menu."); ESC to return previous menu."));
} }
} }
@ -517,7 +517,7 @@ static void
notify_booting (grub_menu_entry_t entry, notify_booting (grub_menu_entry_t entry,
void *userdata __attribute__((unused))) void *userdata __attribute__((unused)))
{ {
grub_printf (" Booting \'%s\'\n\n", entry->title); grub_printf (_(" Booting \'%s\'\n\n"), entry->title);
} }
/* Callback invoked when a default menu entry executed because of a timeout /* Callback invoked when a default menu entry executed because of a timeout
@ -527,7 +527,7 @@ static void
notify_fallback (grub_menu_entry_t entry, notify_fallback (grub_menu_entry_t entry,
void *userdata __attribute__((unused))) void *userdata __attribute__((unused)))
{ {
grub_printf ("\n Falling back to \'%s\'\n\n", entry->title); grub_printf (_("\n Falling back to \'%s\'\n\n"), entry->title);
grub_millisleep (DEFAULT_ENTRY_ERROR_DELAY_MS); grub_millisleep (DEFAULT_ENTRY_ERROR_DELAY_MS);
} }
@ -541,7 +541,7 @@ notify_execution_failure (void *userdata __attribute__((unused)))
grub_print_error (); grub_print_error ();
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;
} }
grub_printf ("\n Failed to boot default entries.\n"); grub_printf (_("\n Failed to boot default entries.\n"));
grub_wait_after_message (); grub_wait_after_message ();
} }