Merge branch 'dev' into chore/i18n

# Conflicts: # src/locales/de.json # src/locales/en.json # src/locales/es.json # src/locales/jp.json # src/locales/ko.json # src/locales/tr.json # src/locales/zh.json # src/locales/zhtw.json # src/pages/_layout/notificationHandlers.ts
2025-11-02 20:21:46 +08:00
parent c29feb6bce 36d1a3878f
commit 36c5cfa450
17 changed files with 23 additions and 24 deletions
--- a/src/locales/ar.json
+++ b/src/locales/ar.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Last Check Update",
  "Click to import subscription": "Click to import subscription",
  "Unknown": "Unknown",
-  "Update failed, retrying with Clash proxy...": "Update failed, retrying with Clash proxy...",
  "Update with Clash proxy successfully": "Update with Clash proxy successfully",
  "Update failed even with Clash proxy": "Update failed even with Clash proxy",
  "Profile Imported with Clash proxy": "Profile Imported with Clash proxy",
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Letzte Aktualitätsprüfung",
  "Click to import subscription": "Klicken Sie hier, um ein Abonnement zu importieren.",
  "Unknown": "Unbekannt",
-  "Update failed, retrying with Clash proxy...": "Abonnement-Aktualisierung fehlgeschlagen. Versuche es mit dem Clash-Proxy erneut...",
  "Update with Clash proxy successfully": "Aktualisierung mit Clash-Proxy erfolgreich",
  "Update failed even with Clash proxy": "Aktualisierung auch mit Clash-Proxy fehlgeschlagen",
  "Profile Imported with Clash proxy": "Abonnement mit Clash-Proxy importiert",
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Last Check Update",
  "Click to import subscription": "Click to import subscription",
  "Unknown": "Unknown",
-  "Update failed, retrying with Clash proxy...": "Update failed, retrying with Clash proxy...",
  "Update with Clash proxy successfully": "Update with Clash proxy successfully",
  "Update failed even with Clash proxy": "Update failed even with Clash proxy",
  "Profile Imported with Clash proxy": "Profile Imported with Clash proxy",
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Última comprobación de actualizaciones",
  "Click to import subscription": "Haga clic para importar una suscripción",
  "Unknown": "Desconocido",
-  "Update failed, retrying with Clash proxy...": "Error al actualizar la suscripción. Intentando con el proxy de Clash...",
  "Update with Clash proxy successfully": "Actualización con el proxy de Clash exitosa",
  "Update failed even with Clash proxy": "Error al actualizar incluso con el proxy de Clash",
  "Profile Imported with Clash proxy": "Suscripción importada con el proxy de Clash",
--- a/src/locales/fa.json
+++ b/src/locales/fa.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Last Check Update",
  "Click to import subscription": "Click to import subscription",
  "Unknown": "Unknown",
-  "Update failed, retrying with Clash proxy...": "Update failed, retrying with Clash proxy...",
  "Update with Clash proxy successfully": "Update with Clash proxy successfully",
  "Update failed even with Clash proxy": "Update failed even with Clash proxy",
  "Profile Imported with Clash proxy": "Profile Imported with Clash proxy",
--- a/src/locales/id.json
+++ b/src/locales/id.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Last Check Update",
  "Click to import subscription": "Click to import subscription",
  "Unknown": "Unknown",
-  "Update failed, retrying with Clash proxy...": "Update failed, retrying with Clash proxy...",
  "Update with Clash proxy successfully": "Update with Clash proxy successfully",
  "Update failed even with Clash proxy": "Update failed even with Clash proxy",
  "Profile Imported with Clash proxy": "Profile Imported with Clash proxy",
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -388,7 +388,6 @@
  "Last Check Update": "最後の更新チェック",
  "Click to import subscription": "クリックしてサブスクリプションをインポート",
  "Unknown": "不明",
-  "Update failed, retrying with Clash proxy...": "サブスクリプションの更新に失敗しました。Clashプロキシを使用して再試行します...",
  "Update with Clash proxy successfully": "Clashプロキシを使用して更新に成功しました。",
  "Update failed even with Clash proxy": "Clashプロキシを使用しても更新に失敗しました。",
  "Profile Imported with Clash proxy": "Clashプロキシを使用してプロファイルのインポートに成功しました。",
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Last Check Update",
  "Click to import subscription": "Click to import subscription",
  "Unknown": "Unknown",
-  "Update failed, retrying with Clash proxy...": "업데이트 실패, Clash 프록시로 재시도 중...",
  "Update with Clash proxy successfully": "Clash 프록시로 업데이트 성공",
  "Update failed even with Clash proxy": "Clash 프록시로도 업데이트 실패",
  "Profile Imported with Clash proxy": "Profile Imported with Clash proxy",
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Последняя проверка обновлений",
  "Click to import subscription": "Нажмите, чтобы импортировать подписку",
  "Unknown": "Unknown",
-  "Update failed, retrying with Clash proxy...": "Update failed, retrying with Clash proxy...",
  "Update with Clash proxy successfully": "Update with Clash proxy successfully",
  "Update failed even with Clash proxy": "Update failed even with Clash proxy",
  "Profile Imported with Clash proxy": "Profile Imported with Clash proxy",
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Son Güncelleme Kontrolü",
  "Click to import subscription": "Abonelik içe aktarmak için tıklayın",
  "Unknown": "Bilinmiyor",
-  "Update failed, retrying with Clash proxy...": "Güncelleme başarısız oldu, Clash vekil ile yeniden deneniyor...",
  "Update with Clash proxy successfully": "Clash vekil ile güncelleme başarılı",
  "Update failed even with Clash proxy": "Clash vekil ile bile güncelleme başarısız oldu",
  "Profile Imported with Clash proxy": "Profil Clash vekil ile içe aktarıldı",
--- a/src/locales/tt.json
+++ b/src/locales/tt.json
@@ -388,7 +388,6 @@
  "Last Check Update": "Last Check Update",
  "Click to import subscription": "Click to import subscription",
  "Unknown": "Unknown",
-  "Update failed, retrying with Clash proxy...": "Update failed, retrying with Clash proxy...",
  "Update with Clash proxy successfully": "Update with Clash proxy successfully",
  "Update failed even with Clash proxy": "Update failed even with Clash proxy",
  "Profile Imported with Clash proxy": "Profile Imported with Clash proxy",
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -388,7 +388,6 @@
  "Last Check Update": "最后检查更新",
  "Click to import subscription": "点击导入订阅",
  "Unknown": "未知",
-  "Update failed, retrying with Clash proxy...": "订阅更新失败，尝试使用 Clash 代理更新",
  "Update with Clash proxy successfully": "使用 Clash 代理更新成功",
  "Update failed even with Clash proxy": "使用 Clash 代理更新也失败",
  "Profile Imported with Clash proxy": "使用 Clash 代理导入订阅成功",
--- a/src/locales/zhtw.json
+++ b/src/locales/zhtw.json
@@ -388,7 +388,6 @@
  "Last Check Update": "最後檢查更新",
  "Click to import subscription": "點擊匯入訂閱",
  "Unknown": "未知",
-  "Update failed, retrying with Clash proxy...": "訂閱更新失敗，嘗試使用 Clash 代理更新",
  "Update with Clash proxy successfully": "使用 Clash 代理更新成功",
  "Update failed even with Clash proxy": "使用 Clash 代理更新也失敗",
  "Profile Imported with Clash proxy": "使用 Clash 代理匯入訂閱成功",
--- a/src/pages/_layout/notificationHandlers.ts
+++ b/src/pages/_layout/notificationHandlers.ts
@@ -21,8 +21,6 @@ export const handleNoticeMessage = (
    "set_config::error": () => showNotice.error(msg),
    update_with_clash_proxy: () =>
      showNotice.success("Update with Clash proxy successfully", msg),
-    update_retry_with_clash: () =>
-      showNotice.info("Update failed, retrying with Clash proxy..."),
    update_failed_even_with_clash: () =>
      showNotice.error("Update failed even with Clash proxy", msg),
    update_failed: () => showNotice.error(msg),