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: "取消同步"