luci-app-openvpn: re-add options comp_lzo and comp_noadapt

* re-add config option comp_lzo according to
  openwrt/openwrt@3850b41
* re-add config option comp_noadapt. This has never been removed
  from openwrt

Signed-off-by: Martin Schiller <ms@dev.tdt.de>

1 files changed, 227 insertions, 201 deletions

diff --git a/applications/luci-app-openvpn/po/en/openvpn.po b/applications/luci-app-openvpn/po/en/openvpn.po
index b6c759c3ba..a26bfe93bb 100644
--- a/applications/luci-app-openvpn/po/en/openvpn.po
+++ b/applications/luci-app-openvpn/po/en/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:721
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:724
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
 msgid "%s"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:348
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:363
 msgid "'net30', 'p2p', or 'subnet'"
 msgstr "'net30', 'p2p', or 'subnet'"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:465
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:480
 msgid "Accept options pushed from server"
 msgstr "Accept options pushed from server"
 
@@ -30,7 +30,7 @@ msgstr "Accept options pushed from server"
 msgid "Add"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:222
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:224
 msgid "Add route after establishing connection"
 msgstr "Add route after establishing connection"
 
@@ -38,48 +38,48 @@ msgstr "Add route after establishing connection"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:655
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Additional authentication over TLS"
 msgstr "Additional authentication over TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:401
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:27
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:416
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:61
 msgid "Allow client-to-client traffic"
 msgstr "Allow client-to-client traffic"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:406
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:421
 msgid "Allow multiple clients with same certificate"
 msgstr "Allow multiple clients with same certificate"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:647
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "Allow only one session"
 msgstr "Allow only one session"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:190
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:192
 msgid "Allow remote to change its IP or port"
 msgstr "Allow remote to change its IP or port"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:441
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:456
 msgid "Allowed maximum of connected clients"
 msgstr "Allowed maximum of connected clients"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:446
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:461
 msgid "Allowed maximum of internal"
 msgstr "Allowed maximum of internal"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:451
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:466
 msgid "Allowed maximum of new connections"
 msgstr "Allowed maximum of new connections"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:69
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:67
 msgid "Append log to file"
 msgstr "Append log to file"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:470
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:485
 msgid "Authenticate using username/password"
 msgstr "Authenticate using username/password"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:541
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:556
 msgid "Automatically redirect default route"
 msgstr "Automatically redirect default route"
 
@@ -88,227 +88,239 @@ msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 "Below is a list of configured OpenVPN instances and their current state"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:121
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:119
 msgid "Call down cmd/script before TUN/TAP close"
 msgstr "Call down cmd/script before TUN/TAP close"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:595
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:33
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:658
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:81
 msgid "Certificate authority"
 msgstr "Certificate authority"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:81
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:13
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:79
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:17
 msgid "Change process priority"
 msgstr "Change process priority"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:41
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:39
 msgid "Change to directory before initialization"
 msgstr "Change to directory before initialization"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:683
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Check peer certificate against a CRL"
 msgstr "Check peer certificate against a CRL"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:45
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:43
 msgid "Chroot to directory after initialization"
 msgstr "Chroot to directory after initialization"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:376
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:391
 msgid "Client is disabled"
 msgstr "Client is disabled"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:461
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:26
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:476
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:57
 msgid "Configure client mode"
 msgstr "Configure client mode"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:361
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:19
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:376
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:37
 msgid "Configure server bridge"
 msgstr "Configure server bridge"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:356
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:18
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:371
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:33
 msgid "Configure server mode"
 msgstr "Configure server mode"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:525
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:540
 msgid "Connect through Socks5 proxy"
 msgstr "Connect through Socks5 proxy"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:505
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:520
 msgid "Connect to remote host through an HTTP proxy"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:500
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:515
 msgid "Connection retry interval"
 msgstr "Connection retry interval"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:49
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:47
 msgid "Daemonize after initialization"
 msgstr "Daemonize after initialization"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:230
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:232
 msgid "Delay n seconds after connection"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:113
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:111
 msgid "Delay tun/tap open and up script execution"
 msgstr "Delay tun/tap open and up script execution"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:599
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:34
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:662
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:85
 msgid "Diffie Hellman parameters"
 msgstr "Diffie Hellman parameters"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:411
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:426
 msgid "Directory for custom client config files"
 msgstr "Directory for custom client config files"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:25
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:23
 msgid "Disable Paging"
 msgstr "Disable Paging"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:29
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:27
 msgid "Disable options consistency check"
 msgstr "Disable options consistency check"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:194
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:20
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:196
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:41
 msgid "Do not bind to local address and port"
 msgstr "Do not bind to local address and port"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:214
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:216
 msgid "Don't actually execute ifconfig"
 msgstr "Don't actually execute ifconfig"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:234
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:236
 msgid "Don't add routes automatically"
 msgstr "Don't add routes automatically"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:667
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Don't cache --askpass or --auth-user-pass passwords"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:371
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:244
+msgid "Don't drop incoming tun packets with same destination as host"
+msgstr ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:386
 msgid "Don't inherit global push options"
 msgstr "Don't inherit global push options"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:73
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:71
 msgid "Don't log timestamps"
 msgstr "Don't log timestamps"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:238
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:240
 msgid "Don't pull routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:316
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:331
 msgid "Don't re-read key on restart"
 msgstr "Don't re-read key on restart"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:218
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:260
+msgid "Don't use adaptive lzo compression"
+msgstr "Don't use adaptive lzo compression"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Don't warn on ifconfig inconsistencies"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:89
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:87
 msgid "Echo parameters to log"
 msgstr "Echo parameters to log"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:246
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:252
 msgid "Empirically measure MTU"
 msgstr "Empirically measure MTU"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:569
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:632
 msgid "Enable OpenSSL hardware crypto engines"
 msgstr "Enable OpenSSL hardware crypto engines"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:242
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:248
 msgid "Enable Path MTU discovery"
 msgstr "Enable Path MTU discovery"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:549
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:30
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:568
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:69
 msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr "Enable Static Key encryption mode (non-TLS)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:590
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:615
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:653
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:678
 msgid "Enable TLS and assume client role"
 msgstr "Enable TLS and assume client role"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:585
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:648
 msgid "Enable TLS and assume server role"
 msgstr "Enable TLS and assume server role"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:262
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:164
+msgid "Enable a compression algorithm"
+msgstr ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:277
 msgid "Enable internal datagram fragmentation"
 msgstr "Enable internal datagram fragmentation"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:329
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:344
 msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr "Enable management interface on <em>IP</em> <em>port</em>"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Enabled"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:659
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr "Encrypt and authenticate all control channel packets with the key"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:559
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:622
 msgid "Encryption cipher for packets"
 msgstr "Encryption cipher for packets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:129
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:127
 msgid "Execute shell cmd after routes are added"
 msgstr "Execute shell cmd after routes are added"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:133
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:131
 msgid "Execute shell command on remote ip change"
 msgstr "Execute shell command on remote ip change"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:158
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:156
 msgid ""
 "Executed in server mode on new client connections, when the client is still "
 "untrusted"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:154
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:152
 msgid ""
 "Executed in server mode whenever an IPv4 address/route or MAC address is "
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:651
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Exit on TLS negotiation failure"
 msgstr "Exit on TLS negotiation failure"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:663
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Get PEM password from controlling tty before we daemonize"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:554
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:573
 msgid "HMAC authentication for packets"
 msgstr "HMAC authentication for packets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:475
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:490
 msgid "Handling of authentication failures"
 msgstr "Handling of authentication failures"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:292
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:22
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:307
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:49
 msgid ""
 "Helper directive to simplify the expression of --ping and --ping-restart in "
 "server mode configurations"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:536
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:551
 msgid "If hostname resolve fails, retry"
 msgstr "If hostname resolve fails, retry"
 
@@ -321,53 +333,53 @@ msgstr "Instance \"%s\""
 msgid "Instance with that name already exists!"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:320
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:335
 msgid "Keep local IP address on restart"
 msgstr "Keep local IP address on restart"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:324
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:339
 msgid "Keep remote IP address on restart"
 msgstr "Keep remote IP address on restart"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:312
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:327
 msgid "Keep tun/tap device open on restart"
 msgstr "Keep tun/tap device open on restart"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:643
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
 msgid "Key transition window"
 msgstr "Key transition window"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:105
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:103
 msgid "Limit repeated log messages"
 msgstr "Limit repeated log messages"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:603
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:35
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:666
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:89
 msgid "Local certificate"
 msgstr "Local certificate"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:174
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:176
 msgid "Local host name or ip address"
 msgstr "Local host name or ip address"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:607
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:36
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:670
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:93
 msgid "Local private key"
 msgstr "Local private key"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:170
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:172
 msgid "Major mode"
 msgstr "Major mode"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:436
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:451
 msgid "Maximum number of queued TCP output packets"
 msgstr "Maximum number of queued TCP output packets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:431
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:446
 msgid "Number of allocated broadcast buffers"
 msgstr "Number of allocated broadcast buffers"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:344
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:359
 msgid "Number of lines for log file history"
 msgstr "Number of lines for log file history"
 
@@ -375,11 +387,11 @@ msgstr "Number of lines for log file history"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:671
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Only accept connections from given X509 name"
 msgstr "Only accept connections from given X509 name"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:308
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:323
 msgid "Only process ping timeouts if routes exist"
 msgstr "Only process ping timeouts if routes exist"
 
@@ -392,11 +404,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN instances"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:83
 msgid "Optimize TUN/TAP/UDP writes"
 msgstr "Optimize TUN/TAP/UDP writes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:53
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:51
 msgid "Output to syslog and do not daemonize"
 msgstr "Output to syslog and do not daemonize"
 
@@ -404,28 +416,28 @@ msgstr "Output to syslog and do not daemonize"
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:611
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:32
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:674
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:77
 msgid "PKCS#12 file containing keys"
 msgstr "PKCS#12 file containing keys"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:138
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:136
 msgid "Pass environment variables to script"
 msgstr "Pass environment variables to script"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:581
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:644
 msgid "Persist replay-protection state"
 msgstr "Persist replay-protection state"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:386
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:401
 msgid "Persist/unpersist ifconfig-pool"
 msgstr "Persist/unpersist ifconfig-pool"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:296
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:311
 msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr "Ping remote every n seconds over TCP/UDP port"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:27
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:28
 msgid "Please edit this file directly in a terminal session."
 msgstr ""
 
@@ -437,262 +449,272 @@ msgstr ""
 msgid "Please select a valid VPN template!"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:162
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:160
 msgid "Policy level over usage of external programs and scripts"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:122
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:141
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:515
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:530
 msgid "Proxy timeout in seconds"
 msgstr "Proxy timeout in seconds"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:391
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:406
 msgid "Push an ifconfig option to remote"
 msgstr "Push an ifconfig option to remote"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:366
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:381
 msgid "Push options to peer"
 msgstr "Push options to peer"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:334
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:349
 msgid "Query management channel for private key"
 msgstr "Query management channel for private key"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:490
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:505
 msgid "Randomly choose remote server"
 msgstr "Randomly choose remote server"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:416
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:431
 msgid "Refuse connection if no custom client config"
 msgstr "Refuse connection if no custom client config"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:93
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:91
 msgid "Remap SIGUSR1 signals"
 msgstr "Remap SIGUSR1 signals"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:485
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:28
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:500
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:65
 msgid "Remote host name or ip address"
 msgstr "Remote host name or ip address"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:300
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:315
 msgid "Remote ping timeout"
 msgstr "Remote ping timeout"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:627
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegotiate data chan. key after bytes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:631
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
 msgid "Renegotiate data chan. key after packets"
 msgstr "Renegotiate data chan. key after packets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:635
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegotiate data chan. key after seconds"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:573
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:636
 msgid "Replay protection sliding window size"
 msgstr "Replay protection sliding window size"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:675
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Require explicit designation on certificate"
 msgstr "Require explicit designation on certificate"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:679
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Require explicit key usage on certificate"
 msgstr "Require explicit key usage on certificate"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:304
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:319
 msgid "Restart after remote ping timeout"
 msgstr "Restart after remote ping timeout"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:623
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+msgid "Restrict the allowed ciphers to be negotiated"
+msgstr ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Retransmit timeout on TLS control channel"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:510
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:525
 msgid "Retry indefinitely on HTTP proxy errors"
 msgstr "Retry indefinitely on HTTP proxy errors"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:531
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:546
 msgid "Retry indefinitely on Socks proxy errors"
 msgstr "Retry indefinitely on Socks proxy errors"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:396
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:411
 msgid "Route subnet to client"
 msgstr "Route subnet to client"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:61
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:59
 msgid "Run as an inetd or xinetd server"
 msgstr "Run as an inetd or xinetd server"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:146
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:144
 msgid "Run script cmd on client connection"
 msgstr "Run script cmd on client connection"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:150
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:148
 msgid "Run script cmd on client disconnection"
 msgstr "Run script cmd on client disconnection"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:125
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:123
 msgid "Run up/down scripts for all restarts"
 msgstr "Run up/down scripts for all restarts"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:36
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:37
 msgid "Save"
 msgstr ""
 
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:61
+msgid ""
+"Section to add an optional 'auth-user-pass' file with your credentials (%s)"
+msgstr ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:40
+msgid "Section to modify the OVPN config file (%s)"
+msgstr ""
+
 #: applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm:85
 msgid "Select template ..."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:480
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:495
 msgid "Send notification to peer on disconnect"
 msgstr "Send notification to peer on disconnect"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:37
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:35
 msgid "Set GID to group"
 msgstr "Set GID to group"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:250
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:265
 msgid "Set TCP/UDP MTU"
 msgstr "Set TCP/UDP MTU"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:33
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:31
 msgid "Set UID to user"
 msgstr "Set UID to user"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:381
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:396
 msgid "Set aside a pool of subnets"
 msgstr "Set aside a pool of subnets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:520
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:535
 msgid "Set extended HTTP proxy options"
 msgstr "Set extended HTTP proxy options"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:21
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:12
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:19
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:13
 msgid "Set output verbosity"
 msgstr "Set output verbosity"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:426
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:441
 msgid "Set size of real and virtual address hash tables"
 msgstr "Set size of real and virtual address hash tables"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:276
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:291
 msgid "Set the TCP/UDP receive buffer size"
 msgstr "Set the TCP/UDP receive buffer size"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:272
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:287
 msgid "Set the TCP/UDP send buffer size"
 msgstr "Set the TCP/UDP send buffer size"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:280
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:295
 msgid "Set tun/tap TX queue length"
 msgstr "Set tun/tap TX queue length"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:210
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:17
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:212
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:29
 msgid "Set tun/tap adapter parameters"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:254
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:269
 msgid "Set tun/tap device MTU"
 msgstr "Set tun/tap device MTU"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:258
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:273
 msgid "Set tun/tap device overhead"
 msgstr "Set tun/tap device overhead"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:267
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:282
 msgid "Set upper bound on TCP MSS"
 msgstr "Set upper bound on TCP MSS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:284
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:299
 msgid "Shaping for peer bandwidth"
 msgstr "Shaping for peer bandwidth"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:109
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:107
 msgid "Shell cmd to execute after tun device open"
 msgstr "Shell cmd to execute after tun device open"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:117
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:115
 msgid "Shell cmd to run after tun device close"
 msgstr "Shell cmd to run after tun device close"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:142
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:140
 msgid "Shell command to verify X509 name"
 msgstr "Shell command to verify X509 name"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:577
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:640
 msgid "Silence the output of replay warnings"
 msgstr "Silence the output of replay warnings"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:564
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:627
 msgid "Size of cipher key"
 msgstr "Size of cipher key"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:226
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:228
 msgid "Specify a default gateway for routes"
 msgstr "Specify a default gateway for routes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:339
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:561
+msgid "Specify whether the client is required to supply a valid certificate"
+msgstr ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:354
 msgid "Start OpenVPN in a hibernating state"
 msgstr "Start OpenVPN in a hibernating state"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Started"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:101
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:99
 msgid "Status file format version"
 msgstr "Status file format version"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:16
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:19
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:15
 msgid "Switch to advanced configuration"
 msgstr "Switch to advanced configuration"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:15
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:23
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:18
 msgid "Switch to basic configuration"
 msgstr "Switch to basic configuration"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:24
-msgid "Switch to file based configuration"
-msgstr ""
-
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:178
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:14
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:180
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:21
 msgid "TCP/UDP port # for both local and remote"
 msgstr "TCP/UDP port # for both local and remote"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:182
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:184
 msgid "TCP/UDP port # for local (default=1194)"
 msgstr "TCP/UDP port # for local (default=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:186
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:188
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP/UDP port # for remote (default=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:619
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
 msgid "TLS cipher"
 msgstr "TLS cipher"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:57
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:55
 msgid "TOS passthrough (applies to IPv4 only)"
 msgstr "TOS passthrough (applies to IPv4 only)"
 
@@ -700,7 +722,7 @@ msgstr "TOS passthrough (applies to IPv4 only)"
 msgid "Template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:421
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:436
 msgid "Temporary directory for client-connect return file"
 msgstr "Temporary directory for client-connect return file"
 
@@ -709,42 +731,41 @@ msgstr "Temporary directory for client-connect return file"
 msgid "The 'Name' field must not be empty!"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:17
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:18
 msgid ""
 "The OVPN config file (%s) could not be found, please check your "
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:691
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:695
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:31
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:687
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "The lowest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:26
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:27
 msgid ""
 "The size of the OVPN config file (%s) is too large for online editing in "
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua:39
-msgid ""
-"This form allows you to modify the content of the OVPN config file (%s)."
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:639
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "Timeframe for key exchange"
 msgstr "Timeframe for key exchange"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:202
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:15
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:204
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:25
 msgid "Type of used device"
 msgstr "Type of used device"
 
@@ -756,44 +777,49 @@ msgstr ""
 msgid "Upload ovpn file"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:495
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:24
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:256
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:45
+msgid "Use fast LZO compression"
+msgstr "Use fast LZO compression"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:510
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:53
 msgid "Use protocol"
 msgstr "Use protocol"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:206
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:208
 msgid "Use tun/tap device node"
 msgstr "Use tun/tap device node"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:456
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:471
 msgid "Use username as common name"
 msgstr "Use username as common name"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:65
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:63
 msgid "Write log to file"
 msgstr "Write log to file"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:77
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:75
 msgid "Write process ID to file"
 msgstr "Write process ID to file"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:97
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:95
 msgid "Write status to file every n seconds"
 msgstr "Write status to file every n seconds"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:93
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:95
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:112
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:114
 msgid "no"
 msgstr "no"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:198
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:200
 msgid "tun/tap device"
 msgstr "tun/tap device"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:288
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:303
 msgid "tun/tap inactivity timeout"
 msgstr "tun/tap inactivity timeout"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "yes (%i)"