translation; closes #1069

Omit the console changes, we are not prepared for improving
the translation there.

src/etc/inc/filter.inc

@@ -402,7 +402,7 @@ function filter_configure_sync()
         mwexec("/sbin/pfctl -e", true);
     } else {
         mwexec("/sbin/pfctl -d", true);
-        update_filter_reload_status(gettext("Filter is disabled.  Not loading rules."));
+        update_filter_reload_status(gettext("Filter is disabled. Not loading rules."));
         if (file_exists("/var/run/booting")) {
             echo gettext("done.") . "\n";
         }

src/www/firewall_rules_edit.php

@@ -1376,11 +1376,12 @@ include("head.inc");
                               <?=gettext("Hint: Select which type of state tracking mechanism you would like to use. If in doubt, use keep state.");?>
                             </span>
                               <ul>
-                                <li><strong><?=gettext("keep state");?> </strong><?=gettext("Works with all IP protocols.");?></li>
-                                <li><strong><?=gettext("sloppy state");?> </strong><?=gettext("Works with all IP protocols.");?></li>
-                                <li><strong><?=gettext("synproxy state");?> </strong><?=gettext("Proxies incoming TCP connections to help protect servers from spoofed TCP SYN floods. This option includes the functionality of keep state and modulate state combined.");?></li>
-                                <li><strong><?=gettext("none");?> </strong><?=gettext("Do not use state mechanisms to keep track.  This is only useful if you're doing advanced queueing in certain situations.  Please check the documentation.");?> </li>
+                                <li><?= sprintf(gettext('%sKeep state%s is used for stateful connection tracking.'),'<strong>', '</strong>') ?></li>
+                                <li><?= sprintf(gettext('%sSloppy state%s works like keep state, but it does not check sequence numbers. Use it when the firewall does not see all packets.'),'<strong>', '</strong>') ?></li>
+                                <li><?= sprintf(gettext('%sSynproxy state%s proxies incoming TCP connections to help protect servers from spoofed TCP SYN floods. This option includes the functionality of keep state and modulate state combined.'),'<strong>', '</strong>') ?></li>
+                                <li><?= sprintf(gettext("%sNone%s: Do not use state mechanisms to keep track. This is only useful if you're doing advanced queueing in certain situations. Please check the documentation."),'<strong>', '</strong>') ?></li>
                               </ul>
+                              <p><?= sprintf(gettext('Source and more information can be found %shere%s.'),'<a href="https://www.freebsd.org/cgi/man.cgi?query=pf.conf&amp;sektion=5">','</a>') ?></p>
                           </div>
                         </td>
                     </tr>

src/www/firewall_schedule.php

@@ -60,7 +60,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         }
 
         if( $referenced_by !== false) {
-            $savemsg = sprintf(gettext("Cannot delete Schedule.  Currently in use by %s"),$referenced_by);
+            $savemsg = sprintf(gettext("Cannot delete Schedule. Currently in use by %s"),$referenced_by);
         } else {
             unset($a_schedules[$id]);
             write_config();

src/www/firewall_virtual_ip_edit.php

@@ -436,7 +436,7 @@ $( document ).ready(function() {
 
                       <div class="hidden" for="help_for_adv">
                         <br/>
-                        <?=gettext("The frequency that this machine will advertise.  0 usually means master. Otherwise the lowest combination of both values in the cluster determines the master.");?>
+                        <?=gettext("The frequency that this machine will advertise. 0 usually means master. Otherwise the lowest combination of both values in the cluster determines the master.");?>
                       </div>
                     </td>
                   </tr>

src/www/interfaces.php

@@ -868,7 +868,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                       $old_wireless_mode = $a_interfaces[$if]['wireless']['mode'];
                       $a_interfaces[$if]['wireless']['mode'] = $pconfig['mode'];
                       if (!interface_wireless_clone("{$wlanif}_", $a_interfaces[$if])) {
-                          $input_errors[] = sprintf(gettext("Unable to change mode to %s.  You may already have the maximum number of wireless clones supported in this mode."), $wlan_modes[$a_interfaces[$if]['wireless']['mode']]);
+                          $input_errors[] = sprintf(gettext("Unable to change mode to %s. You may already have the maximum number of wireless clones supported in this mode."), $wlan_modes[$a_interfaces[$if]['wireless']['mode']]);
                       } else {
                           mwexec("/sbin/ifconfig " . escapeshellarg($wlanif) . "_ destroy");
                       }
@@ -904,7 +904,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                     } elseif (strlen($pconfig['key' . $i]) == 28) {
                         continue;
                     } else {
-                        $input_errors[] =  gettext("Invalid WEP key size.   Sizes should be 40 (64) bit keys or 104 (128) bit.");
+                        $input_errors[] =  gettext("Invalid WEP key size. Sizes should be 40 (64) bit keys or 104 (128) bit.");
                     }
                 }
             }
@@ -916,7 +916,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 }
             }
         }
-        // save  form data
+        // save form data
         if (count($input_errors) == 0) {
             $old_config = $a_interfaces[$if];
             $new_config = array();
@@ -1508,7 +1508,7 @@ include("head.inc");
       });
 
 
-      // Identity Association Statement -> Non-Temporary Address Allocation  change
+      // Identity Association Statement -> Non-Temporary Address Allocation change
       $("#adv_dhcp6_id_assoc_statement_address_enable").change(function(){
         if ($("#adv_dhcp6_id_assoc_statement_address_enable").prop('checked')) {
             $("#show_adv_dhcp6_id_assoc_statement_address").removeClass("hidden");
@@ -2233,7 +2233,7 @@ include("head.inc");
                 <!-- Section : PPTP / L2TP -->
                 <div class="tab-content content-box col-xs-12 __mb" id="pptp" style="display:none">
                   <div class="table-responsive">
-                    <table  class="table table-striped opnsense_standard_table_form">
+                    <table class="table table-striped opnsense_standard_table_form">
                       <thead>
                         <tr>
                           <th colspan="2"><?=gettext("PPTP/L2TP configuration"); ?></th>
@@ -2504,12 +2504,12 @@ include("head.inc");
                             <input name="adv_dhcp6_interface_statement_information_only_enable" type="checkbox" id="adv_dhcp6_interface_statement_information_only_enable" <?=!empty($pconfig['adv_dhcp6_interface_statement_information_only_enable']) ? "checked=\"checked\"" : "";?> />
                             <strong><?=gettext("Information Only"); ?></strong><br/>
                             <div class="hidden" for="help_for_dhcp6_intf_stmt">
-                              <?=gettext("This statement specifies dhcp6c to  only exchange informational configuration parameters with servers. ".
-                              "A list of DNS server  addresses is an  example  of such  parameters. ".
+                              <?=gettext("This statement specifies dhcp6c to only exchange informational configuration parameters with servers. ".
+                              "A list of DNS server addresses is an example of such parameters. ".
                               "This statement is useful when the client does not need ".
-                              "stateful configuration parameters such as IPv6 addresses or  prefixes.");?><br/>
+                              "stateful configuration parameters such as IPv6 addresses or prefixes.");?><br/>
                               <small>
-                                <?=gettext("source: FreeBSD man page");?>
+                                <?=gettext("Source: FreeBSD man page");?>
                               </small>
                             </div>
                             <br/>
@@ -2519,7 +2519,7 @@ include("head.inc");
                               <?=gettext("The values in this field are DHCP send options to be sent when requesting a DHCP lease.  [option declaration [, ...]] <br />" .
                               "Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br />" .
                               "Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br />" .
-                              "Some DHCP services may require certain options be or not be sent. "); ?>
+                              "Some DHCP services may require certain options be or not be sent."); ?>
                             </div>
                             <br />
                             <br />
@@ -2800,7 +2800,7 @@ include("head.inc");
                               endfor;?>
                             </select>
                             <div class="hidden" for="help_for_txpower">
-                              <?=gettext("Note: Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value.  Not all adapters support changing the transmit power setting."); ?>
+                              <?=gettext("Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value. Not all adapters support changing the transmit power setting."); ?>
                             </div>
                           </td>
                         </tr>
@@ -2824,7 +2824,7 @@ include("head.inc");
                             <div class="hidden" for="help_for_channel">
                               <?=gettext("Legend: wireless standards - channel # (frequency @ max TX power / TX power allowed in reg. domain)"); ?>
                               <br />
-                              <?=gettext("Note: Not all channels may be supported by your card.  Auto may override the wireless standard selected above."); ?>
+                              <?=gettext("Not all channels may be supported by your card. Auto may override the wireless standard selected above."); ?>
                             </div>
                           </td>
                         </tr>
@@ -2926,9 +2926,9 @@ include("head.inc");
                             </select>
                             <br /><br />
                             <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."); ?>
+                              <?=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("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>
@@ -3019,9 +3019,7 @@ include("head.inc");
                           <td>
                             <input name="hidessid_enable" type="checkbox" id="hidessid_enable" value="yes" <?=!empty($pconfig['hidessid_enable']) ? "checked=\"checked\"" : "";?> />
                             <div class="hidden" for="help_for_hidessid_enable">
-                              <?=gettext("Setting this option will force the card to NOT broadcast its SSID"); ?>
-                              <br />
-                              <?=gettext("(this might create problems for some clients)."); ?>
+                              <?=gettext("Setting this option will force the card to NOT broadcast its SSID (this might create problems for some clients)."); ?>
                             </div>
                           </td>
                         </tr>
@@ -3177,7 +3175,7 @@ include("head.inc");
                           <td>
                             <input name="auth_server_addr" id="auth_server_addr" type="text" value="<?=$pconfig['auth_server_addr'];?>" />
                             <div class="hidden" for="help_for_auth_server_addr">
-                              <?=gettext("Enter the IP address of the 802.1X Authentication Server.  This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
+                              <?=gettext("Enter the IP address of the 802.1X Authentication Server. This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
                             </div>
                           </td>
                         </tr>
@@ -3202,7 +3200,7 @@ include("head.inc");
                             <input name="auth_server_addr2" id="auth_server_addr2" type="text" value="<?=$pconfig['auth_server_addr2'];?>" />
                             <div class="hidden" for="help_for_auth_server_addr2">
                               <?=gettext("Secondary 802.1X Authentication Server IP Address"); ?></br>
-                              <?=gettext("Enter the IP address of the 802.1X Authentication Server.  This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
+                              <?=gettext("Enter the IP address of the 802.1X Authentication Server. This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
                             </div>
                           </td>
                         </tr>

src/www/load_balancer_monitor_edit.php

@@ -122,7 +122,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     /* Ensure that our monitor names are unique */
     for ($i=0; isset($config['load_balancer']['monitor_type'][$i]); $i++) {
         if ($pconfig['name'] == $config['load_balancer']['monitor_type'][$i]['name'] && $i != $id) {
-            $input_errors[] = gettext("This monitor name has already been used.  Monitor names must be unique.");
+            $input_errors[] = gettext("This monitor name has already been used. Monitor names must be unique.");
         }
     }
 
@@ -139,7 +139,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
             }
             if (!empty($pconfig['options_code']) && !isset($rfc2616[$pconfig['options_code']])) {
-                  $input_errors[] = gettext("HTTP(s) codes must be from RFC2616.");
+                  $input_errors[] = gettext("HTTP(S) codes must be from RFC 2616.");
             }
             if (empty($pconfig['options_path'])) {
                 $input_errors[] = gettext("The path to monitor must be set.");

src/www/services_dhcp.php

@@ -977,7 +977,7 @@ include("head.inc");
                         </div>
                         <div id="showtftp" style="display:none">
                           <input name="tftp" type="text" size="50" value="<?=$pconfig['tftp'];?>" />
-                          <?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
+                          <?=gettext("Leave blank to disable. Enter a full hostname or IP for the TFTP server.");?>
                         </div>
                       </td>
                     </tr>
@@ -1102,7 +1102,7 @@ include("head.inc");
                             </tfoot>
                           </table>
                           <div class="hidden" for="help_for_numberoptions">
-                          <?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information.  For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank"><?=gettext("URL"); ?></a>
+                          <?= sprintf(gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information. For a list of available options please visit this %sURL%s."), '<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">', '</a>') ?>
                           </div>
                         </div>
                       </td>

src/www/services_dhcpv6.php

@@ -751,7 +751,7 @@ include("head.inc");
                             </tfoot>
                           </table>
                           <div class="hidden" for="help_for_numberoptions">
-                          <?= sprintf(gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information. For a list of available options please visit this %sURL%s"),'<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">','</a>') ?>
+                          <?= sprintf(gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information. For a list of available options please visit this %sURL%s."),'<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">','</a>') ?>
                           </div>
                         </div>
                       </td>

src/www/services_dhcpv6_relay.php

@@ -61,7 +61,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         $checksrv = explode(",", $pconfig['server']);
         foreach ($checksrv as $srv) {
             if (!is_ipaddrv6($srv)) {
-                $input_errors[] = gettext("A valid Destination Server IPv6 address  must be specified.");
+                $input_errors[] = gettext("A valid Destination Server IPv6 address must be specified.");
             }
         }
     }

src/www/services_dyndns_edit.php

@@ -367,9 +367,9 @@ include("head.inc");
                         <br />
                         <?= gettext("If you need the new IP to be included in the request, put %IP% in its place.") ?>
                         <br />
-                        <?= gettext("If you need to include multiple possible values, separate them with a |.  If your provider includes a |, escape it with \\|") ?>
+                        <?= gettext('If you need to include multiple possible values, separate them with a |. If your provider includes a |, escape it with \|') ?>
                         <br />
-                        <?= gettext("Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.") ?>
+                        <?= gettext('Tabs (\t), newlines (\n) and carriage returns (\r) at the beginning or end of the returned results are removed before comparison.') ?>
                       </div>
                     </td>
                   </tr>

src/www/vpn_openvpn_export.php

@@ -551,11 +551,9 @@ if (isset($savemsg)) {
                 <td >
                       <input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" />
                       <div class="hidden" for="help_for_openvpnmanager">
-                        <?=gettext('This will change the generated .ovpn configuration to allow for usage of the management interface.'.
-                        'And include the OpenVPNManager program in the "Windows Installers". With this OpenVPN can be used also by non-administrator users.'.
-                        'This is also useful for Windows Vista/7/8 systems where elevated permissions are needed to add routes to the system.');?>
-                        <br/>
-                        <?=gettext("NOTE: This is not currently compatible with the 64-bit OpenVPN installer. It will work with the 32-bit installer on a 64-bit system.");?>
+                        <?=gettext('This will change the generated .ovpn configuration to allow for usage of the management interface. '.
+                        'With this OpenVPN can be used also by non-administrator users. '.
+                        'This is also useful for Windows systems where elevated permissions are needed to add routes to the system.');?>
                       </div>
                 </td>
               </tr>