summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-09-02 05:09:12 -0400
committerUnknwon <u@gogs.io>2015-09-02 05:09:12 -0400
commit1abfe4e05f2c936ab43c8188003a33213b245a56 (patch)
tree38cec881f7ce3e1a60d47ced5d68be6563dd853f /conf
parent37e0cee8770fc4f14857e16eabe83ab7e93a0646 (diff)
downloadgitea-1abfe4e05f2c936ab43c8188003a33213b245a56.tar.gz
gitea-1abfe4e05f2c936ab43c8188003a33213b245a56.zip
PR: nothing to commit and has pull request check
Diffstat (limited to 'conf')
-rw-r--r--conf/locale/locale_en-US.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 3a02825e4e..cd9824edc7 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -466,6 +466,8 @@ pulls.compare_base = base
pulls.compare_compare = compare
pulls.filter_branch = Filter branch
pulls.no_results = No results found.
+pulls.nothing_to_compare = There is nothing to compare because base and head branches are even.
+pulls.has_pull_request = `There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
pulls.create = Create Pull Request
pulls.title_desc = wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>
pulls.tab_conversation = Conversation