From b21beefdfa477fe0e5810051462f134b3f0e99a9 Mon Sep 17 00:00:00 2001
From: Ivan Peltekov <ivan.peltekov@abv.bg>
Date: Tue, 31 Dec 2013 05:26:40 +0100
Subject: translation update

---
 lib/plugins/authad/lang/bg/settings.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/bg/settings.php b/lib/plugins/authad/lang/bg/settings.php
index 877810c4e..bf7a2d8ce 100644
--- a/lib/plugins/authad/lang/bg/settings.php
+++ b/lib/plugins/authad/lang/bg/settings.php
@@ -1,18 +1,19 @@
 <?php
+
 /**
- * Bulgarian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Kiril <neohidra@gmail.com>
  */
-$lang['account_suffix']     = 'Наставка на акаунта Ви. Например <code>@някакъв.домейн.org</code>';
-$lang['base_dn']            = 'Вашият основен DN. Например <code>DC=моят,DC=домейн,DC=org</code>';
-$lang['domain_controllers'] = 'Domain controller списък, разделете сървърите със запетая. Например <code>сървър1.домейн.org,сървър2.домейн.org</code>';
-$lang['admin_username']     = 'Привилегирован Active Directory потребител с достъп до данните на останалите потребители. Не е задължително, но е необходимо за някои функционалности като изпращането на имейл за абонаменти.';
-$lang['admin_password']     = 'Паролата на горния потребител.';
-$lang['sso']                = 'Да се ползва ли еднократно вписване чрез Kerberos или NTLM?';
-$lang['real_primarygroup']  = 'Да се извлича ли истинската група вместо да се предполага "Domain Users" (по-бавно)';
-$lang['use_ssl']            = 'Ползване на SSL свързаност? Не отбелязвайте TLS (по-долу) ако включите опцията.';
-$lang['use_tls']            = 'Ползване на TLS свързаност? Не отбелязвайте SSL (по-горе) ако включите опцията.';
-$lang['debug']              = 'Показване на допълнителна debug информация при грешка?';
-$lang['expirywarn']         = 'Предупреждаване на потребителите Х дни преди изтичане валидността на паролата им. Въведете 0 за изключване.';
-$lang['additional']         = 'Списък с допълнителни AD атрибути за извличане от потребителските данни (разделяйте ги със запетая). Ползва се от няколко приставки.';
\ No newline at end of file
+$lang['account_suffix']        = 'Наставка на акаунта Ви. Например <code>@някакъв.домейн.org</code>';
+$lang['base_dn']               = 'Вашият основен DN. Например <code>DC=моят,DC=домейн,DC=org</code>';
+$lang['domain_controllers']    = 'Domain controller списък, разделете сървърите със запетая. Например <code>сървър1.домейн.org,сървър2.домейн.org</code>';
+$lang['admin_username']        = 'Привилегирован Active Directory потребител с достъп до данните на останалите потребители. Не е задължително, но е необходимо за някои функционалности като изпращането на имейл за абонаменти.';
+$lang['admin_password']        = 'Паролата на горния потребител.';
+$lang['sso']                   = 'Да се ползва ли еднократно вписване чрез Kerberos или NTLM?';
+$lang['real_primarygroup']     = 'Да се извлича ли истинската група вместо да се предполага "Domain Users" (по-бавно)';
+$lang['use_ssl']               = 'Ползване на SSL свързаност? Не отбелязвайте TLS (по-долу) ако включите опцията.';
+$lang['use_tls']               = 'Ползване на TLS свързаност? Не отбелязвайте SSL (по-горе) ако включите опцията.';
+$lang['debug']                 = 'Показване на допълнителна debug информация при грешка?';
+$lang['expirywarn']            = 'Предупреждаване на потребителите Х дни преди изтичане валидността на паролата им. Въведете 0 за изключване.';
+$lang['additional']            = 'Списък с допълнителни AD атрибути за извличане от потребителските данни (разделяйте ги със запетая). Ползва се от няколко приставки.';
-- 
cgit v1.2.3


From e0ea4d0265aa17eb004a22f57641362e2a82ce7a Mon Sep 17 00:00:00 2001
From: alhajr <alhajr300@gmail.com>
Date: Sun, 5 Jan 2014 03:11:35 +0100
Subject: translation update

---
 lib/plugins/authad/lang/ar/settings.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 lib/plugins/authad/lang/ar/settings.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ar/settings.php b/lib/plugins/authad/lang/ar/settings.php
new file mode 100644
index 000000000..d2a2e2a35
--- /dev/null
+++ b/lib/plugins/authad/lang/ar/settings.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author alhajr <alhajr300@gmail.com>
+ */
+$lang['account_suffix']        = 'لاحقة الحساب الخاص بك. على سبيل المثال. <code>@my.domain.org</code>';
+$lang['domain_controllers']    = 'قائمة مفصولة بفواصل من وحدات التحكم بالمجال. على سبيل المثال. <code>srv1.domain.org,srv2.domain.org</code>';
+$lang['admin_password']        = 'كلمة المرور للمستخدم أعلاه.';
+$lang['real_primarygroup']     = 'ينبغي أن تحل المجموعة الأساسية الحقيقية بدلاً من افتراض "Domain Users" (أبطأ).';
+$lang['expirywarn']            = 'عدد الأيام المقدمة لتحذير المستخدم حول كلمة مرور منتهية الصلاحية. (0) للتعطيل.';
-- 
cgit v1.2.3


From 7264d332a1a7e451039aeb9630fc3ab287cf82b5 Mon Sep 17 00:00:00 2001
From: oott123 <ip.192.168.1.1@qq.com>
Date: Sun, 12 Jan 2014 11:56:45 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php
index 84bdc1e5c..52ba2131b 100644
--- a/lib/plugins/authad/lang/zh/settings.php
+++ b/lib/plugins/authad/lang/zh/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author lainme <lainme993@gmail.com>
+ * @author oott123 <ip.192.168.1.1@qq.com>
  */
 $lang['account_suffix']        = '您的账户后缀。例如 <code>@my.domain.org</code>';
 $lang['base_dn']               = '您的基本分辨名。例如 <code>DC=my,DC=domain,DC=org</code>';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = '逗号分隔的域名控制器列表。例如
 $lang['admin_username']        = '一个活动目录的特权用户，可以查看其他所有用户的数据。可选，但对某些活动例如发送订阅邮件是必须的。';
 $lang['admin_password']        = '上述用户的密码。';
 $lang['sso']                   = '是否使用经由 Kerberos 和 NTLM 的 Single-Sign-On？';
+$lang['sso_charset']           = '服务器传入 Kerberos 或者 NTLM 用户名的编码。留空为 UTF-8 或 latin-1 。此功能需要服务器支持iconv扩展。';
 $lang['real_primarygroup']     = ' 是否解析真实的主要组，而不是假设为“域用户” (较慢)';
 $lang['use_ssl']               = '使用 SSL 连接？如果是，不要激活下面的 TLS。';
 $lang['use_tls']               = '使用 TLS 连接？如果是 ，不要激活上面的 SSL。';
-- 
cgit v1.2.3


From 99c82aef828dad38bcd97e73685ed1ac87a0729f Mon Sep 17 00:00:00 2001
From: Erli Moen <evseev.jr@gmail.com>
Date: Sun, 19 Jan 2014 01:31:08 +0100
Subject: translation update

---
 lib/plugins/authad/lang/ru/settings.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 6854e0920..e662300d7 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -6,8 +6,11 @@
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Artur <ncuxxx@gmail.com>
+ * @author Erli Moen <evseev.jr@gmail.com>
  */
+$lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
+$lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
-- 
cgit v1.2.3


From 13bc346a49104660b7e9bd823bcc35dfa577d0ae Mon Sep 17 00:00:00 2001
From: Marina Vladi <deldadam@gmail.com>
Date: Sun, 19 Jan 2014 01:56:10 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/hu/settings.php b/lib/plugins/authad/lang/hu/settings.php
index 1510e1756..05acbdc2d 100644
--- a/lib/plugins/authad/lang/hu/settings.php
+++ b/lib/plugins/authad/lang/hu/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Marton Sebok <sebokmarton@gmail.com>
+ * @author Marina Vladi <deldadam@gmail.com>
  */
 $lang['account_suffix']        = 'Felhasználói azonosító végződése, pl. <code>@my.domain.org</code>.';
 $lang['base_dn']               = 'Bázis DN, pl. <code>DC=my,DC=domain,DC=org</code>.';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = 'Tartománykezelők listája vesszővel elvála
 $lang['admin_username']        = 'Privilegizált AD felhasználó, aki az összes feéhasználó adatait elérheti. Elhagyható, de bizonyos funkciókhoz, például a feliratkozási e-mailek kiküldéséhez szükséges.';
 $lang['admin_password']        = 'Ehhez tartozó jelszó.';
 $lang['sso']                   = 'Single-Sign-On Kerberos-szal vagy NTML használata?';
+$lang['sso_charset']           = 'A webkiszolgáló karakterkészlete megfelel a Kerberos- és NTLM-felhasználóneveknek. Üres UTF-8 és Latin-1-hez. Szükséges az iconv bővítmény.';
 $lang['real_primarygroup']     = 'A valódi elsődleges csoport feloldása a "Tartományfelhasználók" csoport használata helyett? (lassabb)';
 $lang['use_ssl']               = 'SSL használata? Ha használjuk, tiltsuk le a TLS-t!';
 $lang['use_tls']               = 'TLS használata? Ha használjuk, tiltsuk le az SSL-t!';
-- 
cgit v1.2.3


From 1093058c04263725937daf750bfe776178f80f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jan=20Czocha=C5=84ski?= <czochanski@gmail.com>
Date: Tue, 21 Jan 2014 22:21:08 +0100
Subject: translation update

---
 lib/plugins/authad/lang/pl/settings.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php
index ad051b0ac..4e397fc98 100644
--- a/lib/plugins/authad/lang/pl/settings.php
+++ b/lib/plugins/authad/lang/pl/settings.php
@@ -4,10 +4,17 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Tomasz Bosak <bosak.tomasz@gmail.com>
+ * @author Paweł Jan Czochański <czochanski@gmail.com>
  */
 $lang['account_suffix']        = 'Przyrostek twojej nazwy konta np. <code>@my.domain.org</code>';
 $lang['base_dn']               = 'Twoje bazowe DN. Na przykład: <code>DC=my,DC=domain,DC=org</code>';
+$lang['domain_controllers']    = 'Podzielona przecinkami lista kontrolerów domen np. <code>srv1.domena.pl,srv2.domena.pl</code>';
+$lang['admin_username']        = 'Uprawniony użytkownik katalogu Active Directory z dostępem do danych wszystkich użytkowników.
+Opcjonalne, ale wymagane dla niektórych akcji np. wysyłania emailowych subskrypcji.';
 $lang['admin_password']        = 'Hasło dla powyższego użytkownika.';
+$lang['sso']                   = 'Czy pojedyncze logowanie powinno korzystać z Kerberos czy NTML?';
+$lang['sso_charset']           = 'Kodowanie znaków wykorzystywane do przesyłania nazwy użytkownika dla Kerberos lub NTLM. Pozostaw puste dla UTF-8 lub latin-1. Wymaga rozszerzenia iconv.';
 $lang['use_ssl']               = 'Użyć połączenie SSL? Jeśli tak to nie aktywuj TLS poniżej.';
 $lang['use_tls']               = 'Użyć połączenie TLS? Jeśli tak to nie aktywuj SSL powyżej.';
+$lang['debug']                 = 'Wyświetlać dodatkowe informacje do debugowania w przypadku błędów?';
 $lang['expirywarn']            = 'Dni poprzedzających powiadomienie użytkownika o wygasającym haśle. 0 aby wyłączyć.';
-- 
cgit v1.2.3


From 975e2a1982518e206667387f0540ce46e5c482ca Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jan 2014 17:33:18 +0100
Subject: removed empty language files

our translation interface used to submit empty files for a while but no
longer does, so these can go
---
 lib/plugins/authad/lang/lv/settings.php | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 lib/plugins/authad/lang/lv/settings.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/lv/settings.php b/lib/plugins/authad/lang/lv/settings.php
deleted file mode 100644
index ced5dabf8..000000000
--- a/lib/plugins/authad/lang/lv/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * Latvian, Lettish language file
- *
- * @author Aivars Miška <allefm@gmail.com>
- */
-- 
cgit v1.2.3


From 58e8fa00c247b8a7a4a1c12aff0223d73325c4d3 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Sat, 25 Jan 2014 06:41:06 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/sk/settings.php b/lib/plugins/authad/lang/sk/settings.php
index b7d822f7e..266b372bb 100644
--- a/lib/plugins/authad/lang/sk/settings.php
+++ b/lib/plugins/authad/lang/sk/settings.php
@@ -15,6 +15,6 @@ $lang['sso_charset']           = 'Znaková sada, v ktorej bude webserver prená
 $lang['real_primarygroup']     = 'Použiť skutočnú primárnu skupinu používateľa namiesto "Doménoví používatelia" (pomalšie).';
 $lang['use_ssl']               = 'Použiť SSL pripojenie? Ak áno, nepovoľte TLS nižšie.';
 $lang['use_tls']               = 'Použiť TLS pripojenie? Ak áno, nepovoľte SSL vyššie.';
-$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe?';
+$lang['debug']                 = 'Zobraziť dodatočné ladiace informácie pri chybe?';
 $lang['expirywarn']            = 'Počet dní pred uplynutím platnosti hesla, počas ktorých používateľ dostáva upozornenie. 0 deaktivuje túto voľbu.';
 $lang['additional']            = 'Zoznam dodatočných AD atribútov oddelených čiarkou získaných z údajov používateľa. Používané niektorými pluginmi.';
-- 
cgit v1.2.3


From d02f9f2ee154cb5ee9683b63d6c7bdf6e9c02236 Mon Sep 17 00:00:00 2001
From: Momo50 <c.brothelande@gmail.com>
Date: Sat, 25 Jan 2014 16:16:10 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php
index d05390efc..84e0d00d9 100644
--- a/lib/plugins/authad/lang/fr/settings.php
+++ b/lib/plugins/authad/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 Momo50 <c.brothelande@gmail.com>
  */
 $lang['account_suffix']        = 'Le suffixe de votre compte. Ex.: <code>@mon.domaine.org</code>';
 $lang['base_dn']               = 'Votre nom de domaine de base. <code>DC=mon,DC=domaine,DC=org</code>';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = 'Une liste de contrôleurs de domaine séparés
 $lang['admin_username']        = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.';
 $lang['admin_password']        = 'Le mot de passe de l\'utilisateur ci-dessus.';
 $lang['sso']                   = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?';
+$lang['sso_charset']           = 'Le jeu de caractères de votre serveur web va passer le nom d\'utilisateur Kerberos ou NTLM. Vide pour UTF-8 ou latin-1. Nécessite l\'extension iconv.';
 $lang['real_primarygroup']     = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?';
 $lang['use_ssl']               = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.';
 $lang['use_tls']               = 'Utiliser une connexion TLS? Si utilisée, n\'activez pas SSL ci-dessus.';
-- 
cgit v1.2.3


From 3402a2df526d2f8e344fefabb895bfa7de27ef32 Mon Sep 17 00:00:00 2001
From: matej <mateju@svn.gnome.org>
Date: Tue, 4 Feb 2014 13:31:10 +0100
Subject: translation update

---
 lib/plugins/authad/lang/sl/settings.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/sl/settings.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/sl/settings.php b/lib/plugins/authad/lang/sl/settings.php
new file mode 100644
index 000000000..bae467d6d
--- /dev/null
+++ b/lib/plugins/authad/lang/sl/settings.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author matej <mateju@svn.gnome.org>
+ */
+$lang['debug']                 = 'Ali naj bodo prikazane dodatne podrobnosti napak?';
-- 
cgit v1.2.3


From 16ad3fae861bc110881c09b083b2ce9aad6285aa Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 14 Feb 2014 13:32:24 +0100
Subject: fixed some doc strings

---
 lib/plugins/authad/action.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lib/plugins/authad/action.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/action.php b/lib/plugins/authad/action.php
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3


From 741b8a48682890ee68e3f650510fec9a4d47d5b0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 14 Feb 2014 13:57:50 +0100
Subject: Show a domain dropdown when multiple AD domains are configured

This integrates the functionality of the now outdated addomain plugin
directly into the authad plugin and makes multi-domain setups usable
without SSO.

See also https://github.com/cosmocode/dokuwiki-plugin-addomain
---
 lib/plugins/authad/action.php      | 91 ++++++++++++++++++++++++++++++++++++++
 lib/plugins/authad/auth.php        | 25 +++++++++++
 lib/plugins/authad/plugin.info.txt |  2 +-
 3 files changed, 117 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/action.php b/lib/plugins/authad/action.php
index e69de29bb..97be9897e 100644
--- a/lib/plugins/authad/action.php
+++ b/lib/plugins/authad/action.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * DokuWiki Plugin addomain (Action Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <gohr@cosmocode.de>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class action_plugin_addomain
+ */
+class action_plugin_authad extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     */
+    public function register(Doku_Event_Handler &$controller) {
+
+        $controller->register_hook('AUTH_LOGIN_CHECK', 'BEFORE', $this, 'handle_auth_login_check');
+        $controller->register_hook('HTML_LOGINFORM_OUTPUT', 'BEFORE', $this, 'handle_html_loginform_output');
+
+    }
+
+    /**
+     * Adds the selected domain as user postfix when attempting a login
+     *
+     * @param Doku_Event $event
+     * @param array      $param
+     */
+    public function handle_auth_login_check(Doku_Event &$event, $param) {
+        global $INPUT;
+
+        /** @var auth_plugin_authad $auth */
+        global $auth;
+        if(!is_a($auth, 'auth_plugin_authad')) return; // AD not even used
+
+        if($INPUT->str('dom')) {
+            $usr = $auth->cleanUser($event->data['user']);
+            $dom = $auth->_userDomain($usr);
+            if(!$dom) {
+                $usr = "$usr@".$INPUT->str('dom');
+            }
+            $INPUT->post->set('u', $usr);
+            $event->data['user'] = $usr;
+        }
+    }
+
+    /**
+     * Shows a domain selection in the login form when more than one domain is configured
+     *
+     * @param Doku_Event $event
+     * @param array      $param
+     */
+    public function handle_html_loginform_output(Doku_Event &$event, $param) {
+        global $INPUT;
+        /** @var auth_plugin_authad $auth */
+        global $auth;
+        if(!is_a($auth, 'auth_plugin_authad')) return; // AD not even used
+        $domains = $auth->_getConfiguredDomains();
+        if(count($domains) <= 1) return; // no choice at all
+
+        /** @var Doku_Form $form */
+        $form =& $event->data;
+
+        // any default?
+        $dom = '';
+        if($INPUT->has('u')) {
+            $usr = $auth->cleanUser($INPUT->str('u'));
+            $dom = $auth->_userDomain($usr);
+
+            // update user field value
+            if($dom) {
+                $usr          = $auth->_userName($usr);
+                $pos          = $form->findElementByAttribute('name', 'u');
+                $ele          =& $form->getElementAt($pos);
+                $ele['value'] = $usr;
+            }
+        }
+
+        // add select box
+        $element = form_makeListboxField('dom', $domains, $dom, $this->getLang('domain'), '', 'block');
+        $pos     = $form->findElementByAttribute('name', 'p');
+        $form->insertElement($pos + 1, $element);
+    }
+
+}
+
+// vim:ts=4:sw=4:et:
\ No newline at end of file
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index e1d758fb8..db9b179a6 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -511,6 +511,31 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         return $opts;
     }
 
+    /**
+     * Returns a list of configured domains
+     *
+     * The default domain has an empty string as key
+     *
+     * @return array associative array(key => domain)
+     */
+    public function _getConfiguredDomains() {
+        $domains = array();
+        if(empty($this->conf['account_suffix'])) return $domains; // not configured yet
+
+        // add default domain, using the name from account suffix
+        $domains[''] = ltrim($this->conf['account_suffix'], '@');
+
+        // find additional domains
+        foreach($this->conf as $key => $val) {
+            if(is_array($val) && isset($val['account_suffix'])) {
+                $domains[$key] = ltrim($val['account_suffix'], '@');
+            }
+        }
+        ksort($domains);
+
+        return $domains;
+    }
+
     /**
      * Check provided user and userinfo for matching patterns
      *
diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt
index 3af1ddfbe..8774fcf3c 100644
--- a/lib/plugins/authad/plugin.info.txt
+++ b/lib/plugins/authad/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authad
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-04-25
+date   2014-02-14
 name   Active Directory Auth Plugin
 desc   Provides user authentication against a Microsoft Active Directory
 url    http://www.dokuwiki.org/plugin:authad
-- 
cgit v1.2.3


From 9a2c73e86d2549a2cd63d7f772b4bb1a3956e46f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Feb 2014 12:36:15 +0100
Subject: streamlined retrieveUsers() signature over all auth plugins FS#2919

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index e1d758fb8..7e2d902bd 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -332,7 +332,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * @param   array $filter    array of field/pattern pairs, null for no filter
      * @return  array userinfo (refer getUserData for internal userinfo details)
      */
-    public function retrieveUsers($start = 0, $limit = -1, $filter = array()) {
+    public function retrieveUsers($start = 0, $limit = 0, $filter = array()) {
         $adldap = $this->_adldap(null);
         if(!$adldap) return false;
 
@@ -357,7 +357,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
             }
             if($this->_filter($user, $info)) {
                 $result[$user] = $info;
-                if(($limit >= 0) && (++$count >= $limit)) break;
+                if(($limit > 0) && (++$count >= $limit)) break;
             }
         }
         return $result;
-- 
cgit v1.2.3


From 0ba750c06b51626ccace39f0f6be7062eebb0a40 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Feb 2014 13:52:37 +0100
Subject: fixed retrieveUser function in authad

previously it never returned any users
---
 lib/plugins/authad/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 7e2d902bd..a0fec7b52 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -336,7 +336,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         $adldap = $this->_adldap(null);
         if(!$adldap) return false;
 
-        if($this->users === null) {
+        if(!$this->users) {
             //get info for given user
             $result = $adldap->user()->all();
             if (!$result) return array();
-- 
cgit v1.2.3


From 948d482d02c7bfd8a6b00e1339e7e2300acde137 Mon Sep 17 00:00:00 2001
From: Marina Vladi <deldadam@gmail.com>
Date: Sat, 22 Feb 2014 12:51:41 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/hu/settings.php b/lib/plugins/authad/lang/hu/settings.php
index 05acbdc2d..be0592d68 100644
--- a/lib/plugins/authad/lang/hu/settings.php
+++ b/lib/plugins/authad/lang/hu/settings.php
@@ -11,11 +11,11 @@ $lang['base_dn']               = 'Bázis DN, pl. <code>DC=my,DC=domain,DC=org</c
 $lang['domain_controllers']    = 'Tartománykezelők listája vesszővel elválasztva, pl. <code>srv1.domain.org,srv2.domain.org</code>.';
 $lang['admin_username']        = 'Privilegizált AD felhasználó, aki az összes feéhasználó adatait elérheti. Elhagyható, de bizonyos funkciókhoz, például a feliratkozási e-mailek kiküldéséhez szükséges.';
 $lang['admin_password']        = 'Ehhez tartozó jelszó.';
-$lang['sso']                   = 'Single-Sign-On Kerberos-szal vagy NTML használata?';
+$lang['sso']                   = 'Kerberos egyszeri bejelentkezés vagy NTLM használata?';
 $lang['sso_charset']           = 'A webkiszolgáló karakterkészlete megfelel a Kerberos- és NTLM-felhasználóneveknek. Üres UTF-8 és Latin-1-hez. Szükséges az iconv bővítmény.';
 $lang['real_primarygroup']     = 'A valódi elsődleges csoport feloldása a "Tartományfelhasználók" csoport használata helyett? (lassabb)';
 $lang['use_ssl']               = 'SSL használata? Ha használjuk, tiltsuk le a TLS-t!';
 $lang['use_tls']               = 'TLS használata? Ha használjuk, tiltsuk le az SSL-t!';
-$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['debug']                 = 'További hibakeresési üzenetek megjelenítése hiba esetén';
 $lang['expirywarn']            = 'Felhasználók értesítése ennyi nappal a jelszavuk lejárata előtt. 0 a funkció kikapcsolásához.';
-$lang['additional']            = 'Vesszővel elválasztott lista a további AD attribútumok lekéréshez. Néhány plugin használhatja.';
+$lang['additional']            = 'Vesszővel elválasztott lista a további AD attribútumok lekéréséhez. Néhány bővítmény használhatja.';
-- 
cgit v1.2.3


From e30b0f289638b91494ea96d307fd82e1458d6dcf Mon Sep 17 00:00:00 2001
From: Wild <wild.dagger@free.fr>
Date: Sat, 22 Feb 2014 12:47:47 +0100
Subject: translation update

---
 lib/plugins/authad/lang/fr/settings.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php
index 84e0d00d9..d05390efc 100644
--- a/lib/plugins/authad/lang/fr/settings.php
+++ b/lib/plugins/authad/lang/fr/settings.php
@@ -4,7 +4,6 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
- * @author Momo50 <c.brothelande@gmail.com>
  */
 $lang['account_suffix']        = 'Le suffixe de votre compte. Ex.: <code>@mon.domaine.org</code>';
 $lang['base_dn']               = 'Votre nom de domaine de base. <code>DC=mon,DC=domaine,DC=org</code>';
@@ -12,7 +11,6 @@ $lang['domain_controllers']    = 'Une liste de contrôleurs de domaine séparés
 $lang['admin_username']        = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.';
 $lang['admin_password']        = 'Le mot de passe de l\'utilisateur ci-dessus.';
 $lang['sso']                   = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?';
-$lang['sso_charset']           = 'Le jeu de caractères de votre serveur web va passer le nom d\'utilisateur Kerberos ou NTLM. Vide pour UTF-8 ou latin-1. Nécessite l\'extension iconv.';
 $lang['real_primarygroup']     = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?';
 $lang['use_ssl']               = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.';
 $lang['use_tls']               = 'Utiliser une connexion TLS? Si utilisée, n\'activez pas SSL ci-dessus.';
-- 
cgit v1.2.3


From 176279377b99c01aa3ca08bd1a25b134fe7f97b0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 28 Feb 2014 11:20:26 +0100
Subject: fixed merge error

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php
index d05390efc..84e0d00d9 100644
--- a/lib/plugins/authad/lang/fr/settings.php
+++ b/lib/plugins/authad/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 Momo50 <c.brothelande@gmail.com>
  */
 $lang['account_suffix']        = 'Le suffixe de votre compte. Ex.: <code>@mon.domaine.org</code>';
 $lang['base_dn']               = 'Votre nom de domaine de base. <code>DC=mon,DC=domaine,DC=org</code>';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = 'Une liste de contrôleurs de domaine séparés
 $lang['admin_username']        = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.';
 $lang['admin_password']        = 'Le mot de passe de l\'utilisateur ci-dessus.';
 $lang['sso']                   = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?';
+$lang['sso_charset']           = 'Le jeu de caractères de votre serveur web va passer le nom d\'utilisateur Kerberos ou NTLM. Vide pour UTF-8 ou latin-1. Nécessite l\'extension iconv.';
 $lang['real_primarygroup']     = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?';
 $lang['use_ssl']               = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.';
 $lang['use_tls']               = 'Utiliser une connexion TLS? Si utilisée, n\'activez pas SSL ci-dessus.';
-- 
cgit v1.2.3


From 85db969ec27b3f6e656d04a114174a630be90d4c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 28 Feb 2014 11:23:43 +0100
Subject: added missing language strings

---
 lib/plugins/authad/lang/de/lang.php | 10 ++++++++++
 lib/plugins/authad/lang/en/lang.php | 10 ++++++++++
 lib/plugins/authad/lang/ko/lang.php | 10 ++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 lib/plugins/authad/lang/de/lang.php
 create mode 100644 lib/plugins/authad/lang/en/lang.php
 create mode 100644 lib/plugins/authad/lang/ko/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/de/lang.php b/lib/plugins/authad/lang/de/lang.php
new file mode 100644
index 000000000..3f275750c
--- /dev/null
+++ b/lib/plugins/authad/lang/de/lang.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * German language file for addomain plugin
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+
+$lang['domain'] = 'Anmelde-Domäne';
+
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/authad/lang/en/lang.php b/lib/plugins/authad/lang/en/lang.php
new file mode 100644
index 000000000..e2967d662
--- /dev/null
+++ b/lib/plugins/authad/lang/en/lang.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * English language file for addomain plugin
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+
+$lang['domain'] = 'Logon Domain';
+
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/authad/lang/ko/lang.php b/lib/plugins/authad/lang/ko/lang.php
new file mode 100644
index 000000000..1aa436708
--- /dev/null
+++ b/lib/plugins/authad/lang/ko/lang.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Korean language file for addomain plugin
+ *
+ * @author Myeongjin <aranet100@gmail.com>
+ */
+
+$lang['domain'] = '로그온 도메인';
+
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From a854a9a897ade35800abd440c29787ec8429c678 Mon Sep 17 00:00:00 2001
From: Joerg <scooter22@gmx.de>
Date: Thu, 6 Mar 2014 10:46:06 +0100
Subject: translation update

---
 lib/plugins/authad/lang/de/lang.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/de/lang.php b/lib/plugins/authad/lang/de/lang.php
index 3f275750c..eea511d1b 100644
--- a/lib/plugins/authad/lang/de/lang.php
+++ b/lib/plugins/authad/lang/de/lang.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * German language file for addomain plugin
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
-
-$lang['domain'] = 'Anmelde-Domäne';
-
-//Setup VIM: ex: et ts=4 :
+$lang['domain']                = 'Anmelde-Domäne';
-- 
cgit v1.2.3


From 99327e8e4c6bc07af2ebfc62bffee62f35c34025 Mon Sep 17 00:00:00 2001
From: Juan De La Cruz <juann.dlc@gmail.com>
Date: Thu, 6 Mar 2014 15:10:56 +0100
Subject: translation update

---
 lib/plugins/authad/lang/es/lang.php     | 8 ++++++++
 lib/plugins/authad/lang/es/settings.php | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 lib/plugins/authad/lang/es/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/es/lang.php b/lib/plugins/authad/lang/es/lang.php
new file mode 100644
index 000000000..c5b242cba
--- /dev/null
+++ b/lib/plugins/authad/lang/es/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Juan De La Cruz <juann.dlc@gmail.com>
+ */
+$lang['domain']                = 'Dominio de inicio';
diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php
index 98b78056b..9dbd44be8 100644
--- a/lib/plugins/authad/lang/es/settings.php
+++ b/lib/plugins/authad/lang/es/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author monica <may.dorado@gmail.com>
  * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Juan De La Cruz <juann.dlc@gmail.com>
  */
 $lang['account_suffix']        = 'Su cuenta, sufijo. Ejem. <code> @ my.domain.org </ code>';
 $lang['base_dn']               = 'Su base DN. Ejem. <code>DC=my,DC=dominio,DC=org</code>';
@@ -13,3 +14,4 @@ $lang['admin_username']        = 'Un usuario con privilegios de Active Directory
 $lang['admin_password']        = 'La contraseña del usuario anterior.';
 $lang['sso']                   = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?';
 $lang['sso_charset']           = 'La codificación con que tu servidor web pasará el nombre de usuario Kerberos o NTLM. Si es UTF-8 o latin-1 dejar en blanco. Requiere la extensión iconv.';
+$lang['debug']                 = 'Mostrar información adicional de depuración sobre los errores?';
-- 
cgit v1.2.3


From 68321121b4d24c7489400c950afdbe6eba0f417d Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Tue, 11 Mar 2014 18:06:07 +0100
Subject: translation update

---
 lib/plugins/authad/lang/ru/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/ru/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/lang.php b/lib/plugins/authad/lang/ru/lang.php
new file mode 100644
index 000000000..6f3c03e39
--- /dev/null
+++ b/lib/plugins/authad/lang/ru/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ */
+$lang['domain']                = 'Домен';
-- 
cgit v1.2.3


From 2046a6546c8ed62b9a7b33305b6201458f2f8291 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 12 Mar 2014 15:38:28 +0000
Subject: Allow user info to be retrieved without groups

Some parts of dokuwiki (e.g. recent changes, old revisions) can
requests lots of user info (to provide editor names) without
requiring any group information.

This change also implements caching of user info by authmysql &
authpgsql plugins to avoid repeated querying of the DB to retrieve
the same user information.
---
 lib/plugins/authad/auth.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 0860e5756..a3119dda6 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -177,9 +177,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      *
      * @author  James Van Lommel <james@nosq.com>
      * @param string $user
+     * @param bool $requireGroups (optional) - ignored, groups are always supplied by this plugin
      * @return array
      */
-    public function getUserData($user) {
+    public function getUserData($user, $requireGroups=true) {
         global $conf;
         global $lang;
         global $ID;
-- 
cgit v1.2.3


From bc2be47d5025f6340908f521679a214a49066bab Mon Sep 17 00:00:00 2001
From: Rene <wllywlnt@yahoo.com>
Date: Mon, 17 Mar 2014 18:51:15 +0100
Subject: translation update

---
 lib/plugins/authad/lang/nl/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/nl/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/nl/lang.php b/lib/plugins/authad/lang/nl/lang.php
new file mode 100644
index 000000000..75b9aa43f
--- /dev/null
+++ b/lib/plugins/authad/lang/nl/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Rene <wllywlnt@yahoo.com>
+ */
+$lang['domain']                = 'Aanlog Domein';
-- 
cgit v1.2.3


From 494cd513a6a384395f63bcdae7343254acc36e16 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 17 Mar 2014 19:21:31 +0100
Subject: notloggedin removed from nl as well + fix of AD domain string.

---
 lib/plugins/authad/lang/nl/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/nl/lang.php b/lib/plugins/authad/lang/nl/lang.php
index 75b9aa43f..ea8419069 100644
--- a/lib/plugins/authad/lang/nl/lang.php
+++ b/lib/plugins/authad/lang/nl/lang.php
@@ -5,4 +5,4 @@
  * 
  * @author Rene <wllywlnt@yahoo.com>
  */
-$lang['domain']                = 'Aanlog Domein';
+$lang['domain']                = 'Inlog Domein';
-- 
cgit v1.2.3


From 2549a25a3e31bbf5b00c04831062e05640d7b8c0 Mon Sep 17 00:00:00 2001
From: Christopher Schive <chschive@frisurf.no>
Date: Tue, 18 Mar 2014 13:56:35 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/no/settings.php b/lib/plugins/authad/lang/no/settings.php
new file mode 100644
index 000000000..bab5ce67d
--- /dev/null
+++ b/lib/plugins/authad/lang/no/settings.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Christopher Schive <chschive@frisurf.no>
+ */
+$lang['admin_password']        = 'Passordet til brukeren over.';
+$lang['expirywarn']            = 'Antall dager på forhånd brukeren varsles om at passordet utgår. 0 for å deaktivere.';
-- 
cgit v1.2.3


From f7f4c3a286d4822aeeb2537e0c19c9c3f8f103d0 Mon Sep 17 00:00:00 2001
From: ggallon <gwenael.gallon@mac.com>
Date: Mon, 24 Mar 2014 13:56:29 +0100
Subject: translation update

---
 lib/plugins/authad/lang/fr/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/fr/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/fr/lang.php b/lib/plugins/authad/lang/fr/lang.php
new file mode 100644
index 000000000..2de362e41
--- /dev/null
+++ b/lib/plugins/authad/lang/fr/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author ggallon <gwenael.gallon@mac.com>
+ */
+$lang['domain']                = 'Domaine de connexion';
-- 
cgit v1.2.3


From 788d553a1ebe92bace39388b98a10c423cd9ba6f Mon Sep 17 00:00:00 2001
From: Young gon Cha <garmede@gmail.com>
Date: Thu, 3 Apr 2014 02:46:32 +0200
Subject: translation update

---
 lib/plugins/authad/lang/ko/lang.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ko/lang.php b/lib/plugins/authad/lang/ko/lang.php
index 1aa436708..5a2416b2c 100644
--- a/lib/plugins/authad/lang/ko/lang.php
+++ b/lib/plugins/authad/lang/ko/lang.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * Korean language file for addomain plugin
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Myeongjin <aranet100@gmail.com>
  */
-
-$lang['domain'] = '로그온 도메인';
-
-//Setup VIM: ex: et ts=4 :
+$lang['domain']                = '로그온 도메인';
-- 
cgit v1.2.3


From a4bc205acc656841e5020ebf63fa1303ebb4f7d5 Mon Sep 17 00:00:00 2001
From: Clomode <flashmob@gmail.com>
Date: Thu, 3 Apr 2014 23:58:37 +1100
Subject: fixed unclosed tags in some language translations

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php
index 9dbd44be8..087402d1c 100644
--- a/lib/plugins/authad/lang/es/settings.php
+++ b/lib/plugins/authad/lang/es/settings.php
@@ -7,7 +7,7 @@
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Juan De La Cruz <juann.dlc@gmail.com>
  */
-$lang['account_suffix']        = 'Su cuenta, sufijo. Ejem. <code> @ my.domain.org </ code>';
+$lang['account_suffix']        = 'Su cuenta, sufijo. Ejem. <code> @ my.domain.org </code>';
 $lang['base_dn']               = 'Su base DN. Ejem. <code>DC=my,DC=dominio,DC=org</code>';
 $lang['domain_controllers']    = 'Una lista separada por coma de los controladores de dominios. Ejem. <code>srv1.dominio.org,srv2.dominio.org</code>';
 $lang['admin_username']        = 'Un usuario con privilegios de Active Directory con acceso a los datos de cualquier otro usuario. Opcional, pero es necesario para determinadas acciones como el envío de suscripciones de correos electrónicos.';
-- 
cgit v1.2.3


From 07ee73eeefb13e9070c05430d5c2730e696f0061 Mon Sep 17 00:00:00 2001
From: Jernej Vidmar <jernej.vidmar@vidmarboehm.com>
Date: Sat, 5 Apr 2014 13:46:05 +0200
Subject: translation update

---
 lib/plugins/authad/lang/sl/settings.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/sl/settings.php b/lib/plugins/authad/lang/sl/settings.php
index bae467d6d..5849ea431 100644
--- a/lib/plugins/authad/lang/sl/settings.php
+++ b/lib/plugins/authad/lang/sl/settings.php
@@ -4,5 +4,8 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author matej <mateju@svn.gnome.org>
+ * @author Jernej Vidmar <jernej.vidmar@vidmarboehm.com>
  */
+$lang['admin_password']        = 'Geslo zgoraj omenjenega uporabnika';
+$lang['use_tls']               = 'Uporabi TLS povezavo? Če da, ne vključi SSL povezave zgoraj.';
 $lang['debug']                 = 'Ali naj bodo prikazane dodatne podrobnosti napak?';
-- 
cgit v1.2.3


From aafe66b6f625b26207700b72e9828ecc26234145 Mon Sep 17 00:00:00 2001
From: Robert Bogenschneider <bogi@uea.org>
Date: Thu, 10 Apr 2014 10:16:04 +0200
Subject: translation update

---
 lib/plugins/authad/lang/eo/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/eo/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/eo/lang.php b/lib/plugins/authad/lang/eo/lang.php
new file mode 100644
index 000000000..be4abc123
--- /dev/null
+++ b/lib/plugins/authad/lang/eo/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Robert Bogenschneider <bogi@uea.org>
+ */
+$lang['domain']                = 'Ensaluta domajno';
-- 
cgit v1.2.3


From afc19b3d7c042b1257cc4eecd17ad7afba4a4ae9 Mon Sep 17 00:00:00 2001
From: Eloy <ej.perezgomez@gmail.com>
Date: Fri, 11 Apr 2014 19:36:06 +0200
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php
index 087402d1c..13c1144c9 100644
--- a/lib/plugins/authad/lang/es/settings.php
+++ b/lib/plugins/authad/lang/es/settings.php
@@ -6,6 +6,7 @@
  * @author monica <may.dorado@gmail.com>
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Juan De La Cruz <juann.dlc@gmail.com>
+ * @author Eloy <ej.perezgomez@gmail.com>
  */
 $lang['account_suffix']        = 'Su cuenta, sufijo. Ejem. <code> @ my.domain.org </code>';
 $lang['base_dn']               = 'Su base DN. Ejem. <code>DC=my,DC=dominio,DC=org</code>';
@@ -14,4 +15,7 @@ $lang['admin_username']        = 'Un usuario con privilegios de Active Directory
 $lang['admin_password']        = 'La contraseña del usuario anterior.';
 $lang['sso']                   = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?';
 $lang['sso_charset']           = 'La codificación con que tu servidor web pasará el nombre de usuario Kerberos o NTLM. Si es UTF-8 o latin-1 dejar en blanco. Requiere la extensión iconv.';
+$lang['use_ssl']               = '¿Usar conexión SSL? Si se usa, no habilitar TLS abajo.';
+$lang['use_tls']               = '¿Usar conexión TLS? Si se usa, no habilitar SSL arriba.';
 $lang['debug']                 = 'Mostrar información adicional de depuración sobre los errores?';
+$lang['expirywarn']            = 'Días por adelantado para avisar al usuario de que contraseña expirará. 0 para deshabilitar.';
-- 
cgit v1.2.3


From fc4ff0c349240d12ff91559183e1103ad2c5fa91 Mon Sep 17 00:00:00 2001
From: Antonio Bueno <atnbueno@gmail.com>
Date: Wed, 16 Apr 2014 14:36:06 +0200
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php
index 13c1144c9..970259c9c 100644
--- a/lib/plugins/authad/lang/es/settings.php
+++ b/lib/plugins/authad/lang/es/settings.php
@@ -15,7 +15,9 @@ $lang['admin_username']        = 'Un usuario con privilegios de Active Directory
 $lang['admin_password']        = 'La contraseña del usuario anterior.';
 $lang['sso']                   = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?';
 $lang['sso_charset']           = 'La codificación con que tu servidor web pasará el nombre de usuario Kerberos o NTLM. Si es UTF-8 o latin-1 dejar en blanco. Requiere la extensión iconv.';
+$lang['real_primarygroup']     = 'Resolver el grupo primario real en vez de asumir "Domain Users" (más lento)';
 $lang['use_ssl']               = '¿Usar conexión SSL? Si se usa, no habilitar TLS abajo.';
 $lang['use_tls']               = '¿Usar conexión TLS? Si se usa, no habilitar SSL arriba.';
 $lang['debug']                 = 'Mostrar información adicional de depuración sobre los errores?';
 $lang['expirywarn']            = 'Días por adelantado para avisar al usuario de que contraseña expirará. 0 para deshabilitar.';
+$lang['additional']            = 'Una lista separada por comas de atributos AD adicionales a obtener de los datos de usuario. Usado por algunos plugins.';
-- 
cgit v1.2.3


From 3dcaf4be3d109863e587097b4258f61872b5eef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80?=
 <id37736@yandex.ru>
Date: Fri, 25 Apr 2014 09:11:00 +0200
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index e662300d7..c9c6d9f88 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -7,7 +7,9 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Artur <ncuxxx@gmail.com>
  * @author Erli Moen <evseev.jr@gmail.com>
+ * @author Владимир <id37736@yandex.ru>
  */
+$lang['account_suffix']        = 'Суффикс вашего аккаунта типа  <code>@my.domain.org</code>';
 $lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
-- 
cgit v1.2.3


From 227a9832a9d65a12d88704e2bf18db63dae1ad57 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Tue, 13 May 2014 06:36:05 +0200
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/zh/lang.php b/lib/plugins/authad/lang/zh/lang.php
new file mode 100644
index 000000000..2a05aa168
--- /dev/null
+++ b/lib/plugins/authad/lang/zh/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author lainme <lainme993@gmail.com>
+ */
+$lang['domain']                = '登录域';
-- 
cgit v1.2.3


From 1b4623e76a474977d730f37c3c54ff1cf66489ac Mon Sep 17 00:00:00 2001
From: Mati <mackosa@wp.pl>
Date: Wed, 14 May 2014 07:45:56 +0200
Subject: translation update

---
 lib/plugins/authad/lang/pl/settings.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php
index 4e397fc98..91cadca6f 100644
--- a/lib/plugins/authad/lang/pl/settings.php
+++ b/lib/plugins/authad/lang/pl/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Tomasz Bosak <bosak.tomasz@gmail.com>
  * @author Paweł Jan Czochański <czochanski@gmail.com>
+ * @author Mati <mackosa@wp.pl>
  */
 $lang['account_suffix']        = 'Przyrostek twojej nazwy konta np. <code>@my.domain.org</code>';
 $lang['base_dn']               = 'Twoje bazowe DN. Na przykład: <code>DC=my,DC=domain,DC=org</code>';
-- 
cgit v1.2.3


From f88adfe0b3b6ae718cb4a99c6f8363042c7b0b6e Mon Sep 17 00:00:00 2001
From: PzF_X <jp_minecraft@yahoo.co.jp>
Date: Sun, 18 May 2014 13:56:03 +0200
Subject: translation update

---
 lib/plugins/authad/lang/ja/lang.php     | 8 ++++++++
 lib/plugins/authad/lang/ja/settings.php | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 lib/plugins/authad/lang/ja/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ja/lang.php b/lib/plugins/authad/lang/ja/lang.php
new file mode 100644
index 000000000..b40aa5da3
--- /dev/null
+++ b/lib/plugins/authad/lang/ja/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author PzF_X <jp_minecraft@yahoo.co.jp>
+ */
+$lang['domain']                = 'ログオン時のドメイン';
diff --git a/lib/plugins/authad/lang/ja/settings.php b/lib/plugins/authad/lang/ja/settings.php
index f308249ef..118e8348c 100644
--- a/lib/plugins/authad/lang/ja/settings.php
+++ b/lib/plugins/authad/lang/ja/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  * @author Hideaki SAWADA <chuno@live.jp>
+ * @author PzF_X <jp_minecraft@yahoo.co.jp>
  */
 $lang['account_suffix']        = 'アカウントの接尾語。例：<code>@my.domain.org</code>';
 $lang['base_dn']               = 'ベースDN。例：<code>DC=my,DC=domain,DC=org</code>';
@@ -12,6 +13,7 @@ $lang['domain_controllers']    = 'ドメインコントローラのカンマ区
 $lang['admin_username']        = '全ユーザーデータへのアクセス権のある特権Active Directoryユーザー。任意ですが、メール通知の登録等の特定の動作に必要。';
 $lang['admin_password']        = '上記ユーザーのパスワード';
 $lang['sso']                   = 'Kerberos か NTLM を使ったシングルサインオン（SSO）をしますか？';
+$lang['sso_charset']           = 'サーバーは空のUTF-8かLatin-1でKerberosかNTLMユーザネームを送信します。iconv拡張モジュールが必要です。';
 $lang['real_primarygroup']     = '"Domain Users" を仮定する代わりに本当のプライマリグループを解決する（低速）';
 $lang['use_ssl']               = 'SSL接続を使用しますか？使用した場合、下のSSLを有効にしないでください。';
 $lang['use_tls']               = 'TLS接続を使用しますか？使用した場合、上のSSLを有効にしないでください。';
-- 
cgit v1.2.3


From 776b1195ea652eae3a1c5f206d5fe07f3cc2cc67 Mon Sep 17 00:00:00 2001
From: Marton Sebok <sebokmarton@gmail.com>
Date: Tue, 20 May 2014 17:06:16 +0200
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/hu/lang.php b/lib/plugins/authad/lang/hu/lang.php
new file mode 100644
index 000000000..7bb6084b0
--- /dev/null
+++ b/lib/plugins/authad/lang/hu/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Marton Sebok <sebokmarton@gmail.com>
+ */
+$lang['domain']                = 'Bejelentkezési tartomány';
-- 
cgit v1.2.3


From 5883ebc392a1e20e73055568ea00ad07a50caaba Mon Sep 17 00:00:00 2001
From: Murilo <muriloricci@hotmail.com>
Date: Thu, 29 May 2014 22:05:58 +0200
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php
index 45eff5e96..ef0f8f6d2 100644
--- a/lib/plugins/authad/lang/pt/settings.php
+++ b/lib/plugins/authad/lang/pt/settings.php
@@ -4,7 +4,9 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author André Neves <drakferion@gmail.com>
+ * @author Murilo <muriloricci@hotmail.com>
  */
+$lang['account_suffix']        = 'O sufixo da sua conta. Por exemplo, <code>@my.domain.org</code>';
 $lang['admin_password']        = 'A senha para o utilizador acima.';
 $lang['sso']                   = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?';
 $lang['use_ssl']               = 'Usar ligação SSL? Se usada, não ative TLS abaixo.';
-- 
cgit v1.2.3


From 3dc402767b9058811762f67a7a3a21d50e81a65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aivars=20Mi=C5=A1ka?= <allefm@gmail.com>
Date: Fri, 30 May 2014 08:30:58 +0200
Subject: translation update

---
 lib/plugins/authad/lang/lv/lang.php     | 8 ++++++++
 lib/plugins/authad/lang/lv/settings.php | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 lib/plugins/authad/lang/lv/lang.php
 create mode 100644 lib/plugins/authad/lang/lv/settings.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/lv/lang.php b/lib/plugins/authad/lang/lv/lang.php
new file mode 100644
index 000000000..74becf756
--- /dev/null
+++ b/lib/plugins/authad/lang/lv/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aivars Miška <allefm@gmail.com>
+ */
+$lang['domain']                = 'Iežurnālēšanās domēns';
diff --git a/lib/plugins/authad/lang/lv/settings.php b/lib/plugins/authad/lang/lv/settings.php
new file mode 100644
index 000000000..e32e91452
--- /dev/null
+++ b/lib/plugins/authad/lang/lv/settings.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aivars Miška <allefm@gmail.com>
+ */
+$lang['domain_controllers']    = 'Ar komatiem atdalīts domēna kontroleru saraksts. Piemēram, <code>srv1.domain.org,srv2.domain.org</code>';
-- 
cgit v1.2.3


From 6ff0365539729e7e6804d89e887c20052140cae5 Mon Sep 17 00:00:00 2001
From: Paulo Silva <paulotsilva@yahoo.com>
Date: Fri, 30 May 2014 12:06:24 +0200
Subject: translation update

---
 lib/plugins/authad/lang/pt/lang.php     | 8 ++++++++
 lib/plugins/authad/lang/pt/settings.php | 3 +++
 2 files changed, 11 insertions(+)
 create mode 100644 lib/plugins/authad/lang/pt/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/pt/lang.php b/lib/plugins/authad/lang/pt/lang.php
new file mode 100644
index 000000000..f307bc901
--- /dev/null
+++ b/lib/plugins/authad/lang/pt/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Paulo Silva <paulotsilva@yahoo.com>
+ */
+$lang['domain']                = 'Domínio de Início de Sessão';
diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php
index ef0f8f6d2..dc60d7259 100644
--- a/lib/plugins/authad/lang/pt/settings.php
+++ b/lib/plugins/authad/lang/pt/settings.php
@@ -5,8 +5,11 @@
  * 
  * @author André Neves <drakferion@gmail.com>
  * @author Murilo <muriloricci@hotmail.com>
+ * @author Paulo Silva <paulotsilva@yahoo.com>
  */
 $lang['account_suffix']        = 'O sufixo da sua conta. Por exemplo, <code>@my.domain.org</code>';
+$lang['domain_controllers']    = 'Uma lista separada por vírgulas de Controladores de Domínio (AD DC). Ex.: <code>srv1.domain.org,srv2.domain.org</code>';
+$lang['admin_username']        = 'Um utilizador com privilégios na Active Directory que tenha acesso aos dados de todos os outros utilizadores. Opcional, mas necessário para certas ações como enviar emails de subscrição.';
 $lang['admin_password']        = 'A senha para o utilizador acima.';
 $lang['sso']                   = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?';
 $lang['use_ssl']               = 'Usar ligação SSL? Se usada, não ative TLS abaixo.';
-- 
cgit v1.2.3


From e1f856bac8f154dbb5a51c739630e38115fbbe0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aivars=20Mi=C5=A1ka?= <allefm@gmail.com>
Date: Tue, 10 Jun 2014 16:51:41 +0200
Subject: translation update

---
 lib/plugins/authad/lang/lv/settings.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/lv/settings.php b/lib/plugins/authad/lang/lv/settings.php
index e32e91452..5272d27d0 100644
--- a/lib/plugins/authad/lang/lv/settings.php
+++ b/lib/plugins/authad/lang/lv/settings.php
@@ -5,4 +5,7 @@
  * 
  * @author Aivars Miška <allefm@gmail.com>
  */
+$lang['account_suffix']        = 'Jūsu konta sufikss. Piemēram, <code>@my.domain.org</code>';
 $lang['domain_controllers']    = 'Ar komatiem atdalīts domēna kontroleru saraksts. Piemēram, <code>srv1.domain.org,srv2.domain.org</code>';
+$lang['admin_password']        = 'Minētā lietotāja parole.';
+$lang['expirywarn']            = 'Cik dienas iepriekš brīdināt lietotāju par paroles termiņa beigām. Ierakstīt 0, lai atspējotu.';
-- 
cgit v1.2.3


From 19accab588843292613a1e12b22b773f07b511ba Mon Sep 17 00:00:00 2001
From: Davor Turkalj <turki.bsc@gmail.com>
Date: Thu, 10 Jul 2014 13:46:11 +0200
Subject: translation update

---
 lib/plugins/authad/lang/hr/lang.php     |  8 ++++++++
 lib/plugins/authad/lang/hr/settings.php | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 lib/plugins/authad/lang/hr/lang.php
 create mode 100644 lib/plugins/authad/lang/hr/settings.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/hr/lang.php b/lib/plugins/authad/lang/hr/lang.php
new file mode 100644
index 000000000..f750c91b5
--- /dev/null
+++ b/lib/plugins/authad/lang/hr/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Davor Turkalj <turki.bsc@gmail.com>
+ */
+$lang['domain']                = 'Domena za prijavu';
diff --git a/lib/plugins/authad/lang/hr/settings.php b/lib/plugins/authad/lang/hr/settings.php
new file mode 100644
index 000000000..a024b10b7
--- /dev/null
+++ b/lib/plugins/authad/lang/hr/settings.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Davor Turkalj <turki.bsc@gmail.com>
+ */
+$lang['account_suffix']        = 'Vaš sufiks korisničkog imena. Npr. <code>@my.domain.org</code>';
+$lang['base_dn']               = 'Vaš bazni DN. Npr. <code>DC=my,DC=domain,DC=org</code>';
+$lang['domain_controllers']    = 'Zarezom odvojena lista domenskih kontrolera. Npr. <code>srv1.domain.org,srv2.domain.org</code>';
+$lang['admin_username']        = 'Privilegirani korisnik Active Directory-a s pristupom svim korisničkim podacima. Opcionalno, ali potrebno za određene akcije kao što je slanje pretplatničkih poruka.';
+$lang['admin_password']        = 'Lozinka gore navedenoga korisnika.';
+$lang['sso']                   = 'Da li će Single-Sign-On prijava biti korištena preko Kerberosa ili NTLM-a?';
+$lang['sso_charset']           = 'Znakovni set koji će se koristiti Kerberos ili NTLM pri slanju imena korisnika. Prazno za UTF-8 ili latin-1. Zahtjeva iconv ekstenziju.';
+$lang['real_primarygroup']     = 'Da li da se razluči stvarna primarna grupa umjesto pretpostavke da je to "Domain Users" (sporije !).';
+$lang['use_ssl']               = 'Koristi SSL vezu? Ako da, dolje ne koristi TLS!';
+$lang['use_tls']               = 'Koristi TLS vezu? Ako da, gore ne koristi SSL!';
+$lang['debug']                 = 'Prikaži dodatni debug ispis u slučaju greške? ';
+$lang['expirywarn']            = 'Upozori korisnike o isteku lozinke ovoliko dana. 0 za onemogućavanje. ';
+$lang['additional']            = 'Zarezom odvojena lista dodatnih AD atributa koji se dohvaćaju iz korisničkih podataka. Koristi se u nekim dodatcima (plugin).';
-- 
cgit v1.2.3


From 75112fc56c5237220d4fe1b104317f62eda8a561 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 2 Aug 2014 12:19:38 +0100
Subject: updated dates in info.txt of various plugins and template

---
 lib/plugins/authad/plugin.info.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt
index 8774fcf3c..dc0629189 100644
--- a/lib/plugins/authad/plugin.info.txt
+++ b/lib/plugins/authad/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authad
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-02-14
+date   2014-04-03
 name   Active Directory Auth Plugin
 desc   Provides user authentication against a Microsoft Active Directory
 url    http://www.dokuwiki.org/plugin:authad
-- 
cgit v1.2.3


From 682adb32603ee80c53e533a0c0dbde18ade4a8fc Mon Sep 17 00:00:00 2001
From: Hamid <zarrabi@sharif.edu>
Date: Mon, 18 Aug 2014 00:11:29 +0200
Subject: translation update

---
 lib/plugins/authad/lang/fa/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/fa/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/fa/lang.php b/lib/plugins/authad/lang/fa/lang.php
new file mode 100644
index 000000000..1ea73cfdb
--- /dev/null
+++ b/lib/plugins/authad/lang/fa/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hamid <zarrabi@sharif.edu>
+ */
+$lang['domain']                = 'دامنه‌ی ورود';
-- 
cgit v1.2.3


From 1349d49f50efbb15c0d6fff1f9d2a0e85b9d2df0 Mon Sep 17 00:00:00 2001
From: Felipe Castro <fefcas@gmail.com>
Date: Wed, 27 Aug 2014 14:21:01 +0200
Subject: translation update

---
 lib/plugins/authad/lang/pt-br/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/pt-br/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/pt-br/lang.php b/lib/plugins/authad/lang/pt-br/lang.php
new file mode 100644
index 000000000..5fa963d4e
--- /dev/null
+++ b/lib/plugins/authad/lang/pt-br/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Felipe Castro <fefcas@gmail.com>
+ */
+$lang['domain']                = 'Domínio de "Logon"';
-- 
cgit v1.2.3


From 505d947e52392dcc03b5d45fb8c441288d1258e0 Mon Sep 17 00:00:00 2001
From: June-Hao Hou <junehao@gmail.com>
Date: Sat, 13 Sep 2014 10:26:06 +0200
Subject: translation update

---
 lib/plugins/authad/lang/zh-tw/lang.php     | 8 ++++++++
 lib/plugins/authad/lang/zh-tw/settings.php | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 lib/plugins/authad/lang/zh-tw/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/zh-tw/lang.php b/lib/plugins/authad/lang/zh-tw/lang.php
new file mode 100644
index 000000000..6ad0947a2
--- /dev/null
+++ b/lib/plugins/authad/lang/zh-tw/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author June-Hao Hou <junehao@gmail.com>
+ */
+$lang['domain']                = '登入網域';
diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php
index bd5d9413a..42cd8c96b 100644
--- a/lib/plugins/authad/lang/zh-tw/settings.php
+++ b/lib/plugins/authad/lang/zh-tw/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author syaoranhinata@gmail.com
+ * @author June-Hao Hou <junehao@gmail.com>
  */
 $lang['account_suffix']        = '您的帳號後綴。如： <code>@my.domain.org</code>';
 $lang['base_dn']               = '您的基本識別名。如： <code>DC=my,DC=domain,DC=org</code>';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = '以逗號分隔的域名控制器列表。如
 $lang['admin_username']        = 'Active Directory 的特權使用者，可以查看所有使用者的數據。(非必要，但對發送訂閱郵件等活動來說，這是必須的。)';
 $lang['admin_password']        = '上述使用者的密碼。';
 $lang['sso']                   = '是否使用 Kerberos 或 NTLM 的單一登入系統 (Single-Sign-On)？';
+$lang['sso_charset']           = '你的網站伺服器傳遞 Kerberos 或 NTML 帳號名稱所用的語系編碼。空白表示 UTF-8 或 latin-1。此設定需要用到 iconv 套件。';
 $lang['real_primarygroup']     = '是否視作真正的主要群組，而不是假設為網域使用者 (比較慢)';
 $lang['use_ssl']               = '使用 SSL 連接嗎？如果要使用，請不要啟用下方的 TLS。';
 $lang['use_tls']               = '使用 TLS 連接嗎？如果要使用，請不要啟用上方的 SSL。';
-- 
cgit v1.2.3


From 2c99198de3e2c36f9df1cd8897770ced395e3b8a Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Sat, 20 Sep 2014 11:21:00 +0200
Subject: translation update

---
 lib/plugins/authad/lang/cs/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/cs/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/cs/lang.php b/lib/plugins/authad/lang/cs/lang.php
new file mode 100644
index 000000000..8119d208a
--- /dev/null
+++ b/lib/plugins/authad/lang/cs/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
+ */
+$lang['domain']                = 'Přihlašovací doména';
-- 
cgit v1.2.3


From 7ce0a39ec99d93aee3df09ad19d53d6804e27c1c Mon Sep 17 00:00:00 2001
From: Mohamed Belhsine <b.mohamed897@gmail.com>
Date: Mon, 22 Sep 2014 15:01:29 +0200
Subject: translation update

---
 lib/plugins/authad/lang/ar/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/plugins/authad/lang/ar/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ar/lang.php b/lib/plugins/authad/lang/ar/lang.php
new file mode 100644
index 000000000..e0ba7681a
--- /dev/null
+++ b/lib/plugins/authad/lang/ar/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mohamed Belhsine <b.mohamed897@gmail.com>
+ */
+$lang['domain']                = 'مجال تسجيل الدخول';
-- 
cgit v1.2.3


From 59bc3b48fdffb76ee65a4b630be3ffa1f6c20c80 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 29 Sep 2014 21:45:27 +0200
Subject: more scrutinizer issue improvements

---
 lib/plugins/authad/adLDAP/adLDAP.php | 2 --
 lib/plugins/authad/auth.php          | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/adLDAP/adLDAP.php b/lib/plugins/authad/adLDAP/adLDAP.php
index c1f92abe2..5563e4fe9 100644
--- a/lib/plugins/authad/adLDAP/adLDAP.php
+++ b/lib/plugins/authad/adLDAP/adLDAP.php
@@ -947,5 +947,3 @@ class adLDAP {
 * }
 */
 class adLDAPException extends Exception {}
-
-?>
\ No newline at end of file
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index a3119dda6..65f0b1647 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -203,6 +203,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         }
 
         //general user info
+        $info = array();
         $info['name'] = $result[0]['displayname'][0];
         $info['mail'] = $result[0]['mail'][0];
         $info['uid']  = $result[0]['samaccountname'][0];
-- 
cgit v1.2.3


From 253d4b48ec708eb42033862dc15c8576f44a48ed Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 1 Oct 2014 15:32:05 +0200
Subject: more PHPDocs, unused var, small bit code reformatting

---
 lib/plugins/authad/auth.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 65f0b1647..88b56046c 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -329,6 +329,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * Bulk retrieval of user data
      *
      * @author  Dominik Eckelmann <dokuwiki@cosmocode.de>
+     *
      * @param   int   $start     index of first user to be returned
      * @param   int   $limit     max number of users to be returned
      * @param   array $filter    array of field/pattern pairs, null for no filter
@@ -447,7 +448,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     /**
      * Get the domain part from a user
      *
-     * @param $user
+     * @param string $user
      * @return string
      */
     public function _userDomain($user) {
@@ -458,7 +459,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     /**
      * Get the user part from a user
      *
-     * @param $user
+     * @param string $user
      * @return string
      */
     public function _userName($user) {
@@ -544,6 +545,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * The patterns are set up with $this->_constructPattern()
      *
      * @author Chris Smith <chris@jalakai.co.uk>
+     *
      * @param string $user
      * @param array  $info
      * @return bool
@@ -565,6 +567,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * Create a pattern for $this->_filter()
      *
      * @author Chris Smith <chris@jalakai.co.uk>
+     *
      * @param array $filter
      */
     protected function _constructPattern($filter) {
-- 
cgit v1.2.3


From a1298aeaa8cf1dc3bba3fb7ecadb0d989afc42cf Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Sat, 18 Oct 2014 18:25:58 +0200
Subject: translation update

---
 lib/plugins/authad/lang/ru/settings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index c9c6d9f88..0212589d7 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -8,8 +8,9 @@
  * @author Artur <ncuxxx@gmail.com>
  * @author Erli Moen <evseev.jr@gmail.com>
  * @author Владимир <id37736@yandex.ru>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
-$lang['account_suffix']        = 'Суффикс вашего аккаунта типа  <code>@my.domain.org</code>';
+$lang['account_suffix']        = 'Суффикс вашего аккаунта. Например, <code>@my.domain.org</code>';
 $lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
-- 
cgit v1.2.3


From 2ec6a92c13ed276111bbe099aadab33a885397cb Mon Sep 17 00:00:00 2001
From: Patrick <spill.p@hotmail.com>
Date: Wed, 19 Nov 2014 19:20:55 +0100
Subject: translation update

---
 lib/plugins/authad/lang/no/lang.php     | 8 ++++++++
 lib/plugins/authad/lang/no/settings.php | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 lib/plugins/authad/lang/no/lang.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/no/lang.php b/lib/plugins/authad/lang/no/lang.php
new file mode 100644
index 000000000..a1c9c7e8a
--- /dev/null
+++ b/lib/plugins/authad/lang/no/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Patrick <spill.p@hotmail.com>
+ */
+$lang['domain']                = 'Loggpå-domene';
diff --git a/lib/plugins/authad/lang/no/settings.php b/lib/plugins/authad/lang/no/settings.php
index bab5ce67d..f309ead50 100644
--- a/lib/plugins/authad/lang/no/settings.php
+++ b/lib/plugins/authad/lang/no/settings.php
@@ -4,6 +4,8 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Christopher Schive <chschive@frisurf.no>
+ * @author Patrick <spill.p@hotmail.com>
  */
+$lang['account_suffix']        = 'Ditt konto-suffiks F. Eks. <code>@my.domain.org</code>';
 $lang['admin_password']        = 'Passordet til brukeren over.';
 $lang['expirywarn']            = 'Antall dager på forhånd brukeren varsles om at passordet utgår. 0 for å deaktivere.';
-- 
cgit v1.2.3


From 29eba4294ec095d7a6fe677fb8b8e64e98655bcc Mon Sep 17 00:00:00 2001
From: Omid Hezaveh <hezpublic@gmail.com>
Date: Mon, 8 Dec 2014 17:21:12 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/fa/settings.php b/lib/plugins/authad/lang/fa/settings.php
new file mode 100644
index 000000000..161479afb
--- /dev/null
+++ b/lib/plugins/authad/lang/fa/settings.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Omid Hezaveh <hezpublic@gmail.com>
+ */
+$lang['admin_password']        = 'رمز کاربر بالایی ';
+$lang['use_ssl']               = 'از اس‌اس‌ال استفاده می‌کنید؟ در این صورت تی‌ال‌اس را در پایین فعال نکنید. ';
+$lang['use_tls']               = 'از تی‌ال‌اس استفاده می‌کنید؟ در این صورت اس‌اس‌ال را در بالا فعال نکنید. ';
-- 
cgit v1.2.3


From 4ac117924853a8fb3d2826fa814eec444df97323 Mon Sep 17 00:00:00 2001
From: Type-kun <workwork-1@yandex.ru>
Date: Fri, 12 Dec 2014 20:06:31 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 0212589d7..6d92bb163 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -9,11 +9,13 @@
  * @author Erli Moen <evseev.jr@gmail.com>
  * @author Владимир <id37736@yandex.ru>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ * @author Type-kun <workwork-1@yandex.ru>
  */
 $lang['account_suffix']        = 'Суффикс вашего аккаунта. Например, <code>@my.domain.org</code>';
 $lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
+$lang['sso_charset']           = 'Кодировка, в которой веб-сервер передаёт имя пользователя Kerberos или NTLM. Для UTF-8 или latin-1 остаётся пустым. Требует расширение iconv.';
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
-- 
cgit v1.2.3


From e9e4d4669dcc75b110847c78bdf6b80a0f47628b Mon Sep 17 00:00:00 2001
From: Type-kun <workwork-1@yandex.ru>
Date: Sat, 13 Dec 2014 17:20:59 +0100
Subject: translation update

---
 lib/plugins/authad/lang/ru/settings.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 6d92bb163..bb8197765 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -19,3 +19,4 @@ $lang['sso_charset']           = 'Кодировка, в которой веб-
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
+$lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль. 0 - отключить.';
-- 
cgit v1.2.3


From e88b0b78dca1024132a36f217b59c9e73a9cc338 Mon Sep 17 00:00:00 2001
From: Vitaly Filatenko <kot@hacktest.net>
Date: Mon, 15 Dec 2014 22:36:37 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index bb8197765..99c916b44 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -10,13 +10,18 @@
  * @author Владимир <id37736@yandex.ru>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Type-kun <workwork-1@yandex.ru>
+ * @author Vitaly Filatenko <kot@hacktest.net>
  */
 $lang['account_suffix']        = 'Суффикс вашего аккаунта. Например, <code>@my.domain.org</code>';
+$lang['base_dn']               = 'Ваш базовый DN. Например: <code>DC=my,DC=domain,DC=org</code>';
 $lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
+$lang['admin_username']        = 'Привилегированный пользователь Active Directory с доступом ко всем остальным пользовательским данным. Необязательно, однако необходимо для определённых действий вроде отправки почтовой подписки.';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
 $lang['sso_charset']           = 'Кодировка, в которой веб-сервер передаёт имя пользователя Kerberos или NTLM. Для UTF-8 или latin-1 остаётся пустым. Требует расширение iconv.';
+$lang['real_primarygroup']     = 'Должна ли использоваться настоящая первичная группа вместо "Domain Users" (медленнее)';
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
 $lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль. 0 - отключить.';
+$lang['additional']            = 'Дополнительные AD атрибуты, разделённые запятой, для выборки из данных пользователя. Используется некоторыми плагинами.';
-- 
cgit v1.2.3


From 2fd1f790dae5f89a60537f9b80b9c5a10312f595 Mon Sep 17 00:00:00 2001
From: Guido Salatino <guidorafael23@gmail.com>
Date: Thu, 18 Dec 2014 21:26:34 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php
index dc60d7259..6256eb597 100644
--- a/lib/plugins/authad/lang/pt/settings.php
+++ b/lib/plugins/authad/lang/pt/settings.php
@@ -6,12 +6,18 @@
  * @author André Neves <drakferion@gmail.com>
  * @author Murilo <muriloricci@hotmail.com>
  * @author Paulo Silva <paulotsilva@yahoo.com>
+ * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['account_suffix']        = 'O sufixo da sua conta. Por exemplo, <code>@my.domain.org</code>';
+$lang['base_dn']               = 'Sua base DN. Eg. <code> DC=meu, DC=dominio, DC=org </ code>';
 $lang['domain_controllers']    = 'Uma lista separada por vírgulas de Controladores de Domínio (AD DC). Ex.: <code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_username']        = 'Um utilizador com privilégios na Active Directory que tenha acesso aos dados de todos os outros utilizadores. Opcional, mas necessário para certas ações como enviar emails de subscrição.';
 $lang['admin_password']        = 'A senha para o utilizador acima.';
 $lang['sso']                   = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?';
+$lang['sso_charset']           = 'O charset do seu servidor web vai passar o nome de usuário Kerberos ou NTLM  vazio para UTF-8 ou latin-1. Requer a extensão iconv.';
+$lang['real_primarygroup']     = 'Deveria ser resolvido, de fato, o grupo primário ao invés de assumir "Usuários de Domínio" (mais lento).';
 $lang['use_ssl']               = 'Usar ligação SSL? Se usada, não ative TLS abaixo.';
 $lang['use_tls']               = 'Usar ligação TLS? Se usada, não ative SSL abaixo.';
+$lang['debug']                 = 'Deve-se mostrar saída adicional de depuração de erros?';
 $lang['expirywarn']            = 'Número de dias de avanço para avisar o utilizador da expiração da senha. 0 para desativar.';
+$lang['additional']            = 'Uma lista separada por vírgula de atributos adicionais de AD para buscar a partir de dados do usuário. Usado por alguns plugins.';
-- 
cgit v1.2.3


From a71e810b700800fc0b7a599971dc05354df40a81 Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Wed, 31 Dec 2014 15:21:02 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/cs/settings.php b/lib/plugins/authad/lang/cs/settings.php
index 28222d332..92b2d0f13 100644
--- a/lib/plugins/authad/lang/cs/settings.php
+++ b/lib/plugins/authad/lang/cs/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author mkucera66@seznam.cz
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
 $lang['account_suffix']        = 'Přípona vašeho účtu, tj. <code>@moje.domena.org</code>';
 $lang['base_dn']               = 'Vaše doménové jméno DN. tj. <code>DC=moje,DC=domena,DC=org</code>';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = 'Čárkou oddělenových kontrol=rů, tj. <code
 $lang['admin_username']        = 'Privilegovaný uživatel Active Directory s přístupem ke všem datům. Volitelně, ale nutné pro určité akce typu zasílání mailů.';
 $lang['admin_password']        = 'Heslo uživatele výše';
 $lang['sso']                   = 'Chcete přihlašování Single-Sign-On pomocí jádra Kerberos nebo NTLM ( autentizační protokol obvyklý ve Windows)?';
+$lang['sso_charset']           = 'Znaková sada kterou bude webserverem přenášeno uživatelské jméno pro Kerberos nebo NTLM. Prázdné pro UTF-8 nebo latin-1. Vyžaduje rozšíření iconv.';
 $lang['real_primarygroup']     = 'Má být zjištěna primární skupina namísto vyhodnocení hodnoty "doménoví uživatelé" (pomalejší)';
 $lang['use_ssl']               = 'Použít spojení SSL? Pokud ano, nevyužívejte TLS níže.';
 $lang['use_tls']               = 'Použít spojení TLS? Pokud ano, nevyužívejte SSL výše.';
-- 
cgit v1.2.3


From 6f864f4299df0435149a889891bf686b4b17249a Mon Sep 17 00:00:00 2001
From: Maciej Helt <geraldziu@gmail.com>
Date: Mon, 5 Jan 2015 13:36:18 +0100
Subject: translation update

---
 lib/plugins/authad/lang/pl/settings.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php
index 91cadca6f..537bae7ea 100644
--- a/lib/plugins/authad/lang/pl/settings.php
+++ b/lib/plugins/authad/lang/pl/settings.php
@@ -6,6 +6,7 @@
  * @author Tomasz Bosak <bosak.tomasz@gmail.com>
  * @author Paweł Jan Czochański <czochanski@gmail.com>
  * @author Mati <mackosa@wp.pl>
+ * @author Maciej Helt <geraldziu@gmail.com>
  */
 $lang['account_suffix']        = 'Przyrostek twojej nazwy konta np. <code>@my.domain.org</code>';
 $lang['base_dn']               = 'Twoje bazowe DN. Na przykład: <code>DC=my,DC=domain,DC=org</code>';
-- 
cgit v1.2.3


From 9b505d59adc0f5dd5a481c7a9a2e9d1f4f6780f3 Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Sun, 25 Jan 2015 20:56:05 +0100
Subject: translation update

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

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 99c916b44..c791bd791 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -19,9 +19,9 @@ $lang['admin_username']        = 'Привилегированный польз
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
 $lang['sso_charset']           = 'Кодировка, в которой веб-сервер передаёт имя пользователя Kerberos или NTLM. Для UTF-8 или latin-1 остаётся пустым. Требует расширение iconv.';
-$lang['real_primarygroup']     = 'Должна ли использоваться настоящая первичная группа вместо "Domain Users" (медленнее)';
+$lang['real_primarygroup']     = 'Должна ли использоваться настоящая первичная группа вместо “Domain Users” (медленнее)';
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
-$lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль. 0 - отключить.';
-$lang['additional']            = 'Дополнительные AD атрибуты, разделённые запятой, для выборки из данных пользователя. Используется некоторыми плагинами.';
+$lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль? Для отключения укажите 0 (ноль).';
+$lang['additional']            = 'Дополнительные AD-атрибуты, разделённые запятой, для выборки из данных пользователя. Используется некоторыми плагинами.';
-- 
cgit v1.2.3


From 4c32d8dc4120e5a2667564b4108b3708986ea47e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 9 Feb 2015 09:17:32 +0100
Subject: fixed method signature #1024

---
 lib/plugins/authad/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/action.php b/lib/plugins/authad/action.php
index 97be9897e..bc0f90c7e 100644
--- a/lib/plugins/authad/action.php
+++ b/lib/plugins/authad/action.php
@@ -17,7 +17,7 @@ class action_plugin_authad extends DokuWiki_Action_Plugin {
     /**
      * Registers a callback function for a given event
      */
-    public function register(Doku_Event_Handler &$controller) {
+    public function register(Doku_Event_Handler $controller) {
 
         $controller->register_hook('AUTH_LOGIN_CHECK', 'BEFORE', $this, 'handle_auth_login_check');
         $controller->register_hook('HTML_LOGINFORM_OUTPUT', 'BEFORE', $this, 'handle_html_loginform_output');
-- 
cgit v1.2.3