tyler.durden
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2139 from angus-g/fixes/pr-messages 

Reword messages for PR auto merging (#2117)
This commit is contained in:
Unknwon 2015-12-09 17:31:46 -05:00
parent 1b0ef0ec0b 626dc1f0bd
commit bd5dc626e8
2 changed files with 699 additions and 916 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/locale/locale_en-US.ini
View File

@ -510,9 +510,9 @@ pulls.merged = Merged
pulls.has_merged = This pull request has been merged successfully! pulls.has_merged = This pull request has been merged successfully!
pulls.data_broken = Data of this pull request has been broken due to deletion of fork information. pulls.data_broken = Data of this pull request has been broken due to deletion of fork information.
pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments. pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments.
pulls.can_auto_merge_desc = You can perform auto-merge operation on this pull request. pulls.can_auto_merge_desc = This pull request can be merged automatically.
pulls.cannot_auto_merge_desc = You can't perform auto-merge operation because there are conflicts between commits. pulls.cannot_auto_merge_desc = This pull request can't be merged automatically because there are conflicts.
pulls.cannot_auto_merge_helper = Please use command line tool to solve it. pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
pulls.merge_pull_request = Merge Pull Request pulls.merge_pull_request = Merge Pull Request
pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.` pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`

1609
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long