From: Hannu Nyman <redacted>
Date: Tue, 29 Dec 2020 11:29:41 +0000 (+0200)
Subject: treewide: fix weblate conflicts
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=91a6006bde3611f57fc8fa21d148cfc487e6eb56;p=openwrt-luci.git

treewide: fix weblate conflicts

Merge remore tracking branch 'weblate/master' and
fix conflicts.
---

91a6006bde3611f57fc8fa21d148cfc487e6eb56
diff --cc modules/luci-base/po/zh_Hant/base.po
index 8e5f45ae7d,6e6d2cbf39..fa7130345d
--- a/modules/luci-base/po/zh_Hant/base.po
+++ b/modules/luci-base/po/zh_Hant/base.po
@@@ -2938,9 -2922,9 +2937,9 @@@ msgstr "IPv6凌駕IPv4外(第6版)
  msgid "IPv6-over-IPv4 (6to4)"
  msgstr "IPv6凌駕IPv4外(6轉4)"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1598
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1603
  msgid "Identity"
- msgstr "特性"
+ msgstr "身分識別"
  
  #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
  msgid "If checked, 1DES is enabled"
@@@ -3098,9 -3082,9 +3097,9 @@@ msgstr "初始化腳本
  
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
  msgid "Initscripts"
- msgstr "初始化腳本"
+ msgstr "初始化腳本組"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1587
  msgid "Inner certificate constraint (Domain)"
  msgstr "內部憑證制約 (域名)"
  
@@@ -3143,11 -3127,11 +3142,11 @@@ msgstr "介面
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:62
  msgid "Interface %q device auto-migrated from %q to %q."
- msgstr "從 %q 到 %q 自動遷移到界面 %q 設備 ."
+ msgstr "從 %q 到 %q 自動遷移到介面%q 設備 ."
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:922
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:927
  msgid "Interface Configuration"
- msgstr "介面設定"
+ msgstr "介面組態"
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:110
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:151
@@@ -3278,11 -3262,11 +3277,11 @@@ msgstr "需要Java腳本！
  msgid "Join Network"
  msgstr "加入網路"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1685
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1690
  msgid "Join Network: Wireless Scan"
- msgstr "加入網路:無線網路掃描"
+ msgstr "加入網路:無線掃描"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1966
  msgid "Joining Network: %q"
  msgstr "加入網路：%q"
  
@@@ -3794,9 -3773,9 +3793,9 @@@ msgstr "等待數據機待命的最大ç
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
  msgid "Maximum number of leased addresses."
- msgstr "DHCP 最大數量。"
+ msgstr "租約位址群的最大數量。"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:888
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
  msgid "Maximum transmit power"
  msgstr "最大發射功率"
  
@@@ -4009,9 -3988,9 +4008,9 @@@ msgstr "往上移
  msgid "Multicast"
  msgstr "群播"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1442
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1447
  msgid "NAS ID"
- msgstr "網路附存伺服器ID"
+ msgstr "網路儲存設備(NAS)ID"
  
  #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
  msgid "NAT-T Mode"
@@@ -4195,10 -4174,10 +4194,10 @@@ msgstr "没有設定密碼！
  msgid "No peers defined yet"
  msgstr "尚未定義節點群"
  
 -#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:121
 -#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:268
 +#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:140
 +#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
  msgid "No public keys present yet."
- msgstr "目前無可用公鑰。"
+ msgstr "尚無可用公鑰。"
  
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:90
  msgid "No rules in this chain."
@@@ -4379,9 -4358,9 +4378,9 @@@ msgstr "OpenConnect (思科 AnyConnect)
  
  #: protocols/luci-proto-openfortivpn/htdocs/luci-static/resources/protocol/openfortivpn.js:12
  msgid "OpenFortivpn"
- msgstr "OpenFortivpn-Fortinet專屬VPN"
+ msgstr "OpenFortivpn (Fortinet專屬VPN)"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:882
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
  msgid "Operating frequency"
  msgstr "操作頻率"
  
@@@ -4752,11 -4722,11 +4751,11 @@@ msgstr "密碼2
  msgid "Paste or drag SSH key file…"
  msgstr "貼上或拖曳 SSH 金鑰至此…"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1515
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1520
  msgid "Path to CA-Certificate"
- msgstr "CA憑證路徑"
+ msgstr "CA 憑證路徑"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1530
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
  msgid "Path to Client-Certificate"
  msgstr "用戶憑證的路徑"
  
@@@ -5353,9 -5319,9 +5350,9 @@@ msgstr "重新啟動
  msgid "Restart Firewall"
  msgstr "重啟防火牆"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:819
  msgid "Restart radio interface"
- msgstr "重啟介面"
+ msgstr "重啟無線介面"
  
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:372
  msgid "Restore"
@@@ -5471,9 -5437,9 +5468,9 @@@ msgstr "SSH伺服器埠號
  
  #: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
  msgid "SSH username"
- msgstr "SSH 伺服器位址"
+ msgstr "SSH用戶名稱"
  
 -#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:274
 +#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:283
  #: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:51
  msgid "SSH-Keys"
  msgstr "SSH-金鑰"
@@@ -5657,9 -5621,9 +5654,9 @@@ msgstr "嚴重錯誤秒數(SES)
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:208
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:37
  msgid "Short GI"
- msgstr "短 GI"
+ msgstr "短GI"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1090
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
  msgid "Short Preamble"
  msgstr "簡短前序編碼"
  
@@@ -6270,9 -6227,9 +6263,9 @@@ msgstr "
  
  #: modules/luci-compat/luasrc/view/cbi/error.htm:6
  msgid "The configuration file could not be loaded due to the following error:"
- msgstr "因下列問題導致設定檔無法讀取："
+ msgstr "因下列問題導致組態檔無法讀取："
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1925
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1930
  msgid ""
  "The correct SSID must be manually specified when joining a hidden wireless "
  "network"
@@@ -6490,11 -6443,11 +6483,11 @@@ msgstr "路由器尚未設密碼. 請è¨
  
  #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
  msgid "This IPv4 address of the relay"
- msgstr "IPv4位址的轉驛"
+ msgstr "IPv4位址的中繼"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1556
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1561
  msgid "This authentication type is not applicable to the selected EAP method."
- msgstr "已選的 EAP 方法無適用的驗證方式。"
+ msgstr "此身份驗證類型不適用於所選的EAP方法."
  
  #: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:57
  msgid "This does not look like a valid PEM file"
@@@ -6913,9 -6867,9 +6906,9 @@@ msgstr "使用DHCP的閘道
  msgid "Use DNS servers advertised by peer"
  msgstr "使用終端發布的DNS伺服器"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:565
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:569
  msgid "Use ISO/IEC 3166 alpha2 country codes."
- msgstr "使用Use ISO/IEC 3166 alpha2 國碼."
+ msgstr "使用Use ISO/IEC 3166 alpha2 國別碼."
  
  #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
  #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
@@@ -7254,9 -7208,9 +7247,9 @@@ msgstr "警告：未儲存的更改會å
  
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:37
  msgid "Weak"
- msgstr "弱爆了"
+ msgstr "薄弱"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1470
  msgid ""
  "When using a PSK, the PMK can be automatically generated. When enabled, the "
  "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@@ -7688,9 -7628,9 +7681,9 @@@ msgstr "超安全
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:352
  msgid "tagged"
- msgstr "標籤"
+ msgstr "標記的"
  
 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1458
  msgid "time units (TUs / 1.024 ms) [1000-65535]"
  msgstr "時間單位 (TUs / 1.024 ms) [1000-65535]"