From 6ed3476b11fe6e9c4625fb28e8953ac26e8160fb Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 15 Feb 2014 20:59:06 +0000
Subject: fixes possibility of a user password change being sent out when a
 password couldn't be/wasn't changed

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

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 156037f09..b9199e586 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -643,9 +643,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) {
             msg($this->lang['update_ok'],1);
 
-            if ($INPUT->has('usernotify') && $newpass) {
+            if ($INPUT->has('usernotify') && !empty($changes['pass'])) {
                 $notify = empty($changes['user']) ? $olduser : $newuser;
-                $this->_notifyUser($notify,$newpass);
+                $this->_notifyUser($notify,$changes['pass']);
             }
 
             // invalidate all sessions
-- 
cgit v1.2.3


From 40d72af6467f899f09d3b282922f861482e8228f Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 15 Feb 2014 21:00:08 +0000
Subject: add braces and indentation per coding standards

---
 lib/plugins/usermanager/admin.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index b9199e586..4b94440b0 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -631,14 +631,15 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             $newpass = auth_pwgen($olduser);
         }
 
-        if (!empty($newpass) && $this->_auth->canDo('modPass'))
-          $changes['pass'] = $newpass;
-        if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name'])
-          $changes['name'] = $newname;
-        if (!empty($newmail) && $this->_auth->canDo('modMail') && $newmail != $oldinfo['mail'])
-          $changes['mail'] = $newmail;
-        if (!empty($newgrps) && $this->_auth->canDo('modGroups') && $newgrps != $oldinfo['grps'])
-          $changes['grps'] = $newgrps;
+        if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name']) {
+            $changes['name'] = $newname;
+        }
+        if (!empty($newmail) && $this->_auth->canDo('modMail') && $newmail != $oldinfo['mail']) {
+            $changes['mail'] = $newmail;
+        }
+        if (!empty($newgrps) && $this->_auth->canDo('modGroups') && $newgrps != $oldinfo['grps']) {
+            $changes['grps'] = $newgrps;
+        }
 
         if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) {
             msg($this->lang['update_ok'],1);
-- 
cgit v1.2.3


From 359e941731104cd989739d789f476590011eb518 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 15 Feb 2014 21:00:50 +0000
Subject: add password confirmation field when setting password in the
 usermanager

---
 lib/plugins/usermanager/admin.php        | 54 +++++++++++++++++++++++++++-----
 lib/plugins/usermanager/lang/en/lang.php |  3 ++
 2 files changed, 50 insertions(+), 7 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 4b94440b0..faa4b8d31 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -299,6 +299,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         $this->_htmlInputField($cmd."_userid",    "userid",    $this->lang["user_id"],    $user,  $this->_auth->canDo("modLogin"), $indent+6);
         $this->_htmlInputField($cmd."_userpass",  "userpass",  $this->lang["user_pass"],  "",     $this->_auth->canDo("modPass"),  $indent+6);
+        $this->_htmlInputField($cmd."_userpass2", "userpass2", $this->lang["user_passconfirm"], "", $this->_auth->canDo("modPass"), $indent+6);
         $this->_htmlInputField($cmd."_username",  "username",  $this->lang["user_name"],  $name,  $this->_auth->canDo("modName"),  $indent+6);
         $this->_htmlInputField($cmd."_usermail",  "usermail",  $this->lang["user_mail"],  $mail,  $this->_auth->canDo("modMail"),  $indent+6);
         $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6);
@@ -358,7 +359,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $class = $cando ? '' : ' class="disabled"';
         echo str_pad('',$indent);
 
-        if($name == 'userpass'){
+        if($name == 'userpass' || $name == 'userpass2'){
             $fieldtype = 'password';
             $autocomp  = 'autocomplete="off"';
         }elseif($name == 'usermail'){
@@ -475,7 +476,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('addUser')) return false;
 
-        list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser();
+        list($user,$pass,$name,$mail,$grps,$passconfirm) = $this->_retrieveUser();
         if (empty($user)) return false;
 
         if ($this->_auth->canDo('modPass')){
@@ -486,6 +487,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
                     msg($this->lang['add_fail'], -1);
                     return false;
                 }
+            } else {
+                if (!$this->_verifyPassword($pass,$passconfirm)) {
+                    return false;
+                }
             }
         } else {
             if (!empty($pass)){
@@ -606,7 +611,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $oldinfo = $this->_auth->getUserData($olduser);
 
         // get new user data subject to change
-        list($newuser,$newpass,$newname,$newmail,$newgrps) = $this->_retrieveUser();
+        list($newuser,$newpass,$newname,$newmail,$newgrps,$passconfirm) = $this->_retrieveUser();
         if (empty($newuser)) return false;
 
         $changes = array();
@@ -625,10 +630,19 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
                 $changes['user'] = $newuser;
             }
         }
-
-        // generate password if left empty and notification is on
-        if($INPUT->has('usernotify') && empty($newpass)){
-            $newpass = auth_pwgen($olduser);
+        if ($this->_auth->canDo('modPass')) {
+            if ($newpass || $confirm) {
+                if ($this->_verifyPassword($newpass,$passconfirm)) {
+                    $changes['pass'] = $newpass;
+                } else {
+                    return false;
+                }
+            } else {
+                // no new password supplied, check if we need to generate one (or it stays unchanged)
+                if ($INPUT->has('usernotify')) {
+                    $changes['pass'] = auth_pwgen($olduser);
+                }
+            }
         }
 
         if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name']) {
@@ -686,6 +700,31 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return $sent;
     }
 
+    /**
+     * Verify password meets minimum requirements
+     * :TODO: extend to support password strength
+     *
+     * @param string  $password   candidate string for new password
+     * @param string  $confirm    repeated password for confirmation
+     * @return bool   true if meets requirements, false otherwise
+     */
+    protected function _verifyPassword($password, $confirm) {
+
+        if (empty($password)) {
+            return false;
+        }
+
+        if ($password !== $confirm) {
+            msg($this->lang['pass_confirm_fail'], -1);
+            return false;
+        }
+
+        // :TODO: test password for required strength
+
+        // if we make it this far the password is good
+        return true;
+    }
+
     /**
      * Retrieve & clean user data from the form
      *
@@ -702,6 +741,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $user[2] = $INPUT->str('username');
         $user[3] = $INPUT->str('usermail');
         $user[4] = explode(',',$INPUT->str('usergroups'));
+        $user[5] = $INPUT->str('userpass2');                // repeated password for confirmation
 
         $user[4] = array_map('trim',$user[4]);
         if($clean) $user[4] = array_map(array($auth,'cleanGroup'),$user[4]);
diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php
index f87c77afb..c18b5d684 100644
--- a/lib/plugins/usermanager/lang/en/lang.php
+++ b/lib/plugins/usermanager/lang/en/lang.php
@@ -76,4 +76,7 @@ $lang['import_error_create']  = 'Unable to create the user';
 $lang['import_notify_fail']   = 'Notification message could not be sent for imported user, %s with email %s.';
 $lang['import_downloadfailures'] = 'Download Failures as CSV for correction';
 
+// added 2014-02
+$lang['user_passconfirm'] = 'Confirm Password';
+$lang['pass_confirm_fail'] = 'Passwords do not match';
 
-- 
cgit v1.2.3


From be9008d3e4137a2456222098dfe45589e23ee3cf Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 16 Feb 2014 17:54:48 +0000
Subject: user global  strings for password confirmation prompt & error

---
 lib/plugins/usermanager/admin.php        | 6 ++++--
 lib/plugins/usermanager/lang/en/lang.php | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index faa4b8d31..aac2da605 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -277,6 +277,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     protected function _htmlUserForm($cmd,$user='',$userdata=array(),$indent=0) {
         global $conf;
         global $ID;
+        global $lang;
 
         $name = $mail = $groups = '';
         $notes = array();
@@ -299,7 +300,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         $this->_htmlInputField($cmd."_userid",    "userid",    $this->lang["user_id"],    $user,  $this->_auth->canDo("modLogin"), $indent+6);
         $this->_htmlInputField($cmd."_userpass",  "userpass",  $this->lang["user_pass"],  "",     $this->_auth->canDo("modPass"),  $indent+6);
-        $this->_htmlInputField($cmd."_userpass2", "userpass2", $this->lang["user_passconfirm"], "", $this->_auth->canDo("modPass"), $indent+6);
+        $this->_htmlInputField($cmd."_userpass2", "userpass2", $lang["passchk"],          "",     $this->_auth->canDo("modPass"),  $indent+6);
         $this->_htmlInputField($cmd."_username",  "username",  $this->lang["user_name"],  $name,  $this->_auth->canDo("modName"),  $indent+6);
         $this->_htmlInputField($cmd."_usermail",  "usermail",  $this->lang["user_mail"],  $mail,  $this->_auth->canDo("modMail"),  $indent+6);
         $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6);
@@ -709,13 +710,14 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @return bool   true if meets requirements, false otherwise
      */
     protected function _verifyPassword($password, $confirm) {
+        global $lang;
 
         if (empty($password)) {
             return false;
         }
 
         if ($password !== $confirm) {
-            msg($this->lang['pass_confirm_fail'], -1);
+            msg($lang['regbadpass'], -1);
             return false;
         }
 
diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php
index c18b5d684..b55ecc998 100644
--- a/lib/plugins/usermanager/lang/en/lang.php
+++ b/lib/plugins/usermanager/lang/en/lang.php
@@ -76,7 +76,3 @@ $lang['import_error_create']  = 'Unable to create the user';
 $lang['import_notify_fail']   = 'Notification message could not be sent for imported user, %s with email %s.';
 $lang['import_downloadfailures'] = 'Download Failures as CSV for correction';
 
-// added 2014-02
-$lang['user_passconfirm'] = 'Confirm Password';
-$lang['pass_confirm_fail'] = 'Passwords do not match';
-
-- 
cgit v1.2.3


From 2400ddcb0585bd4bba5d4abeb1be8e2f4ebc56d6 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 2 Mar 2014 20:38:18 +0000
Subject: correct mis-spelled var name and correct empty password fields test

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

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index aac2da605..eadfb76ad 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -632,7 +632,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             }
         }
         if ($this->_auth->canDo('modPass')) {
-            if ($newpass || $confirm) {
+            if ($newpass || $passconfirm) {
                 if ($this->_verifyPassword($newpass,$passconfirm)) {
                     $changes['pass'] = $newpass;
                 } else {
@@ -712,7 +712,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     protected function _verifyPassword($password, $confirm) {
         global $lang;
 
-        if (empty($password)) {
+        if (empty($password) && empty($confirm)) {
             return false;
         }
 
-- 
cgit v1.2.3


From 0e80bb5e347ff00c6f81627d8e39dafaaa923bc5 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 5 Mar 2014 21:58:46 +0000
Subject: use empty() where array values might not be set

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

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index eadfb76ad..b67d91b36 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -53,7 +53,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
 
         // attempt to retrieve any import failures from the session
-        if ($_SESSION['import_failures']){
+        if (!empty($_SESSION['import_failures'])){
             $this->_import_failures = $_SESSION['import_failures'];
         }
     }
-- 
cgit v1.2.3


From e26a58378c0c7f5d468dde469a7f782b45354426 Mon Sep 17 00:00:00 2001
From: Janar Leas <janarleas@gmail.com>
Date: Thu, 6 Mar 2014 17:55:34 +0100
Subject: translation update

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

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php
index 2161df918..93b28a6b8 100644
--- a/lib/plugins/usermanager/lang/et/lang.php
+++ b/lib/plugins/usermanager/lang/et/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Estonian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author kristian.kankainen@kuu.la
  * @author Rivo Zängov <eraser@eraser.ee>
  */
-- 
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/usermanager/lang/ru/import.txt | 8 ++++----
 lib/plugins/usermanager/lang/ru/lang.php   | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt
index 3a25f34ce..dd2b797bc 100644
--- a/lib/plugins/usermanager/lang/ru/import.txt
+++ b/lib/plugins/usermanager/lang/ru/import.txt
@@ -1,9 +1,9 @@
 ===== Импорт нескольких пользователей =====
 
 Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
-Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы.
-Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание.
-В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей».
+Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. 
+Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание. 
+В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». 
 Повторяющиеся идентификаторы user-id будут игнорироваться.
 
-Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file
+Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю. 
\ 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 3102ac32a..83158df31 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -19,6 +19,7 @@
  * @author Johnny Utah <pcpa@cyberpunk.su>
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Pavel <ivanovtsk@mail.ru>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
@@ -72,7 +73,7 @@ $lang['import_error_fields']   = 'Не все поля заполнены. На
 $lang['import_error_baduserid'] = 'Отсутствует идентификатор пользователя';
 $lang['import_error_badname']  = 'Имя не годится';
 $lang['import_error_badmail']  = 'Адрес электронной почты не годится';
-$lang['import_error_upload']   = 'Импорт не удался. CSV файл не загружен или пуст.';
+$lang['import_error_upload']   = 'Импорт не удался. CSV-файл не загружен или пуст.';
 $lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.';
 $lang['import_error_create']   = 'Невозможно создать пользователя';
 $lang['import_notify_fail']    = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.';
-- 
cgit v1.2.3


From 3e8d68b4a59e93099da9af13f0825ea2d05d7bd2 Mon Sep 17 00:00:00 2001
From: Janar Leas <janar.leas@eesti.ee>
Date: Thu, 13 Mar 2014 17:36:15 +0100
Subject: translation update

---
 lib/plugins/usermanager/lang/et/lang.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php
index 93b28a6b8..deb1e0be1 100644
--- a/lib/plugins/usermanager/lang/et/lang.php
+++ b/lib/plugins/usermanager/lang/et/lang.php
@@ -5,13 +5,14 @@
  * 
  * @author kristian.kankainen@kuu.la
  * @author Rivo Zängov <eraser@eraser.ee>
+ * @author Janar Leas <janar.leas@eesti.ee>
  */
 $lang['menu']                  = 'Kasutajate haldamine';
 $lang['user_id']               = 'Kasutaja';
 $lang['user_pass']             = 'Parool';
 $lang['user_name']             = 'Tegelik nimi';
 $lang['user_mail']             = 'E-post';
-$lang['user_groups']           = 'Grupid';
+$lang['user_groups']           = 'Rühmad';
 $lang['field']                 = 'Väli';
 $lang['value']                 = 'Väärtus';
 $lang['add']                   = 'Lisa';
@@ -29,3 +30,4 @@ $lang['prev']                  = 'eelmine';
 $lang['next']                  = 'järgmine';
 $lang['last']                  = 'viimased';
 $lang['user_notify']           = 'Teavita kasutajat';
+$lang['note_group']            = 'Kui rühma pole määratletud, siis lisatakse uued kasutajad vaikimisi rühma (%s).';
-- 
cgit v1.2.3


From f4664c4a8a3a2f20afc25899bcd30e22d8402b6f Mon Sep 17 00:00:00 2001
From: NEOhidra <neohidra@gmail.com>
Date: Sun, 6 Apr 2014 18:31:18 +0300
Subject: Bulgarian language update

---
 lib/plugins/usermanager/lang/bg/lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/bg/lang.php b/lib/plugins/usermanager/lang/bg/lang.php
index 9700385f8..aadf76512 100644
--- a/lib/plugins/usermanager/lang/bg/lang.php
+++ b/lib/plugins/usermanager/lang/bg/lang.php
@@ -41,10 +41,10 @@ $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_ok']             = 'Изпратено е осведомителен имейл';
+$lang['notify_fail']           = 'Изпращането на осведомителен имейл не е възможно';
-- 
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/usermanager/lang/es/lang.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index 26e4200e4..317fac2aa 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -24,6 +24,7 @@
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  * @author Mercè López mercelz@gmail.com
+ * @author Antonio Bueno <atnbueno@gmail.com>
  */
 $lang['menu']                  = 'Administración de usuarios';
 $lang['noauth']                = '(la autenticación de usuarios no está disponible)';
@@ -46,6 +47,8 @@ $lang['search']                = 'Buscar';
 $lang['search_prompt']         = 'Realizar la búsqueda';
 $lang['clear']                 = 'Limpiar los filtros de la búsqueda';
 $lang['filter']                = 'Filtrar';
+$lang['line']                  = 'Línea nº';
+$lang['error']                 = 'Mensaje de error';
 $lang['summary']               = 'Mostrando los usuarios %1$d-%2$d de %3$d encontrados. Cantidad total de usuarios %4$d.';
 $lang['nonefound']             = 'No se encontraron usuarios que coincidan con los párametros de la búsqueda. Cantidad total de usuarios %d.';
 $lang['delete_ok']             = '%d usuarios eliminados';
-- 
cgit v1.2.3


From da2c1fba42556340dac10a521b9a9e153ded4669 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Tue, 22 Apr 2014 10:51:03 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/ko/edit.txt  | 2 +-
 lib/plugins/usermanager/lang/ko/intro.txt | 2 +-
 lib/plugins/usermanager/lang/ko/lang.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/ko/edit.txt b/lib/plugins/usermanager/lang/ko/edit.txt
index a938c5b2e..0b35cd7d5 100644
--- a/lib/plugins/usermanager/lang/ko/edit.txt
+++ b/lib/plugins/usermanager/lang/ko/edit.txt
@@ -1 +1 @@
-===== 사용자 정보 편집 =====
\ No newline at end of file
+===== 사용자 편집 =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/intro.txt b/lib/plugins/usermanager/lang/ko/intro.txt
index d75680c71..2ce85f1a2 100644
--- a/lib/plugins/usermanager/lang/ko/intro.txt
+++ b/lib/plugins/usermanager/lang/ko/intro.txt
@@ -1 +1 @@
-====== 사용자 관리 ======
\ No newline at end of file
+====== 사용자 관리자 ======
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index ac129c95e..70e3d94f0 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -44,7 +44,7 @@ $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']                  = '다음';
-- 
cgit v1.2.3


From 9e1bc3f3dd03f19063d530e7aa5eb8eb9b36abf4 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 5 May 2014 13:35:56 +0200
Subject: no fancy quotes in user manager import description

---
 lib/plugins/usermanager/lang/cs/import.txt          | 2 +-
 lib/plugins/usermanager/lang/de-informal/import.txt | 2 +-
 lib/plugins/usermanager/lang/de/import.txt          | 2 +-
 lib/plugins/usermanager/lang/en/import.txt          | 2 +-
 lib/plugins/usermanager/lang/eo/import.txt          | 2 +-
 lib/plugins/usermanager/lang/fr/import.txt          | 2 +-
 lib/plugins/usermanager/lang/hu/import.txt          | 2 +-
 lib/plugins/usermanager/lang/ja/import.txt          | 2 +-
 lib/plugins/usermanager/lang/ko/import.txt          | 2 +-
 lib/plugins/usermanager/lang/nl/import.txt          | 2 +-
 lib/plugins/usermanager/lang/ru/import.txt          | 2 +-
 lib/plugins/usermanager/lang/sk/import.txt          | 2 +-
 lib/plugins/usermanager/lang/zh-tw/import.txt       | 2 +-
 lib/plugins/usermanager/lang/zh/import.txt          | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/cs/import.txt b/lib/plugins/usermanager/lang/cs/import.txt
index c264ae185..d665838f4 100644
--- a/lib/plugins/usermanager/lang/cs/import.txt
+++ b/lib/plugins/usermanager/lang/cs/import.txt
@@ -2,7 +2,7 @@
 
 Vyžaduje CSV soubor s uživateli obsahující alespoň 4 sloupce.
 Sloupce obsahují (v daném pořadí): user-id, celé jméno, emailovou adresu, seznam skupin.
-Položky CSV musí být odděleny čárkou (,) a řetězce umístěny v uvozovkách (""). Zpětné lomítko (\) lze použít pro escapování.
+Položky CSV musí být odděleny čárkou (,) a řetězce umístěny v uvozovkách (%%""%%). Zpětné lomítko (\) lze použít pro escapování.
 Pro získání příkladu takového souboru využijte funkci "Exportovat uživatele" výše.
 Záznamy s duplicitním user-id budou ignorovány.
 
diff --git a/lib/plugins/usermanager/lang/de-informal/import.txt b/lib/plugins/usermanager/lang/de-informal/import.txt
index 6fd6b8d8c..bc8887193 100644
--- a/lib/plugins/usermanager/lang/de-informal/import.txt
+++ b/lib/plugins/usermanager/lang/de-informal/import.txt
@@ -1,7 +1,7 @@
 ===== Massenimport von Benutzern =====
 
 Dieser Import benötigt eine CSV-Datei mit mindestens vier Spalten. Diese Spalten müssen die folgenden Daten (in dieser Reihenfolge) enthalten: Benutzername, Name, E-Mailadresse und Gruppenzugehörigkeit.
-Die CSV-Felder müssen durch ein Komma (,) getrennt sein. Die Zeichenfolgen müssen von Anführungszeichen ("") umgeben sein. Ein Backslash (\) kann zum Maskieren benutzt werden.
+Die CSV-Felder müssen durch ein Komma (,) getrennt sein. Die Zeichenfolgen müssen von Anführungszeichen (%%""%%) umgeben sein. Ein Backslash (\) kann zum Maskieren benutzt werden.
 Für eine Beispieldatei kannst Du die "Benutzer exportieren"-Funktion oben benutzen. Doppelte Benutzername werden ignoriert.
 
 Ein Passwort wird generiert und den einzelnen, erfolgreich importierten Benutzern zugemailt.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/de/import.txt b/lib/plugins/usermanager/lang/de/import.txt
index bf0d2922e..7faca3b9a 100644
--- a/lib/plugins/usermanager/lang/de/import.txt
+++ b/lib/plugins/usermanager/lang/de/import.txt
@@ -1,7 +1,7 @@
 ===== Benutzer-Massenimport =====
 
 Um mehrere Benutzer gleichzeitig zu importieren, wird eine CSV-Datei mit den folgenden vier Spalten benötigt (In dieser Reihenfolge): Benutzer-ID, Voller Name, E-Mail-Adresse und Gruppen.
-Die CSV-Felder sind Kommata-separiert (,) und mit Anführungszeichen eingefasst ("). Mit Backslashes (\) können Sonderzeichen maskiert werden.
+Die CSV-Felder sind Kommata-separiert (,) und mit Anführungszeichen eingefasst (%%"%%). Mit Backslashes (\) können Sonderzeichen maskiert werden.
 Ein Beispiel für eine gültige Datei kann mit der Benutzer-Export-Funktion oben generiert werden.
 Doppelte Benutzer-IDs werden ignoriert.
 
diff --git a/lib/plugins/usermanager/lang/en/import.txt b/lib/plugins/usermanager/lang/en/import.txt
index 2087083e0..360a0689b 100644
--- a/lib/plugins/usermanager/lang/en/import.txt
+++ b/lib/plugins/usermanager/lang/en/import.txt
@@ -2,7 +2,7 @@
 
 Requires a CSV file of users with at least four columns.
 The columns must contain, in order: user-id, full name, email address and groups.
-The CSV fields should be separated by commas (,) and strings delimited by quotation marks ("").  Backslash (\) can be used for escaping.
+The CSV fields should be separated by commas (,) and strings delimited by quotation marks (%%""%%).  Backslash (\) can be used for escaping.
 For an example of a suitable file, try the "Export Users" function above.  
 Duplicate user-ids will be ignored.
 
diff --git a/lib/plugins/usermanager/lang/eo/import.txt b/lib/plugins/usermanager/lang/eo/import.txt
index 61c2c74de..09fbe6911 100644
--- a/lib/plugins/usermanager/lang/eo/import.txt
+++ b/lib/plugins/usermanager/lang/eo/import.txt
@@ -2,7 +2,7 @@
 
 Tio ĉi postulas CSV-dosiero de uzantoj kun minimume kvar kolumnoj.
 La kolumnoj devas enhavi, laŭorde: uzant-id, kompleta nomo, retadreso kaj grupoj.
-La CSV-kampoj devos esti apartitaj per komoj (,) kaj ĉenoj devas esti limigitaj per citiloj (""). Retroklino (\) povas esti uzata por eskapo.
+La CSV-kampoj devos esti apartitaj per komoj (,) kaj ĉenoj devas esti limigitaj per citiloj (%%""%%). Retroklino (\) povas esti uzata por eskapo.
 Por ekzemplo de taŭga dosiero, provu la funkcion "Eksporti uzantojn" supre.
 Duobligitaj uzant-id estos preteratentataj.
 
diff --git a/lib/plugins/usermanager/lang/fr/import.txt b/lib/plugins/usermanager/lang/fr/import.txt
index 191bb8370..a1eb8f858 100644
--- a/lib/plugins/usermanager/lang/fr/import.txt
+++ b/lib/plugins/usermanager/lang/fr/import.txt
@@ -3,7 +3,7 @@
 Requière un fichier [[wpfr>CSV]] d'utilisateurs avec un minimum de quatre colonnes.
 Les colonnes doivent comporter, dans l'ordre : identifiant, nom complet, adresse de courriel et groupes.
 
-Les champs doivent être séparés par une virgule (,), les chaînes sont délimitées par des guillemets (""). On peut utiliser la balance inverse (\) comme caractère d'échappement.
+Les champs doivent être séparés par une virgule (,), les chaînes sont délimitées par des guillemets (%%""%%). On peut utiliser la balance inverse (\) comme caractère d'échappement.
 Pour obtenir un exemple de fichier acceptable, essayer la fonction "Exporter les utilisateurs" ci dessus.
 
 Les identifiants dupliqués seront ignorés.
diff --git a/lib/plugins/usermanager/lang/hu/import.txt b/lib/plugins/usermanager/lang/hu/import.txt
index f204f6a1e..0210112e8 100644
--- a/lib/plugins/usermanager/lang/hu/import.txt
+++ b/lib/plugins/usermanager/lang/hu/import.txt
@@ -2,7 +2,7 @@
 
 Szükséges egy legalább 4 oszlopot tartalmazó, felhasználókat tartalmazó fájl.
 Az oszlopok kötelező tartalma, sorrendben: felhasználói azonosító, teljes név, e-mailcím és csoport.
-A CSV-mezőket vesszővel (,) kell elválasztani, a szövegeket idézőjelek ("") közé kell tenni. A fordított törtvonal (\) használható feloldójelnek. 
+A CSV-mezőket vesszővel (,) kell elválasztani, a szövegeket idézőjelek (%%""%%) közé kell tenni. A fordított törtvonal (\) használható feloldójelnek.
 Megfelelő mintafájl megtekintéséhez próbáld ki a "Felhasználók exportálása" funkciót fentebb.
 A duplán szereplő felhasználói azonosítók kihagyásra kerülnek.
 
diff --git a/lib/plugins/usermanager/lang/ja/import.txt b/lib/plugins/usermanager/lang/ja/import.txt
index 751e515ac..6af87c263 100644
--- a/lib/plugins/usermanager/lang/ja/import.txt
+++ b/lib/plugins/usermanager/lang/ja/import.txt
@@ -2,7 +2,7 @@
 
 少なくとも４列のユーザーCSVファイルが必要です。
 列の順序：ユーザーID、氏名、電子メールアドレス、グループ。
-CSVフィールドはカンマ（,）区切り、文字列は引用符（""）区切りです。
+CSVフィールドはカンマ（,）区切り、文字列は引用符（%%""%%）区切りです。
 エスケープにバックスラッシュ（\）を使用できます。
 適切なファイル例は、上記の"エクスポートユーザー"機能で試して下さい。 
 重複するユーザーIDは無視されます。
diff --git a/lib/plugins/usermanager/lang/ko/import.txt b/lib/plugins/usermanager/lang/ko/import.txt
index 44fe392d0..6d077dfb8 100644
--- a/lib/plugins/usermanager/lang/ko/import.txt
+++ b/lib/plugins/usermanager/lang/ko/import.txt
@@ -2,7 +2,7 @@
 
 적어도 열 네 개가 있는 사용자의 CSV 파일이 필요합니다.
 열은 다음과 같이 포함해야 합니다: 사용자 id, 실명, 이메일 주소와 그룹.
-CSV 필드는 인용 부호("")로 쉼표(,)와 구분된 문자열로 구분해야 합니다. 백슬래시(\)는 탈출에 사용할 수 있습니다.
+CSV 필드는 인용 부호(%%""%%)로 쉼표(,)와 구분된 문자열로 구분해야 합니다. 백슬래시(\)는 탈출에 사용할 수 있습니다.
 적절한 파일의 예를 들어, 위의 "사용자 목록 내보내기"를 시도하세요.
 중복된 사용자 id는 무시됩니다.
 
diff --git a/lib/plugins/usermanager/lang/nl/import.txt b/lib/plugins/usermanager/lang/nl/import.txt
index 267891098..3a9320ecf 100644
--- a/lib/plugins/usermanager/lang/nl/import.txt
+++ b/lib/plugins/usermanager/lang/nl/import.txt
@@ -1,7 +1,7 @@
 ===== Massa-import van gebruikers =====
 
 Hiervoor is een CSV-bestand nodig van de gebruikers met minstens vier kolommen. De kolommen moeten bevatten, in deze volgorde: gebruikers-id, complete naam, e-mailadres en groepen.
-Het CSV-velden moeten worden gescheiden met komma's (,) en de teksten moeten worden omringd met dubbele aanhalingstekens (""). Backslash (\) kan worden gebruikt om te escapen.
+Het CSV-velden moeten worden gescheiden met komma's (,) en de teksten moeten worden omringd met dubbele aanhalingstekens (%%""%%). Backslash (\) kan worden gebruikt om te escapen.
 Voor een voorbeeld van een werkend bestand, probeer de "Exporteer Gebruikers" functie hierboven.
 Dubbele gebruikers-id's zullen worden genegeerd.
 
diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt
index dd2b797bc..f2049dd0c 100644
--- a/lib/plugins/usermanager/lang/ru/import.txt
+++ b/lib/plugins/usermanager/lang/ru/import.txt
@@ -2,7 +2,7 @@
 
 Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
 Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. 
-Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание. 
+Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (%%""%%). Обратный слэш используется как прерывание.
 В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». 
 Повторяющиеся идентификаторы user-id будут игнорироваться.
 
diff --git a/lib/plugins/usermanager/lang/sk/import.txt b/lib/plugins/usermanager/lang/sk/import.txt
index 91fa3e370..2207f6162 100644
--- a/lib/plugins/usermanager/lang/sk/import.txt
+++ b/lib/plugins/usermanager/lang/sk/import.txt
@@ -2,7 +2,7 @@
 
 Vyžaduje CSV súbor používateľov s minimálne 4 stĺpcami.
 Stĺpce musia obsahovať postupne: ID používateľa, meno a priezvisko, emailová adresa a skupiny.
-CVS záznamy by mali byť oddelené čiarkou (,) a reťazce uzavreté úvodzovkami (""). Znak (\) sa používa v spojení so špeciálnymi znakmi.
+CVS záznamy by mali byť oddelené čiarkou (,) a reťazce uzavreté úvodzovkami (%%""%%). Znak (\) sa používa v spojení so špeciálnymi znakmi.
 Príklad vhodného súboru je možné získať funkciou "Export používateľov".
 Duplicitné ID používateľov budú ignorované.
 
diff --git a/lib/plugins/usermanager/lang/zh-tw/import.txt b/lib/plugins/usermanager/lang/zh-tw/import.txt
index a6bb5f6ef..925cdc9d0 100644
--- a/lib/plugins/usermanager/lang/zh-tw/import.txt
+++ b/lib/plugins/usermanager/lang/zh-tw/import.txt
@@ -2,7 +2,7 @@
 
 需提供 CSV 格式的使用者列表檔案（UTF-8 編碼）。
 每列至少 4 欄，依序為：帳號、姓名、電郵、群組。
-各欄以半形逗號 (,) 分隔，有半形逗號的字串可用半形雙引號 ("") 分開，引號可用反斜線 (\) 跳脫。
+各欄以半形逗號 (,) 分隔，有半形逗號的字串可用半形雙引號 (%%""%%) 分開，引號可用反斜線 (\) 跳脫。
 重複的使用者帳號會自動忽略。
 如需要範例檔案，可用上面的「匯出使用者」取得。
 
diff --git a/lib/plugins/usermanager/lang/zh/import.txt b/lib/plugins/usermanager/lang/zh/import.txt
index eacce5a77..243a53e84 100644
--- a/lib/plugins/usermanager/lang/zh/import.txt
+++ b/lib/plugins/usermanager/lang/zh/import.txt
@@ -1,7 +1,7 @@
 ===== 批量导入用户 =====
 
 需要至少有 4 列的 CSV 格式用户列表文件。列必须按顺序包括：用户ID、全名、电子邮件地址和组。
-CSV 域需要用逗号 (,) 分隔，字符串用英文双引号 ("") 分开。反斜杠可以用来转义。
+CSV 域需要用逗号 (,) 分隔，字符串用英文双引号 (%%""%%) 分开。反斜杠可以用来转义。
 可以尝试上面的“导入用户”功能来查看示例文件。重复的用户ID将被忽略。
 
 密码生成后会通过电子邮件发送给每个成功导入的用户。
\ No newline at end of file
-- 
cgit v1.2.3


From b9b1fa3cc0cbb48e6e911f62909871bb8c72c71d Mon Sep 17 00:00:00 2001
From: Francesco <francesco.cavalli@hotmail.com>
Date: Wed, 14 May 2014 21:30:56 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/it/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php
index 6c6789442..af19e293e 100644
--- a/lib/plugins/usermanager/lang/it/lang.php
+++ b/lib/plugins/usermanager/lang/it/lang.php
@@ -16,6 +16,7 @@
  * @author Matteo Pasotti <matteo@xquiet.eu>
  * @author snarchio@gmail.com
  * @author Claudio Lanconelli <lancos@libero.it>
+ * @author Francesco <francesco.cavalli@hotmail.com>
  */
 $lang['menu']                  = 'Gestione Utenti';
 $lang['noauth']                = '(autenticazione non disponibile)';
@@ -40,6 +41,9 @@ $lang['clear']                 = 'Azzera filtro di ricerca';
 $lang['filter']                = 'Filtro';
 $lang['export_all']            = 'Esporta tutti gli utenti (CSV)';
 $lang['export_filtered']       = 'Esporta elenco utenti filtrati (CSV)';
+$lang['import']                = 'Importa nuovi utenti';
+$lang['line']                  = 'Linea numero';
+$lang['error']                 = 'Messaggio di errore';
 $lang['summary']               = 'Visualizzazione utenti %1$d-%2$d di %3$d trovati. %4$d utenti totali.';
 $lang['nonefound']             = 'Nessun utente trovato. %d utenti totali.';
 $lang['delete_ok']             = '%d utenti eliminati';
@@ -60,3 +64,7 @@ $lang['add_ok']                = 'Utente aggiunto correttamente';
 $lang['add_fail']              = 'Aggiunta utente fallita';
 $lang['notify_ok']             = 'Email di notifica inviata';
 $lang['notify_fail']           = 'L\'email di notifica non può essere inviata';
+$lang['import_error_badname']  = 'Nome errato';
+$lang['import_error_badmail']  = 'Indirizzo email errato';
+$lang['import_error_readfail'] = 'Importazione in errore. Impossibile leggere i file caricati.';
+$lang['import_error_create']   = 'Impossibile creare l\'utente';
-- 
cgit v1.2.3


From 0671dd21bb64b57d74fe860af4d0d982cb3fef0d Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 16 May 2014 00:10:08 +0200
Subject: fix header in Dutch local

---
 lib/plugins/usermanager/lang/nl/intro.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/nl/intro.txt b/lib/plugins/usermanager/lang/nl/intro.txt
index 7df09dbab..46968ac2d 100644
--- a/lib/plugins/usermanager/lang/nl/intro.txt
+++ b/lib/plugins/usermanager/lang/nl/intro.txt
@@ -1 +1 @@
-==== Gebruikersmanager =====
\ No newline at end of file
+====== Gebruikersmanager ======
-- 
cgit v1.2.3


From 5aa1e6b571d748ca5b0c7684ec6116c9e5f299d4 Mon Sep 17 00:00:00 2001
From: Rene <wllywlnt@yahoo.com>
Date: Sat, 17 May 2014 09:36:32 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/nl/intro.txt | 2 +-
 lib/plugins/usermanager/lang/nl/lang.php  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/nl/intro.txt b/lib/plugins/usermanager/lang/nl/intro.txt
index 7df09dbab..478174ab6 100644
--- a/lib/plugins/usermanager/lang/nl/intro.txt
+++ b/lib/plugins/usermanager/lang/nl/intro.txt
@@ -1 +1 @@
-==== Gebruikersmanager =====
\ No newline at end of file
+==== Gebruikers =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index 5cebede89..3f9902e14 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -15,8 +15,9 @@
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
+ * @author Rene <wllywlnt@yahoo.com>
  */
-$lang['menu']                  = 'Gebruikersmanager';
+$lang['menu']                  = 'Gebruikersbeheer';
 $lang['noauth']                = '(gebruikersauthenticatie niet beschikbaar)';
 $lang['nosupport']             = '(gebruikersbeheer niet ondersteund)';
 $lang['badauth']               = 'ongeldige authenticatiemethode';
-- 
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/usermanager/lang/hu/import.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/hu/import.txt b/lib/plugins/usermanager/lang/hu/import.txt
index 0210112e8..a2db03300 100644
--- a/lib/plugins/usermanager/lang/hu/import.txt
+++ b/lib/plugins/usermanager/lang/hu/import.txt
@@ -3,7 +3,7 @@
 Szükséges egy legalább 4 oszlopot tartalmazó, felhasználókat tartalmazó fájl.
 Az oszlopok kötelező tartalma, sorrendben: felhasználói azonosító, teljes név, e-mailcím és csoport.
 A CSV-mezőket vesszővel (,) kell elválasztani, a szövegeket idézőjelek (%%""%%) közé kell tenni. A fordított törtvonal (\) használható feloldójelnek.
-Megfelelő mintafájl megtekintéséhez próbáld ki a "Felhasználók exportálása" funkciót fentebb.
+Megfelelő mintafájl megtekintéséhez próbáld ki a "Felhasználók exportálása" funkciót fentebb. 
 A duplán szereplő felhasználói azonosítók kihagyásra kerülnek.
 
 Minden sikeresen importált felhasználó számára jelszó készül, amelyet e-mailben kézhez kap.
\ No newline at end of file
-- 
cgit v1.2.3


From 84c50c494ac3b4f524ce81304691d7fed3975b68 Mon Sep 17 00:00:00 2001
From: Antonio Castilla <antoniocastilla@trazoide.com>
Date: Thu, 29 May 2014 12:46:31 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/es/lang.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index 317fac2aa..6731193de 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -25,6 +25,7 @@
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  * @author Mercè López mercelz@gmail.com
  * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Antonio Castilla <antoniocastilla@trazoide.com>
  */
 $lang['menu']                  = 'Administración de usuarios';
 $lang['noauth']                = '(la autenticación de usuarios no está disponible)';
@@ -69,3 +70,9 @@ $lang['add_ok']                = 'El usuario fue creado exitosamente';
 $lang['add_fail']              = 'Falló la creación del usuario';
 $lang['notify_ok']             = 'Se envió la notificación por correo electrónico';
 $lang['notify_fail']           = 'No se pudo enviar la notificación por correo electrónico';
+$lang['import_error_badmail']  = 'Dirección de correo electrónico incorrecta';
+$lang['import_error_upload']   = 'Error al importar. El archivo csv no se pudo cargar o está vacío.';
+$lang['import_error_readfail'] = 'Error al importar. No se puede leer el archivo subido.';
+$lang['import_error_create']   = 'No se puede crear el usuario';
+$lang['import_notify_fail']    = 'Mensaje de notificación no se ha podido enviar por el usuario importado,%s con el email %s.';
+$lang['import_downloadfailures'] = 'Descarga errores como archivo CSV para la corrección';
-- 
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/usermanager/lang/lv/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/lv/lang.php b/lib/plugins/usermanager/lang/lv/lang.php
index 620678ff5..4944da31e 100644
--- a/lib/plugins/usermanager/lang/lv/lang.php
+++ b/lib/plugins/usermanager/lang/lv/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Latvian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Aivars Miška <allefm@gmail.lv>
  * @author Aivars Miška <allefm@gmail.com>
  */
-- 
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/usermanager/lang/lv/import.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/lv/import.txt

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/lv/import.txt b/lib/plugins/usermanager/lang/lv/import.txt
new file mode 100644
index 000000000..0006ae850
--- /dev/null
+++ b/lib/plugins/usermanager/lang/lv/import.txt
@@ -0,0 +1,9 @@
+===== Masveida lietotāju imports =====
+
+Vajag CSV failu ar vismaz četrām lietotāju datu kolonām šādā secībā: identifikators, pilns vārds, e-pasta adrese un grupas. 
+
+CSV lauki jāatdala ar komatiem (,) un virknes — ar pēdiņām (%%""%%). Backslash (\) can be used for escaping. 
+Derīga faila paraugam izmantojiem augtāk redzamo "Lietotāju eksportu".  
+Dublētus identifikatorus ignorēs. 
+
+Paroli katram veiksmīgi importētajam lietotājam izveidos un nosūtīs pa e-pastu.
\ No newline at end of file
-- 
cgit v1.2.3


From f5ff3ceb78b35e5a23887a9948f761457a4ab9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Hern=C3=A1ndez?= <me@jhalicea.com>
Date: Fri, 4 Jul 2014 08:20:59 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/es/lang.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index 6731193de..a557eacdd 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -26,6 +26,7 @@
  * @author Mercè López mercelz@gmail.com
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
+ * @author Jonathan Hernández <me@jhalicea.com>
  */
 $lang['menu']                  = 'Administración de usuarios';
 $lang['noauth']                = '(la autenticación de usuarios no está disponible)';
@@ -48,6 +49,9 @@ $lang['search']                = 'Buscar';
 $lang['search_prompt']         = 'Realizar la búsqueda';
 $lang['clear']                 = 'Limpiar los filtros de la búsqueda';
 $lang['filter']                = 'Filtrar';
+$lang['export_all']            = 'Exportar Todos los Usuarios (CSV)';
+$lang['export_filtered']       = 'Exportar Lista de Usuarios Filtrada (CSV)';
+$lang['import']                = 'Importar Nuevos Usuarios';
 $lang['line']                  = 'Línea nº';
 $lang['error']                 = 'Mensaje de error';
 $lang['summary']               = 'Mostrando los usuarios %1$d-%2$d de %3$d encontrados. Cantidad total de usuarios %4$d.';
@@ -70,9 +74,10 @@ $lang['add_ok']                = 'El usuario fue creado exitosamente';
 $lang['add_fail']              = 'Falló la creación del usuario';
 $lang['notify_ok']             = 'Se envió la notificación por correo electrónico';
 $lang['notify_fail']           = 'No se pudo enviar la notificación por correo electrónico';
+$lang['import_userlistcsv']    = 'Lista de usuarios (CSV): ';
 $lang['import_error_badmail']  = 'Dirección de correo electrónico incorrecta';
 $lang['import_error_upload']   = 'Error al importar. El archivo csv no se pudo cargar o está vacío.';
 $lang['import_error_readfail'] = 'Error al importar. No se puede leer el archivo subido.';
 $lang['import_error_create']   = 'No se puede crear el usuario';
 $lang['import_notify_fail']    = 'Mensaje de notificación no se ha podido enviar por el usuario importado,%s con el email %s.';
-$lang['import_downloadfailures'] = 'Descarga errores como archivo CSV para la corrección';
+$lang['import_downloadfailures'] = 'Descarga errores en archivo CSV para la corrección';
-- 
cgit v1.2.3


From 4ad66524bcfeccd8ec19915dfb0a6ca536016320 Mon Sep 17 00:00:00 2001
From: Yuthana Tantirungrotechai <yt203y@gmail.com>
Date: Sat, 12 Jul 2014 12:35:43 +0200
Subject: translation update

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

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/th/lang.php b/lib/plugins/usermanager/lang/th/lang.php
index eb88d7b91..d6e14f65f 100644
--- a/lib/plugins/usermanager/lang/th/lang.php
+++ b/lib/plugins/usermanager/lang/th/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Thai language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Komgrit Niyomrath <n.komgrit@gmail.com>
  * @author Kittithat Arnontavilas mrtomyum@gmail.com
  * @author Kittithat Arnontavilas <mrtomyum@gmail.com>
-- 
cgit v1.2.3


From 6d8e3ea1634ecdd794e663fa1f7c802f2fd8914f Mon Sep 17 00:00:00 2001
From: Stan <talktostan@gmail.com>
Date: Sat, 2 Aug 2014 10:06:00 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/zh-tw/lang.php | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index 3fb6b6712..61555254d 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -16,19 +16,14 @@
  * @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']                   = '增加';
@@ -46,7 +41,6 @@ $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 個帳號';
@@ -54,13 +48,10 @@ $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']           = '通知信只會在指定使用者新密碼時寄送。';
@@ -70,8 +61,6 @@ $lang['add_ok']                = '已新增使用者';
 $lang['add_fail']              = '無法新增使用者';
 $lang['notify_ok']             = '通知信已寄出';
 $lang['notify_fail']           = '通知信無法寄出';
-
-// import & errors
 $lang['import_userlistcsv']    = '使用者列表檔案 (CSV):  ';
 $lang['import_header']         = '最近一次匯入 - 失敗';
 $lang['import_success_count']  = '使用者匯入：找到 %d 個使用者，已成功匯入 %d 個。';
-- 
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/usermanager/plugin.info.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt
index 315459122..ae4f9b9cc 100644
--- a/lib/plugins/usermanager/plugin.info.txt
+++ b/lib/plugins/usermanager/plugin.info.txt
@@ -1,7 +1,7 @@
 base   usermanager
 author Chris Smith
 email  chris@jalakai.co.uk
-date   2013-02-20
+date   2014-03-05
 name   User Manager
 desc   Manage DokuWiki user accounts
 url    http://dokuwiki.org/plugin:usermanager
-- 
cgit v1.2.3


From ea8f310e8130739d45b5799e3ab59470d6415d28 Mon Sep 17 00:00:00 2001
From: Igor Degraf <igordegraf@gmail.com>
Date: Thu, 7 Aug 2014 04:41:02 +0200
Subject: translation update

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

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 83158df31..8bbfa639c 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -20,6 +20,7 @@
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Pavel <ivanovtsk@mail.ru>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ * @author Igor Degraf <igordegraf@gmail.com>
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
@@ -77,3 +78,4 @@ $lang['import_error_upload']   = 'Импорт не удался. CSV-файл 
 $lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.';
 $lang['import_error_create']   = 'Невозможно создать пользователя';
 $lang['import_notify_fail']    = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.';
+$lang['import_downloadfailures'] = 'Скачать Ошибки в формате CSV для исправления';
-- 
cgit v1.2.3


From 41b835a453f94a5109088ca8e9f804154b83442c Mon Sep 17 00:00:00 2001
From: Fabio <fabioslurp@yahoo.it>
Date: Sat, 9 Aug 2014 12:51:05 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/it/lang.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php
index af19e293e..ffded3481 100644
--- a/lib/plugins/usermanager/lang/it/lang.php
+++ b/lib/plugins/usermanager/lang/it/lang.php
@@ -17,6 +17,7 @@
  * @author snarchio@gmail.com
  * @author Claudio Lanconelli <lancos@libero.it>
  * @author Francesco <francesco.cavalli@hotmail.com>
+ * @author Fabio <fabioslurp@yahoo.it>
  */
 $lang['menu']                  = 'Gestione Utenti';
 $lang['noauth']                = '(autenticazione non disponibile)';
@@ -64,7 +65,12 @@ $lang['add_ok']                = 'Utente aggiunto correttamente';
 $lang['add_fail']              = 'Aggiunta utente fallita';
 $lang['notify_ok']             = 'Email di notifica inviata';
 $lang['notify_fail']           = 'L\'email di notifica non può essere inviata';
+$lang['import_success_count']  = 'Importazione utenti: %d utenti trovati, %d utenti importati con successo.';
+$lang['import_failure_count']  = 'Importazione utenti: %d falliti. Errori riportati qui sotto.';
+$lang['import_error_fields']   = 'Campi insufficienti, trovati %d, richiesti 4.';
+$lang['import_error_baduserid'] = 'User-id non trovato';
 $lang['import_error_badname']  = 'Nome errato';
 $lang['import_error_badmail']  = 'Indirizzo email errato';
+$lang['import_error_upload']   = 'Importazione fallita. Il file CSV non può essere caricato, o è vuoto.';
 $lang['import_error_readfail'] = 'Importazione in errore. Impossibile leggere i file caricati.';
 $lang['import_error_create']   = 'Impossibile creare l\'utente';
-- 
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/usermanager/lang/fa/lang.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/fa/lang.php b/lib/plugins/usermanager/lang/fa/lang.php
index a6a484411..68db206b9 100644
--- a/lib/plugins/usermanager/lang/fa/lang.php
+++ b/lib/plugins/usermanager/lang/fa/lang.php
@@ -10,6 +10,7 @@
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
  * @author AmirH Hassaneini <mytechmix@gmail.com>
+ * @author Hamid <zarrabi@sharif.edu>
  */
 $lang['menu']                  = 'مدیریت کاربر';
 $lang['noauth']                = '(معتبرسازی کاربر ممکن نیست)';
@@ -36,19 +37,19 @@ $lang['summary']               = 'نمایش کاربر %1$d-%2$d از %3$d. د
 $lang['nonefound']             = 'هیچ کاربری یافت نشد. در کل %d کاربر.';
 $lang['delete_ok']             = '%d کاربر حذف شد';
 $lang['delete_fail']           = 'حذف %d کاربر با مشکل مواجه شد.';
-$lang['update_ok']             = 'کاربر با موفقیت به روز رسانی شد.';
-$lang['update_fail']           = 'به روز رسانی کاربر با مشکل مواجه شد';
-$lang['update_exists']         = 'تغییر نام کاربری ممکن نیست، نام کاربری مورد نظر (%s) قبلن وجود داشته (مابقی تغییرات اعمال شده است)';
+$lang['update_ok']             = 'کاربر با موفقیت به‌روز شد.';
+$lang['update_fail']           = 'به‌روزرسانی کاربر با مشکل مواجه شد';
+$lang['update_exists']         = 'تغییر نام کاربری ممکن نیست، نام کاربری مورد نظر (%s) از قبل وجود داشته است (مابقی تغییرات اعمال خواهد شد).';
 $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_fail']           = 'ارسال ایمیل آگاهی دهنده با مشکل مواجه شد';
+$lang['notify_ok']             = 'ایمیل آگاهی‌دهنده ارسال شد';
+$lang['notify_fail']           = 'ارسال ایمیل آگاهی‌دهنده با مشکل مواجه شد';
-- 
cgit v1.2.3


From c3dd5e61641701501b845f71f894380966d71151 Mon Sep 17 00:00:00 2001
From: Davor Turkalj <turki.bsc@gmail.com>
Date: Mon, 8 Sep 2014 12:56:14 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/hr/add.txt    | 1 +
 lib/plugins/usermanager/lang/hr/delete.txt | 1 +
 lib/plugins/usermanager/lang/hr/edit.txt   | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/hr/add.txt
 create mode 100644 lib/plugins/usermanager/lang/hr/delete.txt
 create mode 100644 lib/plugins/usermanager/lang/hr/edit.txt

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/hr/add.txt b/lib/plugins/usermanager/lang/hr/add.txt
new file mode 100644
index 000000000..f7c866495
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hr/add.txt
@@ -0,0 +1 @@
+===== Dodaj korisnika =====
diff --git a/lib/plugins/usermanager/lang/hr/delete.txt b/lib/plugins/usermanager/lang/hr/delete.txt
new file mode 100644
index 000000000..072185fc1
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hr/delete.txt
@@ -0,0 +1 @@
+===== Ukloni korisnika =====
diff --git a/lib/plugins/usermanager/lang/hr/edit.txt b/lib/plugins/usermanager/lang/hr/edit.txt
new file mode 100644
index 000000000..752fd81f3
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hr/edit.txt
@@ -0,0 +1 @@
+===== Uredi korisnika =====
-- 
cgit v1.2.3


From 2c917972fa1601d7765e56a079884f4a24a69a7e Mon Sep 17 00:00:00 2001
From: Mohamad Mehdi Habibi <habibi.esf@gmail.com>
Date: Wed, 10 Sep 2014 09:50:56 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/fa/lang.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/fa/lang.php b/lib/plugins/usermanager/lang/fa/lang.php
index 68db206b9..bb2505a27 100644
--- a/lib/plugins/usermanager/lang/fa/lang.php
+++ b/lib/plugins/usermanager/lang/fa/lang.php
@@ -11,6 +11,7 @@
  * @author Milad DZand <M.DastanZand@gmail.com>
  * @author AmirH Hassaneini <mytechmix@gmail.com>
  * @author Hamid <zarrabi@sharif.edu>
+ * @author Mohamad Mehdi Habibi <habibi.esf@gmail.com>
  */
 $lang['menu']                  = 'مدیریت کاربر';
 $lang['noauth']                = '(معتبرسازی کاربر ممکن نیست)';
@@ -33,6 +34,8 @@ $lang['search']                = 'جستجو';
 $lang['search_prompt']         = 'انجام جستجو';
 $lang['clear']                 = 'بازنویسی فیلترهای جستجو';
 $lang['filter']                = 'فیلتر';
+$lang['import']                = 'ورود کاربران جدید';
+$lang['error']                 = 'متن خطا';
 $lang['summary']               = 'نمایش کاربر %1$d-%2$d از %3$d. در کل %4$d کاربر.';
 $lang['nonefound']             = 'هیچ کاربری یافت نشد. در کل %d کاربر.';
 $lang['delete_ok']             = '%d کاربر حذف شد';
-- 
cgit v1.2.3


From 0073bb09368d9a17a23b19849caa74d8772f1a6f Mon Sep 17 00:00:00 2001
From: Davor Turkalj <turki.bsc@gmail.com>
Date: Wed, 10 Sep 2014 14:31:03 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/hr/import.txt |  9 ++++
 lib/plugins/usermanager/lang/hr/intro.txt  |  1 +
 lib/plugins/usermanager/lang/hr/lang.php   | 66 ++++++++++++++++++++++++++++++
 lib/plugins/usermanager/lang/hr/list.txt   |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/hr/import.txt
 create mode 100644 lib/plugins/usermanager/lang/hr/intro.txt
 create mode 100644 lib/plugins/usermanager/lang/hr/lang.php
 create mode 100644 lib/plugins/usermanager/lang/hr/list.txt

(limited to 'lib/plugins/usermanager')

diff --git a/lib/plugins/usermanager/lang/hr/import.txt b/lib/plugins/usermanager/lang/hr/import.txt
new file mode 100644
index 000000000..85ea92723
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hr/import.txt
@@ -0,0 +1,9 @@
+===== Masovni unos korisnika =====
+
+Zahtjeva CSV datoteku popisa korisnika s minimalno četiri kolone.
+Kolone moraju sadržavati redom: korisničko ime, puno ime, adresu e-pošte i grupe.
+Polja trebaju biti odvojena zarezom (,) a znakovni nizovi s dvostrukim navodnicima (%%""%%). Obrnuta kosa crta (\) koristi se za specijalne kodove (escaping).
+Koristite "Izvoz korisnika" funkciju da bi ste dobili primjer odgovarajuće datoteke. 
+Duplikati korisničkih imena biti će ignorirani.
+
+Uspješno kreiranim korisnicima lozinka će biti generirana i poslana e-poštom.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/hr/intro.txt b/lib/plugins/usermanager/lang/hr/intro.txt
new file mode 100644
index 000000000..0f156579b
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hr/intro.txt
@@ -0,0 +1 @@
+====== Upravitelj korisnicima ======
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/hr/lang.php b/lib/plugins/usermanager/lang/hr/lang.php
new file mode 100644
index 000000000..80613ed6f
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hr/lang.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Davor Turkalj <turki.bsc@gmail.com>
+ */
+$lang['menu']                  = 'Upravitelj korisnicima';
+$lang['noauth']                = '(korisnička prijava nije dostupna)';
+$lang['nosupport']             = '(upravljanje korisnikom nije podržano)';
+$lang['badauth']               = 'pogrešan mehanizam prijave';
+$lang['user_id']               = 'Korisnik';
+$lang['user_pass']             = 'Lozinka';
+$lang['user_name']             = 'Stvarno ime';
+$lang['user_mail']             = 'E-pošta';
+$lang['user_groups']           = 'Grupe';
+$lang['field']                 = 'Polje';
+$lang['value']                 = 'Vrijednost';
+$lang['add']                   = 'Dodaj';
+$lang['delete']                = 'Obriši';
+$lang['delete_selected']       = 'Obriši odabrano';
+$lang['edit']                  = 'Uredi';
+$lang['edit_prompt']           = 'Uredi ovog korisnika';
+$lang['modify']                = 'Snimi promjene';
+$lang['search']                = 'Potraži';
+$lang['search_prompt']         = 'Izvedi potragu';
+$lang['clear']                 = 'Obriši filtar potrage';
+$lang['filter']                = 'Filtar';
+$lang['export_all']            = 'Izvezi sve korisnike (CSV)';
+$lang['export_filtered']       = 'Izvezi filtriranu listu korisnika (CSV)';
+$lang['import']                = 'Unos novih korisnika';
+$lang['line']                  = 'Linija br.';
+$lang['error']                 = 'Poruka o grešci';
+$lang['summary']               = 'Prikaz korisnika %1$d-%2$d od %3$d nađenih. Ukupno %4$d korisnika.';
+$lang['nonefound']             = 'Nema korisnika koji odgovaraju filtru.Ukupno %d korisnika.';
+$lang['delete_ok']             = '%d korisnik obrisano';
+$lang['delete_fail']           = '%d neuspjelih brisanja.';
+$lang['update_ok']             = 'Korisnik uspješno izmijenjen';
+$lang['update_fail']           = 'Neuspjela izmjena korisnika';
+$lang['update_exists']         = 'Promjena korisničkog imena neuspješna, traženo ime (%s) već postoji (ostale izmjene biti će primijenjene).';
+$lang['start']                 = 'početni';
+$lang['prev']                  = 'prethodni';
+$lang['next']                  = 'slijedeći';
+$lang['last']                  = 'zadnji';
+$lang['edit_usermissing']      = 'Odabrani korisnik nije nađen, traženo korisničko ime vjerojatno je obrisano i promijenjeno negdje drugdje.';
+$lang['user_notify']           = 'Obavijesti korisnika';
+$lang['note_notify']           = 'Obavijest korisniku biti će poslana samo ako je upisana nova lozinka.';
+$lang['note_group']            = 'Novi korisnik biti će dodijeljen u podrazumijevanu grupu (%s) ako grupa nije specificirana.';
+$lang['note_pass']             = 'Lozinka će biti generirana ako se polje ostavi prazno i obavješćivanje korisnika je omogućeno.';
+$lang['add_ok']                = 'Korisnik uspješno dodan';
+$lang['add_fail']              = 'Neuspješno dodavanje korisnika';
+$lang['notify_ok']             = 'Obavijest korisniku poslana';
+$lang['notify_fail']           = 'Obavijest korisniku ne može biti poslana';
+$lang['import_userlistcsv']    = 'Datoteka s popisom korisnika (CSV):';
+$lang['import_header']         = 'Zadnje greške pri uvozu';
+$lang['import_success_count']  = 'Uvoz korisnika: %d korisnika nađeno, %d uspješno uvezeno';
+$lang['import_failure_count']  = 'Uvoz korisnika: %d neuspješno. Greške su navedene niže.';
+$lang['import_error_fields']   = 'Nedovoljan broj polja, nađeno %d, potrebno 4.';
+$lang['import_error_baduserid'] = 'Nedostaje korisničko ime';
+$lang['import_error_badname']  = 'Krivo ime';
+$lang['import_error_badmail']  = 'Kriva adresa e-pošte';
+$lang['import_error_upload']   = 'Uvoz neuspješan. CSV datoteka ne može biti učitana ili je prazna.';
+$lang['import_error_readfail'] = 'Uvoz neuspješan. Ne mogu pročitati učitanu datoteku.';
+$lang['import_error_create']   = 'Ne mogu kreirati korisnika';
+$lang['import_notify_fail']    = 'Obavijest uvezenom korisniku %s nije moguće poslati na adresu e-pošte %s.';
+$lang['import_downloadfailures'] = 'Preuzmi  greške kao CSV za ispravak';
diff --git a/lib/plugins/usermanager/lang/hr/list.txt b/lib/plugins/usermanager/lang/hr/list.txt
new file mode 100644
index 000000000..50b1d2513
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hr/list.txt
@@ -0,0 +1 @@
+===== Lista korisnika =====
\ No newline at end of file
-- 
cgit v1.2.3