Commit 2c68fd3f authored by Franco Fichtner's avatar Franco Fichtner

Merge pull request #720 from fabianfrz/translation

translation fix in thermal_sensors.widget.php
parents 35a11180 fbc5401d
......@@ -527,7 +527,7 @@ EOD;
}
}
} else {
log_error(gettext("Warning! DHCP Failover setup and no CARP virtual IPs defined!"));
log_error(gettext("Warning! DHCP Failover setup and no CARP virtual IPs defined!"));
}
if($skew > 10) {
$type = "secondary";
......
......@@ -1004,7 +1004,7 @@ function vpn_pptpd_configure() {
if (is_process_running("mpd -b")) {
killbypid('/var/run/pptp-vpn.pid');
log_error(gettext("Could not kill mpd within 3 seconds. Trying again."));
log_error(gettext("Could not kill mpd within 3 seconds. Trying again."));
}
/* remove mpd.conf, if it exists */
......
......@@ -189,7 +189,7 @@ include("head.inc");
<td>
<textarea name="aliasimport" rows="15" cols="40"><?=$pconfig['aliasimport'];?></textarea>
<div class="hidden" for="help_for_alias">
<?=gettext("Paste in the aliases to import separated by a carriage return. Common examples are lists of IPs, networks, blacklists, etc."); ?>
<?=gettext("Paste in the aliases to import separated by a carriage return. Common examples are lists of IPs, networks, blacklists, etc."); ?>
<br />
<?=gettext("The list may contain IP addresses, with or without CIDR prefix, IP ranges, blank lines (ignored) and an optional description after each IP. e.g.:"); ?>
<code>
......
......@@ -3025,7 +3025,7 @@ include("head.inc");
<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."); ?>
<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("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."); ?>
</div>
</td>
</tr>
......
......@@ -985,7 +985,7 @@ include("head.inc");
</div>
<div id="showldap" style="display:none">
<input name="ldap" type="text" class="form-control unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>" /><br />
<?=gettext("Leave blank to disable. Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
<?=sprintf(gettext("Leave blank to disable. Enter a full URI for the LDAP server in the form %s"),'ldap://ldap.example.com/dc=example,dc=com')?>
</div>
</td>
</tr>
......
......@@ -519,7 +519,7 @@ include("head.inc");
</div>
<div id="showtftp" style="display:none">
<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
<?=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>
......
......@@ -711,7 +711,7 @@ include("head.inc");
</div>
<div id="showtftp" style="display:none">
<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
<?=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>
......
......@@ -373,11 +373,11 @@ include("head.inc");
<strong><?=gettext("Timeouts for states can be scaled adaptively as the number of state table entries grows.");?></strong>
<br />
<strong><?=gettext("start");?></strong></br>
<?=gettext("When the number of state entries exceeds this value, adaptive scaling begins. All timeout values are scaled linearly with factor (adaptive.end - number of states) / (adaptive.end - adaptive.start).");?><br/>
<?=gettext("When the number of state entries exceeds this value, adaptive scaling begins. All timeout values are scaled linearly with factor (adaptive.end - number of states) / (adaptive.end - adaptive.start).");?><br/>
<strong><?=gettext("end");?></strong></br>
<?=gettext("When reaching this number of state entries, all timeout values become zero, effectively purging all state entries immediately. This value is used to define the scale factor, it should not actually be reached (set a lower state limit, see below).");?>
<br/>
<strong><?=gettext("Note: Leave this blank for the default(0).");?></strong>
<strong><?=gettext("Note: Leave this blank for the default(0).");?></strong>
</div>
</td>
</tr>
......@@ -388,7 +388,7 @@ include("head.inc");
<div class="hidden" for="help_for_maximumstates">
<strong><?=gettext("Maximum number of connections to hold in the firewall state table.");?></strong>
<br />
<?=gettext("Note: Leave this blank for the default. On your system the default size is:");?> <?= default_state_size() ?>
<?=gettext("Note: Leave this blank for the default. On your system the default size is:");?> <?= default_state_size() ?>
</div>
</td>
</tr>
......@@ -399,7 +399,7 @@ include("head.inc");
<div class="hidden" for="help_for_maximumtableentries">
<strong><?=gettext("Maximum number of table entries for systems such as aliases, sshlockout, snort, etc, combined.");?></strong>
<br />
<?=gettext("Note: Leave this blank for the default.");?>
<?=gettext("Note: Leave this blank for the default.");?>
<?php
if (empty($pconfig['maximumtableentries'])) :?>
<?= gettext("On your system the default size is:");?> <?= default_table_entries_size(); ?>
......@@ -462,7 +462,7 @@ include("head.inc");
<div class="hidden" for="help_for_aliasesresolveinterval">
<strong><?=gettext("Interval, in seconds, that will be used to resolve hostnames configured on aliases.");?></strong>
<br />
<?=gettext("Note: Leave this blank for the default (300s).");?>
<?=gettext("Note: Leave this blank for the default (300s).");?>
</div>
</td>
</tr>
......@@ -520,9 +520,9 @@ include("head.inc");
<div class="hidden" for="help_for_natreflection">
<strong><?=gettext("When enabled, this automatically creates additional NAT redirect rules for access to port forwards on your external IP addresses from within your internal networks.");?></strong>
<br /><br />
<?=gettext("The NAT + proxy mode uses a helper program to send packets to the target of the port forward. It is useful in setups where the interface and/or gateway IP used for communication with the target cannot be accurately determined at the time the rules are loaded. Reflection rules are not created for ranges larger than 500 ports and will not be used for more than 1000 ports total between all port forwards. Only TCP and UDP protocols are supported.");?>
<?=gettext("The NAT + proxy mode uses a helper program to send packets to the target of the port forward. It is useful in setups where the interface and/or gateway IP used for communication with the target cannot be accurately determined at the time the rules are loaded. Reflection rules are not created for ranges larger than 500 ports and will not be used for more than 1000 ports total between all port forwards. Only TCP and UDP protocols are supported.");?>
<br /><br />
<?=gettext("The pure NAT mode uses a set of NAT rules to direct packets to the target of the port forward. It has better scalability, but it must be possible to accurately determine the interface and gateway IP used for communication with the target at the time the rules are loaded. There are no inherent limits to the number of ports other than the limits of the protocols. All protocols available for port forwards are supported.");?>
<?=gettext("The pure NAT mode uses a set of NAT rules to direct packets to the target of the port forward. It has better scalability, but it must be possible to accurately determine the interface and gateway IP used for communication with the target at the time the rules are loaded. There are no inherent limits to the number of ports other than the limits of the protocols. All protocols available for port forwards are supported.");?>
<br /><br />
<?=gettext("Individual rules may be configured to override this system setting on a per-rule basis.");?>
</div>
......@@ -546,7 +546,7 @@ include("head.inc");
<div class="hidden" for="help_for_enablebinatreflection">
<strong><?=gettext("Enables the automatic creation of additional NAT redirect rules for access to 1:1 mappings of your external IP addresses from within your internal networks.");?></strong>
<br /><br />
<?=gettext("Note: Reflection on 1:1 mappings is only for the inbound component of the 1:1 mappings. This functions the same as the pure NAT mode for port forwards. For more details, refer to the pure NAT mode description above.");?>
<?=gettext("Note: Reflection on 1:1 mappings is only for the inbound component of the 1:1 mappings. This functions the same as the pure NAT mode for port forwards. For more details, refer to the pure NAT mode description above.");?>
<br /><br />
<?=gettext("Individual rules may be configured to override this system setting on a per-rule basis.");?>
</div>
......@@ -561,7 +561,7 @@ include("head.inc");
<br />
<?=gettext("Required for full functionality of the pure NAT mode of NAT Reflection for port forwards or NAT Reflection for 1:1 NAT.");?>
<br /><br />
<?=gettext("Note: This only works for assigned interfaces. Other interfaces require manually creating the outbound NAT rules that direct the reply packets back through the router.");?>
<?=gettext("Note: This only works for assigned interfaces. Other interfaces require manually creating the outbound NAT rules that direct the reply packets back through the router.");?>
</div>
</td>
</tr>
......
......@@ -322,7 +322,7 @@ else :?>
endif; ?>
var oWin = window.open(url,"OPNsense","width=620,height=400,top=150,left=150, scrollbars=yes");
if (oWin==null || typeof(oWin)=="undefined")
alert("<?=gettext('Popup blocker detected. Action aborted.');?>");
alert("<?=gettext('Popup blocker detected. Action aborted.');?>");
}
$( document ).ready(function() {
......
......@@ -528,7 +528,7 @@ $( document ).ready(function() {
url="system_usermanager_import_ldap.php";
var oWin = window.open(url,"OPNsense","width=620,height=400,top=150,left=150,scrollbars=yes");
if (oWin==null || typeof(oWin)=="undefined") {
alert("<?=gettext('Popup blocker detected. Action aborted.');?>");
alert("<?=gettext('Popup blocker detected. Action aborted.');?>");
}
});
......
......@@ -79,7 +79,7 @@ include("head.inc");
if ($save_and_test):?>
<script type="text/javascript">
myRef = window.open('system_usermanager_settings_test.php?authserver=<?=$pconfig['authmode'];?>','mywin','left=20,top=20,width=700,height=550,toolbar=1,resizable=0');
if (myRef==null || typeof(myRef)=='undefined') alert('<?=gettext("Popup blocker detected. Action aborted.");?>');
if (myRef==null || typeof(myRef)=='undefined') alert('<?=gettext("Popup blocker detected. Action aborted.");?>');
</script>;
<?php
endif;?>
......
......@@ -267,8 +267,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue)
</tr>
<tr>
<td colspan="3">
<span>* <?= gettext('You can configure a proper Thermal Sensor / Module under <br />
&nbsp;&nbsp;&nbsp;<a href="system_advanced_misc.php">System &gt; Advanced &gt; Miscellaneous : Thermal Sensors section</a>.') ?></span>
<span>* <?= sprintf(gettext('You can configure a proper Thermal Sensor / Module %shere%s.'),'<a href="system_advanced_misc.php">','</a>') ?></span>
</td>
</tr>
</table>
......
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