diff --git a/src/components/home/current-proxy-card.tsx b/src/components/home/current-proxy-card.tsx index 1e1f6cc9..c29db668 100644 --- a/src/components/home/current-proxy-card.tsx +++ b/src/components/home/current-proxy-card.tsx @@ -870,7 +870,7 @@ export const CurrentProxyCard = () => { sx={{ borderRadius: 1.5 }} endIcon={} > - {t("layout.navigation.tabs.proxies")} + {t("layout.components.navigation.tabs.proxies")} } diff --git a/src/components/home/home-profile-card.tsx b/src/components/home/home-profile-card.tsx index 5e8fbc0f..79336ae0 100644 --- a/src/components/home/home-profile-card.tsx +++ b/src/components/home/home-profile-card.tsx @@ -365,7 +365,7 @@ export const HomeProfileCard = ({ endIcon={} sx={{ borderRadius: 1.5 }} > - {t("layout.navigation.tabs.proxies")} + {t("layout.components.navigation.tabs.proxies")} ); }, [current, goToProfiles, t]); diff --git a/src/components/setting/mods/controller-viewer.tsx b/src/components/setting/mods/controller-viewer.tsx index 81491476..7b106759 100644 --- a/src/components/setting/mods/controller-viewer.tsx +++ b/src/components/setting/mods/controller-viewer.tsx @@ -75,11 +75,11 @@ export function ControllerViewer({ ref }: { ref?: Ref }) { await patchInfo({ "external-controller": "" }); } - showNotice.success("settings.feedback.notifications.common.saveSuccess"); + showNotice.success("shared.feedback.notifications.common.saveSuccess"); setOpen(false); } catch (err) { showNotice.error( - "settings.feedback.notifications.common.saveFailed", + "shared.feedback.notifications.common.saveFailed", err, 4000, ); diff --git a/src/components/setting/mods/external-controller-cors.tsx b/src/components/setting/mods/external-controller-cors.tsx index d7e042f5..b4ded7c4 100644 --- a/src/components/setting/mods/external-controller-cors.tsx +++ b/src/components/setting/mods/external-controller-cors.tsx @@ -141,11 +141,11 @@ export const HeaderConfiguration = forwardRef( onSuccess: () => { setOpen(false); showNotice.success( - "settings.feedback.notifications.common.saveSuccess", + "shared.feedback.notifications.common.saveSuccess", ); }, onError: () => { - showNotice.error("settings.feedback.notifications.common.saveFailed"); + showNotice.error("shared.feedback.notifications.common.saveFailed"); }, }, ); diff --git a/src/components/setting/mods/network-interface-viewer.tsx b/src/components/setting/mods/network-interface-viewer.tsx index e11893c8..fec78c0c 100644 --- a/src/components/setting/mods/network-interface-viewer.tsx +++ b/src/components/setting/mods/network-interface-viewer.tsx @@ -142,7 +142,7 @@ const AddressDisplay = ({ onClick={async () => { await writeText(content); showNotice.success( - "settings.feedback.notifications.common.copySuccess", + "shared.feedback.notifications.common.copySuccess", ); }} > diff --git a/src/components/setting/setting-verge-advanced.tsx b/src/components/setting/setting-verge-advanced.tsx index ea375f85..eb48af94 100644 --- a/src/components/setting/setting-verge-advanced.tsx +++ b/src/components/setting/setting-verge-advanced.tsx @@ -61,7 +61,7 @@ const SettingVergeAdvanced = ({ onError: _ }: Props) => { const onExportDiagnosticInfo = useCallback(async () => { await exportDiagnosticInfo(); showNotice.success( - "settings.feedback.notifications.common.copySuccess", + "shared.feedback.notifications.common.copySuccess", 1000, ); }, []); diff --git a/src/components/setting/setting-verge-basic.tsx b/src/components/setting/setting-verge-basic.tsx index dd05ab78..87064d04 100644 --- a/src/components/setting/setting-verge-basic.tsx +++ b/src/components/setting/setting-verge-basic.tsx @@ -77,7 +77,7 @@ const SettingVergeBasic = ({ onError }: Props) => { const onCopyClashEnv = useCallback(async () => { await copyClashEnv(); showNotice.success( - "settings.feedback.notifications.common.copySuccess", + "shared.feedback.notifications.common.copySuccess", 1000, ); }, []); diff --git a/src/locales/ar.json b/src/locales/ar.json index 19bd3e82..8531eb64 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -74,7 +74,12 @@ "importSuccess": "تم استيراد الملف الشخصي بنجاح", "importSubscriptionSuccess": "تم استيراد الاشتراك بنجاح", "importWithClashProxy": "Profile Imported with Clash proxy", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "تم النسخ بنجاح", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "تم تثبيت الخدمة بنجاح", "uninstallSuccess": "تم إلغاء تثبيت الخدمة بنجاح" }, - "common": { - "copySuccess": "تم النسخ بنجاح", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Update with Clash proxy successfully", "withClashProxyFailed": "Update failed even with Clash proxy" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Home", - "proxies": "الوكلاء", - "profiles": "الملفات الشخصية", - "connections": "الاتصالات", - "rules": "القواعد", - "logs": "السجلات", - "unlock": "Test", - "settings": "الإعدادات" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Home", + "proxies": "الوكلاء", + "profiles": "الملفات الشخصية", + "connections": "الاتصالات", + "rules": "القواعد", + "logs": "السجلات", + "unlock": "Test", + "settings": "الإعدادات" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/de.json b/src/locales/de.json index e0e60028..dba222cb 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -74,7 +74,12 @@ "importSuccess": "Abonnement erfolgreich importiert", "importSubscriptionSuccess": "Abonnement erfolgreich importiert", "importWithClashProxy": "Abonnement mit Clash-Proxy importiert", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "Kopieren erfolgreich", + "saveSuccess": "Zufalls-Konfiguration erfolgreich gespeichert", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Service erfolgreich installiert", "uninstallSuccess": "Service erfolgreich deinstalliert" }, - "common": { - "copySuccess": "Kopieren erfolgreich", - "saveSuccess": "Zufalls-Konfiguration erfolgreich gespeichert", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Aktualisierung mit Clash-Proxy erfolgreich", "withClashProxyFailed": "Aktualisierung auch mit Clash-Proxy fehlgeschlagen" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Startseite", - "proxies": "Proxy", - "profiles": "Abonnement", - "connections": "Verbindungen", - "rules": "Regeln", - "logs": "Protokolle", - "unlock": "Testen", - "settings": "Einstellungen" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Startseite", + "proxies": "Proxy", + "profiles": "Abonnement", + "connections": "Verbindungen", + "rules": "Regeln", + "logs": "Protokolle", + "unlock": "Testen", + "settings": "Einstellungen" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/en.json b/src/locales/en.json index 45310811..3a5ddf55 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -74,7 +74,12 @@ "importSuccess": "Profile Imported Successfully", "importSubscriptionSuccess": "Import subscription successful", "importWithClashProxy": "Profile Imported with Clash proxy", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "Copy Success", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Service Installed Successfully", "uninstallSuccess": "Service Uninstalled Successfully" }, - "common": { - "copySuccess": "Copy Success", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Update with Clash proxy successfully", "withClashProxyFailed": "Update failed even with Clash proxy" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Home", - "proxies": "Proxies", - "profiles": "Profiles", - "connections": "Connections", - "rules": "Rules", - "logs": "Logs", - "unlock": "Test", - "settings": "Settings" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Home", + "proxies": "Proxies", + "profiles": "Profiles", + "connections": "Connections", + "rules": "Rules", + "logs": "Logs", + "unlock": "Test", + "settings": "Settings" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/es.json b/src/locales/es.json index 27f8a96d..f1ca4a9d 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -74,7 +74,12 @@ "importSuccess": "Suscripción importada con éxito", "importSubscriptionSuccess": "Suscripción importada con éxito", "importWithClashProxy": "Suscripción importada con el proxy de Clash", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "Copia exitosa", + "saveSuccess": "Configuración aleatoria guardada correctamente", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Servicio instalado con éxito", "uninstallSuccess": "Servicio desinstalado con éxito" }, - "common": { - "copySuccess": "Copia exitosa", - "saveSuccess": "Configuración aleatoria guardada correctamente", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Actualización con el proxy de Clash exitosa", "withClashProxyFailed": "Error al actualizar incluso con el proxy de Clash" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Hogar", - "proxies": "Proxies", - "profiles": "Perfiles", - "connections": "Conexiones", - "rules": "Normas", - "logs": "Registros", - "unlock": "Descubrir", - "settings": "Ajustes" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Hogar", + "proxies": "Proxies", + "profiles": "Perfiles", + "connections": "Conexiones", + "rules": "Normas", + "logs": "Registros", + "unlock": "Descubrir", + "settings": "Ajustes" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/fa.json b/src/locales/fa.json index 0e0b6434..b56241b0 100644 --- a/src/locales/fa.json +++ b/src/locales/fa.json @@ -74,7 +74,12 @@ "importSuccess": "پروفایل با موفقیت وارد شد", "importSubscriptionSuccess": "وارد کردن اشتراک با موفقیت انجام شد", "importWithClashProxy": "Profile Imported with Clash proxy", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "کپی با موفقیت انجام شد", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "سرویس با موفقیت نصب شد", "uninstallSuccess": "سرویس با موفقیت حذف نصب شد" }, - "common": { - "copySuccess": "کپی با موفقیت انجام شد", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Update with Clash proxy successfully", "withClashProxyFailed": "Update failed even with Clash proxy" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Home", - "proxies": "پراکسی‌ها", - "profiles": "پروفایل‌ها", - "connections": "اتصالات", - "rules": "قوانین", - "logs": "لاگ‌ها", - "unlock": "Test", - "settings": "تنظیمات" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Home", + "proxies": "پراکسی‌ها", + "profiles": "پروفایل‌ها", + "connections": "اتصالات", + "rules": "قوانین", + "logs": "لاگ‌ها", + "unlock": "Test", + "settings": "تنظیمات" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/id.json b/src/locales/id.json index 29ac39bb..56d9c934 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -74,7 +74,12 @@ "importSuccess": "Profil Berhasil Diimpor", "importSubscriptionSuccess": "Berlangganan Berhasil Diimpor", "importWithClashProxy": "Profile Imported with Clash proxy", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "Salin Berhasil", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Layanan Berhasil Diinstal", "uninstallSuccess": "Layanan Berhasil Dicopot" }, - "common": { - "copySuccess": "Salin Berhasil", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Update with Clash proxy successfully", "withClashProxyFailed": "Update failed even with Clash proxy" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Home", - "proxies": "Proksi", - "profiles": "Profil", - "connections": "Koneksi", - "rules": "Aturan", - "logs": "Log", - "unlock": "Test", - "settings": "Pengaturan" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Home", + "proxies": "Proksi", + "profiles": "Profil", + "connections": "Koneksi", + "rules": "Aturan", + "logs": "Log", + "unlock": "Test", + "settings": "Pengaturan" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/jp.json b/src/locales/jp.json index 3fb98352..c9164cbc 100644 --- a/src/locales/jp.json +++ b/src/locales/jp.json @@ -74,7 +74,12 @@ "importSuccess": "プロファイルのインポートに成功しました。", "importSubscriptionSuccess": "サブスクリプションのインポートに成功しました。", "importWithClashProxy": "Clashプロキシを使用してプロファイルのインポートに成功しました。", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "コピー成功", + "saveSuccess": "ランダム設定を保存完了", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "サービスのインストールに成功しました。", "uninstallSuccess": "サービスのアンインストールに成功しました。" }, - "common": { - "copySuccess": "コピー成功", - "saveSuccess": "ランダム設定を保存完了", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Clashプロキシを使用して更新に成功しました。", "withClashProxyFailed": "Clashプロキシを使用しても更新に失敗しました。" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "ホーム", - "proxies": "プロキシ", - "profiles": "プロファイル", - "connections": "接続", - "rules": "ルール", - "logs": "ログ", - "unlock": "テスト", - "settings": "設定" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "ホーム", + "proxies": "プロキシ", + "profiles": "プロファイル", + "connections": "接続", + "rules": "ルール", + "logs": "ログ", + "unlock": "テスト", + "settings": "設定" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/ko.json b/src/locales/ko.json index 127135c5..fc17b63a 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -74,7 +74,12 @@ "importSuccess": "Profile Imported Successfully", "importSubscriptionSuccess": "구독 가져오기 성공", "importWithClashProxy": "Profile Imported with Clash proxy", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "복사 성공", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Service Installed Successfully", "uninstallSuccess": "Service Uninstalled Successfully" }, - "common": { - "copySuccess": "복사 성공", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Clash 프록시로 업데이트 성공", "withClashProxyFailed": "Clash 프록시로도 업데이트 실패" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "홈", - "proxies": "프록시", - "profiles": "프로필", - "connections": "연결", - "rules": "규칙", - "logs": "로그", - "unlock": "테스트", - "settings": "설정" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "홈", + "proxies": "프록시", + "profiles": "프로필", + "connections": "연결", + "rules": "규칙", + "logs": "로그", + "unlock": "테스트", + "settings": "설정" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/ru.json b/src/locales/ru.json index b6ba4c09..c6bc6d5f 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -74,7 +74,12 @@ "importSuccess": "Профиль успешно импортирован", "importSubscriptionSuccess": "Подписка успешно импортирована", "importWithClashProxy": "Profile Imported with Clash proxy", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "Скопировано", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Служба успешно установлена", "uninstallSuccess": "Служба успешно удалена" }, - "common": { - "copySuccess": "Скопировано", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Update with Clash proxy successfully", "withClashProxyFailed": "Update failed even with Clash proxy" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Главная", - "proxies": "Прокси", - "profiles": "Профили", - "connections": "Соединения", - "rules": "Правила", - "logs": "Логи", - "unlock": "Тест", - "settings": "Настройки" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Главная", + "proxies": "Прокси", + "profiles": "Профили", + "connections": "Соединения", + "rules": "Правила", + "logs": "Логи", + "unlock": "Тест", + "settings": "Настройки" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/tr.json b/src/locales/tr.json index 97fff019..40b7e265 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -74,7 +74,12 @@ "importSuccess": "Profil Başarıyla İçe Aktarıldı", "importSubscriptionSuccess": "Abonelik içe aktarımı başarılı", "importWithClashProxy": "Profil Clash vekil ile içe aktarıldı", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "Kopyalama Başarılı", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Hizmet Başarıyla Kuruldu", "uninstallSuccess": "Hizmet Başarıyla Kaldırıldı" }, - "common": { - "copySuccess": "Kopyalama Başarılı", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Clash vekil ile güncelleme başarılı", "withClashProxyFailed": "Clash vekil ile bile güncelleme başarısız oldu" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Ana Sayfa", - "proxies": "Vekil'ler", - "profiles": "Profiller", - "connections": "Bağlantılar", - "rules": "Kurallar", - "logs": "Günlükler", - "unlock": "Test", - "settings": "Ayarlar" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Ana Sayfa", + "proxies": "Vekil'ler", + "profiles": "Profiller", + "connections": "Bağlantılar", + "rules": "Kurallar", + "logs": "Günlükler", + "unlock": "Test", + "settings": "Ayarlar" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/tt.json b/src/locales/tt.json index 3dbf3d71..4dcbd284 100644 --- a/src/locales/tt.json +++ b/src/locales/tt.json @@ -74,7 +74,12 @@ "importSuccess": "Профиль уңышлы импортланды", "importSubscriptionSuccess": "Import subscription successful", "importWithClashProxy": "Profile Imported with Clash proxy", - "saved": "Saved successfully" + "saved": "Saved successfully", + "common": { + "copySuccess": "Күчерелде", + "saveSuccess": "Configuration saved successfully", + "saveFailed": "Failed to save configuration" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "Сервис уңышлы урнаштырылды", "uninstallSuccess": "Сервис уңышлы салдырылды" }, - "common": { - "copySuccess": "Күчерелде", - "saveSuccess": "Configuration saved successfully", - "saveFailed": "Failed to save configuration" - }, "updater": { "withClashProxySuccess": "Update with Clash proxy successfully", "withClashProxyFailed": "Update failed even with Clash proxy" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "Home", - "proxies": "Прокси", - "profiles": "Профильләр", - "connections": "Тоташулар", - "rules": "Кагыйдәләр", - "logs": "Логлар", - "unlock": "Test", - "settings": "Көйләүләр" - }, - "menu": { - "reorderMode": "Menu reorder mode", - "unlock": "Unlock menu order", - "lock": "Lock menu order" + "components": { + "navigation": { + "tabs": { + "home": "Home", + "proxies": "Прокси", + "profiles": "Профильләр", + "connections": "Тоташулар", + "rules": "Кагыйдәләр", + "logs": "Логлар", + "unlock": "Test", + "settings": "Көйләүләр" + }, + "menu": { + "reorderMode": "Menu reorder mode", + "unlock": "Unlock menu order", + "lock": "Lock menu order" + } } } } diff --git a/src/locales/zh.json b/src/locales/zh.json index 30f444df..2a49f04e 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -74,7 +74,12 @@ "importSuccess": "导入订阅成功", "importSubscriptionSuccess": "导入订阅成功", "importWithClashProxy": "使用 Clash 代理导入订阅成功", - "saved": "保存成功" + "saved": "保存成功", + "common": { + "copySuccess": "复制成功", + "saveSuccess": "配置保存成功", + "saveFailed": "配置保存失败" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "已成功安装服务", "uninstallSuccess": "已成功卸载服务" }, - "common": { - "copySuccess": "复制成功", - "saveSuccess": "配置保存成功", - "saveFailed": "配置保存失败" - }, "updater": { "withClashProxySuccess": "使用 Clash 代理更新成功", "withClashProxyFailed": "使用 Clash 代理更新也失败" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "首 页", - "proxies": "代 理", - "profiles": "订 阅", - "connections": "连 接", - "rules": "规 则", - "logs": "日 志", - "unlock": "测 试", - "settings": "设 置" - }, - "menu": { - "reorderMode": "菜单排序模式", - "unlock": "解锁菜单排序", - "lock": "锁定菜单排序" + "components": { + "navigation": { + "tabs": { + "home": "首 页", + "proxies": "代 理", + "profiles": "订 阅", + "connections": "连 接", + "rules": "规 则", + "logs": "日 志", + "unlock": "测 试", + "settings": "设 置" + }, + "menu": { + "reorderMode": "菜单排序模式", + "unlock": "解锁菜单排序", + "lock": "锁定菜单排序" + } } } } diff --git a/src/locales/zhtw.json b/src/locales/zhtw.json index e2c85705..5ab35a1c 100644 --- a/src/locales/zhtw.json +++ b/src/locales/zhtw.json @@ -74,7 +74,12 @@ "importSuccess": "匯入設定檔成功", "importSubscriptionSuccess": "匯入訂閱成功", "importWithClashProxy": "使用 Clash 代理匯入訂閱成功", - "saved": "儲存成功" + "saved": "儲存成功", + "common": { + "copySuccess": "複製成功", + "saveSuccess": "設定儲存完成", + "saveFailed": "設定儲存失敗" + } }, "validation": { "config": { @@ -1306,11 +1311,6 @@ "installSuccess": "已成功安裝服務", "uninstallSuccess": "已成功解除安裝服務" }, - "common": { - "copySuccess": "複製成功", - "saveSuccess": "設定儲存完成", - "saveFailed": "設定儲存失敗" - }, "updater": { "withClashProxySuccess": "使用 Clash 代理更新成功", "withClashProxyFailed": "使用 Clash 代理更新也失敗" @@ -1329,21 +1329,23 @@ } }, "layout": { - "navigation": { - "tabs": { - "home": "首 頁", - "proxies": "代 理", - "profiles": "訂 閱", - "connections": "連 線", - "rules": "規 則", - "logs": "日 誌", - "unlock": "解 鎖", - "settings": "設 定" - }, - "menu": { - "reorderMode": "選單排序模式", - "unlock": "解鎖選單排序", - "lock": "鎖定選單排序" + "components": { + "navigation": { + "tabs": { + "home": "首 頁", + "proxies": "代 理", + "profiles": "訂 閱", + "connections": "連 線", + "rules": "規 則", + "logs": "日 誌", + "unlock": "解 鎖", + "settings": "設 定" + }, + "menu": { + "reorderMode": "選單排序模式", + "unlock": "解鎖選單排序", + "lock": "鎖定選單排序" + } } } } diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx index 15e912f1..73ff968a 100644 --- a/src/pages/_layout.tsx +++ b/src/pages/_layout.tsx @@ -437,7 +437,7 @@ const Layout = () => { : theme.palette.warning.dark, })} > - {t("layout.navigation.menu.reorderMode")} + {t("layout.components.navigation.menu.reorderMode")} )} @@ -515,8 +515,8 @@ const Layout = () => { dense > {menuUnlocked - ? t("layout.navigation.menu.lock") - : t("layout.navigation.menu.unlock")} + ? t("layout.components.navigation.menu.lock") + : t("layout.components.navigation.menu.unlock")} diff --git a/src/pages/_routers.tsx b/src/pages/_routers.tsx index 876c7b7c..49ffad67 100644 --- a/src/pages/_routers.tsx +++ b/src/pages/_routers.tsx @@ -29,49 +29,49 @@ import UnlockPage from "./unlock"; export const navItems = [ { - label: "layout.navigation.tabs.home", + label: "layout.components.navigation.tabs.home", path: "/", icon: [, ], Component: HomePage, }, { - label: "layout.navigation.tabs.proxies", + label: "layout.components.navigation.tabs.proxies", path: "/proxies", icon: [, ], Component: ProxiesPage, }, { - label: "layout.navigation.tabs.profiles", + label: "layout.components.navigation.tabs.profiles", path: "/profile", icon: [, ], Component: ProfilesPage, }, { - label: "layout.navigation.tabs.connections", + label: "layout.components.navigation.tabs.connections", path: "/connections", icon: [, ], Component: ConnectionsPage, }, { - label: "layout.navigation.tabs.rules", + label: "layout.components.navigation.tabs.rules", path: "/rules", icon: [, ], Component: RulesPage, }, { - label: "layout.navigation.tabs.logs", + label: "layout.components.navigation.tabs.logs", path: "/logs", icon: [, ], Component: LogsPage, }, { - label: "layout.navigation.tabs.unlock", + label: "layout.components.navigation.tabs.unlock", path: "/unlock", icon: [, ], Component: UnlockPage, }, { - label: "layout.navigation.tabs.settings", + label: "layout.components.navigation.tabs.settings", path: "/settings", icon: [, ], Component: SettingsPage,