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

f96e0b
From 394e83c86e75fadbbdeda4651f52fd2013df6a6b Mon Sep 17 00:00:00 2001
f96e0b
From: William Jon McCann <william.jon.mccann@gmail.com>
f96e0b
Date: Fri, 7 Jun 2013 11:09:04 -0400
f96e0b
Subject: [PATCH 474/482] Message string cleanups
f96e0b
f96e0b
Make use of terminology consistent. Remove jargon.
f96e0b
---
f96e0b
 grub-core/normal/menu_text.c | 20 ++++++++------------
f96e0b
 1 file changed, 8 insertions(+), 12 deletions(-)
f96e0b
f96e0b
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
f96e0b
index 5f6654f..d304e2f 100644
f96e0b
--- a/grub-core/normal/menu_text.c
f96e0b
+++ b/grub-core/normal/menu_text.c
f96e0b
@@ -116,16 +116,14 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
f96e0b
 
f96e0b
   if (edit)
f96e0b
     {
f96e0b
-      ret += grub_print_message_indented_real (_("Minimum Emacs-like screen editing is \
f96e0b
-supported. TAB lists completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for a \
f96e0b
-command-line or ESC to discard edits and return to the GRUB menu."),
f96e0b
+      ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
f96e0b
+command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
f96e0b
 					       STANDARD_MARGIN, STANDARD_MARGIN,
f96e0b
 					       term, dry_run);
f96e0b
     }
f96e0b
   else
f96e0b
     {
f96e0b
-      const char *msg = _("Use the %C and %C keys to select which "
f96e0b
-			  "entry is highlighted.");
f96e0b
+      const char *msg = _("Use the %C and %C keys to change the selection.");
f96e0b
       char *msg_translated;
f96e0b
 
f96e0b
       msg_translated = grub_xasprintf (msg, GRUB_UNICODE_UPARROW,
f96e0b
@@ -140,17 +138,15 @@ command-line or ESC to discard edits and return to the GRUB menu."),
f96e0b
       if (nested)
f96e0b
 	{
f96e0b
 	  ret += grub_print_message_indented_real
f96e0b
-	    (_("Press enter to boot the selected OS, "
f96e0b
-	       "`e' to edit the commands before booting "
f96e0b
-	       "or `c' for a command-line. ESC to return previous menu."),
f96e0b
+	    (_("Press 'e' to edit the selected item, "
f96e0b
+	       "or 'c' for a command prompt. Press Escape to return to the previous menu."),
f96e0b
 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
f96e0b
 	}
f96e0b
       else
f96e0b
 	{
f96e0b
 	  ret += grub_print_message_indented_real
f96e0b
-	    (_("Press enter to boot the selected OS, "
f96e0b
-	       "`e' to edit the commands before booting "
f96e0b
-	       "or `c' for a command-line."),
f96e0b
+	    (_("Press 'e' to edit the selected item, "
f96e0b
+	       "or 'c' for a command prompt."),
f96e0b
 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
f96e0b
 	}	
f96e0b
     }
f96e0b
@@ -381,7 +377,7 @@ static void
f96e0b
 menu_text_print_timeout (int timeout, void *dataptr)
f96e0b
 {
f96e0b
   const char *msg =
f96e0b
-    _("The highlighted entry will be executed automatically in %ds.");
f96e0b
+    _("The selected entry will be started automatically in %d seconds.");
f96e0b
   const char *msg_terse = _("%ds");
f96e0b
   struct menu_viewer_data *data = dataptr;
f96e0b
   char *msg_translated = 0;
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b