From f91112ed7e8118a24da10e5560ee33e7c898a7c3 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Mon, 25 Jan 2016 10:46:03 +0100
Subject: [PATCH] translation fixes

---
 src/www/services_dhcp.php         | 15 ++++++---------
 src/www/system_advanced_admin.php |  5 +++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 08480b473..7ab42c8eb 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -890,7 +890,7 @@ include("head.inc");
 										<td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP:");?></td>
 										<td width="78%" class="vtable">
 											<input name="failover_peerip" type="text" class="form-control host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>" /><br />
-											<?=gettext("Leave blank to disable.  Enter the interface IP address of the other machine.  Machines must be using CARP. Interface's advskew determines whether the DHCPd process is Primary or Secondary. Ensure one machine's advskew<20 (and the other is >20).");?>
+											<?=htmlspecialchars(gettext("Leave blank to disable.  Enter the interface IP address of the other machine.  Machines must be using CARP. Interface's advskew determines whether the DHCPd process is Primary or Secondary. Ensure one machine's advskew<20 (and the other is >20)."));?>
 										</td>
 										</tr>
 										<?php endif; ?>
@@ -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>
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php
index d8f40348f..36a08a5e9 100644
--- a/src/www/system_advanced_admin.php
+++ b/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>