diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-12-10 10:59:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 03:59:05 +0100 |
| commit | 2d71cdb6687435cf91d23793b0d3fce9db9881a6 (patch) | |
| tree | b991f906b4112f65b73d23bb6a15afb3962e670e /options/locale/locale_en-US.ini | |
| parent | c85bb6263503ebd335863f413214a775973a1fac (diff) | |
| download | gitea-2d71cdb6687435cf91d23793b0d3fce9db9881a6.tar.gz gitea-2d71cdb6687435cf91d23793b0d3fce9db9881a6.zip | |
Add pull request manually merge instruction (#13840)
* add pull request command line instructions
* Add pull request manually merge instuction
* Fix styles
* Fix lint
* Move inline style to class file
* add space between merge button and hint text
* Add sentence end charcter
* Change the language file
* adjust secondary bg
* further adjustment
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'options/locale/locale_en-US.ini')
| -rw-r--r-- | options/locale/locale_en-US.ini | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ff54bcd3b3..58fd7d8f50 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -86,6 +86,9 @@ write = Write preview = Preview loading = Loading… +step1 = Step 1: +step2 = Step 2: + error404 = The page you are trying to reach either <strong>does not exist</strong> or <strong>you are not authorized</strong> to view it. [error] @@ -1296,6 +1299,10 @@ pulls.update_not_allowed = You are not allowed to update branch pulls.outdated_with_base_branch = This branch is out-of-date with the base branch pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>` pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>` +pulls.merge_instruction_hint = `You can also view <a class="show-instruction">command line instructions</a>.` + +pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes. +pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea. milestones.new = New Milestone milestones.open_tab = %d Open |