From 94e161436dcc55bb94a0d790b9773eacf7323dae Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Sat, 7 Nov 2015 15:55:44 +0100
Subject: [PATCH 1/5] fixes for #427 in firewall_rules_edit.php

---
 src/www/firewall_rules_edit.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index f8714f143..cac38a390 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -664,13 +664,13 @@ include("head.inc");
                     <td width="78%">
                       <select name="type" class="selectpicker" data-live-search="true" data-size="5" >
 <?php
-                        $type_options = array('Pass', 'Block', 'Reject');
+                        $type_options = array('Pass' => gettext('Pass'), 'Block' => gettext('Block'), 'Reject' => gettext('Reject'));
                         if (!empty($pconfig['floating'])) {
-                            $type_options[] = 'Match';
+                            $type_options['Match'] = gettext('Match');
                         }
-                        foreach ($type_options as $type): ?>
+                        foreach ($type_options as $type => $type_translated): ?>
                         <option value="<?=strtolower($type);?>" <?= strtolower($type) == strtolower($pconfig['type']) ? "selected=\"selected\"" :""; ?>>
-                          <?=$type;?>
+                          <?=$type_translated;?>
                         </option>
 <?php
                         endforeach; ?>
@@ -1124,7 +1124,7 @@ include("head.inc");
                     <td><a id="help_for_sourceos" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Source OS");?></td>
                     <td>
                         <select name="os" class="selectpicker" data-live-search="true" data-size="5" data-width="auto">
-                          <option value="" <?= empty($pconfig['os']) ? "selected=\"selected\"" : ""; ?>>Any</option>
+                        <option value="" <?= empty($pconfig['os']) ? "selected=\"selected\"" : ""; ?>><?= gettext('Any') ?></option>
 <?php
                           foreach ($ostypes as $ostype): ?>
                             <option value="<?=$ostype;?>" <?= $ostype == $pconfig['os'] ? "selected=\"selected\"" : ""; ?>>

From b06b01a0b2c5a8cb8c12f55b8d96f73584027b83 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Sat, 7 Nov 2015 16:33:26 +0100
Subject: [PATCH 2/5] fixes for #427 in status_graph.php

---
 src/www/status_graph.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/www/status_graph.php b/src/www/status_graph.php
index b093672c6..bb46d351a 100644
--- a/src/www/status_graph.php
+++ b/src/www/status_graph.php
@@ -204,9 +204,9 @@ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enabl
 					      <thead>
 					        <tr>
 					          <th><?=gettext("Interface"); ?></th>
-					          <th>Sort by</th>
-					          <th>Filter</th>
-					          <th>Display</th>
+                    <th><?= gettext('Sort by') ?></th>
+                    <th><?= gettext('Filter') ?></th>
+                    <th><?= gettext('Display') ?></th>
 					        </tr>
 					      </thead>
 					      <tbody>
@@ -221,18 +221,18 @@ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enabl
 						?>
 						</select></td>
 					          <td><select id="sort" name="sort" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
-							<option value="">Bw In</option>
-							<option value="out"<?php if ($cursort == "out") echo " selected=\"selected\"";?>>Bw Out</option>
+              <option value=""><?= gettext('Bw In') ?></option>
+              <option value="out"<?php if ($cursort == "out") echo " selected=\"selected\"";?>><?= gettext('Bw Out') ?></option>
 						</select></td>
 					          <td><select id="filter" name="filter" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
-							<option value="local"<?php if ($curfilter == "local") echo " selected=\"selected\"";?>>Local</option>
-							<option value="remote"<?php if ($curfilter == "remote") echo " selected=\"selected\"";?>>Remote</option>
-							<option value="all"<?php if ($curfilter == "all") echo " selected=\"selected\"";?>>All</option>
+              <option value="local"<?php if ($curfilter == "local") echo " selected=\"selected\"";?>><?= gettext('Local') ?></option>
+              <option value="remote"<?php if ($curfilter == "remote") echo " selected=\"selected\"";?>><?= gettext('Remote') ?></option>
+              <option value="all"<?php if ($curfilter == "all") echo " selected=\"selected\"";?>><?= gettext('All') ?></option>
 						</select></td>
 					          <td><select id="hostipformat" name="hostipformat" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
-							<option value="">IP Address</option>
-							<option value="hostname"<?php if ($curhostipformat == "hostname") echo " selected";?>>Host Name</option>
-							<option value="fqdn"<?php if ($curhostipformat == "fqdn") echo " selected=\"selected\"";?>>FQDN</option>
+              <option value=""><?= gettext('IP Address') ?></option>
+              <option value="hostname"<?php if ($curhostipformat == "hostname") echo " selected";?>><?= gettext('Host Name') ?></option>
+              <option value="fqdn"<?php if ($curhostipformat == "fqdn") echo " selected=\"selected\"";?>><?= gettext('FQDN') ?></option>
 						</select></td>
 					        </tr>
 					      </tbody>

From 162fdcb222b1146567e5163c8524d62c94b66964 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Sat, 7 Nov 2015 19:35:22 +0100
Subject: [PATCH 3/5] fixes for #427 in interfaces_wireless.php

---
 src/www/interfaces_wireless.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/www/interfaces_wireless.php b/src/www/interfaces_wireless.php
index 96c3670fd..480291149 100644
--- a/src/www/interfaces_wireless.php
+++ b/src/www/interfaces_wireless.php
@@ -68,7 +68,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("Wireless"));
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_wireless_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_wireless_edit.php', 'label'=>gettext('Add')),
 );
 
 ?>

From 1961849d747a14f370bcf92214471d3613357496 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Sat, 7 Nov 2015 19:46:14 +0100
Subject: [PATCH 4/5] fixes for #427

---
 src/www/interfaces_bridge.php | 2 +-
 src/www/interfaces_gif.php    | 2 +-
 src/www/interfaces_gre.php    | 2 +-
 src/www/interfaces_ppps.php   | 2 +-
 src/www/interfaces_qinq.php   | 2 +-
 src/www/interfaces_vlan.php   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/www/interfaces_bridge.php b/src/www/interfaces_bridge.php
index f156e4e96..a4dfe2d4a 100644
--- a/src/www/interfaces_bridge.php
+++ b/src/www/interfaces_bridge.php
@@ -81,7 +81,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("Bridge"));
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_bridge_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_bridge_edit.php', 'label'=>gettext('Add')),
 );
 
 ?>
diff --git a/src/www/interfaces_gif.php b/src/www/interfaces_gif.php
index 8086e705d..b8b016401 100644
--- a/src/www/interfaces_gif.php
+++ b/src/www/interfaces_gif.php
@@ -72,7 +72,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("GIF"));
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_gif_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_gif_edit.php', 'label'=>gettext('Add')),
 );
 
 ?>
diff --git a/src/www/interfaces_gre.php b/src/www/interfaces_gre.php
index 23bf34801..b701ebfc8 100644
--- a/src/www/interfaces_gre.php
+++ b/src/www/interfaces_gre.php
@@ -72,7 +72,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("GRE"));
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_gre_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_gre_edit.php', 'label'=>gettext('Add')),
 );
 
 ?>
diff --git a/src/www/interfaces_ppps.php b/src/www/interfaces_ppps.php
index 010e68592..1f44b74c2 100644
--- a/src/www/interfaces_ppps.php
+++ b/src/www/interfaces_ppps.php
@@ -73,7 +73,7 @@ $pgtitle = gettext("Interfaces: PPPs");
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_ppps_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_ppps_edit.php', 'label'=>gettext('Add')),
 );
 
 ?>
diff --git a/src/www/interfaces_qinq.php b/src/www/interfaces_qinq.php
index e4bea5546..9ab18081c 100644
--- a/src/www/interfaces_qinq.php
+++ b/src/www/interfaces_qinq.php
@@ -80,7 +80,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("QinQ"));
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_qinq_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_qinq_edit.php', 'label'=>gettext('Add')),
 );
 
 ?>
diff --git a/src/www/interfaces_vlan.php b/src/www/interfaces_vlan.php
index aed181d43..da90a7fda 100644
--- a/src/www/interfaces_vlan.php
+++ b/src/www/interfaces_vlan.php
@@ -78,7 +78,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("VLAN"));
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_vlan_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_vlan_edit.php', 'label'=>gettext('Add')),
 );
 
 

From 45f297add6d527252e3b0b4df54270702c7d1e73 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Sat, 7 Nov 2015 19:50:33 +0100
Subject: [PATCH 5/5] fixes for #427 in interfaces_lagg.php

---
 src/www/interfaces_lagg.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/www/interfaces_lagg.php b/src/www/interfaces_lagg.php
index accdc80fd..060c7150b 100644
--- a/src/www/interfaces_lagg.php
+++ b/src/www/interfaces_lagg.php
@@ -77,7 +77,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("LAGG"));
 include("head.inc");
 
 $main_buttons = array(
-	array('href'=>'interfaces_lagg_edit.php', 'label'=>'Add'),
+	array('href'=>'interfaces_lagg_edit.php', 'label'=>gettext('Add')),
 );
 
 ?>