summaryrefslogtreecommitdiffstats
path: root/options/locale
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2016-12-25 23:27:25 +0800
committerGitHub <noreply@github.com>2016-12-25 23:27:25 +0800
commit4b7594d9fa0da67cbc8df74ee1711043168ebbbd (patch)
treeeed4cbedb522844a93645cc8e0d48d904b694ad1 /options/locale
parentd4924d45d6d4e991240d207a834d8d6709781449 (diff)
downloadgitea-4b7594d9fa0da67cbc8df74ee1711043168ebbbd.tar.gz
gitea-4b7594d9fa0da67cbc8df74ee1711043168ebbbd.zip
Provide button to delete merged pull request (#441)
* provide button to delete merged pull request * golint fix
Diffstat (limited to 'options/locale')
-rw-r--r--options/locale/locale_en-US.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 97725a950a..579ab85157 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -588,6 +588,7 @@ 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
milestones.new = New Milestone
milestones.open_tab = %d Open