i18n: add config merge error message

Add translation for config file merge error handling.
2025-11-22 18:06:25 +08:00
parent d4cd8105d1
commit 4acd48adc9
2 changed files with 4 additions and 2 deletions
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -758,7 +758,8 @@
    "configEmbedded": "Embedded Config",
    "configRemote": "Remote Config",
    "configDetails": "Config Details",
-    "configUrl": "Config File URL"
+    "configUrl": "Config File URL",
+    "configMergeError": "Failed to merge configuration file"
  },
  "iconPicker": {
    "search": "Search Icons",
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -758,7 +758,8 @@
    "configEmbedded": "内嵌配置",
    "configRemote": "远程配置",
    "configDetails": "配置详情",
-    "configUrl": "配置文件 URL"
+    "configUrl": "配置文件 URL",
+    "configMergeError": "合并配置文件失败"
  },
  "iconPicker": {
    "search": "搜索图标",