From 805a8dccc8dcae317221dcf5243096602fa9b28c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Mar 2012 13:05:08 +0100
Subject: [PATCH] 	* grub-core/commands/gptsync.c: Fix typographic
 quoting. 	* grub-core/commands/ieee1275/suspend.c: Likewise. 	*
 grub-core/commands/parttool.c: Likewise. 	*
 grub-core/commands/search_wrap.c: Likewise. 	*
 grub-core/commands/videoinfo.c: Likewise. 	*
 grub-core/gfxmenu/gui_label.c: Likewise. 	* grub-core/hello/hello.c:
 Likewise. 	* grub-core/kern/emu/main.c: Likewise. 	* grub-core/net/net.c:
 Likewise. 	* grub-core/normal/menu.c: Likewise. 	*
 grub-core/normal/menu_text.c: Likewise. 	* grub-core/normal/misc.c:
 Likewise. 	* util/grub-editenv.c: Likewise. 	*
 util/grub-install.in: Likewise. 	* util/grub-kbdcomp.in: Likewise. 
 * util/grub-mkconfig.in: Likewise. 	* util/grub-mknetdir.in: Likewise. 
 * util/grub-mkrescue.in: Likewise. 	* util/grub-mkstandalone.in: Likewise.
 	* util/grub-reboot.in: Likewise. 	* util/grub-set-default.in:
 Likewise. 	* util/grub-setup.c: Likewise. 	*
 util/powerpc/ieee1275/grub-mkrescue.in: Likewise.

---
 ChangeLog                              | 26 ++++++++++++++++++++++++++
 grub-core/commands/gptsync.c           |  2 +-
 grub-core/commands/ieee1275/suspend.c  |  2 +-
 grub-core/commands/parttool.c          |  2 +-
 grub-core/commands/search_wrap.c       |  2 +-
 grub-core/commands/videoinfo.c         |  2 +-
 grub-core/gfxmenu/gui_label.c          | 10 +++++-----
 grub-core/hello/hello.c                |  2 +-
 grub-core/kern/emu/main.c              |  3 ++-
 grub-core/net/net.c                    |  2 +-
 grub-core/normal/menu.c                |  4 ++--
 grub-core/normal/menu_text.c           |  8 ++++----
 grub-core/normal/misc.c                |  2 +-
 util/grub-editenv.c                    |  2 +-
 util/grub-install.in                   |  2 +-
 util/grub-kbdcomp.in                   |  2 +-
 util/grub-mkconfig.in                  |  2 +-
 util/grub-mknetdir.in                  |  2 +-
 util/grub-mkrescue.in                  |  2 +-
 util/grub-mkstandalone.in              |  2 +-
 util/grub-reboot.in                    |  2 +-
 util/grub-set-default.in               |  2 +-
 util/grub-setup.c                      |  4 ++--
 util/powerpc/ieee1275/grub-mkrescue.in |  2 +-
 24 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a88d90609..358027ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2012-03-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/gptsync.c: Fix typographic quoting.
+	* grub-core/commands/ieee1275/suspend.c: Likewise.
+	* grub-core/commands/parttool.c: Likewise.
+	* grub-core/commands/search_wrap.c: Likewise.
+	* grub-core/commands/videoinfo.c: Likewise.
+	* grub-core/gfxmenu/gui_label.c: Likewise.
+	* grub-core/hello/hello.c: Likewise.
+	* grub-core/kern/emu/main.c: Likewise.
+	* grub-core/net/net.c: Likewise.
+	* grub-core/normal/menu.c: Likewise.
+	* grub-core/normal/menu_text.c: Likewise.
+	* grub-core/normal/misc.c: Likewise.
+	* util/grub-editenv.c: Likewise.
+	* util/grub-install.in: Likewise.
+	* util/grub-kbdcomp.in: Likewise.
+	* util/grub-mkconfig.in: Likewise.
+	* util/grub-mknetdir.in: Likewise.
+	* util/grub-mkrescue.in: Likewise.
+	* util/grub-mkstandalone.in: Likewise.
+	* util/grub-reboot.in: Likewise.
+	* util/grub-set-default.in: Likewise.
+	* util/grub-setup.c: Likewise.
+	* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
+
 2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/acpihalt.c: Add TRANSLATORS comments.
diff --git a/grub-core/commands/gptsync.c b/grub-core/commands/gptsync.c
index 0b527e30d..edc49dd1b 100644
--- a/grub-core/commands/gptsync.c
+++ b/grub-core/commands/gptsync.c
@@ -232,7 +232,7 @@ grub_cmd_gptsync (grub_command_t cmd __attribute__ ((unused)),
       return grub_errno;
     }
 
-  grub_printf_ (N_("New MBR is written to '%s'\n"), args[0]);
+  grub_printf_ (N_("New MBR is written to `%s'\n"), args[0]);
 
   return GRUB_ERR_NONE;
 }
diff --git a/grub-core/commands/ieee1275/suspend.c b/grub-core/commands/ieee1275/suspend.c
index 49daaba08..b50548574 100644
--- a/grub-core/commands/ieee1275/suspend.c
+++ b/grub-core/commands/ieee1275/suspend.c
@@ -31,7 +31,7 @@ grub_cmd_suspend (grub_command_t cmd __attribute__ ((unused)),
 		  int argc __attribute__ ((unused)),
 		  char **args __attribute__ ((unused)))
 {
-  grub_puts_ (N_("Run 'go' to resume GRUB."));
+  grub_puts_ (N_("Run `go' to resume GRUB."));
   grub_ieee1275_enter ();
   grub_cls ();
   return 0;
diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
index 983c07e88..033a91871 100644
--- a/grub-core/commands/parttool.c
+++ b/grub-core/commands/parttool.c
@@ -38,7 +38,7 @@ static int curhandle = 0;
 static grub_dl_t mymod;
 static char helpmsg[] =
   N_("Perform COMMANDS on partition.\n"
-     "Use \"parttool PARTITION help\" for the list "
+     "Use `parttool PARTITION help' for the list "
      "of available commands.");
 
 int
diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
index e055cd5c7..51c0170ab 100644
--- a/grub-core/commands/search_wrap.c
+++ b/grub-core/commands/search_wrap.c
@@ -191,7 +191,7 @@ GRUB_MOD_INIT(search)
 			     " or filesystem UUID."
 			     " If --set is specified, the first device found is"
 			     " set to a variable. If no variable name is"
-			     " specified, \"root\" is used."),
+			     " specified, `root' is used."),
 			  options);
 }
 
diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index 97945edae..e66573c94 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -162,7 +162,7 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
     struct grub_video_mode_info info;
     struct grub_video_edid_info edid_info;
 
-    grub_printf_ (N_("Adapter '%s':\n"), adapter->name);
+    grub_printf_ (N_("Adapter `%s':\n"), adapter->name);
 
     if (!adapter->iterate)
       {
diff --git a/grub-core/gfxmenu/gui_label.c b/grub-core/gfxmenu/gui_label.c
index 0721349cb..637578f77 100644
--- a/grub-core/gfxmenu/gui_label.c
+++ b/grub-core/gfxmenu/gui_label.c
@@ -181,14 +181,14 @@ label_set_property (void *vself, const char *name, const char *value)
 	{
 	   if (grub_strcmp (value, "@KEYMAP_LONG@") == 0)
 	    value = _("Press enter to boot the selected OS, "
-	       "\'e\' to edit the commands before booting "
-	       "or \'c\' for a command-line. ESC to return previous menu.");
+	       "`e' to edit the commands before booting "
+	       "or `c' for a command-line. ESC to return previous menu.");
            else if (grub_strcmp (value, "@KEYMAP_MIDDLE@") == 0)
 	    value = _("Press enter to boot the selected OS, "
-	       "\'e\' to edit the commands before booting "
-	       "or \'c\' for a command-line.");
+	       "`e' to edit the commands before booting "
+	       "or `c' for a command-line.");
 	   else if (grub_strcmp (value, "@KEYMAP_SHORT@") == 0)
-	    value = _("enter: boot, \'e\': options, \'c\': cmd-line");
+	    value = _("enter: boot, `e': options, `c': cmd-line");
 	   /* FIXME: Add more templates here if needed.  */
 	  self->template = grub_strdup (value);
 	  self->text = grub_xasprintf (value, self->value);
diff --git a/grub-core/hello/hello.c b/grub-core/hello/hello.c
index 0c595e2ef..456b7c322 100644
--- a/grub-core/hello/hello.c
+++ b/grub-core/hello/hello.c
@@ -42,7 +42,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(hello)
 {
   cmd = grub_register_extcmd ("hello", grub_cmd_hello, 0, 0,
-			      N_("Say \"Hello World\"."), 0);
+			      N_("Say `Hello World'."), 0);
 }
 
 GRUB_MOD_FINI(hello)
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 009c643ea..0418aae64 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -193,7 +193,8 @@ main (int argc, char *argv[])
   hold = arguments.hold;
   /* Wait until the ARGS.HOLD variable is cleared by an attached debugger. */
   if (hold && verbosity > 0)
-    printf (_("Run \"gdb %s %d\", and set ARGS.HOLD to zero.\n"),
+    /* TRANSLATORS: In this case GRUB tells user what he has to do.  */
+    printf (_("Run `gdb %s %d', and set ARGS.HOLD to zero.\n"),
             program_name, (int) getpid ());
   while (hold)
     {
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 798cbde56..4fc1b38b2 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1385,7 +1385,7 @@ grub_net_fs_read_real (grub_file_t file, char *buf, grub_size_t len)
       else
 	return total;
     }
-  grub_error (GRUB_ERR_TIMEOUT, N_("timeout reading '%s'"), net->name);
+  grub_error (GRUB_ERR_TIMEOUT, N_("timeout reading `%s'"), net->name);
   return -1;
 }
 
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index 100e8b3f3..b511d4c48 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -672,7 +672,7 @@ notify_booting (grub_menu_entry_t entry,
 		void *userdata __attribute__((unused)))
 {
   grub_printf ("  ");
-  grub_printf_ (N_("Booting \'%s\'"), entry->title);
+  grub_printf_ (N_("Booting `%s'"), entry->title);
   grub_printf ("\n\n");
 }
 
@@ -684,7 +684,7 @@ notify_fallback (grub_menu_entry_t entry,
 		 void *userdata __attribute__((unused)))
 {
   grub_printf ("\n   ");
-  grub_printf_ (N_("Falling back to \'%s\'"), entry->title);
+  grub_printf_ (N_("Falling back to `%s'"), entry->title);
   grub_printf ("\n\n");
   grub_millisleep (DEFAULT_ENTRY_ERROR_DELAY_MS);
 }
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index e0f456d08..1753c7bb0 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -181,16 +181,16 @@ command-line or ESC to discard edits and return to the GRUB menu."),
 	{
 	  ret += grub_print_message_indented_real
 	    (_("Press enter to boot the selected OS, "
-	       "\'e\' to edit the commands before booting "
-	       "or \'c\' for a command-line. ESC to return previous menu."),
+	       "`e' to edit the commands before booting "
+	       "or `c' for a command-line. ESC to return previous menu."),
 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
 	}
       else
 	{
 	  ret += grub_print_message_indented_real
 	    (_("Press enter to boot the selected OS, "
-	       "\'e\' to edit the commands before booting "
-	       "or \'c\' for a command-line."),
+	       "`e' to edit the commands before booting "
+	       "or `c' for a command-line."),
 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
 	}	
     }
diff --git a/grub-core/normal/misc.c b/grub-core/normal/misc.c
index 262f3eebd..8dc6d359e 100644
--- a/grub-core/normal/misc.c
+++ b/grub-core/normal/misc.c
@@ -71,7 +71,7 @@ grub_normal_print_device_info (const char *name)
 		  if (label && grub_strlen (label))
 		    {
 		      grub_xputs (" ");
-		      grub_printf_ (N_("- Label \"%s\""), label);
+		      grub_printf_ (N_("- Label `%s'"), label);
 		    }
 		  grub_free (label);
 		}
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index cb212f0b9..ce7aced5a 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -102,7 +102,7 @@ struct argp argp = {
   "\n"N_("\
 Tool to edit environment block.")
 "\v"N_("\
-If FILENAME is '-', the default value %s is used."),
+If FILENAME is `-', the default value %s is used."),
   NULL, help_filter, NULL
 };
 
diff --git a/util/grub-install.in b/util/grub-install.in
index dbd4a050d..c34c25722 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -122,7 +122,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'" "$0" "$opt" 1>&2
       exit 1
   fi
   echo "$1"
diff --git a/util/grub-kbdcomp.in b/util/grub-kbdcomp.in
index 5a565e3ef..f0206d2c5 100644
--- a/util/grub-kbdcomp.in
+++ b/util/grub-kbdcomp.in
@@ -40,7 +40,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 51ae7472c..8ff9f7483 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -65,7 +65,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1
diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
index 635617d8d..652bc4c72 100644
--- a/util/grub-mknetdir.in
+++ b/util/grub-mknetdir.in
@@ -81,7 +81,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 1cd253284..2d20e98cd 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -84,7 +84,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1
diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
index 1f5418a6f..3f4a38d41 100644
--- a/util/grub-mkstandalone.in
+++ b/util/grub-mkstandalone.in
@@ -77,7 +77,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1
diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index bc97269ed..352716e38 100644
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -63,7 +63,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1
diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index 92e1b2942..5342af1d8 100644
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -63,7 +63,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1
diff --git a/util/grub-setup.c b/util/grub-setup.c
index c2a4335e0..c2833c4a2 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -444,14 +444,14 @@ setup (const char *dir,
 
     if (dest_partmap && !dest_partmap->embed)
       {
-	grub_util_warn (_("Partition style '%s' doesn't support embedding"),
+	grub_util_warn (_("Partition style `%s' doesn't support embedding"),
 			dest_partmap->name);
 	goto unable_to_embed;
       }
 
     if (fs && !fs->embed)
       {
-	grub_util_warn (_("File system '%s' doesn't support embedding"),
+	grub_util_warn (_("File system `%s' doesn't support embedding"),
 			fs->name);
 	goto unable_to_embed;
       }
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 297ff5ffa..a573db70c 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -64,7 +64,7 @@ argument () {
   shift
 
   if test $# -eq 0; then
-      gettext_printf "%s: option requires an argument -- '%s'\n" "$0" "$opt" 1>&2
+      gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2
       exit 1
   fi
   echo $1