diff options
Diffstat (limited to 'options/locale/locale_zh-TW.ini')
| -rw-r--r-- | options/locale/locale_zh-TW.ini | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index 9562a15a6b..c74f10bc0e 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -1437,10 +1437,10 @@ pulls.no_merge_helper=在儲存庫設定啟用合併選項或手動合併該合 pulls.no_merge_wip=無法進行合併，因為它被標記為還在進行中。 pulls.no_merge_not_ready=此合併請求還沒準備好被合併，請檢查審核狀態和狀態檢查。 pulls.no_merge_access=您未被授權合併此合併請求。 -pulls.merge_pull_request=合併 -pulls.rebase_merge_pull_request=Rebase 後合併 -pulls.rebase_merge_commit_pull_request=Rebase 後合併 (--no-ff) -pulls.squash_merge_pull_request=Squash 後合併 +pulls.merge_pull_request=建立合併提交 +pulls.rebase_merge_pull_request=Rebase 後快轉 +pulls.rebase_merge_commit_pull_request=Rebase 後建立合併提交 +pulls.squash_merge_pull_request=建立 Squash 提交 pulls.merge_manually=手動合併 pulls.merge_commit_id=合併提交 ID pulls.require_signed_wont_sign=該分支需要經簽署的提交，但此合併將不會被簽署。 |