diff options
| author | Unknwon <u@gogs.io> | 2016-12-21 00:49:44 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-12-21 00:49:44 -0500 |
| commit | 44ed991726fa9290088c1ba6ed48f18d34116536 (patch) | |
| tree | 663e43976a83e5215faca312d2c053bc5d0d1e32 /conf/locale | |
| parent | 34b92cdb440e175884b45df7197a65b086ff0eac (diff) | |
| parent | 73fedc727538381d4e1048ee03be6b45e977a076 (diff) | |
Merge branch 'develop' of https://github.com/tanapoln/gogs into develop
Diffstat (limited to 'conf/locale')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 90f6c60e..98b4cc6f 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -580,6 +580,8 @@ pulls.cannot_auto_merge_desc = This pull request can't be merged automatically b pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts. 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.delete_branch = Delete Branch +pulls.delete_branch_has_new_commits = Branch cannot be deleted because it has new commits after mergence. milestones.new = New Milestone milestones.open_tab = %d Open |