diff options
| author | Unknwon <u@gogs.io> | 2015-12-09 17:31:46 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-12-09 17:31:46 -0500 |
| commit | bd5dc626e82e18d3e619d918e579dc130edcd1fa (patch) | |
| tree | 144ed254514678d9b34efb279bbb331c68c0118e /conf | |
| parent | 1b0ef0ec0bedb630307162b60a2edacd3ead1d60 (diff) | |
| parent | 626dc1f0bdd5a7717fb5df3ee41a10ea2fcff200 (diff) | |
| download | gitea-bd5dc626e82e18d3e619d918e579dc130edcd1fa.tar.gz gitea-bd5dc626e82e18d3e619d918e579dc130edcd1fa.zip | |
Merge pull request #2139 from angus-g/fixes/pr-messages
Reword messages for PR auto merging (#2117)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 9a6a7f98aa..970487ef14 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -510,9 +510,9 @@ pulls.merged = Merged pulls.has_merged = This pull request has been merged successfully! pulls.data_broken = Data of this pull request has been broken due to deletion of fork information. pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments. -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 command line tool to solve it. +pulls.can_auto_merge_desc = This pull request can be merged automatically. +pulls.cannot_auto_merge_desc = This pull request can't be merged automatically because there are conflicts. +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.` |