diff options
| author | Unknwon <u@gogs.io> | 2015-10-18 19:30:39 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-10-18 19:30:39 -0400 |
| commit | fc7959d3bc89b172b3e0f2d0c5fcdcbb09e2408e (patch) | |
| tree | 23a861a3bccec2d8311067008ebd0771bee82858 /conf/locale | |
| parent | 4dc6285715ccd1e90cb4e437a3c2b1d0b13d47cb (diff) | |
| download | gitea-fc7959d3bc89b172b3e0f2d0c5fcdcbb09e2408e.tar.gz gitea-fc7959d3bc89b172b3e0f2d0c5fcdcbb09e2408e.zip | |
New/reopen PR checks if there is any unmerged and open PR
Diffstat (limited to 'conf/locale')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 1e9be1fd40..29d0b27882 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -502,6 +502,7 @@ pulls.can_auto_merge_desc = You can perform auto-merge operation on this pull re pulls.cannot_auto_merge_desc = You can't perform auto-merge operation because there are conflicts between commits. pulls.cannot_auto_merge_helper = Please use command line tool to solve it. 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.` milestones.new = New Milestone milestones.open_tab = %d Open |