jQuery rewrite branch merged into master branch of whole project

28 files changed, 163 insertions, 56 deletions

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index df13f65e3..e40ee9b7e 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -562,16 +562,19 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @return  array(user, password, full name, email, array(groups))
      */
     function _retrieveUser($clean=true) {
+        global $auth;
 
-        $user[0] = ($clean) ? cleanID(preg_replace('/.*:/','',$_REQUEST['userid'])) : $_REQUEST['userid'];
+        $user[0] = ($clean) ? $auth->cleanUser($_REQUEST['userid']) : $_REQUEST['userid'];
         $user[1] = $_REQUEST['userpass'];
         $user[2] = $_REQUEST['username'];
         $user[3] = $_REQUEST['usermail'];
-        $user[4] = preg_split('/\s*,\s*/',$_REQUEST['usergroups'],-1,PREG_SPLIT_NO_EMPTY);
+        $user[4] = explode(',',$_REQUEST['usergroups']);
 
-        if (empty($user[4]) || (is_array($user[4]) && (count($user[4]) == 1) && (trim($user[4][0]) == ''))) {
-            $user[4] = null;
-        }
+        $user[4] = array_map('trim',$user[4]);
+        if($clean) $user[4] = array_map(array($auth,'cleanGroup'),$user[4]);
+        $user[4] = array_filter($user[4]);
+        $user[4] = array_unique($user[4]);
+        if(!count($user[4])) $user[4] = null;
 
         return $user;
     }
diff --git a/lib/plugins/usermanager/images/search.png b/lib/plugins/usermanager/images/search.png
index 1aa445f03..e9dabc11e 100644
--- a/lib/plugins/usermanager/images/search.png
+++ b/lib/plugins/usermanager/images/search.png
diff --git a/lib/plugins/usermanager/lang/bg/lang.php b/lib/plugins/usermanager/lang/bg/lang.php
index 58c8453f2..909c1e8fe 100644
--- a/lib/plugins/usermanager/lang/bg/lang.php
+++ b/lib/plugins/usermanager/lang/bg/lang.php
@@ -4,11 +4,12 @@
  *
  * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
  * @author Viktor Usunov <usun0v@mail.bg>
+ * @author Kiril <neohidra@gmail.com>
  */
-$lang['menu']                  = 'Управление на потребителите';
-$lang['noauth']                = '(идентифицирането на потребителите е недостъпно)';
-$lang['nosupport']             = '(не се поддържа управление на потребители)';
-$lang['badauth']               = 'невалиден механизъм при идентификация';
+$lang['menu']                  = 'Диспечер на потребителите';
+$lang['noauth']                = '(удостоверяването на потребители не е налично)';
+$lang['nosupport']             = '(управлението на потребители не се поддържа)';
+$lang['badauth']               = 'невалиден механизъм за удостоверяване';
 $lang['user_id']               = 'Потребител';
 $lang['user_pass']             = 'Парола';
 $lang['user_name']             = 'Истинско име';
@@ -16,33 +17,33 @@ $lang['user_mail']             = 'Електронна поща';
 $lang['user_groups']           = 'Групи';
 $lang['field']                 = 'Поле';
 $lang['value']                 = 'Стойност';
-$lang['add']                   = 'Добавяне';
-$lang['delete']                = 'Изтриване';
-$lang['delete_selected']       = 'Изтриване на избраните';
-$lang['edit']                  = 'Редактиране';
+$lang['add']                   = 'Добави';
+$lang['delete']                = 'Изтрий';
+$lang['delete_selected']       = 'Изтрий избраните';
+$lang['edit']                  = 'Редактирай';
 $lang['edit_prompt']           = 'Редактиране на потребителя';
-$lang['modify']                = 'Запис на промените';
+$lang['modify']                = 'Запиши промените';
 $lang['search']                = 'Търсене';
-$lang['search_prompt']         = 'Търсене';
+$lang['search_prompt']         = 'Търси';
 $lang['clear']                 = 'Обновяване на търсенето';
 $lang['filter']                = 'Филтър';
-$lang['summary']               = 'Показване на потребители %1$d-%2$d от %3$d намерени. %4$d потребители общо.';
-$lang['nonefound']             = 'Няма намерени потребители. Общо %d потребители.';
-$lang['delete_ok']             = '%d потребители изтрити';
-$lang['delete_fail']           = '%d не бяха изтрити';
-$lang['update_ok']             = 'Обновяването на потребителя бе успешно';
-$lang['update_fail']           = 'Обновяването на потребителя бе неуспешно';
-$lang['update_exists']         = 'Смяната на потребителското име бе невъзможна, оказаното потребителско име (%s) вече съществува (всякакви други промени ще бъдат приложени).';
+$lang['summary']               = 'Показване на потребители %1$d-%2$d от %3$d намерени. Общо %4$d потребителя.';
+$lang['nonefound']             = 'Не са намерени потребители. Общо %d потребителя.';
+$lang['delete_ok']             = '%d изтрити потребителя';
+$lang['delete_fail']           = 'изтриването на %d се провали.';
+$lang['update_ok']             = 'Обновяването на потребителя е успешно';
+$lang['update_fail']           = 'Обновяването на потребителя се провали';
+$lang['update_exists']         = 'Смяната на потребителското име се провали, въведеното потребителско име (%s) вече съществува (всички други промени ще бъдат приложени).';
 $lang['start']                 = 'начало';
-$lang['prev']                  = 'предишно';
-$lang['next']                  = 'следващо';
-$lang['last']                  = 'последно';
-$lang['edit_usermissing']      = 'Избраният потребител не бе намерен, оказаното потребителско име може да е изтрито или променено другаде.';
-$lang['user_notify']           = 'Осведомяване на потребителя';
-$lang['note_notify']           = 'Осведомителната e-поща се праща само, ако на потребителя е дадена нова парола.';
-$lang['note_group']            = 'Новите потребители ще бъдат добавяни към групата (%s) ако не бъде посочена друга.';
-$lang['note_pass']             = 'Паролата ще бъде генерирана автоматично, ако полето е оставено празно и функцията за уведомяване на потребителя е включена.';
-$lang['add_ok']                = 'Добавянето на потребителя бе успешно';
-$lang['add_fail']              = 'Добавянето на потребителя бе неуспешно';
+$lang['prev']                  = 'назад';
+$lang['next']                  = 'напред';
+$lang['last']                  = 'край';
+$lang['edit_usermissing']      = 'Избраният потребител не е намерен, въведеното потребителско име може да е изтрито или променено другаде.';
+$lang['user_notify']           = 'Уведомяване на потребителя';
+$lang['note_notify']           = 'Ел. писмо се изпраща само ако бъде променена паролата на потребителя.';
+$lang['note_group']            = 'Новите потребители биват добавяни към стандартната групата (%s) ако не е посочена друга.';
+$lang['note_pass']             = 'Паролата ще бъде генерирана автоматично, ако оставите полето празно и функцията за уведомяване на потребителя е включена.';
+$lang['add_ok']                = 'Добавянето на потребителя е успешно';
+$lang['add_fail']              = 'Добавянето на потребителя се провали';
 $lang['notify_ok']             = 'Осведомително е-писмо бе изпратено';
 $lang['notify_fail']           = 'Пращането на осведомително е-писмо е невъзможно';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index 9c5a2abc9..7d8e4599d 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -45,7 +45,7 @@ $lang['edit_usermissing']      = 'Vybraný uživatel nebyl nalezen, zadané uži
 $lang['user_notify']           = 'Upozornit uživatele';
 $lang['note_notify']           = 'Maily s upozorněním se budou posílat pouze, když uživatel dostává nové heslo.';
 $lang['note_group']            = 'Noví uživatelé budou přidáváni do této výchozí skupiny (%s), pokud pro ně není uvedena žádná skupina.';
-$lang['note_pass']             = 'Heslo bude automaticky vygenerováno pokud je pole ponacháno prázdné a je zapnutá notifikace uživatele.';
+$lang['note_pass']             = 'Heslo bude automaticky vygenerováno pokud je pole ponecháno prázdné a je zapnutá notifikace uživatele.';
 $lang['add_ok']                = 'Uživatel úspěšně vytvořen';
 $lang['add_fail']              = 'Vytvoření uživatele selhalo';
 $lang['notify_ok']             = 'Odeslán mail s upozorněním';
diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php
index e906c0cf8..95b36c60f 100644
--- a/lib/plugins/usermanager/lang/de-informal/lang.php
+++ b/lib/plugins/usermanager/lang/de-informal/lang.php
@@ -6,6 +6,7 @@
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
  * @author Matthias Schulte <post@lupo49.de>
+ * @author Christian Wichmann <nospam@zone0.de>
  */
 $lang['menu']                  = 'Benutzerverwalter';
 $lang['noauth']                = '(Benutzeranmeldung ist nicht verfügbar)';
diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php
index 816aaebd7..090d1d1d9 100644
--- a/lib/plugins/usermanager/lang/de/lang.php
+++ b/lib/plugins/usermanager/lang/de/lang.php
@@ -13,6 +13,8 @@
  * @author Blitzi94@gmx.de
  * @author Robert Bogenschneider <robog@GMX.de>
  * @author Robert Bogenschneider <robog@gmx.de>
+ * @author Niels Lange <niels@boldencursief.nl>
+ * @author Christian Wichmann <nospam@zone0.de>
  */
 $lang['menu']                  = 'Benutzerverwaltung';
 $lang['noauth']                = '(Authentifizierungssystem nicht verfügbar)';
diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php
new file mode 100644
index 000000000..0ffea1244
--- /dev/null
+++ b/lib/plugins/usermanager/lang/et/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Estonian language file
+ *
+ * @author kristian.kankainen@kuu.la
+ */
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 92bc127ed..49baf9d51 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -14,6 +14,7 @@
  * @author Philippe Bajoit <philippe.bajoit@gmail.com>
  * @author Florian Gaub <floriang@floriang.net>
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
+ * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  */
 $lang['menu']                  = 'Gestion des utilisateurs';
 $lang['noauth']                = '(authentification utilisateur non disponible)';
diff --git a/lib/plugins/usermanager/lang/he/lang.php b/lib/plugins/usermanager/lang/he/lang.php
index b2b55c3b4..601163013 100644
--- a/lib/plugins/usermanager/lang/he/lang.php
+++ b/lib/plugins/usermanager/lang/he/lang.php
@@ -6,6 +6,7 @@
  * @author Dotan Kamber <kamberd@yahoo.com>
  * @author Moshe Kaplan <mokplan@gmail.com>
  * @author Yaron Yogev <yaronyogev@gmail.com>
+ * @author Yaron Shahrabani <sh.yaron@gmail.com>
  */
 $lang['menu']                  = 'מנהל משתמשים';
 $lang['noauth']                = '(אימות משתמשים אינו זמין)';
diff --git a/lib/plugins/usermanager/lang/hi/lang.php b/lib/plugins/usermanager/lang/hi/lang.php
index d8630a281..d6f78ffd6 100644
--- a/lib/plugins/usermanager/lang/hi/lang.php
+++ b/lib/plugins/usermanager/lang/hi/lang.php
@@ -3,4 +3,5 @@
  * Hindi language file
  *
  * @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
  */
diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php
index a766e5d07..34c510def 100644
--- a/lib/plugins/usermanager/lang/it/lang.php
+++ b/lib/plugins/usermanager/lang/it/lang.php
@@ -11,6 +11,7 @@
  * @author snarchio@alice.it
  * @author robocap <robocap1@gmail.com>
  * @author Osman Tekin osman.tekin93@hotmail.it
+ * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  */
 $lang['menu']                  = 'Gestione Utenti';
 $lang['noauth']                = '(autenticazione non disponibile)';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index eeb8eb791..f2322414a 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -6,6 +6,7 @@
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
+ * @author Seung-Chul Yoo  <dryoo@live.com>
  */
 $lang['menu']                  = '사용자 관리자';
 $lang['noauth']                = '(사용자 인증이 불가능합니다.)';
diff --git a/lib/plugins/usermanager/lang/la/add.txt b/lib/plugins/usermanager/lang/la/add.txt
new file mode 100644
index 000000000..beb797c4a
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/add.txt
@@ -0,0 +1 @@
+===== Sodalem addere =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/delete.txt b/lib/plugins/usermanager/lang/la/delete.txt
new file mode 100644
index 000000000..1eb5e1f14
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/delete.txt
@@ -0,0 +1 @@
+===== Sodalem delere =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/edit.txt b/lib/plugins/usermanager/lang/la/edit.txt
new file mode 100644
index 000000000..4e3d3b2ae
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/edit.txt
@@ -0,0 +1 @@
+===== Sodalem recensere =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/intro.txt b/lib/plugins/usermanager/lang/la/intro.txt
new file mode 100644
index 000000000..7f5c011a8
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/intro.txt
@@ -0,0 +1 @@
+====== Sodalis Tabella ======
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/lang.php b/lib/plugins/usermanager/lang/la/lang.php
new file mode 100644
index 000000000..52c848754
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/lang.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Latin language file
+ *
+ * @author Massimiliano Vassalli <vassalli.max@gmail.com>
+ */
+$lang['menu']                  = 'Sodalis Tabella';
+$lang['noauth']                = '(Sodalis confirmatio deest)';
+$lang['nosupport']             = '(Sodalis administratio deest)';
+$lang['badauth']               = 'Confirmatio fieri non potest.';
+$lang['user_id']               = 'Sodalis';
+$lang['user_pass']             = 'Tessera';
+$lang['user_name']             = 'Nomen uerum';
+$lang['user_mail']             = 'Cursus Interretialis';
+$lang['user_groups']           = 'Grex';
+$lang['field']                 = 'Campus';
+$lang['value']                 = 'Vis';
+$lang['add']                   = 'Addere';
+$lang['delete']                = 'Delere';
+$lang['delete_selected']       = 'Electa delere';
+$lang['edit']                  = 'Recensere';
+$lang['edit_prompt']           = 'Sodalem recensere';
+$lang['modify']                = 'Mutata seruare';
+$lang['search']                = 'Quaerere';
+$lang['search_prompt']         = 'Agentem quaerere';
+$lang['clear']                 = 'Colum quaerendi abrogare';
+$lang['filter']                = 'Colum';
+$lang['summary']               = 'Sodales %1$d-%2$d inter %3$d ostenduntur. Numerus Sodalium. %4$d.';
+$lang['nonefound']             = 'Sodalis non repertus. Numerus sodalium: %d';
+$lang['delete_ok']             = '%d Sodales delentur.';
+$lang['delete_fail']           = '%d non deleri possunt.';
+$lang['update_ok']             = 'Sodalis feliciter nouatus\a';
+$lang['update_fail']           = 'Sodalis infeliciter nouatus\a';
+$lang['update_exists']         = 'Nomen Sodalis non mutatur, eo quod hoc nomen (%s) iam electum est.';
+$lang['start']                 = 'in primis';
+$lang['prev']                  = 'antea';
+$lang['next']                  = 'postea';
+$lang['last']                  = 'in extremis';
+$lang['edit_usermissing']      = 'Hic Sodalis non inuenitur, eo quod nomen iam deletum uel mutatum est.';
+$lang['user_notify']           = 'Sodalem adnotare';
+$lang['note_notify']           = 'Adnotationes cursu interretiali missae solum si noua tessera petitur.';
+$lang['note_group']            = 'Noui\ae Sodales communi Gregi adduntur (%s) si Grex non elegitur.';
+$lang['note_pass']             = 'Tessera non generata nisi campus uacuos est et Sodalis adnotationes aptae faciuntur.';
+$lang['add_ok']                = 'Sodalis feliciter additur.';
+$lang['add_fail']              = 'Sodalis infeliciter additur.';
+$lang['notify_ok']             = 'Adnotationes cursu interretiali missae';
+$lang['notify_fail']           = 'Adnotationes cursu interretiali non missae';
diff --git a/lib/plugins/usermanager/lang/la/list.txt b/lib/plugins/usermanager/lang/la/list.txt
new file mode 100644
index 000000000..b470d2ea4
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/list.txt
@@ -0,0 +1 @@
+===== Sodalis index =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 81d9a72a6..456ba5b29 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -14,6 +14,8 @@
  * @author Vlad Tsybenko <vlad.development@gmail.com>
  * @author Aleksey Osadchiy <rfc@nm.ru>
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
+ * @author Ladyko Andrey <fylh@succexy.spb.ru>
+ * @author Eugene <windy.wanderer@gmail.com>
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
@@ -47,12 +49,12 @@ $lang['start']                 = 'в начало';
 $lang['prev']                  = 'назад';
 $lang['next']                  = 'вперёд';
 $lang['last']                  = 'в конец';
-$lang['edit_usermissing']      = 'Выбранный пользователь не найден. Возможно, указанный логин был удалён или изменен извне.';
+$lang['edit_usermissing']      = 'Выбранный пользователь не найден. Возможно, указанный логин был удалён или изменён извне.';
 $lang['user_notify']           = 'Сообщить пользователю';
 $lang['note_notify']           = 'Письма с уведомлением высылаются только в случае получения нового пароля.';
 $lang['note_group']            = 'Если группа не указана, новые пользователи будут добавлены в группу по умолчанию (%s).';
 $lang['note_pass']             = 'Пароль будет сгенерирован автоматически, если поле оставлено пустым и включено уведомление пользователя.';
 $lang['add_ok']                = 'Пользователь успешно добавлен';
 $lang['add_fail']              = 'Не удалось добавить пользователя';
-$lang['notify_ok']             = 'Пиьмо с уведомлением отправлено';
+$lang['notify_ok']             = 'Письмо с уведомлением отправлено';
 $lang['notify_fail']           = 'Не удалось отправить письмо с уведомлением';
diff --git a/lib/plugins/usermanager/lang/sl/add.txt b/lib/plugins/usermanager/lang/sl/add.txt
index 985fa607e..c1d8913b4 100644
--- a/lib/plugins/usermanager/lang/sl/add.txt
+++ b/lib/plugins/usermanager/lang/sl/add.txt
@@ -1 +1 @@
-===== Dodaj uporabnika =====
\ No newline at end of file
+===== Dodajanje uporabnika =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/sl/delete.txt b/lib/plugins/usermanager/lang/sl/delete.txt
index 515b343e5..7d9de54e6 100644
--- a/lib/plugins/usermanager/lang/sl/delete.txt
+++ b/lib/plugins/usermanager/lang/sl/delete.txt
@@ -1 +1 @@
-===== Izbriši uporabnika =====
\ No newline at end of file
+===== Izbrisanje uporabnika =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/sl/edit.txt b/lib/plugins/usermanager/lang/sl/edit.txt
index 23aeb0c3b..e80bc8585 100644
--- a/lib/plugins/usermanager/lang/sl/edit.txt
+++ b/lib/plugins/usermanager/lang/sl/edit.txt
@@ -1 +1 @@
-===== Uredi uporabnika =====
\ No newline at end of file
+===== Urejanje uporabnikov =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/sl/intro.txt b/lib/plugins/usermanager/lang/sl/intro.txt
new file mode 100644
index 000000000..a4729a8a5
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sl/intro.txt
@@ -0,0 +1 @@
+====== Upravljanje uporabnikov ======
diff --git a/lib/plugins/usermanager/lang/sl/lang.php b/lib/plugins/usermanager/lang/sl/lang.php
index e31f8ff1a..96acfd0af 100644
--- a/lib/plugins/usermanager/lang/sl/lang.php
+++ b/lib/plugins/usermanager/lang/sl/lang.php
@@ -4,17 +4,47 @@
  *
  * @author Dejan Levec <webphp@gmail.com>
  * @author Boštjan Seničar <senicar@gmail.com>
+ * @author Gregor Skumavc (grega.skumavc@gmail.com)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
  */
+$lang['menu']                  = 'Upravljanje uporabnikov';
+$lang['noauth']                = '(overjanje istovetnosti uporabnikov ni na voljo)';
+$lang['nosupport']             = '(upravljanje računov uporabnikov ni podprto)';
+$lang['badauth']               = 'neveljaven način overjanja';
 $lang['user_id']               = 'Uporabnik';
 $lang['user_pass']             = 'Geslo';
-$lang['user_mail']             = 'Email';
+$lang['user_name']             = 'Pravo ime';
+$lang['user_mail']             = 'Elektronski naslov';
 $lang['user_groups']           = 'Skupine';
+$lang['field']                 = 'Polje';
+$lang['value']                 = 'Vrednost';
 $lang['add']                   = 'Dodaj';
 $lang['delete']                = 'Izbriši';
 $lang['delete_selected']       = 'Izbriši izbrano';
 $lang['edit']                  = 'Uredi';
+$lang['edit_prompt']           = 'Uredi tega uporabnika';
 $lang['modify']                = 'Shrani spremembe';
 $lang['search']                = 'Iskanje';
-$lang['prev']                  = 'Prejšnji';
+$lang['search_prompt']         = 'Poišči';
+$lang['clear']                 = 'Počisti filter iskanja';
+$lang['filter']                = 'Filter';
+$lang['summary']               = 'Izpisani so uporabniki %1$d-%2$d od skupno %3$d. Vseh uporabnikov je %4$d.';
+$lang['nonefound']             = 'Ni najdenih uporabnikov. Vseh uporabnikov je %d.';
+$lang['delete_ok']             = '%d uporabnikov je izbrisanih';
+$lang['delete_fail']           = '%d ni bilo mogoče izbrisati';
+$lang['update_ok']             = 'Uporabniški račun je uspešno posodobljen';
+$lang['update_fail']           = 'Posodobitev uporabniškega računa je spodletela';
+$lang['update_exists']         = 'Spreminjanje imena uporabnika je spodletelo. Navedeno uporabniško ime (%s) že obstaja (vse ostale spremembe bodo uveljavljene).';
+$lang['start']                 = 'Začetni';
+$lang['prev']                  = 'Predhodni';
 $lang['next']                  = 'Naslednji';
-$lang['last']                  = 'Zadnji';
+$lang['last']                  = 'Končni';
+$lang['edit_usermissing']      = 'Izbranega uporabnika ni mogoče najti. Navedeno uporabniško ime je morda izbrisano ali spremenjeno.';
+$lang['user_notify']           = 'Obvesti uporabnika';
+$lang['note_notify']           = 'Obvestilna sporočila so poslana le, če uporabnik prejme novo geslo za dostop do strani.';
+$lang['note_group']            = 'Nov uporabnik bo dodan k privzeti skupini (%s), v kolikor ni navedene druge skupine.';
+$lang['note_pass']             = 'Geslo bo ustvarjeno samodejno, v kolikor je polje izpuščeno in je omogočeno obveščanje uporabnika.';
+$lang['add_ok']                = 'Uporabnik je uspešno dodan';
+$lang['add_fail']              = 'Dodajanje uporabnika je spodletelo';
+$lang['notify_ok']             = 'Obvestilno sporočilo je poslano.';
+$lang['notify_fail']           = 'Obvestilnega sporočila ni mogoče poslati.';
diff --git a/lib/plugins/usermanager/lang/tr/lang.php b/lib/plugins/usermanager/lang/tr/lang.php
index 28127d9d0..b9c9cfc52 100644
--- a/lib/plugins/usermanager/lang/tr/lang.php
+++ b/lib/plugins/usermanager/lang/tr/lang.php
@@ -2,11 +2,10 @@
 /**
  * Turkish language file
  *
- * @author Aydın Coşkuner aydinweb@gmail.com
  * @author Aydın Coşkuner <aydinweb@gmail.com>
- * @author yavuzselim@gmail.com
- * @author Cihan Kahveci kahvecicihan@gmail.com
+ * @author Cihan Kahveci <kahvecicihan@gmail.com>
  * @author Yavuz Selim <yavuzselim@gmail.com>
+ * @author Caleb Maclennan <caleb@alerque.com>
  */
 $lang['menu']                  = 'Kullanıcı Yönetimi';
 $lang['noauth']                = '(kullanıcı onaylaması yoktur)';
diff --git a/lib/plugins/usermanager/lang/zh-tw/intro.txt b/lib/plugins/usermanager/lang/zh-tw/intro.txt
index 9c499d862..8f9488d7d 100644
--- a/lib/plugins/usermanager/lang/zh-tw/intro.txt
+++ b/lib/plugins/usermanager/lang/zh-tw/intro.txt
@@ -1 +1 @@
-====== 帳號管理員(User Manager) ======
+====== 帳號管理員 ======
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index 26c87205d..5cb20aae8 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -8,8 +8,10 @@
  * @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>
  */
-$lang['menu']                  = '帳號管理員(User Manager)';
+$lang['menu']                  = '帳號管理員';
 $lang['noauth']                = '(帳號認證尚未開放)';
 $lang['nosupport']             = '(尚不支援帳號管理)';
 $lang['badauth']               = '錯誤的認證機制';
@@ -28,25 +30,25 @@ $lang['edit_prompt']           = '修改該帳號';
 $lang['modify']                = '儲存變更';
 $lang['search']                = '搜尋';
 $lang['search_prompt']         = '開始搜尋';
-$lang['clear']                 = '重新設定搜尋的條件';
+$lang['clear']                 = '重設篩選條件';
 $lang['filter']                = '篩選條件(Filter)';
-$lang['summary']               = '顯示帳號 %1$d 至 %2$d 共 %3$d 筆符合. 總共有 %4$d 個帳號';
-$lang['nonefound']             = '找不到該用戶(共 %d 帳號)。';
+$lang['summary']               = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。';
+$lang['nonefound']             = '找不到帳號。共有 %d 個帳號。';
 $lang['delete_ok']             = '已刪除 %d 個帳號';
 $lang['delete_fail']           = '%d 個帳號刪除失敗';
 $lang['update_ok']             = '成功更新該帳號';
 $lang['update_fail']           = '更新該帳號時失敗';
-$lang['update_exists']         = '變更帳號名稱 (%s) 時失敗，應該是已有同名的帳號，不過除了帳號名稱之外的其他修改仍會儲存。';
+$lang['update_exists']         = '變更帳號名稱 (%s) 失敗，因為有同名帳號存在（其他修改已套用）。';
 $lang['start']                 = '開始';
-$lang['prev']                  = '上一步';
-$lang['next']                  = '下一步';
-$lang['last']                  = '最後步驟';
-$lang['edit_usermissing']      = '找不到所選的帳號，該帳號可能已經被刪除或是改為其他名稱喔。';
+$lang['prev']                  = '上一頁';
+$lang['next']                  = '下一頁';
+$lang['last']                  = '最後一頁';
+$lang['edit_usermissing']      = '找不到選取的帳號，可能已被刪除或改為其他名稱。';
 $lang['user_notify']           = '通知使用者';
-$lang['note_notify']           = '通知信只有在給予使用者新密碼時寄送。';
+$lang['note_notify']           = '通知信只會在指定使用者新密碼時寄送。';
 $lang['note_group']            = '如果沒有指定群組，新使用者將會被加入到預設群組(%s)當中。';
 $lang['note_pass']             = '如果沒有輸入這個欄位而且有勾選通知使用者，則會自動產生一組密碼。';
 $lang['add_ok']                = '新增使用者成功';
 $lang['add_fail']              = '新增使用者失敗';
 $lang['notify_ok']             = '通知信已寄出';
-$lang['notify_fail']           = '通知信無法被寄出';
+$lang['notify_fail']           = '通知信無法寄出';
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index 613826329..21bbb710d 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -8,6 +8,9 @@
  * @author Simon zhan <simonzhan@21cn.com>
  * @author mr.jinyi@gmail.com
  * @author ben <ben@livetom.com>
+ * @author lainme <lainme993@gmail.com>
+ * @author caii <zhoucaiqi@gmail.com>
+ * @author Hiphen Lee <jacob.b.leung@gmail.com>
  */
 $lang['menu']                  = '用户管理器';
 $lang['noauth']                = '（用户认证不可用）';