diff options
| author | 赵智超 <1012112796@qq.com> | 2020-04-14 09:06:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 09:06:23 +0800 |
| commit | 281029529bf98218b6c75353f2fce2d74b7ba196 (patch) | |
| tree | c88354f13b20ddd024b167117c50a57cd11d92b7 /options/locale | |
| parent | 063b1d260fa5559fac0b77c215e8b06a9c083cec (diff) | |
| download | gitea-281029529bf98218b6c75353f2fce2d74b7ba196.tar.gz gitea-281029529bf98218b6c75353f2fce2d74b7ba196.zip | |
ui: Add MergePull comment type instead of close for merge PR (#11058)
Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'options/locale')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9a1a458f66..8b43115c07 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -925,6 +925,7 @@ issues.context.edit = Edit issues.context.delete = Delete issues.no_content = There is no content yet. issues.close_issue = Close +issues.pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s` issues.close_comment_issue = Comment and Close issues.reopen_issue = Reopen issues.reopen_comment_issue = Comment and Reopen |