From ef64395dd4e19a4a0604f1b6482e3fb7e35218fe Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Sun, 28 Sep 2025 02:57:43 +0800
Subject: [PATCH] Resolve conflict

---
 Assets/Translations/{zh.json => zh-CN.json} | 23 +++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
 rename Assets/Translations/{zh.json => zh-CN.json} (98%)

diff --git a/Assets/Translations/zh.json b/Assets/Translations/zh-CN.json
similarity index 98%
rename from Assets/Translations/zh.json
rename to Assets/Translations/zh-CN.json
index a8ea265d..c96f191c 100644
--- a/Assets/Translations/zh.json
+++ b/Assets/Translations/zh-CN.json
@@ -168,10 +168,25 @@
           "description": "调整亮度变化的步长（滚轮和键盘快捷键）。"
         }
       },
-      "night-light": {
-        "section": {
-          "label": "夜灯",
-          "description": "减少蓝光发射，帮助您更好地睡眠并减轻眼睛疲劳。"
+      "color-scheme": {
+        "title": "配色方案",
+        "color-source": {
+          "section": {
+            "label": "颜色来源",
+            "description": "Noctalia 颜色的主要设置。"
+          },
+          "dark-mode": {
+            "label": "深色模式",
+            "description": "切换到更暗的主题，便于夜间观看。"
+          },
+          "enable-matugen": {
+            "label": "启用 Matugen",
+            "description": "根据您的活动壁纸自动生成颜色。"
+          },
+          "matugen-scheme-type": {
+            "label": "Matugen 配色方案类型",
+            "description": "为 Matugen 选择配色方案生成算法。"
+          }
         },
         "enable": {
           "label": "启用夜灯",