aboutsummaryrefslogtreecommitdiff
path: root/conf/locale/locale_zh-TW.ini
diff options
context:
space:
mode:
Diffstat (limited to 'conf/locale/locale_zh-TW.ini')
-rw-r--r--conf/locale/locale_zh-TW.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/locale/locale_zh-TW.ini b/conf/locale/locale_zh-TW.ini
index 0c3c417e..f45b19da 100644
--- a/conf/locale/locale_zh-TW.ini
+++ b/conf/locale/locale_zh-TW.ini
@@ -616,6 +616,7 @@ pulls.compare_compare=對比文件變化
pulls.filter_branch=過濾分支
pulls.no_results=未找到結果
pulls.nothing_to_compare=基準和對比分支代碼已經同步,無需進行對比。
+pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history.
pulls.has_pull_request=`已經存在目標分支的合併請求:<a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
pulls.create=創建合併請求
pulls.title_desc=請求將 %[1]d 次代碼提交從 <code>%[2]s</code> 合併至 <code>%[3]s</code>
@@ -830,7 +831,7 @@ settings.recent_deliveries=最近推送記錄
settings.hook_type=鉤子類型
settings.add_slack_hook_desc=為您的倉庫增加 <a href="%s">Slack</a> 集成。
settings.add_discord_hook_desc=Hook <a href="%s">Discord</a> 到你的 repository。
-settings.add_dingtalk_hook_desc=Add <a href="%s">釘釘機器人</a> 到你的 repository.
+settings.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository.
settings.slack_token=令牌
settings.slack_domain=域名
settings.slack_channel=頻道