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

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

diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 41988ebe2d..e4d7d69e46 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1330,6 +1330,7 @@ restore: "還原"
 syncBetweenDevices: "裝置之間的同步化"
 preferenceSyncConflictTitle: "伺服器上存在設定值"
 preferenceSyncConflictText: "已啟用同步的設定項目會將設定值儲存至伺服器，並已找到該設定項目在伺服器上儲存的設定值。請選擇要使用哪個設定值進行覆寫。"
+preferenceSyncConflictChoiceMerge: "合併至"
 preferenceSyncConflictChoiceServer: "伺服器設定值"
 preferenceSyncConflictChoiceDevice: "裝置的設定值"
 preferenceSyncConflictChoiceCancel: "取消啟用同步"