summaryrefslogtreecommitdiffstats
path: root/conf/locale/locale_zh-CN.ini
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-08-16 14:31:54 +0800
committerUnknwon <u@gogs.io>2015-08-16 14:31:54 +0800
commit55ccb00a47e580efc1cf184e31dd19f05137a4b3 (patch)
treead538b0525a886c8f1c0549709e8b97ac8e811d0 /conf/locale/locale_zh-CN.ini
parent6d3e5a36a1d81cc690807768de3f686699f4c171 (diff)
parentf8a4ab25fda9731803e787160f54d767d1b57eef (diff)
downloadgitea-55ccb00a47e580efc1cf184e31dd19f05137a4b3.tar.gz
gitea-55ccb00a47e580efc1cf184e31dd19f05137a4b3.zip
Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop
# Conflicts: # modules/bindata/bindata.go
Diffstat (limited to 'conf/locale/locale_zh-CN.ini')
-rwxr-xr-xconf/locale/locale_zh-CN.ini2
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 343526546f..3af7e417c4 100755
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -751,8 +751,6 @@ auths.auth_name=授权名称
auths.domain=域名
auths.host=主机地址
auths.port=主机端口
-auths.base_dn=Base DN
-auths.attribute_username=用户名属性
auths.attribute_name=名字属性
auths.attribute_surname=姓氏属性
auths.attribute_mail=邮箱属性