Blame SOURCES/0026-Message-string-cleanups.patch

5593c8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
5593c8
From: William Jon McCann <william.jon.mccann@gmail.com>
5593c8
Date: Fri, 7 Jun 2013 11:09:04 -0400
5593c8
Subject: [PATCH] Message string cleanups
5593c8
5593c8
Make use of terminology consistent. Remove jargon.
5593c8
---
5593c8
 grub-core/normal/menu_text.c | 21 +++++++++------------
5593c8
 1 file changed, 9 insertions(+), 12 deletions(-)
5593c8
5593c8
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
5593c8
index 65deafda531..cc5837ed2b8 100644
5593c8
--- a/grub-core/normal/menu_text.c
5593c8
+++ b/grub-core/normal/menu_text.c
5593c8
@@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
5593c8
 
5593c8
   if (edit)
5593c8
     {
5593c8
-      ret += grub_print_message_indented_real (_("Minimum Emacs-like screen editing is \
5593c8
-supported. TAB lists completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for a \
5593c8
-command-line or ESC to discard edits and return to the GRUB menu."),
5593c8
+      ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
5593c8
+command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
5593c8
 					       STANDARD_MARGIN, STANDARD_MARGIN,
5593c8
 					       term, dry_run);
5593c8
     }
5593c8
@@ -167,8 +166,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
5593c8
     {
5593c8
       char *msg_translated;
5593c8
 
5593c8
-      msg_translated = grub_xasprintf (_("Use the %C and %C keys to select which "
5593c8
-					 "entry is highlighted."),
5593c8
+      msg_translated = grub_xasprintf (_("Use the %C and %C keys to change the "
5593c8
+					 "selection."),
5593c8
 				       GRUB_UNICODE_UPARROW,
5593c8
 				       GRUB_UNICODE_DOWNARROW);
5593c8
       if (!msg_translated)
5593c8
@@ -181,17 +180,15 @@ command-line or ESC to discard edits and return to the GRUB menu."),
5593c8
       if (nested)
5593c8
 	{
5593c8
 	  ret += grub_print_message_indented_real
5593c8
-	    (_("Press enter to boot the selected OS, "
5593c8
-	       "`e' to edit the commands before booting "
5593c8
-	       "or `c' for a command-line. ESC to return previous menu."),
5593c8
+	    (_("Press 'e' to edit the selected item, "
5593c8
+	       "or 'c' for a command prompt. Press Escape to return to the previous menu."),
5593c8
 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
5593c8
 	}
5593c8
       else
5593c8
 	{
5593c8
 	  ret += grub_print_message_indented_real
5593c8
-	    (_("Press enter to boot the selected OS, "
5593c8
-	       "`e' to edit the commands before booting "
5593c8
-	       "or `c' for a command-line."),
5593c8
+	    (_("Press 'e' to edit the selected item, "
5593c8
+	       "or 'c' for a command prompt."),
5593c8
 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
5593c8
 	}	
5593c8
     }
5593c8
@@ -443,7 +440,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
5593c8
       || data->timeout_msg == TIMEOUT_TERSE_NO_MARGIN)
5593c8
     msg_translated = grub_xasprintf (_("%ds"), timeout);
5593c8
   else
5593c8
-    msg_translated = grub_xasprintf (_("The highlighted entry will be executed automatically in %ds."), timeout);
5593c8
+    msg_translated = grub_xasprintf (_("The selected entry will be started automatically in %ds."), timeout);
5593c8
   if (!msg_translated)
5593c8
     {
5593c8
       grub_print_error ();