Merge pull request #703 from fabianfrz/translation

translation fixes

src/etc/inc/authgui.inc

@@ -386,7 +386,7 @@ function display_login_form()
 	<div class="container">
 		<?php
         if (is_ipaddr($http_host) && !$local_ip && !isset($config['system']['webgui']['nohttpreferercheck'])) {
-            print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br /><br />If you did not setup this forwarding, you may be the target of a man-in-the-middle attack."));
+            print_info_box(sprintf(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. %sIf you did not setup this forwarding, you may be the target of a man-in-the-middle attack."),'<br /><br />'));
         }
                 $loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"';
             ?>

src/www/firewall_nat_1to1_edit.php

@@ -325,7 +325,7 @@ include("head.inc");
                       <input name="external" type="text" value="<?=$pconfig['external'];?>" />
                       <br />
                       <div class="hidden" for="help_for_external">
-                        <?=gettext("Enter the external (usually on a WAN) subnet's starting address for the 1:1 mapping.  ");?><br />
+                        <?=gettext("Enter the external (usually on a WAN) subnet's starting address for the 1:1 mapping.");?><br />
                         <?=gettext("The subnet mask from the internal address below will be applied to this IP address."); ?><br />
                         <?=gettext("Hint: this is generally an address owned by the router itself on the selected interface."); ?>
                       </div>

src/www/services_dhcp.php

@@ -1103,15 +1103,12 @@ include("head.inc");
 										</tr>
 										<tr>
 										<td width="22%" valign="top">&nbsp;</td>
-										<td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
-											</strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system_general.php"><?=gettext("System: " .
-											"General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " .
-											"forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " .
-											"be assigned to clients by the DHCP server."); ?><br />
+										<td width="78%"> <p><?=gettext("Note:");?><br />
+											<?=sprintf(gettext("The DNS servers entered in %sSystem: " .
+											"General setup%s (or the %sDNS forwarder%s, if enabled), will be assigned to clients by the DHCP server."),'<a href="system_general.php">','</a>','<a href="services_dnsmasq.php">','</a>'); ?><br />
 											<br />
-											<?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcp_leases.php"><?=gettext("Status: " .
-											"DHCP leases"); ?></a> <?=gettext("page."); ?><br />
-											</span></p>
+											<?=sprintf(gettext("The DHCP lease table can be viewed on the %sStatus: DHCP leases%s page."),'<a href="status_dhcp_leases.php">','</a>') ?><br />
+											</p>
 										</td>
 										</tr>
 									</table>

src/www/system_advanced_admin.php

@@ -453,10 +453,11 @@ include("head.inc");
                     <input name="nohttpreferercheck" type="checkbox" value="yes" <?= !empty($pconfig['nohttpreferercheck']) ? "checked=\"checked\"" : "";?> />
                     <strong><?=gettext("Disable HTTP_REFERER enforcement check"); ?></strong>
                     <div class="hidden" for="help_for_nohttpreferercheck">
-                      <?=gettext("When this is unchecked, access to the webConfigurator " .
+                      <?=sprintf(gettext("When this is unchecked, access to the webConfigurator " .
                                           "is protected against HTTP_REFERER redirection attempts. " .
                                           "Check this box to disable this protection if you find that it interferes with " .
-                                          "webConfigurator access in certain corner cases such as using external scripts to interact with this system. More information on HTTP_REFERER is available from <a target='_blank' href='http://en.wikipedia.org/wiki/HTTP_referrer'>Wikipedia</a>."); ?>
+                                          "webConfigurator access in certain corner cases such as using external scripts to interact with this system. More information on HTTP_REFERER is available from %sWikipedia%s."),
+                                          '<a target="_blank" href="http://en.wikipedia.org/wiki/HTTP_referrer">','</a>') ?>
                     </div>
                   </td>
                 </tr>