Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

1 files changed, 74 insertions, 51 deletions

diff --git a/applications/luci-app-ocserv/po/zh-cn/ocserv.po b/applications/luci-app-ocserv/po/zh-cn/ocserv.po
index 2849831003..c421763768 100644
--- a/applications/luci-app-ocserv/po/zh-cn/ocserv.po
+++ b/applications/luci-app-ocserv/po/zh-cn/ocserv.po
@@ -1,38 +1,43 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-04 12:06+0000\n"
-"Last-Translator: lissom <kkjoy2617@gmail.com>\n"
+"PO-Revision-Date: 2020-01-01 02:22+0000\n"
+"Last-Translator: Zheng Qian <sotux82@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationsocserv/zh_Hans/>\n"
 "Language: zh-cn\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\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 ""
+msgstr "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>–表示：地址/前缀"
 
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:48
 msgid "Active OpenConnect Users"
-msgstr ""
+msgstr "活跃的 OpenConnect 用户"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:61
 msgid "Active users"
-msgstr ""
+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:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
-msgstr ""
+msgstr "AnyConnect 客户端兼容性"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:17
 msgid "Available users"
-msgstr ""
+msgstr "可用用户"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:13
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:13
@@ -51,12 +56,12 @@ 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 ""
+msgstr "DNS 服务器"
 
 #: 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 ""
+msgstr "对等体失效检测时间（秒）"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:70
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:55
@@ -71,42 +76,42 @@ 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 ""
+msgstr "编辑用于生成 ocserv 配置的模板。"
 
 #: 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 ""
+msgstr "启用 UDP"
 
 #: 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 ""
+msgstr "启用 UDP 通道支持；除非您知道自己在做什么，否则必须启用它"
 
 #: 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 ""
+msgstr "启用压缩"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
-msgstr ""
+msgstr "启用代理 ARP"
 
 #: 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 ""
+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 ""
+msgstr "启用对 CISCO AnyConnect 客户端的支持"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:44
 msgid "Firewall Zone"
-msgstr ""
+msgstr "防火墙区域"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:12
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:12
@@ -117,11 +122,11 @@ msgstr "基本设置"
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:67
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:52
 msgid "Group"
-msgstr ""
+msgstr "组"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:65
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:68
 msgid "IP"
@@ -133,7 +138,7 @@ msgstr "IP"
 #: 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 ""
+msgstr "IP 地址"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
@@ -142,8 +147,9 @@ msgstr "最大客户端数量"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
+#, fuzzy
 msgid "Max same clients"
-msgstr ""
+msgstr "最大相同客户端数"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:22
 msgid "Name"
@@ -152,14 +158,15 @@ 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 ""
+msgstr "网络掩码（或 IPv6 前缀）"
 
 #: 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
+#, fuzzy
 msgid "OpenConnect VPN"
-msgstr ""
+msgstr "OpenConnect VPN"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:24
 msgid "Password"
@@ -173,7 +180,7 @@ 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 ""
+msgstr "可预测的 IP"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
@@ -183,52 +190,65 @@ msgid ""
 "network in LAN covering 192.168.1.0/24 use 192.168.1.192/26 to reserve the "
 "upper 62 addresses."
 msgstr ""
+"从 LAN 子网向客户端提供地址；如果启用，下面的网络必须是 LAN 的子网。请注意，指定子网的第一个地址将由 ocserv 保留，因此不应使用。"
+"如果您的 LAN 网络范围是 192.168.1.0/24，请使用 192.168.1.192/26 保留前面的 62 个地址。"
 
 #: 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 ""
+msgstr "路由表"
 
 #: applications/luci-app-ocserv/luasrc/controller/ocserv.lua:19
 msgid "Server Settings"
-msgstr ""
+msgstr "服务器设置"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
 msgid "Server's Public Key ID"
-msgstr ""
+msgstr "服务器公钥 ID"
+
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
+msgid "Server's certificate SHA1 hash"
+msgstr "服务器证书 SHA1 哈希"
 
 #: 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/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 ""
+msgstr "要提供给客户端的 DNS 服务器；可以是 IPv6 或 IPv4"
 
 #: 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 ""
+msgstr "要提供给客户端的 DNS 服务器；可以是 IPv6 或 IPv4。通常，您应该包括此设备的地址"
 
 #: 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 ""
+msgstr "要提供给客户端的 IPv4 子网地址；除非启用代理 ARP，否则这应该是一些与 LAN 地址不同的专用网络。留空以尝试自动配置。"
 
 #: 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 ""
+msgstr "要提供给客户端的 IPv6 子网地址；留空以尝试自动配置。"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
+#, fuzzy
 msgid "The assigned IPs will be selected deterministically"
-msgstr ""
+msgstr "分配的 IP 将确定性地被选中"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
@@ -236,15 +256,15 @@ 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 ""
+msgstr "用户的身份验证方法。最简单的是单个用户名-密码对。使用 PAM 模块使用其他服务器（例如：LDAP、Radius）进行身份验证。"
 
 #: 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 ""
+msgstr "VPN 客户端的防火墙区域将被设定为"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
-msgstr ""
+msgstr "上面子网的掩码。"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
@@ -252,12 +272,13 @@ 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 ""
+msgstr "提供给客户端的路由表；您可以混合使用 IPv4 和 IPv6 路由，服务器将只发送适当的路由。留空以设置默认路由"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
+#, fuzzy
 msgid "The same UDP and TCP ports will be used"
-msgstr ""
+msgstr "将使用相同的 UDP 和 TCP 端口"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
 msgid ""
@@ -266,59 +287,61 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
+#, fuzzy
 msgid "There are no active users."
-msgstr ""
+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 ""
+msgstr "时间"
 
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:51
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
+#, fuzzy
 msgid "User Authentication"
-msgstr ""
+msgstr "用户认证"
 
 #: applications/luci-app-ocserv/luasrc/controller/ocserv.lua:24
 msgid "User Settings"
-msgstr ""
+msgstr "用户设置"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:66
 msgid "Username"
-msgstr ""
+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 ""
+msgstr "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>–子网掩码"
 
 #: 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 ""
+msgstr "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>–网络地址"
 
 #: 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 ""
+msgstr "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>–网络地址"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:69
 msgid "VPN IP"
-msgstr ""
+msgstr "VPN IP"
 
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:54
 msgid "VPN IP Address"
-msgstr ""
+msgstr "VPN IP 地址"
 
 #: 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 ""
+msgstr "查看该服务器使用的 CA 证书。您需要将其另存为“ca.pem”并导入客户端。"