$Lang::tr{'enabled'}
- $Lang::tr{'dhcp advopt scope'}:
+ $Lang::tr{'dhcp advopt scope'}:
END
;
@@ -652,7 +652,7 @@ print <
-
END
;
#Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order'
diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index b66fa467b..1afc55f75 100644
--- a/html/cgi-bin/dnsforward.cgi
+++ b/html/cgi-bin/dnsforward.cgi
@@ -207,20 +207,20 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) {
print <
- $Lang::tr{'dnsforward zone'}:
+ $Lang::tr{'dnsforward zone'}:
$Lang::tr{'enabled'}
- $Lang::tr{'dnsforward forward_server'}:
+ $Lang::tr{'dnsforward forward_server'}:
@@ -229,7 +229,7 @@ print <
- $Lang::tr{'this field may be blank'}
+ $Lang::tr{'required field'}
diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi
index bb7df1fff..e3463d1ac 100644
--- a/html/cgi-bin/hosts.cgi
+++ b/html/cgi-bin/hosts.cgi
@@ -223,7 +223,7 @@ if ($errormessage) {
#
#
#
-#
+#
# $warnmessage
#
#
@@ -253,12 +253,12 @@ print <
- $Lang::tr{'host ip'}:
+ $Lang::tr{'host ip'}:
- $Lang::tr{'hostname'}:
+ $Lang::tr{'hostname'}:
- $Lang::tr{'domain name'}:
+ $Lang::tr{'domain name'}:
$Lang::tr{'enabled'}
@@ -268,7 +268,7 @@ print <
diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
index 1d3436320..161be3421 100644
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -134,7 +134,7 @@ print <
- $Lang::tr{'mac new'}
+ $Lang::tr{'mac new'}
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -159,12 +159,12 @@ END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
print <
+
END
;
} else {
print <
+
END
;
}
@@ -179,12 +179,12 @@ END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
print <
+
END
;
} else {
print <
+
END
;
}
@@ -195,7 +195,7 @@ print <
- $Lang::tr{'this field may be blank'}
+
$Lang::tr{'required field'}
END
;
diff --git a/html/cgi-bin/modem.cgi b/html/cgi-bin/modem.cgi
index 48d1260e8..a13f8b265 100644
--- a/html/cgi-bin/modem.cgi
+++ b/html/cgi-bin/modem.cgi
@@ -78,25 +78,25 @@ print "
- $Lang::tr{'service name'}
+ $Lang::tr{'service name'}
- $Lang::tr{'concentrator name'}
+ $Lang::tr{'concentrator name'}
@@ -909,11 +909,11 @@ print <
- MTU
+ MTU:
- MRU
+ MRU:
END
@@ -925,9 +925,9 @@ print <$Lang::tr{'authentication'}
- $Lang::tr{'username'}
+ $Lang::tr{'username'}
- $Lang::tr{'password'}
+ $Lang::tr{'password'}
@@ -948,7 +948,7 @@ END
}
print <
- $Lang::tr{'script name'}
+ $Lang::tr{'script name'}
@@ -969,7 +969,7 @@ print <
- $Lang::tr{'profile name'}
+ $Lang::tr{'profile name'}
@@ -978,7 +978,7 @@ print <
$Lang::tr{'legend'}:
- $Lang::tr{'this field may be blank'}
+ $Lang::tr{'required field'}
END
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index ba2455a96..6c4e2b05d 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -969,13 +969,13 @@ print <
$Lang::tr{'advproxy enabled on'} Green :
- $Lang::tr{'advproxy proxy port'}:
+ $Lang::tr{'advproxy proxy port'}:
$Lang::tr{'advproxy transparent on'} Green :
- $Lang::tr{'advproxy proxy port transparent'}:
+ $Lang::tr{'advproxy proxy port transparent'}:
@@ -988,7 +988,7 @@ if ($netsettings{'BLUE_DEV'}) {
print " ";
}
print <$Lang::tr{'advproxy visible hostname'}:
+ $Lang::tr{'advproxy visible hostname'}:
@@ -1035,7 +1035,7 @@ print <
$Lang::tr{'advproxy redirector children'}
-$Lang::tr{'processes'}
+$Lang::tr{'processes'}:
END
;
my $count = `ip n| wc -l`;
@@ -1071,19 +1071,19 @@ print <
$Lang::tr{'advproxy via forwarding'}:
- $Lang::tr{'advproxy upstream proxy host:port'}
+ $Lang::tr{'advproxy upstream proxy host:port'}:
$Lang::tr{'advproxy client IP forwarding'}:
- $Lang::tr{'advproxy upstream username'}:
+ $Lang::tr{'advproxy upstream username'}:
$Lang::tr{'advproxy username forwarding'}:
- $Lang::tr{'advproxy upstream password'}:
+ $Lang::tr{'advproxy upstream password'}:
@@ -1119,28 +1119,28 @@ print <
$Lang::tr{'proxy cachemgr'}:
- $Lang::tr{'advproxy admin mail'}:
+ $Lang::tr{'advproxy admin mail'}:
- $Lang::tr{'proxy filedescriptors'}:
+ $Lang::tr{'proxy filedescriptors'}:
- $Lang::tr{'proxy admin password'}:
+ $Lang::tr{'proxy admin password'}:
- $Lang::tr{'advproxy ram cache size'}:
+ $Lang::tr{'advproxy ram cache size'}:
- $Lang::tr{'advproxy hdd cache size'}:
+ $Lang::tr{'advproxy hdd cache size'}:
- $Lang::tr{'advproxy min size'}:
+ $Lang::tr{'advproxy min size'}:
- $Lang::tr{'advproxy max size'}:
+ $Lang::tr{'advproxy max size'}:
@@ -1158,7 +1158,7 @@ print <
- $Lang::tr{'advproxy no cache sites'}:
+ $Lang::tr{'advproxy no cache sites'}:
@@ -1218,8 +1218,8 @@ print <
- $Lang::tr{'advproxy standard ports'}:
- $Lang::tr{'advproxy ssl ports'}:
+ $Lang::tr{'advproxy standard ports'}:
+ $Lang::tr{'advproxy ssl ports'}:
- $Lang::tr{'advproxy allowed subnets'}:
+ $Lang::tr{'advproxy allowed subnets'}:
- $Lang::tr{'advproxy unrestricted ip clients'}:
- $Lang::tr{'advproxy unrestricted mac clients'}:
+ $Lang::tr{'advproxy unrestricted ip clients'}:
+ $Lang::tr{'advproxy unrestricted mac clients'}:
- $Lang::tr{'advproxy banned ip clients'}:
- $Lang::tr{'advproxy banned mac clients'}:
+ $Lang::tr{'advproxy banned ip clients'}:
+ $Lang::tr{'advproxy banned mac clients'}:
+ $Lang::tr{'advproxy supervisor password'}:
$Lang::tr{'advproxy cre group definitions'}:
- $Lang::tr{'advproxy cre supervisors'}:
+ $Lang::tr{'advproxy cre supervisors'}:
END
;
}
@@ -1512,9 +1512,9 @@ print <$Lang::tr{'advproxy transfer limits'}
- $Lang::tr{'advproxy max download size'}:
+ $Lang::tr{'advproxy max download size'}:
- $Lang::tr{'advproxy max upload size'}:
+ $Lang::tr{'advproxy max upload size'}:
@@ -1619,7 +1619,7 @@ END
if ( $proxysettings{'ENABLE_MIME_FILTER'} eq 'on' ){
print <
- $Lang::tr{'advproxy MIME block types'}:
+ $Lang::tr{'advproxy MIME block types'}:
@@ -1683,8 +1683,8 @@ print <$Lang::tr{'advproxy privacy'}
- $Lang::tr{'advproxy fake useragent'}:
- $Lang::tr{'advproxy fake referer'}:
+ $Lang::tr{'advproxy fake useragent'}:
+ $Lang::tr{'advproxy fake referer'}:
@@ -1742,7 +1742,7 @@ if (!($proxysettings{'AUTH_METHOD'} eq 'none')) { if (!($proxysettings{'AUTH_MET
@@ -2020,7 +2020,7 @@ if ($proxysettings{'AUTH_METHOD'} eq 'ntlm-auth') {
$Lang::tr{'advproxy group access control'}
- $Lang::tr{'advproxy group required'}:
+ $Lang::tr{'advproxy group required'}:
@@ -2076,7 +2076,7 @@ print <$Lang::tr{'advproxy LDAP group access control'}
- $Lang::tr{'advproxy LDAP group required'}:
+ $Lang::tr{'advproxy LDAP group required'}:
@@ -2103,7 +2103,7 @@ print <
- $Lang::tr{'advproxy RADIUS identifier'}:
+ $Lang::tr{'advproxy RADIUS identifier'}:
$Lang::tr{'advproxy RADIUS secret'}:
@@ -2259,9 +2259,7 @@ print <
-
- $Lang::tr{'this field may be blank'}
-
+ $Lang::tr{'required field'}
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 5542f6530..39c3ed843 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -938,7 +938,7 @@ END
$Lang::tr{'guaranteed bandwith'}:
- $Lang::tr{'max bandwith'}:
+ $Lang::tr{'max bandwith'} :
Burst:
@@ -960,8 +960,8 @@ print <$Lang::tr{'min costs'} (1)
$Lang::tr{'remark'}:
-
-
+
+ $Lang::tr{'required field'}
diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index 39d71f842..8363b9951 100644
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -263,9 +263,9 @@ print <
- $Lang::tr{'primary ntp server'}:
+ $Lang::tr{'primary ntp server'}:
- $Lang::tr{'secondary ntp server'}:
+ $Lang::tr{'secondary ntp server'}:
@@ -319,7 +319,7 @@ print <
- $Lang::tr{'this field may be blank'}
+ $Lang::tr{'required field'}
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index e00bc5fd5..91f4b45fe 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -266,7 +266,7 @@ if ( ($memory != 0) && (@pid[0] ne "///") ){
$Lang::tr{'tor enabled'}:
- $Lang::tr{'tor socks port'}:
+ $Lang::tr{'tor socks port'}:
@@ -386,17 +386,17 @@ END
$Lang::tr{'tor relay mode private bridge'}
- $Lang::tr{'tor relay nickname'}:
+ $Lang::tr{'tor relay nickname'}:
- $Lang::tr{'tor relay address'}:
+ $Lang::tr{'tor relay address'}:
- $Lang::tr{'tor relay port'}:
+ $Lang::tr{'tor relay port'}:
@@ -404,13 +404,13 @@ END
- $Lang::tr{'tor directory port'}:
+ $Lang::tr{'tor directory port'}:
$Lang::tr{'tor 0 = disabled'}
- $Lang::tr{'tor contact info'}:
+ $Lang::tr{'tor contact info'}:
@@ -441,7 +441,7 @@ END
$Lang::tr{'tor bandwidth unlimited'}
- $Lang::tr{'tor accounting limit'}:
+ $Lang::tr{'tor accounting limit'}:
@@ -484,9 +484,7 @@ END
print <
-
- $Lang::tr{'this field may be blank'}
-
+ $Lang::tr{'required field'}
diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index 6cd9668db..c94c34ec1 100644
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -397,7 +397,7 @@ print <
$Lang::tr{'updxlrtr passive mode'}:
- $Lang::tr{'updxlrtr max disk usage'}:
+ $Lang::tr{'updxlrtr max disk usage'}:
%
@@ -409,7 +409,7 @@ print <
$Lang::tr{'updxlrtr low download priority'}:
- $Lang::tr{'updxlrtr max download rate'}:
+ $Lang::tr{'updxlrtr max download rate'}:
diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 1e50de928..c3c327eec 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -1214,8 +1214,8 @@ print <
- $Lang::tr{'urlfilter blocked domains'}
- $Lang::tr{'urlfilter blocked urls'}
+ $Lang::tr{'urlfilter blocked domains'}
+ $Lang::tr{'urlfilter blocked urls'}
$Lang::tr{'urlfilter example'}
@@ -1257,8 +1257,8 @@ print <
- $Lang::tr{'urlfilter allowed domains'}
- $Lang::tr{'urlfilter allowed urls'}
+ $Lang::tr{'urlfilter allowed domains'}
+ $Lang::tr{'urlfilter allowed urls'}
$Lang::tr{'urlfilter example'}
@@ -1297,7 +1297,7 @@ print <$Lang::tr{'urlfilter custom expression list'}
- $Lang::tr{'urlfilter blocked expressions'}
+ $Lang::tr{'urlfilter blocked expressions'}
- $Lang::tr{'urlfilter unfiltered clients'}
- $Lang::tr{'urlfilter banned clients'}
+ $Lang::tr{'urlfilter unfiltered clients'}
+ $Lang::tr{'urlfilter banned clients'}
$Lang::tr{'urlfilter show url'}:
- $Lang::tr{'urlfilter msg text 1'}:
+ $Lang::tr{'urlfilter msg text 1'}:
$Lang::tr{'urlfilter show ip'}:
- $Lang::tr{'urlfilter msg text 2'}:
+ $Lang::tr{'urlfilter msg text 2'}:
$Lang::tr{'urlfilter show dnserror'}:
- $Lang::tr{'urlfilter msg text 3'}:
+ $Lang::tr{'urlfilter msg text 3'}:
@@ -1499,12 +1499,8 @@ print <
-
-
- $Lang::tr{'this field may be blank'}
-
-
-
+ $Lang::tr{'required field'}
+
@@ -1880,9 +1876,9 @@ print <
- $Lang::tr{'urlfilter source'}
+ $Lang::tr{'urlfilter source'}
- $Lang::tr{'urlfilter dst'}
+ $Lang::tr{'urlfilter dst'}
$Lang::tr{'urlfilter access'}
@@ -1943,7 +1939,7 @@ print <
- $Lang::tr{'remark'}
+ $Lang::tr{'remark'}
@@ -1982,10 +1978,10 @@ print <
- $Lang::tr{'this field may be blank'}
+ $Lang::tr{'required field'}
-
+
$Lang::tr{'urlfilter select multi'}
@@ -2168,7 +2164,7 @@ print <
- $Lang::tr{'urlfilter user time quota'}:
+ $Lang::tr{'urlfilter user time quota'}:
@@ -2384,7 +2380,7 @@ print <
- $Lang::tr{'urlfilter edit domains urls expressions'}
+ $Lang::tr{'urlfilter edit domains urls expressions'}
$Lang::tr{'urlfilter domains'}
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 9f3c645e1..65fc80ff8 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1058,17 +1058,17 @@ END
print <
- $Lang::tr{'organization name'}:
+ $Lang::tr{'organization name'}:
- $Lang::tr{'ipfires hostname'}:
+ $Lang::tr{'ipfires hostname'}:
- $Lang::tr{'your e-mail'}:
+ $Lang::tr{'your e-mail'}:
- $Lang::tr{'your department'}:
+ $Lang::tr{'your department'}:
- $Lang::tr{'city'}:
+ $Lang::tr{'city'}:
- $Lang::tr{'state or province'}:
+ $Lang::tr{'state or province'}:
$Lang::tr{'country'}:
@@ -1083,7 +1083,7 @@ END
}
print <
- $Lang::tr{'vpn subjectaltname'} (subjectAltName=email:*,URI:*,DNS:*,RID:*)
+ $Lang::tr{'vpn subjectaltname'} (subjectAltName=email:*,URI:*,DNS:*,RID:*)
@@ -1094,12 +1094,12 @@ END
$Lang::tr{'upload p12 file'}:
- $Lang::tr{'pkcs12 file password'}:
+ $Lang::tr{'pkcs12 file password'}:
- $Lang::tr{'this field may be blank'}
+ $Lang::tr{'required field'}
END
;
@@ -1961,7 +1961,7 @@ END
if (!$cgiparams{'KEY'}) {
print <
- $Lang::tr{'name'}:
+ $Lang::tr{'name'}:
@@ -1973,8 +1973,9 @@ EOF
my $disabled;
my $blob;
if ($cgiparams{'TYPE'} eq 'host') {
- $disabled = "disabled='disabled'";
- $blob = " ";
+ $disabled = "disabled='disabled'";
+ } elsif ($cgiparams{'TYPE'} eq 'net') {
+ $blob = " ";
};
print <
- $Lang::tr{'local subnet'}
+ $Lang::tr{'local subnet'}
@@ -1993,7 +1994,7 @@ EOF
- $Lang::tr{'remote subnet'}
+ $Lang::tr{'remote subnet'} $blob
@@ -2010,7 +2011,7 @@ EOF
- $Lang::tr{'remark title'}
+ $Lang::tr{'remark title'}
@@ -2059,22 +2060,22 @@ END
$Lang::tr{'generate a certificate'}
- $Lang::tr{'users fullname or system hostname'}:
+ $Lang::tr{'users fullname or system hostname'}:
- $Lang::tr{'users email'}:
+ $Lang::tr{'users email'}:
- $Lang::tr{'users department'}:
+ $Lang::tr{'users department'}:
- $Lang::tr{'organization name'}:
+ $Lang::tr{'organization name'}:
- $Lang::tr{'city'}:
+ $Lang::tr{'city'}:
- $Lang::tr{'state or province'}:
+ $Lang::tr{'state or province'}:
$Lang::tr{'country'}:
@@ -2091,12 +2092,12 @@ END
print <
- $Lang::tr{'vpn subjectaltname'} (subjectAltName=email:*,URI:*,DNS:*,RID:*)
+ $Lang::tr{'vpn subjectaltname'} (subjectAltName=email:*,URI:*,DNS:*,RID:*)
- $Lang::tr{'pkcs12 file password'}:
+ $Lang::tr{'pkcs12 file password'}:
- $Lang::tr{'pkcs12 file password'}:($Lang::tr{'confirmation'})
+ $Lang::tr{'pkcs12 file password'} ($Lang::tr{'confirmation'}):
END
@@ -2504,7 +2505,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
- $Lang::tr{'lifetime'}
+ $Lang::tr{'lifetime'}
$Lang::tr{'hours'}
@@ -2582,13 +2583,13 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
- $Lang::tr{'dpd timeout'}:
+ $Lang::tr{'dpd timeout'}:
- $Lang::tr{'dpd delay'}:
+ $Lang::tr{'dpd delay'}:
@@ -2644,6 +2645,7 @@ EOF
print <
+ $Lang::tr{'required field'}
@@ -2717,7 +2719,7 @@ EOF