ovpnmain.cgi: Improve wording for RW settings

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 0a02a442548d863fd3522e120880cd802012f2d6..1ae950980457df442b74f62ab23acc55c48ebb13 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -473,6 +473,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: locationblock country code
@@ -619,6 +620,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
@@ -763,6 +765,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1020,8 +1024,10 @@ WARNING: untranslated string: no entries = No entries at the moment.
 WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: ovpn ciphers = Ciphers
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6eb3ffa6f888edb14fb40a2eef9381d8db6d9124..ceb43dbd974d24ad70aad0961cb16b25ee14b7b8 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -105,7 +105,7 @@ WARNING: untranslated string: addons = Add-Ons
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advanced = Advanced
-WARNING: untranslated string: advanced server = Advanced server options
+WARNING: untranslated string: advanced server = Advanced Settings
 WARNING: untranslated string: advproxy AUTH always required = Require authentication for unrestricted source addresses
 WARNING: untranslated string: advproxy AUTH auth cache TTL = Authentication cache TTL (in minutes)
 WARNING: untranslated string: advproxy AUTH global settings = Global authentication settings
@@ -1234,7 +1234,6 @@ WARNING: untranslated string: local port = Local Port
 WARNING: untranslated string: local subnet = Local subnet:
 WARNING: untranslated string: local subnet is invalid = Local subnet is invalid.
 WARNING: untranslated string: local subnets = Local Subnets
-WARNING: untranslated string: local vpn hostname/ip = Local VPN Hostname/IP
 WARNING: untranslated string: location = Location
 WARNING: untranslated string: locationblock = Location Block
 WARNING: untranslated string: locationblock block countries = Block countries
@@ -1446,10 +1445,12 @@ WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn con stat = OpenVPN Connection Statistics
 WARNING: untranslated string: ovpn connection name = Connection Name
 WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn errmsg green already pushed = Route for green network is always set
 WARNING: untranslated string: ovpn errmsg invalid ip or mask = Invalid network-address or subnetmask
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
@@ -1460,7 +1461,6 @@ WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
 WARNING: untranslated string: ovpn routes push = Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24
 WARNING: untranslated string: ovpn routes push options = Route push options
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
-WARNING: untranslated string: ovpn server status = Current OpenVPN server status:
 WARNING: untranslated string: ovpn subnet = OpenVPN subnet:
 WARNING: untranslated string: ovpn subnet is invalid = OpenVPN subnet is invalid.
 WARNING: untranslated string: ovpn subnet overlap = OpenVPN Subnet overlaps with : 
@@ -1629,7 +1629,7 @@ WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: saturday = Saturday
 WARNING: untranslated string: save = Save
-WARNING: untranslated string: save-adv-options = Save advanced options
+WARNING: untranslated string: save-adv-options = Save Advanced Settings
 WARNING: untranslated string: scanned = Scanned
 WARNING: untranslated string: script name = Script name:
 WARNING: untranslated string: search = Search
@@ -1721,7 +1721,6 @@ WARNING: untranslated string: standard = Standard
 WARNING: untranslated string: standard login script = Standard login script
 WARNING: untranslated string: start = Start
 WARNING: untranslated string: start address = Start address:
-WARNING: untranslated string: start ovpn server = Start OpenVPN Server
 WARNING: untranslated string: state or province = State or Province
 WARNING: untranslated string: static ip = Static IP
 WARNING: untranslated string: static routes = Static Routes
@@ -1730,7 +1729,6 @@ WARNING: untranslated string: status information = Status information
 WARNING: untranslated string: status ovpn = OpenVPN
 WARNING: untranslated string: std classes = Standardclasses
 WARNING: untranslated string: stop = Stop
-WARNING: untranslated string: stop ovpn server = Stop OpenVPN Server
 WARNING: untranslated string: stopped = STOPPED
 WARNING: untranslated string: strict = Strict
 WARNING: untranslated string: subject = Subject

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 7e4f9744613dabb6b73a8eadd1120fbec489ac40..755d288e8c1e3afa7d11d334add3c5837ef09446 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -502,6 +502,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: locationblock country code
@@ -650,6 +651,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_mssfix
@@ -806,6 +808,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1040,8 +1044,10 @@ WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: no data = unknown string
 WARNING: untranslated string: online = Online
 WARNING: untranslated string: ovpn ciphers = Ciphers
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 777cceb47936e7e916a9f0a1177913c70f5831f6..fbebb7d58bfaf4e4c58bf331e1026f9d49d9c16e 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -500,6 +500,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: locationblock country code
@@ -648,6 +649,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
@@ -797,6 +799,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1044,8 +1048,10 @@ WARNING: untranslated string: malformed public key = Malformed Public Key
 WARNING: untranslated string: online = Online
 WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: ovpn ciphers = Ciphers
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 2d1aaa6e191460d4ce3226cdaddfe94e5bd80989..dff56c89328bfec2182a82d0d618c64bf02b79ba 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -456,6 +456,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
@@ -600,6 +601,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_mssfix
 WARNING: translation string unused: ovpn_mtudisc
@@ -746,6 +748,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1280,8 +1284,10 @@ WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing O
 WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 6fb47bb5cd06b2244c263be8593f1ff60a856c85..c06d2c692d53c80b37431bd946cdc8eb3d093e2d 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -458,6 +458,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
@@ -598,6 +599,7 @@ WARNING: translation string unused: ovpn mtu-disc yes
 WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
@@ -745,6 +747,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1304,8 +1308,10 @@ WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
 WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 9ee0fcc2ee7ec3e259cbf1d6eabc85c35b5904a5..aa615caaa39b2b1a0bb4b9560287ae981604fab3 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -394,6 +394,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
@@ -521,6 +522,7 @@ WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
@@ -668,6 +670,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1461,10 +1465,12 @@ WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
 WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn errmsg green already pushed = Route for green network is always set
 WARNING: untranslated string: ovpn errmsg invalid ip or mask = Invalid network-address or subnetmask
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 85d6bfafba771d554aa3d4b815be8e66010e1dc9..8b94f010be831801ee0f6206cfbae3e40e9d8aa3 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -390,6 +390,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
@@ -516,6 +517,7 @@ WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
@@ -663,6 +665,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1458,8 +1462,10 @@ WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
 WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 341cdf69e8f43b1badf75951b104efc79167d581..10b062cfa339b0fbb9162095fd5e54c976998e08 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -482,6 +482,7 @@ WARNING: translation string unused: load printer
 WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: local master
+WARNING: translation string unused: local vpn hostname/ip
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: locationblock country code
@@ -629,6 +630,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_mssfix
 WARNING: translation string unused: ovpn_mtudisc
@@ -775,6 +777,8 @@ WARNING: translation string unused: ssport forwarding
 WARNING: translation string unused: ssproxy graphs
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: start ovpn server
+WARNING: translation string unused: stop ovpn server
 WARNING: translation string unused: subject test
 WARNING: translation string unused: subject warn
 WARNING: translation string unused: subnet
@@ -1193,8 +1197,10 @@ WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
+WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
+WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings

diff --git a/doc/language_missings b/doc/language_missings
index ee293773a837759a593c8932052285175c029f02..4555c075381be25b87c3f38dc50890d5eb00ee55 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -88,8 +88,10 @@
 < oops something went wrong
 < optional
 < ovpn ciphers
+< ovpn dynamic client subnet
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn no cipher selected
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
@@ -147,8 +149,10 @@
 < ids provider eol
 < online
 < ovpn ciphers
+< ovpn dynamic client subnet
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn no cipher selected
 < ovpn roadwarrior settings
 < ovpn unsupported cipher selected
@@ -200,8 +204,10 @@
 < online
 < oops something went wrong
 < ovpn ciphers
+< ovpn dynamic client subnet
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn no cipher selected
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
@@ -667,9 +673,11 @@
 < ovpn add conf
 < ovpn ciphers
 < ovpn connection name
+< ovpn dynamic client subnet
 < ovpn error md5
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn no cipher selected
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
@@ -1315,10 +1323,12 @@
 < ovpn ciphers
 < ovpn connection name
 < ovpn crypt options
+< ovpn dynamic client subnet
 < ovpn engines
 < ovpn error md5
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn no cipher selected
@@ -2281,12 +2291,14 @@
 < ovpn ciphers
 < ovpn connection name
 < ovpn crypt options
+< ovpn dynamic client subnet
 < ovpn engines
 < ovpn errmsg green already pushed
 < ovpn errmsg invalid ip or mask
 < ovpn error md5
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn mgmt in root range
@@ -3386,10 +3398,12 @@
 < ovpn ciphers
 < ovpn connection name
 < ovpn crypt options
+< ovpn dynamic client subnet
 < ovpn engines
 < ovpn error md5
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn mgmt in root range
@@ -3992,9 +4006,11 @@
 < otp qrcode
 < ovpn ciphers
 < ovpn connection name
+< ovpn dynamic client subnet
 < ovpn error md5
 < ovpn fallback cipher
 < ovpn fallback cipher help
+< ovpn fqdn
 < ovpn no cipher selected
 < ovpn roadwarrior server
 < ovpn roadwarrior settings

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 7b550437914995bc04fa03cb0c6a05a9b0d173fc..46bc59a3b5dc623418203cecab94189051272062 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5250,7 +5250,7 @@ END
 
                                <tr>
                                        <td>
-                                               $Lang::tr{'local vpn hostname/ip'}
+                                               $Lang::tr{'ovpn fqdn'}
                                        </td>
                                        <td>
                                                <input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' />
@@ -5259,7 +5259,7 @@ END
 
                                <tr>
                                        <td>
-                                               $Lang::tr{'ovpn subnet'}
+                                               $Lang::tr{'ovpn dynamic client subnet'}
                                        </td>
                                        <td>
                                                <input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' />

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 934eee224c315f977580597fc823bd9fe0792d90..449b9d2da88ab123628c2004309c4f928a072d70 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -171,7 +171,7 @@
 'administrator username' => 'Administrator username',
 'adsl settings' => 'ADSL settings',
 'advanced' => 'Advanced',
-'advanced server' => 'Advanced server options',
+'advanced server' => 'Advanced Settings',
 'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses',
 'advproxy AUTH auth cache TTL' => 'Authentication cache TTL (in minutes)',
 'advproxy AUTH global settings' => 'Global authentication settings',
@@ -2044,12 +2044,14 @@
 'ovpn crypt options' => 'Cryptographic options',
 'ovpn device' => 'OpenVPN device:',
 'ovpn dl' => 'OVPN-Config Download',
+'ovpn dynamic client subnet' => 'Dynamic Client Subnet',
 'ovpn engines' => 'Crypto engine',
 'ovpn errmsg green already pushed' => 'Route for green network is always set',
 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
 'ovpn error md5' => 'You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>',
 'ovpn fallback cipher' => 'Fallback Cipher',
 'ovpn fallback cipher help' => 'This cipher is being used by clients that do not support cipher negotiation.',
+'ovpn fqdn' => 'FQDN',
 'ovpn generating the root and host certificates' => 'Generating the root and host certificate can take a long time.',
 'ovpn ha' => 'Hash algorithm',
 'ovpn log' => 'OVPN-Log',
@@ -2327,7 +2329,7 @@
 'save config' => 'save settings',
 'save error' => 'Unable to save configuration archive file',
 'save settings' => 'Save settings',
-'save-adv-options' => 'Save advanced options',
+'save-adv-options' => 'Save Advanced Settings',
 'scanned' => 'Scanned',
 'script name' => 'Script name:',
 'search' => 'Search',