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

	* loader/efi/appleloader.c: Include `<grub/i18n.h>'.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/efi/chainloader.c: Include `<grub/i18n.h>'.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/i386/efi/linux.c: Include `<grub/i18n.h>'.
	(grub_cmd_linux): Capitalise Linux.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/i386/ieee1275/linux.c: Include `<grub/i18n.h>'.
	(grub_cmd_linux): Capitalise Linux.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/i386/linux.c: Include `<grub/i18n.h>'.
	(grub_cmd_linux): Capitalise Linux.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/i386/pc/chainloader.c: Include `<grub/i18n.h>'.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/i386/pc/linux.c: Include `<grub/i18n.h>'.
	(grub_cmd_linux): Capitalise Linux.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/i386/xnu.c: Include `<grub/i18n.h>'.
	(grub_cpu_xnu_init): Gettextizze.
	* loader/multiboot_loader.c: Include `<grub/i18n.h>'.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/powerpc/ieee1275/linux.c: Include `<grub/i18n.h>'.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/sparc64/ieee1275/linux.c: Include `<grub/i18n.h>'.
	(grub_linux_load64): Capitalise Linux.
	(GRUB_MOD_INIT): Gettextizze.
	* loader/xnu.c: Include `<grub/i18n.h>'.
	(GRUB_MOD_INIT): Gettextizze.
	* po/POTFILES: Add `loader/efi/appleloader.c',
	`loader/efi/chainloader.c', `loader/i386/efi/linux.c',
	`loader/i386/ieee1275/linux.c', `loader/i386/linux.c',
	`loader/i386/pc/chainloader.c', `loader/i386/pc/linux.c',
	`loader/i386/xnu.c', `loader/multiboot_loader.c',
	`loader/powerpc/ieee1275/linux.c', `loader/sparc64/ieee1275/linux.c'
	and `loader/xnu.c'.

diff --git a/ChangeLog b/ChangeLog
index e91e8753642415cfab72e35ba925ade969f755ec..43accdc25d0581dd40aa774941d3e301381411ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2010-01-08  Carles Pina i Estany  <carles@pina.cat>
+
+       * loader/efi/appleloader.c: Include `<grub/i18n.h>'.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/efi/chainloader.c: Include `<grub/i18n.h>'.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/i386/efi/linux.c: Include `<grub/i18n.h>'.
+       (grub_cmd_linux): Capitalise Linux.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/i386/ieee1275/linux.c: Include `<grub/i18n.h>'.
+       (grub_cmd_linux): Capitalise Linux.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/i386/linux.c: Include `<grub/i18n.h>'.
+       (grub_cmd_linux): Capitalise Linux.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/i386/pc/chainloader.c: Include `<grub/i18n.h>'.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/i386/pc/linux.c: Include `<grub/i18n.h>'.
+       (grub_cmd_linux): Capitalise Linux.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/i386/xnu.c: Include `<grub/i18n.h>'.
+       (grub_cpu_xnu_init): Gettextizze.
+       * loader/multiboot_loader.c: Include `<grub/i18n.h>'.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/powerpc/ieee1275/linux.c: Include `<grub/i18n.h>'.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/sparc64/ieee1275/linux.c: Include `<grub/i18n.h>'.
+       (grub_linux_load64): Capitalise Linux.
+       (GRUB_MOD_INIT): Gettextizze.
+       * loader/xnu.c: Include `<grub/i18n.h>'.
+       (GRUB_MOD_INIT): Gettextizze.
+       * po/POTFILES: Add `loader/efi/appleloader.c',
+       `loader/efi/chainloader.c', `loader/i386/efi/linux.c',
+       `loader/i386/ieee1275/linux.c', `loader/i386/linux.c',
+       `loader/i386/pc/chainloader.c', `loader/i386/pc/linux.c',
+       `loader/i386/xnu.c', `loader/multiboot_loader.c',
+       `loader/powerpc/ieee1275/linux.c', `loader/sparc64/ieee1275/linux.c'
+       and `loader/xnu.c'.
+
 2010-01-08  Robert Millan  <rmh.grub@aybabtu.com>
 
        * src/mkisofs.c: Remove `ifdef linux' portability kludge.

diff --git a/loader/efi/appleloader.c b/loader/efi/appleloader.c
index 114a0a506445d170093007a2dce2e1fdc6c723da..dc42683a6536ccffcf5222139e347d948e7ed0e0 100644 (file)
--- a/loader/efi/appleloader.c
+++ b/loader/efi/appleloader.c
@@ -25,6 +25,7 @@
 #include <grub/efi/api.h>
 #include <grub/efi/efi.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_dl_t my_mod;
 
@@ -321,7 +322,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(appleloader)
 {
   cmd = grub_register_command ("appleloader", grub_cmd_appleloader,
-                              "[OPTS]", "Boot legacy system.");
+                              "[OPTS]", N_("Boot legacy system."));
   my_mod = mod;
 }
 

diff --git a/loader/efi/chainloader.c b/loader/efi/chainloader.c
index 559c3f52ae2c1c084becc955a1831098a6bf107a..a095ad9317b09325c70fc0b587a86f40910c565d 100644 (file)
--- a/loader/efi/chainloader.c
+++ b/loader/efi/chainloader.c
@@ -33,6 +33,7 @@
 #include <grub/efi/efi.h>
 #include <grub/efi/disk.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_dl_t my_mod;
 
@@ -336,7 +337,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(chainloader)
 {
   cmd = grub_register_command ("chainloader", grub_cmd_chainloader,
-                              0, "Load another boot loader.");
+                              0, N_("Load another boot loader."));
   my_mod = mod;
 }
 

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 1c256e377d3a8688824758f4378eaf70ad8ee44c..848c1ef7d1e49acab36d0c9d6d1070210324b0ea 100644 (file)
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -33,6 +33,7 @@
 #include <grub/pci.h>
 #include <grub/command.h>
 #include <grub/memory.h>
+#include <grub/i18n.h>
 
 #define GRUB_LINUX_CL_OFFSET           0x1000
 #define GRUB_LINUX_CL_END_OFFSET       0x2000
@@ -619,7 +620,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
     {
-      grub_error (GRUB_ERR_READ_ERROR, "cannot read the linux header");
+      grub_error (GRUB_ERR_READ_ERROR, "cannot read the Linux header");
       goto fail;
     }
 
@@ -989,9 +990,9 @@ static grub_command_t cmd_linux, cmd_initrd;
 GRUB_MOD_INIT(linux)
 {
   cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-                                    0, "Load Linux.");
+                                    0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-                                     0, "Load initrd.");
+                                     0, N_("Load initrd."));
   my_mod = mod;
 }
 

diff --git a/loader/i386/ieee1275/linux.c b/loader/i386/ieee1275/linux.c
index e8a6f1a52036bd18ba46e1ebe9ac2f6d7b8feb08..7d556ee00e3c53fc1e8cc9fb11c50f96bb2c60bc 100644 (file)
--- a/loader/i386/ieee1275/linux.c
+++ b/loader/i386/ieee1275/linux.c
@@ -32,6 +32,7 @@
 #include <grub/cpu/linux.h>
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 #define GRUB_OFW_LINUX_PARAMS_ADDR     0x90000
 #define GRUB_OFW_LINUX_KERNEL_ADDR     0x100000
@@ -165,7 +166,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
     {
-      grub_error (GRUB_ERR_READ_ERROR, "cannot read the linux header");
+      grub_error (GRUB_ERR_READ_ERROR, "cannot read the Linux header");
       goto fail;
     }
 
@@ -276,9 +277,9 @@ static grub_command_t cmd_linux, cmd_initrd;
 GRUB_MOD_INIT(linux)
 {
   cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-                                    0, "Load Linux.");
+                                    0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-                                     0, "Load initrd.");
+                                     0, N_("Load initrd."));
   my_mod = mod;
 }
 

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 8992167834ba1cd662b016db299c01372b11164d..4375a1162933d529b7277abbc7cc29018e67ec5d 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -33,6 +33,7 @@
 #include <grub/video_fb.h>
 #include <grub/command.h>
 #include <grub/i386/pc/vbe.h>
+#include <grub/i18n.h>
 
 #define GRUB_LINUX_CL_OFFSET           0x1000
 #define GRUB_LINUX_CL_END_OFFSET       0x2000
@@ -613,7 +614,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
     {
-      grub_error (GRUB_ERR_READ_ERROR, "cannot read the linux header");
+      grub_error (GRUB_ERR_READ_ERROR, "cannot read the Linux header");
       goto fail;
     }
 
@@ -982,9 +983,9 @@ static grub_command_t cmd_linux, cmd_initrd;
 GRUB_MOD_INIT(linux)
 {
   cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-                                    0, "Load Linux.");
+                                    0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-                                     0, "Load initrd.");
+                                     0, N_("Load initrd."));
   my_mod = mod;
 }
 

diff --git a/loader/i386/pc/chainloader.c b/loader/i386/pc/chainloader.c
index a153d80a9bb3b2f5f23107a9a47983efa9d46757..81cfddac1ef0fc4ceaaac8530d24f057bb6df5b4 100644 (file)
--- a/loader/i386/pc/chainloader.c
+++ b/loader/i386/pc/chainloader.c
@@ -32,6 +32,7 @@
 #include <grub/dl.h>
 #include <grub/command.h>
 #include <grub/machine/biosnum.h>
+#include <grub/i18n.h>
 
 static grub_dl_t my_mod;
 static int boot_drive;
@@ -146,7 +147,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(chainloader)
 {
   cmd = grub_register_command ("chainloader", grub_cmd_chainloader,
-                              0, "Load another boot loader.");
+                              0, N_("Load another boot loader."));
   my_mod = mod;
 }
 

diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index 77b7966bfdf5395347a0dae7ca251abc566ae79b..24bb395555e1381ebf453812c1768d0cc097627b 100644 (file)
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -30,6 +30,7 @@
 #include <grub/dl.h>
 #include <grub/cpu/linux.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 #define GRUB_LINUX_CL_OFFSET           0x9000
 #define GRUB_LINUX_CL_END_OFFSET       0x90FF
@@ -81,7 +82,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
     {
-      grub_error (GRUB_ERR_READ_ERROR, "cannot read the linux header");
+      grub_error (GRUB_ERR_READ_ERROR, "cannot read the Linux header");
       goto fail;
     }
 
@@ -383,10 +384,10 @@ GRUB_MOD_INIT(linux16)
 {
   cmd_linux =
     grub_register_command ("linux16", grub_cmd_linux,
-                          0, "Load Linux.");
+                          0, N_("Load Linux."));
   cmd_initrd =
     grub_register_command ("initrd16", grub_cmd_initrd,
-                          0, "Load initrd.");
+                          0, N_("Load initrd."));
   my_mod = mod;
 }
 

diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index f71e2c306f949e4901f3bb7316ba29f6e77e768f..23a8a6f7b65b0c4b0c82a0f572b79e0d55fc47f8 100644 (file)
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -32,6 +32,7 @@
 #include <grub/term.h>
 #include <grub/command.h>
 #include <grub/gzio.h>
+#include <grub/i18n.h>
 
 char grub_xnu_cmdline[1024];
 grub_uint32_t grub_xnu_heap_will_be_at;
@@ -1026,7 +1027,7 @@ grub_cpu_xnu_init (void)
 {
   cmd_devprop_load = grub_register_command ("xnu_devprop_load",
                                            grub_cmd_devprop_load,
-                                           0, "Load device-properties dump.");
+                                           0, N_("Load device-properties dump."));
 }
 
 void

diff --git a/loader/multiboot_loader.c b/loader/multiboot_loader.c
index 790f14d9aa55690c579b0e556c64f22364677212..6d042fa8198a235fa9138d666143c71efc0cd954 100644 (file)
--- a/loader/multiboot_loader.c
+++ b/loader/multiboot_loader.c
@@ -26,6 +26,7 @@
 #include <grub/misc.h>
 #include <grub/gzio.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 grub_dl_t my_mod;
 
@@ -129,15 +130,15 @@ GRUB_MOD_INIT(multiboot)
   cmd_multiboot =
 #ifdef GRUB_USE_MULTIBOOT2
     grub_register_command ("multiboot2", grub_cmd_multiboot_loader,
-                          0, "Load a multiboot 2 kernel.");
+                          0, N_("Load a multiboot 2 kernel."));
 #else
     grub_register_command ("multiboot", grub_cmd_multiboot_loader,
-                          0, "Load a multiboot kernel.");
+                          0, N_("Load a multiboot kernel."));
 #endif
 
   cmd_module =
     grub_register_command ("module", grub_cmd_module_loader,
-                          0, "Load a multiboot module.");
+                          0, N_("Load a multiboot module."));
 
   my_mod = mod;
 }

diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c
index 085f5c026e3a3aa7e024b42957edaddcd2ccd2bb..39ba2ad0ac1b086dca1dd9839c0b977344abef81 100644 (file)
--- a/loader/powerpc/ieee1275/linux.c
+++ b/loader/powerpc/ieee1275/linux.c
@@ -26,6 +26,7 @@
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/machine/loader.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 #define ELF32_LOADMASK (0xc0000000UL)
 #define ELF64_LOADMASK (0xc000000000000000ULL)
@@ -349,9 +350,9 @@ static grub_command_t cmd_linux, cmd_initrd;
 GRUB_MOD_INIT(linux)
 {
   cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-                                    0, "Load Linux.");
+                                    0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-                                     0, "Load initrd.");
+                                     0, N_("Load initrd."));
   my_mod = mod;
 }
 

diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 6ffad202e69792e641057adb567ee0a00d4361ec..4d5723c19829ad4aec996c50983698ce3f038314 100644 (file)
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -27,6 +27,7 @@
 #include <grub/machine/loader.h>
 #include <grub/gzio.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_dl_t my_mod;
 
@@ -263,7 +264,7 @@ grub_linux_load64 (grub_elf_t elf)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
                       "couldn't map physical memory");
 
-  grub_dprintf ("loader", "Loading linux at vaddr 0x%lx, paddr 0x%lx, size 0x%lx\n",
+  grub_dprintf ("loader", "Loading Linux at vaddr 0x%lx, paddr 0x%lx, size 0x%lx\n",
                linux_addr, paddr, linux_size);
 
   linux_paddr = paddr;
@@ -516,9 +517,9 @@ GRUB_MOD_INIT(linux)
   fetch_translations ();
 
   cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-                                    0, "Load Linux.");
+                                    0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-                                     0, "Load initrd.");
+                                     0, N_("Load initrd."));
   my_mod = mod;
 }
 

diff --git a/loader/xnu.c b/loader/xnu.c
index f3ae3888a0de29532fec49124d2e7efd972de2e7..c3dcee3edf4f6e3f5bfe282e1af11daa406f398f 100644 (file)
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -32,6 +32,7 @@
 #include <grub/command.h>
 #include <grub/misc.h>
 #include <grub/env.h>
+#include <grub/i18n.h>
 
 struct grub_xnu_devtree_key *grub_xnu_devtree_root = 0;
 static int driverspackagenum = 0;
@@ -1404,25 +1405,25 @@ static grub_command_t cmd_kextdir, cmd_ramdisk, cmd_resume, cmd_splash;
 GRUB_MOD_INIT(xnu)
 {
   cmd_kernel = grub_register_command ("xnu_kernel", grub_cmd_xnu_kernel, 0,
-                                     "Load XNU image.");
+                                     N_("Load XNU image."));
   cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64,
-                                       0, "Load 64-bit XNU image.");
+                                       0, N_("Load 64-bit XNU image."));
   cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0,
-                                    "Load XNU extension package.");
+                                    N_("Load XNU extension package."));
   cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0,
-                                   "Load XNU extension.");
+                                   N_("Load XNU extension."));
   cmd_kextdir = grub_register_command ("xnu_kextdir", grub_cmd_xnu_kextdir,
-                                      "DIRECTORY [OSBundleRequired]",
-                                      "Load XNU extension directory.");
+                                      N_("DIRECTORY [OSBundleRequired]"),
+                                      N_("Load XNU extension directory."));
   cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0,
-                                      "Load XNU ramdisk. "
-                                      "It will be seen as md0.");
+                                      N_("Load XNU ramdisk. "
+                                      "It will be seen as md0."));
   cmd_splash = grub_register_command ("xnu_splash", grub_cmd_xnu_splash, 0,
-                                     "Load a splash image for XNU.");
+                                     N_("Load a splash image for XNU."));
 
 #ifndef GRUB_UTIL
   cmd_resume = grub_register_command ("xnu_resume", grub_cmd_xnu_resume,
-                                     0, "Load XNU hibernate image.");
+                                     0, N_("Load XNU hibernate image."));
 #endif
 
   grub_cpu_xnu_init ();

diff --git a/po/POTFILES b/po/POTFILES
index c4ae9d56209f536cfb57849f594ebd86aadf9a93..32927256c26e0e2256869af4cd18b26d18744a71 100644 (file)
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -53,7 +53,19 @@ hello/hello.c
 
 lib/arg.c
 
+loader/efi/appleloader.c
+loader/efi/chainloader.c
 loader/i386/bsd.c
+loader/i386/efi/linux.c
+loader/i386/ieee1275/linux.c
+loader/i386/linux.c
+loader/i386/pc/chainloader.c
+loader/i386/pc/linux.c
+loader/i386/xnu.c
+loader/multiboot_loader.c
+loader/powerpc/ieee1275/linux.c
+loader/sparc64/ieee1275/linux.c
+loader/xnu.c
 
 normal/auth.c
 normal/color.c