2009-11-22 Robert Millan <rmh.grub@aybabtu.com>

        * util/i386/pc/grub-mkimage.c: Ungettextize grub_util_info() strings.
        * util/i386/pc/grub-setup.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 79978d3070cca848ea178dd8ea465cebae633ea1..4a26413d42ecbb7dd92b18ff8de50a4d3d761e6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-22  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * util/i386/pc/grub-mkimage.c: Ungettextize grub_util_info() strings.
+       * util/i386/pc/grub-setup.c: Likewise.
+
 2009-11-21  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * util/getroot.c [__GNU__]: Include <hurd.h>, <hurd/lookup.h>, and

diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c
index d675e4f01383926f8b70897bd7f942d129459dd3..785ea8c7185f55c62496fdff35996ae9b155275c 100644 (file)
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@@ -114,14 +114,14 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   if (memdisk_path)
     {
       memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
-      grub_util_info (_("the size of memory disk is 0x%x"), memdisk_size);
+      grub_util_info ("the size of memory disk is 0x%x", memdisk_size);
       total_module_size += memdisk_size + sizeof (struct grub_module_header);
     }
 
   if (config_path)
     {
       config_size = grub_util_get_image_size (config_path) + 1;
-      grub_util_info (_("the size of config file is 0x%x"), config_size);
+      grub_util_info ("the size of config file is 0x%x", config_size);
       total_module_size += config_size + sizeof (struct grub_module_header);
     }
 
@@ -129,7 +129,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     total_module_size += (grub_util_get_image_size (p->name)
                          + sizeof (struct grub_module_header));
 
-  grub_util_info (_("the total module size is 0x%x"), total_module_size);
+  grub_util_info ("the total module size is 0x%x", total_module_size);
 
   kernel_img = xmalloc (kernel_size + total_module_size);
   grub_util_load_image (kernel_path, kernel_img);
@@ -196,7 +196,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   compress_kernel (kernel_img, kernel_size + total_module_size,
                   &core_img, &core_size);
 
-  grub_util_info (_("the core size is 0x%x"), core_size);
+  grub_util_info ("the core size is 0x%x", core_size);
 
 #if defined(GRUB_MACHINE_PCBIOS)
   {

diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 43762c2e445471eeda0612aefe3e250efd8bb4df..f20db1e9a11e7b64e35afb95666d1b1e85a340de 100644 (file)
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -159,7 +159,7 @@ setup (const char *dir,
   void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector, unsigned offset,
                          unsigned length)
     {
-      grub_util_info (_("the first sector is <%llu,%u,%u>"),
+      grub_util_info ("the first sector is <%llu,%u,%u>",
                      sector, offset, length);
 
       if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
@@ -173,7 +173,7 @@ setup (const char *dir,
     {
       struct boot_blocklist *prev = block + 1;
 
-      grub_util_info (_("saving <%llu,%u,%u> with the segment 0x%x"),
+      grub_util_info ("saving <%llu,%u,%u> with the segment 0x%x",
                      sector, offset, length, (unsigned) current_segment);
 
       if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
@@ -244,7 +244,7 @@ setup (const char *dir,
   if (! dest_dev)
     grub_util_error ("%s", grub_errmsg);
 
-  grub_util_info (_("setting the root device to `%s'"), root);
+  grub_util_info ("setting the root device to `%s'", root);
   if (grub_env_set ("root", root) != GRUB_ERR_NONE)
     grub_util_error ("%s", grub_errmsg);
 
@@ -322,7 +322,7 @@ setup (const char *dir,
       bsd_part = grub_le_to_cpu32 (*install_bsd_part);
     }
 
-  grub_util_info (_("dos partition is %d, bsd partition is %d"),
+  grub_util_info ("dos partition is %d, bsd partition is %d",
                  dos_part, bsd_part);
 
   if (! dest_dev->disk->has_partitions)
@@ -378,7 +378,7 @@ setup (const char *dir,
     }
 
 
-  grub_util_info (_("the core image will be embedded at sector 0x%llx"), embed_region.start);
+  grub_util_info ("the core image will be embedded at sector 0x%llx", embed_region.start);
 
   *install_dos_part = grub_cpu_to_le32 (dos_part);
   *install_bsd_part = grub_cpu_to_le32 (bsd_part);
@@ -446,11 +446,11 @@ unable_to_embed:
       if (file)
        {
          if (grub_file_size (file) != core_size)
-           grub_util_info (_("succeeded in opening the core image but the size is different (%d != %d)"),
+           grub_util_info ("succeeded in opening the core image but the size is different (%d != %d)",
                            (int) grub_file_size (file), (int) core_size);
          else if (grub_file_read (file, tmp_img, core_size)
                   != (grub_ssize_t) core_size)
-           grub_util_info (_("succeeded in opening the core image but cannot read %d bytes"),
+           grub_util_info ("succeeded in opening the core image but cannot read %d bytes",
                            (int) core_size);
          else if (memcmp (core_img, tmp_img, core_size) != 0)
            {
@@ -473,7 +473,7 @@ unable_to_embed:
                }
 
 #endif
-             grub_util_info (_("succeeded in opening the core image but the data is different"));
+             grub_util_info ("succeeded in opening the core image but the data is different");
            }
          else
            {
@@ -484,10 +484,10 @@ unable_to_embed:
          grub_file_close (file);
        }
       else
-       grub_util_info (_("couldn't open the core image"));
+       grub_util_info ("couldn't open the core image");
 
       if (grub_errno)
-       grub_util_info (_("error message = %s"), grub_errmsg);
+       grub_util_info ("error message = %s", grub_errmsg);
 
       grub_errno = GRUB_ERR_NONE;
       sync ();
@@ -541,7 +541,7 @@ unable_to_embed:
   *install_bsd_part = grub_cpu_to_le32 (bsd_part);
 
   /* Write the first two sectors of the core image onto the disk.  */
-  grub_util_info (_("opening the core image `%s'"), core_path);
+  grub_util_info ("opening the core image `%s'", core_path);
   fp = fopen (core_path, "r+b");
   if (! fp)
     grub_util_error (_("Cannot open `%s'"), core_path);
@@ -763,7 +763,7 @@ main (int argc, char *argv[])
       root_dev = grub_util_get_grub_dev (grub_guess_root_device (dir ? : DEFAULT_DIRECTORY));
       if (! root_dev)
        {
-         grub_util_info (_("guessing the root device failed, because of `%s'"),
+         grub_util_info ("guessing the root device failed, because of `%s'",
                          grub_errmsg);
          grub_util_error (_("Cannot guess the root device. Specify the option ``--root-device''."));
        }