diff options
| author | Unknwon <u@gogs.io> | 2015-09-02 09:26:56 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-02 09:26:56 -0400 |
| commit | 953bb06857f59f5c6987f68a08a94cf5a885b456 (patch) | |
| tree | 196a45fa4e7f8808b35790981eb0e417bbfa1a61 /conf | |
| parent | 6ea28f2a4759c5192811b12de054e7ad62f080f6 (diff) | |
| download | gitea-953bb06857f59f5c6987f68a08a94cf5a885b456.tar.gz gitea-953bb06857f59f5c6987f68a08a94cf5a885b456.zip | |
basic PR feature
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index cd9824edc7..64698fc922 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -470,10 +470,14 @@ pulls.nothing_to_compare = There is nothing to compare because base and head bra 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.merged_title_desc = merged %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> %[4]s pulls.tab_conversation = Conversation pulls.tab_commits = Commits pulls.tab_files = Files changed pulls.reopen_to_merge = Please reopen this pull request to perform merge operation. +pulls.merged = Merged +pulls.has_merged = This pull request has been merged successfully! +pulls.data_borken = Data of this pull request has been borken due to deletion of fork information. pulls.can_auto_merge_desc = You can perform auto-merge operation on this pull request. 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 commond line tool to solve it. |