diff options
| author | Unknwon <u@gogs.io> | 2015-10-24 03:36:47 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-10-24 03:36:47 -0400 |
| commit | 0fbb8c8826771e92e890fb1c72b356d3e62c7b01 (patch) | |
| tree | 2695707e4789a6611fa35393b06631848657469a /conf | |
| parent | e0aab4a7f6c1f1b5cc7fa40e2c09623b635bc4a6 (diff) | |
New push to head repo of head branch: regenerate patch and retest apply
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 29d0b278..1ad0b668 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -498,6 +498,7 @@ pulls.reopen_to_merge = Please reopen this pull request to perform merge operati 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 conflit 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. |