Merge branch 'master' into stable

44 files changed, 252 insertions, 87 deletions

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 6dfdf06e8..c2540cc03 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -84,16 +84,6 @@ function css_out(){
         if(isset($config_cascade['userstyle'][$mediatype])){
             $files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE;
         }
-        // load rtl styles
-        // note: this adds the rtl styles only to the 'screen' media type
-        // @deprecated 2012-04-09: rtl will cease to be a mode of its own,
-        //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
-        if ($mediatype=='screen') {
-            if($lang['direction'] == 'rtl'){
-                if (isset($styleini['stylesheets']['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $styleini['stylesheets']['rtl']);
-                if (isset($config_cascade['userstyle']['rtl'])) $files[$mediatype][$config_cascade['userstyle']['rtl']] = DOKU_BASE;
-            }
-        }
 
         $cache_files = array_merge($cache_files, array_keys($files[$mediatype]));
     }
@@ -173,6 +163,12 @@ function css_out(){
  */
 function css_parseless($css) {
     $less = new lessc();
+    $less->importDir[] = DOKU_INC;
+
+    if (defined('DOKU_UNITTEST')){
+        $less->importDir[] = TMP_DIR;
+    }
+
     try {
         return $less->compile($css);
     } catch(Exception $e) {
@@ -271,7 +267,7 @@ function css_styleini($tpl) {
 
         // replacements
         if(is_array($data['replacements'])){
-            $replacements = array_merge($replacements, $data['replacements']);
+            $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
         }
     }
 
@@ -288,7 +284,7 @@ function css_styleini($tpl) {
 
         // replacements
         if(is_array($data['replacements'])){
-            $replacements = array_merge($replacements, $data['replacements']);
+            $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
         }
     }
 
@@ -306,7 +302,7 @@ function css_styleini($tpl) {
 
         // replacements
         if(is_array($data['replacements'])){
-            $replacements = array_merge($replacements, $data['replacements']);
+            $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
         }
     }
 
@@ -316,6 +312,13 @@ function css_styleini($tpl) {
     );
 }
 
+function css_fixreplacementurls($replacements, $location) {
+    foreach($replacements as $key => $value) {
+        $replacements[$key] = preg_replace('#(url\([ \'"]*)(?!/|data:|http://|https://| |\'|")#','\\1'.$location,$value);
+    }
+    return $replacements;
+}
+
 /**
  * Prints classes for interwikilinks
  *
@@ -393,18 +396,69 @@ function css_filetypes(){
  * given location prefix
  */
 function css_loadfile($file,$location=''){
-    if(!@file_exists($file)) return '';
-    $css = io_readFile($file);
-    if(!$location) return $css;
+    $css_file = new DokuCssFile($file);
+    return $css_file->load($location);
+}
 
-    $css = preg_replace('#(url\([ \'"]*)(?!/|data:|http://|https://| |\'|")#','\\1'.$location,$css);
-    $css = preg_replace('#(@import\s+[\'"])(?!/|data:|http://|https://)#', '\\1'.$location, $css);
+class DokuCssFile {
 
-    return $css;
+    protected $filepath;
+    protected $location;
+    private   $relative_path = null;
+
+    public function __construct($file) {
+        $this->filepath = $file;
+    }
+
+    public function load($location='') {
+        if (!@file_exists($this->filepath)) return '';
+
+        $css = io_readFile($this->filepath);
+        if (!$location) return $css;
+
+        $this->location = $location;
+
+        $css = preg_replace_callback('#(url\( *)([\'"]?)(.*?)(\2)( *\))#',array($this,'replacements'),$css);
+        $css = preg_replace_callback('#(@import\s+)([\'"])(.*?)(\2)#',array($this,'replacements'),$css);
+
+        return $css;
+    }
+
+    private function getRelativePath(){
+
+        if (is_null($this->relative_path)) {
+            $basedir = array(DOKU_INC);
+            if (defined('DOKU_UNITTEST')) {
+                $basedir[] = realpath(TMP_DIR);
+            }
+            $regex = '#^('.join('|',$basedir).')#';
+
+            $this->relative_path = preg_replace($regex, '', dirname($this->filepath));
+        }
+
+        return $this->relative_path;
+    }
+
+    public function replacements($match) {
+
+        if (preg_match('#^(/|data:|https?://)#',$match[3])) {
+            return $match[0];
+        }
+        else if (substr($match[3],-5) == '.less') {
+            if ($match[3]{0} != '/') {
+                $match[3] = $this->getRelativePath() . '/' . $match[3];
+            }
+        }
+        else {
+            $match[3] = $this->location . $match[3];
+        }
+
+        return join('',array_slice($match,1));
+    }
 }
 
 /**
- * Converte local image URLs to data URLs if the filesize is small
+ * Convert local image URLs to data URLs if the filesize is small
  *
  * Callback for preg_replace_callback
  */
@@ -422,7 +476,7 @@ function css_datauri($match){
         $data = base64_encode(file_get_contents($local));
     }
     if($data){
-        $url = '\'data:image/'.$ext.';base64,'.$data.'\'';
+        $url = 'data:image/'.$ext.';base64,'.$data;
     }else{
         $url = $base.$url;
     }
@@ -447,11 +501,6 @@ function css_pluginstyles($mediatype='screen'){
             $list[DOKU_PLUGIN."$p/style.css"]  = DOKU_BASE."lib/plugins/$p/";
             $list[DOKU_PLUGIN."$p/style.less"]  = DOKU_BASE."lib/plugins/$p/";
         }
-        // @deprecated 2012-04-09: rtl will cease to be a mode of its own,
-        //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
-        if($lang['direction'] == 'rtl'){
-            $list[DOKU_PLUGIN."$p/rtl.css"] = DOKU_BASE."lib/plugins/$p/";
-        }
     }
     return $list;
 }
diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index e3c81d877..cd3f362ad 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -6,7 +6,7 @@ require_once(DOKU_INC.'inc/init.php');
 $IMG  = getID('media');
 $ID   = cleanID($INPUT->str('id'));
 
-// this makes some general infos available as well as the info about the
+// this makes some general info available as well as the info about the
 // "parent" page
 $INFO = array_merge(pageinfo(),mediainfo());
 
diff --git a/lib/images/_deprecated.txt b/lib/images/_deprecated.txt
index bccea2049..a347f8b3c 100644
--- a/lib/images/_deprecated.txt
+++ b/lib/images/_deprecated.txt
@@ -1,12 +1,2 @@
 
-== @deprecated 2012-10-06 ==
-
-arrow_down.gif
-arrow_up.gif
-at.gif
-close.png
-del.png
-edit.gif
-list-minus.gif
-list-plus.gif
-pencil.png
+(none)
diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif
deleted file mode 100644
index ff13b9585..000000000
--- a/lib/images/arrow_down.gif
+++ /dev/null
diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif
deleted file mode 100644
index d491c18db..000000000
--- a/lib/images/arrow_up.gif
+++ /dev/null
diff --git a/lib/images/at.gif b/lib/images/at.gif
deleted file mode 100644
index 8bdf40d54..000000000
--- a/lib/images/at.gif
+++ /dev/null
diff --git a/lib/images/close.png b/lib/images/close.png
deleted file mode 100644
index 4ccef0603..000000000
--- a/lib/images/close.png
+++ /dev/null
diff --git a/lib/images/del.png b/lib/images/del.png
deleted file mode 100644
index e59ded55f..000000000
--- a/lib/images/del.png
+++ /dev/null
diff --git a/lib/images/edit.gif b/lib/images/edit.gif
deleted file mode 100644
index a2a23de7b..000000000
--- a/lib/images/edit.gif
+++ /dev/null
diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif
deleted file mode 100644
index 36902f159..000000000
--- a/lib/images/list-minus.gif
+++ /dev/null
diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif
deleted file mode 100644
index adc3fac8a..000000000
--- a/lib/images/list-plus.gif
+++ /dev/null
diff --git a/lib/images/pencil.png b/lib/images/pencil.png
deleted file mode 100644
index 78142b61e..000000000
--- a/lib/images/pencil.png
+++ /dev/null
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index b24981d91..6c7c28ff6 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -345,7 +345,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * Print infos and editor
+     * Print info and editor
      */
     function _html_info(){
         global $ID;
diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php
index 7c05b721c..4e44dab5f 100644
--- a/lib/plugins/acl/lang/ar/lang.php
+++ b/lib/plugins/acl/lang/ar/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Arabic language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Mostafa Hussein <mostafa@gmail.com>
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php
index fd624ad02..6bc86dc01 100644
--- a/lib/plugins/authad/lang/de/settings.php
+++ b/lib/plugins/authad/lang/de/settings.php
@@ -2,9 +2,11 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author Ben Fey <benedikt.fey@beck-heun.de>
+ * @author Jonas Gröger <jonas.groeger@gmail.com>
  */
 $lang['account_suffix']        = 'Ihr Account-Suffix. Z. B. <code>@my.domain.org</code>';
 $lang['base_dn']               = 'Ihr Base-DN. Z. B. <code>DC=my,DC=domain,DC=org</code>';
@@ -12,6 +14,7 @@ $lang['domain_controllers']    = 'Eine Komma-separierte Liste von Domänen-Contr
 $lang['admin_username']        = 'Ein priviligierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.';
 $lang['admin_password']        = 'Das Passwort des obigen Benutzers.';
 $lang['sso']                   = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?';
+$lang['sso_charset']           = 'Der Zeichensatz, mit dem der Server den Kerberos- oder NTLM-Benutzernamen versendet. Leer lassen für UTF-8 oder latin-1. Benötigt die iconv-Erweiterung.';
 $lang['real_primarygroup']     = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)';
 $lang['use_ssl']               = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.';
 $lang['use_tls']               = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.';
diff --git a/lib/plugins/authad/lang/eo/settings.php b/lib/plugins/authad/lang/eo/settings.php
index ee672ecd3..11640ebb7 100644
--- a/lib/plugins/authad/lang/eo/settings.php
+++ b/lib/plugins/authad/lang/eo/settings.php
@@ -3,6 +3,7 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
+ * @author Robert Bogenschneider <bogi@uea.org>
  */
 $lang['account_suffix']        = 'Via konto-aldonaĵo, ekz. <code>@mia.domajno.lando</code>';
 $lang['base_dn']               = 'Via baza DN, ekz. <code>DC=mia,DC=domajno,DC=lando</code>';
@@ -10,6 +11,7 @@ $lang['domain_controllers']    = 'Komodisigita listo de domajno-serviloj, ekz. <
 $lang['admin_username']        = 'Privilegiita Aktiv-Dosieruja uzanto kun aliro al ĉiuj uzantaj datumoj. Libervole, sed necesa por iuj agadoj kiel sendi abonan retpoŝton.';
 $lang['admin_password']        = 'La pasvorto de tiu uzanto.';
 $lang['sso']                   = 'Ĉu uzi Sola Aliro tra Kerberos aŭ NTLM?';
+$lang['sso_charset']           = 'Per kiu karaktraro via retservilo pludonas uzantonomojn al Kerberos aŭ NTLM? Malplena por UTF-8 aŭ latin-1. Bezonas iconv-aldonaĵon.';
 $lang['real_primarygroup']     = 'Ĉu trovi la veran ĉefan grupon anstataŭ supozi "Domajnuzantoj" (pli malrapida)?';
 $lang['use_ssl']               = 'Ĉu uzi SSL-konekton? Se jes, ne aktivigu TLS sube.';
 $lang['use_tls']               = 'Ĉu uzi TLS-konekton? Se jes, ne aktivigu SSL supre.';
diff --git a/lib/plugins/authad/lang/ko/settings.php b/lib/plugins/authad/lang/ko/settings.php
index 2914bf47b..053823508 100644
--- a/lib/plugins/authad/lang/ko/settings.php
+++ b/lib/plugins/authad/lang/ko/settings.php
@@ -11,6 +11,7 @@ $lang['domain_controllers']    = '도메인 컨트롤러의 쉼표로 구분한
 $lang['admin_username']        = '다른 모든 사용자의 데이터에 접근할 수 있는 권한이 있는 Active Directory 사용자. 선택적이지만 구독 메일을 보내는 등의 특정 작업에 필요합니다.';
 $lang['admin_password']        = '위 사용자의 비밀번호.';
 $lang['sso']                   = 'Kerberos나 NTLM을 통해 Single-Sign-On을 사용해야 합니까?';
+$lang['sso_charset']           = '당신의 웹서버의 문자집합은 Kerberos나 NTLM 사용자 이름으로 전달됩니다. UTF-8이나 라린-1이 비어 있습니다. icov 확장 기능이 필요합니다.';
 $lang['real_primarygroup']     = '실제 기본 그룹은 "도메인 사용자"를 가정하는 대신 해결될 것입니다 (느림)';
 $lang['use_ssl']               = 'SSL 연결을 사용합니까? 사용한다면 아래 TLS을 활성화하지 마세요.';
 $lang['use_tls']               = 'TLS 연결을 사용합니까? 사용한다면 위 SSL을 활성화하지 마세요.';
diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index f849c201a..6854e0920 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -5,5 +5,9 @@
  * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
+ * @author Artur <ncuxxx@gmail.com>
  */
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
+$lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
+$lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
+$lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
diff --git a/lib/plugins/authad/lang/sk/settings.php b/lib/plugins/authad/lang/sk/settings.php
index 55f266dd6..b7d822f7e 100644
--- a/lib/plugins/authad/lang/sk/settings.php
+++ b/lib/plugins/authad/lang/sk/settings.php
@@ -6,10 +6,15 @@
  * @author Martin Michalek <michalek.dev@gmail.com>
  */
 $lang['account_suffix']        = 'Prípona používateľského účtu. Napr. <code>@my.domain.org</code>';
+$lang['base_dn']               = 'Vaše base DN. Napr. <code>DC=my,DC=domain,DC=org</code>';
+$lang['domain_controllers']    = 'Zoznam doménových radičov oddelených čiarkou. Napr. <code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_username']        = 'Privilegovaný používateľ Active Directory s prístupom ku všetkým dátam ostatných používateľov. Nepovinné nastavenie, ale potrebné pre určité akcie ako napríklad zasielanie mailov o zmenách.';
 $lang['admin_password']        = 'Heslo vyššie uvedeného používateľa.';
 $lang['sso']                   = 'Použiť Single-Sign-On cez Kerberos alebo NTLM?';
+$lang['sso_charset']           = 'Znaková sada, v ktorej bude webserver prenášať meno Kerberos or NTLM používateľa. Prázne pole znamená UTF-8 alebo latin-1. Vyžaduje iconv rozšírenie.';
+$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['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.';
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);
             }
         }
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';
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';
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';
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';
diff --git a/lib/plugins/authmysql/lang/da/settings.php b/lib/plugins/authmysql/lang/da/settings.php
index 207d0ff60..1e38cb6b4 100644
--- a/lib/plugins/authmysql/lang/da/settings.php
+++ b/lib/plugins/authmysql/lang/da/settings.php
@@ -2,10 +2,25 @@
 
 /**
  * @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 MySQL server';
+$lang['user']                  = 'MySQL brugernavn';
+$lang['password']              = 'Kodeord til ovenstående bruger';
+$lang['database']              = 'Database der skal benyttes';
+$lang['charset']               = 'Tegnsæt benyttet i database';
+$lang['checkPass']             = 'SQL-sætning til at kontrollere kodeord';
+$lang['getUserInfo']           = 'SQL-sætning til at hente brugerinformation';
+$lang['getUsers']              = 'SQL-sætning til at liste alle brugere';
+$lang['addUser']               = 'SQL-sætning til at tilføje en ny bruger';
+$lang['addGroup']              = 'SQL-sætning til at tilføje en ny gruppe';
+$lang['addUserGroup']          = 'SQL-sætning til at tilføje en bruger til en eksisterende gruppe';
+$lang['delGroup']              = 'SQL-sætning til at fjerne en gruppe';
+$lang['delUser']               = 'SQL-sætning til at slette en bruger';
+$lang['delUserRefs']           = 'SQL-sætning til at fjerne en bruger fra alle grupper';
+$lang['updateUser']            = 'SQL-sætning til at opdatere en brugerprofil';
 $lang['debug']                 = 'Vis yderligere debug output';
 $lang['debug_o_0']             = 'ingen';
 $lang['debug_o_1']             = 'kun ved fejl';
diff --git a/lib/plugins/authmysql/lang/sk/settings.php b/lib/plugins/authmysql/lang/sk/settings.php
index 8c52f905e..d7e8cb286 100644
--- a/lib/plugins/authmysql/lang/sk/settings.php
+++ b/lib/plugins/authmysql/lang/sk/settings.php
@@ -34,5 +34,9 @@ $lang['UpdateLogin']           = 'SQL podmienka pre aktualizáciu prihlasovacieh
 $lang['UpdatePass']            = 'SQL podmienka pre aktualizáciu hesla používateľa';
 $lang['UpdateEmail']           = 'SQL podmienka pre aktualizáciu emailovej adresy používateľa';
 $lang['UpdateName']            = 'SQL podmienka pre aktualizáciu mena a priezviska používateľa';
+$lang['UpdateTarget']          = 'Podmienka identifikácie používateľa pri aktualizácii';
 $lang['delUserGroup']          = 'SQL príkaz pre vyradenie používateľa z danej skupiny';
 $lang['getGroupID']            = 'SQL príkaz pre získanie primárneho kľúča skupiny';
+$lang['debug_o_0']             = 'žiadne';
+$lang['debug_o_1']             = 'iba pri chybách';
+$lang['debug_o_2']             = 'všetky SQL dopyty';
diff --git a/lib/plugins/authpgsql/lang/da/settings.php b/lib/plugins/authpgsql/lang/da/settings.php
index 76c08a734..007174815 100644
--- a/lib/plugins/authpgsql/lang/da/settings.php
+++ b/lib/plugins/authpgsql/lang/da/settings.php
@@ -4,7 +4,19 @@
  * @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 PostgresSQL server';
 $lang['port']                  = 'Din PostgresSQL servers port';
+$lang['password']              = 'Kodeord til ovenstående bruger';
+$lang['database']              = 'Database der skal benyttes';
 $lang['debug']                 = 'Vis yderligere debug output';
+$lang['checkPass']             = 'SQL-sætning til at kontrollere kodeord';
+$lang['getUsers']              = 'SQL-sætning til at liste alle brugere';
+$lang['addUser']               = 'SQL-sætning til at tilføje en ny bruger';
+$lang['addGroup']              = 'SQL-sætning til at tilføje en ny gruppe';
+$lang['addUserGroup']          = 'SQL-sætning til at tilføje en bruger til en eksisterende gruppe';
+$lang['delGroup']              = 'SQL-sætning til at fjerne en gruppe';
+$lang['delUser']               = 'SQL-sætning til at slette en bruger';
+$lang['delUserRefs']           = 'SQL-sætning til at fjerne en bruger fra alle grupper';
+$lang['updateUser']            = 'SQL-sætning til at opdatere en brugerprofil';
diff --git a/lib/plugins/authpgsql/lang/sk/settings.php b/lib/plugins/authpgsql/lang/sk/settings.php
index 9d656415d..861d1237d 100644
--- a/lib/plugins/authpgsql/lang/sk/settings.php
+++ b/lib/plugins/authpgsql/lang/sk/settings.php
@@ -33,5 +33,6 @@ $lang['UpdateLogin']           = 'SQL podmienka pre aktualizáciu prihlasovacieh
 $lang['UpdatePass']            = 'SQL podmienka pre aktualizáciu hesla používateľa';
 $lang['UpdateEmail']           = 'SQL podmienka pre aktualizáciu emailovej adresy používateľa';
 $lang['UpdateName']            = 'SQL podmienka pre aktualizáciu mena a priezviska používateľa';
+$lang['UpdateTarget']          = 'Podmienka identifikácie používateľa pri aktualizácii';
 $lang['delUserGroup']          = 'SQL príkaz pre vyradenie používateľa z danej skupiny';
 $lang['getGroupID']            = 'SQL príkaz pre získanie primárneho kľúča skupiny';
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index ac52090e3..0cdaca90d 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -71,7 +71,7 @@ $lang['deaccent']              = '문서 이름을 지우는 방법';
 $lang['useheading']            = '문서 이름으로 첫 문단 제목 사용';
 $lang['sneaky_index']          = '기본적으로 도쿠위키는 색인 목록에 모든 이름공간을 보여줍니다.
 이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 이름공간은 보여주지 않습니다. 접근 가능한 하위 이름공간을 보이지 않게 설정하면 자동으로 설정됩니다. 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.';
-$lang['hidepages']             = '사이트맵과 기타 자동 색인과 같은 찾기에서 정규 표현식과 일치하는 문서 숨기기';
+$lang['hidepages']             = '검색, 사이트맵과 기타 자동 색인에서 정규 표현식과 일치하는 문서 숨기기';
 $lang['useacl']                = '접근 제어 목록 (ACL) 사용';
 $lang['autopasswd']            = '자동으로 만들어진 비밀번호';
 $lang['authtype']              = '인증 백-엔드';
@@ -137,7 +137,7 @@ $lang['gzip_output']           = 'xhml 내용 gzip 압축 사용';
 $lang['compress']              = '최적화된 CSS, 자바스크립트 출력';
 $lang['cssdatauri']            = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code>에서 <code>600</code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.';
 $lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP 404/페이지를 찾을 수 없습니다" 응답';
-$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">버그 852</a>를 참고하시기 바랍니다.';
+$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 검색 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">버그 852</a>를 참고하시기 바랍니다.';
 $lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
 $lang['renderer_xhtml']        = '주 (xhtml) 위키 출력 처리기';
 $lang['renderer__core']        = '%s (도쿠위키 내부)';
diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php
index a1a778131..aae58fdb9 100644
--- a/lib/plugins/plugin/lang/ar/lang.php
+++ b/lib/plugins/plugin/lang/ar/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Arabic language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
  * @author uahello@gmail.com
diff --git a/lib/plugins/popularity/lang/ar/lang.php b/lib/plugins/popularity/lang/ar/lang.php
index 481668505..c3e21868f 100644
--- a/lib/plugins/popularity/lang/ar/lang.php
+++ b/lib/plugins/popularity/lang/ar/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Arabic language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
  * @author uahello@gmail.com
diff --git a/lib/plugins/revert/lang/ar/lang.php b/lib/plugins/revert/lang/ar/lang.php
index a073c336d..27de54f16 100644
--- a/lib/plugins/revert/lang/ar/lang.php
+++ b/lib/plugins/revert/lang/ar/lang.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
- * Arabic language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
  * @author uahello@gmail.com
+ * @author Ahmad Abd-Elghany <tolpa1@gmail.com>
  */
 $lang['menu']                  = 'مدير الاسترجاع';
 $lang['filter']                = 'ابحث في الصفحات المتأذاة';
diff --git a/lib/plugins/revert/lang/ko/intro.txt b/lib/plugins/revert/lang/ko/intro.txt
index 7aa618ba6..565aa4bbe 100644
--- a/lib/plugins/revert/lang/ko/intro.txt
+++ b/lib/plugins/revert/lang/ko/intro.txt
@@ -1,3 +1,3 @@
 ====== 되돌리기 관리자 ======
 
-스팸 공격으로부터 자동으로 되돌리는데 이 페이지가 도움이 될 수 있습니다. 스팸 공격받은 문서 목록을 찾으려면 문자열을 입력하고(예를 들어 스팸 URL) 나서 찾은 문서가 스팸 공격을 받았는지 확인하고 되돌리세요.
\ No newline at end of file
+스팸 공격으로부터 자동으로 되돌리는데 이 페이지가 도움이 될 수 있습니다. 스팸에 공격 받은 문서 목록을 찾으려면 검색어를 입력하고(예를 들어 스팸 URL) 나서 찾은 문서가 스팸 공격을 받았는지 확인하고 되돌리세요.
\ No newline at end of file
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index e63706960..5666100e9 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -11,7 +11,7 @@
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['menu']                  = '되돌리기 관리자';
-$lang['filter']                = '스팸 문서 찾기';
+$lang['filter']                = '스팸 문서 검색';
 $lang['revert']                = '선택한 문서 되돌리기';
 $lang['reverted']              = '%s 판을 %s 판으로 되돌림';
 $lang['removed']               = '%s 제거됨';
diff --git a/lib/plugins/usermanager/lang/ar/lang.php b/lib/plugins/usermanager/lang/ar/lang.php
index d4b891320..0a751e7fb 100644
--- a/lib/plugins/usermanager/lang/ar/lang.php
+++ b/lib/plugins/usermanager/lang/ar/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Arabic language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
  * @author uahello@gmail.com
diff --git a/lib/plugins/usermanager/lang/da/lang.php b/lib/plugins/usermanager/lang/da/lang.php
index 6b615b51d..47d7efea2 100644
--- a/lib/plugins/usermanager/lang/da/lang.php
+++ b/lib/plugins/usermanager/lang/da/lang.php
@@ -12,6 +12,7 @@
  * @author rasmus@kinnerup.com
  * @author Michael Pedersen subben@gmail.com
  * @author Mikael Lyngvig <mikael@lyngvig.org>
+ * @author soer9648 <soer9648@eucl.dk>
  */
 $lang['menu']                  = 'Brugerstyring';
 $lang['noauth']                = '(Brugervalidering er ikke tilgængelig)';
@@ -34,6 +35,11 @@ $lang['search']                = 'Søg';
 $lang['search_prompt']         = 'Udfør søgning';
 $lang['clear']                 = 'Nulstil søgefilter';
 $lang['filter']                = 'Filter';
+$lang['export_all']            = 'Eksportér Alle Brugere (CSV)';
+$lang['export_filtered']       = 'Eksportér Filtrerede Brugerliste (CSV)';
+$lang['import']                = 'Importér Nye Brugere';
+$lang['line']                  = 'Linje nr.';
+$lang['error']                 = 'Fejlmeddelelse';
 $lang['summary']               = 'Viser brugerne %1$d-%2$d ud af %3$d fundne. %4$d brugere totalt.';
 $lang['nonefound']             = 'Ingen brugere fundet. %d brugere totalt.';
 $lang['delete_ok']             = '%d brugere slettet';
@@ -54,3 +60,15 @@ $lang['add_ok']                = 'Bruger tilføjet uden fejl.';
 $lang['add_fail']              = 'Tilføjelse af bruger mislykkedes';
 $lang['notify_ok']             = 'Meddelelse sendt';
 $lang['notify_fail']           = 'Meddelelse kunne ikke sendes';
+$lang['import_userlistcsv']    = 'Brugerlistefil (CSV):';
+$lang['import_header']         = 'Nyeste Import - Fejl';
+$lang['import_success_count']  = 'Bruger-Import: %d brugere fundet, %d importeret med succes.';
+$lang['import_failure_count']  = 'Bruger-Import: %d fejlet. Fejl er listet nedenfor.';
+$lang['import_error_fields']   = 'Utilstrækkelige felter, fandt %d, påkrævet 4.';
+$lang['import_error_baduserid'] = 'Bruger-id mangler';
+$lang['import_error_badname']  = 'Ugyldigt navn';
+$lang['import_error_badmail']  = 'Ugyldig email-adresse';
+$lang['import_error_upload']   = 'Import Fejlet. CSV-filen kunne ikke uploades eller er tom.';
+$lang['import_error_readfail'] = 'Import Fejlet. Ikke muligt at læse uploadede fil.';
+$lang['import_error_create']   = 'Ikke muligt at oprette brugeren';
+$lang['import_notify_fail']    = 'Notifikationsmeddelelse kunne ikke sendes for importerede bruger %s, med emailen %s.';
diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php
index 21be74f71..d1b9b908b 100644
--- a/lib/plugins/usermanager/lang/de/lang.php
+++ b/lib/plugins/usermanager/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
@@ -20,6 +20,8 @@
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Sven <Svenluecke48@gmx.d>
  * @author christian studer <cstuder@existenz.ch>
+ * @author Ben Fey <benedikt.fey@beck-heun.de>
+ * @author Jonas Gröger <jonas.groeger@gmail.com>
  */
 $lang['menu']                  = 'Benutzerverwaltung';
 $lang['noauth']                = '(Authentifizierungssystem nicht verfügbar)';
@@ -67,6 +69,8 @@ $lang['add_ok']                = 'Nutzer erfolgreich angelegt';
 $lang['add_fail']              = 'Nutzer konnte nicht angelegt werden';
 $lang['notify_ok']             = 'Benachrichtigungsmail wurde versandt';
 $lang['notify_fail']           = 'Benachrichtigungsmail konnte nicht versandt werden';
+$lang['import_userlistcsv']    = 'Benutzerliste (CSV-Datei):';
+$lang['import_header']         = 'Letzte Fehler bei Import';
 $lang['import_success_count']  = 'User-Import: %d User gefunden, %d erfolgreich importiert.';
 $lang['import_failure_count']  = 'User-Import: %d fehlgeschlagen. Fehlgeschlagene User sind nachfolgend aufgelistet.';
 $lang['import_error_fields']   = 'Unzureichende Anzahl an Feldern: %d gefunden, benötigt sind 4.';
@@ -77,3 +81,4 @@ $lang['import_error_upload']   = 'Import fehlgeschlagen. Die CSV-Datei konnte ni
 $lang['import_error_readfail'] = 'Import fehlgeschlagen. Die hochgeladene Datei konnte nicht gelesen werden.';
 $lang['import_error_create']   = 'User konnte nicht angelegt werden';
 $lang['import_notify_fail']    = 'Notifikation konnte nicht an den importierten Benutzer %s (E-Mail: %s) gesendet werden.';
+$lang['import_downloadfailures'] = 'Fehler als CSV-Datei zur Korrektur herunterladen';
diff --git a/lib/plugins/usermanager/lang/eo/lang.php b/lib/plugins/usermanager/lang/eo/lang.php
index 4c4174339..ff7818e05 100644
--- a/lib/plugins/usermanager/lang/eo/lang.php
+++ b/lib/plugins/usermanager/lang/eo/lang.php
@@ -59,6 +59,8 @@ $lang['add_ok']                = 'La uzanto sukcese aldoniĝis';
 $lang['add_fail']              = 'Ne eblis aldoni uzanton';
 $lang['notify_ok']             = 'Avizanta mesaĝo sendiĝis';
 $lang['notify_fail']           = 'La avizanta mesaĝo ne povis esti sendita';
+$lang['import_userlistcsv']    = 'Dosiero kun listo de uzantoj (CSV):';
+$lang['import_header']         = 'Plej lastaj Import-eraroj';
 $lang['import_success_count']  = 'Uzant-importo: %d uzantoj trovataj, %d sukcese importitaj.';
 $lang['import_failure_count']  = 'Uzant-importo: %d fiaskis. Fiaskoj estas sube listitaj.';
 $lang['import_error_fields']   = 'Nesufiĉe da kampoj, ni trovis %d, necesas 4.';
@@ -69,3 +71,4 @@ $lang['import_error_upload']   = 'Importo fiaskis. La csv-dosiero ne povis esti
 $lang['import_error_readfail'] = 'Importo fiaskis. Ne eblas legi alŝutitan dosieron.';
 $lang['import_error_create']   = 'Ne eblas krei la uzanton';
 $lang['import_notify_fail']    = 'Averta mesaĝo ne povis esti sendata al la importita uzanto %s, kun retdreso %s.';
+$lang['import_downloadfailures'] = 'Elŝut-eraroj por korektado (CSV)';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index 1905fadc2..ccc7f9059 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -28,9 +28,9 @@ $lang['delete_selected']       = '선택 삭제';
 $lang['edit']                  = '편집';
 $lang['edit_prompt']           = '이 사용자 편집';
 $lang['modify']                = '바뀜 저장';
-$lang['search']                = '찾기';
-$lang['search_prompt']         = '찾기 실행';
-$lang['clear']                 = '찾기 필터 재설정';
+$lang['search']                = '검색';
+$lang['search_prompt']         = '검색 수행';
+$lang['clear']                 = '검색 필터 재설정';
 $lang['filter']                = '필터';
 $lang['export_all']            = '모든 사용자 목록 내보내기 (CSV)';
 $lang['export_filtered']       = '필터된 사용자 목록 내보내기 (CSV)';
diff --git a/lib/plugins/usermanager/lang/zh-tw/import.txt b/lib/plugins/usermanager/lang/zh-tw/import.txt
new file mode 100644
index 000000000..a6bb5f6ef
--- /dev/null
+++ b/lib/plugins/usermanager/lang/zh-tw/import.txt
@@ -0,0 +1,9 @@
+===== 批次匯入使用者 =====
+
+需提供 CSV 格式的使用者列表檔案（UTF-8 編碼）。
+每列至少 4 欄，依序為：帳號、姓名、電郵、群組。
+各欄以半形逗號 (,) 分隔，有半形逗號的字串可用半形雙引號 ("") 分開，引號可用反斜線 (\) 跳脫。
+重複的使用者帳號會自動忽略。
+如需要範例檔案，可用上面的「匯出使用者」取得。
+
+系統會為成功匯入的使用者產生密碼並寄信通知。
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index c7126bd1a..3fb6b6712 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -9,21 +9,26 @@
  * @author Wayne San <waynesan@zerozone.tw>
  * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
- * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
  * @author syaoranhinata@gmail.com
  * @author Ichirou Uchiki <syaoranhinata@gmail.com>
  * @author tsangho <ou4222@gmail.com>
+ * @author Danny Lin <danny0838@gmail.com>
  */
 $lang['menu']                  = '帳號管理器';
+
+// custom language strings for the plugin
 $lang['noauth']                = '(帳號認證尚未開放)';
 $lang['nosupport']             = '(尚不支援帳號管理)';
+
 $lang['badauth']               = '錯誤的認證機制';
+
 $lang['user_id']               = '帳號';
 $lang['user_pass']             = '密碼';
 $lang['user_name']             = '名稱';
 $lang['user_mail']             = '電郵';
 $lang['user_groups']           = '群組';
+
 $lang['field']                 = '欄位';
 $lang['value']                 = '設定值';
 $lang['add']                   = '增加';
@@ -36,8 +41,12 @@ $lang['search']                = '搜尋';
 $lang['search_prompt']         = '開始搜尋';
 $lang['clear']                 = '重設篩選條件';
 $lang['filter']                = '篩選條件 (Filter)';
-$lang['import']                = '匯入新的用戶';
+$lang['export_all']            = '匯出所有使用者 (CSV)';
+$lang['export_filtered']       = '匯出篩選後的使用者列表 (CSV)';
+$lang['import']                = '匯入新使用者';
+$lang['line']                  = '列號';
 $lang['error']                 = '錯誤訊息';
+
 $lang['summary']               = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。';
 $lang['nonefound']             = '找不到帳號。共有 %d 個帳號。';
 $lang['delete_ok']             = '已刪除 %d 個帳號';
@@ -45,10 +54,13 @@ $lang['delete_fail']           = '%d 個帳號無法刪除。';
 $lang['update_ok']             = '已更新該帳號';
 $lang['update_fail']           = '無法更新該帳號';
 $lang['update_exists']         = '無法變更帳號名稱 (%s) ，因為有同名帳號存在。其他修改則已套用。';
+
 $lang['start']                 = '開始';
 $lang['prev']                  = '上一頁';
 $lang['next']                  = '下一頁';
 $lang['last']                  = '最後一頁';
+
+// added after 2006-03-09 release
 $lang['edit_usermissing']      = '找不到選取的帳號，可能已被刪除或改為其他名稱。';
 $lang['user_notify']           = '通知使用者';
 $lang['note_notify']           = '通知信只會在指定使用者新密碼時寄送。';
@@ -58,4 +70,18 @@ $lang['add_ok']                = '已新增使用者';
 $lang['add_fail']              = '無法新增使用者';
 $lang['notify_ok']             = '通知信已寄出';
 $lang['notify_fail']           = '通知信無法寄出';
-$lang['import_error_readfail'] = '會入錯誤，無法讀取已經上傳的檔案';
+
+// import & errors
+$lang['import_userlistcsv']    = '使用者列表檔案 (CSV):  ';
+$lang['import_header']         = '最近一次匯入 - 失敗';
+$lang['import_success_count']  = '使用者匯入：找到 %d 個使用者，已成功匯入 %d 個。';
+$lang['import_failure_count']  = '使用者匯入：%d 個匯入失敗，列出於下。';
+$lang['import_error_fields']   = '欄位不足，需要 4 個，找到 %d 個。';
+$lang['import_error_baduserid'] = '使用者帳號遺失';
+$lang['import_error_badname']  = '名稱不正確';
+$lang['import_error_badmail']  = '電郵位址不正確';
+$lang['import_error_upload']   = '匯入失敗，CSV 檔案內容空白或無法匯入。';
+$lang['import_error_readfail'] = '匯入錯誤，無法讀取上傳的檔案';
+$lang['import_error_create']   = '無法建立使用者';
+$lang['import_notify_fail']    = '通知訊息無法寄給已匯入的使用者 %s（電郵 %s）';
+$lang['import_downloadfailures'] = '下載失敗項的 CSV 檔案以供修正';
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index c602830f7..ec846f6fd 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -110,26 +110,23 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                         <ul>
                             <?php
                                 $data = array();
+                                $data['view'] = 'detail';
 
                                 // View in media manager; @todo: transfer logic to backend
                                 $imgNS = getNS($IMG);
                                 $authNS = auth_quickaclcheck("$imgNS:*");
                                 if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) {
                                     $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG));
-                                    $data['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
+                                    $data['items']['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
                                 }
 
                                 // Back to [ID]; @todo: transfer logic to backend
-                                $data['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+                                $data['items']['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
 
                                 // the page tools can be amended through a custom plugin hook
-                                // if you're deriving from this template and your design is close enough to
-                                // the dokuwiki template you might want to trigger a DOKUWIKI event instead
-                                // of using $conf['template'] here
-                                $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
-                                $evt = new Doku_Event($hook, $data);
+                                $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
                                 if($evt->advise_before()){
-                                    foreach($evt->data as $k => $html) echo $html;
+                                    foreach($evt->data['items'] as $k => $html) echo $html;
                                 }
                                 $evt->advise_after();
                                 unset($data);
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index f6ca4ed86..3bc46406a 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -75,22 +75,21 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <ul>
                         <?php
                             $data = array(
-                                'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
-                                'revert'    => tpl_action('revert',    1, 'li', 1, '<span>', '</span>'),
-                                'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
-                                'backlink'  => tpl_action('backlink',  1, 'li', 1, '<span>', '</span>'),
-                                'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
-                                'top'       => tpl_action('top',       1, 'li', 1, '<span>', '</span>')
+                                'view'  => 'main',
+                                'items' => array(
+                                    'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
+                                    'revert'    => tpl_action('revert',    1, 'li', 1, '<span>', '</span>'),
+                                    'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
+                                    'backlink'  => tpl_action('backlink',  1, 'li', 1, '<span>', '</span>'),
+                                    'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
+                                    'top'       => tpl_action('top',       1, 'li', 1, '<span>', '</span>')
+                                )
                             );
 
                             // the page tools can be amended through a custom plugin hook
-                            // if you're deriving from this template and your design is close enough to
-                            // the dokuwiki template you might want to trigger a DOKUWIKI event instead
-                            // of using $conf['template'] here
-                            $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
-                            $evt = new Doku_Event($hook, $data);
+                            $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
                             if($evt->advise_before()){
-                                foreach($evt->data as $k => $html) echo $html;
+                                foreach($evt->data['items'] as $k => $html) echo $html;
                             }
                             $evt->advise_after();
                             unset($data);
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 897b6e6da..cc23c169f 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -2,7 +2,8 @@
 ; for limitations of the ini format used here
 
 ; To extend this file or make changes to it, it is recommended to create
-; a style.local.ini file to prevent losing any changes after an upgrade.
+; a local conf/tpl/<template-folder-name>/style.ini file to prevent losing
+; any changes after an upgrade.
 ; Please don't forget to copy the section your changes should be under
 ; (i.e. [stylesheets] or [replacements]) into that file as well.