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

# Conflicts:
#	modules/bindata/bindata.go

14 files changed, 5 insertions, 31 deletions

diff --git a/conf/locale/locale_bg-BG.ini b/conf/locale/locale_bg-BG.ini
index 65d5962f1c..383d697bf3 100755
--- a/conf/locale/locale_bg-BG.ini
+++ b/conf/locale/locale_bg-BG.ini
@@ -663,8 +663,6 @@ auths.auth_name=Име на удостоверяването
 auths.domain=Домейн

 auths.host=Хост

 auths.port=Порт

-auths.base_dn=Основен DN

-auths.attribute_username=Атрибут на потребителско име

 auths.attribute_name=Атрибут име

 auths.attribute_surname=Атрибут фамилия

 auths.attribute_mail=E-Mail атрибут

diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
index df7f1edc3f..fe2c13a923 100755
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@@ -750,8 +750,6 @@ auths.auth_name=Authentifizierungsname
 auths.domain=Domain

 auths.host=Host

 auths.port=Port

-auths.base_dn=Base DN

-auths.attribute_username=Benutzername Attribut

 auths.attribute_name=Vorname Attribut

 auths.attribute_surname=Nachname Attribut

 auths.attribute_mail=E-Mail Attribut

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
diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini
index 93c9722d75..509b496a09 100755
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@@ -750,13 +750,10 @@ auths.auth_name=Nombre de Autorización
 auths.domain=Dominio

 auths.host=Host

 auths.port=Puerto

-auths.base_dn=Base DN

-auths.attribute_username=Atributo username

 auths.attribute_name=Atributo nombre

 auths.attribute_surname=Atributo apellido

 auths.attribute_mail=Atributo correo electrónico

 auths.filter=Filtro de Búsqueda

-auths.ms_ad_sa=Ms Ad SA

 auths.smtp_auth=Tipo de Autorización SMTP

 auths.smtphost=SMTP Host

 auths.smtpport=Puerto SMTP

diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini
index 0f8d33e328..69f686bc25 100755
--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
@@ -722,8 +722,6 @@ auths.auth_name=Nom d'Autorisation
 auths.domain=Domaine

 auths.host=Hôte

 auths.port=Port

-auths.base_dn=Base DN (Nom Distingué)

-auths.attribute_username=Attribut du nom d'utilisateur

 auths.attribute_name=Attribut du prénom

 auths.attribute_surname=Attribut du nom de famille

 auths.attribute_mail=Attribut de l'e-mail

diff --git a/conf/locale/locale_it-IT.ini b/conf/locale/locale_it-IT.ini
index de6d83bea3..8377cdbe24 100755
--- a/conf/locale/locale_it-IT.ini
+++ b/conf/locale/locale_it-IT.ini
@@ -663,8 +663,6 @@ auths.auth_name=Nome Autorizzazione
 auths.domain=Dominio

 auths.host=Host

 auths.port=Porta

-auths.base_dn=Base DN

-auths.attribute_username=Attributo Nome Utente

 auths.attribute_name=Attributo Nome

 auths.attribute_surname=Attributo Cognome

 auths.attribute_mail=Attributo Email

diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini
index 53c794c44b..ddcba127b3 100755
--- a/conf/locale/locale_ja-JP.ini
+++ b/conf/locale/locale_ja-JP.ini
@@ -750,8 +750,6 @@ auths.auth_name=認証名
 auths.domain=ドメイン

 auths.host=ホスト

 auths.port=ポート

-auths.base_dn=ベースのドメイン名

-auths.attribute_username=ユーザー名属性

 auths.attribute_name=名前属性

 auths.attribute_surname=名字属性

 auths.attribute_mail=Eメール属性

diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini
index c2d4fac6b0..c525031b6b 100755
--- a/conf/locale/locale_lv-LV.ini
+++ b/conf/locale/locale_lv-LV.ini
@@ -663,8 +663,6 @@ auths.auth_name=Autorizācijas nosaukums
 auths.domain=Domēns

 auths.host=Resursdators

 auths.port=Ports

-auths.base_dn=Pamata DN

-auths.attribute_username=Username attribute

 auths.attribute_name=First name attribute

 auths.attribute_surname=Surname attribute

 auths.attribute_mail=E-mail attribute

diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini
index baa4862128..4d8cbd9fff 100755
--- a/conf/locale/locale_nl-NL.ini
+++ b/conf/locale/locale_nl-NL.ini
@@ -663,8 +663,6 @@ auths.auth_name=Autorisatienaam
 auths.domain=Domein

 auths.host=Host

 auths.port=Poort

-auths.base_dn=Base DN

-auths.attribute_username=Gebruikersnaam attribuut

 auths.attribute_name=Voornaam attribuut

 auths.attribute_surname=Achternaam attribuut

 auths.attribute_mail=E-mail attribuut

diff --git a/conf/locale/locale_pl-PL.ini b/conf/locale/locale_pl-PL.ini
index ea0fd796b0..3518970252 100755
--- a/conf/locale/locale_pl-PL.ini
+++ b/conf/locale/locale_pl-PL.ini
@@ -663,8 +663,6 @@ auths.auth_name=Nazwa autoryzacji
 auths.domain=Domena

 auths.host=Host

 auths.port=Port

-auths.base_dn=Base DN

-auths.attribute_username=Atrybut username

 auths.attribute_name=Atrybut imienia

 auths.attribute_surname=Atrybut nazwiska

 auths.attribute_mail=Atrybut email

diff --git a/conf/locale/locale_pt-BR.ini b/conf/locale/locale_pt-BR.ini
index 695be4e475..c3b8455272 100755
--- a/conf/locale/locale_pt-BR.ini
+++ b/conf/locale/locale_pt-BR.ini
@@ -751,8 +751,6 @@ auths.auth_name=Nome da Autorização
 auths.domain=Domínio

 auths.host=Host

 auths.port=Porta

-auths.base_dn=Base DN

-auths.attribute_username=Atributo nome de usuário

 auths.attribute_name=Atributo primeiro nome

 auths.attribute_surname=Atributo sobrenome

 auths.attribute_mail=Atributo e-mail

diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini
index 1f62ce0e2b..bf1c1b1b08 100755
--- a/conf/locale/locale_ru-RU.ini
+++ b/conf/locale/locale_ru-RU.ini
@@ -663,8 +663,6 @@ auths.auth_name=Название авторизации
 auths.domain=Домен

 auths.host=Хост

 auths.port=Порт

-auths.base_dn=Base DN

-auths.attribute_username=Username attribute

 auths.attribute_name=First name attribute

 auths.attribute_surname=Surname attribute

 auths.attribute_mail=E-mail attribute

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=邮箱属性

diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini
index e58e321c87..8d1f6ee514 100755
--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
@@ -663,8 +663,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=電子郵箱屬性