From 00b58ed587450dbc2e6db86d7ddc710e86784fc6 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 31 May 2025 20:00:26 +0900
Subject: [PATCH] New translations ja-jp.yml (Chinese Simplified)

---
 locales/zh-CN.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index e915168bc7..f9e910c070 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1330,6 +1330,7 @@ restore: "恢复"
 syncBetweenDevices: "设备间同步"
 preferenceSyncConflictTitle: "服务器上已存在设定值"
 preferenceSyncConflictText: "服务器上已有此设置的设定值。要覆盖哪个设定值？"
+preferenceSyncConflictChoiceMerge: "合并"
 preferenceSyncConflictChoiceServer: "服务器上的设定值"
 preferenceSyncConflictChoiceDevice: "设备上的设定值"
 preferenceSyncConflictChoiceCancel: "取消同步"