diff options
Diffstat (limited to 'i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json')
| -rw-r--r-- | i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json index a82efe04f8a..7e13d2e40eb 100644 --- a/i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json +++ b/i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json @@ -6,6 +6,7 @@ { "cursorNotInConflict": "編輯器游標不在衝突合併範圍之內", "compareChangesTitle": "{0}: 當前變更⟷來源變更", + "cursorOnCommonAncestorsRange": "編輯器游標在共同上階區塊內，請移動至「當前項目」或「來源項目」區塊", "cursorOnSplitterRange": "編輯器游標在衝突合併工具範圍內,請移動至\"當前項目\"或來源項目\"區塊", "noConflicts": "檔案內找不到需要合併衝突項目", "noOtherConflictsInThisFile": "此檔案內沒有其他的衝突合併項目" |