Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes

1 files changed, 198 insertions, 24 deletions

diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 7134034b79..cdbabd4cf3 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -34,6 +34,12 @@ msgstr "--Hãy chọn--"
 msgid "-- custom --"
 msgstr "--tùy chỉnh--"
 
+msgid "-- match by device --"
+msgstr ""
+
+msgid "-- match by label --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr ""
 
@@ -113,6 +119,9 @@ msgstr ""
 msgid "ADSL Status"
 msgstr ""
 
+msgid "AICCU (SIXXS)"
+msgstr ""
+
 msgid "APN"
 msgstr ""
 
@@ -140,6 +149,9 @@ msgstr ""
 msgid "ATM device number"
 msgstr ""
 
+msgid "AYIYA"
+msgstr ""
+
 msgid "Access Concentrator"
 msgstr ""
 
@@ -225,12 +237,12 @@ msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-msgid "Always announce default router"
+msgid ""
+"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison"
+"\">Tunneling Comparison</a> on SIXXS"
 msgstr ""
 
-msgid ""
-"Always use 40MHz channels even if the secondary channel overlaps. Using this "
-"option does not comply with IEEE 802.11n-2009!"
+msgid "Always announce default router"
 msgstr ""
 
 msgid "An additional network will be created if you leave this unchecked."
@@ -280,6 +292,9 @@ msgstr ""
 msgid "Atheros 802.11%s Wireless Controller"
 msgstr ""
 
+msgid "AuthGroup"
+msgstr ""
+
 msgid "Authentication"
 msgstr "Xác thực"
 
@@ -343,6 +358,9 @@ msgstr ""
 msgid "Band"
 msgstr ""
 
+msgid "Behind NAT"
+msgstr ""
+
 msgid ""
 "Below is the determined list of files to backup. It consists of changed "
 "configuration files marked by opkg, essential base files and the user "
@@ -379,15 +397,15 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
+msgid "CA certificate; if empty it will be saved after the first connection."
+msgstr ""
+
 msgid "CPU"
 msgstr ""
 
 msgid "CPU usage (%)"
 msgstr "CPU usage (%)"
 
-msgid "Cached"
-msgstr ""
-
 msgid "Cancel"
 msgstr "Bỏ qua"
 
@@ -471,9 +489,6 @@ msgstr ""
 msgid "Configuration files will be kept."
 msgstr ""
 
-msgid "Configures this mount as overlay storage for block-extroot"
-msgstr ""
-
 msgid "Confirmation"
 msgstr "Xác nhận"
 
@@ -486,6 +501,9 @@ msgstr ""
 msgid "Connection Limit"
 msgstr "Giới hạn kết nối"
 
+msgid "Connection to server fails when TLS cannot be used"
+msgstr ""
+
 msgid "Connections"
 msgstr ""
 
@@ -580,6 +598,9 @@ msgstr ""
 msgid "Default gateway"
 msgstr ""
 
+msgid "Default route"
+msgstr ""
+
 msgid "Default state"
 msgstr ""
 
@@ -763,9 +784,18 @@ msgstr ""
 msgid "Enable VLAN functionality"
 msgstr ""
 
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgstr ""
+
 msgid "Enable learning and aging"
 msgstr ""
 
+msgid "Enable mirroring of incoming packets"
+msgstr ""
+
+msgid "Enable mirroring of outgoing packets"
+msgstr ""
+
 msgid "Enable this mount"
 msgstr ""
 
@@ -884,9 +914,6 @@ msgstr ""
 msgid "Force"
 msgstr "Force"
 
-msgid "Force 40MHz mode"
-msgstr ""
-
 msgid "Force CCMP (AES)"
 msgstr ""
 
@@ -920,9 +947,6 @@ msgstr ""
 msgid "Free space"
 msgstr ""
 
-msgid "Frequency Hopping"
-msgstr "Tần số Hopping"
-
 msgid "GHz"
 msgstr ""
 
@@ -968,15 +992,15 @@ msgstr ""
 msgid "HE.net username"
 msgstr ""
 
-msgid "HT mode (802.11n)"
-msgstr ""
-
 msgid "Handler"
 msgstr ""
 
 msgid "Hang Up"
 msgstr "Hang Up"
 
+msgid "Heartbeat"
+msgstr ""
+
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -1013,6 +1037,9 @@ msgstr ""
 msgid "Hostnames"
 msgstr "Tên host"
 
+msgid "Hybrid"
+msgstr ""
+
 msgid "IP address"
 msgstr "Địa chỉ IP"
 
@@ -1058,6 +1085,9 @@ msgstr "IPv6"
 msgid "IPv6 Firewall"
 msgstr ""
 
+msgid "IPv6 Neighbours"
+msgstr ""
+
 msgid "IPv6 Settings"
 msgstr ""
 
@@ -1070,6 +1100,9 @@ msgstr ""
 msgid "IPv6 address"
 msgstr ""
 
+msgid "IPv6 address delegated to the local tunnel endpoint (optional)"
+msgstr ""
+
 msgid "IPv6 assignment hint"
 msgstr ""
 
@@ -1206,6 +1239,9 @@ msgstr ""
 msgid "Interfaces"
 msgstr "Giao diện "
 
+msgid "Internal"
+msgstr ""
+
 msgid "Internal Server Error"
 msgstr ""
 
@@ -1283,6 +1319,9 @@ msgstr "Ngôn ngữ"
 msgid "Language and Style"
 msgstr ""
 
+msgid "Leaf"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1379,7 +1418,7 @@ msgstr ""
 msgid "Localise queries"
 msgstr "Tra vấn địa phương"
 
-msgid "Locked to channel %d used by %s"
+msgid "Locked to channel %d used by: %s"
 msgstr ""
 
 msgid "Log output level"
@@ -1421,6 +1460,11 @@ msgstr ""
 msgid "MTU"
 msgstr ""
 
+msgid ""
+"Make sure to clone the root filesystem using something like the commands "
+"below:"
+msgstr ""
+
 msgid "Maximum Rate"
 msgstr "Mức cao nhất"
 
@@ -1460,6 +1504,12 @@ msgstr "Mức thấp nhất"
 msgid "Minimum hold time"
 msgstr "Mức thấp nhất"
 
+msgid "Mirror monitor port"
+msgstr ""
+
+msgid "Mirror source port"
+msgstr ""
+
 msgid "Missing protocol extension for proto %q"
 msgstr ""
 
@@ -1530,6 +1580,9 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
+msgid "NTP sync time-out"
+msgstr ""
+
 msgid "Name"
 msgstr "Tên"
 
@@ -1665,12 +1718,24 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+msgid "OpenConnect (CISCO AnyConnect)"
+msgstr ""
+
+msgid "Operating frequency"
+msgstr ""
+
 msgid "Option changed"
 msgstr ""
 
 msgid "Option removed"
 msgstr ""
 
+msgid "Optional, specify to override default server (tic.sixxs.net)"
+msgstr ""
+
+msgid "Optional, use when the SIXXS account has more than one tunnel"
+msgstr ""
+
 msgid "Options"
 msgstr "Lựa chọn "
 
@@ -1686,6 +1751,9 @@ msgstr ""
 msgid "Outdoor Channels"
 msgstr "Kênh ngoại mạng"
 
+msgid "Output Interface"
+msgstr ""
+
 msgid "Override MAC address"
 msgstr ""
 
@@ -1763,6 +1831,9 @@ msgstr "Mật mã của private key"
 msgid "Password successfully changed!"
 msgstr ""
 
+msgid "Path"
+msgstr "Đường dẫn"
+
 msgid "Path to CA-Certificate"
 msgstr "Đường dẫn tới CA-Certificate"
 
@@ -2005,6 +2076,9 @@ msgstr ""
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
+msgid "Require TLS"
+msgstr ""
+
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
@@ -2044,6 +2118,12 @@ msgstr ""
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
+msgid "Root preparation"
+msgstr ""
+
+msgid "Routed IPv6 prefix for downstream interfaces"
+msgstr ""
+
 msgid "Router Advertisement-Service"
 msgstr ""
 
@@ -2069,6 +2149,14 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
+msgid ""
+"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) "
+"use 6in4 instead"
+msgstr ""
+
+msgid "SIXXS-handle[/Tunnel-ID]"
+msgstr ""
+
 msgid "SSH Access"
 msgstr ""
 
@@ -2116,6 +2204,17 @@ msgstr "Phân tách WDS"
 msgid "Server Settings"
 msgstr ""
 
+msgid "Server password"
+msgstr ""
+
+msgid ""
+"Server password, enter the specific password of the tunnel when the username "
+"contains the tunnel ID"
+msgstr ""
+
+msgid "Server username"
+msgstr ""
+
 msgid "Service Name"
 msgstr ""
 
@@ -2185,6 +2284,9 @@ msgstr ""
 msgid "Source"
 msgstr "Nguồn"
 
+msgid "Source routing"
+msgstr ""
+
 msgid "Specifies the button state to handle"
 msgstr ""
 
@@ -2414,6 +2516,11 @@ msgstr ""
 "máy tính để tiếp cận thiết bị một lần nữa, phụ thuộc vào cài đặt của bạn. "
 
 msgid ""
+"The tunnel end-point is behind NAT, defaults to disabled and only applies to "
+"AYIYA"
+msgstr ""
+
+msgid ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 msgstr ""
@@ -2557,6 +2664,15 @@ msgstr ""
 msgid "Tunnel Link"
 msgstr ""
 
+msgid "Tunnel broker protocol"
+msgstr ""
+
+msgid "Tunnel setup server"
+msgstr ""
+
+msgid "Tunnel type"
+msgstr ""
+
 msgid "Turbo Mode"
 msgstr "Turbo Mode"
 
@@ -2635,7 +2751,10 @@ msgstr ""
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
-msgid "Use as root filesystem"
+msgid "Use as external overlay (/overlay)"
+msgstr ""
+
+msgid "Use as root filesystem (/)"
 msgstr ""
 
 msgid "Use broadcast flag"
@@ -2669,6 +2788,12 @@ msgstr "Đã sử dụng"
 msgid "Used Key Slot"
 msgstr ""
 
+msgid "User certificate (PEM encoded)"
+msgstr ""
+
+msgid "User key (PEM encoded)"
+msgstr ""
+
 msgid "Username"
 msgstr "Tên người dùng "
 
@@ -2687,9 +2812,21 @@ msgstr ""
 msgid "VPN Server"
 msgstr ""
 
+msgid "VPN Server port"
+msgstr ""
+
+msgid "VPN Server's certificate SHA1 hash"
+msgstr ""
+
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
+msgid "Verbose"
+msgstr ""
+
+msgid "Verbose logging by aiccu daemon"
+msgstr ""
+
 msgid "Verify"
 msgstr ""
 
@@ -2719,6 +2856,10 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
+msgid ""
+"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)"
+msgstr ""
+
 msgid "Waiting for changes to be applied..."
 msgstr ""
 
@@ -2731,6 +2872,15 @@ msgstr ""
 msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr "Cảnh báo: Các thay đổi chưa lưu sẽ bị mất trong khi khởi động lại!"
 
+msgid "Whether to create an IPv6 default route over the tunnel"
+msgstr ""
+
+msgid "Whether to route only packets from delegated prefixes"
+msgstr ""
+
+msgid "Width"
+msgstr ""
+
 msgid "Wifi"
 msgstr "Wifi"
 
@@ -2787,6 +2937,12 @@ msgid ""
 "You must enable Java Script in your browser or LuCI will not work properly."
 msgstr ""
 
+msgid ""
+"Your Internet Explorer is too old to display this page correctly. Please "
+"upgrade it to at least version 7 or use another browser like Firefox, Opera "
+"or Safari."
+msgstr ""
+
 msgid "any"
 msgstr ""
 
@@ -2867,6 +3023,12 @@ msgstr ""
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Tập tin <abbr title=\"Domain Name System\">DNS</abbr> địa phương"
 
+msgid "minimum 1280, maximum 1480"
+msgstr ""
+
+msgid "navigation Navigation"
+msgstr ""
+
 msgid "no"
 msgstr ""
 
@@ -2876,6 +3038,9 @@ msgstr ""
 msgid "none"
 msgstr "không "
 
+msgid "not present"
+msgstr ""
+
 msgid "off"
 msgstr ""
 
@@ -2885,6 +3050,9 @@ msgstr ""
 msgid "open"
 msgstr ""
 
+msgid "overlay"
+msgstr ""
+
 msgid "relay mode"
 msgstr ""
 
@@ -2894,6 +3062,12 @@ msgstr ""
 msgid "server mode"
 msgstr ""
 
+msgid "skiplink1 Skip to navigation"
+msgstr ""
+
+msgid "skiplink2 Skip to content"
+msgstr ""
+
 msgid "stateful-only"
 msgstr ""
 
@@ -2927,6 +3101,9 @@ msgstr ""
 msgid "« Back"
 msgstr ""
 
+#~ msgid "Frequency Hopping"
+#~ msgstr "Tần số Hopping"
+
 #~ msgid "Active Leases"
 #~ msgstr "Leases hoạt động"
 
@@ -3536,9 +3713,6 @@ msgstr ""
 #~ msgid "Number of leased addresses"
 #~ msgstr "Số của địa chỉ lease"
 
-#~ msgid "Path"
-#~ msgstr "Đường dẫn"
-
 #~ msgid "Perform Actions"
 #~ msgstr "Trình bày hành động"