Merge pull request #931 from fabianfrz/translation

translation and some style

src/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt

@@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
                         updateVoucherGroupList();
                     } else {
                         // A voucher server is needed before we can add vouchers, alert user
-                        BootstrapDialog.alert('{{ lang._('Please setup a voucher server first ') }} (<a href="/system_authservers.php">{{ lang._('goto auth servers') }}</a> )');
+                        BootstrapDialog.alert('{{ lang._('Please setup a voucher server first (%sgoto auth servers%s)') | format('<a href="/system_authservers.php">','</a>') }}');
                     }
                 }
             });

src/www/interfaces_vlan_edit.php

@@ -194,11 +194,11 @@ include("head.inc");
                     </td>
                   </tr>
                   <tr>
-                    <td><a id="help_for_tag" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("VLAN tag ");?></td>
+                    <td><a id="help_for_tag" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("VLAN tag");?></td>
                     <td>
                       <input name="tag" type="text" value="<?=$pconfig['tag'];?>" />
                       <div class="hidden" for="help_for_tag">
-                        <?=gettext("802.1Q VLAN tag (between 1 and 4094) ");?>
+                        <?=gettext("802.1Q VLAN tag (between 1 and 4094)");?>
                       </div>
                     </td>
                   </tr>

src/www/services_dnsmasq.php

@@ -282,9 +282,8 @@ $( document ).ready(function() {
                     <strong><?=gettext("Query DNS servers sequentially");?></strong>
                     <div class="hidden" for="help_for_strict_order">
                       <?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
-                          "query the DNS servers sequentially in the order specified (<i>System - General Setup - DNS Servers</i>), ".
-                          "rather than all at once in parallel. ".
-                          ""), $g['product_name']); ?>
+                          "query the DNS servers sequentially in the order specified (%sSystem - General Setup - DNS Servers%s), ".
+                          "rather than all at once in parallel."), $g['product_name'],'<i>','</i>'); ?>
                     </div>
                   </td>
                 </tr>
@@ -294,9 +293,8 @@ $( document ).ready(function() {
                     <strong><?=gettext("Require domain");?></strong>
                     <div class="hidden" for="help_for_strict_order">
                       <?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
-                          "not forward A or AAAA queries for plain names, without dots or domain parts, to upstream name servers.  ".
-                          "If the name is not known from /etc/hosts or DHCP then a \"not found\" answer is returned. ".
-                          ""), $g['product_name']); ?>
+                          "not forward A or AAAA queries for plain names, without dots or domain parts, to upstream name servers. ".
+                          'If the name is not known from /etc/hosts or DHCP then a "not found" answer is returned.'), $g['product_name']); ?>
                     </div>
                   </td>
                 </tr>
@@ -306,10 +304,9 @@ $( document ).ready(function() {
                     <strong><?=gettext("Do not forward private reverse lookups");?></strong>
                     <div class="hidden" for="help_for_strict_order">
                       <?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
-                          "not forward reverse DNS lookups (PTR) for private addresses (RFC 1918) to upstream name servers.  ".
-                          "Any entries in the Domain Overrides section forwarding private \"n.n.n.in-addr.arpa\" names to a specific server are still forwarded. ".
-                          "If the IP to name is not known from /etc/hosts, DHCP or a specific domain override then a \"not found\" answer is immediately returned. ".
-                          ""), $g['product_name']); ?>
+                          "not forward reverse DNS lookups (PTR) for private addresses (RFC 1918) to upstream name servers. ".
+                          'Any entries in the Domain Overrides section forwarding private "n.n.n.in-addr.arpa" names to a specific server are still forwarded. '.
+                          'If the IP to name is not known from /etc/hosts, DHCP or a specific domain override then a "not found" answer is immediately returned.'), $g['product_name']); ?>
                     </div>
                   </td>
                 </tr>
@@ -497,7 +494,7 @@ $( document ).ready(function() {
               <tfoot>
                 <tr>
                   <td colspan="4">
-                    <?=gettext("Entries in this area override an entire domain, and subdomains, by specifying an"." authoritative DNS server to be queried for that domain.");?>
+                    <?=gettext("Entries in this area override an entire domain, and subdomains, by specifying an authoritative DNS server to be queried for that domain.");?>
                   </td>
                 </tr>
               </tfoot>

src/www/services_ntpd.php

@@ -321,7 +321,7 @@ include("head.inc");
                         <input class="btn btn-default btn-xs" type="button" onclick="show_advanced('showstatisticsbox', 'showstatistics')" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show statistics logging options");?>
                       </div>
                       <div id="showstatistics" style="display:none">
-                      <strong><?=gettext("Warning: ")?></strong><?=gettext("these options will create persistant daily log files in /var/log/ntp."); ?>
+                      <?= gettext("These options will create persistent daily log files in /var/log/ntp.") ?>
                       <br /><br />
                       <input name="clockstats" type="checkbox" id="clockstats"<?=!empty($pconfig['clockstats']) ? " checked=\"checked\"" : ""; ?> />
                       <?=gettext("Enable logging of reference clock statistics (default: disabled)."); ?>

src/www/services_snmp.php

@@ -168,7 +168,7 @@ include("head.inc");
                       </td>
                     </tr>
                     <tr>
-                      <td><a id="help_for_pollport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Polling Port ");?></td>
+                      <td><a id="help_for_pollport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Polling Port") ?></td>
                       <td>
                         <input name="pollport" type="text" value="<?=$pconfig['pollport'];?>" />
                         <div class="hidden" for="help_for_pollport">
@@ -228,7 +228,7 @@ include("head.inc");
                       </td>
                     </tr>
                     <tr>
-                      <td><a id="help_for_trapserverport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Trap server port ");?></td>
+                      <td><a id="help_for_trapserverport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Trap server port") ?></td>
                       <td>
                         <input name="trapserverport" type="text" id="trapserverport" size="40" value="<?=htmlspecialchars($pconfig['trapserverport']) ? htmlspecialchars($pconfig['trapserverport']) : htmlspecialchars(162);?>" />
                         <div class="hidden" for="help_for_trapserverport">