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.

diff --git a/ChangeLog.gettext2 b/ChangeLog.gettext2
new file mode 100644 (file)
index 0000000..0aee7e2
--- /dev/null
+++ b/ChangeLog.gettext2
@@ -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.

diff --git a/normal/main.c b/normal/main.c
index 748eef80534114ed1249a47be90c55e1d6c54742..afe3667f37ab6dc64db12e6dea4836fc9ad97848 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -29,6 +29,7 @@
 #include <grub/reader.h>
 #include <grub/menu_viewer.h>
 #include <grub/auth.h>
+#include <grub/i18n.h>
 
 #define GRUB_DEFAULT_HISTORY_SIZE      50
 
@@ -508,10 +509,10 @@ grub_normal_reader_init (void)
   grub_normal_init_page ();
   grub_setcursor (1);
 
-  grub_printf ("\
+  grub_printf (_("\
  [ Minimal BASH-like line editing is supported. For the first word, TAB\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." : "");
 
   return 0;

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

diff --git a/normal/menu_text.c b/normal/menu_text.c
index 4ff22e928709bc3783dd592ba23d9d3f7063336e..de28205de740b62233330a94cc1c568244c64e42 100644 (file)
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -39,7 +39,7 @@ static grub_uint8_t grub_color_menu_highlight;
 void
 grub_wait_after_message (void)
 {
-  grub_printf ("\nPress any key to continue...");
+  grub_printf (_("\nPress any key to continue..."));
   (void) grub_getkey ();
   grub_putchar ('\n');
 }
@@ -87,22 +87,22 @@ print_message (int nested, int edit)
 
   if (edit)
     {
-      grub_printf ("\n\
+      grub_printf (_("\n\
       Minimum Emacs-like screen editing is supported. TAB lists\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
     {
       grub_printf (_("\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_printf ("\
+      grub_printf (_("\
       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)
-       grub_printf ("\n\
-      ESC to return previous menu.");
+       grub_printf (_("\n\
+      ESC to return previous menu."));
     }
 }
 
@@ -517,7 +517,7 @@ static void
 notify_booting (grub_menu_entry_t entry,
                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
@@ -527,7 +527,7 @@ static void
 notify_fallback (grub_menu_entry_t entry,
                 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);
 }
 
@@ -541,7 +541,7 @@ notify_execution_failure (void *userdata __attribute__((unused)))
       grub_print_error ();
       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 ();
 }