Merge branch 'main' into main

2024-02-04 20:59:08 +08:00
parent 19e22c036a 0ce01bf60d
commit 9da1e680c2
25 changed files with 612 additions and 238 deletions
--- a/assets/translations/strings_en.i18n.json
+++ b/assets/translations/strings_en.i18n.json
@@ -11,7 +11,10 @@
        },
        "sort": "Sort",
        "sortBy": "Sort by",
-        "addToClipboard": "Add to clipboard"
+        "addToClipboard": "Add to clipboard",
+        "notSet": "Not Set",
+        "agree": "Agree",
+        "decline": "Decline"
    },
    "intro": {
        "termsAndPolicyCaution(rich)": "by continuing you agree with ${tap(@:about.termsAndConditions)}",
@@ -204,8 +207,13 @@
                "mux": "Multiplexer",
                "outbound": "Outbound Options",
                "tlsTricks": "TLS Tricks",
+                "warp": "WARP Options",
                "misc": "Misc Options"
            },
+            "warpConsent": {
+                "title": "Cloudflare WARP Consent",
+                "description(rich)": "Cloudflare WARP is a free WireGuard VPN provider. By enabling this option you are agreeing to the Cloudflare WARP's ${tos(Terms of Service)} and ${privacy(Privacy Policy)}."
+            },
            "pageTitle": "Config Options",
            "logLevel": "Log Level",
            "resolveDestination": "Resolve Destination",
@@ -243,7 +251,17 @@
            "tlsPaddingSize": "TLS Padding",
            "enableMux": "Enable Mux",
            "muxProtocol": "Mux Protocol",
-            "muxMaxStreams": "Max Concurrent Streams"
+            "muxMaxStreams": "Max Concurrent Streams",
+            "enableWarp": "Enable WARP",
+            "warpDetourMode": "Detour Mode",
+            "warpDetourModes": {
+                "inbound": "Detour WARP through proxies",
+                "outbound": "Detour proxies through WARP"
+            },
+            "warpLicenseKey": "License Key",
+            "warpCleanIp": "Clean IP",
+            "warpPort": "Port",
+            "warpNoise": "Noise"
        },
        "geoAssets": {
            "pageTitle": "Routing Assets",
--- a/assets/translations/strings_es.i18n.json
+++ b/assets/translations/strings_es.i18n.json
@@ -11,7 +11,10 @@
        },
        "sort": "Clasificar",
        "sortBy": "Ordenar por",
-        "addToClipboard": "Añadir al portapapeles"
+        "addToClipboard": "Añadir al portapapeles",
+        "notSet": "No establecido",
+        "agree": "Aceptar",
+        "decline": "Rechazar"
    },
    "intro": {
        "termsAndPolicyCaution(rich)": "al continuar, aceptas ${tap(@:about.termsAndConditions)}",
@@ -204,6 +207,7 @@
                "mux": "Multiplexer",
                "outbound": "Opciones de salida",
                "tlsTricks": "Trucos TLS",
+                "warp": "WARP Options",
                "misc": "Opciones varias"
            },
            "pageTitle": "Opciones de configuración",
@@ -243,7 +247,21 @@
            "tlsPaddingSize": "Relleno TLS",
            "enableMux": "Enable Mux",
            "muxProtocol": "Mux Protocol",
-            "muxMaxStreams": "Max Concurrent Streams"
+            "muxMaxStreams": "Max Concurrent Streams",
+            "enableWarp": "Enable WARP",
+            "warpDetourMode": "Detour Mode",
+            "warpDetourModes": {
+                "inbound": "Detour WARP through proxies",
+                "outbound": "Detour proxies through WARP"
+            },
+            "warpLicenseKey": "License Key",
+            "warpCleanIp": "Clean IP",
+            "warpPort": "Port",
+            "warpNoise": "Noise",
+            "warpConsent": {
+                "title": "Consentimiento WARP de Cloudflare",
+                "description(rich)": "Cloudflare WARP es un proveedor de VPN WireGuard gratuito. Al habilitar esta opción, acepta los ${tos(Términos de servicio)} y ${privacy(Política de privacidad)} de Cloudflare WARP."
+            }
        },
        "geoAssets": {
            "pageTitle": "Activos de enrutamiento",
--- a/assets/translations/strings_fa.i18n.json
+++ b/assets/translations/strings_fa.i18n.json
@@ -11,7 +11,10 @@
        },
        "sort": "مرتب‌سازی",
        "sortBy": "مرتب‌سازی براساس",
-        "addToClipboard": "به کلیپ بورد اضافه کنید"
+        "addToClipboard": "به کلیپ بورد اضافه کنید",
+        "notSet": "تنظیم نشده",
+        "agree": "موافق",
+        "decline": "کاهش می یابد"
    },
    "intro": {
        "termsAndPolicyCaution(rich)": "در صورت ادامه با ${tap(@:about.termsAndConditions)} موافقت میکنید",
@@ -204,6 +207,7 @@
                "mux": "Multiplexer",
                "outbound": "Outbound Options",
                "tlsTricks": "TLS Tricks",
+                "warp": "WARP Options",
                "misc": "تنظیمات متفرقه"
            },
            "pageTitle": "تنظیمات کانفیگ",
@@ -243,7 +247,21 @@
            "tlsPaddingSize": "TLS Padding",
            "enableMux": "Enable Mux",
            "muxProtocol": "Mux Protocol",
-            "muxMaxStreams": "Max Concurrent Streams"
+            "muxMaxStreams": "Max Concurrent Streams",
+            "enableWarp": "Enable WARP",
+            "warpDetourMode": "Detour Mode",
+            "warpDetourModes": {
+                "inbound": "Detour WARP through proxies",
+                "outbound": "Detour proxies through WARP"
+            },
+            "warpLicenseKey": "License Key",
+            "warpCleanIp": "Clean IP",
+            "warpPort": "Port",
+            "warpNoise": "Noise",
+            "warpConsent": {
+                "title": "رضایت Cloudflare WARP",
+                "description(rich)": "Cloudflare WARP یک ارائه دهنده رایگان WireGuard VPN است. با فعال کردن این گزینه، با ${tos(شرایط خدمات)} و ${privacy(خط‌مشی رازداری)} Cloudflare WARP موافقت می‌کنید."
+            }
        },
        "geoAssets": {
            "pageTitle": "فایل‌های مسیریابی",
--- a/assets/translations/strings_ru.i18n.json
+++ b/assets/translations/strings_ru.i18n.json
@@ -11,7 +11,10 @@
        },
        "sort": "Сортировка",
        "sortBy": "Сортировка",
-        "addToClipboard": "Копировать в буфер обмена"
+        "addToClipboard": "Копировать в буфер обмена",
+        "notSet": "Не задано",
+        "agree": "Соглашаться",
+        "decline": "Отклонить"
    },
    "intro": {
        "termsAndPolicyCaution(rich)": "Продолжая, Вы соглашаетесь с ${tap(@:about.termsAndConditions)}",
@@ -204,6 +207,7 @@
                "mux": "Multiplexer",
                "outbound": "Outbound Options",
                "tlsTricks": "TLS Tricks",
+                "warp": "WARP Options",
                "misc": "Разные параметры"
            },
            "pageTitle": "Параметры конфигурации",
@@ -243,7 +247,21 @@
            "tlsPaddingSize": "TLS Padding",
            "enableMux": "Enable Mux",
            "muxProtocol": "Mux Protocol",
-            "muxMaxStreams": "Max Concurrent Streams"
+            "muxMaxStreams": "Max Concurrent Streams",
+            "enableWarp": "Enable WARP",
+            "warpDetourMode": "Detour Mode",
+            "warpDetourModes": {
+                "inbound": "Detour WARP through proxies",
+                "outbound": "Detour proxies through WARP"
+            },
+            "warpLicenseKey": "License Key",
+            "warpCleanIp": "Clean IP",
+            "warpPort": "Port",
+            "warpNoise": "Noise",
+            "warpConsent": {
+                "title": "Согласие Cloudflare WARP",
+                "description(rich)": "Cloudflare WARP — бесплатный провайдер WireGuard VPN. Включая эту опцию, вы соглашаетесь с ${tos(Условиями обслуживания)} и ${privacy(Политикой конфиденциальности)} Cloudflare WARP."
+            }
        },
        "geoAssets": {
            "pageTitle": "Активы маршрутизации",
--- a/assets/translations/strings_tr.i18n.json
+++ b/assets/translations/strings_tr.i18n.json
@@ -11,7 +11,10 @@
        },
        "sort": "Sırala",
        "sortBy": "Sırala",
-        "addToClipboard": "Panoya ekle"
+        "addToClipboard": "Panoya ekle",
+        "notSet": "Ayarlanmadı",
+        "agree": "Kabul etmek",
+        "decline": "Reddetmek"
    },
    "intro": {
        "termsAndPolicyCaution(rich)": "devam ederek ${tap(@:about.termsAndConditions)} kabul etmiş olursunuz",
@@ -204,6 +207,7 @@
                "mux": "Multiplexer",
                "outbound": "Outbound Options",
                "tlsTricks": "TLS Tricks",
+                "warp": "WARP Options",
                "misc": "Çeşitli Seçenekler"
            },
            "pageTitle": "Yapılandırma Seçenekleri",
@@ -243,7 +247,21 @@
            "tlsPaddingSize": "TLS Padding",
            "enableMux": "Enable Mux",
            "muxProtocol": "Mux Protocol",
-            "muxMaxStreams": "Max Concurrent Streams"
+            "muxMaxStreams": "Max Concurrent Streams",
+            "enableWarp": "Enable WARP",
+            "warpDetourMode": "Detour Mode",
+            "warpDetourModes": {
+                "inbound": "Detour WARP through proxies",
+                "outbound": "Detour proxies through WARP"
+            },
+            "warpLicenseKey": "License Key",
+            "warpCleanIp": "Clean IP",
+            "warpPort": "Port",
+            "warpNoise": "Noise",
+            "warpConsent": {
+                "title": "Cloudflare WARP Onayı",
+                "description(rich)": "Cloudflare WARP ücretsiz bir WireGuard VPN sağlayıcısıdır. Bu seçeneği etkinleştirerek Cloudflare WARP'ın ${tos(Hizmet Şartları)} ve ${privacy(Gizlilik Politikası)}'nı kabul etmiş olursunuz."
+            }
        },
        "geoAssets": {
            "pageTitle": "Varlıkları Yönlendirme",
--- a/assets/translations/strings_zh-CN.i18n.json
+++ b/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": "路由资源文件",