From 953bb06857f59f5c6987f68a08a94cf5a885b456 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 2 Sep 2015 09:26:56 -0400 Subject: basic PR feature --- conf/locale/locale_en-US.ini | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') 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: %[2]s#%[3]d` pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from %[2]s into %[3]s +pulls.merged_title_desc = merged %[1]d commits from %[2]s into %[3]s %[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. -- cgit v1.2.3