diff options
| author | GiteaBot <teabot@gitea.io> | 2020-01-11 10:51:31 +0000 |
|---|---|---|
| committer | GiteaBot <teabot@gitea.io> | 2020-01-11 10:51:31 +0000 |
| commit | f2e6c4538e83f267a1b1f2abaaf38cd99c6dd0a5 (patch) | |
| tree | ba9b06c0c6cdccc0c9b1ec11a2b6b227eed6b68f /options/locale/locale_zh-CN.ini | |
| parent | eadb45e8912c3cd1d3af7cdf17a3641201213a34 (diff) | |
| download | gitea-f2e6c4538e83f267a1b1f2abaaf38cd99c6dd0a5.tar.gz gitea-f2e6c4538e83f267a1b1f2abaaf38cd99c6dd0a5.zip | |
[skip ci] Updated translations via Crowdin
Diffstat (limited to 'options/locale/locale_zh-CN.ini')
| -rw-r--r-- | options/locale/locale_zh-CN.ini | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 00c8078754..ec00848dc5 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1061,7 +1061,6 @@ pulls.cannot_auto_merge_helper=手动合并解决此冲突 pulls.no_merge_desc=由于未启用合并选项，此合并请求无法被合并。 pulls.no_merge_helper=在仓库设置中启用合并选项或者手工合并请求。 pulls.no_merge_wip=这个合并请求无法合并，因为被标记为尚未完成的工作。 -pulls.no_merge_status_check=此合并请求不能合并，因为不是所有的状态检查都是成功的。 pulls.merge_pull_request=合并请求 pulls.rebase_merge_pull_request=变基并合并 pulls.rebase_merge_commit_pull_request=变基合并 (--no-ff) |