Merge remote-tracking branch 'origin/main' into release

base/en.json

@@ -164,7 +164,8 @@
         "current_client_label": "Current Client",
         "disguise_mac_label": "Camouflaged MAC address",
         "random_mac_label": "Randomized MAC address",
-        "clone_mac_label": "Cloned MAC address"
+        "clone_mac_label": "Cloned MAC address",
+        "mac_format_tips": "the least significant bit of the first octet is not allowed set to 1 (i.e. the second hexadecimal digit is not allowed odd)."
     },
     "upload": {
         "select_or_drag": "Select a file or drag it here",

base/zh-cn.json

@@ -164,7 +164,8 @@
         "disguise_mac_label": "伪装的 MAC 地址",
         "random_mac_label": "随机的 MAC 地址",
         "clone_mac_label": "克隆的 MAC 地址",
-        "mac_real_label": "出厂"
+        "mac_real_label": "出厂",
+        "mac_format_tips": "第一个字节的最低位不允许设置为 1（即第二个十六进制数字不允许为奇数）。"
     },
     "upload": {
         "file_include": "文件类型包括",

base/zh-tw.json

@@ -149,7 +149,8 @@
         "lan1_label": "LAN 1 埠",
         "ttl_tips": "TTL（Time To Live）設置了數據包在網絡中生存的最大時間，根據運營商要求進行填寫。",
         "mac_addr_label": "MAC 地址",
-        "mac_real_label": "出廠"
+        "mac_real_label": "出廠",
+        "mac_format_tips": "第一個字節的最低位不允許設置爲 1（即第二個十六進制數字不允許爲奇數）。"
     },
     "date": {
         "day": "天",

clients/zh-tw.json

@@ -30,7 +30,7 @@
         "watch": "可穿戴設備",
         "laptop": "手提電腦",
         "printer": "打印機",
-        "sound": "聲音",
+        "sound": "音響",
         "device_type_label": "設備類型",
         "sort_by": "按$$$$排序",
         "ascending": "升序",

firewall/en.json

@@ -2,10 +2,10 @@
     "firewall": {
         "port_forwards": "Port Forwarding",
         "open_ports_on_router": "Open Ports on Router",
-        "port_forwards_desc": "If you have servers in your LAN subnet and want them be accessible from the WAN side, you need to set up port forward to these servers, identified by IP addresses and ports. The device will prioritize the higher-priority rule if there is a conflict between the {external_ports} of two enabled rules.",
+        "port_forwards_desc": "If you have servers in your LAN subnet and want them be accessible from the WAN side, you need to set up port forwarding to these servers, identified by IP addresses and ports. The device will prioritize the higher-priority rule if there is a conflict between the {external_ports} of two enabled rules.",
         "open_port_on_router_dest": "For security reasons, the services that you install on the device are only opened to its LAN network. If you want them to be accessible from the WAN network, you need to open ports for these services on the WAN.",
         "dmz_desc": "DMZ lets you to expose one local computer to the Internet, all inbound packets will be redirected to this computer.",
-        "dmz_tips": "If you enable DMZ, your port forward and port open rules will not take effect.",
+        "dmz_tips": "If you enable DMZ, your port forwarding and port open rules will not take effect.",
         "open_dmz": "Enable DMZ",
         "dmz_host_ip": "DMZ Host IP",
         "name": "Name",
@@ -18,8 +18,8 @@
         "port": "Port",
         "action": "Action",
         "no_data": "No data in the table",
-        "add_port_forwards_title": "Add New Port Forward Rule",
-        "edit_port_forwards_title": "Modify Port Forward Rule",
+        "add_port_forwards_title": "Add New Port Forwarding Rule",
+        "edit_port_forwards_title": "Modify Port Forwarding Rule",
         "add_router_prot_title": "Add New Open Port",
         "edit_router_prot_title": "Modify Open Port",
         "delete_all_port_tips": "Are you sure you want to delete all entries?",

firewall/zh-tw.json

@@ -19,8 +19,8 @@
         "action": "操作",
         "no_data": "沒有配置信息",
         "delete_all_port_tips": "是否要刪除所有端口規則?",
-        "add_port_forwards_title": "添加新的通訊埠轉發 (Port Forward) 規則",
-        "edit_port_forwards_title": "編輯通訊埠轉發 (Port Forward) 規則",
+        "add_port_forwards_title": "添加新的通訊埠轉發 (Port Forwarding) 規則",
+        "edit_port_forwards_title": "編輯通訊埠轉發 (Port Forwarding) 規則",
         "add_router_prot_title": "添加新的開放端口",
         "edit_router_prot_title": "編輯開放端口",
         "confirm_delete_tips": "您確認要刪除該項配置嗎？",

home/en.json

@@ -15,7 +15,7 @@
         "classic": "Classic",
         "custom_lang_btn": "Add Languages",
         "custom_lang_title": "Management Interface Languages",
-        "custom_lang_tips": "The official language packs are English and Chinese. (Other languages are maintained by our community.) The latest language packs will be obtained from our repository when you click \"Update\".",
+        "custom_lang_tips": "The official language packs are English and Chinese. (Other languages are maintained by our community, GL.iNet cannot guarantee the completeness or quality of them.) The latest language packs will be obtained from our repository when you click \"Update\".",
         "custom_lang_note": "Unselected language packs will be deleted (except English).",
         "enable_update_langs_label": "Enable Auto Update",
         "update_time_label": "Update Time",

home/zh-cn.json

@@ -16,7 +16,7 @@
         "custom_lang_btn": "添加语言",
         "custom_lang_title": "管理界面语言",
         "custom_lang_note": "未被选择的语言包将被删除（英文除外）。",
-        "custom_lang_tips": "官方语言包为英文和中文（其他语言由我们的社区维护）。点击更新时将从我们的官方仓库拉取最新的语言包。",
+        "custom_lang_tips": "官方语言包为英文和中文（其他语言由我们的社区维护，我们无法保证其完整性或质量。）点击更新时将从我们的官方仓库拉取最新的语言包。",
         "langs_no_internet_tips": "更新语言列表失败。{otherTips}",
         "enable_update_langs_label": "启用自动更新",
         "update_time_label": "更新时间"

home/zh-tw.json

@@ -15,7 +15,7 @@
         "classic": "經典",
         "custom_lang_btn": "添加語言",
         "custom_lang_title": "管理界面語言",
-        "custom_lang_tips": "官方語言包為英文和中文（其他語言由我們的社區維護）。 點擊更新時將從我們的官方倉庫拉取最新的語言包。",
+        "custom_lang_tips": "官方語言包為英文和中文（其他語言由我們的社區維護，我們無法保證其完整性或質量。）點擊更新時將從我們的官方倉庫拉取最新的語言包。",
         "custom_lang_note": "未被選擇的語言包將被刪除（英文除外）。",
         "langs_no_internet_tips": "更新語言列表失敗。 {otherTips}",
         "enable_update_langs_label": "啟用自動更新",

internet/de.json

@@ -19,7 +19,7 @@
         "change_to_lan_check_tips": "Bitte ziehen Sie zuerst das Netzwerkkabel vom WAN-Port ab. $$$$ Neu erkennen $$$$",
         "change_port_btn": "Ändern auf {port}",
         "revert_port_btn": "Wiederherstellen auf {port}",
-        "no_wan_tips": "{silkprint} status: Benutze als {port}. Kein Kabel erkannt.",
+        "no_wan_tips": "Kein Kabel erkannt.",
         "using_tips": "{silkprint} status: Benutze als {port}. {changePort}",
         "use_as_wan_tips": "Geräte am {asWan} Port können die Administrator-Oberfläche nicht mehr erreichen. Der Zugang ist weiterhin über WLAN oder einem anderen LAN Port möglich.",
         "reset_port_tips": "Der {silkprint} kann wiederhergestellt werden, wenn der Reset-Taster am Gerät für 4 Sekunden gedrückt und gehalten wird.",

internet/en.json

@@ -17,7 +17,7 @@
         "change_to_lan_check_tips": "First, please unplug the Ethernet cable that is plugged into the WAN port. $$$$ re-detect $$$$",
         "change_to_wan_tips": "Once the LAN port is used as a WAN port, you will not be able to access the administrator panel via this Ethernet port connected to the LAN port. Please ensure that your client can connect to Wi-Fi or other LAN port.",
         "change_to_wan_tips2": "You can restore the LAN port (so that it is no longer used as a WAN port) by pressing and holding the reset button on the device for four seconds.",
-        "no_wan_tips": "{silkprint} status: Using as {port}. No cable detected.",
+        "no_wan_tips": "No cable detected.",
         "using_tips": "{silkprint} status: Using as {port}. {changePort}",
         "reset_port_tips": "You can restore the {silkprint} by pressing and holding down the device's reset button for 4 seconds.",
         "use_as_wan_tips": "{asWan}, the device connected to the port can't access the admin panel anymore. You'll have to connect it to Wi-Fi or other LAN ports.",
@@ -78,13 +78,13 @@
         "modify_wifi_title": "Modify Network Settings",
         "enable_disguise_label": "Enable Camouflage",
         "enable_disguise_tips": "If this option is enabled, this router camouflage itself as the same device as the client device you are now using.",
-        "allow_auto_portal_tips": "If this option is enabled, this router will automatically enter Login Mode for Public Hotspots when it successfully connected to a hotspot but not the Internet. This mode will pause VPNs, which may cause data leaks to the provider of the hotspot (e.g., hotel/mall).",
+        "allow_auto_portal_tips": "If this option is enabled, this router will automatically enter Login Mode for Public Hotspots when it successfully connected to a hotspot but not the Internet. This mode will pause VPNs and custom DNS until it leave, which may cause data leaks to the provider of the hotspot (e.g., hotel/mall).",
         "allow_auto_portal_label": "Auto-Enable Login Mode for Public Hotspots",
         "auto_portal_tips": "The device has entered Login Mode for Public Hotspots to access the Captive Portal's hotspot. After successful login, it will automatically leave this mode.",
         "to_auth_btn": "Go to Login",
-        "entered_portal_tips": "The device is in Login Mode for Public Hotspots. VPNs has been paused, which may cause data leaks to the provider of the hotspot (e.g., hotel/mall). After successful login, this router automatically leaves this mode. To leave manually, {exit}.",
+        "entered_portal_tips": "The device is in Login Mode for Public Hotspots. VPNs and custom DNS has been paused, which may cause data leaks to the provider of the hotspot (e.g., hotel/mall). After successful login, this router automatically leaves this mode. To leave manually, {exit}.",
         "auto_go_auth_tips": "Automatically {auth} after {count}",
-        "need_enter_portal_tips": "Can’t access the internet via the repeated hotspot. Try to enter {portal} to fix the issue.",
+        "need_enter_portal_tips": "Can’t access the internet via the repeated hotspot. Try to enter {portal} to fix the issue. Note this mode will pause VPNs and custom DNS until it leave, which may cause data leaks to the provider of the hotspot (e.g., hotel/mall).",
         "portal_auth_mode_btn": "Login Mode for Public Hotspots",
         "going_to_auth_tips": "Coming soon to the Login page:"
     },

internet/es.json

@@ -18,7 +18,7 @@
         "change_to_wan_tips2": "Puede restaurar el puerto LAN (que ya no se use como puerto WAN) manteniendo presionado el botón de reset en el dispositivo durante cuatro (4) segundos.",
         "change_to_lan_check_tips": "Por favor, desconecte primero el cable conectado al puerto WAN. $$$$ Detectando... $$$$",
         "change_port_btn": "Cambiar a {port}",
-        "no_wan_tips": "{silkprint} estado: Usado como {port}. No se detecta el cable.",
+        "no_wan_tips": "No se detecta el cable.",
         "using_tips": "{silkprint} estado: Usado como {port}. {changePort}",
         "reset_port_tips": "Puede restaurar el {silkprint} presionando y manteniendo presionado el botón de reinicio del dispositivo durante 4 segundos.",
         "use_as_wan_tips": "{asWan}, el dispositivo conectado al puerto ya no puede acceder al panel de administración. Tendrá que conectarlo a Wi-Fi u otros puertos LAN.",

internet/fr.json

@@ -19,7 +19,7 @@
         "change_to_wan_tips2": "Vous pouvez restaurer le port LAN (afin qu'il ne soit plus utilisé comme port WAN) en appuyant sur le bouton de réinitialisation de l'appareil et en le maintenant enfoncé pendant quatre secondes.",
         "change_port_btn": "Changer en {port}",
         "use_as_wan_tips": "{asWan}, les appareils connecté à ce port ne peuvent pas accéder à l'interface d'administration. Vous devez vous connecter à un autre port ou au réseau WiFi.",
-        "no_wan_tips": "silkprint} Etat : Utilisé comme {port}. Pas de cable détecté.",
+        "no_wan_tips": "Pas de cable détecté.",
         "using_tips": "{silkprint} status : Utilisé comme {port}. {changePort}",
         "reset_port_tips": "Vous pouvez restaurer le {silkprint} en restant appuyé sur le bouton reset pendant 4 secondes.",
         "revert_port_btn": "Restaurer en {port}",

internet/zh-cn.json

@@ -17,7 +17,7 @@
         "change_to_lan_check_tips": "请先拔出插入 WAN 口的网线。$$$$重新检测$$$$",
         "change_to_wan_tips": "LAN 口用作 WAN 口后，您将无法再通过该网口连接到内网来访问管理员面板。请确保您的客户端可以连接 Wi-Fi 或者还有其他 LAN 口。",
         "change_to_wan_tips2": "您可以按住设备上的重置按扭 4 秒钟来还原 LAN 口（不再作为 WAN 口）。",
-        "no_wan_tips": "{silkprint} 状态：作为 {port} 使用。未检测到网线。",
+        "no_wan_tips": "未检测到网线。",
         "use_as_wan_tips": "{asWan}，客户端设备将无法再使用该网口连接并访问管理面板。请确保您的客户端可以连接 Wi-Fi 或者其他 LAN 口。",
         "revert_port_btn": "恢复至 {port}",
         "revert_as_lan_tips": "您确定要将 {silkprint}恢复成作为 LAN 口使用的状态吗？",
@@ -74,15 +74,15 @@
         "fail_mac_tips": "路由器的 MAC 地址不能与 Wi-Fi 客户端相同，请$$$$修改克隆的 MAC$$$$或在该客户端上修改 MAC。",
         "scan_wifi_fail_dfs_tips": "设备正在进行 DFS 信道可用性检测，无法扫描周边 Wi-Fi。请等待检测结束。",
         "connet_dfs_tips": "路由器中继DFS信道的WiFi时，如果此WiFi可用，路由器将使用选择的DFS信道，需要注意的是，如果此WiFi不可用，将会切换信道，此时会导致通过WiFi连接的客户端短暂断开，有些设备会无感重连，有些需要手动重连。",
-        "allow_auto_portal_tips": "若此选项启用，此路由器会在连接热点成功但无法连接到互联网时自动进入公共热点认证模式。注意，此模式会暂停 VPN，这可能导致信息泄露给热点的提供方（如酒店、商场）。",
+        "allow_auto_portal_tips": "若此选项启用，此路由器会在连接热点成功但无法连接到互联网时自动进入公共热点认证模式。此模式会暂停 VPN 和自定义 DNS 直到其退出为止，这可能导致信息泄露给热点的提供方（如酒店、商场）。",
         "allow_auto_portal_label": "自动启用公共热点认证模式",
-        "need_enter_portal_tips": "无法通过已中继的热点访问互联网，您可以尝试进入{portal}来解决问题。",
+        "need_enter_portal_tips": "无法通过已中继的热点访问互联网，您可以尝试进入{portal}来解决问题。注意，此模式会暂停 VPN 和自定义 DNS 直到其退出为止，这可能导致信息泄露给热点的提供方（如酒店、商场）。",
         "portal_auth_mode_btn": "公共热点认证模式",
         "modify_wifi_tips": "更改任何网络设置都会导致中继重新连接。",
         "enable_disguise_tips": "若此选项启用，路由器伪装成您目前使用的客户端设备的同款设备。",
         "auto_portal_tips": "此设备已自动进入公共热点验证模式以访问热点的 Captive Portal。认证成功后，设备将自动退出该模式。",
         "to_auth_btn": "前往登录",
-        "entered_portal_tips": "设备处于公共热点认证模式中。注意，此模式会暂停 VPN，这可能导致信息泄露给热点的提供方（如酒店、商场）。认证成功后设备会自动退出该模式。如果您要退出，{exit}。",
+        "entered_portal_tips": "设备处于公共热点认证模式中。VPN 和自定义 DNS 已被暂时停用，这可能导致信息泄露给热点的提供方（如酒店、商场）。认证成功后设备会自动退出该模式。如果您要退出，{exit}。",
         "enable_disguise_label": "启用伪装",
         "modify_wifi_title": "修改网络配置",
         "auto_go_auth_tips": "{count}之后自动{auth}",