dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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