aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-10-24 15:35:26 -0400
committerUnknwon <u@gogs.io>2015-10-24 15:35:26 -0400
commit63e6e3127139bed511c7af3fa354927ea0ffad4f (patch)
tree19eb3b7b12e7a113128328ab3d7dd4885ac2fb76 /conf
parent2be5837cb04d016ef8e6d89eee441dfaad1ce34d (diff)
downloadgitea-63e6e3127139bed511c7af3fa354927ea0ffad4f.tar.gz
gitea-63e6e3127139bed511c7af3fa354927ea0ffad4f.zip
add config and update locale
Diffstat (limited to 'conf')
-rw-r--r--conf/app.ini2
-rw-r--r--conf/locale/locale_en-US.ini2
-rwxr-xr-xconf/locale/locale_zh-CN.ini1
3 files changed, 4 insertions, 1 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 213d945115..a5f7a0b7ca 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -11,6 +11,8 @@ RUN_MODE = dev
[repository]
ROOT =
SCRIPT_TYPE = bash
+; Patch test queue length, make it as large as possible.
+PULL_REQUEST_QUEUE_LENGTH = 10000
[ui]
; Number of repositories that are showed in one explore page
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 1ad0b668f3..df5f3c148b 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -498,7 +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.is_checking = The conflict 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.
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 9dac513fbb..339b59d81b 100755
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -498,6 +498,7 @@ pulls.reopen_to_merge=请重新开启合并请求来完成合并操作。
pulls.merged=已合并
pulls.has_merged=该合并请求已经成功合并!
pulls.data_broken=该合并请求的数据由于派生仓库的相关信息被删除而被破坏。
+pulls.is_checking=该合并请求正在进行冲突检查,请稍后再刷新页面。
pulls.can_auto_merge_desc=您可以实现该合并请求的自动合并操作。
pulls.cannot_auto_merge_desc=因为代码提交存在冲突,您无法对该合并请求执行自动合并操作。
pulls.cannot_auto_merge_helper=请使用命令行工具来解决冲突。