Skip to content

O
OpnSense
Commit 124061a4 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

src: translations tweaks 

Taking the liberty to use this as an opportunity to kill the
usage of "e-mail".

Suggested by: @Antonio-Prado

(cherry picked from commit d988799a)
parent 6d01df69
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 41 deletions
src/wizard/openvpn.xml
View file @ 124061a4
......@@ -182,7 +182,7 @@
<type>input</type>
<size>40</size>
<bindstofield>ovpnserver->step2->authscope</bindstofield>
<description>Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path.&lt;br/&gt;EXAMPLE: CN=Users;DC=example&lt;br/&gt;EXAMPLE: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com </description>
<description>Semicolon separated. This will be prepended to the search base DN above or you can specify full container path.&lt;br/&gt;EXAMPLE: CN=Users;DC=example&lt;br/&gt;EXAMPLE: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com </description>
</field>
<field>
<name>userdn</name>
......@@ -427,8 +427,8 @@
</field>
<field>
<name>email</name>
<displayname>E-mail</displayname>
<description>E-mail address for the Certificate contact. Often the e-mail of the person generating the certificate (i.e. You.)</description>
<displayname>Email</displayname>
<description>Email address for the Certificate contact. Often the email of the person generating the certificate (i.e. You.)</description>
<type>input</type>
<size>30</size>
<bindstofield>ovpnserver->step6->email</bindstofield>
......@@ -556,8 +556,8 @@
</field>
<field>
<name>email</name>
<displayname>E-mail</displayname>
<description>E-mail address for the Certificate contact. Often the e-mail of the person generating the certificate (i.e. You.)</description>
<displayname>Email</displayname>
<description>Email address for the Certificate contact. Often the email of the person generating the certificate (i.e. You.)</description>
<type>input</type>
<size>30</size>
<bindstofield>ovpnserver->step9->email</bindstofield>
......@@ -872,7 +872,7 @@
<name>nbtscope</name>
<type>input</type>
<bindstofield>ovpnserver->step10->nbtscope</bindstofield>
<description>A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/IP. The NetBIOS scope ID isolates NetBIOS traffic on a single network to only those nodes with the same NetBIOS scope ID.</description>
<description>A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/IP. The NetBIOS Scope ID isolates NetBIOS traffic on a single network to only those nodes with the same NetBIOS Scope ID.</description>
</field>
<field>
<displayname>WINS Server 1</displayname>
......
src/www/system_advanced_notifications.php
View file @ 124061a4
......@@ -207,7 +207,7 @@ include("head.inc");
</td>
</tr>
<tr>
<th colspan="2"><?=gettext("SMTP E-Mail"); ?></th>
<th colspan="2"><?=gettext("SMTP Email"); ?></th>
</tr>
<tr>
<td><a id="help_for_disable_smtp" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Disable SMTP Notifications"); ?></td>
......@@ -219,20 +219,20 @@ include("head.inc");
</td>
</tr>
<tr>
<td><a id="help_for_smtpipaddress" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("E-Mail server"); ?></td>
<td><a id="help_for_smtpipaddress" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Email server"); ?></td>
<td>
<input name="smtpipaddress" type="text" value="<?=$pconfig['smtpipaddress']; ?>" />
<div class="hidden" for="help_for_smtpipaddress">
<?=gettext("This is the FQDN or IP address of the SMTP E-Mail server to which notifications will be sent."); ?>
<?=gettext("This is the FQDN or IP address of the SMTP Email server to which notifications will be sent."); ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_smtpport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("SMTP Port of E-Mail server"); ?></td>
<td><a id="help_for_smtpport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("SMTP Port of Email server"); ?></td>
<td>
<input name="smtpport" type="text" value="<?=$pconfig['smtpport']; ?>" />
<div class="hidden" for="help_for_smtpport">
<?=gettext("This is the port of the SMTP E-Mail server, typically 25, 587 (submission) or 465 (smtps)"); ?>
<?=gettext("This is the port of the SMTP Email server, typically 25, 587 (submission) or 465 (smtps)"); ?>
</div>
</td>
</tr>
......@@ -246,40 +246,40 @@ include("head.inc");
</td>
</tr>
<tr>
<td><a id="help_for_smtpfromaddress" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("From e-mail address"); ?></td>
<td><a id="help_for_smtpfromaddress" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Sender address"); ?></td>
<td>
<input name="smtpfromaddress" type="text" value="<?=$pconfig['smtpfromaddress']; ?>" />
<div class="hidden" for="help_for_smtpfromaddress">
<?=gettext("This is the e-mail address that will appear in the from field."); ?>
<?=gettext("This is the email address that will appear as the email notification sender."); ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_smtpnotifyemailaddress" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("E-Mail address"); ?></td>
<td><a id="help_for_smtpnotifyemailaddress" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Recipient address"); ?></td>
<td>
<input name="smtpnotifyemailaddress" type="text" value="<?=$pconfig['smtpnotifyemailaddress'];?>" />
<div class="hidden" for="help_for_smtpnotifyemailaddress">
<?=gettext("Enter the e-mail address that you would like email notifications sent to."); ?>
<?=gettext("Enter the email address that you would like email notifications sent to."); ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_smtpusername" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("E-Mail auth username"); ?></td>
<td><a id="help_for_smtpusername" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Email auth username"); ?></td>
<td>
<input name="smtpusername" type="text" value="<?=$pconfig['smtpusername']; ?>" />
<div class="hidden" for="help_for_smtpusername">
<small><?=gettext("(optional)");?></small><br/>
<?=gettext("Enter the e-mail address username for SMTP authentication."); ?>
<?=gettext("Enter the email address username for SMTP authentication."); ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_smtppassword" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("E-Mail auth password"); ?></td>
<td><a id="help_for_smtppassword" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Email auth password"); ?></td>
<td>
<input name='smtppassword' type='password' value='<?=$pconfig['smtppassword']; ?>' /><br />
<div class="hidden" for="help_for_smtppassword">
<small><?=gettext("(optional)");?></small><br/>
<?=gettext("Enter the e-mail address password for SMTP authentication."); ?>
<?=gettext("Enter the email address password for SMTP authentication."); ?>
</div>
</td>
</tr>
......
src/www/system_authservers.php
View file @ 124061a4
......@@ -586,7 +586,7 @@ endif; ?>
</ul>
<br/>
<div class="hidden" for="help_for_ldapauthcontainers">
<br/><?=gettext("Note: Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path containing a dc= component.");?>
<br/><?=gettext("Semicolon separated. This will be prepended to the search base DN above or you can specify full container path containing a DC= component.");?>
<br /><?=gettext("Example:");?> CN=Users;DC=example,DC=com
<br /><?=gettext("Example:");?> OU=Staff;OU=Freelancers
</div>
......
src/www/system_camanager.php
View file @ 124061a4
......@@ -413,7 +413,7 @@ legacy_html_escape_form_data($pconfig);
include("head.inc");
$main_buttons = array(
array('label'=>gettext("add or import ca"), 'href'=>'system_camanager.php?act=new'),
array('label' => gettext('Add or import CA'), 'href' => 'system_camanager.php?act=new'),
);
......
src/www/system_certmanager.php
View file @ 124061a4
......@@ -354,10 +354,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
break;
case "email":
if (empty($altname['value'])) {
$input_errors[] = gettext("You must provide an e-mail address for this type of subjectAltName");
$input_errors[] = gettext("You must provide an email address for this type of subjectAltName");
}
if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $altname['value'])) {
$input_errors[] = gettext("The e-mail provided in a subjectAltName contains invalid characters.");
$input_errors[] = gettext("The email provided in a subjectAltName contains invalid characters.");
}
break;
case "URI":
......
src/www/vpn_ipsec_keys_edit.php
View file @ 124061a4
......@@ -144,7 +144,7 @@ include("head.inc");
<td>
<input name="ident" type="text" class="formfld unknown" id="ident" size="30" value="<?=$pconfig['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 email address."); ?>
</div>
</td>
</tr>
......
src/www/vpn_ipsec_settings.php
View file @ 124061a4
......@@ -114,7 +114,7 @@ if (isset($input_errors) && count($input_errors) > 0) {
<div class="table-responsive">
<table class="table table-striped opnsense_standard_table_form">
<tr>
<td ><strong><?=gettext("IPSec Advanced Settings"); ?></strong></td>
<td ><strong><?=gettext("IPsec Advanced Settings"); ?></strong></td>
<td align="right">
<small><?=gettext("full help"); ?> </small>
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i>
......@@ -126,7 +126,7 @@ if (isset($input_errors) && count($input_errors) > 0) {
<input name="noinstalllanspd" type="checkbox" id="noinstalllanspd" value="yes" <?=!empty($pconfig['noinstalllanspd']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Do not install LAN SPD"); ?></strong>
<div class="hidden" for="help_for_noinstalllanspd">
<?=gettext("By default, if IPSec is enabled negating SPD are inserted to provide protection. " .
<?=gettext("By default, if IPsec is enabled negating SPD are inserted to provide protection. " .
"This behaviour can be changed by enabling this setting which will prevent installing these SPDs."); ?>
</div>
</td>
......@@ -147,7 +147,7 @@ if (isset($input_errors) && count($input_errors) > 0) {
<td><a id="help_for_ipsec_debug" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IPsec Debug"); ?></td>
<td>
<div class="hidden" for="help_for_ipsec_debug">
<strong><?=gettext("Start IPSec in debug mode based on sections selected"); ?></strong> <br/>
<strong><?=gettext("Start IPsec in debug mode based on sections selected"); ?></strong> <br/>
</div>
<?php foreach ($ipsec_loglevels as $lkey => $ldescr) :
?>
......@@ -164,8 +164,7 @@ endforeach; ?>
<?php
endforeach; ?>
<div class="hidden" for="help_for_ipsec_debug">
<?=gettext("Launches IPSec in debug mode so that more verbose logs " .
"will be generated to aid in troubleshooting."); ?>
<?=gettext("Launch IPsec in debug mode so that more verbose logs will be generated to aid in troubleshooting."); ?>
</div>
</td>
</tr>
......
src/www/vpn_openvpn_client.php
View file @ 124061a4
......@@ -197,9 +197,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
if (is_ipaddrv4($iv_ip) && (stristr($pconfig['protocol'], "6") !== false)) {
$input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv6 protocol and an IPv4 IP address.");
$input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv6 protocol and an IPv4 address.");
} elseif (is_ipaddrv6($iv_ip) && (stristr($pconfig['protocol'], "6") === false)) {
$input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv4 protocol and an IPv6 IP address.");
$input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv4 protocol and an IPv6 address.");
} elseif ((stristr($pconfig['protocol'], "6") === false) && !get_interface_ip($iv_iface) && ($pconfig['interface'] != "any")) {
$input_errors[] = gettext("An IPv4 protocol was selected, but the selected interface has no IPv4 address.");
} elseif ((stristr($pconfig['protocol'], "6") !== false) && !get_interface_ipv6($iv_iface) && ($pconfig['interface'] != "any")) {
......@@ -207,7 +207,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
if (!empty($pconfig['local_port'])) {
if (empty($pconfig['local_port']) || !is_numeric($pconfig['local_port']) || $pconfig['local_port'] < 0 || ($pconfig['local_port'] > 65535)) {
$input_errors[] = gettext("The field Local port must contain a valid port, ranging from 0 to 65535.");
$input_errors[] = gettext("The field 'Local port' must contain a valid port, ranging from 0 to 65535.");
}
$portused = openvpn_port_used($pconfig['protocol'], $pconfig['interface'], $pconfig['local_port'], $vpnid);
if (($portused != $vpnid) && ($portused != 0)) {
......@@ -215,19 +215,19 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
}
if (empty($pconfig['server_addr']) || (!is_domain($pconfig['server_addr']) && !is_ipaddr($pconfig['server_addr']))) {
$input_errors[] = gettext("The field Server host or address must contain a valid IP address or domain name.") ;
$input_errors[] = gettext("The field 'Server host or address' must contain a valid IP address or domain name.") ;
}
if (empty($pconfig['server_port']) || !is_numeric($pconfig['server_port']) || $pconfig['server_port'] < 0 || ($pconfig['server_port'] > 65535)) {
$input_errors[] = gettext("The field Server port must contain a valid port, ranging from 0 to 65535.");
$input_errors[] = gettext("The field 'Server port' must contain a valid port, ranging from 0 to 65535.");
}
if (!empty($pconfig['proxy_addr'])) {
if (empty($pconfig['proxy_addr']) || (!is_domain($pconfig['proxy_addr']) && !is_ipaddr($pconfig['proxy_addr']))) {
$input_errors[] = gettext("The field Proxy host or address must contain a valid IP address or domain name.") ;
$input_errors[] = gettext("The field 'Proxy host or address' must contain a valid IP address or domain name.");
}
if (empty($pconfig['proxy_port']) || !is_numeric($pconfig['proxy_port']) || $pconfig['proxy_port'] < 0 || ($pconfig['proxy_port'] > 65535)) {
$input_errors[] = gettext("The field Proxy port must contain a valid port, ranging from 0 to 65535.");
$input_errors[] = gettext("The field 'Proxy port' must contain a valid port, ranging from 0 to 65535.");
}
if (isset($pconfig['proxy_authtype']) && $pconfig['proxy_authtype'] != "none") {
if (empty($pconfig['proxy_user']) || empty($pconfig['proxy_passwd'])) {
......
src/www/vpn_openvpn_csc.php
View file @ 124061a4
......@@ -624,9 +624,9 @@ if ($act!="new" && $act!="edit") {
<div class="hidden" for="help_for_netbios_enable">
<?=gettext("A NetBIOS Scope ID provides an extended naming " .
"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 " .
"NetBIOS scope ID."); ?>
"NetBIOS Scope ID."); ?>
</div>
</div>
</td>
......
src/www/vpn_openvpn_export.php
View file @ 124061a4
......@@ -547,7 +547,7 @@ if (isset($savemsg)) {
</td>
</tr>
<tr class="mode_server">
<td valign="top"><a id="help_for_openvpnmanager" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Management Interface OpenVPNManager");?></td>
<td valign="top"><a id="help_for_openvpnmanager" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Management Interface OpenVPN Manager");?></td>
<td >
<input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" />
<div class="hidden" for="help_for_openvpnmanager">
......
src/www/vpn_openvpn_server.php
View file @ 124061a4
......@@ -1438,9 +1438,9 @@ endif; ?>
<div class="hidden" for="help_for_netbios_enable">
<?=gettext("A NetBIOS Scope ID provides an extended naming " .
"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 " .
"NetBIOS scope ID."); ?>
"NetBIOS Scope ID."); ?>
</div>
</div>
</td>
......
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