2010-01-06 Carles Pina i Estany <carles@pina.cat>

	* kern/err.c: Include `<grub/i18n.h>'.
	(grub_print_error): Add full stop. Gettextizze.
	* loader/i386/bsd.c (grub_netbsd_boot): Change grub_error description.
	(grub_bsd_load_elf): Capitalise ELF.
	(grub_cmd_freebsd_loadenv): Add `s' in error string.
	(grub_cmd_freebsd_module): Likewise.
	(grub_cmd_freebsd_module_elf): Likewise.
	* loader/i386/bsdXX.c (SUFFIX): Capitalise ELF.

diff --git a/ChangeLog b/ChangeLog
index 52cb5d4010d472e56de2bcb555bb3e359eb3dc49..3bd67bfbae2de1ebe7f0ea2f6a27cc2461d559c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-06  Carles Pina i Estany  <carles@pina.cat>
+
+       * kern/err.c: Include `<grub/i18n.h>'.
+       (grub_print_error): Add full stop. Gettextizze.
+       * loader/i386/bsd.c (grub_netbsd_boot): Change grub_error description.
+       (grub_bsd_load_elf): Capitalise ELF.
+       (grub_cmd_freebsd_loadenv): Add `s' in error string.
+       (grub_cmd_freebsd_module): Likewise.
+       (grub_cmd_freebsd_module_elf): Likewise.
+       * loader/i386/bsdXX.c (SUFFIX): Capitalise ELF.
+
 2010-01-06  Carles Pina i Estany  <carles@pina.cat>
 
        * commands/search.c (GRUB_MOD_INIT): Use HELP_MESSAGE.

diff --git a/kern/err.c b/kern/err.c
index 311130154a896cfaf4f88bca2ee26e01345fc099..02d7d879f501ae1be796fcb8475d45d156957edc 100644 (file)
--- a/kern/err.c
+++ b/kern/err.c
@@ -20,6 +20,7 @@
 #include <grub/err.h>
 #include <grub/misc.h>
 #include <stdarg.h>
+#include <grub/i18n.h>
 
 #define GRUB_MAX_ERRMSG                256
 #define GRUB_ERROR_STACK_SIZE  10
@@ -121,7 +122,7 @@ grub_print_error (void)
   do
     {
       if (grub_errno != GRUB_ERR_NONE)
-        grub_err_printf ("error: %s\n", grub_errmsg);
+        grub_err_printf (_("error: %s.\n"), grub_errmsg);
     }
   while (grub_error_pop ());
 

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index d0f0c464b318b0c89334ac1fb27d5dd1170574ca..0785a3fc103758d8815c01f88a7f717945c75c40 100644 (file)
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -680,7 +680,7 @@ grub_netbsd_boot (void)
       + sizeof (struct grub_netbsd_btinfo_mmap_header)
       + count * sizeof (struct grub_netbsd_btinfo_mmap_entry)
       > grub_os_area_addr + grub_os_area_size)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "no memory for boot info");
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
 
   curarg = mmap = (struct grub_netbsd_btinfo_mmap_header *) kern_end;
   pm = (struct grub_netbsd_btinfo_mmap_entry *) (mmap + 1);
@@ -888,7 +888,7 @@ grub_bsd_load_elf (grub_elf_t elf)
       return grub_elf64_load (elf, grub_bsd_elf64_hook, 0, 0);
     }
   else
-    return grub_error (GRUB_ERR_BAD_OS, "invalid elf");
+    return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
 }
 
 static grub_err_t
@@ -1081,7 +1081,7 @@ grub_cmd_freebsd_loadenv (grub_command_t cmd __attribute__ ((unused)),
 
   if (kernel_type != KERNEL_TYPE_FREEBSD)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                      "only FreeBSD support environment");
+                      "only FreeBSD supports environment");
 
   if (argc == 0)
     {
@@ -1175,11 +1175,11 @@ grub_cmd_freebsd_module (grub_command_t cmd __attribute__ ((unused)),
 
   if (kernel_type != KERNEL_TYPE_FREEBSD)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                      "only FreeBSD support module");
+                      "only FreeBSD supports module");
 
   if (!is_elf_kernel)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                      "only ELF kernel support module");
+                      "only ELF kernel supports module");
 
   /* List the current modules if no parameter.  */
   if (!argc)
@@ -1241,11 +1241,11 @@ grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
 
   if (kernel_type != KERNEL_TYPE_FREEBSD)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                      "only FreeBSD support module");
+                      "only FreeBSD supports module");
 
   if (! is_elf_kernel)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                      "only ELF kernel support module");
+                      "only ELF kernel supports module");
 
   /* List the current modules if no parameter.  */
   if (! argc)

diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index 4c1c035a9ce3ffe6f47d85d8818dd3c12f95fcd5..b4d5748212bb0655646c31c1db36a1fe147ad8eb 100644 (file)
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -271,7 +271,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (grub_file_t file, grub_addr_t *kern_end)
       (grub_ssize_t) symsize)
     {
       if (! grub_errno)
-       return grub_error (GRUB_ERR_BAD_OS, "invalid elf");
+       return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
       return grub_errno;
     }
   curload += symsize;
@@ -285,7 +285,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (grub_file_t file, grub_addr_t *kern_end)
       != (grub_ssize_t) strsize)
     {
       if (! grub_errno)
-       return grub_error (GRUB_ERR_BAD_OS, "invalid elf");
+       return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
       return grub_errno;
     }
   curload += strsize;