summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-ocserv
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-ocserv')
-rw-r--r--applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua31
-rw-r--r--applications/luci-app-ocserv/po/bg/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/ca/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/cs/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/de/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/el/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/en/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/es/ocserv.po111
-rw-r--r--applications/luci-app-ocserv/po/fr/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/he/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/hi/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/hu/ocserv.po96
-rw-r--r--applications/luci-app-ocserv/po/it/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/ja/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/ko/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/mr/ocserv.po324
-rw-r--r--applications/luci-app-ocserv/po/ms/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/nb_NO/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/pl/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/pt/ocserv.po123
-rw-r--r--applications/luci-app-ocserv/po/pt_BR/ocserv.po115
-rw-r--r--applications/luci-app-ocserv/po/ro/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/ru/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/sk/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/sv/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/templates/ocserv.pot90
-rw-r--r--applications/luci-app-ocserv/po/tr/ocserv.po96
-rw-r--r--applications/luci-app-ocserv/po/uk/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/vi/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/zh-cn/ocserv.po90
-rw-r--r--applications/luci-app-ocserv/po/zh-tw/ocserv.po90
31 files changed, 1554 insertions, 1502 deletions
diff --git a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
index 396dedd4a3..6194a18dca 100644
--- a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
@@ -17,35 +17,14 @@ local e = s:taboption("general", Flag, "enable", translate("Enable server"))
e.rmempty = false
e.default = "1"
-local o_sha = s:taboption("general", DummyValue, "sha_hash", translate("Server's certificate SHA1 hash"),
- translate("That value should be communicated to the client to verify the server's certificate"))
local o_pki = s:taboption("general", DummyValue, "pkid", translate("Server's Public Key ID"),
- translate("An alternative value to be communicated to the client to verify the server's certificate; this value only depends on the public key"))
+ translate("The value to be communicated to the client to verify the server's certificate; this value only depends on the public key"))
-local fd = io.popen("/usr/bin/certtool -i --infile /etc/ocserv/server-cert.pem", "r")
+local fd = io.popen("/usr/bin/certtool --hash sha256 --key-id --infile /etc/ocserv/server-cert.pem", "r")
if fd then local ln
- local found_sha = false
- local found_pki = false
- local complete = 0
- while complete < 2 do
- local ln = fd:read("*l")
- if not ln then
- break
- elseif ln:match("SHA%-?1 fingerprint:") then
- found_sha = true
- elseif found_sha then
- local hash = ln:match("([a-f0-9]+)")
- o_sha.default = hash and hash:upper()
- complete = complete + 1
- found_sha = false
- elseif ln:match("Public Key I[Dd]:") then
- found_pki = true
- elseif found_pki then
- local hash = ln:match("([a-f0-9]+)")
- o_pki.default = hash and "sha1:" .. hash:upper()
- complete = complete + 1
- found_pki = false
- end
+ local ln = fd:read("*l")
+ if ln then
+ o_pki.default = "sha256:" .. ln
end
fd:close()
end
diff --git a/applications/luci-app-ocserv/po/bg/ocserv.po b/applications/luci-app-ocserv/po/bg/ocserv.po
index f38d412851..362fabd6ab 100644
--- a/applications/luci-app-ocserv/po/bg/ocserv.po
+++ b/applications/luci-app-ocserv/po/bg/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ca/ocserv.po b/applications/luci-app-ocserv/po/ca/ocserv.po
index da00b7c34f..d861657f12 100644
--- a/applications/luci-app-ocserv/po/ca/ocserv.po
+++ b/applications/luci-app-ocserv/po/ca/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.9.1-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
msgid "Collecting data..."
msgstr "S’estan recollint dades…"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr "Dispositiu"
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "Nom"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr "Contrasenya"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Estat"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/cs/ocserv.po b/applications/luci-app-ocserv/po/cs/ocserv.po
index f66edcac39..bc53d2d710 100644
--- a/applications/luci-app-ocserv/po/cs/ocserv.po
+++ b/applications/luci-app-ocserv/po/cs/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr "Šifra"
msgid "Collecting data..."
msgstr "Probíhá sběr dat..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr "Zařízení"
msgid "Edit Template"
msgstr "Editovat šablonu"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr "IP adresa"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "Název"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr "Heslo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Port"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr "Nastavení serveru"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Stav"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr "Čas"
msgid "User"
msgstr "Uživatel"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr "Uživatelské jméno"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/de/ocserv.po b/applications/luci-app-ocserv/po/de/ocserv.po
index 9a151e96d1..ed54302f8d 100644
--- a/applications/luci-app-ocserv/po/de/ocserv.po
+++ b/applications/luci-app-ocserv/po/de/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr "Verschlüsselungsalgorithmus"
msgid "Collecting data..."
msgstr "Sammle Daten..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr "Gerät"
msgid "Edit Template"
msgstr "Template bearbeiten"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr "IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr "IP-Adresse"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "Name"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr "Passwort"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Port"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr "Servereinstellungen"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Status"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr "Zeit"
msgid "User"
msgstr "Nutzer"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr "Benutzername"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/el/ocserv.po b/applications/luci-app-ocserv/po/el/ocserv.po
index 257b766d42..a409378698 100644
--- a/applications/luci-app-ocserv/po/el/ocserv.po
+++ b/applications/luci-app-ocserv/po/el/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
msgid "Collecting data..."
msgstr "Συλλογή δεδομένων..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Κατάσταση"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/en/ocserv.po b/applications/luci-app-ocserv/po/en/ocserv.po
index dfad1d98e8..e2089fec80 100644
--- a/applications/luci-app-ocserv/po/en/ocserv.po
+++ b/applications/luci-app-ocserv/po/en/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/es/ocserv.po b/applications/luci-app-ocserv/po/es/ocserv.po
index eeebaae9fb..14855db690 100644
--- a/applications/luci-app-ocserv/po/es/ocserv.po
+++ b/applications/luci-app-ocserv/po/es/ocserv.po
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -30,15 +30,7 @@ msgstr "Usuarios activos de OpenConnect"
msgid "Active users"
msgstr "Usuarios activos"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-"Un valor alternativo que se comunicará al cliente para verificar el "
-"certificado del servidor; este valor solo depende de la clave pública"
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr "Compatibilidad con el cliente AnyConnect"
@@ -61,12 +53,12 @@ msgstr "Cifrado"
msgid "Collecting data..."
msgstr "Recolectando datos…"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr "Servidores DNS"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr "Tiempo muerto de detección de pares (segundos)"
@@ -81,18 +73,18 @@ msgstr "Dispositivo"
msgid "Edit Template"
msgstr "Editar plantilla"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
"Edite la plantilla que se utiliza para generar la configuración de ocserv."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr "Activar UDP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
@@ -101,12 +93,12 @@ msgstr ""
"Activar el soporte del canal UDP; esto debe estar activado a menos que sepa "
"lo que está haciendo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr "Activar compresión"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr "Activar proxy arp"
@@ -115,7 +107,7 @@ msgstr "Activar proxy arp"
msgid "Enable server"
msgstr "Activar servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr "Active el soporte para clientes CISCO AnyConnect"
@@ -143,20 +135,20 @@ msgstr "ID"
msgid "IP"
msgstr "IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr "Dirección IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr "Máx. clientes"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr "Max. mismos clientes"
@@ -165,7 +157,7 @@ msgstr "Max. mismos clientes"
msgid "Name"
msgstr "Nombre"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr "Máscara de red (o prefijo IPv6)"
@@ -181,17 +173,17 @@ msgstr "OpenConnect VPN"
msgid "Password"
msgstr "Contraseña"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Puerto"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr "IP predecibles"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -205,7 +197,7 @@ msgstr ""
"que no debe estar en uso. Si tiene una red en LAN que cubre 192.168.1.0/24, "
"use 192.168.1.192/26 para reservar las 62 direcciones superiores."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr "Tabla de ruteo"
@@ -214,34 +206,22 @@ msgstr "Tabla de ruteo"
msgid "Server Settings"
msgstr "Configuración del servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
msgid "Server's Public Key ID"
msgstr "ID de clave pública del servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
-msgstr "Certificado de servidor SHA1 hash"
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
msgid "Status"
msgstr "Estado"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-"Ese valor debe comunicarse al cliente para verificar el certificado del "
-"servidor"
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
"Los servidores DNS que se proporcionarán a los clientes; puede ser IPv6 o "
"IPv4"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
@@ -249,7 +229,7 @@ msgstr ""
"Los servidores DNS que se proporcionarán a los clientes; puede ser IPv6 o "
"IPv4. Por lo general, debe incluir la dirección de este dispositivo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
@@ -259,7 +239,7 @@ msgstr ""
"ser una red privada diferente de las direcciones LAN a menos que el proxy "
"ARP esté activado. Deje en blanco para intentar la configuración automática."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
@@ -267,12 +247,12 @@ msgstr ""
"La dirección de subred IPv6 para proporcionar a los clientes; déjelo en "
"blanco para intentar la configuración automática."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr "Las IP asignadas se seleccionarán de manera determinista"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -287,11 +267,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr "La zona de firewall en la que se establecerán los clientes VPN"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr "La máscara de la subred de antes."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -302,11 +282,17 @@ msgstr ""
"rutas IPv4 e IPv6, el servidor enviará solo lo apropiado. Deje en blanco "
"para establecer una ruta predeterminada"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr "Se usarán los mismos puertos UDP y TCP"
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr "No hay usuarios activos."
@@ -320,7 +306,7 @@ msgstr "Hora"
msgid "User"
msgstr "Usuario"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr "Autenticacion de usuario"
@@ -333,20 +319,20 @@ msgstr "Configuración de usuario"
msgid "Username"
msgstr "Nombre de usuario"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
"Máscara de red VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
"Dirección de red VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -361,7 +347,7 @@ msgstr "IP VPN"
msgid "VPN IP Address"
msgstr "Dirección IP VPN"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
@@ -369,3 +355,20 @@ msgid ""
msgstr ""
"Ver el certificado de CA utilizado por este servidor. Deberá guardarlo como "
"'ca.pem' e importarlo a los clientes."
+
+#~ msgid ""
+#~ "An alternative value to be communicated to the client to verify the "
+#~ "server's certificate; this value only depends on the public key"
+#~ msgstr ""
+#~ "Un valor alternativo que se comunicará al cliente para verificar el "
+#~ "certificado del servidor; este valor solo depende de la clave pública"
+
+#~ msgid "Server's certificate SHA1 hash"
+#~ msgstr "Certificado de servidor SHA1 hash"
+
+#~ msgid ""
+#~ "That value should be communicated to the client to verify the server's "
+#~ "certificate"
+#~ msgstr ""
+#~ "Ese valor debe comunicarse al cliente para verificar el certificado del "
+#~ "servidor"
diff --git a/applications/luci-app-ocserv/po/fr/ocserv.po b/applications/luci-app-ocserv/po/fr/ocserv.po
index 20e90f902c..82b52006ed 100644
--- a/applications/luci-app-ocserv/po/fr/ocserv.po
+++ b/applications/luci-app-ocserv/po/fr/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr "Code de chiffrement"
msgid "Collecting data..."
msgstr "Récupération des données…"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr "Appareil"
msgid "Edit Template"
msgstr "Modifier le modèle"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "Nom"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr "Mot de passe"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "État"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr "Heure"
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/he/ocserv.po b/applications/luci-app-ocserv/po/he/ocserv.po
index 8bdd803c4f..63c014b986 100644
--- a/applications/luci-app-ocserv/po/he/ocserv.po
+++ b/applications/luci-app-ocserv/po/he/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/hi/ocserv.po b/applications/luci-app-ocserv/po/hi/ocserv.po
index e0f3b71801..d4499a41f5 100644
--- a/applications/luci-app-ocserv/po/hi/ocserv.po
+++ b/applications/luci-app-ocserv/po/hi/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/hu/ocserv.po b/applications/luci-app-ocserv/po/hu/ocserv.po
index 0c2fea5485..4c0249d804 100644
--- a/applications/luci-app-ocserv/po/hu/ocserv.po
+++ b/applications/luci-app-ocserv/po/hu/ocserv.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"PO-Revision-Date: 2019-11-29 19:45+0000\n"
+"PO-Revision-Date: 2019-12-10 23:14+0000\n"
"Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsocserv/hu/>\n"
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
msgid "Collecting data..."
msgstr "Adatok összegyűjtése…"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -67,36 +61,36 @@ msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:70
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:55
msgid "Device"
-msgstr ""
+msgstr "Eszköz"
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:14
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:14
msgid "Edit Template"
msgstr "Sablon szerkesztése"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "Név"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr "Jelszó"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Port"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,21 +184,17 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
#: applications/luci-app-ocserv/luasrc/controller/ocserv.lua:19
msgid "Server Settings"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
+msgstr "Kiszolgáló beállításai"
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Állapot"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr "Idő"
msgid "User"
msgstr "Felhasználó"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr "Felhasználónév"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/it/ocserv.po b/applications/luci-app-ocserv/po/it/ocserv.po
index 136765c188..c1d696435f 100644
--- a/applications/luci-app-ocserv/po/it/ocserv.po
+++ b/applications/luci-app-ocserv/po/it/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "Nome"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Stato"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ja/ocserv.po b/applications/luci-app-ocserv/po/ja/ocserv.po
index 91a78127b5..09348c1c62 100644
--- a/applications/luci-app-ocserv/po/ja/ocserv.po
+++ b/applications/luci-app-ocserv/po/ja/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ko/ocserv.po b/applications/luci-app-ocserv/po/ko/ocserv.po
index 2f24691b12..26f1c9a418 100644
--- a/applications/luci-app-ocserv/po/ko/ocserv.po
+++ b/applications/luci-app-ocserv/po/ko/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/mr/ocserv.po b/applications/luci-app-ocserv/po/mr/ocserv.po
new file mode 100644
index 0000000000..9a12906a97
--- /dev/null
+++ b/applications/luci-app-ocserv/po/mr/ocserv.po
@@ -0,0 +1,324 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-15 21:22+0000\n"
+"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
+"Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsocserv/mr/>\n"
+"Language: mr\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
+msgid ""
+"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
+"prefix"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:48
+msgid "Active OpenConnect Users"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:61
+msgid "Active users"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
+msgid "AnyConnect client compatibility"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:17
+msgid "Available users"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:13
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:13
+msgid "CA certificate"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:72
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:57
+msgid "Cipher"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:62
+msgid "Collecting data..."
+msgstr "डेटा संकलित करीत आहे ..."
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
+msgid "DNS servers"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
+msgid "Dead peer detection time (secs)"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:70
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:55
+msgid "Device"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:14
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:14
+msgid "Edit Template"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
+msgid "Edit the template that is used for generating the ocserv configuration."
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
+msgid "Enable UDP"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
+msgid ""
+"Enable UDP channel support; this must be enabled unless you know what you "
+"are doing"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
+msgid "Enable compression"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
+msgid "Enable proxy arp"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:16
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:16
+msgid "Enable server"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
+msgid "Enable support for CISCO AnyConnect clients"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:44
+msgid "Firewall Zone"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:12
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:12
+msgid "General Settings"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:23
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:67
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:52
+msgid "Group"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:65
+msgid "ID"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:68
+msgid "IP"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
+msgid "IP Address"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
+msgid "Max clients"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
+msgid "Max same clients"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:22
+msgid "Name"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
+msgid "Netmask (or IPv6-prefix)"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/controller/ocserv.lua:14
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:7
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:7
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:7
+msgid "OpenConnect VPN"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:24
+msgid "Password"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
+msgid "Port"
+msgstr "पोर्ट"
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
+msgid "Predictable IPs"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
+msgid ""
+"Provide addresses to clients from a subnet of LAN; if enabled the network "
+"below must be a subnet of LAN. Note that the first address of the specified "
+"subnet will be reserved by ocserv, so it should not be in use. If you have a "
+"network in LAN covering 192.168.1.0/24 use 192.168.1.192/26 to reserve the "
+"upper 62 addresses."
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
+msgid "Routing table"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/controller/ocserv.lua:19
+msgid "Server Settings"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
+msgid "Server's Public Key ID"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
+msgid "Status"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
+msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
+msgid ""
+"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
+"Typically you should include the address of this device"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
+msgid ""
+"The IPv4 subnet address to provide to clients; this should be some private "
+"network different than the LAN addresses unless proxy ARP is enabled. Leave "
+"empty to attempt auto-configuration."
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
+msgid ""
+"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
+"configuration."
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
+msgid "The assigned IPs will be selected deterministically"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
+msgid ""
+"The authentication method for the users. The simplest is plain with a single "
+"username-password pair. Use PAM modules to authenticate using another server "
+"(e.g., LDAP, Radius)."
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:45
+msgid "The firewall zone that the VPN clients will be set to"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+msgid "The mask of the subnet above."
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
+msgid ""
+"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
+"routes, the server will send only the appropriate. Leave empty to set a "
+"default route"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
+msgid "The same UDP and TCP ports will be used"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
+msgid "There are no active users."
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:71
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:56
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:51
+msgid "User"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
+msgid "User Authentication"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/controller/ocserv.lua:24
+msgid "User Settings"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:66
+msgid "Username"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
+msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
+msgid ""
+"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
+msgid ""
+"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:69
+msgid "VPN IP"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:54
+msgid "VPN IP Address"
+msgstr ""
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
+msgid ""
+"View the CA certificate used by this server. You will need to save it as 'ca."
+"pem' and import it into the clients."
+msgstr ""
diff --git a/applications/luci-app-ocserv/po/ms/ocserv.po b/applications/luci-app-ocserv/po/ms/ocserv.po
index 81591388d4..4fa9e6f73d 100644
--- a/applications/luci-app-ocserv/po/ms/ocserv.po
+++ b/applications/luci-app-ocserv/po/ms/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/nb_NO/ocserv.po b/applications/luci-app-ocserv/po/nb_NO/ocserv.po
index 07276f38c7..ad3cbb39af 100644
--- a/applications/luci-app-ocserv/po/nb_NO/ocserv.po
+++ b/applications/luci-app-ocserv/po/nb_NO/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.9.1\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
msgid "Collecting data..."
msgstr "Samler inn data…"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/pl/ocserv.po b/applications/luci-app-ocserv/po/pl/ocserv.po
index fb1b8e0059..3c1f777770 100644
--- a/applications/luci-app-ocserv/po/pl/ocserv.po
+++ b/applications/luci-app-ocserv/po/pl/ocserv.po
@@ -11,7 +11,7 @@ msgstr ""
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -26,13 +26,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -55,12 +49,12 @@ msgstr "Szyfr"
msgid "Collecting data..."
msgstr "Trwa zbieranie danych..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -75,29 +69,29 @@ msgstr "Urządzenie"
msgid "Edit Template"
msgstr "Edytuj szablon"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -106,7 +100,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -134,20 +128,20 @@ msgstr ""
msgid "IP"
msgstr "IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr "Adres IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr "Maks. klientów"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -156,7 +150,7 @@ msgstr ""
msgid "Name"
msgstr "Nazwa"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -172,17 +166,17 @@ msgstr ""
msgid "Password"
msgstr "Hasło"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Port"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -191,7 +185,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -200,12 +194,8 @@ msgstr ""
msgid "Server Settings"
msgstr "Ustawienia serwera"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -213,41 +203,35 @@ msgstr ""
msgid "Status"
msgstr "Status"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -259,11 +243,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -271,11 +255,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -289,7 +279,7 @@ msgstr "Czas"
msgid "User"
msgstr "Użytkownik"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -302,18 +292,18 @@ msgstr ""
msgid "Username"
msgstr "Nazwa użytkownika"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -327,7 +317,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/pt/ocserv.po b/applications/luci-app-ocserv/po/pt/ocserv.po
index 153ecbf46f..0721b3d4a1 100644
--- a/applications/luci-app-ocserv/po/pt/ocserv.po
+++ b/applications/luci-app-ocserv/po/pt/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -27,15 +27,7 @@ msgstr "Utilizadores de Active OpenConnect"
msgid "Active users"
msgstr "Utilizadores ativos"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-"Um valor alternativo a ser comunicado ao cliente para verificar o "
-"certificado do servidor; este valor depende apenas da chave pública"
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr "Compatibilidade do cliente AnyConnect"
@@ -58,12 +50,12 @@ msgstr "Cifra"
msgid "Collecting data..."
msgstr "A recolher dados..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr "Servidores DNS"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr "Tempo de deteção de pares mortos (segundos)"
@@ -78,17 +70,17 @@ msgstr "Aparelho"
msgid "Edit Template"
msgstr "Editar Modelo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr "Editar o modelo que é usado para gerar a configuração cifsd."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr "Ativar UDP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
@@ -97,12 +89,12 @@ msgstr ""
"Ativar o suporte de canais UDP; isso deve ser ativado a menos que saiba o "
"que está fazendo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr "Ativar compressão"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr "Ativar proxy de arp"
@@ -111,7 +103,7 @@ msgstr "Ativar proxy de arp"
msgid "Enable server"
msgstr "Ativar servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr "Ativar o suporte para clientes de CISCO AnyConnect"
@@ -139,20 +131,20 @@ msgstr "ID"
msgid "IP"
msgstr "IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr "Endereço IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr "Máximo de clientes"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr "Máximo de mesmos clientes"
@@ -161,7 +153,7 @@ msgstr "Máximo de mesmos clientes"
msgid "Name"
msgstr "Nome"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr "Máscara de rede (ou prefixo de IPv6)"
@@ -177,17 +169,17 @@ msgstr "VPN OpenConnect"
msgid "Password"
msgstr "Palavra-passe"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Porta"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr "IPs Previsíveis"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -201,7 +193,7 @@ msgstr ""
"tiver uma rede na LAN que cubra 192.168.1.0/24 utilize 192.168.1.192/26 para "
"reservar os 62 endereços superiores."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr "Tabela de roteamento"
@@ -210,33 +202,21 @@ msgstr "Tabela de roteamento"
msgid "Server Settings"
msgstr "Configurações do Servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
msgid "Server's Public Key ID"
msgstr "ID da Chave Pública do Servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
-msgstr "Hash SHA1 do certificado do servidor"
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
msgid "Status"
msgstr "Estado"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-"Esse valor deve ser comunicado ao cliente para verificar o certificado do "
-"servidor"
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
"Os servidores DNS a serem fornecidos aos clientes; podem ser IPv6 ou IPv4"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
@@ -244,7 +224,7 @@ msgstr ""
"Os servidores DNS a serem fornecidos aos clientes; podem ser IPv6 ou IPv4. "
"Normalmente deve incluir o endereço deste aparelho"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
@@ -254,7 +234,7 @@ msgstr ""
"alguma rede privada diferente dos endereços LAN, a menos que o proxy ARP "
"esteja ativado. Deixe vazio para tentar a autoconfiguração."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
@@ -262,12 +242,12 @@ msgstr ""
"O endereço de sub-rede IPv6 a fornecer aos clientes; deixe vazio para tentar "
"a autoconfiguração."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr "Os IPs atribuídos serão selecionados de forma determinística"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -282,11 +262,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr "A zona do firewall em qual os clientes VPN serão atribuido"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr "A máscara da sub-rede acima."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -297,11 +277,17 @@ msgstr ""
"rotas IPv4 e IPv6, o servidor enviará apenas o apropriado. Deixe vazio para "
"definir uma rota padrão"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr "As mesmas portas UDP e TCP serão usadas"
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr "Não há utilizadores ativos."
@@ -315,7 +301,7 @@ msgstr "Tempo"
msgid "User"
msgstr "Utilizador"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr "Autenticação do utilizador"
@@ -328,28 +314,28 @@ msgstr "Configurações do utilizador"
msgid "Username"
msgstr "Nome do utilizador"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-"Máscara de rede VPN <abbr title=\"Protocolo de Internet Versão 4\""
-">IPv4</abbr>"
+"Máscara de rede VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</"
+"abbr>"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 4\""
-">IPv4</abbr>"
+"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</"
+"abbr>"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
msgstr ""
-"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 6\""
-">IPv6</abbr>"
+"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 6\">IPv6</"
+"abbr>"
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:69
msgid "VPN IP"
@@ -359,7 +345,7 @@ msgstr "IP da VPN"
msgid "VPN IP Address"
msgstr "Endereço IP da VPN"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
@@ -367,3 +353,20 @@ msgid ""
msgstr ""
"Veja o certificado AC utilizado por este servidor. Precisará gravá-lo como "
"'ca.pem' e importá-lo para os clientes."
+
+#~ msgid ""
+#~ "An alternative value to be communicated to the client to verify the "
+#~ "server's certificate; this value only depends on the public key"
+#~ msgstr ""
+#~ "Um valor alternativo a ser comunicado ao cliente para verificar o "
+#~ "certificado do servidor; este valor depende apenas da chave pública"
+
+#~ msgid "Server's certificate SHA1 hash"
+#~ msgstr "Hash SHA1 do certificado do servidor"
+
+#~ msgid ""
+#~ "That value should be communicated to the client to verify the server's "
+#~ "certificate"
+#~ msgstr ""
+#~ "Esse valor deve ser comunicado ao cliente para verificar o certificado do "
+#~ "servidor"
diff --git a/applications/luci-app-ocserv/po/pt_BR/ocserv.po b/applications/luci-app-ocserv/po/pt_BR/ocserv.po
index d67fe5a7d5..9276d3b313 100644
--- a/applications/luci-app-ocserv/po/pt_BR/ocserv.po
+++ b/applications/luci-app-ocserv/po/pt_BR/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -27,15 +27,7 @@ msgstr "Usuários ativos do OpenConnect"
msgid "Active users"
msgstr "Usuários ativos"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-"Um valor alternativo a ser comunicado ao cliente para verificar o "
-"certificado do servidor; este valor depende apenas da chave pública"
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr "Compatibilidade com o cliente AnyConnect"
@@ -58,12 +50,12 @@ msgstr "Cifra"
msgid "Collecting data..."
msgstr "Coletando dados..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr "Servidores de DNS"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr "Tempo de detecção de pares inativos (segundos)"
@@ -78,17 +70,17 @@ msgstr "Dispositivo"
msgid "Edit Template"
msgstr "Editar modelo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr "Edite o modelo que é usado para gerar a configuração do ocserv."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr "Ativar UDP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
@@ -97,12 +89,12 @@ msgstr ""
"Ativar o suporte a canais UDP; esta opção deve estar ativa a não ser que "
"você saiba o que está fazendo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr "Ativar compressão"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr "Ativar proxy arp"
@@ -111,7 +103,7 @@ msgstr "Ativar proxy arp"
msgid "Enable server"
msgstr "Ativar o servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr "Ativar o suporte para clientes da CISCO AnyConnect"
@@ -139,20 +131,20 @@ msgstr "ID"
msgid "IP"
msgstr "IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr "Endereço IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr "Quantidade máxima de clientes"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr "Quantidade máxima de clientes iguais"
@@ -161,7 +153,7 @@ msgstr "Quantidade máxima de clientes iguais"
msgid "Name"
msgstr "Nome"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr "Máscara de Rede (ou prefixo IPv6)"
@@ -177,17 +169,17 @@ msgstr "OpenConnect VPN"
msgid "Password"
msgstr "Senha"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Porta"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr "IPs Previsíveis"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -198,10 +190,10 @@ msgstr ""
"Fornece endereços para clientes de uma sub-rede LAN; se ativo a rede abaixo "
"deve ser uma sub-rede da LAN. repare que o primeiro endereço da sub-net "
"especificada será reservada pelo ocserv, assim tal endereço não deve estar "
-"em uso. Caso tenha uma rede na LAN cobrindo 192.168.1.0/24 utilize 192.168.1."
-"192/26 para que os 62 endereços acima sejam devidamente reservados."
+"em uso. Caso tenha uma rede na LAN cobrindo 192.168.1.0/24 utilize "
+"192.168.1.192/26 para que os 62 endereços acima sejam devidamente reservados."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr "Tabela de roteamento"
@@ -210,34 +202,22 @@ msgstr "Tabela de roteamento"
msgid "Server Settings"
msgstr "Configurações do Servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
msgid "Server's Public Key ID"
msgstr "ID da Chave Pública do Servidor"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
-msgstr "Hash do certificado SHA1 do Servidor"
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
msgid "Status"
msgstr "Condição"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-"Este valor deve ser comunicado ao cliente para verificar o certificado do "
-"servidor"
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
"Os servidores de DNS a ser oferecido aos clientes; pode ser tanto IPv6 ou "
"IPv4"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
@@ -245,7 +225,7 @@ msgstr ""
"Os servidores DNS a ser oferecido aos clientes; pode ser tanto IPv6 ou IPv4. "
"Geralmente você deve incluir o endereço deste dispositivo"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
@@ -255,7 +235,7 @@ msgstr ""
"endereços de rede privados diferentes do endereço LAN a não ser que um proxy "
"ARP esteja ativo. Para uma configuração automática, deixe a opção vazia."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
@@ -263,12 +243,12 @@ msgstr ""
"O endereço IPv6 a ser oferecida aos clientes. Para uma configuração "
"automática, deixe a opção vazia."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr "Os IPs atribuídos serão selecionados deterministicamente"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -283,11 +263,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr "A zona do firewall em que os clientes VPN serão enviados"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr "A máscara da sub-rede acima."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -298,11 +278,17 @@ msgstr ""
"rotas IPv4 e IPv6, o servidor enviará o que for apropriado. Deixe vazio para "
"definir uma rota padrão"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr "As mesmas portas UDP e TCP serão usadas"
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr "Não há usuários ativos."
@@ -316,7 +302,7 @@ msgstr "Tempo"
msgid "User"
msgstr "Usuário"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr "Autenticação do Usuário"
@@ -329,14 +315,14 @@ msgstr "Configurações do Usuário"
msgid "Username"
msgstr "Nome do Usuário"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
"VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>-Máscara de "
"Rede"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
@@ -344,7 +330,7 @@ msgstr ""
"VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>-Endereço de "
"Rede"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -360,7 +346,7 @@ msgstr "IP da VPN"
msgid "VPN IP Address"
msgstr "Endereço IP da VPN"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
@@ -368,3 +354,20 @@ msgid ""
msgstr ""
"Exibir o certificado CA utilizado por este servidor. Você precisará salvá-lo "
"como 'ca.pem' e importá-lo nos clientes."
+
+#~ msgid ""
+#~ "An alternative value to be communicated to the client to verify the "
+#~ "server's certificate; this value only depends on the public key"
+#~ msgstr ""
+#~ "Um valor alternativo a ser comunicado ao cliente para verificar o "
+#~ "certificado do servidor; este valor depende apenas da chave pública"
+
+#~ msgid "Server's certificate SHA1 hash"
+#~ msgstr "Hash do certificado SHA1 do Servidor"
+
+#~ msgid ""
+#~ "That value should be communicated to the client to verify the server's "
+#~ "certificate"
+#~ msgstr ""
+#~ "Este valor deve ser comunicado ao cliente para verificar o certificado do "
+#~ "servidor"
diff --git a/applications/luci-app-ocserv/po/ro/ocserv.po b/applications/luci-app-ocserv/po/ro/ocserv.po
index 2948272141..0b166c5666 100644
--- a/applications/luci-app-ocserv/po/ro/ocserv.po
+++ b/applications/luci-app-ocserv/po/ro/ocserv.po
@@ -11,7 +11,7 @@ msgstr ""
"20)) ? 1 : 2;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -26,13 +26,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -55,12 +49,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -75,29 +69,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -106,7 +100,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -134,20 +128,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -156,7 +150,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -172,17 +166,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -191,7 +185,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -200,12 +194,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -213,41 +203,35 @@ msgstr ""
msgid "Status"
msgstr "stsatus"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -259,11 +243,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -271,11 +255,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -289,7 +279,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -302,18 +292,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -327,7 +317,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ru/ocserv.po b/applications/luci-app-ocserv/po/ru/ocserv.po
index d7faf3a9a1..9bfc086d78 100644
--- a/applications/luci-app-ocserv/po/ru/ocserv.po
+++ b/applications/luci-app-ocserv/po/ru/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/sk/ocserv.po b/applications/luci-app-ocserv/po/sk/ocserv.po
index 4a59cca079..f939526490 100644
--- a/applications/luci-app-ocserv/po/sk/ocserv.po
+++ b/applications/luci-app-ocserv/po/sk/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/sv/ocserv.po b/applications/luci-app-ocserv/po/sv/ocserv.po
index 18dc5b0a2b..9562721bc8 100644
--- a/applications/luci-app-ocserv/po/sv/ocserv.po
+++ b/applications/luci-app-ocserv/po/sv/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.9.1-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr "Chiffer"
msgid "Collecting data..."
msgstr "Samlar in data..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr "Enhet"
msgid "Edit Template"
msgstr "Redigera mall"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr "IP-adress"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "Namn"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr "Lösenord"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Port"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr "Server-inställningar"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Status"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
msgid "User"
msgstr "Användare"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr "Användarnamn"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/templates/ocserv.pot b/applications/luci-app-ocserv/po/templates/ocserv.pot
index 8083170ce0..2e96fb3fe4 100644
--- a/applications/luci-app-ocserv/po/templates/ocserv.pot
+++ b/applications/luci-app-ocserv/po/templates/ocserv.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -16,13 +16,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -45,12 +39,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -65,29 +59,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -96,7 +90,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -124,20 +118,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -146,7 +140,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -162,17 +156,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -181,7 +175,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -190,12 +184,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -203,41 +193,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -249,11 +233,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -261,11 +245,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -279,7 +269,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -292,18 +282,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -317,7 +307,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/tr/ocserv.po b/applications/luci-app-ocserv/po/tr/ocserv.po
index cef1dedb3d..b966990c86 100644
--- a/applications/luci-app-ocserv/po/tr/ocserv.po
+++ b/applications/luci-app-ocserv/po/tr/ocserv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
-"PO-Revision-Date: 2019-11-13 13:06+0000\n"
-"Last-Translator: Yunus BAYRAK <yunus@baygunelektronik.com>\n"
+"PO-Revision-Date: 2019-12-09 20:03+0000\n"
+"Last-Translator: İsmail Karslı <ismail541236@gmail.com>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsocserv/tr/>\n"
"Language: tr\n"
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -52,14 +46,14 @@ msgstr ""
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:62
msgid "Collecting data..."
-msgstr ""
+msgstr "Veri alınıyor..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Durum"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/uk/ocserv.po b/applications/luci-app-ocserv/po/uk/ocserv.po
index 78beba3b38..81a7fb71a2 100644
--- a/applications/luci-app-ocserv/po/uk/ocserv.po
+++ b/applications/luci-app-ocserv/po/uk/ocserv.po
@@ -11,7 +11,7 @@ msgstr ""
"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -26,13 +26,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -55,12 +49,12 @@ msgstr "Шифр"
msgid "Collecting data..."
msgstr "Збирання даних..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -75,29 +69,29 @@ msgstr "Пристрій"
msgid "Edit Template"
msgstr "Редагувати шаблон"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -106,7 +100,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -134,20 +128,20 @@ msgstr ""
msgid "IP"
msgstr "IP-адреса"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -156,7 +150,7 @@ msgstr ""
msgid "Name"
msgstr "Ім'я"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -172,17 +166,17 @@ msgstr ""
msgid "Password"
msgstr "Пароль"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "Порт"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -191,7 +185,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -200,12 +194,8 @@ msgstr ""
msgid "Server Settings"
msgstr "Налаштування сервера"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -213,41 +203,35 @@ msgstr ""
msgid "Status"
msgstr "Стан"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -259,11 +243,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -271,11 +255,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -289,7 +279,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -302,18 +292,18 @@ msgstr ""
msgid "Username"
msgstr "Ім'я користувача"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -327,7 +317,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/vi/ocserv.po b/applications/luci-app-ocserv/po/vi/ocserv.po
index 3fe7835031..6c472d9eda 100644
--- a/applications/luci-app-ocserv/po/vi/ocserv.po
+++ b/applications/luci-app-ocserv/po/vi/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
msgid "Collecting data..."
msgstr "Đang lấy dữ liệu..."
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "Trạng thái"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr "Thời gian"
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/zh-cn/ocserv.po b/applications/luci-app-ocserv/po/zh-cn/ocserv.po
index 14a8ada3ad..2849831003 100644
--- a/applications/luci-app-ocserv/po/zh-cn/ocserv.po
+++ b/applications/luci-app-ocserv/po/zh-cn/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 3.10-dev\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -54,12 +48,12 @@ msgstr "算法"
msgid "Collecting data..."
msgstr "正在收集数据…"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -74,29 +68,29 @@ msgstr "设备"
msgid "Edit Template"
msgstr "编辑模板"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -105,7 +99,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
msgid "IP"
msgstr "IP"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr "最大客户端数量"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
msgid "Name"
msgstr "名称"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
msgid "Password"
msgstr "密码"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr "端口"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
msgid "Status"
msgstr "状态"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/zh-tw/ocserv.po b/applications/luci-app-ocserv/po/zh-tw/ocserv.po
index 714dbf5a24..f86234bc74 100644
--- a/applications/luci-app-ocserv/po/zh-tw/ocserv.po
+++ b/applications/luci-app-ocserv/po/zh-tw/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
msgid "Active users"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
msgid "AnyConnect client compatibility"
msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
msgid "DNS servers"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
msgid "Dead peer detection time (secs)"
msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
msgid "Edit the template that is used for generating the ocserv configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
msgid "Enable UDP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
msgid ""
"Enable UDP channel support; this must be enabled unless you know what you "
"are doing"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
msgid "Enable compression"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
msgid "Enable proxy arp"
msgstr ""
@@ -99,7 +93,7 @@ msgstr ""
msgid "Enable server"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
msgid "Enable support for CISCO AnyConnect clients"
msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
msgid "IP"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
msgid "IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
msgid "Max clients"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
msgid "Max same clients"
msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
msgid "Netmask (or IPv6-prefix)"
msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
msgid "Password"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
msgid "Port"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
msgid "Predictable IPs"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
msgid ""
"Provide addresses to clients from a subnet of LAN; if enabled the network "
"below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
"upper 62 addresses."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
msgid "Routing table"
msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
msgid "Server Settings"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
msgstr ""
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
msgid ""
"The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
"Typically you should include the address of this device"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
msgid ""
"The IPv4 subnet address to provide to clients; this should be some private "
"network different than the LAN addresses unless proxy ARP is enabled. Leave "
"empty to attempt auto-configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
msgid ""
"The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
"configuration."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
msgid "The assigned IPs will be selected deterministically"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
msgid ""
"The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
msgid "The firewall zone that the VPN clients will be set to"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
msgid "The mask of the subnet above."
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
msgid ""
"The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
"default route"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
msgid "The same UDP and TCP ports will be used"
msgstr ""
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
#: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
msgid "There are no active users."
msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
msgid "User"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
msgid "User Authentication"
msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
msgid "Username"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
msgid ""
"VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
msgid ""
"VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
msgid "VPN IP Address"
msgstr ""
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
msgid ""
"View the CA certificate used by this server. You will need to save it as 'ca."