Skip to content

O
OpnSense
Commit 62237a02 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

Merge pull request #640 from fabianfrz/fix_from_dokukaefer 

Fix from @DokuKaefer
parents 9ac9d0a4 e856a022
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 68 deletions
src/www/firewall_nat_out_edit.php
View file @ 62237a02
...@@ -601,10 +601,9 @@ include("head.inc"); ...@@ -601,10 +601,9 @@ include("head.inc");
</table> </table>
<div class="hidden" for="help_for_target"> <div class="hidden" for="help_for_target">
<?=gettext("Packets matching this rule will be mapped to the IP address given here.");?><br /> <?=gettext("Packets matching this rule will be mapped to the IP address given here.");?><br />
<?=gettext("If you want this rule to apply to another IP address rather than the IP address of the interface chosen above, ". <?=sprintf(gettext("If you want this rule to apply to another IP address rather than the IP address of the interface chosen above, ".
"select it here (you will need to define ");?> "select it here (you will need to define %sVirtual IP addresses%s on the interface first)."),'<a href="firewall_virtual_ip.php">','</a>')?>
<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a>
<?=gettext("addresses on the interface first).");?>
</div> </div>
</td> </td>
</tr> </tr>
......
src/www/interfaces.php
View file @ 62237a02
...@@ -1704,8 +1704,7 @@ include("head.inc"); ...@@ -1704,8 +1704,7 @@ include("head.inc");
<input name="blockpriv" type="checkbox" id="blockpriv" value="yes" <?=!empty($pconfig['blockpriv']) ? "checked=\"checked\"" : ""; ?> /> <input name="blockpriv" type="checkbox" id="blockpriv" value="yes" <?=!empty($pconfig['blockpriv']) ? "checked=\"checked\"" : ""; ?> />
<div class="hidden" for="help_for_blockpriv"> <div class="hidden" for="help_for_blockpriv">
<?=gettext("When set, this option blocks traffic from IP addresses that are reserved " . <?=gettext("When set, this option blocks traffic from IP addresses that are reserved " .
"for private networks as per RFC 1918 (10/8, 172.16/12, 192.168/16) as"); ?> "for private networks as per RFC 1918 (10/8, 172.16/12, 192.168/16) as well as loopback addresses (127/8)."); ?>&nbsp;&nbsp; <?=gettext("You should generally " .
<?=gettext("well as loopback addresses (127/8)."); ?>&nbsp;&nbsp; <?=gettext("You should generally " .
"leave this option turned on, unless your WAN network lies in such " . "leave this option turned on, unless your WAN network lies in such " .
"a private address space, too."); ?> "a private address space, too."); ?>
</div> </div>
......
src/www/system_certmanager.php
View file @ 62237a02
...@@ -776,9 +776,7 @@ $( document ).ready(function() { ...@@ -776,9 +776,7 @@ $( document ).ready(function() {
endforeach; ?> endforeach; ?>
</select> </select>
<div class="hidden" id="no_caref"> <div class="hidden" id="no_caref">
<?=gettext("No internal Certificate Authorities have been defined. You must");?> <?=sprintf(gettext("No internal Certificate Authorities have been defined. You must %sadd%s an internal CA before creating an internal certificate."),'<a href="system_camanager.php?act=new&amp;method=internal">','</a>');?>
<a href="system_camanager.php?act=new&amp;method=internal"><?=gettext("create");?></a>
<?=gettext("an internal CA before creating an internal certificate.");?>
</div> </div>
</td> </td>
</tr> </tr>
......
src/www/system_general.php
View file @ 62237a02
...@@ -338,7 +338,7 @@ include("head.inc"); ...@@ -338,7 +338,7 @@ include("head.inc");
<div class="hidden" for="help_for_domain"> <div class="hidden" for="help_for_domain">
<?=gettext("Do not use 'local' as a domain name. It will cause local hosts running mDNS (avahi, bonjour, etc.) to be unable to resolve local hosts not running mDNS."); ?> <?=gettext("Do not use 'local' as a domain name. It will cause local hosts running mDNS (avahi, bonjour, etc.) to be unable to resolve local hosts not running mDNS."); ?>
<br /> <br />
<?=gettext("e.g."); ?> <em><?=gettext("mycorp.com, home, office, private, etc."); ?></em> <?=sprintf(gettext("e.g. %smycorp.com, home, office, private, etc.%s"),'<em>','</em>') ?>
</div> </div>
</td> </td>
</tr> </tr>
......
src/www/vpn_ipsec_keys_edit.php
View file @ 62237a02
...@@ -143,7 +143,7 @@ include("head.inc"); ...@@ -143,7 +143,7 @@ include("head.inc");
<td> <td>
<input name="ident" type="text" class="formfld unknown" id="ident" size="30" value="<?=$pconfig['ident'];?>" /> <input name="ident" type="text" class="formfld unknown" id="ident" size="30" value="<?=$pconfig['ident'];?>" />
<div class="hidden" for="help_for_ident"> <div class="hidden" for="help_for_ident">
<?=gettext("This can be either an IP address, fully qualified domain name or an e-mail address"); ?>. <?=gettext("This can be either an IP address, fully qualified domain name or an e-mail address."); ?>
</div> </div>
</td> </td>
</tr> </tr>
......
src/www/vpn_ipsec_phase1.php
View file @ 62237a02
...@@ -598,7 +598,7 @@ function dpdchkbox_change() { ...@@ -598,7 +598,7 @@ function dpdchkbox_change() {
<div class="hidden" for="help_for_disabled"> <div class="hidden" for="help_for_disabled">
<strong><?=gettext("Disable this phase1 entry"); ?></strong><br /> <strong><?=gettext("Disable this phase1 entry"); ?></strong><br />
<?=gettext("Set this option to disable this phase1 without " . <?=gettext("Set this option to disable this phase1 without " .
"removing it from the list"); ?>. "removing it from the list."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -633,7 +633,7 @@ function dpdchkbox_change() { ...@@ -633,7 +633,7 @@ function dpdchkbox_change() {
?> ?>
</select> </select>
<div class="hidden" for="help_for_iketype"> <div class="hidden" for="help_for_iketype">
<?=gettext("Select the KeyExchange Protocol version to be used. Usually known as IKEv1 or IKEv2."); ?>. <?=gettext("Select the KeyExchange Protocol version to be used. Usually known as IKEv1 or IKEv2."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -652,7 +652,7 @@ function dpdchkbox_change() { ...@@ -652,7 +652,7 @@ function dpdchkbox_change() {
?> ?>
</select> </select>
<div class="hidden" for="help_for_protocol"> <div class="hidden" for="help_for_protocol">
<?=gettext("Select the Internet Protocol family from this dropdown"); ?>. <?=gettext("Select the Internet Protocol family from this dropdown."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -692,7 +692,7 @@ function dpdchkbox_change() { ...@@ -692,7 +692,7 @@ function dpdchkbox_change() {
?> ?>
</select> </select>
<div class="hidden" for="help_for_interface"> <div class="hidden" for="help_for_interface">
<?=gettext("Select the interface for the local endpoint of this phase1 entry"); ?>. <?=gettext("Select the interface for the local endpoint of this phase1 entry."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -716,7 +716,7 @@ function dpdchkbox_change() { ...@@ -716,7 +716,7 @@ function dpdchkbox_change() {
<input name="descr" type="text" id="descr" size="40" value="<?=$pconfig['descr'];?>" /> <input name="descr" type="text" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
<div class="hidden" for="help_for_remotegw"> <div class="hidden" for="help_for_remotegw">
<?=gettext("You may enter a description here " . <?=gettext("You may enter a description here " .
"for your reference (not parsed)"); ?>. "for your reference (not parsed)."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -750,7 +750,7 @@ function dpdchkbox_change() { ...@@ -750,7 +750,7 @@ function dpdchkbox_change() {
?> ?>
</select> </select>
<div class="hidden" for="help_for_authmethod"> <div class="hidden" for="help_for_authmethod">
<?=gettext("Must match the setting chosen on the remote side"); ?>. <?=gettext("Must match the setting chosen on the remote side."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -769,7 +769,7 @@ function dpdchkbox_change() { ...@@ -769,7 +769,7 @@ function dpdchkbox_change() {
?> ?>
</select> </select>
<div class="hidden" for="help_for_mode"> <div class="hidden" for="help_for_mode">
<?=gettext("Aggressive is more flexible, but less secure"); ?>. <?=gettext("Aggressive is more flexible, but less secure."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -827,7 +827,7 @@ endforeach; ?> ...@@ -827,7 +827,7 @@ endforeach; ?>
<input name="peerid_data" type="text" id="peerid_data" size="30" value="<?=$pconfig['peerid_data'];?>" /> <input name="peerid_data" type="text" id="peerid_data" size="30" value="<?=$pconfig['peerid_data'];?>" />
<?php if (!empty($pconfig['mobile'])) { <?php if (!empty($pconfig['mobile'])) {
?> ?>
<small><?=gettext("NOTE: This is known as the \"group\" setting on some VPN client implementations"); ?>.</small> <small><?=gettext("NOTE: This is known as the \"group\" setting on some VPN client implementations."); ?></small>
<?php <?php
} ?> } ?>
</td> </td>
...@@ -838,7 +838,7 @@ endforeach; ?> ...@@ -838,7 +838,7 @@ endforeach; ?>
<input name="pre-shared-key" type="text" class="formfld unknown" id="pskey" size="40" <input name="pre-shared-key" type="text" class="formfld unknown" id="pskey" size="40"
value="<?= $pconfig['authentication_method'] == "pre_shared_key" || $pconfig['authentication_method'] == "xauth_psk_server" ? $pconfig['pre-shared-key'] : "";?>" /> value="<?= $pconfig['authentication_method'] == "pre_shared_key" || $pconfig['authentication_method'] == "xauth_psk_server" ? $pconfig['pre-shared-key'] : "";?>" />
<div class="hidden" for="help_for_psk"> <div class="hidden" for="help_for_psk">
<?=gettext("Input your Pre-Shared Key string"); ?>. <?=gettext("Input your Pre-Shared Key string."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -858,7 +858,7 @@ endforeach; ?> ...@@ -858,7 +858,7 @@ endforeach; ?>
?> ?>
</select> </select>
<div class="hidden" for="help_for_certref"> <div class="hidden" for="help_for_certref">
<?=gettext("Select a certificate previously configured in the Certificate Manager"); ?>. <?=gettext("Select a certificate previously configured in the Certificate Manager."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -881,7 +881,7 @@ endforeach; ?> ...@@ -881,7 +881,7 @@ endforeach; ?>
?> ?>
</select> </select>
<div class="hidden" for="help_for_caref"> <div class="hidden" for="help_for_caref">
<?=gettext("Select a certificate authority previously configured in the Certificate Manager"); ?>. <?=gettext("Select a certificate authority previously configured in the Certificate Manager."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -929,7 +929,7 @@ endforeach; ?> ...@@ -929,7 +929,7 @@ endforeach; ?>
?> ?>
</select> </select>
<div class="hidden" for="help_for_halgo"> <div class="hidden" for="help_for_halgo">
<?=gettext("Must match the setting chosen on the remote side"); ?>. <?=gettext("Must match the setting chosen on the remote side."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -960,7 +960,7 @@ endforeach; ?> ...@@ -960,7 +960,7 @@ endforeach; ?>
?> ?>
</select> </select>
<div class="hidden" for="help_for_dhgroup"> <div class="hidden" for="help_for_dhgroup">
<?=gettext("Must match the setting chosen on the remote side"); ?>. <?=gettext("Must match the setting chosen on the remote side."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1010,7 +1010,7 @@ endforeach; ?> ...@@ -1010,7 +1010,7 @@ endforeach; ?>
</select> </select>
<div class="hidden" for="help_for_nat_traversal"> <div class="hidden" for="help_for_nat_traversal">
<?=gettext("Set this option to enable the use of NAT-T (i.e. the encapsulation of ESP in UDP packets) if needed, " . <?=gettext("Set this option to enable the use of NAT-T (i.e. the encapsulation of ESP in UDP packets) if needed, " .
"which can help with clients that are behind restrictive firewalls"); ?>. "which can help with clients that are behind restrictive firewalls."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1026,13 +1026,13 @@ endforeach; ?> ...@@ -1026,13 +1026,13 @@ endforeach; ?>
<input name="dpd_delay" type="text" class="formfld unknown" id="dpd_delay" size="5" value="<?=$pconfig['dpd_delay'];?>" /> <input name="dpd_delay" type="text" class="formfld unknown" id="dpd_delay" size="5" value="<?=$pconfig['dpd_delay'];?>" />
<?=gettext("seconds"); ?> <?=gettext("seconds"); ?>
<div class="hidden" for="help_for_dpd_enable"> <div class="hidden" for="help_for_dpd_enable">
<?=gettext("Delay between requesting peer acknowledgement"); ?>. <?=gettext("Delay between requesting peer acknowledgement."); ?>
</div> </div>
<br /> <br />
<input name="dpd_maxfail" type="text" class="formfld unknown" id="dpd_maxfail" size="5" value="<?=$pconfig['dpd_maxfail'];?>" /> <input name="dpd_maxfail" type="text" class="formfld unknown" id="dpd_maxfail" size="5" value="<?=$pconfig['dpd_maxfail'];?>" />
<?=gettext("retries"); ?> <?=gettext("retries"); ?>
<div class="hidden" for="help_for_dpd_enable"> <div class="hidden" for="help_for_dpd_enable">
<?=gettext("Number of consecutive failures allowed before disconnect"); ?>. <?=gettext("Number of consecutive failures allowed before disconnect."); ?>
</div> </div>
</div> </div>
</td> </td>
......
src/www/vpn_l2tp.php
View file @ 62237a02
...@@ -325,12 +325,12 @@ function enable_change(enable_over) { ...@@ -325,12 +325,12 @@ function enable_change(enable_over) {
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<input name="localip" type="text" class="form-control unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>" /> <input name="localip" type="text" class="form-control unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>" />
<p class="text-muted"><em><small> <p class="text-muted"><em><small>
<?=gettext("Enter the IP address the L2TP server should give to clients for use as their \"gateway\""); ?>. <?=gettext("Enter the IP address the L2TP server should give to clients for use as their \"gateway\"."); ?>
<br /> <br />
<?=gettext("Typically this is set to an unused IP just outside of the client range"); ?>. <?=gettext("Typically this is set to an unused IP just outside of the client range"); ?>.
<br /> <br />
<br /> <br />
<?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall"); ?>.</small></em></p></td> <?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall."); ?></small></em></p></td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Remote Address Range");?></td> <td width="22%" valign="top" class="vncellreq"><?=gettext("Remote Address Range");?></td>
...@@ -374,7 +374,7 @@ function enable_change(enable_over) { ...@@ -374,7 +374,7 @@ function enable_change(enable_over) {
?> ?>
</select> </select>
<p class="text-muted"><em><small><?=gettext("Hint:"); <p class="text-muted"><em><small><?=gettext("Hint:");
?> 10 <?=gettext("is ten L2TP clients"); ?></small></em></p> ?> <?=gettext("10 is ten L2TP clients"); ?></small></em></p>
</td> </td>
</tr> </tr>
<tr> <tr>
......
src/www/vpn_openvpn_client.php
View file @ 62237a02
...@@ -964,8 +964,7 @@ endif; ?> ...@@ -964,8 +964,7 @@ endif; ?>
<td> <td>
<input name="route_no_pull" type="checkbox" value="yes" <?=!empty($pconfig['route_no_pull']) ? "checked=\"checked\"" : "" ;?> /> <input name="route_no_pull" type="checkbox" value="yes" <?=!empty($pconfig['route_no_pull']) ? "checked=\"checked\"" : "" ;?> />
<div class="hidden" for="help_for_route_no_pull"> <div class="hidden" for="help_for_route_no_pull">
<?=gettext("Don't add or remove routes automatically. Instead pass routes to ");?> <?=sprintf(gettext("Don't add or remove routes automatically. Instead pass routes to %s--route-up%s script using environmental variables"),'<strong>','</strong>') ?>.
<strong>--route-up</strong> <?=gettext("script using environmental variables"); ?>.
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1009,11 +1008,11 @@ endif; ?> ...@@ -1009,11 +1008,11 @@ endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
<div class="hidden" for="help_for_verbosity_level"> <div class="hidden" for="help_for_verbosity_level">
<?=gettext("Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what's happening without being swamped by output"); ?>.<br /> <br /> <?=gettext("Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what's happening without being swamped by output.") ?> <br /> <br />
<strong>none</strong> -- <?=gettext("No output except fatal errors"); ?>. <br /> <?=sprintf(gettext("%snone%s -- No output except fatal errors."),'<strong>','</strong>') ?> <br />
<strong>default</strong>-<strong>4</strong> -- <?=gettext("Normal usage range"); ?>. <br /> <?=sprintf(gettext("%sdefault%s-%s4%s -- Normal usage range."),'<strong>','</strong>','<strong>','</strong>'); ?> <br />
<strong>5</strong> -- <?=gettext("Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets"); ?>. <br /> <?=sprintf(gettext("%s5%s -- Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets."),'<strong>','</strong>') ?> <br />
<strong>6</strong>-<strong>11</strong> -- <?=gettext("Debug info range"); ?>. <?=sprintf(gettext("%s6%s-%s11%s -- Debug info range."),'<strong>','</strong>','<strong>','</strong>') ?>
</div> </div>
</td> </td>
</tr> </tr>
......
src/www/vpn_openvpn_csc.php
View file @ 62237a02
...@@ -441,7 +441,7 @@ if ($act!="new" && $act!="edit") { ...@@ -441,7 +441,7 @@ if ($act!="new" && $act!="edit") {
"VPN can be established. " . "VPN can be established. " .
"Expressed as a comma-separated list of one or more IP/PREFIX networks. " . "Expressed as a comma-separated list of one or more IP/PREFIX networks. " .
"You may leave this blank if there are no client-side networks to " . "You may leave this blank if there are no client-side networks to " .
"be routed"); ?>.<br /> "be routed."); ?><br />
<?=gettext("NOTE: Remember to add these subnets to the " . <?=gettext("NOTE: Remember to add these subnets to the " .
"IPv6 Remote Networks list on the corresponding OpenVPN server settings.");?> "IPv6 Remote Networks list on the corresponding OpenVPN server settings.");?>
</div> </div>
...@@ -467,7 +467,7 @@ if ($act!="new" && $act!="edit") { ...@@ -467,7 +467,7 @@ if ($act!="new" && $act!="edit") {
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<input name="push_reset" type="checkbox" value="yes" <?= !empty($pconfig['push_reset']) ? "checked=\"checked\"" : "";?> /> <input name="push_reset" type="checkbox" value="yes" <?= !empty($pconfig['push_reset']) ? "checked=\"checked\"" : "";?> />
<div class="hidden" for="help_for_push_reset"> <div class="hidden" for="help_for_push_reset">
<?=gettext("Prevent this client from receiving any server-defined client settings"); ?>. <?=gettext("Prevent this client from receiving any server-defined client settings."); ?>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -488,13 +488,13 @@ if ($act!="new" && $act!="edit") { ...@@ -488,13 +488,13 @@ if ($act!="new" && $act!="edit") {
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<input name="dns_server_enable" type="checkbox" id="dns_server_enable" value="yes" <?=!empty($pconfig['dns_server1']) || !empty($pconfig['dns_server2']) || !empty($pconfig['dns_server3']) || !empty($pconfig['dns_server4']) ? "checked=\"checked\"" : "" ;?> onclick="dns_server_change()" /> <input name="dns_server_enable" type="checkbox" id="dns_server_enable" value="yes" <?=!empty($pconfig['dns_server1']) || !empty($pconfig['dns_server2']) || !empty($pconfig['dns_server3']) || !empty($pconfig['dns_server4']) ? "checked=\"checked\"" : "" ;?> onclick="dns_server_change()" />
<div id="dns_server_data"> <div id="dns_server_data">
<?=gettext("Server"); ?> #1:&nbsp; <?=gettext("Server #1:"); ?>&nbsp;
<input name="dns_server1" type="text" class="formfld unknown" id="dns_server1" size="20" value="<?=htmlspecialchars($pconfig['dns_server1']);?>" /> <input name="dns_server1" type="text" class="formfld unknown" id="dns_server1" size="20" value="<?=htmlspecialchars($pconfig['dns_server1']);?>" />
<?=gettext("Server"); ?> #2:&nbsp; <?=gettext("Server #2:"); ?>&nbsp;
<input name="dns_server2" type="text" class="formfld unknown" id="dns_server2" size="20" value="<?=htmlspecialchars($pconfig['dns_server2']);?>" /> <input name="dns_server2" type="text" class="formfld unknown" id="dns_server2" size="20" value="<?=htmlspecialchars($pconfig['dns_server2']);?>" />
<?=gettext("Server"); ?> #3:&nbsp; <?=gettext("Server #3:"); ?>&nbsp;
<input name="dns_server3" type="text" class="formfld unknown" id="dns_server3" size="20" value="<?=htmlspecialchars($pconfig['dns_server3']);?>" /> <input name="dns_server3" type="text" class="formfld unknown" id="dns_server3" size="20" value="<?=htmlspecialchars($pconfig['dns_server3']);?>" />
<?=gettext("Server"); ?> #4:&nbsp; <?=gettext("Server #4:"); ?>&nbsp;
<input name="dns_server4" type="text" class="formfld unknown" id="dns_server4" size="20" value="<?=htmlspecialchars($pconfig['dns_server4']);?>" /> <input name="dns_server4" type="text" class="formfld unknown" id="dns_server4" size="20" value="<?=htmlspecialchars($pconfig['dns_server4']);?>" />
</div> </div>
<div class="hidden" for="help_for_dns_server"> <div class="hidden" for="help_for_dns_server">
...@@ -507,9 +507,9 @@ if ($act!="new" && $act!="edit") { ...@@ -507,9 +507,9 @@ if ($act!="new" && $act!="edit") {
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<input name="ntp_server_enable" type="checkbox" id="ntp_server_enable" value="yes" <?=!empty($pconfig['ntp_server1']) || !empty($pconfig['ntp_server2']) ? "checked=\"checked\"" : "" ;?> onclick="ntp_server_change()" /> <input name="ntp_server_enable" type="checkbox" id="ntp_server_enable" value="yes" <?=!empty($pconfig['ntp_server1']) || !empty($pconfig['ntp_server2']) ? "checked=\"checked\"" : "" ;?> onclick="ntp_server_change()" />
<div id="ntp_server_data"> <div id="ntp_server_data">
<?=gettext("Server"); ?> #1:&nbsp; <?=gettext("Server #1:"); ?>&nbsp;
<input name="ntp_server1" type="text" class="formfld unknown" id="ntp_server1" size="20" value="<?=$pconfig['ntp_server1'];?>" /> <input name="ntp_server1" type="text" class="formfld unknown" id="ntp_server1" size="20" value="<?=$pconfig['ntp_server1'];?>" />
<?=gettext("Server"); ?> #2:&nbsp; <?=gettext("Server #2:"); ?>&nbsp;
<input name="ntp_server2" type="text" class="formfld unknown" id="ntp_server2" size="20" value="<?=$pconfig['ntp_server2'];?>" /> <input name="ntp_server2" type="text" class="formfld unknown" id="ntp_server2" size="20" value="<?=$pconfig['ntp_server2'];?>" />
</div> </div>
<div class="hidden" for="help_for_ntp_server"> <div class="hidden" for="help_for_ntp_server">
...@@ -547,7 +547,7 @@ if ($act!="new" && $act!="edit") { ...@@ -547,7 +547,7 @@ if ($act!="new" && $act!="edit") {
<?=gettext("Possible options: b-node (broadcasts), p-node " . <?=gettext("Possible options: b-node (broadcasts), p-node " .
"(point-to-point name queries to a WINS server), " . "(point-to-point name queries to a WINS server), " .
"m-node (broadcast then query name server), and " . "m-node (broadcast then query name server), and " .
"h-node (query name server, then broadcast)"); ?>. "h-node (query name server, then broadcast)."); ?>
</div> </div>
Scope ID:&nbsp; Scope ID:&nbsp;
<input name="netbios_scope" type="text" class="formfld unknown" id="netbios_scope" size="30" value="<?=$pconfig['netbios_scope'];?>" /> <input name="netbios_scope" type="text" class="formfld unknown" id="netbios_scope" size="30" value="<?=$pconfig['netbios_scope'];?>" />
...@@ -556,7 +556,7 @@ if ($act!="new" && $act!="edit") { ...@@ -556,7 +556,7 @@ if ($act!="new" && $act!="edit") {
"service for NetBIOS over TCP/IP. The NetBIOS " . "service for NetBIOS over TCP/IP. The NetBIOS " .
"scope ID isolates NetBIOS traffic on a single " . "scope ID isolates NetBIOS traffic on a single " .
"network to only those nodes with the same " . "network to only those nodes with the same " .
"NetBIOS scope ID"); ?>. "NetBIOS scope ID."); ?>
</div> </div>
</div> </div>
</td> </td>
...@@ -566,9 +566,9 @@ if ($act!="new" && $act!="edit") { ...@@ -566,9 +566,9 @@ if ($act!="new" && $act!="edit") {
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<input name="wins_server_enable" type="checkbox" id="wins_server_enable" value="yes" <?=!empty($pconfig['wins_server1']) || !empty($pconfig['wins_server2']) ? "checked=\"checked\"" : "" ;?> onclick="wins_server_change()" /> <input name="wins_server_enable" type="checkbox" id="wins_server_enable" value="yes" <?=!empty($pconfig['wins_server1']) || !empty($pconfig['wins_server2']) ? "checked=\"checked\"" : "" ;?> onclick="wins_server_change()" />
<div id="wins_server_data"> <div id="wins_server_data">
<?=gettext("Server"); ?> #1: <?=gettext("Server #1:"); ?>
<input name="wins_server1" type="text" class="formfld unknown" id="wins_server1" size="20" value="<?=$pconfig['wins_server1'];?>" /> <input name="wins_server1" type="text" class="formfld unknown" id="wins_server1" size="20" value="<?=$pconfig['wins_server1'];?>" />
<?=gettext("Server"); ?> #2: <?=gettext("Server #2:"); ?>
<input name="wins_server2" type="text" class="formfld unknown" id="wins_server2" size="20" value="<?=$pconfig['wins_server2'];?>" /> <input name="wins_server2" type="text" class="formfld unknown" id="wins_server2" size="20" value="<?=$pconfig['wins_server2'];?>" />
</div> </div>
<div class="hidden" for="help_for_wins_server"> <div class="hidden" for="help_for_wins_server">
......
src/www/vpn_openvpn_server.php
View file @ 62237a02
...@@ -1508,19 +1508,19 @@ endif; ?> ...@@ -1508,19 +1508,19 @@ endif; ?>
<input name="dns_server_enable" type="checkbox" id="dns_server_enable" value="yes" <?=!empty($pconfig['dns_server1']) || !empty($pconfig['dns_server2']) || !empty($pconfig['dns_server3']) || !empty($pconfig['dns_server4']) ? "checked=\"checked\"" : "" ;?> onclick="dns_server_change()" /> <input name="dns_server_enable" type="checkbox" id="dns_server_enable" value="yes" <?=!empty($pconfig['dns_server1']) || !empty($pconfig['dns_server2']) || !empty($pconfig['dns_server3']) || !empty($pconfig['dns_server4']) ? "checked=\"checked\"" : "" ;?> onclick="dns_server_change()" />
<div id="dns_server_data" summary="dns servers"> <div id="dns_server_data" summary="dns servers">
<span> <span>
<?=gettext("Server"); ?> #1:&nbsp; <?=gettext("Server #1:"); ?>&nbsp;
</span> </span>
<input name="dns_server1" type="text" class="form-control unknown" id="dns_server1" size="20" value="<?=$pconfig['dns_server1'];?>" /> <input name="dns_server1" type="text" class="form-control unknown" id="dns_server1" size="20" value="<?=$pconfig['dns_server1'];?>" />
<span> <span>
<?=gettext("Server"); ?> #2:&nbsp; <?=gettext("Server #2:"); ?>&nbsp;
</span> </span>
<input name="dns_server2" type="text" class="form-control unknown" id="dns_server2" size="20" value="<?=$pconfig['dns_server2'];?>" /> <input name="dns_server2" type="text" class="form-control unknown" id="dns_server2" size="20" value="<?=$pconfig['dns_server2'];?>" />
<span> <span>
<?=gettext("Server"); ?> #3:&nbsp; <?=gettext("Server #3:"); ?>&nbsp;
</span> </span>
<input name="dns_server3" type="text" class="form-control unknown" id="dns_server3" size="20" value="<?=$pconfig['dns_server3'];?>" /> <input name="dns_server3" type="text" class="form-control unknown" id="dns_server3" size="20" value="<?=$pconfig['dns_server3'];?>" />
<span> <span>
<?=gettext("Server"); ?> #4:&nbsp; <?=gettext("Server #4:"); ?>&nbsp;
</span> </span>
<input name="dns_server4" type="text" class="form-control unknown" id="dns_server4" size="20" value="<?=$pconfig['dns_server4'];?>" /> <input name="dns_server4" type="text" class="form-control unknown" id="dns_server4" size="20" value="<?=$pconfig['dns_server4'];?>" />
</div> </div>
...@@ -1548,11 +1548,11 @@ endif; ?> ...@@ -1548,11 +1548,11 @@ endif; ?>
<input name="ntp_server_enable" type="checkbox" id="ntp_server_enable" value="yes" <?=!empty($pconfig['ntp_server1']) || !empty($pconfig['ntp_server2']) ? "checked=\"checked\"" : "" ;?> onclick="ntp_server_change()" /> <input name="ntp_server_enable" type="checkbox" id="ntp_server_enable" value="yes" <?=!empty($pconfig['ntp_server1']) || !empty($pconfig['ntp_server2']) ? "checked=\"checked\"" : "" ;?> onclick="ntp_server_change()" />
<div id="ntp_server_data" summary="ntp servers"> <div id="ntp_server_data" summary="ntp servers">
<span> <span>
<?=gettext("Server"); ?> #1:&nbsp; <?=gettext("Server #1:"); ?>&nbsp;
</span> </span>
<input name="ntp_server1" type="text" class="form-control unknown" id="ntp_server1" size="20" value="<?=$pconfig['ntp_server1'];?>" /> <input name="ntp_server1" type="text" class="form-control unknown" id="ntp_server1" size="20" value="<?=$pconfig['ntp_server1'];?>" />
<span> <span>
<?=gettext("Server"); ?> #2:&nbsp; <?=gettext("Server #2:"); ?>&nbsp;
</span> </span>
<input name="ntp_server2" type="text" class="form-control unknown" id="ntp_server2" size="20" value="<?=$pconfig['ntp_server2'];?>" /> <input name="ntp_server2" type="text" class="form-control unknown" id="ntp_server2" size="20" value="<?=$pconfig['ntp_server2'];?>" />
</div> </div>
...@@ -1595,7 +1595,7 @@ endif; ?> ...@@ -1595,7 +1595,7 @@ endif; ?>
<?=gettext("Possible options: b-node (broadcasts), p-node " . <?=gettext("Possible options: b-node (broadcasts), p-node " .
"(point-to-point name queries to a WINS server), " . "(point-to-point name queries to a WINS server), " .
"m-node (broadcast then query name server), and " . "m-node (broadcast then query name server), and " .
"h-node (query name server, then broadcast)"); ?>. "h-node (query name server, then broadcast)."); ?>
</div> </div>
<span> <span>
<?=gettext("Scope ID"); ?>:&nbsp; <?=gettext("Scope ID"); ?>:&nbsp;
...@@ -1606,7 +1606,7 @@ endif; ?> ...@@ -1606,7 +1606,7 @@ endif; ?>
"service for NetBIOS over TCP/IP. The NetBIOS " . "service for NetBIOS over TCP/IP. The NetBIOS " .
"scope ID isolates NetBIOS traffic on a single " . "scope ID isolates NetBIOS traffic on a single " .
"network to only those nodes with the same " . "network to only those nodes with the same " .
"NetBIOS scope ID"); ?>. "NetBIOS scope ID."); ?>
</div> </div>
</div> </div>
</td> </td>
...@@ -1622,11 +1622,11 @@ endif; ?> ...@@ -1622,11 +1622,11 @@ endif; ?>
</div> </div>
<div id="wins_server_data" summary="wins servers"> <div id="wins_server_data" summary="wins servers">
<span> <span>
<?=gettext("Server"); ?> #1:&nbsp; <?=gettext("Server #1:"); ?>&nbsp;
</span> </span>
<input name="wins_server1" type="text" class="form-control unknown" id="wins_server1" size="20" value="<?=$pconfig['wins_server1'];?>" /> <input name="wins_server1" type="text" class="form-control unknown" id="wins_server1" size="20" value="<?=$pconfig['wins_server1'];?>" />
<span> <span>
<?=gettext("Server"); ?> #2:&nbsp; <?=gettext("Server #2:"); ?>&nbsp;
</span> </span>
<input name="wins_server2" type="text" class="form-control unknown" id="wins_server2" size="20" value="<?=$pconfig['wins_server2'];?>" /> <input name="wins_server2" type="text" class="form-control unknown" id="wins_server2" size="20" value="<?=$pconfig['wins_server2'];?>" />
</div> </div>
...@@ -1677,11 +1677,11 @@ endif; ?> ...@@ -1677,11 +1677,11 @@ endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
<div class="hidden" for="help_for_verbosity_level"> <div class="hidden" for="help_for_verbosity_level">
<?=gettext("Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what's happening without being swamped by output"); ?>.<br /> <br /> <?=gettext("Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what's happening without being swamped by output."); ?><br /> <br />
<strong>none</strong> -- <?=gettext("No output except fatal errors"); ?>. <br /> <?=sprintf(gettext("%snone%s -- No output except fatal errors."),'<strong>','</strong>') ?> <br />
<strong>default</strong>-<strong>4</strong> -- <?=gettext("Normal usage range"); ?>. <br /> <?=sprintf(gettext("%sdefault%s-%s4%s -- Normal usage range."),'<strong>','</strong>','<strong>','</strong>') ?> <br />
<strong>5</strong> -- <?=gettext("Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets"); ?>. <br /> <?=sprintf(gettext("%s5%s -- Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets."),'<strong>','</strong>') ?> <br />
<strong>6</strong>-<strong>11</strong> -- <?=gettext("Debug info range"); ?>. <?=sprintf(gettext("%s6%s-%s11%s -- Debug info range."),'<strong>','</strong>','<strong>','</strong>') ?>
</div> </div>
</td> </td>
</tr> </tr>
......
src/www/vpn_pptp.php
View file @ 62237a02
...@@ -515,10 +515,7 @@ function enable_change(enable_over) { ...@@ -515,10 +515,7 @@ function enable_change(enable_over) {
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top">&nbsp;</td> <td width="22%" valign="top">&nbsp;</td>
<td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br /> <td width="78%"><?=sprintf(gettext("Note: don't forget to %sadd a firewall rule%s to permit traffic from PPTP clients!"),'<a href="firewall_rules.php?if=pptp">','</a>') ?></td>
</strong></span><?=gettext("don't forget to ");
?><a href="firewall_rules.php?if=pptp"><?=gettext("add a firewall rule"); ?></a> <?=gettext("to permit ".
"traffic from PPTP clients");?>!</span></td>
</tr> </tr>
</table> </table>
</div> </div>
......
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

Technounit-GROUP 2023