diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-09-03 14:29:36 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-09-03 09:29:36 +0300 |
| commit | 6ed22ffd16b80348d52daa0e1915608d307bfe87 (patch) | |
| tree | f6e388ef3b28c459599e3fbdf011f839c987a9f7 /options/locale/locale_en-US.ini | |
| parent | 8ae96a37ce6c02021e05ea57f9c600e19acdd6bb (diff) | |
| download | gitea-6ed22ffd16b80348d52daa0e1915608d307bfe87.tar.gz gitea-6ed22ffd16b80348d52daa0e1915608d307bfe87.zip | |
Add merged commit id on pull view when it's merged (#8062)
Diffstat (limited to 'options/locale/locale_en-US.ini')
| -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 4d2031c5de..b76d82ca86 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -971,6 +971,7 @@ pulls.tab_files = Files Changed pulls.reopen_to_merge = Please reopen this pull request to perform a merge. pulls.cant_reopen_deleted_branch = This pull request cannot be reopened because the branch was deleted. pulls.merged = Merged +pulls.merged_as = The pull request has been merged as <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>. pulls.has_merged = The pull request has been merged. pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.` pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress. Remove the <strong>%s</strong> prefix from the title when it's ready |