tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00
Code Releases Activity

Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop

Browse Source 
# Conflicts:
#	modules/bindata/bindata.go
This commit is contained in:
Unknwon
2015-08-16 14:31:54 +08:00
parent 6d3e5a36a1 f8a4ab25fd
commit 55ccb00a47
23 changed files with 225 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
conf/locale/locale_en-US.ini
View File

@@ -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
remove_file = Remove file