From a4655683f1e9b4bf77a25334cd447b4b50e1c151 Mon Sep 17 00:00:00 2001
From: Lorenzo Radaelli <lorenzo@mfr-trade.it>
Date: Sun, 24 Feb 2013 10:36:18 +0100
Subject: Italian language update

---
 lib/plugins/authldap/lang/it/settings.php | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/it/settings.php

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/it/settings.php b/lib/plugins/authldap/lang/it/settings.php
new file mode 100644
index 000000000..10ae72f87
--- /dev/null
+++ b/lib/plugins/authldap/lang/it/settings.php
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Italian language file
+ *
+ */
-- 
cgit v1.2.3


From 3fe280371c5b3e2f435f374dfffc58114ce85093 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Sun, 24 Feb 2013 10:37:45 +0100
Subject: Simplified Chinese language update

---
 lib/plugins/authldap/lang/zh/settings.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/zh/settings.php

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
new file mode 100644
index 000000000..e84511b42
--- /dev/null
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Chinese language file
+ *
+ * @author lainme <lainme993@gmail.com>
+ */
+$lang['server']                = '您的 LDAP 服务器。填写主机名 (<code>localhost</code>) 或者完整的 URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'LDAP 服务器端口 (如果上面没有给出完整的 URL)';
+$lang['usertree']              = '何处查找用户账户。例如 <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = '何处查找用户组。例如 <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = '用于搜索用户账户的 LDAP 筛选器。例如 <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = '用于搜索组的 LDAP 筛选器。例如 <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = '使用的协议版本。您或许需要设置为 <code>3</code>';
+$lang['starttls']              = '使用 TLS 连接？';
+$lang['referrals']             = '是否允许引用 (referrals)？';
+$lang['binddn']                = '一个可选的绑定用户的 DN (如果匿名绑定不满足要求)。例如 Eg. <code>cn=admin, dc=my, dc=home</code>';
+$lang['bindpw']                = '上述用户的密码';
+$lang['userscope']             = '限制用户搜索的范围';
+$lang['groupscope']            = '限制组搜索的范围';
+$lang['debug']                 = '有错误时显示额外的调试信息';
-- 
cgit v1.2.3


From bdac741579f8c6f00248d5d3ec635d4c2e08fb1e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 24 Feb 2013 10:39:52 +0100
Subject: fixed typos

---
 lib/plugins/authldap/lang/en/settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/en/settings.php b/lib/plugins/authldap/lang/en/settings.php
index 0bb397be5..ddedf8ae3 100644
--- a/lib/plugins/authldap/lang/en/settings.php
+++ b/lib/plugins/authldap/lang/en/settings.php
@@ -1,14 +1,14 @@
 <?php
 $lang['server']      = 'Your LDAP server. Either hostname (<code>localhost</code>) or full qualified URL (<code>ldap://server.tld:389</code>)';
 $lang['port']        = 'LDAP server port if no full URL was given above';
-$lang['usertree']    = 'Where to finde the user accounts. Eg. <code>ou=People, dc=server, dc=tld</code>';
+$lang['usertree']    = 'Where to find the user accounts. Eg. <code>ou=People, dc=server, dc=tld</code>';
 $lang['grouptree']   = 'Where to find the user groups. Eg. <code>ou=Group, dc=server, dc=tld</code>';
 $lang['userfilter']  = 'LDAP filter to search for user accounts. Eg. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
 $lang['groupfilter'] = 'LDAP filter to search for groups. Eg. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']     = 'The protocol version to use. You may need to set this to <code>3</code>';
 $lang['starttls']    = 'Use TLS connections?';
 $lang['referrals']   = 'Shall referrals be followed?';
-$lang['binddn']      = 'DN of an ptional bind user if anonymous bind is not sufficient. Eg. <code>cn=admin, dc=my, dc=home</code>';
+$lang['binddn']      = 'DN of an optional bind user if anonymous bind is not sufficient. Eg. <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']      = 'Password of above user';
 $lang['userscope']   = 'Limit search scope for user search';
 $lang['groupscope']  = 'Limit search scope for group search';
-- 
cgit v1.2.3


From b3fd863955b2c6c1987f36b9206b806da6e487c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com>
Date: Sun, 28 Jul 2013 02:00:10 +0200
Subject: Korean language update

---
 lib/plugins/authldap/lang/ko/settings.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 7f7efe8d0..6200a03b9 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -13,9 +13,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 (항상)';
-- 
cgit v1.2.3


From 4b0e9be14f53973587becf18a79ad97e0b8ae195 Mon Sep 17 00:00:00 2001
From: Maciej Matejczuk <mmatejczuk@gmail.com>
Date: Sun, 28 Jul 2013 02:11:25 +0200
Subject: Polish language update

---
 lib/plugins/authldap/lang/pl/settings.php | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/pl/settings.php

(limited to 'lib/plugins/authldap')

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';
-- 
cgit v1.2.3


From 22064dd98283bc61e1b444e45707c1c51230eb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Seb=C5=91k?= <sebokmarton@gmail.com>
Date: Sun, 28 Jul 2013 02:12:20 +0200
Subject: Hungarian language update

---
 lib/plugins/authldap/lang/hu/settings.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/hu/settings.php

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/hu/settings.php b/lib/plugins/authldap/lang/hu/settings.php
new file mode 100644
index 000000000..b4b28d0a0
--- /dev/null
+++ b/lib/plugins/authldap/lang/hu/settings.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Hungarian language file
+ *
+ * @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';
-- 
cgit v1.2.3


From a191bd2a8ef9a6cde5c9a80e84eef2369a247214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederico=20Guimar=C3=A3es?= <frederico@teia.bio.br>
Date: Thu, 1 Aug 2013 22:27:42 +0200
Subject: Brazilian Portuguese language update

---
 lib/plugins/authldap/lang/pt-br/settings.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/pt-br/settings.php b/lib/plugins/authldap/lang/pt-br/settings.php
index 70b68b289..d12a9cf36 100644
--- a/lib/plugins/authldap/lang/pt-br/settings.php
+++ b/lib/plugins/authldap/lang/pt-br/settings.php
@@ -3,17 +3,18 @@
  * Brazilian Portuguese language file
  *
  * @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 do LDAP para procurar por contas de usuários. Eg. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
-$lang['groupfilter']           = 'Filtro do LDAP 0ara procurar por grupos. Eg. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</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['deref']                 = 'Como respeitar aliases ?';
+$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';
-- 
cgit v1.2.3


From d6d855093f24c6c3f608d005189385959a7efbf7 Mon Sep 17 00:00:00 2001
From: DokuWiki Translation <>
Date: Fri, 2 Aug 2013 00:30:58 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/zh-tw/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

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>)';
-- 
cgit v1.2.3


From 8ae55d68448098e1830dc09f9e658fb534aa0dc6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 2 Aug 2013 09:39:49 +0200
Subject: Revert "translation update"

This reverts commit d6d855093f24c6c3f608d005189385959a7efbf7.

I guess it was a bit too early to think straight :-/
---
 lib/plugins/authldap/lang/zh-tw/settings.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index d2513eeff..e93190516 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -1,8 +1,7 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ * Chinese Traditional language file
+ *
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 LDAP 伺服器。填寫主機名稱 (<code>localhost</code>) 或完整的 URL (<code>ldap://server.tld:389</code>)';
-- 
cgit v1.2.3


From 6a8cbb12e8b5d489c3abef4676de0dbee82994c3 Mon Sep 17 00:00:00 2001
From: Henrik <henrik@idealis.se>
Date: Sat, 3 Aug 2013 05:45:55 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/sv/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/sv/settings.php b/lib/plugins/authldap/lang/sv/settings.php
index 0fdcad147..68dbccfd0 100644
--- a/lib/plugins/authldap/lang/sv/settings.php
+++ b/lib/plugins/authldap/lang/sv/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Swedish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['server']                = 'Din LDAO server. Antingen värdnamn (<code>localhost</code>) eller giltig full URL (<code>ldap://server.tld:389</code>)';
-- 
cgit v1.2.3


From 7e2d11334fbe7c1174bfe6711f88a5625e982042 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:42:41 +0200
Subject: add 'danger' alert to authldap config settings

---
 lib/plugins/authldap/conf/metadata.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index a3256628c..a165a322c 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' => 'danger');
\ No newline at end of file
-- 
cgit v1.2.3


From bed4ab799d58cd04a3fabc7355084181da86e843 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 18:09:35 +0200
Subject: change 'debug' setting to 'security' (rather than 'danger')

---
 lib/plugins/authldap/conf/metadata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index a165a322c..6aa53c40d 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -16,4 +16,4 @@ $meta['bindpw']      = array('password','_caution' => 'danger');
 $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' => 'danger');
\ No newline at end of file
+$meta['debug']       = array('onoff','_caution' => 'security');
\ No newline at end of file
-- 
cgit v1.2.3


From 5d92c7d222f614c23229a455bc6738bbaaf0a6ce Mon Sep 17 00:00:00 2001
From: mprins <mprins@users.sf.net>
Date: Sun, 4 Aug 2013 10:50:57 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/nl/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index 274c3b7fc..958bd4d6f 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $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';
-- 
cgit v1.2.3


From d5808163ba1734a45356b87153595c69205f0756 Mon Sep 17 00:00:00 2001
From: Sven <Svenluecke48@gmx.d>
Date: Sun, 4 Aug 2013 16:55:57 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/de/settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index b237201d8..b24c792f9 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
-- 
cgit v1.2.3


From c03b461102c569da6cded4ca3c473f5ae149cea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20H=C3=A4rnqvist?= <tor.harnqvist@gmail.com>
Date: Sun, 4 Aug 2013 23:00:55 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/sv/settings.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/sv/settings.php b/lib/plugins/authldap/lang/sv/settings.php
index 68dbccfd0..d98400461 100644
--- a/lib/plugins/authldap/lang/sv/settings.php
+++ b/lib/plugins/authldap/lang/sv/settings.php
@@ -4,6 +4,7 @@
  * @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';
@@ -12,6 +13,7 @@ $lang['grouptree']             = 'Specificera var grupper finns. T.ex. <code>ou=
 $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';
-- 
cgit v1.2.3


From 544130397f3b68808f74d98f8681a07448c25899 Mon Sep 17 00:00:00 2001
From: tsangho <ou4222@gmail.com>
Date: Mon, 5 Aug 2013 20:15:57 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/zh-tw/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

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>)';
-- 
cgit v1.2.3


From 7e45525650fd98a7cfd14c3484eb5add715c24a5 Mon Sep 17 00:00:00 2001
From: Rachel <rzhang0802@gmail.com>
Date: Tue, 6 Aug 2013 09:11:09 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/zh/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index 3f38deae9..b531c192a 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>)';
-- 
cgit v1.2.3


From 9646a812f0f8451f1931e0fb702576c94560475e Mon Sep 17 00:00:00 2001
From: Edmondo Di Tucci <snarchio@gmail.com>
Date: Thu, 8 Aug 2013 15:10:56 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/it/settings.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

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?';
-- 
cgit v1.2.3


From dba5f66fc1f3f8bd61cdda736dd1a2d00b628164 Mon Sep 17 00:00:00 2001
From: Emmanuel <seedfloyd@gmail.com>
Date: Thu, 8 Aug 2013 20:15:57 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/fr/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php
index 3df09eb7c..607eed24d 100644
--- a/lib/plugins/authldap/lang/fr/settings.php
+++ b/lib/plugins/authldap/lang/fr/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $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>)';
-- 
cgit v1.2.3


From f4399459c78289d4e4d41039094596cd4fff893a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 10 Aug 2013 13:25:58 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/nl/settings.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index 958bd4d6f..b6eed6f38 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -3,6 +3,7 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
+ * @author Gerrit Uitslag <klapinklapin@gmail.com>
  */
 $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';
@@ -13,9 +14,14 @@ $lang['groupfilter']           = 'LDAP groepsfilter. Bijv. <code>(&amp;(objectCl
 $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['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';
-- 
cgit v1.2.3


From fe37a6515e213f6a0f1302a5a0807033205ffee5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 12:28:16 +0200
Subject: improved bundled plugin descriptions

---
 lib/plugins/authldap/plugin.info.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

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
-- 
cgit v1.2.3


From 9b864f22ffb017242eb721f9b3de4fc1094ba8bc Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Mon, 12 Aug 2013 16:05:58 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ko/settings.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 6200a03b9..898b8f37a 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>) 중 하나';
@@ -20,7 +21,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 (항상)';
+$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)';
-- 
cgit v1.2.3


From 198dcd63fcefa4e89209cc1a540057b0fe7138b3 Mon Sep 17 00:00:00 2001
From: christian studer <cstuder@existenz.ch>
Date: Thu, 15 Aug 2013 09:20:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/de/settings.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index b24c792f9..d788da876 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -4,6 +4,7 @@
  * @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';
-- 
cgit v1.2.3


From c92968d1297188120d60b9de773b7c19915bc088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederico=20Gon=C3=A7alves=20Guimar=C3=A3es?=
 <frederico@teia.bio.br>
Date: Thu, 15 Aug 2013 11:36:04 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/pt-br/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/pt-br/settings.php b/lib/plugins/authldap/lang/pt-br/settings.php
index d12a9cf36..6ad6b4862 100644
--- a/lib/plugins/authldap/lang/pt-br/settings.php
+++ b/lib/plugins/authldap/lang/pt-br/settings.php
@@ -1,7 +1,8 @@
 <?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>
  */
-- 
cgit v1.2.3


From ab090718d52f2360b769f039b1bf5f496f23097f Mon Sep 17 00:00:00 2001
From: Felipe Castro <fefcas@yahoo.com.br>
Date: Thu, 15 Aug 2013 13:56:24 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/eo/settings.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

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';
-- 
cgit v1.2.3


From f0ee5aeb8e64276eee9beab496d611a28bb0a013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20K=C5=99ivka?= <krivka@fit.vutbr.cz>
Date: Thu, 15 Aug 2013 22:20:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/cs/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/cs/settings.php b/lib/plugins/authldap/lang/cs/settings.php
index 783d2a3ae..b2b5b59dc 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>)';
-- 
cgit v1.2.3


From 68389009e322909ba9f85af41320c4886ca27309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Neves?= <drakferion@gmail.com>
Date: Fri, 16 Aug 2013 04:11:01 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/pt/settings.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/pt/settings.php

(limited to 'lib/plugins/authldap')

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';
-- 
cgit v1.2.3


From a08059e44c9e3e1da368455ccf56a2ad361613b3 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Mon, 19 Aug 2013 02:55:58 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ko/settings.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 898b8f37a..5c5341b31 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -21,7 +21,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)';
+$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';
-- 
cgit v1.2.3


From 9fb553c08c19ca0ce9d63813af849413410a0b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Pl=C3=B6ger?= <develop@dieploegers.de>
Date: Mon, 19 Aug 2013 13:35:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/de-informal/settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/de-informal/settings.php b/lib/plugins/authldap/lang/de-informal/settings.php
index 15e4d8129..bdac7dd68 100644
--- a/lib/plugins/authldap/lang/de-informal/settings.php
+++ b/lib/plugins/authldap/lang/de-informal/settings.php
@@ -1,8 +1,8 @@
 <?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>
  */
-- 
cgit v1.2.3


From bcc165558b4d58baab4ccc85d9066f0c4ba7de2a Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Tue, 20 Aug 2013 23:05:58 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ru/settings.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

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']                = 'Пароль для указанного пользователя.';
-- 
cgit v1.2.3


From 2f182b4aa999e7ae84995869c0df72a03926b5f6 Mon Sep 17 00:00:00 2001
From: schplurtz <Schplurtz@laposte.net>
Date: Sun, 15 Sep 2013 16:16:19 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/fr/settings.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php
index 607eed24d..f8d29e7ed 100644
--- a/lib/plugins/authldap/lang/fr/settings.php
+++ b/lib/plugins/authldap/lang/fr/settings.php
@@ -4,6 +4,7 @@
  * @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';
@@ -14,6 +15,7 @@ $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';
-- 
cgit v1.2.3


From e8497e5416a7a09d55b87de0ad0d38dc9e85438d Mon Sep 17 00:00:00 2001
From: schplurtz <Schplurtz@laposte.net>
Date: Mon, 16 Sep 2013 22:01:01 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/fr/settings.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php
index f8d29e7ed..dc475071e 100644
--- a/lib/plugins/authldap/lang/fr/settings.php
+++ b/lib/plugins/authldap/lang/fr/settings.php
@@ -22,3 +22,7 @@ $lang['userscope']             = 'Limiter la portée de recherche d\'utilisateur
 $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';
-- 
cgit v1.2.3


From 4f11d93def5599386f32a03401a73e7175679f22 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 20 Sep 2013 16:32:08 +0200
Subject: skips 'count' entries in ldap results. Fixes FS#2370

---
 lib/plugins/authldap/auth.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

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 {
-- 
cgit v1.2.3


From 0da02e4da30749eeeec74b09658d8aac595a4fb7 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Tue, 1 Oct 2013 23:45:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/sk/settings.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/sk/settings.php

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
new file mode 100644
index 000000000..759c92304
--- /dev/null
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Martin Michalek <michalek.dev@gmail.com>
+ */
+$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';
-- 
cgit v1.2.3


From 8d761d98c3f60eea7b8a37355e516bced5a27a25 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <sawadakun@live.jp>
Date: Fri, 4 Oct 2013 19:00:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ja/settings.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php
index fdc6fc434..cee7b059c 100644
--- a/lib/plugins/authldap/lang/ja/settings.php
+++ b/lib/plugins/authldap/lang/ja/settings.php
@@ -1,6 +1,18 @@
 <?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>
  */
+$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['binddn']                = '匿名バインドでは不十分な場合、オプションバインドユーザーのDN。例：<code>cn=admin, dc=my, dc=home</code>';
+$lang['bindpw']                = '上記ユーザーのパスワード';
+$lang['debug']                 = 'エラーに関して追加のデバッグ情報を表示する。';
-- 
cgit v1.2.3


From 30d21b979563135c12048a582ef5877368ef3d95 Mon Sep 17 00:00:00 2001
From: Serenity87HUN <anikototh87@gmail.com>
Date: Mon, 7 Oct 2013 15:16:34 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/hu/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/hu/settings.php b/lib/plugins/authldap/lang/hu/settings.php
index b4b28d0a0..041f82755 100644
--- a/lib/plugins/authldap/lang/hu/settings.php
+++ b/lib/plugins/authldap/lang/hu/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Hungarian language file
- *
+ * @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>)';
-- 
cgit v1.2.3


From 88f4ee239da1f6158c3adc8549bdd688e3d9b2a3 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Tue, 8 Oct 2013 20:16:36 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ja/settings.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php
index cee7b059c..6dec9a576 100644
--- a/lib/plugins/authldap/lang/ja/settings.php
+++ b/lib/plugins/authldap/lang/ja/settings.php
@@ -5,6 +5,7 @@
  * 
  * @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サーバーポート';
@@ -13,6 +14,11 @@ $lang['grouptree']             = 'ユーザーグループを探す場所。例
 $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';
-- 
cgit v1.2.3


From 8fd5faebc6501c1fd7ef719de47f639d097912c9 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Thu, 10 Oct 2013 08:45:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/sk/settings.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
index 759c92304..8dd087a22 100644
--- a/lib/plugins/authldap/lang/sk/settings.php
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -5,6 +5,17 @@
  * 
  * @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 nebola vyššie zadané úplné URL';
+$lang['usertree']              = 'Kde je možné nájsť účty používateľov. Napr. <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Kde je možné nájsť skupiny 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';
-- 
cgit v1.2.3


From 1da2eb6fdf5ffff04e1bb6153a89d033a4b2c7f2 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Mon, 14 Oct 2013 02:01:01 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/sk/settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
index 8dd087a22..48bd37395 100644
--- a/lib/plugins/authldap/lang/sk/settings.php
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -6,9 +6,9 @@
  * @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 nebola vyššie zadané úplné URL';
-$lang['usertree']              = 'Kde je možné nájsť účty používateľov. Napr. <code>ou=People, dc=server, dc=tld</code>';
-$lang['grouptree']             = 'Kde je možné nájsť skupiny používateľov. Napr. <code>ou=Group, dc=server, dc=tld</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>';
-- 
cgit v1.2.3


From 48e49553b3ae1dc9624cdd96b34ffe0175ba8ae3 Mon Sep 17 00:00:00 2001
From: Jens Hyllegaard <jens.hyllegaard@gmail.com>
Date: Mon, 21 Oct 2013 14:36:35 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/da/settings.php | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/da/settings.php

(limited to 'lib/plugins/authldap')

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';
-- 
cgit v1.2.3


From 57b3faf82ad2686f1ecd0678266a38a24fd23736 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Tue, 22 Oct 2013 14:31:02 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/zh/settings.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index b531c192a..77c2c6952 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -20,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';
-- 
cgit v1.2.3


From 269e961b5d395674d18eb2bd82814b2620c05c19 Mon Sep 17 00:00:00 2001
From: Remon <no@email.local>
Date: Fri, 25 Oct 2013 14:00:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/nl/settings.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index b6eed6f38..193d1a386 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -4,16 +4,17 @@
  * @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';
-- 
cgit v1.2.3


From c3d02ebb91843d2fbaaea8acf3079add3fa77f8a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sun, 27 Oct 2013 13:26:03 +0100
Subject: Fix issues from teams:i18n:translation-check in localizations

---
 lib/plugins/authldap/lang/cs/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/cs/settings.php b/lib/plugins/authldap/lang/cs/settings.php
index b2b5b59dc..20491f1fb 100644
--- a/lib/plugins/authldap/lang/cs/settings.php
+++ b/lib/plugins/authldap/lang/cs/settings.php
@@ -10,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?';
-- 
cgit v1.2.3


From b4304655d0b09ba0a958b9cf56f1bf699cf05b84 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 8 Nov 2013 10:48:50 +0100
Subject: Fix password decryption during LDAP rebinding

The LDAP rebinding was still using the old blowfish encryption instead
of AES so rebinding failed.
---
 lib/plugins/authldap/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index de1332282..31e2c5135 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -166,7 +166,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
             // be accessible anonymously, so we try to rebind the current user here
             list($loginuser, $loginsticky, $loginpass) = auth_getCookie();
             if($loginuser && $loginpass) {
-                $loginpass = PMA_blowfish_decrypt($loginpass, auth_cookiesalt(!$loginsticky));
+                $loginpass = auth_decrypt($loginpass, auth_cookiesalt(!$loginsticky, true));
                 $this->checkPass($loginuser, $loginpass);
             }
         }
-- 
cgit v1.2.3


From fb4828803b474f9729dcc8e9920b19b7bc533a54 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny0838@gmail.com>
Date: Mon, 11 Nov 2013 09:26:50 +0800
Subject: Update zh-tw translation

---
 lib/plugins/authldap/lang/zh-tw/settings.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index d2513eeff..7e35ef632 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
@@ -20,3 +19,8 @@ $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';
-- 
cgit v1.2.3


From ac4d41ba8ae73bb61890475242df4887e1f58399 Mon Sep 17 00:00:00 2001
From: soer9648 <soer9648@eucl.dk>
Date: Tue, 12 Nov 2013 20:52:27 +0100
Subject: translation update

---
 lib/plugins/authldap/lang/da/settings.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/da/settings.php b/lib/plugins/authldap/lang/da/settings.php
index a3558aa5c..b736504a5 100644
--- a/lib/plugins/authldap/lang/da/settings.php
+++ b/lib/plugins/authldap/lang/da/settings.php
@@ -4,6 +4,12 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
+ * @author soer9648 <soer9648@eucl.dk>
  */
 $lang['server']                = 'Din LDAP server. Enten værtsnavn (<code>localhost</code>) eller fuld kvalificeret URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'LDAP server port, hvis der ikke er angivet en komplet URL ovenfor.';
+$lang['usertree']              = 'Hvor findes brugerkonti. F.eks. <code>ou=Personer, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Hvor findes brugergrupper. F.eks. <code>ou=Grupper, dc=server, dc=tld</code>';
+$lang['starttls']              = 'Benyt TLS forbindelser?';
+$lang['bindpw']                = 'Kodeord til ovenstående bruger';
 $lang['debug']                 = 'Vis yderligere debug output ved fejl';
-- 
cgit v1.2.3


From 9970bf3ddc2f2a04491ead0bf54523270c3f0102 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Tue, 12 Nov 2013 20:56:02 +0100
Subject: translation update

---
 lib/plugins/authldap/lang/sk/settings.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
index 48bd37395..c44f07e97 100644
--- a/lib/plugins/authldap/lang/sk/settings.php
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -13,7 +13,13 @@ $lang['userfilter']            = 'LDAP filter pre vyhľadávanie používateľsk
 $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['referrals']             = 'Majú byť nasledované odkazy na používateľov (referrals)?';
+$lang['deref']                 = 'Ako previesť aliasy?';
+$lang['binddn']                = 'DN prípadného priradenia používateľa, ak anonymné priradenie nie je dostatočné. Napr. <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = 'Heslo vyššie uvedeného používateľa';
+$lang['userscope']             = 'Obmedzenie oblasti pri vyhľadávaní používateľa';
+$lang['groupscope']            = 'Obmedzenie oblasti pri vyhľadávaní skupiny';
+$lang['groupkey']              = 'Príslušnost k skupine určená z daného atribútu používateľa (namiesto štandardnej AD skupiny) napr. skupiny podľa oddelenia alebo telefónneho čísla';
 $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';
-- 
cgit v1.2.3


From dc4e861bc179b74b87293e83e19a73f781d41690 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 16 Nov 2013 01:30:59 +0100
Subject: translation update

---
 lib/plugins/authldap/lang/ko/settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 5c5341b31..ae8dc7ab6 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -17,8 +17,8 @@ $lang['referrals']             = '참고(referrals)를 허용하겠습니까? ';
 $lang['deref']                 = '어떻게 별명을 간접 참고하겠습니까?';
 $lang['binddn']                = '익명 바인드가 충분하지 않으면 선택적인 바인드 사용자의 DN. 예를 들어 <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = '위 사용자의 비밀번호';
-$lang['userscope']             = '사용자 찾기에 대한 찾기 범위 제한';
-$lang['groupscope']            = '그룹 찾기에 대한 찾기 범위 제한';
+$lang['userscope']             = '사용자 검색에 대한 검색 범위 제한';
+$lang['groupscope']            = '그룹 검색에 대한 검색 범위 제한';
 $lang['groupkey']              = '(표준 AD 그룹 대신) 사용자 속성에서 그룹 구성원. 예를 들어 부서나 전화에서 그룹';
 $lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이기';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
-- 
cgit v1.2.3