From 440a30cf574e6ece252ee88e31a4a610d8a8f35a Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Wed, 18 Nov 2015 12:15:38 -0500
Subject: Detailed cosmetic changes to the system update system

---
 src/usr/local/www/head.inc                   | 2 +-
 src/usr/local/www/pkg_mgr_install.php        | 8 ++++----
 src/usr/local/www/system_update_settings.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 4b8cd69..835d67b 100755
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -189,7 +189,7 @@ function output_menu($arrayitem, $target = null) {
 $system_menu = array();
 $system_menu[] = array(gettext("Logout"), "/index.php?logout");
 $system_menu[] = array(gettext("Advanced"), "/system_advanced_admin.php");
-$system_menu[] = array(gettext("Upgrade"), "/pkg_mgr_install.php?id=firmware");
+$system_menu[] = array(gettext("Update"), "/pkg_mgr_install.php?id=firmware");
 $system_menu[] = array(gettext("General Setup"), "/system.php");
 $system_menu[] = array(gettext("High Avail. Sync"), "/system_hasync.php");
 if ($g['platform'] == $g['product_name'] or $g['platform'] == "nanobsd") {
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 6917c02..ff5dd60 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -258,7 +258,7 @@ $tab_array[] = array(gettext("Installed packages"), false, "pkg_mgr_installed.ph
 $tab_array[] = array(gettext("Package Installer"), true, "");
 
 if($firmwareupdate) {
-	$tab_array[] = array(gettext("Updater Settings"), false, "system_update_settings.php");
+	$tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php");
 }
 
 display_top_tabs($tab_array);
@@ -306,7 +306,7 @@ if ($input_errors)
 <?php
 			} else if ($firmwareupdate) {
 ?>
-				<?=$g['product_name']?> <?=gettext(" system firmware update")?>
+				<?=$g['product_name']?> <?=gettext(" system update")?>
 <?php
 			} else {
 ?>
@@ -323,7 +323,7 @@ if ($input_errors)
 ?>
 		<div class="form-group">
 			<label class="col-sm-2 control-label">
-				<?=gettext("Installed firmware")?>
+				<?=gettext("Current base system")?>
 			</label>
 			<div class="col-sm-10">
 				<?=$firmwareversion['installed_version']?>
@@ -332,7 +332,7 @@ if ($input_errors)
 
 		<div class="form-group">
 			<label class="col-sm-2 control-label">
-				<?=gettext("Newest firmware")?>
+				<?=gettext("Latest base system")?>
 			</label>
 			<div class="col-sm-10">
 				<?=$firmwareversion['version']?>
diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php
index e09bd61..ce8eb69 100644
--- a/src/usr/local/www/system_update_settings.php
+++ b/src/usr/local/www/system_update_settings.php
@@ -124,8 +124,8 @@ if ($savemsg)
 	print_info_box($savemsg, 'success');
 
 $tab_array = array();
-$tab_array[] = array(gettext("Updater Settings"), true, "system_update_settings.php");
-$tab_array[] = array(gettext("Upgrade"), false, "pkg_mgr_install.php?id=firmware");
+$tab_array[] = array(gettext("Update Settings"), true, "system_update_settings.php");
+$tab_array[] = array(gettext("Update"), false, "pkg_mgr_install.php?id=firmware");
 display_top_tabs($tab_array);
 
 require_once('classes/Form.class.php');
-- 
cgit v1.1