diff --git a/ChangeLog b/ChangeLog
index 3acc543d4..41f9aeaa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,64 @@
+2010-01-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Use flag-based instead of hook-based video mode selection and "auto"
+	keyword.
+
+	* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
+	(grub_video_set_mode): Changed prototype. All users updated.
+	(grub_video_check_mode_flag): New inline function.
+	* video/video.c (parse_modespec): New function.
+	(grub_video_set_mode): Parse flags and keywords.
+
+2010-01-17  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/misc.c (grub_util_info): Fix the order of the parameters in a
+	fprintf call.
+
+2010-01-16  Grégoire Sutre <gregoire.sutre@gmail.com>
+
+	* genmk.rb (class SCRIPT): Replace option -i of sed by a pipe.
+
+2010-01-16  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
+	string.
+	* util/grub-emu.c (usage): Likewise.
+	* util/grub-mkpasswd-pbkdf2.c (usage): Likewise.
+	* util/i386/efi/grub-mkimage.c (usage): Likewise.
+	* util/i386/pc/grub-mkimage.c (usage): Likewise.
+	* util/i386/pc/grub-setup.c (usage): Likewise.
+
+2010-01-16  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/misc.c (grub_util_warn): Gettextizze, print full stop after
+	the message.
+	(grub_util_info): Likewise.
+	(grub_util_error): Likewise.
+	* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
+	and/or new lines in `grub_util_warna', `grub_util_info',
+	`grub_util_error' calls.
+	* util/getroot.c: Likewise.
+	* util/grub-editenv.c: Likewise.
+	* util/grub-emu.c: Likewise.
+	* util/grub-fstest.c: Likewise.
+	* util/grub-mkdevicemap.c: Likewise.
+	* util/grub-mkfont.c: Likewise.
+	* util/grub-mkpasswd-pbkdf2.c: Likewise.
+	* util/grub-mkrelpath.c: Likewise.
+	* util/grub-pe2elf.c: Likewise.
+	* util/grub-probe.c: Likewise.
+	* util/hostdisk.c: Likewise.
+	* util/i386/efi/grub-mkimage.c: Likewise.
+	* util/i386/pc/grub-mkimage.c: Likewise.
+	* util/i386/pc/grub-setup.c: Likewise.
+	* util/ieee1275/ofpath.c: Likewise.
+	* util/mkisofs/eltorito.c: Likewise.
+	* util/mkisofs/rock.c: Likewise.
+	* util/mkisofs/write.c: Likewise.
+	* util/raid.c: Likewise.
+	* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
+	* util/sparc64/ieee1275/grub-setup.c: Likewise.
+
 2010-01-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Enable multiboot on non-pc.
diff --git a/ChangeLog.videomask b/ChangeLog.videomask
deleted file mode 100644
index 7c58d0b57..000000000
--- a/ChangeLog.videomask
+++ /dev/null
@@ -1,10 +0,0 @@
-2009-11-20  Vladimir Serbinenko  <phcoder@gmail.com>
-
-	Use flag-based instead of hook-based video mode selection and "auto"
-	keyword.
-
-	* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
-	(grub_video_set_mode): Changed prototype. All users updated.
-	(grub_video_check_mode_flag): New inline function.
-	* video/video.c (parse_modespec): New function.
-	(grub_video_set_mode): Parse flags and keywords.
diff --git a/genmk.rb b/genmk.rb
index 810a2f1be..afd1582aa 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -370,8 +370,7 @@ class Script
     "CLEANFILES += #{@name}
 
 #{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
-	./config.status --file=#{name}:#{src}
-	sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $@
+	./config.status --file=-:#{src} | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
 	chmod +x $@
 
 "
diff --git a/include/grub/video.h b/include/grub/video.h
index bba5901d1..fb0151878 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -329,7 +329,4 @@ grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
 grub_video_driver_id_t
 grub_video_get_driver_id (void);
 
-grub_video_driver_id_t
-grub_video_get_driver_id (void);
-
 #endif /* ! GRUB_VIDEO_HEADER */
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 43c2c129b..28f1c685a 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -807,6 +807,7 @@ grub_openbsd_boot (void)
   pa = pa->ba_next;
   pa->ba_type = OPENBSD_BOOTARG_END;
   pa++;
+
   buf = (grub_uint8_t *) pa;
   argbuf_target_end = buf - buf0 + buf_target;
 
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 4a062ecb8..3324be514 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -239,6 +239,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
   grub_size_t mmap_size;
   grub_uint8_t *ptrorig; 
   grub_addr_t ptrdest;
+
   grub_err_t err;
   grub_size_t bufsize;
 
diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index c07238b81..176220a2b 100644
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -64,7 +64,6 @@ grub_linux16_boot (void)
   return grub_relocator16_boot (relocator, state);
 }
 
-
 static grub_err_t
 grub_linux_unload (void)
 {
diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index 6ba8b1ae2..c0736b83f 100644
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -328,7 +328,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s -o FILE [OPTION]... [MODULES]\n\
diff --git a/util/getroot.c b/util/getroot.c
index 22ad7e967..6357c8a26 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -115,14 +115,14 @@ grub_get_prefix (const char *dir)
   saved_cwd = xgetcwd ();
 
   if (chdir (dir) < 0)
-    grub_util_error ("Cannot change directory to `%s'", dir);
+    grub_util_error ("cannot change directory to `%s'", dir);
 
   abs_dir = xgetcwd ();
   strip_extra_slashes (abs_dir);
   prev_dir = xstrdup (abs_dir);
 
   if (stat (".", &prev_st) < 0)
-    grub_util_error ("Cannot stat `%s'", dir);
+    grub_util_error ("cannot stat `%s'", dir);
 
   if (! S_ISDIR (prev_st.st_mode))
     grub_util_error ("`%s' is not a directory", dir);
@@ -130,13 +130,13 @@ grub_get_prefix (const char *dir)
   while (1)
     {
       if (chdir ("..") < 0)
-	grub_util_error ("Cannot change directory to the parent");
+	grub_util_error ("cannot change directory to the parent");
 
       if (stat (".", &st) < 0)
-	grub_util_error ("Cannot stat current directory");
+	grub_util_error ("cannot stat current directory");
 
       if (! S_ISDIR (st.st_mode))
-	grub_util_error ("Current directory is not a directory???");
+	grub_util_error ("current directory is not a directory???");
 
       if (prev_st.st_dev != st.st_dev || prev_st.st_ino == st.st_ino)
 	break;
@@ -153,7 +153,7 @@ grub_get_prefix (const char *dir)
   strip_extra_slashes (prefix);
 
   if (chdir (saved_cwd) < 0)
-    grub_util_error ("Cannot change directory to `%s'", dir);
+    grub_util_error ("cannot change directory to `%s'", dir);
 
 #ifdef __CYGWIN__
   if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
@@ -236,7 +236,7 @@ find_root_device (const char *dir, dev_t dev)
 	  if (res)
 	    {
 	      if (chdir (saved_cwd) < 0)
-		grub_util_error ("Cannot restore the original directory");
+		grub_util_error ("cannot restore the original directory");
 
 	      free (saved_cwd);
 	      closedir (dp);
@@ -279,7 +279,7 @@ find_root_device (const char *dir, dev_t dev)
 		continue;
 
 	  if (chdir (saved_cwd) < 0)
-	    grub_util_error ("Cannot restore the original directory");
+	    grub_util_error ("cannot restore the original directory");
 
 	  free (saved_cwd);
 	  closedir (dp);
@@ -288,7 +288,7 @@ find_root_device (const char *dir, dev_t dev)
     }
 
   if (chdir (saved_cwd) < 0)
-    grub_util_error ("Cannot restore the original directory");
+    grub_util_error ("cannot restore the original directory");
 
   free (saved_cwd);
   closedir (dp);
@@ -445,7 +445,7 @@ grub_guess_root_device (const char *dir)
   struct stat st;
 
   if (stat (dir, &st) < 0)
-    grub_util_error ("Cannot stat `%s'", dir);
+    grub_util_error ("cannot stat `%s'", dir);
 
 #ifdef __CYGWIN__
   /* Cygwin specific function.  */
@@ -591,7 +591,7 @@ grub_util_get_grub_dev (const char *os_dev)
 	  free (p);
 	}
       else
-	grub_util_error ("Unknown kind of RAID device `%s'", os_dev);
+	grub_util_error ("unknown kind of RAID device `%s'", os_dev);
 
       break;
 
@@ -608,7 +608,7 @@ grub_util_check_block_device (const char *blk_dev)
   struct stat st;
 
   if (stat (blk_dev, &st) < 0)
-    grub_util_error ("Cannot stat `%s'", blk_dev);
+    grub_util_error ("cannot stat `%s'", blk_dev);
 
   if (S_ISBLK (st.st_mode))
     return (blk_dev);
@@ -622,7 +622,7 @@ grub_util_check_char_device (const char *blk_dev)
   struct stat st;
 
   if (stat (blk_dev, &st) < 0)
-    grub_util_error ("Cannot stat `%s'", blk_dev);
+    grub_util_error ("cannot stat `%s'", blk_dev);
 
   if (S_ISCHR (st.st_mode))
     return (blk_dev);
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 1fb1422df..f21042c97 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -69,10 +69,10 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``grub-editenv --help'' for more information.\n");
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
-Usage: grub-editenv [OPTIONS] [FILENAME] COMMAND\n\
+Usage: %s [OPTIONS] [FILENAME] COMMAND\n\
 \n\
 Tool to edit environment block.\n\
 \nCommands:\n\
@@ -88,7 +88,7 @@ Tool to edit environment block.\n\
 If not given explicitly, FILENAME defaults to %s.\n\
 \n\
 Report bugs to <%s>.\n",
-DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG, PACKAGE_BUGREPORT);
+program_name, DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG, PACKAGE_BUGREPORT);
 
   exit (status);
 }
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 3f2acaaec..21fc6fa09 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -129,10 +129,10 @@ usage (int status)
 {
   if (status)
     fprintf (stderr,
-	     "Try ``grub-emu --help'' for more information.\n");
+	     "Try `%s --help' for more information.\n", program_name);
   else
     printf (
-      "Usage: grub-emu [OPTION]...\n"
+      "Usage: %s [OPTION]...\n"
       "\n"
       "GRUB emulator.\n"
       "\n"
@@ -144,7 +144,7 @@ usage (int status)
       "  -h, --help                display this message and exit\n"
       "  -V, --version             print version information and exit\n"
       "\n"
-      "Report bugs to <%s>.\n", DEFAULT_DEVICE_MAP, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+      "Report bugs to <%s>.\n", program_name, DEFAULT_DEVICE_MAP, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
   return status;
 }
 
@@ -220,14 +220,14 @@ main (int argc, char *argv[])
     {
       char *device_name = grub_guess_root_device (dir);
       if (! device_name)
-        grub_util_error ("cannot find a device for %s.\n", dir);
+        grub_util_error ("cannot find a device for %s", dir);
 
       root_dev = grub_util_get_grub_dev (device_name);
       if (! root_dev)
 	{
 	  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''.");
+	  grub_util_error ("cannot guess the root device. Specify the option `--root-device'");
 	}
     }
 
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 586dda0f9..4470cbfa5 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -71,7 +71,7 @@ execute_command (char *name, int n, char **args)
 
   cmd = grub_command_find (name);
   if (! cmd)
-    grub_util_error ("Can\'t find command %s", name);
+    grub_util_error ("can\'t find command %s", name);
 
   return (cmd->func) (cmd, n, args);
 }
@@ -100,9 +100,9 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
 
       dev = grub_device_open (0);
       if ((! dev) || (! dev->disk))
-        grub_util_error ("Can\'t open device.");
+        grub_util_error ("can\'t open device");
 
-      grub_util_info ("total sectors : %lld.",
+      grub_util_info ("total sectors : %lld",
                       (unsigned long long) dev->disk->total_sectors);
 
       if (! leng)
@@ -115,7 +115,7 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
           len = (leng > BUF_SIZE) ? BUF_SIZE : leng;
 
           if (grub_disk_read (dev->disk, 0, skip, len, buf))
-            grub_util_error ("Disk read fails at offset %lld, length %d.",
+            grub_util_error ("disk read fails at offset %lld, length %d",
                              skip, len);
 
           if (hook (skip, buf, len))
@@ -132,15 +132,15 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
   file = grub_file_open (pathname);
   if (!file)
     {
-      grub_util_error ("cannot open file %s.", pathname);
+      grub_util_error ("cannot open file %s", pathname);
       return;
     }
 
-  grub_util_info ("file size : %lld.", (unsigned long long) file->size);
+  grub_util_info ("file size : %lld", (unsigned long long) file->size);
 
   if (skip > file->size)
     {
-      grub_util_error ("invalid skip value %lld.", (unsigned long long) skip);
+      grub_util_error ("invalid skip value %lld", (unsigned long long) skip);
       return;
     }
 
@@ -158,7 +158,7 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
       sz = grub_file_read (file, buf, (len > BUF_SIZE) ? BUF_SIZE : len);
       if (sz < 0)
 	{
-	  grub_util_error ("read error at offset %llu.", ofs);
+	  grub_util_error ("read error at offset %llu", ofs);
 	  break;
 	}
 
@@ -184,7 +184,7 @@ cmd_cp (char *src, char *dest)
 
     if ((int) fwrite (buf, 1, len, ff) != len)
       {
-	grub_util_error ("write error.");
+	grub_util_error ("write error");
 	return 1;
       }
 
@@ -194,7 +194,7 @@ cmd_cp (char *src, char *dest)
   ff = fopen (dest, "wb");
   if (ff == NULL)
     {
-      grub_util_error ("open error.");
+      grub_util_error ("open error");
       return;
     }
   read_file (src, cp_hook);
@@ -212,7 +212,7 @@ cmd_cmp (char *src, char *dest)
   {
     if ((int) fread (buf_1, 1, len, ff) != len)
       {
-	grub_util_error ("read error at offset %llu.", ofs);
+	grub_util_error ("read error at offset %llu", ofs);
 	return 1;
       }
 
@@ -223,7 +223,7 @@ cmd_cmp (char *src, char *dest)
 	for (i = 0; i < len; i++, ofs++)
 	  if (buf_1[i] != buf[i])
 	    {
-	      grub_util_error ("compare fail at offset %llu.", ofs);
+	      grub_util_error ("compare fail at offset %llu", ofs);
 	      return 1;
 	    }
       }
@@ -233,12 +233,12 @@ cmd_cmp (char *src, char *dest)
   ff = fopen (dest, "rb");
   if (ff == NULL)
     {
-      grub_util_error ("open error.");
+      grub_util_error ("open error");
       return;
     }
 
   if ((skip) && (fseeko (ff, skip, SEEK_SET)))
-    grub_util_error ("seek error.");
+    grub_util_error ("seek error");
 
   read_file (src, cmp_hook);
   fclose (ff);
@@ -286,13 +286,13 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
   for (i = 0; i < num_disks; i++)
     {
       if (grub_strlen (images[i]) + 7 > sizeof (host_file))
-        grub_util_error ("Pathname %s too long.", images[i]);
+        grub_util_error ("pathname %s too long", images[i]);
 
       grub_sprintf (loop_name, "loop%d", i);
       grub_sprintf (host_file, "(host)%s", images[i]);
 
       if (execute_command ("loopback", 3, argv))
-        grub_util_error ("loopback command fails.");
+        grub_util_error ("loopback command fails");
     }
 
   grub_lvm_fini ();
@@ -349,7 +349,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... IMAGE_PATH COMMANDS\n\
diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index b4febbb8d..c68482af1 100644
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -84,7 +84,7 @@ usage (int status)
 {
   if (status)
     fprintf (stderr,
-	     "Try ``%s --help'' for more information.\n", program_name);
+	     "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]...\n\
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 3d1c6faac..fcd35afd4 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -96,7 +96,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTIONS] FONT_FILES\n\
@@ -347,7 +347,7 @@ write_font (struct grub_font_info *font_info, char *output_file)
 
   file = fopen (output_file, "wb");
   if (! file)
-    grub_util_error ("Can\'t write to file %s.", output_file);
+    grub_util_error ("can\'t write to file %s.", output_file);
 
   offset = 0;
 
@@ -546,7 +546,7 @@ main (int argc, char *argv[])
 
 		  a = strtoul (p, &p, 0);
 		  if (*p != '-')
-		    grub_util_error ("Invalid font range");
+		    grub_util_error ("invalid font range");
 		  b = strtoul (p + 1, &p, 0);
 		  if ((font_info.num_range & (GRUB_FONT_RANGE_BLOCK - 1)) == 0)
 		    font_info.ranges = xrealloc (font_info.ranges,
@@ -561,7 +561,7 @@ main (int argc, char *argv[])
 		  if (*p)
 		    {
 		      if (*p != ',')
-			grub_util_error ("Invalid font range");
+			grub_util_error ("invalid font range");
 		      else
 			p++;
 		    }
@@ -598,7 +598,7 @@ main (int argc, char *argv[])
     }
 
   if (! output_file)
-    grub_util_error ("No output file is specified.");
+    grub_util_error ("no output file is specified");
 
   if (FT_Init_FreeType (&ft_lib))
     grub_util_error ("FT_Init_FreeType fails");
@@ -610,7 +610,7 @@ main (int argc, char *argv[])
 
       if (FT_New_Face (ft_lib, argv[optind], font_index, &ft_face))
 	{
-	  grub_util_info ("Can't open file %s, index %d\n", argv[optind],
+	  grub_util_info ("can't open file %s, index %d", argv[optind],
 			  font_index);
 	  continue;
 	}
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index b27a4e893..82437fdca 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -74,16 +74,16 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``grub-scrypt --help'' for more information.\n");
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
-Usage: grub-scrypt [OPTIONS]\n\
+Usage: %s [OPTIONS]\n\
 \nOptions:\n\
      -c number, --iteration-count=number  Number of PBKDF2 iterations\n\
      -l number, --buflen=number           Length of generated hash\n\
      -s number, --salt=number             Length of salt\n\
 \n\
-Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
 
   exit (status);
 }
@@ -165,12 +165,12 @@ main (int argc, char *argv[])
 
   bufhex = malloc (buflen * 2 + 1);
   if (!bufhex)
-    grub_util_error ("Out of memory");
+    grub_util_error ("out of memory");
   buf = malloc (buflen);
   if (!buf)
     {
       free (bufhex);
-      grub_util_error ("Out of memory");
+      grub_util_error ("out of memory");
     }
 
   salt = malloc (saltlen);
@@ -178,7 +178,7 @@ main (int argc, char *argv[])
     {
       free (bufhex);
       free (buf);
-      grub_util_error ("Out of memory");
+      grub_util_error ("out of memory");
     }
   salthex = malloc (saltlen * 2 + 1);
   if (!salthex)
@@ -186,7 +186,7 @@ main (int argc, char *argv[])
       free (salt);
       free (bufhex);
       free (buf);
-      grub_util_error ("Out of memory");
+      grub_util_error ("out of memory");
     }
 
   /* Disable echoing. Based on glibc.  */
@@ -225,7 +225,7 @@ main (int argc, char *argv[])
       /* Restore the original setting.  */
       if (tty_changed)
 	(void) tcsetattr (fileno (in), TCSAFLUSH, &s);
-      grub_util_error ("Failure to read password");
+      grub_util_error ("failure to read password");
     }
   if (nr >= 1 && pass1[nr-1] == '\n')
     pass1[nr-1] = 0;
@@ -249,7 +249,7 @@ main (int argc, char *argv[])
       free (bufhex);
       free (salthex);
       free (salt);
-      grub_util_error ("Failure to read password");
+      grub_util_error ("failure to read password");
     }
   if (nr >= 1 && pass2[nr-1] == '\n')
     pass2[nr-1] = 0;
@@ -264,7 +264,7 @@ main (int argc, char *argv[])
       free (bufhex);
       free (salthex);
       free (salt);
-      grub_util_error ("Passwords don't match");
+      grub_util_error ("passwords don't match");
     }
   memset (pass2, 0, strlen (pass2));
   free (pass2);
@@ -286,7 +286,7 @@ main (int argc, char *argv[])
 	free (salthex);
 	free (salt);
 	fclose (f);
-	grub_util_error ("Couldn't retrieve random data for salt");
+	grub_util_error ("couldn't retrieve random data for salt");
       }
     rd = fread (salt, 1, saltlen, f);
     if (rd != saltlen)
@@ -299,7 +299,7 @@ main (int argc, char *argv[])
 	free (salthex);
 	free (salt);
 	fclose (f);
-	grub_util_error ("Couldn't retrieve random data for salt");
+	grub_util_error ("couldn't retrieve random data for salt");
       }
     fclose (f);
   }
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
       memset (salthex, 0, 2 * saltlen);
       free (salt);
       free (salthex);
-      grub_util_error ("Cryptographic error number %d", gcry_err);
+      grub_util_error ("cryptographic error number %d", gcry_err);
     }
 
   hexify (bufhex, buf, buflen);
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index 62e400814..327f0c866 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -34,7 +34,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTIONS] PATH\n\
diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
index fb370d9ec..488ad9b23 100644
--- a/util/grub-pe2elf.c
+++ b/util/grub-pe2elf.c
@@ -40,7 +40,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTIONS] input [output]\n\
@@ -182,7 +182,7 @@ write_section_data (FILE* fp, char *image,
           char name[5 + strlen (pe_shdr->name)];
 
           if (num_sections >= MAX_SECTIONS)
-            grub_util_error ("Too many sections");
+            grub_util_error ("too many sections");
 
           sprintf (name, ".rel%s", pe_shdr->name);
 
@@ -230,14 +230,14 @@ write_reloc_section (FILE* fp, char *image,
 
           if ((pe_rel->symtab_index >= pe_chdr->num_symbols) ||
               (symtab_map[pe_rel->symtab_index] == -1))
-            grub_util_error ("Invalid symbol");
+            grub_util_error ("invalid symbol");
 
           if (pe_rel->type == GRUB_PE32_REL_I386_DIR32)
             type = R_386_32;
           else if (pe_rel->type == GRUB_PE32_REL_I386_REL32)
             type = R_386_PC32;
           else
-            grub_util_error ("Unknown pe relocation type %d\n", pe_rel->type);
+            grub_util_error ("unknown pe relocation type %d\n", pe_rel->type);
 
           ofs = pe_rel->offset - pe_sec->virtual_address;
           addr = (grub_uint32_t *)(image + pe_sec->raw_data_offset + ofs);
@@ -248,14 +248,14 @@ write_reloc_section (FILE* fp, char *image,
               code = image[pe_sec->raw_data_offset + ofs - 1];
 
               if (((code != 0xe8) && (code != 0xe9)) || (*addr))
-                grub_util_error ("Invalid relocation (%x %x)", code, *addr);
+                grub_util_error ("invalid relocation (%x %x)", code, *addr);
 
               modified = 1;
               if (symtab[symtab_map[pe_rel->symtab_index]].st_shndx)
                 {
                   if (symtab[symtab_map[pe_rel->symtab_index]].st_shndx
                       != shdr[i].sh_info)
-                    grub_util_error ("Cross section call is not allowed");
+                    grub_util_error ("cross section call is not allowed");
 
                   *addr = (symtab[symtab_map[pe_rel->symtab_index]].st_value
                            - ofs - 4);
@@ -440,7 +440,7 @@ convert_pe (FILE* fp, char *image)
 
   pe_chdr = (struct grub_pe32_coff_header *) image;
   if (grub_le_to_cpu16 (pe_chdr->machine) != GRUB_PE32_MACHINE_I386)
-    grub_util_error ("Invalid coff image");
+    grub_util_error ("invalid coff image");
 
   strtab = xmalloc (STRTAB_BLOCK);
   strtab_max = STRTAB_BLOCK;
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 4ba8a98e5..879098542 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -84,7 +84,7 @@ probe_partmap (grub_disk_t disk)
 {
   if (disk->partition == NULL)
     {
-      grub_util_info ("No partition map found for %s", disk->name);
+      grub_util_info ("no partition map found for %s", disk->name);
       return;
     }
 
@@ -113,17 +113,17 @@ probe (const char *path, char *device_name)
     {
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
       if (! grub_util_check_char_device (device_name))
-        grub_util_error ("%s is not a character device.\n", device_name);
+        grub_util_error ("%s is not a character device", device_name);
 #else
       if (! grub_util_check_block_device (device_name))
-        grub_util_error ("%s is not a block device.\n", device_name);
+        grub_util_error ("%s is not a block device", device_name);
 #endif
     }
   else
     device_name = grub_guess_root_device (path);
 
   if (! device_name)
-    grub_util_error ("cannot find a device for %s (is /dev mounted?).\n", path);
+    grub_util_error ("cannot find a device for %s (is /dev mounted?)", path);
 
   if (print == PRINT_DEVICE)
     {
@@ -133,7 +133,7 @@ probe (const char *path, char *device_name)
 
   drive_name = grub_util_get_grub_dev (device_name);
   if (! drive_name)
-    grub_util_error ("Cannot find a GRUB drive for %s.  Check your device.map.\n", device_name);
+    grub_util_error ("cannot find a GRUB drive for %s.  Check your device.map", device_name);
 
   if (print == PRINT_DRIVE)
     {
@@ -309,7 +309,7 @@ usage (int status)
 {
   if (status)
     fprintf (stderr,
-	     "Try ``%s --help'' for more information.\n", program_name);
+	     "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... [PATH|DEVICE]\n\
diff --git a/util/hostdisk.c b/util/hostdisk.c
index c94f4237e..603445801 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -568,7 +568,7 @@ read_device_map (const char *dev_map)
   fp = fopen (dev_map, "r");
   if (! fp)
     {
-      grub_util_info (_("Cannot open `%s'"), dev_map);
+      grub_util_info (_("cannot open `%s'"), dev_map);
       return;
     }
 
@@ -639,7 +639,7 @@ read_device_map (const char *dev_map)
 	 symbolic links.  */
       map[drive].device = xmalloc (PATH_MAX);
       if (! realpath (p, map[drive].device))
-	grub_util_error ("Cannot get the real path of `%s'", p);
+	grub_util_error ("cannot get the real path of `%s'", p);
 #else
       map[drive].device = xstrdup (p);
 #endif
diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c
index 7f5141531..f8c0f152e 100644
--- a/util/i386/efi/grub-mkimage.c
+++ b/util/i386/efi/grub-mkimage.c
@@ -778,7 +778,7 @@ make_reloc_section (FILE *out, Elf_Addr current_address, Elf_Ehdr *e,
 	    if ((ELF_R_TYPE (info) == R_X86_64_32) ||
                 (ELF_R_TYPE (info) == R_X86_64_32S))
 	      {
-		grub_util_error ("Can\'t add fixup entry for R_X86_64_32(S)");
+		grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
 	      }
 	    else if (ELF_R_TYPE (info) == R_X86_64_64)
 	      {
@@ -1029,10 +1029,10 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``grub-mkimage --help'' for more information.\n");
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
-Usage: grub-mkimage -o FILE [OPTION]... [MODULES]\n\
+Usage: %s -o FILE [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
 \n\
@@ -1044,7 +1044,7 @@ Make a bootable image of GRUB.\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-", GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+", program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
 
   exit (status);
 }
diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c
index ebf1bc7ff..16b2c6619 100644
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@@ -289,7 +289,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 #ifdef GRUB_MACHINE_PCBIOS
   if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
-    grub_util_error (_("Core image is too big (%p > %p)\n"),
+    grub_util_error (_("core image is too big (%p > %p)"),
  		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size, GRUB_MEMORY_MACHINE_UPPER);
 #endif
 
@@ -326,10 +326,10 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
+    fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);
   else
     printf (_("\
-Usage: grub-mkimage [OPTION]... [MODULES]\n\
+Usage: %s [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
 \n\
@@ -343,7 +343,7 @@ Make a bootable image of GRUB.\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-"), GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+"), program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
 
   exit (status);
 }
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 909a521eb..4e2517ef2 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -156,7 +156,7 @@ setup (const char *dir,
 		      sector, offset, length);
 
       if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error (_("The first sector of the core file is not sector-aligned"));
+	grub_util_error (_("the first sector of the core file is not sector-aligned"));
 
       first_sector = sector;
     }
@@ -170,7 +170,7 @@ setup (const char *dir,
 		      sector, offset, length, (unsigned) current_segment);
 
       if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error (_("Non-sector-aligned data is found in the core file"));
+	grub_util_error (_("non-sector-aligned data is found in the core file"));
 
       if (block != first_block
 	  && (grub_le_to_cpu64 (prev->start)
@@ -184,7 +184,7 @@ setup (const char *dir,
 
 	  block--;
 	  if (block->len)
-	    grub_util_error (_("The sectors of the core file are too fragmented"));
+	    grub_util_error (_("the sectors of the core file are too fragmented"));
 	}
 
       last_length = length;
@@ -195,7 +195,7 @@ setup (const char *dir,
   boot_path = grub_util_get_path (dir, boot_file);
   boot_size = grub_util_get_image_size (boot_path);
   if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("The size of `%s' is not %u"),
+    grub_util_error (_("the size of `%s' is not %u"),
 		     boot_path, GRUB_DISK_SECTOR_SIZE);
   boot_img = grub_util_read_image (boot_path);
   free (boot_path);
@@ -212,9 +212,9 @@ setup (const char *dir,
   core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
 		  >> GRUB_DISK_SECTOR_BITS);
   if (core_size < GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("The size of `%s' is too small"), core_path);
+    grub_util_error (_("the size of `%s' is too small"), core_path);
   else if (core_size > 0xFFFF * GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("The size of `%s' is too large"), core_path);
+    grub_util_error (_("the size of `%s' is too large"), core_path);
 
   core_img = grub_util_read_image (core_path);
 
@@ -251,7 +251,7 @@ setup (const char *dir,
       grub_fs_t fs;
       fs = grub_fs_probe (dest_dev);
       if (! fs)
-	grub_util_error (_("Unable to identify a filesystem in %s; safety check can't be performed"),
+	grub_util_error (_("unable to identify a filesystem in %s; safety check can't be performed"),
 			 dest_dev->disk->name);
 
       if (! fs->reserved_first_sector)
@@ -304,7 +304,7 @@ setup (const char *dir,
 	      bsd_part = -1;
 	    }
 	  else
-	    grub_util_error (_("No DOS-style partitions found"));
+	    grub_util_error (_("no DOS-style partitions found"));
 	}
       else
 	dos_part = bsd_part = -1;
@@ -413,14 +413,14 @@ setup (const char *dir,
 unable_to_embed:
 
   if (must_embed)
-    grub_util_error (_("Embedding is not possible, but this is required when "
-		       "the root device is on a RAID array or LVM volume."));
+    grub_util_error (_("embedding is not possible, but this is required when "
+		       "the root device is on a RAID array or LVM volume"));
 
   grub_util_warn (_("Embedding is not possible.  GRUB can only be installed in this "
 		    "setup by using blocklists.  However, blocklists are UNRELIABLE and "
 		    "its use is discouraged."));
   if (! force)
-    grub_util_error (_("If you really want blocklists, use --force."));
+    grub_util_error (_("if you really want blocklists, use --force"));
 
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
@@ -495,7 +495,7 @@ unable_to_embed:
     }
 
   if (i == MAX_TRIES)
-    grub_util_error (_("Cannot read `%s' correctly"), core_path_dev);
+    grub_util_error (_("cannot read `%s' correctly"), core_path_dev);
 
   /* Clean out the blocklists.  */
   block = first_block;
@@ -508,7 +508,7 @@ unable_to_embed:
       block--;
 
       if ((char *) block <= core_img)
-	grub_util_error (_("No terminator in the core image"));
+	grub_util_error (_("no terminator in the core image"));
     }
 
   /* Now read the core image to determine where the sectors are.  */
@@ -519,13 +519,13 @@ unable_to_embed:
   file->read_hook = save_first_sector;
   if (grub_file_read (file, tmp_img, GRUB_DISK_SECTOR_SIZE)
       != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("Failed to read the first sector of the core image"));
+    grub_util_error (_("failed to read the first sector of the core image"));
 
   block = first_block;
   file->read_hook = save_blocklists;
   if (grub_file_read (file, tmp_img, core_size - GRUB_DISK_SECTOR_SIZE)
       != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("Failed to read the rest sectors of the core image"));
+    grub_util_error (_("failed to read the rest sectors of the core image"));
 
   grub_file_close (file);
 
@@ -544,7 +544,7 @@ unable_to_embed:
   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);
+    grub_util_error (_("cannot open `%s'"), core_path);
 
   grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE * 2, fp);
   fclose (fp);
@@ -584,13 +584,13 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
+    fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);
   else
     printf (_("\
-Usage: grub-setup [OPTION]... DEVICE\n\
+Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
-DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
+DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
@@ -605,6 +605,7 @@ DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
 \n\
 Report bugs to <%s>.\n\
 "),
+	    program_name,
 	    DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY,
 	    DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
 
@@ -751,7 +752,7 @@ main (int argc, char *argv[])
       char *tmp = get_device_name (root_dev);
 
       if (! tmp)
-	grub_util_error (_("Invalid root device `%s'"), root_dev);
+	grub_util_error (_("invalid root device `%s'"), root_dev);
 
       tmp = xstrdup (tmp);
       free (root_dev);
@@ -764,7 +765,7 @@ main (int argc, char *argv[])
 	{
 	  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''."));
+	  grub_util_error (_("cannot guess the root device. Specify the option `--root-device'"));
 	}
     }
 
diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c
index e90488fc3..79a0e8be5 100644
--- a/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@ -131,12 +131,12 @@ block_device_get_sysfs_path_and_link(const char *devicenode,
   snprintf(sysfs_path, sysfs_path_len, "/sys/block/%s", devicenode);
 
   if (!realpath (sysfs_path, rpath))
-    grub_util_error ("Cannot get the real path of `%s'", sysfs_path);
+    grub_util_error ("cannot get the real path of `%s'", sysfs_path);
 
   strcat(rpath, "/device");
 
   if (!realpath (rpath, sysfs_path))
-    grub_util_error ("Cannot get the real path of `%s'", rpath);
+    grub_util_error ("cannot get the real path of `%s'", rpath);
 
   free (rpath);
 }
@@ -247,12 +247,12 @@ vendor_is_ATA(const char *path)
   snprintf(buf, PATH_MAX, "%s/vendor", path);
   fd = open(buf, O_RDONLY);
   if (fd < 0)
-    grub_util_error ("Cannot open 'vendor' node of `%s'", path);
+    grub_util_error ("cannot open 'vendor' node of `%s'", path);
 
   memset(buf, 0, PATH_MAX);
   err = read(fd, buf, PATH_MAX);
   if (err < 0)
-    grub_util_error ("Cannot read 'vendor' node of `%s'", path);
+    grub_util_error ("cannot read 'vendor' node of `%s'", path);
 
   close(fd);
 
@@ -288,7 +288,7 @@ check_sas (char *sysfs_path, int *tgt)
 
   fd = open(path, O_RDONLY);
   if (fd < 0)
-    grub_util_error("Cannot open SAS PHY ID '%s'\n", path);
+    grub_util_error("cannot open SAS PHY ID `%s'\n", path);
 
   memset (phy, 0, sizeof (phy));
   read (fd, phy, sizeof (phy));
@@ -375,7 +375,7 @@ grub_util_devname_to_ofpath (char *devname)
   name_buf = xmalloc (PATH_MAX);
   name_buf = realpath (devname, name_buf);
   if (! name_buf)
-    grub_util_error ("Cannot get the real path of `%s'", devname);
+    grub_util_error ("cannot get the real path of `%s'", devname);
 
   device = get_basename (devname);
   devnode = strip_trailing_digits (devname);
diff --git a/util/misc.c b/util/misc.c
index 47dd8c78d..0b682c445 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -60,11 +60,12 @@ grub_util_warn (const char *fmt, ...)
 {
   va_list ap;
 
-  fprintf (stderr, "%s: warn: ", program_name);
+  fprintf (stderr, _("%s: warn:"), program_name);
+  fprintf (stderr, " ");
   va_start (ap, fmt);
   vfprintf (stderr, fmt, ap);
   va_end (ap);
-  fputc ('\n', stderr);
+  fprintf (stderr, ".\n");
   fflush (stderr);
 }
 
@@ -75,11 +76,12 @@ grub_util_info (const char *fmt, ...)
     {
       va_list ap;
 
-      fprintf (stderr, "%s: info: ", program_name);
+      fprintf (stderr, _("%s: info:"), program_name);
+      fprintf (stderr, " ");
       va_start (ap, fmt);
       vfprintf (stderr, fmt, ap);
       va_end (ap);
-      fputc ('\n', stderr);
+      fprintf (stderr, ".\n");
       fflush (stderr);
     }
 }
@@ -89,11 +91,12 @@ grub_util_error (const char *fmt, ...)
 {
   va_list ap;
 
-  fprintf (stderr, "%s: error: ", program_name);
+  fprintf (stderr, _("%s: error:"), program_name);
+  fprintf (stderr, " ");
   va_start (ap, fmt);
   vfprintf (stderr, fmt, ap);
   va_end (ap);
-  fputc ('\n', stderr);
+  fprintf (stderr, ".\n");
   exit (1);
 }
 
diff --git a/util/mkisofs/eltorito.c b/util/mkisofs/eltorito.c
index a134dfc48..1d2a715e0 100644
--- a/util/mkisofs/eltorito.c
+++ b/util/mkisofs/eltorito.c
@@ -288,7 +288,7 @@ void FDECL1(get_torito_desc, struct eltorito_boot_descriptor *, boot_desc)
 	struct eltorito_boot_info bi_table;
 	bootimage = fopen (de->whole_name, "r+b");
 	if (bootimage == NULL)
-	  error (1, errno, _("Error opening boot image file '%s' for update"),
+	  error (1, errno, _("Error opening boot image file `%s' for update"),
 		 de->whole_name);
 	/* Compute checksum of boot image, sans 64 bytes */
 	total_len = 0;
@@ -296,7 +296,7 @@ void FDECL1(get_torito_desc, struct eltorito_boot_descriptor *, boot_desc)
 	while ((len = fread (csum_buffer, 1, SECTOR_SIZE, bootimage)) > 0)
 	  {
 	    if (total_len & 3)
-	      error (1, 0, _("Odd alignment at non-end-of-file in boot image '%s'"),
+	      error (1, 0, _("Odd alignment at non-end-of-file in boot image `%s'"),
 		     de->whole_name);
 	    if (total_len < 64)
 	      memset (csum_buffer, 0, 64 - total_len);
@@ -308,7 +308,7 @@ void FDECL1(get_torito_desc, struct eltorito_boot_descriptor *, boot_desc)
 	  }
 
 	if (total_len != de->size)
-	  error (1, 0, _("Boot image file '%s' changed unexpectedly"),
+	  error (1, 0, _("Boot image file `%s' changed unexpectedly"),
 		 de->whole_name);
 	/* End of file, set position to byte 8 */
 	fseeko (bootimage, (off_t) 8, SEEK_SET);
diff --git a/util/mkisofs/rock.c b/util/mkisofs/rock.c
index f18b0bd83..a7a39f774 100644
--- a/util/mkisofs/rock.c
+++ b/util/mkisofs/rock.c
@@ -306,7 +306,7 @@ int deep_opt;
 	     * the symbolic link won't fit into one SL System Use Field
 	     * print an error message and continue with splited one
 	     */
-	    fprintf (stderr, _("symbolic link ``%s'' too long for one SL System Use Field, splitting"), cpnt);
+	    fprintf (stderr, _("symbolic link `%s' too long for one SL System Use Field, splitting"), cpnt);
 	  }
        if(MAYBE_ADD_CE_ENTRY(SL_SIZE + sl_bytes)) add_CE_entry();
      }
diff --git a/util/mkisofs/write.c b/util/mkisofs/write.c
index 5447229c8..e1cdd213e 100644
--- a/util/mkisofs/write.c
+++ b/util/mkisofs/write.c
@@ -158,7 +158,7 @@ void FDECL4(xfwrite, void *, buffer, uint64_t, count, uint64_t, size, FILE *, fi
 		sprintf(nbuf, "%s_%02d", outfile, idx++);
 		file = freopen(nbuf, "wb", file);
 		if (file == NULL)
-		  error (1, errno, _("Cannot open '%s'"), nbuf);
+		  error (1, errno, _("Cannot open `%s'"), nbuf);
 
 	}
      while(count)
diff --git a/util/raid.c b/util/raid.c
index 83a0ee6e2..ec3ecd26e 100644
--- a/util/raid.c
+++ b/util/raid.c
@@ -50,7 +50,7 @@ grub_util_getdiskname (int major, int minor)
   else if (major == SCSI_DISK0_MAJOR)
     sprintf (name, "/dev/sd%c", 'a' + minor / 16);
   else
-    grub_util_error ("Unknown device number: %d, %d", major, minor);
+    grub_util_error ("unknown device number: %d, %d", major, minor);
 
   return name;
 }
@@ -72,7 +72,7 @@ grub_util_raid_getmembers (char *name)
   fd = open (devname, O_RDONLY);
 
   if (fd == -1)
-    grub_util_error ("Can't open %s: %s", devname, strerror (errno));
+    grub_util_error ("can't open %s: %s", devname, strerror (errno));
 
   free (devname);
 
@@ -81,7 +81,7 @@ grub_util_raid_getmembers (char *name)
     grub_util_error ("ioctl RAID_VERSION error: %s", strerror (errno));
 
   if (version.major != 0 || version.minor != 90)
-    grub_util_error ("Unsupported RAID version: %d.%d",
+    grub_util_error ("unsupported RAID version: %d.%d",
 		     version.major, version.minor);
 
   ret = ioctl (fd, GET_ARRAY_INFO, &info);
diff --git a/util/sparc64/ieee1275/grub-mkimage.c b/util/sparc64/ieee1275/grub-mkimage.c
index 96ddfe3d7..6907b8d8a 100644
--- a/util/sparc64/ieee1275/grub-mkimage.c
+++ b/util/sparc64/ieee1275/grub-mkimage.c
@@ -191,7 +191,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... [MODULES]\n\
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 9d8e67562..c39ea853f 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -161,7 +161,7 @@ setup (const char *prefix, const char *dir,
       grub_util_info ("first sector is <%llu,%u,%u>", sector, offset, length);
 
       if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("The first sector of the core file "
+	grub_util_error ("the first sector of the core file "
 			 "is not sector-aligned");
 
       first_sector = sector;
@@ -176,7 +176,7 @@ setup (const char *prefix, const char *dir,
       grub_util_info ("saving <%llu,%u,%u>", sector, offset, length);
 
       if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("Non-sector-aligned data is found in the core file");
+	grub_util_error ("non-sector-aligned data is found in the core file");
 
       if (block != first_block
 	  && (grub_be_to_cpu64 (prev->start)
@@ -189,7 +189,7 @@ setup (const char *prefix, const char *dir,
 
 	  block--;
 	  if (block->len)
-	    grub_util_error ("The sectors of the core file are too fragmented");
+	    grub_util_error ("the sectors of the core file are too fragmented");
 	}
 
       last_length = length;
@@ -201,7 +201,7 @@ setup (const char *prefix, const char *dir,
   boot_path = grub_util_get_path (dir, boot_file);
   boot_size = grub_util_get_image_size (boot_path);
   if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("The size of `%s' is not %d",
+    grub_util_error ("the size of `%s' is not %d",
 		     boot_path, GRUB_DISK_SECTOR_SIZE);
   boot_img = grub_util_read_image (boot_path);
   free (boot_path);
@@ -219,7 +219,7 @@ setup (const char *prefix, const char *dir,
   core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
 		  >> GRUB_DISK_SECTOR_BITS);
   if (core_size < GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("The size of `%s' is too small", core_path);
+    grub_util_error ("the size of `%s' is too small", core_path);
 
   core_img = grub_util_read_image (core_path);
   free (core_path);
@@ -229,7 +229,7 @@ setup (const char *prefix, const char *dir,
 					   + GRUB_DISK_SECTOR_SIZE
 					   - sizeof (*block));
 
-  grub_util_info ("root is '%s', dest is '%s', and dest_ofpath is '%s'",
+  grub_util_info ("root is `%s', dest is `%s', and dest_ofpath is `%s'",
 		  root, dest, dest_ofpath);
 
   /* Open the root device and the destination device.  */
@@ -320,7 +320,7 @@ setup (const char *prefix, const char *dir,
     }
 
   if (i == MAX_TRIES)
-    grub_util_error ("Cannot read `%s' correctly", core_path);
+    grub_util_error ("cannot read `%s' correctly", core_path);
 
   /* Clean out the blocklists.  */
   block = first_block;
@@ -332,7 +332,7 @@ setup (const char *prefix, const char *dir,
       block--;
 
       if ((char *) block <= core_img)
-	grub_util_error ("No terminator in the core image");
+	grub_util_error ("no terminator in the core image");
     }
 
   /* Now read the core image to determine where the sectors are.  */
@@ -343,13 +343,13 @@ setup (const char *prefix, const char *dir,
   file->read_hook = save_first_sector;
   if (grub_file_read (file, tmp_img, GRUB_DISK_SECTOR_SIZE)
       != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("Failed to read the first sector of the core image");
+    grub_util_error ("failed to read the first sector of the core image");
 
   block = first_block;
   file->read_hook = save_blocklists;
   if (grub_file_read (file, tmp_img, core_size - GRUB_DISK_SECTOR_SIZE)
       != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("Failed to read the rest sectors of the core image");
+    grub_util_error ("failed to read the rest sectors of the core image");
 
   grub_file_close (file);
 
@@ -368,7 +368,7 @@ setup (const char *prefix, const char *dir,
   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);
+    grub_util_error ("cannot open `%s'", core_path);
 
   grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE, fp);
   fclose (fp);
@@ -404,13 +404,13 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
-DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
+DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
@@ -559,14 +559,14 @@ find_dest_dev (struct grub_setup_info *gp, char *argv[])
 	  fprintf (stderr, "Invalid device `%s'.\n", argv[optind]);
 	  usage (1);
 	}
-      grub_util_info ("transformed OS device '%s' into GRUB device '%s'",
+      grub_util_info ("transformed OS device `%s' into GRUB device `%s'",
 		      argv[optind], gp->dest_dev);
     }
   else
     {
       /* For simplicity.  */
       gp->dest_dev = xstrdup (gp->dest_dev);
-      grub_util_info ("Using '%s' as GRUB device", gp->dest_dev);
+      grub_util_info ("Using `%s' as GRUB device", gp->dest_dev);
     }
 }
 
@@ -578,7 +578,7 @@ check_root_dev (struct grub_setup_info *gp)
       char *tmp = get_device_name (gp->root_dev);
 
       if (! tmp)
-	grub_util_error ("Invalid root device `%s'", gp->root_dev);
+	grub_util_error ("invalid root device `%s'", gp->root_dev);
 
       tmp = xstrdup (tmp);
       free (gp->root_dev);
@@ -594,11 +594,11 @@ check_root_dev (struct grub_setup_info *gp)
 	{
 	  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''.");
+	  grub_util_error ("cannot guess the root device. "
+			   "Specify the option `--root-device'");
 	}
-      grub_util_info ("Guessed root device '%s' and root_dev '%s' from "
-		      "dir '%s'", root_device, gp->root_dev, dir);
+      grub_util_info ("guessed root device `%s' and root_dev `%s' from "
+		      "dir `%s'", root_device, gp->root_dev, dir);
     }
 }