* 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.

diff --git a/ChangeLog b/ChangeLog
index a88d906097111859776328f7820ce482676f8807..358027ae2824e03d73f956c75577f173080f49b8 100644 (file)
--- 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 0b527e30db21db7270f8d4450939be49490a2ee6..edc49dd1b09308d192adbc0d73f7f56bca6354a0 100644 (file)
--- 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 49daaba085e46af89a3026b6c123aaa78db23d58..b50548574abbf911ce89775ac8e21b083f7386f7 100644 (file)
--- 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 983c07e88913cc08e51a7ac304cc43d28256acc9..033a918719a88c1b3dcd510326471fe41487ff0f 100644 (file)
--- 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 e055cd5c7769c5fc50ad56e6262f6dd4ea19f89a..51c0170abc5be1a014e03249979de6565510344e 100644 (file)
--- 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 97945edae1d294a23136c11479af16f9107196a9..e66573c947568c791f1366cb0d51fe058a816a4c 100644 (file)
--- 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 0721349cb1e48a99f7b245f5757c985b4cddae90..637578f77a702fc5b673207c589e54dbd2532c64 100644 (file)
--- 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 0c595e2ef4e24d4e1a07ec5debd3246a4b1324d6..456b7c3227f0ff8d33361dbecb0c22cbde8e176a 100644 (file)
--- 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 009c643eaf67568b83403fa032cf6a1a81fe1528..0418aae64f76eaba875a60d8c7fea0fc8a7aae02 100644 (file)
--- 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 798cbde56cacde01a81c24c1afeaceb078cd2eab..4fc1b38b2fb620d4f0471844441fe01598e1edaa 100644 (file)
--- 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 100e8b3f3f674c71514f223ddffb0f5775b2ef89..b511d4c48af7fb7f73365e863f26e206eece4188 100644 (file)
--- 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 e0f456d0886b680fd0aa7ad025b8214d25fa5281..1753c7bb06558b14ee7e5d5a6428379cd1dd2163 100644 (file)
--- 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 262f3eebd8d8e8cfff787c6a7a0d873b987a8901..8dc6d359ef2641cbdcba2f2c4d1ec0bf4fdfbcdf 100644 (file)
--- 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 cb212f0b9f4dc1921568a0ffb50cc35e5d81e8de..ce7aced5a1621a6b7378b60ab119899a0b8f39a6 100644 (file)
--- 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 dbd4a050d2bbc082a3eb3772046f9ee5b94cc0c4..c34c25722ba9bdd3947e2698d04428bdc9076e6b 100644 (file)
--- 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 5a565e3ef7ff14cb67ccbe22a5c9756583492804..f0206d2c5f1ff7174c8d14ac193a24dd137d8f78 100644 (file)
--- 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 51ae7472cff96795bd8e443c68c89e338d91170b..8ff9f74832e5f2536933e526dd29503bb9303262 100644 (file)
--- 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 635617d8d2dc44f03848c001e71c6099732b48e8..652bc4c72a9144f5c716f0c07cd12f449dcaba6b 100644 (file)
--- 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 1cd25328426d3505fe4973678f70b111db5984d5..2d20e98cd50b98c5c1e95e6f3549511ac713267e 100644 (file)
--- 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 1f5418a6f8d0fe0ed4e3ccff17663b7f87c2a181..3f4a38d413f0cb54f4c8fe235ef8b69a3e86ddf2 100644 (file)
--- 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 bc97269ed830e716d6c649c7c791759ed145cee1..352716e38e72bb645d8acb547bceaea85bd2fafc 100644 (file)
--- 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 92e1b2942b00dbae90e9886a94ff9dee502edd67..5342af1d88f17830eebfd0c96a2cd3e5ccdb6ddf 100644 (file)
--- 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 c2a4335e0eda32c38b315298b74152152bbcffc8..c2833c4a2fde2125bdd5fef34a9ad0a5f06fce87 100644 (file)
--- 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 297ff5ffa564c6e3dd73bd9819cfa4f5e25bac7b..a573db70ca2258adfe04924446a9e486d1bf8006 100644 (file)
--- 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