xt string changes

2 files changed, 16 insertions, 9 deletions

diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index ff5dd60..ba4dc2e 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -255,8 +255,11 @@ include("head.inc");
 $tab_array = array();
 $tab_array[] = array(gettext("Available packages"), false, "pkg_mgr.php");
 $tab_array[] = array(gettext("Installed packages"), false, "pkg_mgr_installed.php");
-$tab_array[] = array(gettext("Package Installer"), true, "");
-
+if($firmwareupdate) {
+	$tab_array[] = array(gettext("System update"), true, "");
+} else {
+	$tab_array[] = array(gettext("Package Installer"), true, "");
+}
 if($firmwareupdate) {
 	$tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php");
 }
@@ -350,7 +353,7 @@ if ($input_errors)
 			<label class="col-sm-2 control-label">
 			</label>
 			<div class="col-sm-10">
-				<?=($firmwareversion) ? gettext("System firmware is up to date") : ""?>
+				<?=($firmwareversion) ? gettext("System is up to date") : ""?>
 			</div>
 		</div>
 <?php
@@ -367,7 +370,7 @@ if ($input_errors)
 <?php endif;
 
 if($firmwareupdate && !$firmwareversion) {
-	print_info_box(gettext("Unable to retrieve system firmware versions"), danger);
+	print_info_box(gettext("Unable to retrieve system versions"), danger);
 }
 
 if ($_POST['mode'] == 'delete') {
@@ -400,7 +403,7 @@ if (!empty($_POST['id']) || $_POST['mode'] == "reinstallall"):
 		<div class="panel-heading">
 <?php if($firmwareupdate) {
 ?>
-			<h2 class="panel-title" id="status"><?=gettext("Updating system firmware")?></h2>
+			<h2 class="panel-title" id="status"><?=gettext("Updating system")?></h2>
 <?php } else {
 ?>
  			<h2 class="panel-title" id="status"><?=gettext("Package") . " " . $modetxt?></h2>
@@ -497,9 +500,13 @@ function setProgress(barName, percent, transition) {
 // Display a success banner
 function show_success() {
 	$('#final').removeClass("alert-info").addClass("alert-success");
-	if("<?=$_POST['mode']?>" != "reinstallall")
-		$('#final').html("<b>" + "<?=$pkgid?>" + " </b>" + "<?=$modetxt?>" + " " + "<?=gettext(' successfully completed')?>");
-	else
+	if("<?=$_POST['mode']?>" != "reinstallall") {
+		if("<?=$pkgid?>" == "firmware") {
+			$('#final').html("<b>" + "System update" + " " + "<?=gettext(' successfully completed')?>");
+		} else {
+			$('#final').html("<b>" + "<?=$pkgid?>" + " </b>" + "<?=$modetxt?>" + " " + "<?=gettext(' successfully completed')?>");
+		}
+	} else
 		$('#final').html("<?=gettext('Reinstallation of all packages successfully completed')?>");
 
 	$('#final').show();
diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php
index ce8eb69..fcc9374 100644
--- a/src/usr/local/www/system_update_settings.php
+++ b/src/usr/local/www/system_update_settings.php
@@ -125,7 +125,7 @@ if ($savemsg)
 
 $tab_array = array();
 $tab_array[] = array(gettext("Update Settings"), true, "system_update_settings.php");
-$tab_array[] = array(gettext("Update"), false, "pkg_mgr_install.php?id=firmware");
+$tab_array[] = array(gettext("System update"), false, "pkg_mgr_install.php?id=firmware");
 display_top_tabs($tab_array);
 
 require_once('classes/Form.class.php');