Commit 6411baea authored by Fabian Franz's avatar Fabian Franz Committed by Franco Fichtner

translation; closes #1069

Omit the console changes, we are not prepared for improving
the translation there.
parent 63e1ff58
...@@ -402,7 +402,7 @@ function filter_configure_sync() ...@@ -402,7 +402,7 @@ function filter_configure_sync()
mwexec("/sbin/pfctl -e", true); mwexec("/sbin/pfctl -e", true);
} else { } else {
mwexec("/sbin/pfctl -d", true); 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")) { if (file_exists("/var/run/booting")) {
echo gettext("done.") . "\n"; echo gettext("done.") . "\n";
} }
......
...@@ -1376,11 +1376,12 @@ include("head.inc"); ...@@ -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.");?> <?=gettext("Hint: Select which type of state tracking mechanism you would like to use. If in doubt, use keep state.");?>
</span> </span>
<ul> <ul>
<li><strong><?=gettext("keep state");?> </strong><?=gettext("Works with all IP protocols.");?></li> <li><?= sprintf(gettext('%sKeep state%s is used for stateful connection tracking.'),'<strong>', '</strong>') ?></li>
<li><strong><?=gettext("sloppy state");?> </strong><?=gettext("Works with all IP protocols.");?></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><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><?= 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><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("%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> </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> </div>
</td> </td>
</tr> </tr>
......
...@@ -60,7 +60,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { ...@@ -60,7 +60,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} }
if( $referenced_by !== false) { 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 { } else {
unset($a_schedules[$id]); unset($a_schedules[$id]);
write_config(); write_config();
......
...@@ -436,7 +436,7 @@ $( document ).ready(function() { ...@@ -436,7 +436,7 @@ $( document ).ready(function() {
<div class="hidden" for="help_for_adv"> <div class="hidden" for="help_for_adv">
<br/> <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> </div>
</td> </td>
</tr> </tr>
......
This diff is collapsed.
...@@ -122,7 +122,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -122,7 +122,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
/* Ensure that our monitor names are unique */ /* Ensure that our monitor names are unique */
for ($i=0; isset($config['load_balancer']['monitor_type'][$i]); $i++) { for ($i=0; isset($config['load_balancer']['monitor_type'][$i]); $i++) {
if ($pconfig['name'] == $config['load_balancer']['monitor_type'][$i]['name'] && $i != $id) { 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') { ...@@ -139,7 +139,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'."); $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']])) { 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'])) { if (empty($pconfig['options_path'])) {
$input_errors[] = gettext("The path to monitor must be set."); $input_errors[] = gettext("The path to monitor must be set.");
......
...@@ -977,7 +977,7 @@ include("head.inc"); ...@@ -977,7 +977,7 @@ include("head.inc");
</div> </div>
<div id="showtftp" style="display:none"> <div id="showtftp" style="display:none">
<input name="tftp" type="text" size="50" value="<?=$pconfig['tftp'];?>" /> <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> </div>
</td> </td>
</tr> </tr>
...@@ -1102,7 +1102,7 @@ include("head.inc"); ...@@ -1102,7 +1102,7 @@ include("head.inc");
</tfoot> </tfoot>
</table> </table>
<div class="hidden" for="help_for_numberoptions"> <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>
</div> </div>
</td> </td>
......
...@@ -751,7 +751,7 @@ include("head.inc"); ...@@ -751,7 +751,7 @@ include("head.inc");
</tfoot> </tfoot>
</table> </table>
<div class="hidden" for="help_for_numberoptions"> <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>
</div> </div>
</td> </td>
......
...@@ -61,7 +61,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -61,7 +61,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$checksrv = explode(",", $pconfig['server']); $checksrv = explode(",", $pconfig['server']);
foreach ($checksrv as $srv) { foreach ($checksrv as $srv) {
if (!is_ipaddrv6($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.");
} }
} }
} }
......
...@@ -367,9 +367,9 @@ include("head.inc"); ...@@ -367,9 +367,9 @@ include("head.inc");
<br /> <br />
<?= gettext("If you need the new IP to be included in the request, put %IP% in its place.") ?> <?= gettext("If you need the new IP to be included in the request, put %IP% in its place.") ?>
<br /> <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 /> <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> </div>
</td> </td>
</tr> </tr>
......
...@@ -551,11 +551,9 @@ if (isset($savemsg)) { ...@@ -551,11 +551,9 @@ if (isset($savemsg)) {
<td > <td >
<input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" /> <input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" />
<div class="hidden" for="help_for_openvpnmanager"> <div class="hidden" for="help_for_openvpnmanager">
<?=gettext('This will change the generated .ovpn configuration to allow for usage of the management interface.'. <?=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.'. '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.');?> 'This is also useful for Windows 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.");?>
</div> </div>
</td> </td>
</tr> </tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment