diff options
| author | Unknwon <u@gogs.io> | 2015-09-02 04:08:05 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-02 04:08:05 -0400 |
| commit | 37e0cee8770fc4f14857e16eabe83ab7e93a0646 (patch) | |
| tree | 2eacd8816cb783f208b2afd061d6162cfeafca0e /conf | |
| parent | 65e73c4ac63b4d8cb5cd1ec6077fa6085e46895c (diff) | |
| download | gitea-37e0cee8770fc4f14857e16eabe83ab7e93a0646.tar.gz gitea-37e0cee8770fc4f14857e16eabe83ab7e93a0646.zip | |
finish PR UI
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 595ed435d8..3a02825e4e 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -462,12 +462,20 @@ issues.label_deletion_success = Label has been deleted successfully! pulls.compare_changes = Compare Changes pulls.compare_changes_desc = Compare two branches and make a pull request for changes. +pulls.compare_base = base +pulls.compare_compare = compare +pulls.filter_branch = Filter branch pulls.no_results = No results found. 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 pulls.tab_commits = Commits pulls.tab_files = Files changed +pulls.reopen_to_merge = Please reopen this pull request to perform merge operation. +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. +pulls.merge_pull_request = Merge Pull Request milestones.new = New Milestone milestones.open_tab = %d Open |