svn commit: r251389 - in head/usr.sbin/bsdconfig: console/include mouse/include security/include startup startup/include startup/share

[Devin Teske]

Author: dteske
Date: Tue Jun  4 16:48:23 2013
New Revision: 251389
URL: http://svnweb.freebsd.org/changeset/base/251389

Log:
  Lessen verbosity of "Exit" menutag items to appear more consistent across
  menus from one module to the next.
  
  Replacing "Exit this menu (returning to previous)" with "Exit this menu".
  
  PR:		ports/169316

Modified:
  head/usr.sbin/bsdconfig/console/include/messages.subr
  head/usr.sbin/bsdconfig/mouse/include/messages.subr
  head/usr.sbin/bsdconfig/security/include/messages.subr
  head/usr.sbin/bsdconfig/startup/include/messages.subr
  head/usr.sbin/bsdconfig/startup/rcconf
  head/usr.sbin/bsdconfig/startup/share/rcconf.subr

Modified: head/usr.sbin/bsdconfig/console/include/messages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/console/include/messages.subr	Tue Jun  4 16:32:17 2013	(r251388)
+++ head/usr.sbin/bsdconfig/console/include/messages.subr	Tue Jun  4 16:48:23 2013	(r251389)
@@ -78,7 +78,7 @@ msg_estonian_iso_desc="Estonian ISO keym
 msg_estonian_iso_15="Estonian ISO 15"
 msg_estonian_iso_15_desc="Estonian ISO 8859-15 keymap"
 msg_exit="Exit"
-msg_exit_this_menu="Exit this menu (returning to previous)"
+msg_exit_this_menu="Exit this menu"
 msg_fade="Fade"
 msg_fade_desc="Fade out effect screen saver"
 msg_fast="Fast"

Modified: head/usr.sbin/bsdconfig/mouse/include/messages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/include/messages.subr	Tue Jun  4 16:32:17 2013	(r251388)
+++ head/usr.sbin/bsdconfig/mouse/include/messages.subr	Tue Jun  4 16:48:23 2013	(r251389)
@@ -42,7 +42,7 @@ msg_disable="Disable"
 msg_disable_the_mouse_daemon="Disable the mouse daemon"
 msg_enable="Enable"
 msg_exit="Exit"
-msg_exit_this_menu="Exit this menu (returning to previous)"
+msg_exit_this_menu="Exit this menu"
 msg_flags="Flags"
 msg_glidepoint="GlidePoint"
 msg_glidepoint_desc="ALPS GlidePoint pad (serial)"

Modified: head/usr.sbin/bsdconfig/security/include/messages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/security/include/messages.subr	Tue Jun  4 16:32:17 2013	(r251388)
+++ head/usr.sbin/bsdconfig/security/include/messages.subr	Tue Jun  4 16:48:23 2013	(r251389)
@@ -30,7 +30,7 @@ msg_cancel="Cancel"
 msg_disable_securelevels="Disable securelevels"
 msg_disabled="Disabled"
 msg_exit="Exit"
-msg_exit_this_menu="Exit this menu (returning to previous)"
+msg_exit_this_menu="Exit this menu"
 msg_highly_secure="Highly Secure"
 msg_highly_secure_mode="Highly secure mode"
 msg_menu_text="This menu allows you to configure aspects of the operating system security\npolicy.  Please read the system documentation carefully before modifying\nthese settings, as they may cause service disruption if used improperly.\n\nMost settings will take affect only following a system reboot."

Modified: head/usr.sbin/bsdconfig/startup/include/messages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/include/messages.subr	Tue Jun  4 16:32:17 2013	(r251388)
+++ head/usr.sbin/bsdconfig/startup/include/messages.subr	Tue Jun  4 16:48:23 2013	(r251389)
@@ -63,8 +63,7 @@ msg_exit_cancel="Exit/Cancel"
 msg_exit_cancel_desc="Return to previous menu"
 msg_exit_cancel_help="Return to the previous menu (selected items are untouched)"
 msg_exit_desc="Return to previous menu"
-msg_exit_help="Exit this menu (returning to previous)"
-msg_exit_this_menu="Exit this menu (returning to previous)"
+msg_exit_this_menu="Exit this menu"
 msg_info="Info"
 msg_lpd="lpd"
 msg_lpd_desc="This host has a printer and wants to run lpd."

Modified: head/usr.sbin/bsdconfig/startup/rcconf
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcconf	Tue Jun  4 16:32:17 2013	(r251388)
+++ head/usr.sbin/bsdconfig/startup/rcconf	Tue Jun  4 16:48:23 2013	(r251389)
@@ -81,7 +81,7 @@ dialog_menu_main()
 	local prompt=
 	local menu_list="
 		'X $msg_exit'    '$msg_exit_desc'
-		                  ${SHOW_DESC:+'$msg_exit_help'}
+		                  ${SHOW_DESC:+'$msg_exit_this_menu'}
 		'> $msg_add_new' '$msg_add_new_desc'
 		                  ${SHOW_DESC:+'$msg_add_new_help'}
 		'> $msg_delete'  '$msg_delete_desc'

Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Tue Jun  4 16:32:17 2013	(r251388)
+++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Tue Jun  4 16:48:23 2013	(r251389)
@@ -372,7 +372,7 @@ f_dialog_input_rclist()
 {
 	local prompt="$msg_please_select_an_rcconf_directive"
 	local menu_list="
-		'X $msg_exit' '' ${SHOW_DESC:+'$msg_exit_help'}
+		'X $msg_exit' '' ${SHOW_DESC:+'$msg_exit_this_menu'}
 	" # END-QUOTE
 	local hline="$hline_arrows_tab_enter"