Merge branch 'master' into stable

* master: (413 commits)
  release preparation
  fixed strict violation in ACL plugin
  Fix issues from teams:i18n:translation-check in localizations
  ensure locale is set back to the original value
  skip FS#2867 test if \s doesn't match \xA0 after attempting to change the locale
  unittests for auth_loadACL
  translation update
  allow charset for SSO to be configured FS#2148
  Mailer: avoid overlong headers in content ids FS#2868
  translation update
  translation update
  replace \s, \S with [ \t], [^ \t] in regexs used with acls
  translation update
  translation update
  translation update
  translation update
  Fix handling of the legacy subscription action name
  remove obsolete opera handling and session closing
  remove no longer used ajax.php
  fix proxy CONNECT where HTTP 1.1 answer is given
  ...

23 files changed, 242 insertions, 54 deletions

diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index 6a967a6d4..de1332282 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -208,8 +208,8 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
                 if(is_array($key)) {
                     // use regexp to clean up user_result
                     list($key, $regexp) = each($key);
-                    if($user_result[$key]) foreach($user_result[$key] as $grp) {
-                        if(preg_match($regexp, $grp, $match)) {
+                    if($user_result[$key]) foreach($user_result[$key] as $grpkey => $grp) {
+                        if($grpkey !== 'count' && preg_match($regexp, $grp, $match)) {
                             if($localkey == 'grps') {
                                 $info[$localkey][] = $match[1];
                             } else {
diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index a3256628c..2f6019f23 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -1,19 +1,19 @@
 <?php
-$meta['server']      = array('string');
-$meta['port']        = array('numeric');
-$meta['usertree']    = array('string');
-$meta['grouptree']   = array('string');
-$meta['userfilter']  = array('string');
-$meta['groupfilter'] = array('string');
-$meta['version']     = array('numeric');
-$meta['starttls']    = array('onoff');
-$meta['referrals']   = array('onoff');
-$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3));
-$meta['binddn']      = array('string');
-$meta['bindpw']      = array('password');
+$meta['server']      = array('string','_caution' => 'danger');
+$meta['port']        = array('numeric','_caution' => 'danger');
+$meta['usertree']    = array('string','_caution' => 'danger');
+$meta['grouptree']   = array('string','_caution' => 'danger');
+$meta['userfilter']  = array('string','_caution' => 'danger');
+$meta['groupfilter'] = array('string','_caution' => 'danger');
+$meta['version']     = array('numeric','_caution' => 'danger');
+$meta['starttls']    = array('onoff','_caution' => 'danger');
+$meta['referrals']   = array('onoff','_caution' => 'danger');
+$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'danger');
+$meta['binddn']      = array('string','_caution' => 'danger');
+$meta['bindpw']      = array('password','_caution' => 'danger');
 //$meta['mapping']['name']  unsupported in config manager
 //$meta['mapping']['grps']  unsupported in config manager
-$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'));
-$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'));
-$meta['groupkey']    = array('string');
-$meta['debug']       = array('onoff');
\ No newline at end of file
+$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupkey']    = array('string','_caution' => 'danger');
+$meta['debug']       = array('onoff','_caution' => 'security');
diff --git a/lib/plugins/authldap/lang/cs/settings.php b/lib/plugins/authldap/lang/cs/settings.php
index 783d2a3ae..20491f1fb 100644
--- a/lib/plugins/authldap/lang/cs/settings.php
+++ b/lib/plugins/authldap/lang/cs/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author mkucera66@seznam.cz
  */
 $lang['server']                = 'Váš server LDAP. Buď jméno hosta (<code>localhost</code>) nebo plně kvalifikovaný popis URL (<code>ldap://server.tld:389</code>)';
@@ -9,7 +10,7 @@ $lang['port']                  = 'Port serveru LDAP. Pokud není, bude využito
 $lang['usertree']              = 'Kde najít uživatelské účty, tj. <code>ou=Lide, dc=server, dc=tld</code>';
 $lang['grouptree']             = 'Kde najít uživatelské skupiny, tj. <code>ou=Skupina, dc=server, dc=tld</code>';
 $lang['userfilter']            = 'Filter LDAPu pro vyhledávání uživatelských účtů, tj. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
-$lang['groupfilter']           = 'Filter LDAPu pro vyhledávání uživatelských skupin, tj. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filter LDAPu pro vyhledávání uživatelských skupin, tj. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = 'Verze použitého protokolu. Můžete potřebovat jej nastavit na <code>3</code>';
 $lang['starttls']              = 'Využít spojení TLS?';
 $lang['referrals']             = 'Přeposílat odkazy?';
diff --git a/lib/plugins/authldap/lang/da/settings.php b/lib/plugins/authldap/lang/da/settings.php
new file mode 100644
index 000000000..a3558aa5c
--- /dev/null
+++ b/lib/plugins/authldap/lang/da/settings.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
+ */
+$lang['server']                = 'Din LDAP server. Enten værtsnavn (<code>localhost</code>) eller fuld kvalificeret URL (<code>ldap://server.tld:389</code>)';
+$lang['debug']                 = 'Vis yderligere debug output ved fejl';
diff --git a/lib/plugins/authldap/lang/de-informal/settings.php b/lib/plugins/authldap/lang/de-informal/settings.php
index fa0fc1521..bdac7dd68 100644
--- a/lib/plugins/authldap/lang/de-informal/settings.php
+++ b/lib/plugins/authldap/lang/de-informal/settings.php
@@ -1,9 +1,10 @@
 <?php
+
 /**
- * German informal language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
 $lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
@@ -14,9 +15,14 @@ $lang['groupfilter']           = 'LDAP-Filter, um die Benutzergruppen zu suchen.
 $lang['version']               = 'Zu verwendende Protokollversion von LDAP.';
 $lang['starttls']              = 'Verbindung über TLS aufbauen?';
 $lang['referrals']             = 'Weiterverfolgen von LDAP-Referrals (Verweise)?';
+$lang['deref']                 = 'Wie sollen Aliasse derefernziert werden?';
 $lang['binddn']                = 'DN eines optionalen Benutzers, wenn der anonyme Zugriff nicht ausreichend ist. Zum Beispiel: <code>cn=admin, dc=my, dc=home</code>.';
 $lang['bindpw']                = 'Passwort des angegebenen Benutzers.';
 $lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
 $lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
 $lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
 $lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NIEMALS';
+$lang['deref_o_1']             = 'LDAP_DEREF_SUCHEN';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDEN';
+$lang['deref_o_3']             = 'LDAP_DEREF_IMMER';
diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index b237201d8..d788da876 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -1,9 +1,10 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author christian studer <cstuder@existenz.ch>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
 $lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
@@ -14,9 +15,14 @@ $lang['groupfilter']           = 'LDAP-Filter, um die Benutzergruppen zu suchen.
 $lang['version']               = 'Zu verwendende Protokollversion von LDAP.';
 $lang['starttls']              = 'Verbindung über TLS aufbauen?';
 $lang['referrals']             = 'Weiterverfolgen von LDAP-Referrals (Verweise)?';
+$lang['deref']                 = 'Wie sollen Aliase aufgelöst werden?';
 $lang['binddn']                = 'DN eines optionalen Benutzers, wenn der anonyme Zugriff nicht ausreichend ist. Zum Beispiel: <code>cn=admin, dc=my, dc=home</code>.';
 $lang['bindpw']                = 'Passwort des angegebenen Benutzers.';
 $lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
 $lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
 $lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
 $lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/en/settings.php b/lib/plugins/authldap/lang/en/settings.php
index e3f385f99..b73166ab2 100644
--- a/lib/plugins/authldap/lang/en/settings.php
+++ b/lib/plugins/authldap/lang/en/settings.php
@@ -20,4 +20,4 @@ $lang['debug']       = 'Display additional debug information on errors';
 $lang['deref_o_0']   = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']   = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']   = 'LDAP_DEREF_FINDING';
-$lang['deref_o_3']   = 'LDAP_DEREF_ALWAYS';
\ No newline at end of file
+$lang['deref_o_3']   = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/eo/settings.php b/lib/plugins/authldap/lang/eo/settings.php
index 2863a1125..07b46c84a 100644
--- a/lib/plugins/authldap/lang/eo/settings.php
+++ b/lib/plugins/authldap/lang/eo/settings.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Felipe Castro <fefcas@yahoo.com.br>
  */
 $lang['server']                = 'Via LDAP-servilo. Aŭ servila nomo (<code>localhost</code>) aŭ plene detala URL (<code>ldap://servilo.lando:389</code>)';
 $lang['port']                  = 'LDAP-servila pordego, se vi supre ne indikis la plenan URL';
@@ -12,9 +14,14 @@ $lang['groupfilter']           = 'LDAP-filtrilo por serĉi grupojn, ekz. <code>(
 $lang['version']               = 'La uzenda protokolversio. Eble necesas indiki <code>3</code>';
 $lang['starttls']              = 'Ĉu uzi TLS-konektojn?';
 $lang['referrals']             = 'Ĉu sekvi referencojn?';
+$lang['deref']                 = 'Kiel dereferencigi kromnomojn?';
 $lang['binddn']                = 'DN de opcie bindita uzanto, se anonima bindado ne sufiĉas, ekz. <code>cn=admin, dc=mia, dc=hejmo</code>';
 $lang['bindpw']                = 'Pasvorto de tiu uzanto';
 $lang['userscope']             = 'Limigi serĉospacon de uzantaj serĉoj';
 $lang['groupscope']            = 'Limigi serĉospacon por grupaj serĉoj';
 $lang['groupkey']              = 'Grupa membreco de iu uzanta atributo (anstataŭ standardaj AD-grupoj), ekz. grupo de departemento aŭ telefonnumero';
 $lang['debug']                 = 'Ĉu montri aldonajn erarinformojn?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php
index 3df09eb7c..dc475071e 100644
--- a/lib/plugins/authldap/lang/fr/settings.php
+++ b/lib/plugins/authldap/lang/fr/settings.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
+ * @author schplurtz <Schplurtz@laposte.net>
  */
 $lang['server']                = 'Votre serveur LDAP. Soit le nom d\'hôte (<code>localhost</code>) ou l\'URL complète (<code>ldap://serveur.dom:389</code>)';
 $lang['port']                  = 'Port du serveur LDAP si l\'URL complète n\'a pas été indiquée ci-dessus';
@@ -13,9 +15,14 @@ $lang['groupfilter']           = 'Filtre LDAP pour rechercher les groupes. Ex.:
 $lang['version']               = 'La version de protocole à utiliser. Il se peut que vous deviez utiliser <code>3</code>';
 $lang['starttls']              = 'Utiliser les connexions TLS?';
 $lang['referrals']             = 'Suivre les références?';
+$lang['deref']                 = 'Comment déréférencer les alias ?';
 $lang['binddn']                = 'Nom de domaine d\'un utilisateur de connexion facultatif si une connexion anonyme n\'est pas suffisante. Ex. : <code>cn=admin, dc=mon, dc=accueil</code>';
 $lang['bindpw']                = 'Mot de passe de l\'utilisateur ci-dessus.';
 $lang['userscope']             = 'Limiter la portée de recherche d\'utilisateurs';
 $lang['groupscope']            = 'Limiter la portée de recherche de groupes';
 $lang['groupkey']              = 'Affiliation aux groupes à partir de n\'importe quel attribut utilisateur (au lieu des groupes AD standards), p. ex. groupes par département ou numéro de téléphone';
 $lang['debug']                 = 'Afficher des informations de bégogage supplémentaires pour les erreurs';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/hu/settings.php b/lib/plugins/authldap/lang/hu/settings.php
new file mode 100644
index 000000000..041f82755
--- /dev/null
+++ b/lib/plugins/authldap/lang/hu/settings.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Marton Sebok <sebokmarton@gmail.com>
+ */
+$lang['server']                = 'LDAP-szerver. Hosztnév (<code>localhost</code>) vagy abszolút URL portszámmal (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'LDAP-szerver port, ha nem URL lett megadva';
+$lang['usertree']              = 'Hol találom a felhasználókat? Pl. <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Hol találom a csoportokat? Pl. <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP szűrő a felhasználók kereséséhez, pl. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP szűrő a csoportok kereséséhez, pl. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'A használt protokollverzió. Valószínűleg a <code>3</code> megfelelő';
+$lang['starttls']              = 'TLS használata?';
+$lang['referrals']             = 'Hivatkozások követése?';
+$lang['deref']                 = 'Hogyan fejtsük vissza az aliasokat?';
+$lang['binddn']                = 'Egy hozzáféréshez használt felhasználó DN-je, ha nincs névtelen hozzáférés. Pl. <code>cn=admin, dc=my, dc=home</code>';
+$lang['bindpw']                = 'Ehhez tartozó jelszó.';
+$lang['userscope']             = 'A keresési tartomány korlátozása erre a felhasználókra való keresésnél';
+$lang['groupscope']            = 'A keresési tartomány korlátozása erre a csoportokra való keresésnél';
+$lang['groupkey']              = 'Csoport meghatározása a következő attribútumból (az alapértelmezett AD csoporttagság helyett), pl. a szervezeti egység vagy a telefonszám';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/it/settings.php b/lib/plugins/authldap/lang/it/settings.php
index 10ae72f87..023159489 100644
--- a/lib/plugins/authldap/lang/it/settings.php
+++ b/lib/plugins/authldap/lang/it/settings.php
@@ -1,5 +1,15 @@
 <?php
+
 /**
- * Italian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Edmondo Di Tucci <snarchio@gmail.com>
  */
+$lang['server']                = 'Il tuo server LDAP. Inserire o l\'hostname (<code>localhost</code>) oppure un URL completo (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'Porta del server LDAP se non è stato fornito un URL completo più sopra.';
+$lang['usertree']              = 'Dove cercare l\'account utente. Eg. <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Dove cercare i gruppi utente. Eg. <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'Filtro per cercare l\'account utente LDAP. Eg. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filtro per cercare i gruppi LDAP. Eg. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Versione protocollo da usare. Pu<code>3</code>';
+$lang['starttls']              = 'Usare la connessione TSL?';
diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php
index fdc6fc434..6dec9a576 100644
--- a/lib/plugins/authldap/lang/ja/settings.php
+++ b/lib/plugins/authldap/lang/ja/settings.php
@@ -1,6 +1,24 @@
 <?php
+
 /**
- * Japanese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
+ * @author Hideaki SAWADA <sawadakun@live.jp>
+ * @author Hideaki SAWADA <chuno@live.jp>
  */
+$lang['server']                = 'LDAPサーバー。ホスト名（<code>localhost</code）又は完全修飾URL（<code>ldap://server.tld:389</code>）';
+$lang['port']                  = '上記が完全修飾URLでない場合、LDAPサーバーポート';
+$lang['usertree']              = 'ユーザーアカウントを探す場所。例：<code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'ユーザーグループを探す場所。例：<code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'ユーザーアカウントを探すためのLDAP抽出条件。例：<code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'グループを探すLDAP抽出条件。例：<code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = '使用するプロトコルのバージョン。<code>3</code>を設定する必要がある場合があります。';
+$lang['starttls']              = 'TLS接続を使用しますか？';
+$lang['binddn']                = '匿名バインドでは不十分な場合、オプションバインドユーザーのDN。例：<code>cn=admin, dc=my, dc=home</code>';
+$lang['bindpw']                = '上記ユーザーのパスワード';
+$lang['debug']                 = 'エラーに関して追加のデバッグ情報を表示する。';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 7f7efe8d0..5c5341b31 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['server']                = 'LDAP 서버. 호스트 이름(<code>localhost</code>)이나 전체 자격 URL(<code>ldap://server.tld:389</code>) 중 하나';
@@ -13,9 +14,14 @@ $lang['groupfilter']           = '그룹을 찾을 LDAP 필터. 예를 들어 <c
 $lang['version']               = '사용할 프로토콜 버전. <code>3</code>으로 설정해야 할 수도 있습니다';
 $lang['starttls']              = 'TLS 연결을 사용하겠습니까?';
 $lang['referrals']             = '참고(referrals)를 허용하겠습니까? ';
+$lang['deref']                 = '어떻게 별명을 간접 참고하겠습니까?';
 $lang['binddn']                = '익명 바인드가 충분하지 않으면 선택적인 바인드 사용자의 DN. 예를 들어 <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = '위 사용자의 비밀번호';
 $lang['userscope']             = '사용자 찾기에 대한 찾기 범위 제한';
 $lang['groupscope']            = '그룹 찾기에 대한 찾기 범위 제한';
 $lang['groupkey']              = '(표준 AD 그룹 대신) 사용자 속성에서 그룹 구성원. 예를 들어 부서나 전화에서 그룹';
 $lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이기';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index 274c3b7fc..193d1a386 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -1,20 +1,28 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Gerrit Uitslag <klapinklapin@gmail.com>
+ * @author Remon <no@email.local>
  */
-$lang['server']                = 'Je LDAP server. Ofwel servernaam (<code>localhost</code>) of volledige URL (<code>ldap://server.tld:389</code>)';
-$lang['port']                  = 'LDAP server poort als hiervoor geen volledige URL is opgegeven';
+$lang['server']                = 'Je LDAP server. Of de servernaam (<code>localhost</code>) of de volledige URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'LDAP server poort als bij de entry hierboven geen volledige URL is opgegeven';
 $lang['usertree']              = 'Locatie van de gebruikersaccounts. Bijv. <code>ou=Personen,dc=server,dc=tld</code>';
 $lang['grouptree']             = 'Locatie van de gebruikersgroepen. Bijv. <code>ou=Group,dc=server,dc=tld</code>';
 $lang['userfilter']            = 'LDAP gebruikersfilter. Bijv. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
 $lang['groupfilter']           = 'LDAP groepsfilter. Bijv. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
-$lang['version']               = 'Te gebruiken protocolversie. Je zou het moeten kunnen instellen op <code>3</code>';
-$lang['starttls']              = 'Gebruiken TLS verbindingen';
-$lang['referrals']             = 'Moeten verwijzingen worden gevolg';
+$lang['version']               = 'Te gebruiken protocolversie. Mogelijk dat dit ingesteld moet worden op <code>3</code>';
+$lang['starttls']              = 'Gebruik maken van TLS verbindingen?';
+$lang['referrals']             = 'Moeten verwijzingen worden gevolgd?';
+$lang['deref']                 = 'Hoe moeten de verwijzing van aliases worden bepaald?';
 $lang['binddn']                = 'DN van een optionele bind gebruiker als anonieme bind niet genoeg is. Bijv. <code>cn=beheer, dc=mijn, dc=thuis</code>';
 $lang['bindpw']                = 'Wachtwoord van bovenstaande gebruiker';
 $lang['userscope']             = 'Beperken scope van zoekfuncties voor gebruikers';
 $lang['groupscope']            = 'Beperken scope van zoekfuncties voor groepen';
 $lang['groupkey']              = 'Groepslidmaatschap van enig gebruikersattribuut (in plaats van standaard AD groepen), bijv. groep van afdeling of telefoonnummer';
 $lang['debug']                 = 'Tonen van aanvullende debuginformatie bij fouten';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/pl/settings.php b/lib/plugins/authldap/lang/pl/settings.php
new file mode 100644
index 000000000..44641f514
--- /dev/null
+++ b/lib/plugins/authldap/lang/pl/settings.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Polish language file
+ *
+ */
+$lang['starttls']              = 'Użyć połączeń TLS?';
+$lang['bindpw']                = 'Hasło powyższego użytkownika';
diff --git a/lib/plugins/authldap/lang/pt-br/settings.php b/lib/plugins/authldap/lang/pt-br/settings.php
index daf9efd00..6ad6b4862 100644
--- a/lib/plugins/authldap/lang/pt-br/settings.php
+++ b/lib/plugins/authldap/lang/pt-br/settings.php
@@ -1,19 +1,28 @@
 <?php
+
 /**
- * Brazilian Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Victor Westmann <victor.westmann@gmail.com>
+ * @author Frederico Guimarães <frederico@teia.bio.br>
  */
 $lang['server']                = 'Seu servidor LDAP. Ou hostname (<code>localhost</code>) ou uma URL completa (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'Porta LDAP do servidor se nenhuma URL completa tiver sido fornecida acima';
 $lang['usertree']              = 'Onde encontrar as contas de usuários. Eg. <code>ou=Pessoas, dc=servidor, dc=tld</code>';
 $lang['grouptree']             = 'Onde encontrar os grupos de usuários. Eg. <code>ou=Pessoas, dc=servidor, dc=tld</code>';
+$lang['userfilter']            = 'Filtro LDAP para pesquisar por contas de usuários. Ex. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filtro LDAP para pesquisar por grupos. Ex. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = 'A versão do protocolo para usar. Você talvez deva definir isto para <code>3</code>';
 $lang['starttls']              = 'Usar conexões TLS?';
-$lang['referrals']             = 'Permitir referências serem seguidas?';
+$lang['referrals']             = 'Permitir que as referências sejam seguidas?';
+$lang['deref']                 = 'Como dereferenciar os aliases?';
 $lang['binddn']                = 'DN de um vínculo opcional de usuário se vínculo anônimo não for suficiente. Eg. <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = 'Senha do usuário acima';
 $lang['userscope']             = 'Limitar escopo da busca para busca de usuário';
 $lang['groupscope']            = 'Limitar escopo da busca para busca de grupo';
 $lang['groupkey']              = 'Membro de grupo vem de qualquer atributo do usuário (ao invés de grupos padrões AD) e.g. departamento de grupo ou número de telefone';
 $lang['debug']                 = 'Mostrar informações adicionais de depuração em erros';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/pt/settings.php b/lib/plugins/authldap/lang/pt/settings.php
new file mode 100644
index 000000000..a2ccf87ad
--- /dev/null
+++ b/lib/plugins/authldap/lang/pt/settings.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author André Neves <drakferion@gmail.com>
+ */
+$lang['server']                = 'O seu servidor de LDAP. Ou hostname (<code>localhost</code>) ou URL qualificado completo (<code>ldap://servidor.tld:389</code>)';
+$lang['port']                  = 'Porta de servidor de LDAP se o URL completo não foi fornecido acima';
+$lang['usertree']              = 'Onde encontrar as contas de utilizador. Por exemplo <code>ou=Pessoas, dc=servidor, dc=tld</code>';
+$lang['grouptree']             = 'Onde encontrar os grupos de utilizadores. Por exemplo code>ou=Grupo, dc=servidor, dc=tld</code>';
+$lang['userfilter']            = 'Filtro LDAP para procurar por contas de utilizador. Por exemplo <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filtro LDAP para procurar por grupos. Por exemplo <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'A versão do protocolo a utilizar. Pode precisar de alterar isto para <code>3</code>';
+$lang['starttls']              = 'Usar ligações TLS?';
+$lang['referrals']             = 'Referrals devem ser seguidos?';
+$lang['bindpw']                = 'Senha do utilizador acima';
+$lang['debug']                 = 'Mostrar informação adicional de debug aquando de erros';
diff --git a/lib/plugins/authldap/lang/ru/settings.php b/lib/plugins/authldap/lang/ru/settings.php
index 4c394080e..70ad7b6f4 100644
--- a/lib/plugins/authldap/lang/ru/settings.php
+++ b/lib/plugins/authldap/lang/ru/settings.php
@@ -1,6 +1,9 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  */
+$lang['bindpw']                = 'Пароль для указанного пользователя.';
diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
new file mode 100644
index 000000000..48bd37395
--- /dev/null
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Martin Michalek <michalek.dev@gmail.com>
+ */
+$lang['server']                = 'LDAP server. Adresa (<code>localhost</code>) alebo úplné URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'Port LDAP servera, ak nebolo vyššie zadané úplné URL';
+$lang['usertree']              = 'Umiestnenie účtov používateľov. Napr. <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Umiestnenie skupín používateľov. Napr. <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP filter pre vyhľadávanie používateľských účtov. Napr. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP filter pre vyhľadávanie skupín. Napr. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Použitá verzia protokolu. Možno bude potrebné nastaviť na hodnotu <code>3</code>';
+$lang['starttls']              = 'Použiť TLS pripojenie?';
+$lang['bindpw']                = 'Heslo vyššie uvedeného používateľa';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/lang/sv/settings.php b/lib/plugins/authldap/lang/sv/settings.php
new file mode 100644
index 000000000..d98400461
--- /dev/null
+++ b/lib/plugins/authldap/lang/sv/settings.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Smorkster Andersson smorkster@gmail.com
+ * @author Tor Härnqvist <tor.harnqvist@gmail.com>
+ */
+$lang['server']                = 'Din LDAO server. Antingen värdnamn (<code>localhost</code>) eller giltig full URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'LDAP server port, om det inte angavs full URL ovan';
+$lang['usertree']              = 'Specificera var användarkonton finns. T.ex. <code>ou=Användare, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Specificera var grupper finns. T.ex. <code>ou=Grupp, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP filter för att söka efter användarkonton. T.ex. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP filter för att söka efter grupper. T.ex. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Version av protokoll att använda. Du kan behöva sätta detta till <code>3</code>';
+$lang['starttls']              = 'Använd TLS-anslutningar';
+$lang['bindpw']                = 'Lösenord för användare ovan';
+$lang['groupkey']              = 'Gruppmedlemskap från något användarattribut (istället för standard AD grupp) t.ex. grupp från avdelning eller telefonnummer';
+$lang['debug']                 = 'Visa ytterligare felsökningsinformation vid fel';
diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index e93190516..d2513eeff 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 LDAP 伺服器。填寫主機名稱 (<code>localhost</code>) 或完整的 URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index 3f38deae9..77c2c6952 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 LDAP 服务器。填写主机名 (<code>localhost</code>) 或者完整的 URL (<code>ldap://server.tld:389</code>)';
@@ -19,3 +20,7 @@ $lang['userscope']             = '限制用户搜索的范围';
 $lang['groupscope']            = '限制组搜索的范围';
 $lang['groupkey']              = '根据任何用户属性得来的组成员(而不是标准的 AD 组)，例如根据部门或者电话号码得到的组。';
 $lang['debug']                 = '有错误时显示额外的调试信息';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authldap/plugin.info.txt b/lib/plugins/authldap/plugin.info.txt
index 94809a75b..0d0b13f65 100644
--- a/lib/plugins/authldap/plugin.info.txt
+++ b/lib/plugins/authldap/plugin.info.txt
@@ -2,6 +2,6 @@ base   authldap
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2013-04-19
-name   ldap auth plugin
-desc   Provides authentication against am LDAP server
+name   LDAP Auth Plugin
+desc   Provides user authentication against an LDAP server
 url    http://www.dokuwiki.org/plugin:authldap