diff options
| author | Unknwon <u@gogs.io> | 2015-08-16 14:31:54 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-16 14:31:54 +0800 |
| commit | 55ccb00a47e580efc1cf184e31dd19f05137a4b3 (patch) | |
| tree | ad538b0525a886c8f1c0549709e8b97ac8e811d0 /conf/locale/locale_en-US.ini | |
| parent | 6d3e5a36a1d81cc690807768de3f686699f4c171 (diff) | |
| parent | f8a4ab25fda9731803e787160f54d767d1b57eef (diff) | |
| download | gitea-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_en-US.ini')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index c1578b543b..ffb589cfbd 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -751,12 +751,13 @@ auths.auth_name = Authorization Name auths.domain = Domain auths.host = Host auths.port = Port -auths.base_dn = Base DN -auths.attribute_username = Username attribute +auths.bind_dn = Bind DN +auths.bind_password = Bind Password +auths.user_base = User Search Base auths.attribute_name = First name attribute auths.attribute_surname = Surname attribute auths.attribute_mail = E-mail attribute -auths.filter = Search Filter +auths.filter = User Filter auths.ms_ad_sa = Ms Ad SA auths.smtp_auth = SMTP Authorization Type auths.smtphost = SMTP Host @@ -888,4 +889,4 @@ raw_minutes = minutes default_message = Drop files here or click to upload. invalid_input_type = You can't upload files of this type. file_too_big = File size({{filesize}} MB) exceeds maximum size({{maxFilesize}} MB). -remove_file = Remove file
\ No newline at end of file +remove_file = Remove file |