Merge branch 'master' of rcs.pfsense.org:pfsense/pfsense-gettext

2 files changed, 13 insertions, 14 deletions

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 2be04dc..2360b71 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -396,7 +396,7 @@ function get_dates($curperiod, $graph) {
 						<input type="text" name="start" class="formfldunknown" length="32" value="<?php echo $start;?>">
 						<?=gettext("End:");?>
 						<input type="text" name="end" class="formfldunknown" length="32" value="<?php echo $now;?>">
-						<input type="submit" name="Submit" value="Go">
+						<input type="submit" name="Submit" value="<?=gettext("Go"); ?>">
 						<?
 						$curdatabase = $curoption;
 						$graph = "custom-$curdatabase";
diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php
index 7d80ad2..a12e22a 100755
--- a/usr/local/www/status_rrd_graph_settings.php
+++ b/usr/local/www/status_rrd_graph_settings.php
@@ -111,7 +111,6 @@ include("head.inc");
         <tr>
                 <td>
 			<?php
-<<<<<<< HEAD
                                 $tab_array = array();
                                 if($curcat == "system") { $tabactive = True; } else { $tabactive = False; }
                                 $tab_array[] = array(gettext("System"), $tabactive, "status_rrd_graph.php?cat=system");
@@ -140,35 +139,35 @@ include("head.inc");
                                 display_top_tabs($tab_array);
 				$tab_array = array();
 				if($curcat == "system") { $tabactive = True; } else { $tabactive = False; }
-				$tab_array[] = array("System", $tabactive, "status_rrd_graph.php?cat=system");
+				$tab_array[] = array(gettext("System"), $tabactive, "status_rrd_graph.php?cat=system");
 				if($curcat == "traffic") { $tabactive = True; } else { $tabactive = False; }
-				$tab_array[] = array("Traffic", $tabactive, "status_rrd_graph.php?cat=traffic");
+				$tab_array[] = array(gettext("Traffic"), $tabactive, "status_rrd_graph.php?cat=traffic");
 				if($curcat == "packets") { $tabactive = True; } else { $tabactive = False; }
-				$tab_array[] = array("Packets", $tabactive, "status_rrd_graph.php?cat=packets");
+				$tab_array[] = array(gettext("Packets"), $tabactive, "status_rrd_graph.php?cat=packets");
 				if($curcat == "quality") { $tabactive = True; } else { $tabactive = False; }
-				$tab_array[] = array("Quality", $tabactive, "status_rrd_graph.php?cat=quality");
+				$tab_array[] = array(gettext("Quality"), $tabactive, "status_rrd_graph.php?cat=quality");
 				if($queues) {
 					if($curcat == "queues") { $tabactive = True; } else { $tabactive = False; }
-						$tab_array[] = array("Queues", $tabactive, "status_rrd_graph.php?cat=queues");
+						$tab_array[] = array(gettext("Queues"), $tabactive, "status_rrd_graph.php?cat=queues");
 					if($curcat == "queuedrops") { $tabactive = True; } else { $tabactive = False; }
-						$tab_array[] = array("QueueDrops", $tabactive, "status_rrd_graph.php?cat=queuedrops");
+						$tab_array[] = array(gettext("QueueDrops"), $tabactive, "status_rrd_graph.php?cat=queuedrops");
 				}
 				if($wireless) {
 					if($curcat == "wireless") { $tabactive = True; } else { $tabactive = False; }
-						$tab_array[] = array("Wireless", $tabactive, "status_rrd_graph.php?cat=wireless");
+						$tab_array[] = array(gettext("Wireless"), $tabactive, "status_rrd_graph.php?cat=wireless");
 				}
 				if($cellular) {
 					if($curcat == "cellular") { $tabactive = True; } else { $tabactive = False; }
-						$tab_array[] = array("Cellular", $tabactive, "status_rrd_graph.php?cat=cellular");
+						$tab_array[] = array(gettext("Cellular"), $tabactive, "status_rrd_graph.php?cat=cellular");
 				}
 				if($vpnusers) {
 					if($curcat == "vpnusers") { $tabactive = True; } else { $tabactive = False; }
-						$tab_array[] = array("VPN", $tabactive, "status_rrd_graph.php?cat=vpnusers");
+						$tab_array[] = array(gettext("VPN"), $tabactive, "status_rrd_graph.php?cat=vpnusers");
 				}
 				if($curcat == "custom") { $tabactive = True; } else { $tabactive = False; }
-			        $tab_array[] = array("Custom", $tabactive, "status_rrd_graph.php?cat=custom");
+			        $tab_array[] = array(gettext("Custom"), $tabactive, "status_rrd_graph.php?cat=custom");
 				if($curcat == "settings") { $tabactive = True; } else { $tabactive = False; }
-					$tab_array[] = array("Settings", $tabactive, "status_rrd_graph_settings.php");
+					$tab_array[] = array(gettext("Settings"), $tabactive, "status_rrd_graph_settings.php");
 				
 				display_top_tabs($tab_array);
                         ?>
@@ -223,7 +222,7 @@ include("head.inc");
 			</tr>
 			<tr>
 				<td width="22%" height="53" valign="top">&nbsp;</td>
-				<td width="78%"><strong><span class="red"><?=gettext("Note:");?></span></strong><br>
+				<td width="78%"><strong><span class="red"><?=gettext("Note");?>:</span></strong><br>
 					<?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please " .
 					"take this into account after changing the style.");?>
 				</td>