diff options
| author | Unknwon <u@gogs.io> | 2017-11-15 23:27:52 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-11-15 23:28:31 -0500 |
| commit | 34c2e52bd5523a2c6bafd5026817c8d51387f370 (patch) | |
| tree | 289fd3ca1b3ee7aafe49915cc57032ddea856591 /conf/locale/locale_en-US.ini | |
| parent | 5cd1fdeb9ee1af1179a859dc5ed65561bfe5a6d6 (diff) | |
repo/pull: allow rebase before merging (#4805)
Diffstat (limited to 'conf/locale/locale_en-US.ini')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 4166c4e1..5ec65e80 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -632,8 +632,9 @@ pulls.is_checking = The conflict checking is still in progress, please refresh p 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.create_merge_commit = Create a merge commit +pulls.rebase_before_merging = Rebase before merging pulls.merge_pull_request = Merge Pull Request -pulls.rebase_merge_pull_request = Rebase and 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.` pulls.delete_branch = Delete Branch pulls.delete_branch_has_new_commits = Branch cannot be deleted because it has new commits after mergence. @@ -738,7 +739,7 @@ settings.tracker_issue_style.numeric = Numeric settings.tracker_issue_style.alphanumeric = Alphanumeric settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index. settings.pulls_desc = Enable pull requests to accept public contributions -settings.use_rebase_desc = Use rebase to merge pull requests +settings.pulls.allow_rebase_merge = Allow use rebase to merge commits settings.danger_zone = Danger Zone settings.cannot_fork_to_same_owner = You cannot fork a repository to its original owner. settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name. |