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