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 268f6c6806f8b9bd19f8c8f6809abc5fca6ef727..a4ecf6f97988eb66287ab15989da2bb1c820f928 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -475,6 +475,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
@@ -621,6 +622,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
@@ -770,6 +772,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
@@ -1021,8 +1025,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 646652aac2ac6b4256c993d8efd2008a912b4e04..6158b16e4c6d209d12cdfdbfaefb9e920db0c545 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -106,7 +106,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
@@ -1219,7 +1219,6 @@ WARNING: untranslated string: local ip address = Local IP Address
 WARNING: untranslated string: local ntp server specified but not enabled = Local NTP server specified but not enabled
 WARNING: untranslated string: local subnet = Local subnet:
 WARNING: untranslated string: local subnet is invalid = Local subnet is invalid.
-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
@@ -1427,10 +1426,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
@@ -1441,7 +1442,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 : 
@@ -1593,7 +1593,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
@@ -1685,7 +1685,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
@@ -1694,7 +1693,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 4b59a4f092d12d35bc319d9d97bdeca068b7106a..23b1958036a4174226108a6aa5f150cef5a2868e 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -522,6 +522,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
@@ -676,6 +677,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
@@ -832,6 +834,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
@@ -1084,8 +1088,10 @@ WARNING: untranslated string: oops something went wrong = Oops, something went w
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired
 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.fr b/doc/language_issues.fr
index 50176f39cd5f26097c4e3f72bc25559998a5cbde..d902f258c22eada62bb9dea9e0cd5bb0e664793c 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -503,6 +503,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
@@ -651,6 +652,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
@@ -805,6 +807,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
@@ -1032,8 +1036,10 @@ WARNING: untranslated string: last updated = Last Updated
 WARNING: untranslated string: load average = Load Average
 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 cc7902d65b63a69818823ea17bc35c4959e343fe..fa4254078dd012211fd2243a0a2910266255b94f 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -459,6 +459,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
@@ -603,6 +604,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
@@ -753,6 +755,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
@@ -1267,8 +1271,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 ee91418131b2dba23b832212837cf1828fb3e03b..a97cb5039ebb064e3fb43fa9f2808e618c2a1e74 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -461,6 +461,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
@@ -601,6 +602,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
@@ -753,6 +755,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
@@ -1292,8 +1296,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 931f23de34714cf1c8d7549d77561baa80a3895e..e6ef8995cad951da73373a1b9d22b91853cd954d 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -397,6 +397,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
@@ -524,6 +525,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
@@ -676,6 +678,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
@@ -1449,10 +1453,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 dedc6011bead0b20e193b0e5175277471ad76fb4..657de92e3c5615a9477d79fb3797576920baceff 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -393,6 +393,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
@@ -519,6 +520,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
@@ -671,6 +673,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
@@ -1446,8 +1450,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 4ae16b6b2ce435de6e89aecec450d409aaaec509..326d739e654b7beaba80d3a9b31ec62ce84290b5 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -485,6 +485,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
@@ -632,6 +633,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
@@ -783,6 +785,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
@@ -1181,8 +1185,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 86553c78458151c2de38a03168f7ff11f1d9ae5e..565366606cc26b9825551dab2ace10bc24d5111b 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -86,8 +86,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
@@ -168,8 +170,10 @@
 < openvpn cert expires soon
 < openvpn cert has expired
 < 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
@@ -224,8 +228,10 @@
 < load average
 < 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
@@ -623,9 +629,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
@@ -1203,10 +1211,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
@@ -2102,12 +2112,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
@@ -3139,10 +3151,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
@@ -3677,9 +3691,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 1e496c62c93d26a71c7b2d62e63004df5bde25c5..6bef6599938871fec714f05c63ac8233361b04bb 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5249,7 +5249,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'}' />
@@ -5258,7 +5258,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 7b1a8e7d7efb6d337c90b37d23326e1cc73638ef..062974fa9e7c111f82a3ee95029bb73fea37fb19 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -172,7 +172,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',
@@ -2028,12 +2028,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',
@@ -2298,7 +2300,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',