From owner-svn-src-head@FreeBSD.ORG Tue Jun 4 16:48:24 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CE50FE8F; Tue, 4 Jun 2013 16:48:24 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B1F951DBF; Tue, 4 Jun 2013 16:48:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54GmO0g072759; Tue, 4 Jun 2013 16:48:24 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54GmN5Q072751; Tue, 4 Jun 2013 16:48:23 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306041648.r54GmN5Q072751@svn.freebsd.org> From: Devin Teske Date: Tue, 4 Jun 2013 16:48:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251389 - in head/usr.sbin/bsdconfig: console/include mouse/include security/include startup startup/include startup/share X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 16:48:24 -0000 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"