Hello,
Attached a patch that would gettextize some files under normal (but not
the conflictive string, I will implement it later).
Tell how it looks, if you would merge it now or later, etc.
Thanks,
--
Carles Pina i Estany
http://pinux.info
=== added file 'ChangeLog.gettext2'
--- ChangeLog.gettext2 1970-01-01 00:00:00 +0000
+++ ChangeLog.gettext2 2009-11-22 22:24:34 +0000
@@ -0,0 +1,5 @@
+2009-11-22 Carles Pina i Estany <car...@pina.cat>
+
+ * normal/menu_text.c: Gettexttize but not print_timeout function.
+ * normal/main.c: Gettexttize.
+ * normal/menu_entry.c: Likewise.
=== modified file 'normal/main.c'
--- normal/main.c 2009-08-24 23:55:06 +0000
+++ normal/main.c 2009-11-22 22:17:17 +0000
@@ -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_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;
=== modified file 'normal/menu_entry.c'
--- normal/menu_entry.c 2009-08-24 23:55:06 +0000
+++ normal/menu_entry.c 2009-11-22 22:19:14 +0000
@@ -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 @@
}
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_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 ();
}
=== modified file 'normal/menu_text.c'
--- normal/menu_text.c 2009-11-22 21:41:33 +0000
+++ normal/menu_text.c 2009-11-22 22:24:03 +0000
@@ -39,7 +39,7 @@
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 @@
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 @@
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 @@
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 @@
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 ();
}
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
