From cfb4c9f1c9a5fa315361b86f5ed25b044a0df930 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Fri, 29 Jan 2016 17:55:14 +0100
Subject: [PATCH] fix some whitespace

---
 src/etc/inc/services.inc             | 2 +-
 src/etc/inc/vpn.inc                  | 2 +-
 src/www/firewall_aliases_import.php  | 2 +-
 src/www/interfaces.php               | 2 +-
 src/www/system_advanced_firewall.php | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 4d701463c..55b3886a4 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -527,7 +527,7 @@ EOD;
 					}
 				}
 			} else {
-				log_error(gettext("Warning!  DHCP Failover setup and no CARP virtual IPs defined!"));
+				log_error(gettext("Warning! DHCP Failover setup and no CARP virtual IPs defined!"));
 			}
 			if($skew > 10) {
 				$type = "secondary";
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index 4a8ba7f2b..5e6e2a76f 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -1004,7 +1004,7 @@ function vpn_pptpd_configure() {
 
     if (is_process_running("mpd -b")) {
       killbypid('/var/run/pptp-vpn.pid');
-      log_error(gettext("Could not kill mpd within 3 seconds.   Trying again."));
+      log_error(gettext("Could not kill mpd within 3 seconds. Trying again."));
     }
 
     /* remove mpd.conf, if it exists */
diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php
index 20184fa69..bae3fd457 100644
--- a/src/www/firewall_aliases_import.php
+++ b/src/www/firewall_aliases_import.php
@@ -189,7 +189,7 @@ include("head.inc");
                     <td>
                       <textarea name="aliasimport" rows="15" cols="40"><?=$pconfig['aliasimport'];?></textarea>
                       <div class="hidden" for="help_for_alias">
-                        <?=gettext("Paste in the aliases to import separated by a carriage return.  Common examples are lists of IPs, networks, blacklists, etc."); ?>
+                        <?=gettext("Paste in the aliases to import separated by a carriage return. Common examples are lists of IPs, networks, blacklists, etc."); ?>
                         <br />
                         <?=gettext("The list may contain IP addresses, with or without CIDR prefix, IP ranges, blank lines (ignored) and an optional description after each IP. e.g.:"); ?>
                         <code>
diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index 397ddaf80..3b4afa790 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -3025,7 +3025,7 @@ include("head.inc");
                             <div class="hidden" for="help_for_regdomain">
                               <?=gettext("These settings may affect which channels are available and the maximum transmit power allowed on those channels.  Using the correct settings to comply with local regulatory requirements is recommended."); ?>
                               <br />
-                              <?=gettext("Note: All wireless networks on this interface will be temporarily brought down when changing regulatory settings.  Some of the regulatory domains or country codes may not be allowed by some cards.  These settings may not be able to add additional channels that are not already supported."); ?>
+                              <?=gettext("Note: All wireless networks on this interface will be temporarily brought down when changing regulatory settings. Some of the regulatory domains or country codes may not be allowed by some cards. These settings may not be able to add additional channels that are not already supported."); ?>
                             </div>
                           </td>
                         </tr>
diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php
index e03862c0c..cbee7d3d4 100644
--- a/src/www/system_advanced_firewall.php
+++ b/src/www/system_advanced_firewall.php
@@ -377,7 +377,7 @@ include("head.inc");
                       <strong><?=gettext("end");?></strong></br>
                       <?=gettext("When reaching this number of state entries, all timeout values become zero, effectively purging all state entries immediately.  This value is used to define the scale factor, it should not actually be reached (set a lower state limit, see below).");?>
                       <br/>
-                      <strong><?=gettext("Note:  Leave this blank for the default(0).");?></strong>
+                      <strong><?=gettext("Note: Leave this blank for the default(0).");?></strong>
                     </div>
                   </td>
                 </tr>
@@ -388,7 +388,7 @@ include("head.inc");
                     <div class="hidden" for="help_for_maximumstates">
                       <strong><?=gettext("Maximum number of connections to hold in the firewall state table.");?></strong>
                       <br />
-                      <?=gettext("Note:  Leave this blank for the default.  On your system the default size is:");?> <?= default_state_size() ?>
+                      <?=gettext("Note: Leave this blank for the default.  On your system the default size is:");?> <?= default_state_size() ?>
                     </div>
                   </td>
                 </tr>
@@ -399,7 +399,7 @@ include("head.inc");
                     <div class="hidden" for="help_for_maximumtableentries">
                       <strong><?=gettext("Maximum number of table entries for systems such as aliases, sshlockout, snort, etc, combined.");?></strong>
                       <br />
-                      <?=gettext("Note:  Leave this blank for the default.");?>
+                      <?=gettext("Note: Leave this blank for the default.");?>
 <?php
                       if (empty($pconfig['maximumtableentries'])) :?>
                         <?= gettext("On your system the default size is:");?> <?= default_table_entries_size(); ?>