Merge branch 'main' into main

assets/translations/strings_zh-CN.i18n.json

@@ -11,7 +11,10 @@
         },
         "sort": "排序",
         "sortBy": "排序方式",
-        "addToClipboard": "添加到剪贴板"
+        "addToClipboard": "添加到剪贴板",
+        "notSet": "没有设置",
+        "agree": "同意",
+        "decline": "衰退"
     },
     "intro": {
         "termsAndPolicyCaution(rich)": "继续即表示您同意 ${tap(@:about.termsAndConditions)}",
@@ -204,7 +207,9 @@
                 "mux": "复用器",
                 "outbound": "出站选项",
                 "tlsTricks": "TLS Tricks",
-                "misc": "其他选项"
+                "misc": "其他选项",
+                "warp": "WARP 选项",
+                "misc": "其它选项",
             },
             "pageTitle": "配置选项",
             "logLevel": "日志级别",
@@ -244,6 +249,23 @@
             "enableMux": "启用复用器",
             "muxProtocol": "复用器控制",
             "muxMaxStreams": "最大并发数"
+            "enableMux": "启用 Mux",
+            "muxProtocol": "Mux 控制",
+            "muxMaxStreams": "最大并发数",
+            "enableWarp": "启用 WARP",
+            "warpDetourMode": "迂回模式",
+            "warpDetourModes": {
+                "inbound": "通过代理绕过 WARP",
+                "outbound": "通过 WARP 绕过代理"
+            },
+            "warpLicenseKey": "许可证密钥",
+            "warpCleanIp": "干净 IP",
+            "warpPort": "端口",
+            "warpNoise": "噪音",
+            "warpConsent": {
+                "title": "Cloudflare WARP 同意",
+                "description(rich)": "Cloudflare WARP 是免费的 WireGuard VPN 提供商。启用此选项即表示您同意 Cloudflare WARP 的 ${tos(服务条款)} 和 ${privacy(隐私政策)}"
+            }
         },
         "geoAssets": {
             "pageTitle": "路由资源文件",