Merge pull request #2372 from TDT-AG/pr/20181213-openvpn-comp-lzo

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

29 files changed, 5922 insertions, 5230 deletions

diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
index 25d1481f8..40201bace 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
@@ -250,6 +250,15 @@ local knownParams = {
 			"mtu_test",
 			0,
 			translate("Empirically measure MTU") },
+		{ ListValue,
+			"comp_lzo",
+			{ "yes", "no", "adaptive" },
+			translate("Use fast LZO compression") },
+		{ Flag,
+			"comp_noadapt",
+			0,
+			translate("Don't use adaptive lzo compression"),
+			{ comp_lzo=1 } },
 		{ Value,
 			"link_mtu",
 			1500,
@@ -368,7 +377,7 @@ local knownParams = {
 			{ client="0" }, { client="" } },
 		{ DynamicList,
 			"push",
-			{ "redirect-gateway" },
+			{ "redirect-gateway", "comp-lzo" },
 			translate("Push options to peer"),
 			{ client="0" }, { client="" } },
 		{ Flag,
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
index 3e9137bae..132c4d8f9 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -39,6 +39,10 @@ local basicParams = {
 		"nobind",
 		0,
 		translate("Do not bind to local address and port") },
+	{ ListValue,
+		"comp_lzo",
+		{"yes","no","adaptive"},
+		translate("Use fast LZO compression") },
 	{ Value,
 		"keepalive",
 		"10 60",
diff --git a/applications/luci-app-openvpn/po/ca/openvpn.po b/applications/luci-app-openvpn/po/ca/openvpn.po
index 5777d086e..b9174f6f9 100644
--- a/applications/luci-app-openvpn/po/ca/openvpn.po
+++ b/applications/luci-app-openvpn/po/ca/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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', o '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 "Accepta opcions rebudes del servidor"
 
@@ -30,7 +30,7 @@ msgstr "Accepta opcions rebudes del servidor"
 msgid "Add"
 msgstr "Afegeix"
 
-#: 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 "Afegeix ruta després d'establir connexió"
 
@@ -38,48 +38,48 @@ msgstr "Afegeix ruta després d'establir connexió"
 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 "Autenticació addicional sobre 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 "Permet tràfic client a client"
 
-#: 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 "Permet múltiples clients amb el mateix certificat"
 
-#: 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 "Permet només una sessió"
 
-#: 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 "Permet al remot canviar la seva IP o 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 "Màxim de clients connectats pemès"
 
-#: 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 "Màxim permès d'interns"
 
-#: 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 "Màxim de noves connexions permesès"
 
-#: 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 "Afegeix el registre al fitxer"
 
-#: 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 "Autentica utilitzant nom d'usuari/contrasenya"
 
-#: 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 "Readreça automàticament la ruta per defecte"
 
@@ -89,228 +89,240 @@ msgstr ""
 "A sota hi ha una llista d'instàncies OpenVPN configurades i el seu estat "
 "actual"
 
-#: 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 ""
 "Crida l'script/comanda de desactivació abans de tancar el dispositiu TUN/TAP"
 
-#: 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 "Autoritat de certificat"
 
-#: 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 "Canvia la prioritat del procés"
 
-#: 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 "Canvia el directori abans de la inicialització"
 
-#: 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 "Comprova el certificat de peer contra un 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 al directori després de la inicialització"
 
-#: 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 "El client està inhabilitat"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Categoria de configuració"
 
-#: 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 "Configura el mode client"
 
-#: 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 "Configura el pont de servidor"
 
-#: 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 "Configura el mode servidor"
 
-#: 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 "Connecta't a través un proxy Socks5"
 
-#: 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 "Connecta al host remot a través d'un intermediari HTTP"
 
-#: 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 "Interval de reintent de connexió"
 
-#: 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 "Dimonitza després d'inicialitzar"
 
-#: 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 "Retarda l'obertura tun/tap i l'execució d'script d'activació"
 
-#: 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 "Paràmetres Diffie-Hellman"
 
-#: 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 "Directori per fitxers de configuració de client personalitzats"
 
-#: 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 "Desactiva 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 "Desactiva la comprovació de consistència d'opcions"
 
-#: 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 "No vinculis a adreça i port locals"
 
-#: 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 "No executis 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 "No afegeixis rutes automàticament"
 
-#: 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 "No desis a la memòria cau contrasenyes --askpass o --auth-user-pass"
 
-#: 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 "No heretis les opcions globals enviades pel servidor"
 
-#: 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 "No registris les marques horàries"
 
-#: 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 "No rellegeixis la clau al reiniciar"
 
-#: 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 "No utilitzis compressió adaptativa LZO"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "No alertis d'inconsistències ifconfig"
 
-#: 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 "Escriu els paràmetres al registre"
 
-#: 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 "Mesura empíricament l'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 "Habilita els motors criptogràfics de maquinari del OpenSSL"
 
-#: 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 "Habilita el descobriment de ruta MTU"
 
-#: 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 "Activa el mode d'encriptació de Clau Estàtica (no-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 "Activa el TLS i assumeix el rol de client"
 
-#: 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 "Activa el TLS i assumeix el rol de servidor"
 
-#: 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 "Activa la fragmentació de datagrames interna"
 
-#: 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 "Activa la interfície de gestió a <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 "Activat"
 
-#: 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 ""
 
-#: 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 "Xifra d'encriptació per paquets"
 
-#: 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 "Executa comanda després d'afegir les rutes"
 
-#: 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 "Executa una ordre de consola quan hi hagi un canvi d'IP remot"
 
-#: 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 "Surt en fallar la negociació TLS"
 
-#: 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 "Aconsegueix contrasenya PEM de controlar tty abans de dimonitzar"
 
-#: 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 "Autenticació HMAC per paquets"
 
-#: 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 "Gestió de fallades d'autenticació"
 
-#: 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 "Si la resolució del nom de màquina falla, reintenta-ho"
 
@@ -323,53 +335,53 @@ msgstr "Instància \"%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 "Mantingues l'adreça IP local al reiniciar"
 
-#: 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 "Mantingues l'adreça IP remota al reiniciar"
 
-#: 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 "Mantingues el dispositiu tun/tap obert al reiniciar"
 
-#: 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 "Finestra de transició de clau"
 
-#: 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 "Limita els missatges de registre repetits"
 
-#: 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 "Certificat local"
 
-#: 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 "Nom de màquina local o adreça IP"
 
-#: 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 "Clau privada local"
 
-#: 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 "Mode major"
 
-#: 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 "Número màxim de paquets TCP encuats a la sortida"
 
-#: 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 "Número de memòries intermèdies de difusió assignades"
 
-#: 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 "Número de línies per historial de fitxer de registre"
 
@@ -377,11 +389,11 @@ msgstr "Número de línies per historial de fitxer de registre"
 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 "Accepta connexions només d'un cert nom X509"
 
-#: 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 "Processa l'excés de temps d'espera de pings remots si la ruta existeix"
 
@@ -394,11 +406,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Instàncies OpenVPN"
 
-#: 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 "Optimitza les escriptures TUN/TAP/UDP"
 
-#: 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 "Sortida al syslog i no dimonitzis"
 
@@ -406,28 +418,28 @@ msgstr "Sortida al syslog i no dimonitzis"
 msgid "Overview"
 msgstr "Visió de conjunt"
 
-#: 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 "Fitxer PKCS#12 contenidor de claus"
 
-#: 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 "Passa les variables d'ambient a l'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 "Persisteix l'estat de protecció de reproducció"
 
-#: 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 "Persisteix/deixa de persistir 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 remot cada n segons sobre port TCP/UDP"
 
-#: 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 ""
 
@@ -439,263 +451,273 @@ 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 "Temps d'espera màxim de proxy en segons"
 
-#: 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 "Envia una opció ifconfig al remot"
 
-#: 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 "Envia opcions al 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 "Consulta el canal de gestió per una clau privada"
 
-#: 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 "Tria aleatòriament el servidor remot"
 
-#: 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 "Refusa la connexió si no hi ha configuració de client personalitzada"
 
-#: 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 "Remapeja senyals SIGUSR1"
 
-#: 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 "Nom de màquina remot o adreça IP"
 
-#: 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 "Temps d'espera màxim de ping remot"
 
-#: 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 "Renegocia clau de canal de dades després de 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 "Renegocia clau de canal de dades després de paquets"
 
-#: 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 "Renegocia clau de canal de dades després de segons"
 
-#: 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 "Mida de la finestra lliscant de protecció de reproducció"
 
-#: 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 "Requereix una designació explícita al certificat"
 
-#: 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 "Requereix ús de clau explícit al certificat"
 
-#: 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 "Reinicia després d'excedir el temps d'espera de ping remot"
 
-#: 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 "Temps d'espera de retransmissió en canal de control TLS"
 
-#: 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 "Reintenta indefinidament en errors de proxy HTTP"
 
-#: 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 "Reintenta indefinidament en errors de proxy Socks"
 
-#: 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 "Enruta subxarxa al 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 "Executa com un servidor inetd o xinetd"
 
-#: 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 "Executa l'script en connectar-se el client"
 
-#: 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 "Executa l'script en desconnectar-te el client"
 
-#: 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 "Executa els scripts d'activació/desactivació per tots els reinicis."
 
-#: 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 "Envia notificació al peer en desconnectar-se"
 
-#: 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 "Estableix el GID al grup"
 
-#: 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 "Estableix la MTU de TCP/UDP"
 
-#: 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 "Estableix l'UID per l'usuari"
 
-#: 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 "Deixa de banda un conjunt de subxarxes"
 
-#: 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 "Estableix les opcions de proxy HTTP exteses"
 
-#: 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 "Estableix el detall de sortida"
 
-#: 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 ""
 "Estableix la mida de les taules de dispersió d'adreces reals i virtuals"
 
-#: 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 "Estableix la mida de memòria intermèdia de recepció TCP/UDP"
 
-#: 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 "Estableix la mida de memòria intermèdia d'enviament TCP/UDP"
 
-#: 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 "Estableix la mida de cua TX de tun/tap"
 
-#: 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 "Estableix la MTU del dispositiu tun/tap"
 
-#: 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 "Estableix la càrrega (overhead) del dispositiu tun/tap"
 
-#: 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 "Estableix el límit superior al 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 "Configuració d'ample de banda d'un peer"
 
-#: 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 "Ordre a executar després que s'obri un dispositiu tun"
 
-#: 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 "Ordre a executar després que es tanqui un dispositiu tun"
 
-#: 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 "Ordre de comanda per verificar el nom X509"
 
-#: 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 "Silencia la sortida d'alertes de reproducció"
 
-#: 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 "Mida de la clau de xifratge"
 
-#: 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 "Especifica una passarel·la per defecte per rutes"
 
-#: 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 "Inicia l'OpenVPN en un estat d'hivernació"
 
-#: 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 "Iniciat"
 
-#: 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 "Versió de format de fitxer d'estat"
 
-#: 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 "Canvia a configuració avançada"
 
-#: 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 "Canvia a configuració bàsica"
 
-#: 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 "Port TCP/UDP tan per local com per remot"
 
-#: 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 "Port TCP/UDP per local (defecte=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 "Port TCP/UDP per remot (defecte=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 "Xifrador TLS"
 
-#: 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 "Pas TOS (aplica només a IPv4)"
 
@@ -703,7 +725,7 @@ msgstr "Pas TOS (aplica només a IPv4)"
 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 "Directori temporal pel fitxer de retorn per la connexió de client"
 
@@ -712,42 +734,41 @@ msgstr "Directori temporal pel fitxer de retorn per la connexió de client"
 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 "Calendari per intercanvi de claus"
 
-#: 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 "Tipus de dispositiu utilitzat"
 
@@ -759,45 +780,50 @@ 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 "Utilitza compressió ràpida LZO"
+
+#: 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 "Utilitza 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 "Utilitza un node de dispositiu tun/tap"
 
-#: 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 "Utilitza el nom d'usuari com a nom comú"
 
-#: 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 "Escriu registre al fitxer"
 
-#: 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 "Escriu l'ID del procés al fitxer"
 
-#: 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 "Escriu l'estat al fitxer cada n segons"
 
-#: 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 "dispositiu tun/tap"
 
-#: 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 "temps d'espera màxim d'inactivitat tun/tap"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "sí (%i)"
 
diff --git a/applications/luci-app-openvpn/po/cs/openvpn.po b/applications/luci-app-openvpn/po/cs/openvpn.po
index 76ec61d67..a9375f10d 100644
--- a/applications/luci-app-openvpn/po/cs/openvpn.po
+++ b/applications/luci-app-openvpn/po/cs/openvpn.po
@@ -11,16 +11,16 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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', nebo '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 "Přijmout nastavení, přijatá ze serveru"
 
@@ -28,7 +28,7 @@ msgstr "Přijmout nastavení, přijatá ze serveru"
 msgid "Add"
 msgstr "Přidat"
 
-#: 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 "Přidat trasu po navázání spojení"
 
@@ -36,48 +36,48 @@ msgstr "Přidat trasu po navázání spojení"
 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 "Dodatečné ověření přes 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 "Povolit provoz typu klient-klient"
 
-#: 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 "Povolit více klientů se stejným certifikátem"
 
-#: 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 "Povolit pouze jedno sezení"
 
-#: 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 ""
 
-#: 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 "Maximální povolené množství připojených klientů"
 
-#: 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 ""
 
-#: 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 "Maximální povolené množství nových připojení"
 
-#: 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 "Připojit log do souboru"
 
-#: 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 "Ověřit prostřednictvím uživatelského jména / hesla"
 
-#: 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 ""
 
@@ -85,227 +85,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 "Certifikační autorita"
 
-#: 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 "Změnit prioritu procesu"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Klient je zakázáný"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Konfigurace kategorie"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Parametry Diffie Hellman"
 
-#: 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 "Adresář s uživatelskými konfiguračními soubory"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Povolit hardwarovou akceleraci OpenSSL"
 
-#: 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 "Povolit Path MTU discovery (PMTUD)"
 
-#: 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 ""
 
-#: 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 "Povolit TLS a převzít roli klienta"
 
-#: 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 "Povolit TLS a převzít roli serveru"
 
-#: 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 "Povolit interní fragmentaci datagramů"
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -318,53 +330,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Lokální certifikát"
 
-#: 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 ""
 
-#: 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 "Lokální soukromý klíč"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -372,11 +384,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -389,11 +401,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN instance"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -401,28 +413,28 @@ msgstr ""
 msgid "Overview"
 msgstr "Přehled"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -434,262 +446,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 "Protokol"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Spustit skript cmd pro připojení klienta"
 
-#: 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 "Spustit skript cmd pro odpojení klienta"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Velikost šifrovacího klíče"
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Start/Stop"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Spuštěno"
 
-#: 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 ""
 
-#: 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 "Přepnout na pokročilou konfiguraci"
 
-#: 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 "Přepnout na základní konfiguraci"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 šifra"
 
-#: 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 ""
 
@@ -697,7 +719,7 @@ msgstr ""
 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 ""
 
@@ -706,42 +728,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -753,45 +774,50 @@ 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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "ne"
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "ano (%i)"
 
diff --git a/applications/luci-app-openvpn/po/de/openvpn.po b/applications/luci-app-openvpn/po/de/openvpn.po
index dfb142887..697c87f3c 100644
--- a/applications/luci-app-openvpn/po/de/openvpn.po
+++ b/applications/luci-app-openvpn/po/de/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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 "Topologietyp"
 
-#: 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 "Vom Server übertragene Optionen lokal akzeptieren"
 
@@ -30,7 +30,7 @@ msgstr "Vom Server übertragene Optionen lokal akzeptieren"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: 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 "Netzwerkrouten nach Verbindungsaufbau einrichten"
 
@@ -38,48 +38,48 @@ msgstr "Netzwerkrouten nach Verbindungsaufbau einrichten"
 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 "Erweiterte Authentifikation über 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 "Netzwerkverkehr zwischen Teilnehmern zulassen"
 
-#: 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 "Mehrere Teilnehmer mit selbem Zertifikat erlauben"
 
-#: 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 "Nur eine einzige Verbindung zulassen"
 
-#: 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 "Address- und Port-Änderungen der Gegenstelle zulassen"
 
-#: 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 "Betriebsmodus"
 
-#: 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 "Maximal erlaubte Anzahl an Netzwerkrouten pro Teilnehmer"
 
-#: 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 "Wiederholrate für Verbindungversuche"
 
-#: 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 "An Protokolldatei anfügen"
 
-#: 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 "Authentifikation mittels Benutzername und Passwort"
 
-#: 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 "Automatisch die Standard-Route umleiten"
 
@@ -87,193 +87,205 @@ msgstr "Automatisch die Standard-Route umleiten"
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "Liste der konfigurierten OpenVPN Instanzen und ihr momentaner Status"
 
-#: 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 ""
 "Shell-Kommando <em>vor</em> Deaktivierung der TUN/TAP Schnittstelle ausführen"
 
-#: 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 "Zertifikat der Zertifizierungsstelle"
 
-#: 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 "Prozess-Priorität anpassen"
 
-#: 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 "<em>Vor</em> der Initialisierung in Verzeichnis wechseln"
 
-#: 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 "Teilnehmerzertifikat mit Sperrliste abgleichen"
 
-#: 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 "<em>Nach</em> der Initialisierung in Verzeichnis wechseln"
 
-#: 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 "Teilnehmer-Konto deaktivieren"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Kategorie"
 
-#: 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 "Clientmodus"
 
-#: 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 "Server-zu-Server Netzwerkbrücke"
 
-#: 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 "Server-Modus"
 
-#: 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 "Verbindung über einen Socks 5 - 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 "Verbindung zum entfernten Rechner über HTTP-Proxy aufbauen"
 
-#: 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 "Wiederholrate für Verbindungversuche"
 
-#: 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 "Nach der Initialisierung als Hintergrundprozess ausführen"
 
-#: 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 "Nach dem Verbindungsaufbau um n Sekunden verzögern"
 
-#: 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 "Shell-Kommando nach Schnittstelleneinrichtung verzögern"
 
-#: 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-Parameter"
 
-#: 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 "Verzeichnis für eigene Konfigurationsdateien"
 
-#: 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 "Benutzten Arbeitsspeicher sperren"
 
-#: 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 "Konsistenzprüfungen für Optionen durchführen"
 
-#: 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 "An keine spezielle Adresse binden"
 
-#: 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 "Schnittstellenkonfiguration nicht durchführen"
 
-#: 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 "Netzwerkrouten nicht automatisch einrichten"
 
-#: 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 "Authentifikationsdaten nicht zwischenspeichern"
 
-#: 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 "Nur teilnehmerspezifische Optionen übertragen"
 
-#: 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 "Keine Zeitangaben protokollieren"
 
-#: 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 "Schlüssel bei Neustarts beibehalten"
 
-#: 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 "Adaptive LZO-Kompression deaktivieren"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Keine Warnung bei inkonsistenter Schnittstellenkonfiguration"
 
-#: 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 "Parameter in Protokolldatei speichern"
 
-#: 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 "MTU regelmäßig testen"
 
-#: 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 "OpenSSL-Unterstützung für Kryptographie-Hardware benutzen"
 
-#: 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 "MTU-Erkennung aktivieren"
 
-#: 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 "Verschlüsselung mittels statischer Schlüssel (kein 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 "TLS im Client-Betriebsmodus aktivieren"
 
-#: 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 "TLS im Server-Betriebsmodus aktivieren"
 
-#: 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 "Datenpakete bei Bedarf fragmentieren"
 
-#: 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 "Administratorschnittstelle aktivieren"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Einschalten"
 
-#: 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 ""
 
-#: 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 "Verschlüsselungsalgorithmus für Pakete"
 
-#: 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 "Shell-Befehl nach Routen-Einrichtung ausführen"
 
-#: 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 "Programm bei Adressänderung der Gegenstelle aufrufen"
 
-#: 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"
@@ -281,7 +293,7 @@ msgstr ""
 "Wird bei neuen Client-Verbindungen im Servermodus ausgeführt, wenn dem "
 "Clienten noch nicht vertraut wird"
 
-#: 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"
@@ -289,24 +301,24 @@ msgstr ""
 "Wird im Servermodus ausgeführt, wann immer eine IPv4-Adresse/Route oder MAC-"
 "Adresse zur internen Routingtabelle von OpenVPN hinzugefügt wird"
 
-#: 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 "Terminieren nach fehlgeschlagenem Schlüsselaustausch"
 
-#: 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 "PEM-Passwort von Konsole abfragen"
 
-#: 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-Authentifizierung für Pakete"
 
-#: 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 "Behandlung von Authentifikationsfehlern"
 
-#: 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"
@@ -314,7 +326,7 @@ msgstr ""
 "Helfer-Direktive, um den Ausdruck von --ping und --ping-restart in "
 "Servermodus-Konfigurationen zu vereinfachen"
 
-#: 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 "Neuer Verbindungsversuch wenn Namensauflösung fehlschlägt"
 
@@ -327,53 +339,53 @@ msgstr "Instanz \"%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 "Lokale IP-Adresse bei Neustarts beibehalten"
 
-#: 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 "IP-Adresse der Gegenstelle bei Neustarts beibehalten"
 
-#: 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 "TUN/TAP Schnittelle bei Neustarts offen halten"
 
-#: 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 "Maximaler Zeitraum für Schlüsselwechsel"
 
-#: 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 "Wiederholende Protokollmeldungen unterdrücken"
 
-#: 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 "Lokales Zertifikat"
 
-#: 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 "Lokaler Rechnername oder IP Adresse"
 
-#: 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 "Lokaler privater Schlüssel"
 
-#: 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 "Betriebsmodus"
 
-#: 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 "Maximale Anzahl an TCP-Paketen in der Warteschlange"
 
-#: 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 "Anzahl der benutzten Broadcast-Puffer"
 
-#: 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 "Anzahl der Zeilen im Protokoll-Zwischenspeicher"
 
@@ -381,11 +393,11 @@ msgstr "Anzahl der Zeilen im Protokoll-Zwischenspeicher"
 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 "Nur Verbindungen vom angegebenem X.509 Name zulassen"
 
-#: 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 "Ping-Timeouts nur bei vorhandenen Routen auslösen"
 
@@ -398,11 +410,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN Instanzen"
 
-#: 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 "TUN-, TAP- und UDP-Schreibvorgänge optimieren"
 
-#: 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 "Ausgaben ins Systemprotokoll umleiten und im Vordergrund ausführen"
 
@@ -410,28 +422,28 @@ msgstr "Ausgaben ins Systemprotokoll umleiten und im Vordergrund ausführen"
 msgid "Overview"
 msgstr "Übersicht"
 
-#: 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 Schlüsselarchiv"
 
-#: 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 "Umgebungsvariablen für Shell-Befehle"
 
-#: 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 "Persistenter Status für \"Replay\"-Schutz"
 
-#: 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 "Persistenten IP-Adressbereich nutzen"
 
-#: 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-Intervall für Gegenstellen"
 
-#: 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 ""
 
@@ -443,264 +455,274 @@ 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 "Policy-Ebene über Nutzung von externen Programmen und Skripten"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:122
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:141
 msgid "Port"
 msgstr "Netzwerkport"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: 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 "Maximaler Timeout für Proxy-Verbindungen"
 
-#: 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 "IP-Adresskonfiguration an Teilnehmer übertragen"
 
-#: 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 "Optionen an Teilnehmer übertragen"
 
-#: 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 "Privaten Schlüssel über Management-Kanal abfragen"
 
-#: 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 "Entfernten Server zufällig wählen"
 
-#: 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 "Teilnehmer-Verbindung verweigern wenn Teilnehmer-Konfiguration fehlt"
 
-#: 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 "\"USR1\" Systemsignal umleiten"
 
-#: 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 "Entfernter Rechnername oder IP-Adresse"
 
-#: 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 "Ping-Timeout für Gegenstellen"
 
-#: 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 "Schlüssel nach maximale Verkehrsmenge neu aushandeln"
 
-#: 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 "Schlüssel nach maximaler Anzahl von Paketen neu aushandeln"
 
-#: 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 "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
 
-#: 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 "Fenstergröße für \"Replay\"-Schutz"
 
-#: 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 "Verwendungszweck von Zertifikaten überprüfen"
 
-#: 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 "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
 
-#: 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 "Neu Starten nach Ping-Timeout an Gegenstellen"
 
-#: 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 "TLS Timeout"
 
-#: 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 "Neue Verbindung bei Proxy-Fehlern aufbauen"
 
-#: 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 "Neue Verbindung bei Proxy-Fehlern aufbauen"
 
-#: 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 "Subnetz an Teilnehmer routen"
 
-#: 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 "Als <em>inetd</em> oder <em>xinetd</em> Server laufen"
 
-#: 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 "Shell-Kommando bei neuer Teilnehmer-Verbindung ausführen"
 
-#: 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 "Shell-Kommando beim Trennen von Teilnehmer-Verbindungen ausführen"
 
-#: 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 "Shell-Kommandos bei jedem Neustart ausführen"
 
-#: 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 "Teilnehmer über Verbindungstrennung informieren"
 
-#: 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 "Dienst mit Benutzergruppe laufen lassen"
 
-#: 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 "MTU für TCP/UDP Protokoll festlegen"
 
-#: 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 "Dienst als Benutzer laufen lassen"
 
-#: 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 "IP-Adressbereich für zu vergebende Subnetze"
 
-#: 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 "Erweiterte HTTP-Proxy Einstellungen vornehmen"
 
-#: 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 "Detailstufe für Protokolle"
 
-#: 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 "Größe für interne Adresstabellen"
 
-#: 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 "Größe des TCP/UDP Empfangs-Puffers"
 
-#: 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 "Größe des TCP/UDP Sende-Puffers"
 
-#: 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 "Größe der Sende-Warteschlange"
 
-#: 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 "Tun/Tap parameter einstellen"
 
-#: 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 "MTU für TUN/TAP Schnittstelle festlegen"
 
-#: 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 "Overhead für TUN/TAP Schnittstelle festlegen"
 
-#: 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 "Maximale TCP-MSS erzwingen"
 
-#: 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 "Verbindungsrate von Gegenstellen limitieren"
 
-#: 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-Kommando nach Einrichtung von TUN/TAP Schnittstelle ausführen"
 
-#: 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-Kommando <em>nach</em> Deaktivierung der TUN/TAP Schnittstelle "
 "ausführen"
 
-#: 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-Kommando zum Überprüfen das X.509 Namens"
 
-#: 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 "\"Replay\"-Warnungen unterdrücken"
 
-#: 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 "Größe des Schlüssels"
 
-#: 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 "Standard-Gateway für Netzwerkrouten"
 
-#: 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 "OpenVPN im Schlafmodus starten"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Start/Stopp"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Gestartet"
 
-#: 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 "Format für Status-Datei"
 
-#: 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 "Erweiterte Einstellungen"
 
-#: 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 "Zur vereinfachten Konfiguration wechseln"
 
-#: 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 "Benutzter TCP oder UDP Port"
 
-#: 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 "Lokaler TCP oder UDP Port"
 
-#: 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 oder UDP Port der Gegenstelle"
 
-#: 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 Verschlüsselungsalgorithmus"
 
-#: 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\" Durchleitung (nur für IPv4)"
 
@@ -708,7 +730,7 @@ msgstr "\"TOS\" Durchleitung (nur für IPv4)"
 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 "Temporäres Verzeichnis für Teilnehmer-Verbindungen"
 
@@ -717,42 +739,41 @@ msgstr "Temporäres Verzeichnis für Teilnehmer-Verbindungen"
 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 "Maximaler Zeitraum für Schlüsselaustausch"
 
-#: 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 "Schnittstellentyp"
 
@@ -764,45 +785,50 @@ 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 "Schnelle LZO-Kompression benutzen"
+
+#: 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 "Netzwerkprotokoll"
 
-#: 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 "TUN/TAP Gerätedatei"
 
-#: 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 "Benutzernamen als Common-Name benutzen"
 
-#: 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 "In Protokolldatei schreiben"
 
-#: 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 "Prozess-Nummer in Datei schreiben"
 
-#: 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 "Status-Datei schreiben"
 
-#: 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 "Nicht gestartet"
 
-#: 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 Schnittstelle"
 
-#: 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 "Inaktivitäts-Timeout für TUN/TAP Schnittstellen"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "Gestartet (%s)"
 
diff --git a/applications/luci-app-openvpn/po/el/openvpn.po b/applications/luci-app-openvpn/po/el/openvpn.po
index 610c2d8ab..92d55bb46 100644
--- a/applications/luci-app-openvpn/po/el/openvpn.po
+++ b/applications/luci-app-openvpn/po/el/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 "%s"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -30,7 +30,7 @@ msgstr ""
 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 ""
 
@@ -38,48 +38,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Επιτρέπουμε στον απομακρυσμένο να αλλάξει την IP ή τη θύρα"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -89,227 +89,239 @@ msgstr ""
 "Παρακάτω είναι μία λίστα των ρυθμισμένων περιστατικών OpenVPN και της "
 "τρέχουσας κατάστασής τους"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Σύνδεση μέσω διαμεσολαβητή Socks5"
 
-#: 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 "Διάστημα επαναπροσπάθειας σύνδεσης"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Μη συνδέσεις σε τοπική διεύθυνση και θύρα"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Εκτέλεση της εντολής κελύφους στην αλλαγή IP του απομακρυσμένου"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 "Αν αποτύχει η μετατροπή του ονόματος του μηχανήματος σε IP, ξαναπροσπάθησε"
@@ -323,53 +335,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Όνομα τοπικού μηχανήματος ή διεύθυνση IP"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -377,11 +389,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -394,11 +406,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Διεργασίες OpenVPN"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -406,28 +418,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -439,262 +451,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 "Θύρα"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: 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 "Τέλος χρόνου μεσολαβητή σε δευτερόλεπτα"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Τυχαία επιλογή απομακρυσμένου διακομιστή"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Όνομα απομακρυσμένου μηχανήματος ή διεύθυνση IP"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Επαναπροσπάθεια για πάντα αν υπάρχουν λάθη HTTP στο μεσολαβητή"
 
-#: 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 "Επαναπροσπάθεια για πάντα σε περίπτωση λαθών στο διαμεσολαβητή Socks5"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Ορισμός εκτεταμένων ρυθμίσεων διαμεσολαβητή HTTP"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Ξεκίνησε"
 
-#: 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 ""
 
-#: 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 "Μετάβαση στις προχωρημένες ρυθμίσεις"
 
-#: 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 "Μετάβαση στις βασικές επιλογές"
 
-#: 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 νούμερο θύρας για το τοπικό και το απομακρυσμένο"
 
-#: 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 αριθμός θύρας για το τοπικό (εξ'ορισμού=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 αριθμός θύρας για τον απομακρυσμένο (εξ'ορισμού=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 ""
 
-#: 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 ""
 
@@ -702,7 +724,7 @@ msgstr ""
 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 ""
 
@@ -711,42 +733,41 @@ msgstr ""
 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 ""
 
-#: 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 "Είδος χρησιμοποιούμενης συσκευής"
 
@@ -758,44 +779,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "όχι"
 
-#: 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"
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "ναι (%i)"
diff --git a/applications/luci-app-openvpn/po/en/openvpn.po b/applications/luci-app-openvpn/po/en/openvpn.po
index b6c759c3b..a26bfe93b 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)"
diff --git a/applications/luci-app-openvpn/po/es/openvpn.po b/applications/luci-app-openvpn/po/es/openvpn.po
index 788c94b2b..5652a7eeb 100644
--- a/applications/luci-app-openvpn/po/es/openvpn.po
+++ b/applications/luci-app-openvpn/po/es/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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', o '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 "Aceptar opciones envidadas desde el servidor"
 
@@ -30,7 +30,7 @@ msgstr "Aceptar opciones envidadas desde el servidor"
 msgid "Add"
 msgstr "Añadir"
 
-#: 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 "Añadir la ruta tras establecer la conexión"
 
@@ -38,48 +38,48 @@ msgstr "Añadir la ruta tras establecer la conexión"
 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 "Autentificación adicional con 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 "Permitir el tráfico cliente-a-cliente"
 
-#: 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 "Permitir múltiples clientes con el mismo certificado"
 
-#: 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 "Permitir sólo una sesión"
 
-#: 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 "Permitir al conectado cambiar su IP o puerto"
 
-#: 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 "Máximo de clientes conectados"
 
-#: 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 "Máximo de internos"
 
-#: 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 "Máximo de nuevas conexiones"
 
-#: 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 "Unir registro al archivo"
 
-#: 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 "Autentificar con nombre usuario y contraseña"
 
-#: 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 "Redirigir automáticamente la ruta por defecto"
 
@@ -87,192 +87,204 @@ msgstr "Redirigir automáticamente la ruta por defecto"
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "Instancias OpenVPN configuradas y estado actual"
 
-#: 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 "Comando/script a llamar al cerrar el dispositivo TUn/TAP"
 
-#: 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 "Autoridad certificativa"
 
-#: 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 "Cambiar la prioridad del proceso"
 
-#: 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 "Cambiar a este directorio antes de inicializar"
 
-#: 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 "Comprobar certificados contra un 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 "Restringir a este directorio tras inicializar"
 
-#: 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 "Cliente desactivado"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Categoría de configuración"
 
-#: 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 "Configurar el modo cliente"
 
-#: 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 "Configurar el puente servidor"
 
-#: 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 "Configurar el modo servidor"
 
-#: 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 "Conectar por un proxy Socks5"
 
-#: 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 "Conectar a la máquina remota usando un proxy HTTP"
 
-#: 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 "Intervalo de reconexión"
 
-#: 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 "Demonizar tras inicialización"
 
-#: 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 "Espera tras conexión (segundos)"
 
-#: 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 "Espera para la apertura TUN/TAP y ejecución del script de arranque"
 
-#: 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 "Parámetros Diffie-Hellman"
 
-#: 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 "Directorio de configuraciones personalizadas"
 
-#: 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 "Desactivar paginación"
 
-#: 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 "Desactivar comprobación de consistencia de opciones"
 
-#: 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 "No asociar a un puerto y dirección locales"
 
-#: 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 "No ejecutar 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 "No añadir rutas automáticamente"
 
-#: 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 "No guardar las contraseñas --askpass o --auth-user-pass"
 
-#: 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 "No heredar opciones push globales"
 
-#: 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 "No guardar en registro horas"
 
-#: 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 "No releer la clave al rearrancar"
 
-#: 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 "No usar compresión adaptativa LZO"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "No avisar de inconsistencias en ifconfig"
 
-#: 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 "Guardar parámetros en el registro"
 
-#: 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 "Medir MTU empíricamente"
 
-#: 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 "Motor criptográfico por hardware OpenSSL"
 
-#: 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 "Detección de MTU"
 
-#: 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 "Modo de encriptado de clave estática (no-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 "Activar TLS y asumir el papel de cliente"
 
-#: 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 "Activar TLS y asumir el papel de servidor"
 
-#: 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 "Fragmentación de datagramas interna"
 
-#: 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 "Interfaz de gestión en <em>IP</em> <em>puerto</em>"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Activado"
 
-#: 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 ""
 
-#: 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 "Cifra de encriptación de paquetes"
 
-#: 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 "Comandos a ejecutar tras añadir rutas"
 
-#: 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 "Comando a ejecutar si se cambia la IP remota"
 
-#: 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"
@@ -280,7 +292,7 @@ msgstr ""
 "Ejecutado en modo servidor en nuevas conexiones de clientes, cuando no se "
 "confía aún en el cliente"
 
-#: 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"
@@ -288,24 +300,24 @@ msgstr ""
 "Ejecutado en modo servidor cuando una ruta, dirección IPv4 o dirección MAC "
 "se añade a la tabla de rutas interna de OpenVPN"
 
-#: 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 "Salir si falla la negociación"
 
-#: 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 "Obtener la clave PEM del tty de control antes de demonizar"
 
-#: 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 "Autentificación HMAC de paquetes"
 
-#: 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 "Gestión de fallos de autentificación"
 
-#: 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"
@@ -313,7 +325,7 @@ msgstr ""
 "Directriz para simplificar la expresión de --ping y --ping-restart en "
 "configuraciones en modo servido"
 
-#: 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 "Reintentar si falla la resolución de nombre de máquina"
 
@@ -326,53 +338,53 @@ msgstr "Instancia \"%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 "Mantener la dirección IP local al rearrancar"
 
-#: 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 "Mantener la dirección IP remota al rearrancar"
 
-#: 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 "Mantener el dispositivo TUN/TAP abierto al rearrancar"
 
-#: 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 "Ventana de transición de clave"
 
-#: 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 "Limitar mensajes repetidos al registro"
 
-#: 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 "Certificado local"
 
-#: 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 "Nombre de máquina local o dirección IP"
 
-#: 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 "Clave privada local"
 
-#: 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 "Modo principal"
 
-#: 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 "Paquetes máximos en la cola de salida TCP"
 
-#: 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 "Número de buffers de propagación"
 
-#: 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 "Líneas en el archivo de registro histórico"
 
@@ -380,11 +392,11 @@ msgstr "Líneas en el archivo de registro histórico"
 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 "Aceptar solo conexiones desde este nombre X509"
 
-#: 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 "Procesa solo las esperas a ping si existe la ruta"
 
@@ -397,11 +409,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Instancias OpenVPN"
 
-#: 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 "Optimizar escrituras TUN/TAP/UDP"
 
-#: 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 "Escribir en SysLog y no demonizar"
 
@@ -409,28 +421,28 @@ msgstr "Escribir en SysLog y no demonizar"
 msgid "Overview"
 msgstr "Resumen"
 
-#: 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 "Archivo PKCS#12 de claves"
 
-#: 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 "Pasar variables de entorno al 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 "Estado continuo de protección antireproducción"
 
-#: 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 "Mantener/no mantener el listado de interfaces"
 
-#: 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 al remoto cada n segundos sobre un puerto TCP/UDP"
 
-#: 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 ""
 
@@ -442,263 +454,273 @@ 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 "Política sobre el uso de programas externos y scripts"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:122
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:141
 msgid "Port"
 msgstr "Puerto"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: 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 "Espera del proxy en segundos"
 
-#: 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 "Enviar un opción de ifconfig al puesto remoto"
 
-#: 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 "Enviar opciones al otro"
 
-#: 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 "Consulta el canal de gestión por la clave privada"
 
-#: 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 "Elegir aleatoriamente un servidor remoto"
 
-#: 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 ""
 "Rechazar conexión si no tiene una configuración de cliente personalizada"
 
-#: 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 "Redirigir señales SIGUSR1"
 
-#: 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 "Nombre de máquina remota o dirección IP"
 
-#: 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 "Espera a ping remoto"
 
-#: 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 "Bytes tras los que renegociar la clave del canal del datos"
 
-#: 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 "Paquetes tras los que renegociar la clave del canal del datos"
 
-#: 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 "Segundos tras los que renegociar la clave del canal del datos"
 
-#: 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 "Tamaño de la ventana deslizante de la protección de reproducción"
 
-#: 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 "Designación explícita de certificado"
 
-#: 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 "Clave de uso explícita de certificado"
 
-#: 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 "Rearrancar tras espera del ping remoto"
 
-#: 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 "Espera de retransmisión en el canal de control TLS"
 
-#: 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 "Reintentar indefinidamente en errores del proxy HTTP"
 
-#: 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 "Reintentar indefinidamente en errores del proxy Socks"
 
-#: 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 "Enrutar subred a cliente"
 
-#: 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 "Ejecutar como servidor inetd o xinetd"
 
-#: 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 "Script a ejecutar tras una conexión de cliente"
 
-#: 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 "Script a ejecutar tras una desconexión de cliente"
 
-#: 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 "Ejecutar scripts de activación/desactivación en todos los rearranques"
 
-#: 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 "Enviar notificación al otro en caso de desconexión"
 
-#: 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 "GID del grupo"
 
-#: 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 "MTU TCP/UDP"
 
-#: 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 "UID del usuario"
 
-#: 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 "Reservar un bloque de subredes"
 
-#: 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 "Opciones HTTP extendidas del proxy"
 
-#: 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 "Nivel de detalle de mensajes"
 
-#: 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 "Tamaño de las tablas real y virtual de hashes"
 
-#: 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 "Tamaño del búfer de recepción TCP/UDP"
 
-#: 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 "Tamaño del búfer de envío TCP/UDP"
 
-#: 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 "Longitud de la cola de transmisión TUN/TAP"
 
-#: 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 "Parámetros del adaptador TUN/TAP"
 
-#: 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 "MTU del dispositivo TUN/TAP"
 
-#: 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 "Sobrecarga del dispositivo TUN/TAP"
 
-#: 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 "Límite superior de MSS de TCP"
 
-#: 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 "Adaptar ancho de banda de clientes"
 
-#: 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 "Comando shell a ejecutar tras abrir el dispositivo TUN"
 
-#: 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 "Comando shell a ejecutar tras cerrar el dispositivo TUN"
 
-#: 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 "Comando shell a ejecutar para verificar un nombre X509"
 
-#: 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 "No mostrar avisos de reproducción"
 
-#: 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 "Tamaño de la clave de cifrado"
 
-#: 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 "Gateway por defecto"
 
-#: 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 "Arrancar OpenVPN en estado hibernado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Arrancar/Parar"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Arrancado"
 
-#: 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 "Versión del formato del fichero de estado"
 
-#: 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 "Cambiar a configuración avanzada"
 
-#: 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 "Cambiar a configuración básica"
 
-#: 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 "Número de puerto TCP/UDP para local y remoto"
 
-#: 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 "Número de puerto TCP/UDP para 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 "Número de puerto TCP/UDP para remoto (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 "Cifra TLS"
 
-#: 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 "Paso a través TOS (sólo para IPv4)"
 
@@ -706,7 +728,7 @@ msgstr "Paso a través TOS (sólo para IPv4)"
 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 ""
 "Directorio temporal para el fichero de retorno de la conexión del cliente"
@@ -716,42 +738,41 @@ msgstr ""
 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 "Tiempo de intercambio de clave"
 
-#: 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 "Tipo de dispositivo usado"
 
@@ -763,45 +784,50 @@ 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 "Compresión rápida LZO"
+
+#: 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 "Protocolo"
 
-#: 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 "Nodo de dispositivo TUN/TAP"
 
-#: 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 "Nombre de usuario como nombre común"
 
-#: 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 "Escribir registro a fichero"
 
-#: 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 "Escribir ID del proceso a fichero"
 
-#: 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 "Segundos tras los que escribir el fichero de estado"
 
-#: 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 "dispositivo TUN/TAP"
 
-#: 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 "Espera de inactividad tun/tap"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "sí (%i)"
 
diff --git a/applications/luci-app-openvpn/po/fr/openvpn.po b/applications/luci-app-openvpn/po/fr/openvpn.po
index bf5a2cc21..24fbee815 100644
--- a/applications/luci-app-openvpn/po/fr/openvpn.po
+++ b/applications/luci-app-openvpn/po/fr/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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' ou '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 "Accepter les options envoyées par le serveur"
 
@@ -30,7 +30,7 @@ msgstr "Accepter les options envoyées par le serveur"
 msgid "Add"
 msgstr "Ajouter"
 
-#: 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 "Ajouter un routage après l'établissement de la connexion"
 
@@ -38,48 +38,48 @@ msgstr "Ajouter un routage après l'établissement de la connexion"
 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 "Authentification supplémentaire par dessus 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 "Autoriser le trafic entre clients"
 
-#: 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 "Permettre à plusieurs clients d'utiliser le même certificat"
 
-#: 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 "Autoriser seulement une 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 "Autoriser l'hôte distant à changer d'adresse IP ou de 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 "Maximum autorisé de clients connectés"
 
-#: 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 "Admis au maximum interne"
 
-#: 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 "Maximum autorisé de nouvelles connexions"
 
-#: 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 "Ajouter les journaux en fin de ce fichier"
 
-#: 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 "S'authentifier par identifiant/mot-de-passe"
 
-#: 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 "Rediriger automatiquement la route par défaut"
 
@@ -89,201 +89,213 @@ msgstr ""
 "Voici ci-dessous la liste d'instances OpenVPN configurées et leur état "
 "courant"
 
-#: 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 ""
 "Appelle une commande/script d'arrêt avant que le périphérique TUN/TAP soit "
 "fermé"
 
-#: 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 "Autorité des certificats"
 
-#: 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 "Modifier la priorité du processus"
 
-#: 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 "Aller dans ce répertorie avant l'initialisation"
 
-#: 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 ""
 "Confronter le certificat du distant à une liste des certificats révoqués "
 "(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 "Faire un « chroot » dans ce répertoire après initialisation"
 
-#: 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 désactivé"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Catégorie de configuration"
 
-#: 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 "Configurer le mode client"
 
-#: 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 "Configurer le mode pont"
 
-#: 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 "Configurer le mode serveur"
 
-#: 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 "Se connecter via un proxy Socks5"
 
-#: 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 "Se connecter à un hôte distant via un mandataire HTTP"
 
-#: 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 "Intervalle entre 2 tentatives de connexion"
 
-#: 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 "Transformer en démon après l'initialisation"
 
-#: 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 "Attends n secondes après la connexion"
 
-#: 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 ""
 "Attends avant l'ouverture de tun/tap et l'exécution de scripts de mise en "
 "marche"
 
-#: 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 "Paramètres Diffie Hellman"
 
-#: 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 "Répertoire contenant vos fichiers de config client spécifiques"
 
-#: 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 "Désactiver la pagination"
 
-#: 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 "Désactiver la vérification de la cohérence des options"
 
-#: 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 "Ne pas attacher à l'adresse et au port local"
 
-#: 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 "Ne pas exécuter réellement 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 "Ne pas ajouter de routes automatiquement"
 
-#: 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 ""
 "Ne pas copier en cache les mots de passe des options --askpass ou --auth-"
 "user-pass"
 
-#: 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 "Ne pas hériter des options d'envoi globales"
 
-#: 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 "Ne pas journaliser les horodatages"
 
-#: 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 "Ne pas relire la clef au redémarrage"
 
-#: 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 "Ne pas utiliser la compression adaptative LZO"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Ne pas alerter en cas d'incohérence d'ifconfig"
 
-#: 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 "Écrire les paramètres dans le journal"
 
-#: 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 "Mesurer le MTU empiriquement"
 
-#: 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 "Activer les systèmes de cryptages OpenSSL matériels"
 
-#: 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 "Activer la découverte du MTU du chemin"
 
-#: 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 "Activer le mode de cryptage à clef statique (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 "Activer le TLS et prendre le rôle du client"
 
-#: 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 "Activer le TLS et prendre le rôle du serveur"
 
-#: 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 "Autoriser la fragmentation des datagrammes en interne"
 
-#: 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 "Activer l'interface de gestion sur <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 "Activé"
 
-#: 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 ""
 
-#: 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 "Méthode de chiffrement des paquets"
 
-#: 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 "Exécuter une commande shell après l'ajout des routes"
 
-#: 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 ""
 "Exécuter une commande Shell suite à un changement d'IP de l'hôte distant"
 
-#: 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"
@@ -291,7 +303,7 @@ msgstr ""
 "Lancé en mode serveur pour les nouvelles connexions client, quand le client "
 "n'est pas encore reconnu"
 
-#: 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"
@@ -299,26 +311,26 @@ msgstr ""
 "Lancé en mode serveur à chaque fois qu'une adresse/route IPv4 ou une adresse "
 "MAC est ajoutée à la table de routage interne d'OpenVPN"
 
-#: 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 "Arrêter suite à l'échec de la négociation TLS"
 
-#: 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 ""
 "Obtenir le mot de passe du certificat depuis le terminal avant de passer en "
 "mode démon"
 
-#: 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 "Authentification HMAC des paquets"
 
-#: 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 "Gestion des erreurs d'authentification"
 
-#: 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"
@@ -326,7 +338,7 @@ msgstr ""
 "Aide pour simplifier l'expression des --ping et --ping-restart dans les "
 "configurations en mode serveur"
 
-#: 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 "Si la résolution du nom de l'hôte échoue, ré-essayer"
 
@@ -339,53 +351,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 "Conserver l'adresse IP locale lors du redémarrage"
 
-#: 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 "Conserver l'adresse IP distante lors du redémarrage"
 
-#: 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 "Conserver le périphérique tun/tap ouvert au redémarrage"
 
-#: 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 ""
 
-#: 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 "Limiter les messages répétés dans les journaux"
 
-#: 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 "Certificat local"
 
-#: 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 "Nom ou adresse IP de l'hôte local"
 
-#: 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 "Clef privée locale"
 
-#: 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 "Mode principal"
 
-#: 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 "Nombre maximum de paquets TCP en attente d'émission"
 
-#: 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 "Nombre de tampons de diffusion alloués"
 
-#: 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 "Nombre de lignes de l'historique du fichier-journal"
 
@@ -393,11 +405,11 @@ msgstr "Nombre de lignes de l'historique du fichier-journal"
 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 "Accepte seulement des connexions du nom X509 donné"
 
-#: 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 ""
 "Traiter l'expiration des délais des pings seulement si les routes existent"
@@ -411,11 +423,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Instances OpenVPN"
 
-#: 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 "Optimiser les écritures TUN/TAP/UDP"
 
-#: 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 "Envoyer à syslog et ne pas transformer en démon"
 
@@ -423,29 +435,29 @@ msgstr "Envoyer à syslog et ne pas transformer en démon"
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
-#: 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 "Fichier au format PKCS#12 contenant les clefs"
 
-#: 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 "Transmettre les variables d'environnement au 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 "Reconduire l'état de protection anti-rejeu"
 
-#: 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 "Reconduire ou non le lot d'ifconfig"
 
-#: 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 ""
 "Envoyer un ping à l'hôte distant toutes les n secondes sur le port TCP/UDP"
 
-#: 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 ""
 
@@ -457,264 +469,274 @@ 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 "Règle de sécurité appliqué à l'usage de programmes et scripts externes"
 
-#: 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 "Protocole"
 
-#: 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 "Délai d'attente du mandataire, en secondes"
 
-#: 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 "Envoyer une option ifconfig au distant"
 
-#: 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 "Envoyer les options au client"
 
-#: 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 "Canal de requête de gestion pour clef privée"
 
-#: 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 "Choisir au hasard un serveur distant"
 
-#: 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 "Refuser la connexion en l'absence de config client spécifique"
 
-#: 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 "Rediriger les signaux SIGUSR1"
 
-#: 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 "Nom ou adresse IP de l'hôte distant"
 
-#: 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 "Délai de ping du distant"
 
-#: 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 "Renégocier la clé du canal de données après tant d'octets"
 
-#: 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 "Renégocier la clé du canal de données après tant de paquets"
 
-#: 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 ""
 "Renégocier la clé du canal de données après tant de temps (en secondes)"
 
-#: 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 "Taille de la fenêtre glissante pour la protection anti-rejeu"
 
-#: 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 "Exiger l'appellation explicite sur le certificat"
 
-#: 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 "Exiger l'utilisation explicite de la clé sur le certificat"
 
-#: 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 "Redémarrer aprés le dépassement du délai de ping du distant"
 
-#: 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 "Renvoyer l'expiration du délai sur le canal de contrôle TLS"
 
-#: 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 "Ré-essayer indéfiniment suite à des erreurs du proxy HTTP"
 
-#: 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 "Ré-essayer indéfiniment suite à des erreurs du proxy Socks"
 
-#: 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 "Router le sous-réseau vers le 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 "Exécuter en tant que serveur inetd ou xinetd"
 
-#: 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 "Exécuter une commande de script lors de la connexion d'un client"
 
-#: 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 "Exécuter une commande de script lors de la déconnexion d'un client"
 
-#: 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 "Exécuter les scripts up/down à tous les redémarrages"
 
-#: 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 "Envoyer une notification au distant à la déconnexion"
 
-#: 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 "Utiliser le GID de ce groupe"
 
-#: 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 "Définir le MTU TCP/UDP"
 
-#: 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 "Utiliser l'UID de cet utilisateur"
 
-#: 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 "Mettre de coté un lot de sous-réseaux"
 
-#: 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 "Définir les options de mandataire HTTP étendu"
 
-#: 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 "Définir la verbosité des écrits"
 
-#: 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 ""
 "Définir la taille des tables de haché des adresses réelles et virtuelles"
 
-#: 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 "Définir la taille de la pile de réception TCP/UDP"
 
-#: 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 "Définir la taille de la pile d'envoi TCP/UDP"
 
-#: 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 "Définir la taille de la pile TX tun/tap"
 
-#: 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 "Définir les paramètres de l'adaptateur tun/tap"
 
-#: 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 "Définir le MTU du périphérique tun/tap"
 
-#: 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 ""
 
-#: 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 "Définir la borne supérieure du MSS TCP"
 
-#: 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 "Gère la bande-passante du distant"
 
-#: 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 "Commande Shell à exécuter après l'ouverture du périphérique tun"
 
-#: 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 "Commande Shell à exécuter après la fermeture du périphérique tun"
 
-#: 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 "Commande shell de vérification du nom X509"
 
-#: 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 "Supprime les messages d'alertes anti-rejeu"
 
-#: 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 "Taille de la clé de cryptage"
 
-#: 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 "Définir la passerelle par défaut des 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 "Démarrer OpenVPN dans un état d'hibernation"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Démarrer/Arrêter"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Démarré"
 
-#: 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 "Version du format du fichier de status"
 
-#: 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 "Afficher les paramètres de configuration avancés"
 
-#: 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 "Afficher les paramètres de configuration standards"
 
-#: 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 "Numéro de port TCP/UDP valable pour l'hôte local et l'hôte distant"
 
-#: 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 "Numéro de port TCP/UDP pour l'hôte local (par défaut 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 "Numéro de port TCP/UDP pour l'hôte distant (par défaut 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 "Méthode de chiffrement TLS"
 
-#: 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 ""
 
@@ -722,7 +744,7 @@ msgstr ""
 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 "Répertoire pour le fichier temporaire lié à la connexion d'un client"
 
@@ -731,42 +753,41 @@ msgstr "Répertoire pour le fichier temporaire lié à la connexion d'un client"
 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 "Période d'un échange de clés"
 
-#: 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 de périphérique utilisé"
 
@@ -778,45 +799,50 @@ 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 "Utiliser la compression LZO rapide"
+
+#: 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 "Utiliser le protocole"
 
-#: 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 "Utiliser le périphérique tun/tap"
 
-#: 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 "Utiliser le nom d'utilisateur comme nom « commun » (du certificat)"
 
-#: 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 "Écrire le journal dans le fichier"
 
-#: 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 "Écrire le numéro de processus dans le fichier"
 
-#: 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 "Écrire le status dans le fichier chaque n secondes"
 
-#: 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 "non"
 
-#: 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 "Périphérique tun/tap"
 
-#: 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 "Délai d'inactivité tun/tap"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "oui (%i)"
 
diff --git a/applications/luci-app-openvpn/po/he/openvpn.po b/applications/luci-app-openvpn/po/he/openvpn.po
index 73b46bac6..17a73ddfd 100644
--- a/applications/luci-app-openvpn/po/he/openvpn.po
+++ b/applications/luci-app-openvpn/po/he/openvpn.po
@@ -9,16 +9,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
-#: 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 ""
 
@@ -26,7 +26,7 @@ msgstr ""
 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 ""
 
@@ -34,48 +34,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -83,227 +83,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -316,53 +328,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -370,11 +382,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -387,11 +399,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -399,28 +411,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -432,262 +444,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -695,7 +717,7 @@ msgstr ""
 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 ""
 
@@ -704,42 +726,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -751,44 +772,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/hu/openvpn.po b/applications/luci-app-openvpn/po/hu/openvpn.po
index f2b6a5552..1684fb548 100644
--- a/applications/luci-app-openvpn/po/hu/openvpn.po
+++ b/applications/luci-app-openvpn/po/hu/openvpn.po
@@ -11,16 +11,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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' vagy '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 "A kiszolgáló által küldött opciók elfogadás"
 
@@ -28,7 +28,7 @@ msgstr "A kiszolgáló által küldött opciók elfogadás"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: 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 "Útvonal hozzáadása a kapcsolat létrejötte után"
 
@@ -36,48 +36,48 @@ msgstr "Útvonal hozzáadása a kapcsolat létrejötte után"
 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 "További hitelesítés TLS-en keresztül"
 
-#: 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 "Ügyfél-ügyfél közötti kapcsolat engedélyezése"
 
-#: 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 "Több ügyfél engedélyezése ugyanazzal a tanúsítvánnyal"
 
-#: 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 "Csak egy munkafolyamat engedélyezése"
 
-#: 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 "A távoli gép IP címének vagy portjának megváltozatásának engedélyezése"
 
-#: 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 "A csatlakozott ügyfelek maximális megengedett száma"
 
-#: 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 "Belső kapcsolatok maximális száma"
 
-#: 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 "Az új kapcsolatok maximálisan megengedett száma"
 
-#: 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 "Napló hozzáfűzése fájlhoz"
 
-#: 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 "Azonosítás felhasználónév és jelszó használatával"
 
-#: 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 "Az alapértelmezett útvonal automatikus átirányítása"
 
@@ -87,227 +87,239 @@ msgstr ""
 "Az alábbi listában találhatóak a beállított OpenVPN példányok és azok "
 "aktuális állapota"
 
-#: 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 "A TUN/TAP interfész lezárása előtt futtatandó shell script."
 
-#: 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 "Hitelesítésszolgáltató"
 
-#: 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 "Folyamat prioritásának módosítása"
 
-#: 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 "Váltás a könyvtárra inicializáslás előtt"
 
-#: 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 "Kliens tanúsítvány összevetése a tiltólistával."
 
-#: 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 "Gyökérkönyvtár váltás inicializáció után"
 
-#: 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 "Ügyfél letiltva"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Beállítások / Visszavonás"
 
-#: 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 "Ügyfél mód beállítása"
 
-#: 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 "Kiszolgáló híd beállítása"
 
-#: 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 "Kiszolgáló mód beállítása"
 
-#: 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 "Kapcsolódás Sock5 proxy-n keresztül"
 
-#: 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 "Kapcsolódás a távoli géphez HTTP proxyn keresztül"
 
-#: 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 "Kapcsolódás újrapróbálkozási időköz"
 
-#: 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 "Váltás démon módba inicializálás után"
 
-#: 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 "Kapcsolat felépítés után 'n' másodperc késleltetés"
 
-#: 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 ""
 
-#: 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 paraméterek"
 
-#: 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 "Egyéni ügyfél konfigurációs fájlok könyvtára "
 
-#: 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 "Lapozás letiltása"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Ne adjon hozzá útvonalakat automatikusan "
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Időbélyegeket ne naplózza"
 
-#: 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 ""
 
-#: 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 "Ne használjon adaptív LZO tömörítést"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 "A paramétereket írja a naplóba"
 
-#: 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 ""
 
-#: 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 "OpenSSL hardveres titkosítás engedélyezése"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -320,53 +332,53 @@ msgstr ""
 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 "Helyi IP cím megtartása újraindításkor"
 
-#: 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 "Távoli IP cím megtartása újraindításkor"
 
-#: 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 "tun/tap eszközök nyitva tartása újraindításkor"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Helyi tanúsítvány"
 
-#: 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 "Helyi gép név vagy IP cím"
 
-#: 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 "Helyi privát kulcs"
 
-#: 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 ""
 
-#: 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 "A sorbaállított kimenő TCP csomagok maximális száma"
 
-#: 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 "Lefoglalt broadcast pufferek száma"
 
-#: 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 "Naplófájl történet sorainak száma"
 
@@ -374,11 +386,11 @@ msgstr "Naplófájl történet sorainak száma"
 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 ""
 
-#: 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 ""
 
@@ -391,11 +403,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN példányok"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -403,28 +415,28 @@ msgstr ""
 msgid "Overview"
 msgstr "Áttekintés"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -436,262 +448,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 "Protokoll"
 
-#: 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 várakozási idő (másodperc)"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Kapcsolat megtagadás ha nincs egyéni ügyfél konfiguráció"
 
-#: 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 ""
 
-#: 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 "Távoli gép név vagy IP cím"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Indítás/Leállítás"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Elindítva"
 
-#: 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 ""
 
-#: 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 "Váltás haladó beállításokra"
 
-#: 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 "Váltás alap beállításokra"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 titkosító"
 
-#: 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 ""
 
@@ -699,7 +721,7 @@ msgstr ""
 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 ""
 
@@ -708,42 +730,41 @@ msgstr ""
 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 ""
 
-#: 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 "A használt eszköz típusa"
 
@@ -755,45 +776,50 @@ 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 "Gyors LZO tömörítés használata"
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Napló írása fájlba"
 
-#: 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 "Folyamat azonosító (PID) fájlba írása"
 
-#: 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 "Állapot fájlba írása 'n' másodpercenként"
 
-#: 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 "nem"
 
-#: 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/ eszköz"
 
-#: 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 tétlenségi idő"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "igen (%i)"
 
diff --git a/applications/luci-app-openvpn/po/it/openvpn.po b/applications/luci-app-openvpn/po/it/openvpn.po
index f0e35b422..07e65baf5 100644
--- a/applications/luci-app-openvpn/po/it/openvpn.po
+++ b/applications/luci-app-openvpn/po/it/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 "%s"
 
-#: 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 ""
 
-#: 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 "Accetta opzioni inviate dal server"
 
@@ -30,7 +30,7 @@ msgstr "Accetta opzioni inviate dal server"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: 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 "Aggiungi rotte dopo aver stabilito la connessione"
 
@@ -38,48 +38,48 @@ msgstr "Aggiungi rotte dopo aver stabilito la connessione"
 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 "Autenticazione addizionale 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 "Permetti traffico client-client"
 
-#: 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 "Permetti più client con lo stesso certificato"
 
-#: 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 "Permetti solo una sessione"
 
-#: 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 "Permetti ai remote di cambiare il proprio IP o porta"
 
-#: 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 "Numero massimo di clienti connessi"
 
-#: 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 "Numero massimo di interni"
 
-#: 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 "Numero massimo di nuove connessioni ammesse"
 
-#: 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 "Appendi il log al 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 "Autenticazione usando username/passoword"
 
-#: 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 "Modifica automaticamente la default route"
 
@@ -87,229 +87,241 @@ msgstr "Modifica automaticamente la default route"
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "Sotto c'è una lista di istanze OpenVPN configurate e il loro stato"
 
-#: 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 "Richiama un cmd/script prima della chiusura del TUN/TAP"
 
-#: 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 "CA"
 
-#: 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 "Cambia priorità del processo"
 
-#: 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 "Cambia cartella prima dell'inizializzazione"
 
-#: 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 "Verifica il certificato del nodo su una 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 "Fai chroot alla cartella dopo l'inizializzazione"
 
-#: 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 disabilitato"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Categoria di configurazione"
 
-#: 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 "Configura la modalità client"
 
-#: 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 "Configura un 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 "Configura la modalità server"
 
-#: 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 "Connetti attraverso un proxy Socks5"
 
-#: 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 "Connetti attraverso un proxy HTTP"
 
-#: 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 "Intervallo per riprovare la connessione"
 
-#: 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 "Usa come daemon dopo l'inizializzazione"
 
-#: 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 "Ritarda n secondi dopo la connessione"
 
-#: 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 "Ritarda lo script di apertura e avvio del tun/tap"
 
-#: 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 "Parametri Diffie Hellman"
 
-#: 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 "Cartella per file personalizzati di configuarazione client"
 
-#: 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 ""
 
-#: 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 "Disabilita il controllo della consistenza delle opzioni"
 
-#: 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 "Non effettuare il bind sull'indirizzo/porta locale"
 
-#: 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 "Non eseguire realmente 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 "Non aggiungere rotte automaticamente"
 
-#: 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 "Non tenere in memoria le password di --askpass o di --auth-user-pass"
 
-#: 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 ""
 
-#: 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 "Non loggare il 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 "Non spingere automaticamente le rotte"
 
-#: 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 "Non rileggere le chiavi al riavvio"
 
-#: 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 "Non usare compressione lzo adattiva"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Non avvisare inconsistenze a livello ifconfig"
 
-#: 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 "Parametri Echo da loggare"
 
-#: 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 "Misura empericamente l'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 "Abilita il supporto criptografico hardware per OpenSSL"
 
-#: 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 "Abilita la ricerca Path MTU"
 
-#: 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 "Abilita la modalità di criptazione chiave statica (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 "Abilita TLS e usa il ruolo client"
 
-#: 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 "Abilita TLS e usa il ruolo server"
 
-#: 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 "Abilita frammentazione interna dei datagram"
 
-#: 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 "Abilita l'interfaccia di controllo su <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 "Abilitato"
 
-#: 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 ""
 "Crittografa e autentica tutti i pacchetti del canale di controllo con la "
 "chiave"
 
-#: 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 "Cifratura di criptazione dei pacchetti"
 
-#: 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 "Esegui un comando shell dopo che le rotte sono aggiunte"
 
-#: 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 "Esegui un comando shell al cambio di ip remoto"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Autenticazione HMAC per i pacchetti"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -322,53 +334,53 @@ msgstr "Istanza \"%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 "Mantieni l'IP local al riavvio"
 
-#: 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 "Mantieni l'IP remoto al riavvio"
 
-#: 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 "Mantienti il device tun/tap aperto al riavvio"
 
-#: 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 ""
 
-#: 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 "Limita le ripetizioni di messaggi nel log"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Chiave privata local"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -376,11 +388,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -393,11 +405,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN istanze"
 
-#: 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 "Ottimizza le scritture su TUN/TAP/UDP"
 
-#: 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 ""
 
@@ -405,28 +417,28 @@ msgstr ""
 msgid "Overview"
 msgstr "Anteprima"
 
-#: 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 "Passa le variabili d'ambiente allo 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -438,262 +450,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 "Porta"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Avviato"
 
-#: 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 ""
 
-#: 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 "Passa alla configurazione avanzata"
 
-#: 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 "Passa alla configurazione base"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -701,7 +723,7 @@ msgstr ""
 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 ""
 
@@ -710,42 +732,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -757,44 +778,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "si (%i)"
diff --git a/applications/luci-app-openvpn/po/ja/openvpn.po b/applications/luci-app-openvpn/po/ja/openvpn.po
index 1732cd755..335379a7d 100644
--- a/applications/luci-app-openvpn/po/ja/openvpn.po
+++ b/applications/luci-app-openvpn/po/ja/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 "%s"
 
-#: 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', または '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 ""
 
@@ -30,7 +30,7 @@ msgstr ""
 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 ""
 
@@ -38,48 +38,48 @@ msgstr ""
 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 ""
 
-#: 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 "クライアント間通信を許可する"
 
-#: 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 ""
 
-#: 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 "1つのセッションのみを許可する"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -87,227 +87,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "現在設定済のOpenVPNの設定とステータスを表示しています。"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "クライアントモードに設定"
 
-#: 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 ""
 
-#: 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 "サーバーモードに設定"
 
-#: 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 ""
 
-#: 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 "再接続間隔"
 
-#: 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 "初期化後にデーモン化する"
 
-#: 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 "セッション接続後、n秒ディレイする"
 
-#: 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 ""
 
-#: 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 パラメータ"
 
-#: 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 ""
 
-#: 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 "ページングを無効にする"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "時刻をログに書き込まない"
 
-#: 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 "再起動時にキーの再読み込みを行わない"
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "OpenSSL暗号化のハードウェアサポートを有効にする"
 
-#: 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 "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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "有効"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -320,53 +332,53 @@ msgstr "設定 \"%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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -374,11 +386,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -391,11 +403,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN 設定"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -403,28 +415,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -436,262 +448,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 "ポート"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "ログ出力レベルの設定"
 
-#: 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 ""
 
-#: 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 "TCP/UDP の受信バッファサイズ"
 
-#: 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 "TCP/UDP の送信バッファサイズ"
 
-#: 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 "tun/tap デバイスの送信キューサイズ"
 
-#: 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 "tun/tap デバイスの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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "実行中"
 
-#: 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 ""
 
-#: 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 "詳細設定へ移動"
 
-#: 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 "基本設定へ移動"
 
-#: 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 ポート (ローカル・リモート共用)"
 
-#: 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 ポート (ローカル, 標準設定=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 ポート (リモート, 標準設定=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 暗号化方式"
 
-#: 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 ""
 
@@ -699,7 +721,7 @@ msgstr ""
 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 ""
 
@@ -708,42 +730,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -755,45 +776,50 @@ 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 "高速LZO圧縮機能を使用する"
+
+#: 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 "使用するプロトコル"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "いいえ"
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "はい (%i)"
 
@@ -803,9 +829,6 @@ msgstr "はい (%i)"
 #~ msgid "Make tun device IPv6 capable"
 #~ msgstr "tun デバイスでIPv6機能を有効にする"
 
-#~ msgid "Use fast LZO compression"
-#~ msgstr "高速LZO圧縮機能を使用する"
-
 #~ msgid "Cryptography"
 #~ msgstr "暗号設定"
 
diff --git a/applications/luci-app-openvpn/po/ms/openvpn.po b/applications/luci-app-openvpn/po/ms/openvpn.po
index 109a0c474..d8d6a4414 100644
--- a/applications/luci-app-openvpn/po/ms/openvpn.po
+++ b/applications/luci-app-openvpn/po/ms/openvpn.po
@@ -8,16 +8,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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 ""
 
-#: 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 ""
 
@@ -25,7 +25,7 @@ msgstr ""
 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 ""
 
@@ -33,48 +33,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -82,227 +82,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -315,53 +327,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -369,11 +381,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -386,11 +398,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -398,28 +410,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -431,262 +443,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -694,7 +716,7 @@ msgstr ""
 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 ""
 
@@ -703,42 +725,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -750,44 +771,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/no/openvpn.po b/applications/luci-app-openvpn/po/no/openvpn.po
index 73b46bac6..17a73ddfd 100644
--- a/applications/luci-app-openvpn/po/no/openvpn.po
+++ b/applications/luci-app-openvpn/po/no/openvpn.po
@@ -9,16 +9,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
-#: 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 ""
 
@@ -26,7 +26,7 @@ msgstr ""
 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 ""
 
@@ -34,48 +34,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -83,227 +83,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -316,53 +328,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -370,11 +382,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -387,11 +399,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -399,28 +411,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -432,262 +444,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -695,7 +717,7 @@ msgstr ""
 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 ""
 
@@ -704,42 +726,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -751,44 +772,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/pl/openvpn.po b/applications/luci-app-openvpn/po/pl/openvpn.po
index 5a213008d..cd23c2169 100644
--- a/applications/luci-app-openvpn/po/pl/openvpn.po
+++ b/applications/luci-app-openvpn/po/pl/openvpn.po
@@ -12,16 +12,16 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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', lub '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 "Zaakceptuj opcje narzucone przez serwer"
 
@@ -29,7 +29,7 @@ msgstr "Zaakceptuj opcje narzucone przez serwer"
 msgid "Add"
 msgstr "Dodaj"
 
-#: 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 "Dodaj trasę po nawiązaniu połączenia"
 
@@ -37,48 +37,48 @@ msgstr "Dodaj trasę po nawiązaniu połączenia"
 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 "Dodatkowe uwierzytelnianie poprzez 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 "Zezwól na łączność klient-klient"
 
-#: 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 "Zezwól na łączenie wielu klientów z tym samym certyfikatem."
 
-#: 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 "Zezwól tylko na jedną sesję"
 
-#: 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 "Zezwól na zmianę IP lub portu odległemu hostowi."
 
-#: 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 "Maksymalna dozwolona liczba klientów"
 
-#: 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 "Maksymalna dozwolona liczba wewnętrznych"
 
-#: 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 "Maksymalna dozwolona liczba nowych połączeń"
 
-#: 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 "Dopisz log do pliku"
 
-#: 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 "Autoryzacja z użyciem loginu oraz hasła"
 
-#: 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 "Automatycznie przekieruj domyślną trasę"
 
@@ -88,192 +88,204 @@ msgstr ""
 "Ponieżej znajduje się lista skonfigurowanych procesów OpenVPN wraz z ich "
 "aktualnymi stanami."
 
-#: 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 "Zatrzymaj skrypt przed wyłączeniem interfejsu TUN/TAP"
 
-#: 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 "Urząd certyfikacji"
 
-#: 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 "Zmień priorytet procesu"
 
-#: 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 "Przejdź do katalogu przed inicjalizacją"
 
-#: 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 "Sprawdź certyfikat peera na obecność w 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 "Zmień root (chroot) na katalog po inicjalizacji"
 
-#: 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 "Klient jest wyłączony"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Kategoria konfiguracji"
 
-#: 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 "Konfiguruj tryb klienta"
 
-#: 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 "Konfiguruj serwer w trybie mostu"
 
-#: 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 "Konfiguruj serwer"
 
-#: 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 "Połącz poprzez 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 "Połącz ze zdalnym hostem poprzez HTTP proxy"
 
-#: 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 "Interwał powtarzania połączeń"
 
-#: 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 "Przejdź w tryb demona po inicjalizacji"
 
-#: 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 "Opóźnienie n sekund po nawiązaniu połączenia"
 
-#: 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 "Opóźnienie otwarcia interfejsu tun/tap i wykonania skryptu"
 
-#: 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 "Parametry Diffie Hellman"
 
-#: 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 "Katalog na pliki konfiguracyjne"
 
-#: 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 "Wyłącz stronicowanie"
 
-#: 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 "Wyłącz sprawdzanie poprawności ustawień"
 
-#: 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 "Nie związuj z lokalnym adresem i portem"
 
-#: 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 "Nie uruchamiaj obecnie 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 "Nie dodawaj tras (routes) automatycznie"
 
-#: 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 "Nie cacheuj haseł --askpass lub --auth-user-pass"
 
-#: 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 "Nie dziedzicz globalnej opcji push"
 
-#: 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 "Nie zapisuj czasu w logu"
 
-#: 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 "Nie wczytuj ponownie klucza podczas restartu"
 
-#: 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 "Nie używaj adaptatywnej kompresji lzo"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Nie ostrzegaj przed niespójnością w ifconfig"
 
-#: 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 "Zapisuj parametry w logu"
 
-#: 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 "Mierz MTU empirycznie"
 
-#: 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 "Włącz sprzętowe przyspieszenie OpenSSL"
 
-#: 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 "Włącz wykrywanie \"Path MTU\""
 
-#: 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 "Włącz tryb szyfrowania statycznym kluczem (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 "Włącz TLS i przyjmij rolę klienta"
 
-#: 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 "Włącz TLS i przyjmij rolę serwera"
 
-#: 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 "Włącz wewnętrzną fragmentację datagramu"
 
-#: 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 "Włącz interfejs zarządzalny na <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 "Włączone"
 
-#: 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 ""
 
-#: 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 "Szyfrowanie dla pakietów"
 
-#: 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 "Wykonaj komendę powłoki po dodaniu tras"
 
-#: 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 "Wykonaj komendę powłoki po zmianie zdalnego IP"
 
-#: 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"
@@ -281,7 +293,7 @@ msgstr ""
 "Wykonane w trybie serwera na nowych połączeniach klienta, gdy klient jest "
 "nadal niezaufany"
 
-#: 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"
@@ -289,24 +301,24 @@ msgstr ""
 "Wykonane w trybie serwera, gdy adres IPv4, trasa lub adres MAC są dodane do "
 "wewnętrznej tablicy routingu w OpenVPN"
 
-#: 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 "Wyjdź przy niepowodzeniu negocjacji TLS"
 
-#: 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 "Uzyskaj hasło PEM z kontroli tty przed demonizacją"
 
-#: 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 "Autoryzacja HMAC dla pakietów"
 
-#: 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 "Postępowanie z błędami uwierzytelniania"
 
-#: 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"
@@ -314,7 +326,7 @@ msgstr ""
 "Dyrektywa Helper w celu uproszczenia wyrażenie --ping i --ping-restart w "
 "konfiguracjach w trybie serwera"
 
-#: 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 "Jeżeli ustanowienie nazwy hosta nie powiedzie się, spróbuj ponownie"
 
@@ -327,53 +339,53 @@ msgstr "Instancja \"%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 "Zachowaj lokalny adres IP przy restarcie"
 
-#: 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 "Zachowaj zdalny adres IP przy restarcie"
 
-#: 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 "Utrzymaj urządzenie tun/tap po restarcie jako otwarte"
 
-#: 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 "Okno zmiany klucza"
 
-#: 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 powtarzających się wiadomości w logu"
 
-#: 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 "Certyfikat lokalny"
 
-#: 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 "Lokalna nazwa hosta lub adres IP"
 
-#: 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 "Lokalny klucz prywatny"
 
-#: 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 "Tryb główny"
 
-#: 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 "Maksymalna liczba wychodzących pakietów TCP w kolejce"
 
-#: 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 "Liczba przydzielonych buforów nadawczych"
 
-#: 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 "Liczba linii w pliku dziennika historii"
 
@@ -381,11 +393,11 @@ msgstr "Liczba linii w pliku dziennika historii"
 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 "Akceptuj tylko połączenia z podanej nazwy X509"
 
-#: 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 "Wykonaj procedurę \"ping timeout\" tylko jeżeli trasy istnieją"
 
@@ -398,11 +410,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Instancje OpenVPN"
 
-#: 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 "Optymalizuj wpisy TUN/TAP/UDP"
 
-#: 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 "Wysyłaj do syslog'a i nie demonizuj"
 
@@ -410,28 +422,28 @@ msgstr "Wysyłaj do syslog'a i nie demonizuj"
 msgid "Overview"
 msgstr "Przegląd"
 
-#: 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 "Plik PKCS#12 zawierający klucze"
 
-#: 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 "Przekaż zmienne środowiskowe do skryptu"
 
-#: 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 "Utrzymaj status ochrony odpowiedzi"
 
-#: 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 "Utrzymuj/Nie utrzymuj 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 "Pinguj zdalnego co n sekund przez port TCP/UDP"
 
-#: 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 ""
 
@@ -443,270 +455,280 @@ 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 ""
 "Poziom zasad odnoszących się do używania zewnętrznych programów i skryptów"
 
-#: 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 "Protokół"
 
-#: 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 "Czas bezczynności proxy w sekundach"
 
-#: 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 "Wyślij opcje ifconfig do zdalnego"
 
-#: 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 "Wyślij opcje do peera"
 
-#: 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 "Kanał zarządzania zapytaniami dla klucza prywatnego"
 
-#: 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 "Losowo wybierz serwer zdalny"
 
-#: 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 "Odmów połączenie gdy nie standardowy klient konfiguracja"
 
-#: 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 "Przemapuj SIGUSR1"
 
-#: 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 "Nazwa lub IP zdalnego hosta"
 
-#: 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 "Zdalny ping upłynął czas"
 
-#: 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 "Renegocjacja danych charakteru klucza po bajtach"
 
-#: 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 "Renegocjacja danych charakteru klucza po pakietach"
 
-#: 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 "Renegocjacja danych charakteru klucza po sekundach"
 
-#: 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 "Powtórzenie osłony okna rozmiaru"
 
-#: 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 "Potrzebna Podpis na Certyfikacie"
 
-#: 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 "Potrzebna klucza używanego w certyfikacie"
 
-#: 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 po zdalnym ping upływie czasu"
 
-#: 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 "Retransmisja po upływie czasu TLS na kanale kontrolnym"
 
-#: 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 "Ponownie spróbować na Http proxy Błędzie"
 
-#: 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 ""
 
-#: 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 "Trasa podsieci do klienta"
 
-#: 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 "Uruchom jako serwer inetd lub xinetd"
 
-#: 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 "Uruchom skrypt cmd po połączeniu klienta"
 
-#: 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 "Uruchom skrypt cmd po rozłączeniu klienta"
 
-#: 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 "Uruchom skrypty up/down dla wszystkich restartów"
 
-#: 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
 #, fuzzy
 msgid "Send notification to peer on disconnect"
 msgstr "Wyślij zgłoszenie o rozłączeniu do peer"
 
-#: 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 "Ustaw GID dla grupy"
 
-#: 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 "Ustaw 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 "Ustaw UID dla użytkownika"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:381
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:396
 #, fuzzy
 msgid "Set aside a pool of subnets"
 msgstr "Odłożyć na bok pulę podsieci"
 
-#: 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 "Ustaw rozszerzone opcje proxy HTTP"
 
-#: 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 ""
 
-#: 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 "Ustaw rozmiar rzeczywistych i wirtualnych adresów tablicy hash"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:276
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:291
 #, fuzzy
 msgid "Set the TCP/UDP receive buffer size"
 msgstr "Ustaw rozmiar buforu wysyłania TCP/UDP"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:272
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:287
 #, fuzzy
 msgid "Set the TCP/UDP send buffer size"
 msgstr "Ustaw rozmiar buforu wysyłania TCP/UDP"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:280
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:295
 #, fuzzy
 msgid "Set tun/tap TX queue length"
 msgstr "Ustaw długość kolejki tun / tap TX "
 
-#: 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 "Ustaw parametr adaptera tun/tap"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Ustaw górną granicę 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 "Formowanie wzajemnego pasma"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:109
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:107
 #, fuzzy
 msgid "Shell cmd to execute after tun device open"
 msgstr "cmd Shell po uruchomieniu urzadzenie tun"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:117
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:115
 #, fuzzy
 msgid "Shell cmd to run after tun device close"
 msgstr "cmd Shell po wyłączeniu urzadzenie tun"
 
-#: 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 "polecenie Shell aby sprawdzić nazwę X509"
 
-#: 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 "Wycisz powtórne pojawianie się ostrzeżeń"
 
-#: 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 "Rozmiar klucza szyfrowania"
 
-#: 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 "Określ domyślną bramę dla tras"
 
-#: 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 "Uruchom OpenVPN w stanie hibernacji"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Start/Stop"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Uruchomiono"
 
-#: 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 "Wersja formatu pliku statusu"
 
-#: 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 "Konfiguracja zaawansowana"
 
-#: 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 "Konfiguracja podstawowa"
 
-#: 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 "Numer portu TCP/UDP zarówno dla lokalnego jak i zdalnego"
 
-#: 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 "Numer portu TCP/UDP dla lokalnego (domyślnie=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 "Numer portu TCP/UDP dla zdalnego (domyślnie=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 "Kodowanie TLS"
 
-#: 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 "Przepuszczanie TOS (dotyczy tylko IPv4)"
 
@@ -714,7 +736,7 @@ msgstr "Przepuszczanie TOS (dotyczy tylko IPv4)"
 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 "Katalog tymczasowy dla pliku zwrotnego połączenia klienta"
 
@@ -723,42 +745,41 @@ msgstr "Katalog tymczasowy dla pliku zwrotnego połączenia klienta"
 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 ""
 
-#: 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 "Typ użytego urządzenia"
 
@@ -770,45 +791,50 @@ 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 "Użyj szybkiej kompresji LZO"
+
+#: 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 "Użyj protokołu"
 
-#: 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 "Użyj węzła urządzenia tun/tap"
 
-#: 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 "Użyj nazwy użytkownika jako nazwy wspólnej"
 
-#: 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 "Zapisz log do pliku"
 
-#: 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 "Zapisz numer ID procesu do pliku"
 
-#: 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 "Zapisz status do pliku co n sekund"
 
-#: 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 "nie"
 
-#: 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 "urządzenie tun/tap"
 
-#: 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 "czas bezczynności tun/tap"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "tak (%i)"
 
diff --git a/applications/luci-app-openvpn/po/pt-br/openvpn.po b/applications/luci-app-openvpn/po/pt-br/openvpn.po
index 40192bc75..cdf1d990d 100644
--- a/applications/luci-app-openvpn/po/pt-br/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt-br/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 "Language-Team: \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 "%s"
 
-#: 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', ou '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 "Aceitar opções enviadas pelo servidor"
 
@@ -30,7 +30,7 @@ msgstr "Aceitar opções enviadas pelo servidor"
 msgid "Add"
 msgstr "Adicionar"
 
-#: 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 "Adicionar rota após estabelecimento da conexão"
 
@@ -38,48 +38,48 @@ msgstr "Adicionar rota após estabelecimento da conexão"
 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 "Autenticação adicional por 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 "Permitir tráfego entre os clientes"
 
-#: 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 "Permitir múltiplos clientes com o mesmo certificado"
 
-#: 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 "Permitir apenas uma sessão"
 
-#: 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 "Permitir a um equipamento remoto altere o seu IP ou porta"
 
-#: 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 "Máximo permitido de clientes conectados"
 
-#: 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 "Máximo permitido internamente para rotas de clientes"
 
-#: 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 "Máximo permitido de novas conexões"
 
-#: 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 "Acrescentar registos ao arquivo"
 
-#: 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 "Autenticar com usuário/senha"
 
-#: 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 "Redirecionar automaticamente a rota padrão"
 
@@ -89,192 +89,204 @@ msgstr ""
 "Abaixo está uma lista de todas as instâncias OpenVPN configuradas e o seu "
 "estado atual"
 
-#: 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 "Executar o comando/script antes do tun/tap fechar"
 
-#: 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 "Autoridade certificadora"
 
-#: 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 "Alterar prioridade do processo"
 
-#: 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 "Mudar para o diretório antes da iniciação"
 
-#: 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 "Verificar certificado do parceiro conta uma 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 para o diretório após a iniciação"
 
-#: 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 "Cliente desativado"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Categoria da configuração"
 
-#: 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 "Configurar modo cliente"
 
-#: 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 "Configurar ponte de servidor"
 
-#: 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 "Configurar modo de servidor"
 
-#: 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 "Conectar através de um proxy Socks5"
 
-#: 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 "Conectar a equipamento remoto através de um proxy HTTP"
 
-#: 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 "Intervalo de reestabelecimento de conexão"
 
-#: 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 "Entre em segundo plano após a iniciação"
 
-#: 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 "Atrase n segundos depois da conexão"
 
-#: 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 "Retardar o script de abertura e ativação do tun/tap"
 
-#: 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 "Parâmetros Diffie-Hellman"
 
-#: 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 "Diretório para configurações personalizadas dos clientes"
 
-#: 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 "Desativar paginação"
 
-#: 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 "Desativar opções de verificação de consistência"
 
-#: 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 "Não ativar no endereço e porta locais"
 
-#: 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 "Não executar ifconfig de verdade"
 
-#: 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 "Não adicionar rotas automaticamente"
 
-#: 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 "Não colocar em cache as senhas do --askpass ou --auth-user-pass "
 
-#: 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 "Não herdar as opções globais de envio (push)"
 
-#: 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 "Não registar a data/hora"
 
-#: 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 "Não puxe as rotas automaticamente"
 
-#: 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 "Não reler a chave entre os reinícios"
 
-#: 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 "Não usar compressão LZO adaptiva"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Não avisar quando existirem inconsistências no ifconfig"
 
-#: 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 "Escrever parâmetros no registo"
 
-#: 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 "Medir empíricamente o 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 "Ativar motor OpenSSL por hardware"
 
-#: 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 "Ativar a descoberta do MTU do caminho"
 
-#: 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 "Ativar modo de encriptação por chave estática (não-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 "Ativar TLS e assumir papel de cliente"
 
-#: 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 "Ativar TLS e assumir papel de servidor"
 
-#: 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 "Ativar a fragmentação interna de datagramas"
 
-#: 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 "Ativar o interface de gestão em <em>IP</em> <em>porta</em>"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Ativado"
 
-#: 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 "Cifre e autentique todos os pacotes do canal de controle com a chave"
 
-#: 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 "Cifra de encriptação para pacotes"
 
-#: 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 "Executar o comando shell após as rotas serem adicionadas"
 
-#: 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 "Executar o comando shell quando existir alteração do IP remoto"
 
-#: 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"
@@ -282,7 +294,7 @@ msgstr ""
 "Executado em modo servidor na nova conexão de cliente, enquanto o cliente "
 "ainda não é confiável"
 
-#: 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"
@@ -290,24 +302,24 @@ msgstr ""
 "Executado em modo servidor quando um endereço/rota IPv4 é adicionao na "
 "tabela de roteamento interna do OpenVPN"
 
-#: 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 "Fechar quando existir falha na negociacao TLS"
 
-#: 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 "Obter password PEM do terminal de controlo antes de passar a daemon"
 
-#: 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 "Autenticação HMAC para pacotes"
 
-#: 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 "Gestão de falhas de autenticação"
 
-#: 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"
@@ -315,7 +327,7 @@ msgstr ""
 "Diretiva de ajuda para simplificar a expressão --ping e --ping-restart nas "
 "configurações de modo servidor"
 
-#: 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 "Se a resolução de nomes falhar, tentar novamente"
 
@@ -328,53 +340,53 @@ msgstr "Instância \"%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 "Manter o endereço IP local entre os reinícios"
 
-#: 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 "Manter o endereço IP remoto entre os reinícios"
 
-#: 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 "Manter o dispositivo tun/tap aberto entre os reinícios"
 
-#: 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 "Janela para transição de chaves"
 
-#: 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 "Limitar entradas repetidas no registo"
 
-#: 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 "Certificado local"
 
-#: 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 "Nome do equipamento ou endereço IP local"
 
-#: 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 "Chave privada local"
 
-#: 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 "Modo principal"
 
-#: 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 "Número máximo de pacotes TCP na fila de saída"
 
-#: 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 "Número de buffers de broadcast alocados"
 
-#: 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 "Número de linhas para o histórico do registo"
 
@@ -382,11 +394,11 @@ msgstr "Número de linhas para o histórico do registo"
 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 "Aceitar conexões apenas de um dado nome X509"
 
-#: 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 "Só processe os estouros de tempo de pings se as rotas existirem"
 
@@ -399,11 +411,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Instâncias OpenVPN"
 
-#: 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 "Otimizar as escritas TUN/TAP/UDP"
 
-#: 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 "Enviar para o syslog os registos e não vá para segundo plano"
 
@@ -411,28 +423,28 @@ msgstr "Enviar para o syslog os registos e não vá para segundo plano"
 msgid "Overview"
 msgstr "Visão Geral"
 
-#: 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 "Arquivo PKCS#12 com as chaves"
 
-#: 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 "Passar variáveis de ambiente ao 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 "Manter persistência da proteção replay"
 
-#: 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 "Manter ou não o conjunto de subredes"
 
-#: 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 "Pingar o remoto a cada n segundos sobre a porta TCP/UDP"
 
-#: 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 ""
 
@@ -444,262 +456,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 "Nível da política sobre o uso de programas e scripts externos"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:122
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:141
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: 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 "Tempo limite do proxy em segundos"
 
-#: 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 "Enviar uma opção ifconfig ao remoto"
 
-#: 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 "Enviar opções ao remoto"
 
-#: 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 "Solicitar chave privada ao canal de gestão"
 
-#: 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 "Escolher o server remoto aleatoriamente"
 
-#: 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 "Recusar conexões de clientes que não tenham configuração personalizada"
 
-#: 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 "Remapear os sinais SIGUSR1"
 
-#: 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 "Nome do equipamento ou endereço IP remoto"
 
-#: 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 "Tempo limite do ping remoto"
 
-#: 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 "Renegociar chave do canal de dados após n 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 "Renegociar chave do canal de dados após n pacotes"
 
-#: 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 "Renegociar chave do canal de dados após n segundos"
 
-#: 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 "Tamanho da janela de proteção conta replay"
 
-#: 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 "Requerer designação específica no certificado"
 
-#: 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 "Requerer que o uso da chave seja explicitado no certificado"
 
-#: 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 "Reiniciar após estouro do tempo do ping remoto"
 
-#: 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 "Estouro de tempo de retransmissão no canal de controle TLS"
 
-#: 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 "Tentar infinitamente a conexão quando existirem erros de proxy Socks"
 
-#: 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 "Tentar infinitamente a conexão quando existirem erros de proxy Socks"
 
-#: 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 "Encaminhar rota da subrede para o cliente"
 
-#: 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 "Executar através do inetd ou xinetd"
 
-#: 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 "Executar script quando o cliente conectar"
 
-#: 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 "Executar script quando o cliente desconectar"
 
-#: 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 "Executar scripts de subida/descida para todos os reinícios"
 
-#: 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 "Notificar parceiro remoto ao desconectar"
 
-#: 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 "Usar o GID do grupo"
 
-#: 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 "Definir o MTU TCP/UDP"
 
-#: 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 "Usar o UID do usuário"
 
-#: 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 "Reservar um conjunto de subredes"
 
-#: 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 "Definir opções extendidas para o proxy HTTP"
 
-#: 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 "Definir detalhamento do registo"
 
-#: 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 "Definir tamanho das tabelas hash de endereços reais e virtuais"
 
-#: 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 "Definir o tamanho do buffer de recepção TCP/UDP"
 
-#: 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 "Definir o tamanho do buffer de envio TCP/UDP"
 
-#: 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 "Definir o tamanho da fila de transmissão tun/tap"
 
-#: 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 "Definir parâmetros do adaptador TUN/TAP"
 
-#: 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 "Definir o MTU do dispositivo tun/tap"
 
-#: 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 "Definir o overhead do dispositivo tun/tap"
 
-#: 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 "Definir teto do MSS TCP"
 
-#: 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 "Restringir a largura de banda ao parceiro"
 
-#: 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 "Comando shell para executar após abertura do dispositivo tun"
 
-#: 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 "Comando shell para executar após o fechamento do dispositivo tun"
 
-#: 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 "Comando shell para verificar o nome do X509"
 
-#: 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 "Silenciar a saída dos avisos de replay"
 
-#: 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 "Tamanho da chave de cifragem"
 
-#: 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 "Especificar uma roteador padrão para as rotas"
 
-#: 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 "Iniciar o OpenVPN em estado de hibernação"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Iniciar/Parar"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Iniciado"
 
-#: 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 "Versão de formato do arquivo de estado"
 
-#: 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 "Mudar para configuração avançada"
 
-#: 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 "Mudar para configuração básica"
 
-#: 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 "Porta TCP/UDP tanto para local e remoto"
 
-#: 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 "Porta TCP/UDP para local (padrão=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 "Porta TCP/UDP para remoto (padrão=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 "Cifra TLS"
 
-#: 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 "Encaminhe TOS (aplicável apenas a IPv4)"
 
@@ -707,7 +729,7 @@ msgstr "Encaminhe TOS (aplicável apenas a IPv4)"
 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 "Diretório temporário para arquivo de retorno de conexão-cliente"
 
@@ -716,42 +738,41 @@ msgstr "Diretório temporário para arquivo de retorno de conexão-cliente"
 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 "A mais alta versão suporta do TLS"
 
-#: 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 "A direção da chave para as opções 'tls-auth' e 'secret'"
 
-#: 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 "A mais baixa versão suporta do TLS"
 
-#: 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 "Janela temporal para troca de chaves"
 
-#: 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 "Tipo de dispositivo utilizado"
 
@@ -763,45 +784,50 @@ 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 "Usar compressão LZO rápida"
+
+#: 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 "Usar protocolo"
 
-#: 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 "Utilizar dispositivo tun/tap"
 
-#: 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 "Usar o nome do usuário como 'common name' (CN)"
 
-#: 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 "Escrever registo no arquivo"
 
-#: 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 "Escrever PID no arquivo"
 
-#: 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 "Escrever estado para arquivo a cada n segundos"
 
-#: 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 "não"
 
-#: 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 "Dispositivo tun/tap"
 
-#: 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 "Tempo limite de inatividade tun/tap"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "sim (%i)"
 
diff --git a/applications/luci-app-openvpn/po/pt/openvpn.po b/applications/luci-app-openvpn/po/pt/openvpn.po
index d42bb2129..bceaf376d 100644
--- a/applications/luci-app-openvpn/po/pt/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt/openvpn.po
@@ -13,16 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\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 "%s"
 
-#: 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', ou '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 "Aceitar opções enviadas pelo servidor"
 
@@ -30,7 +30,7 @@ msgstr "Aceitar opções enviadas pelo servidor"
 msgid "Add"
 msgstr "Adicionar"
 
-#: 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 "Adicionar rota após estabelecimento da ligação"
 
@@ -38,48 +38,48 @@ msgstr "Adicionar rota após estabelecimento da ligação"
 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 "Autenticação adicional por 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 "Permitir tráfego cliente-a-cliente"
 
-#: 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 "Permitir multiplos clientes com o mesmo certificado"
 
-#: 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 "Permitir apenas uma sessão"
 
-#: 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 "Permitir a um host remoto que altere o seu IP ou porta"
 
-#: 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 "Máximo permitido de clientes ligados"
 
-#: 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 "Máximo permitido internamente para rotas de clientes"
 
-#: 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 "Maximo permitido de novas ligações"
 
-#: 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 "Acrescentar registos ao ficheiro"
 
-#: 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 "Autenticar com 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 "Redireccionar automaticamente a rota pre-definida"
 
@@ -89,192 +89,204 @@ msgstr ""
 "Abaixo está uma lista de todas as instâncias OpenVPN configuradas e o seu "
 "estado actual"
 
-#: 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 "Executar o comando/script antes do fecho tun/tap"
 
-#: 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 "Autoridade certificadora"
 
-#: 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 "Alterar prioridade do processo"
 
-#: 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 "Mudar para o directório antes da inicialização"
 
-#: 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 "Verificar certificado do remoto conta uma 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 para o directorio apos a inicialização"
 
-#: 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 "Cliente desativado"
 
-#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:26
+#: applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm:20
 msgid "Configuration category"
 msgstr "Categoria da configuração"
 
-#: 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 "Configurar modo cliente"
 
-#: 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 "Configurar bridge de servidor"
 
-#: 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 "Configurar modo de servidor"
 
-#: 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 "Ligar através de um proxy Socks5"
 
-#: 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 "Ligar ao host remoto através de um proxy HTTP"
 
-#: 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 "Intervalo de reestabelecimento de ligação"
 
-#: 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 "Passar a daemon após a inicialização"
 
-#: 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 "Aguardar n segundos após a ligação"
 
-#: 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 "Retardar o script de abertura/ativação tun/tap"
 
-#: 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 "Parametros Diffie-Hellman"
 
-#: 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 "Directório para configurações personalizadas dos clientes"
 
-#: 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 "Desativar 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 "Desativar opções de verificação de consistência"
 
-#: 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 "Não vincular o endereço e porta locais"
 
-#: 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 "Não executar 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 "Não adicionar rotas automaticamente"
 
-#: 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 "Não colocar em cache as passwords --askpass ou --auth-user-pass "
 
-#: 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 "Não herdar as opções globais de envio (push)"
 
-#: 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 "Não registar 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 "Não reler a chave entre reinicios"
 
-#: 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 "Não usar compressão LZO adaptiva"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Não avisar quando existirem inconsistencias no ifconfig"
 
-#: 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 "Escrever parametros no registo"
 
-#: 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 "Medição empírica de 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 "Ativar motor OpenSSL por hardware"
 
-#: 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 "Ativar a descoberta do MTU do caminho"
 
-#: 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 "Ativar modo de encriptação por chave estática (não-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 "Activar TLS e assumir papel de cliente"
 
-#: 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 "Activar TLS e assumir papel de servidor"
 
-#: 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 "Activar a fragmentação interna de datagramas"
 
-#: 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 "Activar o interface de gestão em <em>IP</em> <em>porta</em>"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Activado"
 
-#: 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 ""
 
-#: 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 "Cifra de encriptação para pacotes"
 
-#: 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 "Executar o comando shell após as rotas serem adicionadas"
 
-#: 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 "Executar o comando shell quando existir alteração do IP remoto"
 
-#: 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"
@@ -282,7 +294,7 @@ msgstr ""
 "Executado em modo de servidor em novas ligações de cliente, quando o cliente "
 "ainda não é de confiável"
 
-#: 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"
@@ -290,24 +302,24 @@ msgstr ""
 "Executado em modo de servidor quando um endereço IPv4/rota ou endereço MAC é "
 "adicionado à tabela interna de roteamento do OpernVPN."
 
-#: 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 "Fechar quando existir falha na negociação TLS"
 
-#: 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 "Obter password PEM do terminal de controlo antes de passar a daemon"
 
-#: 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 "Autenticação HMAC para pacotes"
 
-#: 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 "Gestão de falhas de autenticação"
 
-#: 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"
@@ -315,7 +327,7 @@ msgstr ""
 "Directiva auxiliar para simplificar a expressão de --ping e --ping-restart "
 "nas configurações do modo servidor"
 
-#: 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 "Se a resolução de nomes falhar, tentar novamente"
 
@@ -328,53 +340,53 @@ msgstr "Instância \"%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 "Manter o endereço IP local entre reinicios"
 
-#: 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 "Manter o endereço IP remoto entre reinicios"
 
-#: 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 "Manter o dispositivo tun/tap aberto entre reinicios"
 
-#: 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 "Janela para transição de chaves"
 
-#: 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 "Limitar repetição de entradas no registo"
 
-#: 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 "Certificado local"
 
-#: 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 "Hostname ou endereço IP local"
 
-#: 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 "Chave privada local"
 
-#: 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 "Modo principal"
 
-#: 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 "Maximo de pacotes TCP na queue de output"
 
-#: 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 "Numero de buffers de broadcast alocados"
 
-#: 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 "Numero de linhas para o historico do registo"
 
@@ -382,11 +394,11 @@ msgstr "Numero de linhas para o historico do registo"
 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 "Aceitar ligações apenas de um dado nome X509"
 
-#: 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 "Só processar timeouts de pings se existirem rotas"
 
@@ -399,11 +411,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Instâncias OpenVPN"
 
-#: 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 "Optimizar as escritas TUN/TAP/UDP"
 
-#: 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 "Registos para o syslog e não passar a daemon"
 
@@ -411,28 +423,28 @@ msgstr "Registos para o syslog e não passar a daemon"
 msgid "Overview"
 msgstr "Visão Geral"
 
-#: 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 "Ficheiro PKCS#12 com chaves"
 
-#: 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 "Passar variaveis de ambiente ao 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 "Manter persistência da protecção replay"
 
-#: 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 "Manter ou não o conjunto de subredes"
 
-#: 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 "Pingar o remoto a cada n segundos sobre a porta TCP/UDP"
 
-#: 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 ""
 
@@ -444,262 +456,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 "Nível da política sobre o uso de programas externos e scripts"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:122
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:141
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: 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 "Timeout do proxy em segundos"
 
-#: 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 "Enviar uma opção ifconfig ao remoto"
 
-#: 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 "Enviar opções ao remoto"
 
-#: 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 "Solicitar chave privada ao canal de gestão"
 
-#: 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 "Escolher o server remoto aleatoriamente"
 
-#: 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 "Recusar ligações de clientes que não tenham configurações "
 
-#: 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 "Mapear os sinais SIGUSR1"
 
-#: 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 "Hostname endereço IP remoto"
 
-#: 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 "Timeout do ping remoto"
 
-#: 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 "Renegociar chave do canal de dados após n 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 "Renegociar chave do canal de dados após n pacotes"
 
-#: 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 "Renegociar chave do canal de dados após n segundos"
 
-#: 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 "Tamanho da janela de protecção conta replay"
 
-#: 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 "Requerer designação específica no certificado"
 
-#: 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 "Requerer utilização explicita de utilização de chave no certificado"
 
-#: 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 "Reiniciar após timeout do ping remoto"
 
-#: 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 "Timeout de retransmissão no canal de controlo TLS"
 
-#: 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 "Tentar infinitamente sempre que existam erros de proxy HTTP"
 
-#: 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 "Tentar continuamente a ligação quando existirem erros de proxy Socks"
 
-#: 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 "Encaminhar rota da subrede para o cliente"
 
-#: 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 "Executar via inetd ou xinetd"
 
-#: 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 "Executar script quando o cliente ligar"
 
-#: 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 "Executar script quando o cliente desligar"
 
-#: 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 "Executar scripts de abertura/activação para todos os reinicios"
 
-#: 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 "Notificar remoto ao desligar"
 
-#: 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 "Assumir GID para o grupo"
 
-#: 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 "Definir o MTU TCP/UDP"
 
-#: 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 "Assumir UID para o utilizador"
 
-#: 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 "Reservar um conjunto de subredes"
 
-#: 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 "Definir opções extra para o proxy HTTP"
 
-#: 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 "Definir verbosidade do registo"
 
-#: 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 "Definir tamanho das tabelas hash de endereços reais e virtuais"
 
-#: 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 "Definir o buffer de recepção TCP/UDP"
 
-#: 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 "Definir o buffer de envio TCP/UDP"
 
-#: 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 "Definir o tamanho da queue de transmissão tun/tap"
 
-#: 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 "Definir os parâmetros do adaptador tun/tap"
 
-#: 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 "Definir o MTU do dispositivo tun/tap"
 
-#: 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 "Definir o overhead do dispositivo tun/tap"
 
-#: 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 "Definir tecto do MSS TCP"
 
-#: 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 "Restringir a largura de banda ao remoto"
 
-#: 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 "Comando shell a executar após abertura do dispositivo tun"
 
-#: 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 "Comando shell a executar após fecho do dispositivo tun"
 
-#: 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 "Comando shell para verificar o nome X509"
 
-#: 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 "Silenciar o output dos avisos de replay"
 
-#: 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 "Tamanho da chave de cifra"
 
-#: 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 "Especificar uma gateway para as rotas"
 
-#: 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 "Iniciar o OpenVPN em estado de hibernação"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:98
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:117
 msgid "Start/Stop"
 msgstr "Iniciar/Parar"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:87
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:106
 msgid "Started"
 msgstr "Iniciado"
 
-#: 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 "Versão de formato do ficheiro de estado"
 
-#: 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 "Mudar para configuração avançada"
 
-#: 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 "Mudar para configuração básica"
 
-#: 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 "Porta TCP/UDP para local e remoto"
 
-#: 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 "Porta TCP/UDP para local (predefinição=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 "Porta TCP/UDP para remoto (predefinição=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 "Cifra TLS"
 
-#: 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 "Passthrough TOS (aplicavel apenas a IPv4)"
 
@@ -707,7 +729,7 @@ msgstr "Passthrough TOS (aplicavel apenas a IPv4)"
 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 "Directório temporário para ficheiro de retorno de ligação-cliente"
 
@@ -716,42 +738,41 @@ msgstr "Directório temporário para ficheiro de retorno de ligação-cliente"
 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 "Janela temporal para troca de chaves"
 
-#: 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 "Tipo de dispositivo utilizado"
 
@@ -763,45 +784,50 @@ 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 "Usar compressão LZO rápida"
+
+#: 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 "Usar protocolo"
 
-#: 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 "Utilizar dispositivo tun/tap"
 
-#: 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 "Usar o username como nome comum"
 
-#: 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 "Escrever registo para o ficheiro"
 
-#: 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 "Escrever PID no ficheiro"
 
-#: 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 "Escrever estado para ficheiro a cada n segundos"
 
-#: 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 "não"
 
-#: 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 "Dispositivo tun/tap"
 
-#: 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 "Timeout de inactividade tun/tap"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "sim (%i)"
 
diff --git a/applications/luci-app-openvpn/po/ro/openvpn.po b/applications/luci-app-openvpn/po/ro/openvpn.po
index 6373be337..e925bbaee 100644
--- a/applications/luci-app-openvpn/po/ro/openvpn.po
+++ b/applications/luci-app-openvpn/po/ro/openvpn.po
@@ -10,16 +10,16 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\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 ""
 
-#: 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 ""
 
@@ -27,7 +27,7 @@ msgstr ""
 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 ""
 
@@ -35,48 +35,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -84,227 +84,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -317,53 +329,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -371,11 +383,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -388,11 +400,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -400,28 +412,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -433,262 +445,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -696,7 +718,7 @@ msgstr ""
 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 ""
 
@@ -705,42 +727,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -752,44 +773,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/ru/openvpn.po b/applications/luci-app-openvpn/po/ru/openvpn.po
index 7b4aa5b66..401e41186 100644
--- a/applications/luci-app-openvpn/po/ru/openvpn.po
+++ b/applications/luci-app-openvpn/po/ru/openvpn.po
@@ -15,16 +15,16 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский интерфейс, "
 "все проверялось в графическом режиме, совместим с другими apps\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' или '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 "Принять параметры, переданные с сервера."
 
@@ -32,7 +32,7 @@ msgstr "Принять параметры, переданные с сервер�
 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 "Добавить маршрут после установки соединения."
 
@@ -40,51 +40,51 @@ msgstr "Добавить маршрут после установки соеди
 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 "Дополнительная аутентификация используя 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 "Разрешить трафик между клиентами."
 
-#: 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 ""
 "Разрешить одновременное подключение нескольких клиентов с одним сертификатом."
 
-#: 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 "Разрешить только одну сессию."
 
-#: 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 "Разрешить удаленное изменение IP-адреса или порта."
 
-#: 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 "Разрешено максимальное количество подключенных клиентов."
 
-#: 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 ""
 "Разрешено максимальное кол-во внутренних маршрутов клиенту (по "
 "умолчанию=256)."
 
-#: 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 "Разрешено максимальное кол-во новых соединений."
 
-#: 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 "Добавить запись в файл журнала."
 
-#: 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 "Аутентификация используя имя пользователя и пароль."
 
-#: 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 "Автоматически перенаправлять маршруты по умолчанию."
 
@@ -92,139 +92,143 @@ msgstr "Автоматически перенаправлять маршруты
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "Список настроенных экземпляров OpenVPN и их текущее состояние."
 
-#: 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 ""
 "Команда/скрипт для командной строки, запускаемая(ый) перед отключением TUN/"
 "TAP."
 
-#: 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 "Центр сертификации"
 
-#: 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 "Изменить приоритет процесса после инициализации."
 
-#: 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 "Перейти в указанную папку перед инициализацией."
 
-#: 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 "Проверить сертификат узла на соответствие файлу CRL в формате PEM."
 
-#: 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 ""
 "Корневой каталог после инициализации. OpenVPN не сможет получить доступ к "
 "файлам за его пределами."
 
-#: 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 "Клиент отключен"
 
-#: 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 "Настроить режим клиента."
 
-#: 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 "Настроить мост сервера."
 
-#: 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 "Настроить режим сервера."
 
-#: 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 "Соединяться используя Socks5 прокси."
 
-#: 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 "Подключиться к удалённому хосту используя HTTP прокси."
 
-#: 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 "Интервал между попытками подключения."
 
-#: 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 "Запустить в режиме демона после инициализации."
 
-#: 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 "Задержка n секунд после подключения."
 
-#: 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 "Использовать задержку запуска tun/tap до выполнения скрипта"
 
-#: 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 "Файл параметров Диффи Хелмана."
 
-#: 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 "Папка для пользовательских config файлов клиента."
 
-#: 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 ""
 "Отключите пейджинг, вызвав функцию 'POSIX mlockall'.<br />Требуется, чтобы "
 "OpenVPN был первоначально запущен от root.<br />Хотя OpenVPN может "
 "впоследствии понизить свой UID с помощью опции '-user'."
 
-#: 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 "Выключить проверку согласованности параметров."
 
-#: 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 ""
 "Не выполнять привязку к локальному адресу и порту.<br />Используется "
 "динамический порт, подключение только с параметром 'remote'."
 
-#: 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 ""
 "На самом деле не выполнять команды 'ifconfig/netsh'.<br />Вместо этого "
 "передавать параметры '-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 ""
 "Не добавлять маршруты автоматически.<br />Вместо этого передавать маршруты в "
 "'-route-up' скрипт используя переменные окружения."
 
-#: 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 ""
 "Не кэшировать пароли '-askpass' или '-auth-user-pass' в виртуальной памяти."
 
-#: 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 ""
 "Не наследовать общие параметры 'Push Options' для конкретного клиента.  Это "
 "позволит игнорировать '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 "Не записывать метки времени в системный журнал."
 
-#: 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 ""
 "Когда используется опция '-client' или '-pull', принять опции переданные "
@@ -234,85 +238,93 @@ msgstr ""
 "ввиду что эта опция по прежнему позволяет серверу устанавливать свойства TCP/"
 "IP для клиентского TUN/TAP интерфейса."
 
-#: 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 ""
 "Не перечитывайте файлы ключей при перезапуске (выполнении 'SIGUSR1' или "
 "'ping-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 "Не использовать адаптивное сжатие 'lzo'."
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 "Не выводить предупреждение проверки согласованности параметров, если "
 "параметр 'ifconfig' с этой стороны соединения не совпадает с удаленной "
 "стороной."
 
-#: 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 "Записывать параметры эхо-ответов в системный журнал."
 
-#: 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 "Эмпирически измерять 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 "Включить поддержку аппаратного шифрования OpenSSL."
 
-#: 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 "Включить обнаружение пути MTU (PMTUD)."
 
-#: 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 ""
 "Включить режим шифрования с использованием Статического ключа (не TLS). "
 "Использовать общий секретный файл, который был сгенерирован 'genkey'."
 
-#: 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 "Включить TLS и выступить в роли клиента во время подтверждения TLS."
 
-#: 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 "Включить в режиме сервера протокол TLS."
 
-#: 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 ""
 "Включить внутреннюю фрагментацию датаграмм, чтобы не отправлялись UDP-"
 "датаграммы, размер которых превышает максимальное число байтов."
 
-#: 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 ""
 "Включить интерфейс управления, назначив ему <em>IP-адрес</em> <em>порт</em>."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Включено"
 
-#: 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 ""
 "Шифрование и проверка подлинности всех пакетов каналов управления с помощью "
 "ключа"
 
-#: 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 "Алгоритм шифрования для пакетов."
 
-#: 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 "Выполнить shell команду после добавления маршрутов."
 
-#: 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 "Выполнить shell команду при изменении IP-адреса удалённого хоста."
 
-#: 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"
@@ -320,7 +332,7 @@ msgstr ""
 "Выполнять в режиме сервера '-mode server' при появлении новых клиентских "
 "соединений, если к клиенту ещё нет доверия."
 
-#: 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"
@@ -328,27 +340,27 @@ msgstr ""
 "Выполнять в режиме сервера '-mode server' каждый раз, когда адрес/маршрут "
 "IPv4 или MAC-адрес добавлен в таблицу маршрутизации OpenVPN."
 
-#: 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 "Выйти при ошибке согласования использования протокола TLS."
 
-#: 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 "Получить PEM пароль от управления tty, прежде чем включить демон."
 
-#: 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 ключа для пакетов."
 
-#: 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 ""
 "Настройка реакции на ошибки проверки имени пользователя / пароля, такие как "
 "ответ клиента на AUTH_FAILED сообщение от сервера или провал проверки пароля "
 "закрытого ключа."
 
-#: 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"
@@ -356,7 +368,7 @@ msgstr ""
 "Вспомогательная команда предназначенная для упрощения выражений '-ping' и '-"
 "ping-restart' в режиме настройки сервера."
 
-#: 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 "Пытаться подключиться снова при ошибке определения имени хоста."
 
@@ -369,53 +381,53 @@ msgstr "Экземпляр \"%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 "Не изменять локальный IP-адрес при перезапуске."
 
-#: 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 "Не изменять удалённый IP-адрес при перезапуске."
 
-#: 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 "Сохранять виртуальное устройство tun/tap запущенным при перезагрузке."
 
-#: 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 "Окно передачи ключей"
 
-#: 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 "Ограничить повторяющиеся сообщения в журнале."
 
-#: 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 "Локальный сертификат"
 
-#: 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 "Имя локального хоста или IP-адрес."
 
-#: 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 "Локальный Приватный ключ"
 
-#: 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 "Основной режим"
 
-#: 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 "Максимальное количество исходящих TCP пакетов в очереди."
 
-#: 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 "Количество выделенных широковещательных буферов."
 
-#: 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 "Количество строк в файле журнала."
 
@@ -423,11 +435,11 @@ msgstr "Количество строк в файле журнала."
 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 "Только принимать соединения от имени данного сертификата X509."
 
-#: 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 ""
 "Использовать временную задержку пинг-запросов только в случае, когда "
@@ -442,12 +454,12 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "Экземпляры OpenVPN"
 
-#: 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 ""
 "Оптимизация записей ввода/вывода TUN/TAP/UDP (экспериментальная опция)."
 
-#: 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 "Записывать события в системный журнал и не переходить в режим демона."
 
@@ -455,32 +467,32 @@ msgstr "Записывать события в системный журнал �
 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', содержащий локальный Приватный ключ, локальный "
 "сертификат и root CA сертификат."
 
-#: 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 "Передавать переменные окружения скрипту."
 
-#: 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 ""
 "Сохранять состояние защиты от воспроизведения в сеансах, используя файл для "
 "сохранения и перезагрузки состояния."
 
-#: 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 "Сохранять/не сохранять пул ifconfig."
 
-#: 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 "Выполнять пинг-запрос каждые n секунд, используя порт TCP/UDP."
 
-#: 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 ""
 
@@ -492,191 +504,204 @@ 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 "Порт"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "Протокол"
 
-#: 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 "Время ожидания прокси в секундах."
 
-#: 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 "Выполнить команду ifconfig на удалённом узле."
 
-#: 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'."
 
-#: 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 "Канал управления запросами для Приватного ключа."
 
-#: 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 "Случайный выбор удалённого сервера."
 
-#: 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 ""
 "Разорвать соединение, если пользовательский 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 ""
 "Управление внутренними или внешними сигналами генерируемыми 'SIGUSR1' и "
 "переназначаемыми 'SIGHUP'."
 
-#: 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 "Имя удалённого хоста или IP-адрес."
 
-#: 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 "Время ожидания удаленного пинг-запроса."
 
-#: 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 ""
 "Повторное согласование ключа канала данных после отправки или получения n "
 "байт (по умолчанию отключено)."
 
-#: 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 ""
 "Повторное согласование ключа канала данных после отправки и получения n "
 "пакетов (по умолчанию отключено)."
 
-#: 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 ""
 "Повторное согласование ключа канала данных через n секунд (по "
 "умолчанию=3600)."
 
-#: 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 ""
 "Использовать защиту от повтора - скользящее окно размером 'n' с интервалом "
 "времени 't' секунд."
 
-#: 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 "Требовать явного указания в сертификате."
 
-#: 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 "Требовать явного использования ключа в сертификате."
 
-#: 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 "Перезапуск после ожидания удаленного пинг-запроса."
 
-#: 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 ""
 "Пакет ретранслирует тайм-аут на канале управления протокола TLS, если нет "
 "подтверждения от удаленного узла в течение секунд (по умолчанию=2)."
 
-#: 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 ""
 "Постоянно пытаться заново подключиться при ошибке HTTP прокси.<br />Если "
 "возникает ошибка прокси-сервера HTTP, имитировать сброс 'SIGUSR1'."
 
-#: 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 ""
 "Постоянно пытаться заново подключиться при ошибке Socks прокси. Если "
 "возникает ошибка прокси-сервера HTTP, имитировать сброс 'SIGUSR1'."
 
-#: 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 "Перенаправить подсеть клиенту."
 
-#: 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 "Запуск от имени сервера 'inetd' или 'xinetd'."
 
-#: 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 "Запустить скрипт командной строки при подключении клиента."
 
-#: 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 "Запустить скрипт командной строки при отключении клиента."
 
-#: 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 "Запускать 'up/down' скрипты во время всех перезапусков."
 
-#: 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 "Отправить уведомление на узел при отключении."
 
-#: 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 "Задайте GID группы."
 
-#: 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 "Задайте MTU для TCP/UDP."
 
-#: 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 "Задайте UID пользователя."
 
-#: 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 "Выделить пул подсетей."
 
-#: 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 "Задайте расширенные параметры HTTP прокси."
 
-#: 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 "Задайте детализацию ведения журнала."
 
-#: 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 ""
 "Задайте размер реального адреса хэш-таблицы 'r' и виртуального адреса хэш-"
 "таблицы 'v'. По умолчанию для обеих таблиц установлено значение 256."
 
-#: 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 "Задайте размер буфера приёма TCP/UDP."
 
-#: 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 "Задайте размер буфера передачи TCP/UDP."
 
-#: 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 ""
 "Задайте длину очереди передачи интерфейса tun/tap. В настоящее время по "
 "умолчанию 100."
 
-#: 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 ""
 "Задайте параметры адаптеру tun/tap. l это IP-адрес локальной конечной точки "
@@ -684,98 +709,95 @@ msgstr ""
 "Для устройств TAP rn-это маска подсети сегмента виртуального Ethernet, к "
 "которому создается или подключается."
 
-#: 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 "Задайте MTU для виртуального устройства tun/tap."
 
-#: 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 ""
 "Задайте возможное превышение размера MTU для виртуального устройства tun/tap."
 
-#: 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 "Задайте верхнюю границу для 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 "Формирование полосы пропускания узлов."
 
-#: 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 команду после старта виртуального устройства tun."
 
-#: 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 команду после закрытия виртуального устройства tun."
 
-#: 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 для проверки имени сертификата X509."
 
-#: 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 ""
 "Заглушить вывод предупреждений о повторах, которые являются обычным ложным "
 "сигналом в Wi-Fi сетях."
 
-#: 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 "Размер ключа алгоритма шифрования."
 
-#: 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 "Назначить шлюз по умолчанию для маршрутов."
 
-#: 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 "Запустить OpenVPN в спящем режиме."
 
-#: 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 "Запущено"
 
-#: 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 "Версия формата файла состояния."
 
-#: 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 "Перейти к расширенным настройкам"
 
-#: 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 "Перейти к основным настройкам"
 
-#: 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 порта."
 
-#: 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 порта (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 порта (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."
 
-#: 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 пересылки (применяется только к IPv4)."
 
@@ -783,7 +805,7 @@ msgstr "TOS пересылки (применяется только к IPv4)."
 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 "Временная папка для файла возврата '-client-connect'."
 
@@ -792,42 +814,41 @@ msgstr "Временная папка для файла возврата '-clien
 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 "Самая высокая поддерживаемая версия протокола TLS."
 
-#: 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 "Указать ключ для параметров 'tls-auth' и 'secret'."
 
-#: 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 "Самая низкая поддерживаемая версия протокола TLS."
 
-#: 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 "Временные рамки для обмена ключами."
 
-#: 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 "Тип используемого устройства."
 
@@ -839,45 +860,50 @@ 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 "Использовать быстрое сжатие 'lzo'."
+
+#: 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 "Использовать протокол"
 
-#: 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 "Использование виртуального  устройства tun/tap узлом."
 
-#: 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 "Использовать имя пользователя в качестве общего имени."
 
-#: 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 "Записывать события в файл."
 
-#: 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 "Записать ID процесса в файл."
 
-#: 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 "Записывать состояние в файл каждые n секунд."
 
-#: 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 "нет"
 
-#: 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."
 
-#: 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."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "да (%i)"
 
diff --git a/applications/luci-app-openvpn/po/sk/openvpn.po b/applications/luci-app-openvpn/po/sk/openvpn.po
index 5c519d293..7913d6f06 100644
--- a/applications/luci-app-openvpn/po/sk/openvpn.po
+++ b/applications/luci-app-openvpn/po/sk/openvpn.po
@@ -8,16 +8,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 ""
 
-#: 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 ""
 
@@ -25,7 +25,7 @@ msgstr ""
 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 ""
 
@@ -33,48 +33,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -82,227 +82,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -315,53 +327,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -369,11 +381,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -386,11 +398,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -398,28 +410,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -431,262 +443,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -694,7 +716,7 @@ msgstr ""
 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 ""
 
@@ -703,42 +725,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -750,44 +771,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/sv/openvpn.po b/applications/luci-app-openvpn/po/sv/openvpn.po
index 77576e889..25fdceb1d 100644
--- a/applications/luci-app-openvpn/po/sv/openvpn.po
+++ b/applications/luci-app-openvpn/po/sv/openvpn.po
@@ -9,16 +9,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 "%s"
 
-#: 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', eller 'subnät'"
 
-#: 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 ""
 
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Add"
 msgstr "Lägg till"
 
-#: 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 ""
 
@@ -34,48 +34,48 @@ msgstr ""
 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 "Ytterligare autentisering via 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 "Tillåt klient-till-klienttraffik"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -83,227 +83,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -316,53 +328,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -370,11 +382,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -387,11 +399,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -399,28 +411,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -432,262 +444,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -695,7 +717,7 @@ msgstr ""
 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 ""
 
@@ -704,42 +726,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -751,44 +772,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/templates/openvpn.pot b/applications/luci-app-openvpn/po/templates/openvpn.pot
index 505b9bda5..d518696e7 100644
--- a/applications/luci-app-openvpn/po/templates/openvpn.pot
+++ b/applications/luci-app-openvpn/po/templates/openvpn.pot
@@ -1,16 +1,16 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -18,7 +18,7 @@ msgstr ""
 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 ""
 
@@ -26,48 +26,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -75,227 +75,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -308,53 +320,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -362,11 +374,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -379,11 +391,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -391,28 +403,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -424,262 +436,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -687,7 +709,7 @@ msgstr ""
 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 ""
 
@@ -696,42 +718,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -743,44 +764,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/tr/openvpn.po b/applications/luci-app-openvpn/po/tr/openvpn.po
index 8f6b84490..6bef476bd 100644
--- a/applications/luci-app-openvpn/po/tr/openvpn.po
+++ b/applications/luci-app-openvpn/po/tr/openvpn.po
@@ -8,16 +8,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
-#: 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 ""
 
@@ -25,7 +25,7 @@ msgstr ""
 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 ""
 
@@ -33,48 +33,48 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -82,227 +82,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -315,53 +327,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -369,11 +381,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -386,11 +398,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -398,28 +410,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -431,262 +443,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -694,7 +716,7 @@ msgstr ""
 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 ""
 
@@ -703,42 +725,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -750,44 +771,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/uk/openvpn.po b/applications/luci-app-openvpn/po/uk/openvpn.po
index c4eef737d..e17d10764 100644
--- a/applications/luci-app-openvpn/po/uk/openvpn.po
+++ b/applications/luci-app-openvpn/po/uk/openvpn.po
@@ -12,16 +12,16 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 ""
 
-#: 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 ""
 
@@ -29,7 +29,7 @@ msgstr ""
 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 ""
 
@@ -37,48 +37,48 @@ msgstr ""
 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 ""
 
-#: 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 "Дозволити обмін трафіком між клієнтами"
 
-#: 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 "Дозволити декілька клієнтів з однаковим сертифікатом"
 
-#: 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 "Дозволити лише одну сесію"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -86,227 +86,239 @@ msgstr ""
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -319,53 +331,53 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -373,11 +385,11 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -390,11 +402,11 @@ msgstr ""
 msgid "OpenVPN instances"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -402,28 +414,28 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -435,262 +447,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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -698,7 +720,7 @@ msgstr ""
 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 ""
 
@@ -707,42 +729,41 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
@@ -754,44 +775,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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr ""
diff --git a/applications/luci-app-openvpn/po/vi/openvpn.po b/applications/luci-app-openvpn/po/vi/openvpn.po
index b85cb07c5..b8c6d3ac8 100644
--- a/applications/luci-app-openvpn/po/vi/openvpn.po
+++ b/applications/luci-app-openvpn/po/vi/openvpn.po
@@ -12,16 +12,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\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 "Chấp nhận tùy chọn được đảy từ server"
 
@@ -29,7 +29,7 @@ msgstr "Chấp nhận tùy chọn được đảy từ 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 "Thêm tuyến sau khi kết nối thành lập"
 
@@ -37,48 +37,48 @@ msgstr "Thêm tuyến sau khi kết nối thành lập"
 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 "Xác thực bổ xung trên 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 "Cho phép lưu thông đối tượng - đến - đối tượng"
 
-#: 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 "Cho phép nhiều đối tượng với cùng một chứng chỉ"
 
-#: 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 "Chỉ cho phép một 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 "Cho phép đối tượng ngoài vùng thay đổi IP hoặc cổng"
 
-#: 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 "Cho phép tối đa đối tượng kết nối mới là"
 
-#: 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 "Internal tối đa được cho phép"
 
-#: 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 "Cho phép tối đa kết nối mới là"
 
-#: 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 "Nối thêm log lên tập tin"
 
-#: 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 "Xác thực username/password đang sử dụng"
 
-#: 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 "Tự động chuyển hướng tuyến mặc định"
 
@@ -88,227 +88,239 @@ msgstr ""
 "Dưới đây là một list của OpenVPN instances đã được cấu hình và tình trạng "
 "hiện tại"
 
-#: 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 trước khi TUN/TAP đóng"
 
-#: 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 "Giấy chứng nhận ủy quyền"
 
-#: 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 "Thay đổi quy trình ưu tiên"
 
-#: 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 "Chuyển qua thư mục trước khi khởi tạo"
 
-#: 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 "Kiểm tra chứng chỉ đối tác với một 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 vào thư mục sau khi khởi tạo"
 
-#: 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 "Đối tượng bị vô hiệu hóa"
 
-#: 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 "Định cấu hình chế độ đối tượng "
 
-#: 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 "Định cấu hình cầu nối server"
 
-#: 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 "Định cấu hình chế độ server"
 
-#: 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 "Kết nối qua 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 "Khoảng thử kết nối"
 
-#: 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 sau khi khởi tạo"
 
-#: 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 "Trì hoãn tun/tap mở và 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 "Tham số Diffie Hellman "
 
-#: 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 "Dạnh mục cho các tập tin config đối tương tùy chỉnh"
 
-#: 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 "Vô hiệu hóa 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 "Vô hiệu hóa tùy chọn kiểm tra nhất quán"
 
-#: 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 "Đừng đóng kết địa chỉ địa phương và cổng"
 
-#: 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 "Đừng thực sự thực hiện 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 "Đừng tự động thêm vào đường dẫn"
 
-#: 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 "Đừng thừa hưởng tùy chọn đẩy toàn cầu"
 
-#: 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 "Đừng 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 "Đừng đọc lại key ở chế độ khởi động "
 
-#: 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 "Đừng dùng bộ nén lzo thích ứng"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Đừng cảnh báo về sự không nhất quán của ifconfig"
 
-#: 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 "Báo tham số lên 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 "Đo 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 "Kích hoạt 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 "Kích hoạt khám phá đường dẫn MTU"
 
-#: 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 "Kích hoạt chế độ mã hóa khóa tĩnh (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 "Kích hoạt TLS và giả định vải trò của client"
 
-#: 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 "Kích hoạt TLS và giả định vải trò của server"
 
-#: 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 "Kích hoạt 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 "Kích hoạt giao diện điều hành trên <em>IP</em> <em>cổng</em>"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:85
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:104
 msgid "Enabled"
 msgstr "Kích hoạt "
 
-#: 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 ""
 
-#: 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 cho các gói"
 
-#: 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 "Thực hiện shell cmd sau khi tuyến đã thêm vào"
 
-#: 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 "Thực hiện lệnh shell trên ip thay đổi từ xa"
 
-#: 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 trên TLS khi thương lượng thất bại"
 
-#: 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 "Lấy mật mã PEM từ điều khiển tty trước khi chúng ta 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 "Sự xác thực HMAC cho gói"
 
-#: 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 "Xử lý những sai soát khi xác thực "
 
-#: 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 "Nếu hostname resolve thất bại, thử lại"
 
@@ -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 "Giữ địa chỉ IP ở chế độ khởi động"
 
-#: 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 "Giữ remote địa chỉ IP ở chế độ khởi động"
 
-#: 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 "Giữ công cụ tun/tap mở khi khởi động lại  "
 
-#: 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 "Giới hạn lập log tin nhắn"
 
-#: 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 "Chứng chỉ địa phương"
 
-#: 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 "Tên host địa phương và địa chỉ IP"
 
-#: 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 "Phím bảo mật địa phương"
 
-#: 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 "Chế độ chính"
 
-#: 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 "Số lượng tối đa của 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 "Số lượng phân bổ phát sóng 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 "Số dòng cho tập tin log history"
 
@@ -375,11 +387,11 @@ msgstr "Số dòng cho tập tin log 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 "Chỉ chấp nhận kết nối từ những tên X509 cho sẵn"
 
-#: 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 "Chỉ xử lý ping timouts nếu tuyến tồn tại"
 
@@ -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 "Tối ưu hóa 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 tới syslog và đừng daemonize"
 
@@ -404,28 +416,28 @@ msgstr "Output tới syslog và đừng 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 tập tin có chứa key"
 
-#: 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 "Bỏ qua yếu tố môi trường tới 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 "Tiếp tục tình trạng replay-protection"
 
-#: 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 mỗi n giây trên cổng TCP/UDP"
 
-#: 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 "Cổng"
 
-#: 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 "Đảy một tùy chọn ifconfig tới 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 "Đẩy lựa chọn cho đối tác"
 
-#: 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 "Tra vấn kênh điều hành cho phím bảo mật "
 
-#: 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 "Ngẫu nhiên chọn server ngoài vùng"
 
-#: 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 "Từ chối kết nối nêu không có config đối tượng tùy chỉnh"
 
-#: 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 tín hiệu SIGUSR1"
 
-#: 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 "Tên host ngoài vùng và địa chỉ IP"
 
-#: 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 "PING timeout từ xa"
 
-#: 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 "Thương lượng lại data chan. key sau 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 "Thương lượng lại data chan. key sau 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 "Thương lượng lại data chan. key sau 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 chế độ bảo vệ kích thước window trượt"
 
-#: 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 "Yêu cầu rõ ràng về giấy chứng nhận "
 
-#: 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 "Yêu cầu key dùng rõ rãng trên chứng nhận"
 
-#: 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 "Khởi động lại sau khi 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 trên kênh kiểm soát TLS"
 
-#: 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 "Thử lại trên HTTP proxy lỗi"
 
-#: 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 "Thử lại trên Socks proxy lỗi"
 
-#: 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 "Tuyến subnet tới khách hàng"
 
-#: 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 "Chạy như inetd hoặc 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 "Chạy script cmd trên đối tượng kết nối"
 
-#: 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 "Chạy script cmd trên đối tượng không kết nối"
 
-#: 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 "Chạy up/down scripts cho tất cả khởi động"
 
-#: 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 "Gửi thông báo cho bạn bè về ngắt kết nối"
 
-#: 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 "Cài đặt GID tới nhóm"
 
-#: 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 "Cài đặt 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 "Cài đặt UID tới người dùng"
 
-#: 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 "Để sang một bên một pool của 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 "Thiết lập các tùy chọn mở rộng HTTP proxy"
 
-#: 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 "Đặt 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 "Đặt dung lượng của bảng address hash thực và ảo"
 
-#: 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 "Đặt TCP/UDP nhận dung lượng buffer"
 
-#: 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 "Đặt TCP/UDP gửi dung lượng buffer"
 
-#: 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 "Đặt tun/tap độ dài queue"
 
-#: 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 "Đặt công cụ tun/tap 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 "Đặt thiết bị tun/tap 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 "Đặt upper bound trên 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 cho 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 để thực thi sau khi thiết bị tun mở"
 
-#: 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 để chạy sau khi thiết bị tun đóng"
 
-#: 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 để hợp thức hóa tên X509 "
 
-#: 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 của các cảnh báo reply"
 
-#: 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 "Dung lượng của 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 "Chỉ định một cổng mặc định cho tuyến"
 
-#: 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 "Bắt đầu OpenVPN trong một 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 "Bắt đầu"
 
-#: 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 "Tình trạng tập tin phiên bản format"
 
-#: 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 "Chuyển sang cấu hình cấp cao"
 
-#: 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 "Chuyển sang cấu hình căn bản"
 
-#: 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 "Cổng TCP/UDP # cho cả địa phương và ngoài vùng"
 
-#: 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 "Cổng TCP/UDP # cho địa phương (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 "Cổng TCP/UDP # cho ngoài vùng (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 (chỉ áp dụng cho IPv4)"
 
@@ -700,7 +722,7 @@ msgstr "TOS passthrough (chỉ áp dụng cho IPv4)"
 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 "Danh mục tạm thời cho tập tin client-connect return"
 
@@ -709,42 +731,41 @@ msgstr "Danh mục tạm thời cho tập tin client-connect return"
 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 cho trao đổi key"
 
-#: 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 "Loại công cụ sử dụng"
 
@@ -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 "Dùng LZO nén nhanh"
+
+#: 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 "Dùng 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 "Dùng chế độ công cụ tun/tap"
 
-#: 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 "Dùng tên đăng nhập như tên thông thường"
 
-#: 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 "Viết log lên tập tin"
 
-#: 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 "Viết xử lý ID lên tập tin"
 
-#: 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 "Viết tình trạng tới tập tin mỗi n giây"
 
-#: 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 "không"
 
-#: 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 "Công cụ tun/tap"
 
-#: 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 timeout không có hành động"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "Có (%i)"
diff --git a/applications/luci-app-openvpn/po/zh-cn/openvpn.po b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
index 82740110f..3736027f1 100644
--- a/applications/luci-app-openvpn/po/zh-cn/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
@@ -16,16 +16,16 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\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 "%s"
 
-#: 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”，或“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 "接受从服务器发送过来的选项"
 
@@ -33,7 +33,7 @@ msgstr "接受从服务器发送过来的选项"
 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 "建立连接后添加路由"
 
@@ -41,48 +41,48 @@ msgstr "建立连接后添加路由"
 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 "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 "允许客户端到客户端的通信"
 
-#: 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 "允许多用户共用同一证书"
 
-#: 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 "只允许一个会话"
 
-#: 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 "允许远端改变 IP 或端口"
 
-#: 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 "允许最大已连接客户端数"
 
-#: 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 "允许最大内部连接"
 
-#: 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 "允许最大新建连接数"
 
-#: 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 "添加日志至文件"
 
-#: 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 "以用户名/密码的方式进行验证"
 
-#: 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 "自动重定向至默认路由"
 
@@ -90,228 +90,240 @@ msgstr "自动重定向至默认路由"
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "以下是 OpenVPN 已配置实例及其当前状态的列表"
 
-#: 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 "TUN/TAP 关闭前的命令行及脚本"
 
-#: 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 "认证授权"
 
-#: 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 "改变进程优先级"
 
-#: 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 "初始化前改变根目录"
 
-#: 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 "验证客户端证书以确保其是否过期"
 
-#: 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 "初始化后改变根目录"
 
-#: 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 "客户端已被禁止"
 
-#: 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 "配置客户端模式"
 
-#: 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 "配置服务器桥接"
 
-#: 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 "配置服务器模式"
 
-#: 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 "通过 Sock5 代理连接"
 
-#: 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 "通过 HTTP 代理连接到远程主机"
 
-#: 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 "连接重试时间间隔"
 
-#: 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 "初始化后进入后台运行"
 
-#: 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 "延迟 tun/tap 的打开及 up 脚本的执行"
 
-#: 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/DH 密钥交换参数"
 
-#: 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 "自定义客户端配置文件的目录"
 
-#: 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 "禁止分页"
 
-#: 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 "禁止选项一致性检查"
 
-#: 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 "不绑定本地地址和端口"
 
-#: 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 "不实际执行 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 "不自动添加路由"
 
-#: 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 "不缓存 --askpass 或 --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 "不继承全局主动发送选项"
 
-#: 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 "不记录时间戳"
 
-#: 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 "服务重启时不重读密钥值"
 
-#: 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 "不用自适应 lzo 压缩"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "ifconfig 不一致时不警告"
 
-#: 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 "把参数写入日志"
 
-#: 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 "以历史值估算 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 "打开 OpenSSL 硬件加密引擎"
 
-#: 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 "启用路径 MTU 发现"
 
-#: 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 "允许静态密钥加密模式"
 
-#: 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 "允许 TLS 并伪装为客户端"
 
-#: 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 "允许 TLS 并伪装为服务器"
 
-#: 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 "允许内部数据报分片"
 
-#: 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 "在 <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 "启用"
 
-#: 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 "使用密钥加密及认证所有的控制通道数据包"
 
-#: 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 "加密数据包"
 
-#: 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 "添加路由后执行 shell 命令"
 
-#: 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 "当远程 ip 改变时执行 shell 命令"
 
-#: 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 ""
 "服务器模式下，将每个 IPv4 地址/路由或 MAC 地址添加到 OpenVPN 的内部路由表中。"
 
-#: 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 "TLS 验证失败后退出"
 
-#: 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 "后台运行前从控制的 tty 中获取 PEM 密码"
 
-#: 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 算法校验数据包"
 
-#: 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 "处理验证失败"
 
-#: 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 "在服务配置模式下简化 Helper 指令 --ping 和 --ping-restart 的表达式"
 
-#: 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 "如果主机名解析错误，重试"
 
@@ -324,53 +336,53 @@ msgstr "实例 \"%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 "服务重启时保持本地 IP 地址"
 
-#: 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 "服务重启时保持远程 IP 地址"
 
-#: 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 "服务重启时自动打开 tun/tap 设备"
 
-#: 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 "密钥传输滑动窗口"
 
-#: 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 "限制重复的日志消息"
 
-#: 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 "本地证书"
 
-#: 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 "本地主机名或 ip 地址"
 
-#: 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 "本地私钥"
 
-#: 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 "主要模式"
 
-#: 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 "TCP队列中输出包的最大数量"
 
-#: 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 "已分配的广播缓冲区数量"
 
-#: 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 "历史日志文件的行数"
 
@@ -378,11 +390,11 @@ msgstr "历史日志文件的行数"
 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 "只接收已给定的 X509 名称的连接"
 
-#: 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 "仅当路由存在时处理 ping 超时"
 
@@ -395,11 +407,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN 实例"
 
-#: 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 "优化 TUN/TAP/UDP 写入"
 
-#: 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 "输出到 syslog，不运行守护进程"
 
@@ -407,28 +419,28 @@ msgstr "输出到 syslog，不运行守护进程"
 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 文件包含的密钥"
 
-#: 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 "传递环境变量至脚本"
 
-#: 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 "保存重播保护的状态"
 
-#: 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 "持久/非持久 ifconfig 池"
 
-#: 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 "每 n 秒 ping 一次远程 TCP/UDP 端口"
 
-#: 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 ""
 
@@ -440,262 +452,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 "端口"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "协议"
 
-#: 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 "代理超时，单位秒"
 
-#: 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 "主动向远程发送 ifconfig 选项"
 
-#: 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 "主动向端点发送选项"
 
-#: 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 "为私钥查询管理通道"
 
-#: 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 "随机选择远程服务器"
 
-#: 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 "拒接没有自定义客户端配置的连接"
 
-#: 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 "重映射 SIGUSR1 信号"
 
-#: 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 "远程主机名或 ip 地址"
 
-#: 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 "远程 ping 超时"
 
-#: 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 "传输若干字节后重新验证数据通道密钥"
 
-#: 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 "传输若干数据包后重新验证数据通道密钥"
 
-#: 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 "传输若干秒后重新验证数据通道密钥"
 
-#: 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 "重播保护的滑动窗口大小"
 
-#: 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 "证书需要显式指定"
 
-#: 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 "证书需要明确的密钥"
 
-#: 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 "远程 ping 超时后重启"
 
-#: 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 "TLS 控制通道超时后重新发送"
 
-#: 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 "无限重试直至代理正确"
 
-#: 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 "无限重试直至 Socks 代理正确"
 
-#: 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 "路由子网至客户端"
 
-#: 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 "以 inetd 或 xinetd 服务器的方式运行"
 
-#: 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 "当客户端连接时在命令行下允许脚本"
 
-#: 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 "当客户端断开时在命令行下允许脚本"
 
-#: 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 "每次重启都执行启动/关闭脚本"
 
-#: 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 "断开连接时向客户端发送通知"
 
-#: 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 "为群组设置 GID 值"
 
-#: 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 "设置 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 "为用户设置 UID 值"
 
-#: 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 "设置子网池"
 
-#: 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 "设置 HTTP 扩展代理选项"
 
-#: 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 "设置输出冗余级别"
 
-#: 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 "设置实际和虚拟地址的哈希表大小"
 
-#: 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 "设置 TCP/UDP 接收缓冲区大小"
 
-#: 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 "设置 TCP/UDP 发送缓冲区大小"
 
-#: 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 "设置 tun/tap 发送队列长度"
 
-#: 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 "设置 tun/tap 适配器参数"
 
-#: 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 "设置 tun/tap 设备的 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 "设置 tun/tap 设备的开销"
 
-#: 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 "设置 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 "改变结点带宽"
 
-#: 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 "tun 设备打开后运行的 shell 命令"
 
-#: 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 "tun 设备关闭后运行的 shell 命令"
 
-#: 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 命令以验证 X509 名称"
 
-#: 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 "以静音的方式发出重播警告"
 
-#: 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 "密钥大小"
 
-#: 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 "指定路由默认网关"
 
-#: 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 "以休眠的状态打开 OpenVPN"
 
-#: 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 "已运行的"
 
-#: 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 "显式文件格式版本的状态"
 
-#: 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 "高级配置"
 
-#: 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 "基本配置"
 
-#: 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 端口 # 同时针对本地和远程"
 
-#: 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 端口 # 本地（默认 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 端口 # 远程（默认 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 加密"
 
-#: 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 穿透（仅限 IPv4）"
 
@@ -703,7 +725,7 @@ msgstr "TOS 穿透（仅限 IPv4）"
 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 "客户端连接返回文件的临时目录"
 
@@ -712,42 +734,41 @@ msgstr "客户端连接返回文件的临时目录"
 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 "最高支持的 TLS 版本"
 
-#: 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 "“tls-auth”和“secret”选项的密钥类型"
 
-#: 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 "最低支持的 TLS 版本"
 
-#: 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 "密钥交换时间表"
 
-#: 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 "使用设备类型"
 
@@ -759,45 +780,50 @@ 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 "使用快速 LZO 压缩"
+
+#: 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 "采用协议"
 
-#: 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 "使用 tun/tap 设备节点"
 
-#: 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 "把用户名作为通用名称"
 
-#: 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 "保存日志至文件"
 
-#: 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 "记录进程 ID 至文件"
 
-#: 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 "每 n 秒后写入状态至文件"
 
-#: 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 "否"
 
-#: 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 设备"
 
-#: 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 休眠超时"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "是（%i）"
 
diff --git a/applications/luci-app-openvpn/po/zh-tw/openvpn.po b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
index 4f3247594..e1768ef88 100644
--- a/applications/luci-app-openvpn/po/zh-tw/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
@@ -16,16 +16,16 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\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 "%s"
 
-#: 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”，或“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 "接受從伺服器傳送過來的選項"
 
@@ -33,7 +33,7 @@ msgstr "接受從伺服器傳送過來的選項"
 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 "建立連線後新增路由"
 
@@ -41,48 +41,48 @@ msgstr "建立連線後新增路由"
 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 "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 "允許客戶端到客戶端的通訊"
 
-#: 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 "允許多使用者共用同一證書"
 
-#: 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 "只允許一個會話"
 
-#: 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 "允許遠端改變 IP 或埠"
 
-#: 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 "允許最大已連線客戶端數"
 
-#: 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 "允許最大內部連線"
 
-#: 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 "允許最大新建連線數"
 
-#: 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 "新增日誌至檔案"
 
-#: 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 "以使用者名稱/密碼的方式進行驗證"
 
-#: 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 "自動重定向至預設路由"
 
@@ -90,228 +90,240 @@ msgstr "自動重定向至預設路由"
 msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "以下是 OpenVPN 已配置例項及其當前狀態的列表"
 
-#: 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 "TUN/TAP 關閉前的指令列及指令碼"
 
-#: 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 "認證授權"
 
-#: 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 "改變程序優先順序"
 
-#: 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 "初始化前改變根目錄"
 
-#: 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 "驗證客戶端證書以確保其是否過期"
 
-#: 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 "初始化後改變根目錄"
 
-#: 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 "客戶端已被禁止"
 
-#: 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 "配置客戶端模式"
 
-#: 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 "配置伺服器橋接"
 
-#: 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 "配置伺服器模式"
 
-#: 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 "通過 Sock5 代理連線"
 
-#: 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 "通過 HTTP 代理連線到遠端主機"
 
-#: 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 "連線重試時間間隔"
 
-#: 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 "初始化後進入後臺執行"
 
-#: 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 "延遲 tun/tap 的開啟及 up 指令碼的執行"
 
-#: 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/DH 金鑰交換引數"
 
-#: 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 "自訂客戶端配置檔案的目錄"
 
-#: 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 "禁止分頁"
 
-#: 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 "禁止選項一致性檢查"
 
-#: 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 "不繫結本地位址和埠"
 
-#: 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 "不實際執行 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 "不自動新增路由"
 
-#: 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 "不快取 --askpass 或 --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 "不繼承全域性主動傳送選項"
 
-#: 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 "不記錄時間戳"
 
-#: 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 "服務重啟時不重讀金鑰值"
 
-#: 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 "不用自適應 lzo 壓縮"
+
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:220
 msgid "Don't warn on ifconfig inconsistencies"
 msgstr "ifconfig 不一致時不警告"
 
-#: 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 "把引數寫入日誌"
 
-#: 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 "以歷史值估算 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 "開啟 OpenSSL 硬體加密引擎"
 
-#: 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 "啟用路徑 MTU 發現"
 
-#: 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 "允許靜態金鑰加密模式"
 
-#: 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 "允許 TLS 並偽裝為客戶端"
 
-#: 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 "允許 TLS 並偽裝為伺服器"
 
-#: 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 "允許內部資料報分片"
 
-#: 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 "在 <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 "啟用"
 
-#: 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 "使用金鑰加密及認證所有的控制通道資料包"
 
-#: 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 "加密資料包"
 
-#: 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 "新增路由後執行 shell 指令"
 
-#: 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 "當遠端 ip 改變時執行 shell 指令"
 
-#: 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 ""
 "伺服器模式下，將每個 IPv4 位址/路由或 MAC 位址新增到 OpenVPN 的內部路由表中。"
 
-#: 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 "TLS 驗證失敗後退出"
 
-#: 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 "後臺執行前從控制的 tty 中獲取 PEM 密碼"
 
-#: 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 演算法校驗資料包"
 
-#: 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 "處理驗證失敗"
 
-#: 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 "在服務配置模式下簡化 Helper 指令 --ping 和 --ping-restart 的表示式"
 
-#: 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 "如果主機名解析錯誤，重試"
 
@@ -324,53 +336,53 @@ msgstr "例項 \"%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 "服務重啟時保持本地 IP 位址"
 
-#: 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 "服務重啟時保持遠端 IP 位址"
 
-#: 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 "服務重啟時自動開啟 tun/tap 裝置"
 
-#: 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 "金鑰傳輸滑動視窗"
 
-#: 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 "限制重複的日誌訊息"
 
-#: 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 "本地證書"
 
-#: 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 "本地主機名或 ip 位址"
 
-#: 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 "本地私鑰"
 
-#: 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 "主要模式"
 
-#: 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 "TCP佇列中輸出包的最大數量"
 
-#: 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 "已分配的廣播緩衝區數量"
 
-#: 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 "歷史日誌檔案的行數"
 
@@ -378,11 +390,11 @@ msgstr "歷史日誌檔案的行數"
 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 "只接收已給定的 X509 名稱的連線"
 
-#: 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 "僅當路由存在時處理 ping 超時"
 
@@ -395,11 +407,11 @@ msgstr "OpenVPN"
 msgid "OpenVPN instances"
 msgstr "OpenVPN 例項"
 
-#: 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 "優化 TUN/TAP/UDP 寫入"
 
-#: 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 "輸出到 syslog，不執行守護程序"
 
@@ -407,28 +419,28 @@ msgstr "輸出到 syslog，不執行守護程序"
 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 檔案包含的金鑰"
 
-#: 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 "傳遞環境變數至指令碼"
 
-#: 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 "儲存重播保護的狀態"
 
-#: 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 "持久/非持久 ifconfig 池"
 
-#: 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 "每 n 秒 ping 一次遠端 TCP/UDP 埠"
 
-#: 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 ""
 
@@ -440,262 +452,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 "埠"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:128
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:156
 msgid "Protocol"
 msgstr "協議"
 
-#: 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 "代理超時，單位秒"
 
-#: 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 "主動向遠端傳送 ifconfig 選項"
 
-#: 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 "主動向端點發送選項"
 
-#: 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 "為私鑰查詢管理通道"
 
-#: 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 "隨機選擇遠端伺服器"
 
-#: 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 "拒接沒有自訂客戶端配置的連線"
 
-#: 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 "重對映 SIGUSR1 訊號"
 
-#: 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 "遠端主機名或 ip 位址"
 
-#: 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 "遠端 ping 超時"
 
-#: 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 "傳輸若干位元組後重新驗證資料通道金鑰"
 
-#: 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 "傳輸若干資料包後重新驗證資料通道金鑰"
 
-#: 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 "傳輸若干秒後重新驗證資料通道金鑰"
 
-#: 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 "重播保護的滑動視窗大小"
 
-#: 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 "證書需要顯式指定"
 
-#: 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 "證書需要明確的金鑰"
 
-#: 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 "遠端 ping 超時後重啟"
 
-#: 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 "TLS 控制通道超時後重新發送"
 
-#: 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 "無限重試直至代理正確"
 
-#: 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 "無限重試直至 Socks 代理正確"
 
-#: 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 "路由子網至客戶端"
 
-#: 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 "以 inetd 或 xinetd 伺服器的方式執行"
 
-#: 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 "當客戶端連線時在指令列下允許指令碼"
 
-#: 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 "當客戶端斷開時在指令列下允許指令碼"
 
-#: 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 "每次重啟都執行啟動/關閉指令碼"
 
-#: 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 "斷開連線時向客戶端傳送通知"
 
-#: 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 "為群組設定 GID 值"
 
-#: 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 "設定 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 "為使用者設定 UID 值"
 
-#: 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 "設定子網池"
 
-#: 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 "設定 HTTP 擴充套件代理選項"
 
-#: 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 "設定輸出冗餘級別"
 
-#: 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 "設定實際和虛擬位址的雜湊表大小"
 
-#: 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 "設定 TCP/UDP 接收緩衝區大小"
 
-#: 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 "設定 TCP/UDP 傳送緩衝區大小"
 
-#: 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 "設定 tun/tap 傳送佇列長度"
 
-#: 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 "設定 tun/tap 介面卡引數"
 
-#: 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 "設定 tun/tap 裝置的 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 "設定 tun/tap 裝置的開銷"
 
-#: 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 "設定 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 "改變結點頻寬"
 
-#: 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 "tun 裝置開啟後執行的 shell 指令"
 
-#: 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 "tun 裝置關閉後執行的 shell 指令"
 
-#: 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 指令以驗證 X509 名稱"
 
-#: 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 "以靜音的方式發出重播警告"
 
-#: 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 "金鑰大小"
 
-#: 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 "指定路由預設閘道器"
 
-#: 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 "以休眠的狀態開啟 OpenVPN"
 
-#: 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 "已執行的"
 
-#: 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 "顯式檔案格式版本的狀態"
 
-#: 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 "高階配置"
 
-#: 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 "基本配置"
 
-#: 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 埠 # 同時針對本地和遠端"
 
-#: 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 埠 # 本地（預設 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 埠 # 遠端（預設 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 加密"
 
-#: 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 穿透（僅限 IPv4）"
 
@@ -703,7 +725,7 @@ msgstr "TOS 穿透（僅限 IPv4）"
 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 "客戶端連線返回檔案的臨時目錄"
 
@@ -712,42 +734,41 @@ msgstr "客戶端連線返回檔案的臨時目錄"
 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 "最高支援的 TLS 版本"
 
-#: 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 "“tls-auth”和“secret”選項的金鑰型別"
 
-#: 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 "最低支援的 TLS 版本"
 
-#: 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 "金鑰交換時間表"
 
-#: 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 "使用裝置型別"
 
@@ -759,45 +780,50 @@ 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 "使用快速 LZO 壓縮"
+
+#: 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 "採用協議"
 
-#: 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 "使用 tun/tap 裝置節點"
 
-#: 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 "把使用者名稱作為通用名稱"
 
-#: 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 "儲存日誌至檔案"
 
-#: 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 "記錄程序 ID 至檔案"
 
-#: 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 "每 n 秒後寫入狀態至檔案"
 
-#: 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 "否"
 
-#: 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 裝置"
 
-#: 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 休眠超時"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:92
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua:111
 msgid "yes (%i)"
 msgstr "是（%i）"
 
diff --git a/applications/luci-app-openvpn/root/etc/config/openvpn_recipes b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
index 69270e48e..12a49eef0 100644
--- a/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
+++ b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
@@ -8,6 +8,7 @@ config openvpn_recipe server_tun_ptp
 	option ifconfig		'10.0.0.1 10.0.0.2'
 	option secret		'shared-secret.key'
 	option keepalive	'10 60'
+	option comp_lzo		'yes'
 	option verb		'3'
 	option mssfix		'1420'
 
@@ -22,6 +23,7 @@ config openvpn_recipe client_tun_ptp
 	option ifconfig		'10.0.0.2 10.0.0.1'
 	option secret		'shared-secret.key'
 	option nobind		'1'
+	option comp_lzo		'yes'
 	option verb		'3'
 
 #
@@ -37,6 +39,7 @@ config openvpn_recipe server_tun
 	option key 		'server.key'
 	option dh 		'dh1024.pem'
 	option keepalive	'10 60'
+	option comp_lzo		'yes'
 	option verb		'3'
 	option mssfix		'1420'
 
@@ -51,6 +54,7 @@ config openvpn_recipe client_tun
 	list remote		'vpnserver.example.org'
 	option pkcs12		'my_client.p12'
 	option remote_cert_tls	'server'
+	option comp_lzo		'yes'
 	option nobind		'1'
 	option persist_key	'1'
 	option persist_tun	'1'
@@ -71,6 +75,7 @@ config openvpn_recipe server_tap_bridge
 	option key 		'server.key'
 	option dh 		'dh1024.pem'
 	option keepalive	'10 60'
+	option comp_lzo		'yes'
 	option verb		'3'
 	option mssfix		'1420'
 
@@ -88,6 +93,7 @@ config openvpn_recipe client_tap_bridge
 	option key 		'my_client.key'
 	option dh 		'dh1024.pem'
 	option remote_cert_tls	'server'
+	option comp_lzo		'yes'
 	option nobind		'1'
 	option persist_key	'1'
 	option verb		'3'