tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-13 13:08:19 +00:00
Code Releases Activity

[skip ci] Updated translations via Crowdin

Browse Source
This commit is contained in:
GiteaBot
2019-11-19 23:06:30 +00:00
parent c57edb6c7b
commit 4a357f4188
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
options/locale/locale_zh-CN.ini
View File

@@ -1037,7 +1037,6 @@ pulls.rebase_merge_commit_pull_request=变基合并 (--no-ff)
pulls.squash_merge_pull_request=压缩提交并合并
pulls.invalid_merge_option=你可以在此合并请求中使用合并选项。
pulls.merge_conflict=合并失败：合并时发生冲突：%[1]s<br>[2]<br> 提示：尝试不同的合并策略
pulls.rebase_conflict=合并失败：Rebase合并时发生冲突：%[1]s<br>[2]<br> 提示：尝试不同的合并策略
pulls.unrelated_histories=合并失败：两个分支没有共同历史。提示：尝试不同的策略
pulls.merge_out_of_date=合并失败：在生成合并时，主分支已更新。提示：再试一次。
pulls.open_unmerged_pull_exists=`您不能执行重新打开操作, 因为已经存在相同的合并请求 (#%d)。`