Merge remote-tracking branch 'origin/master'

30 files changed, 159 insertions, 31 deletions

diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt
index 029dc82e7..cb8fe7e8e 100644
--- a/lib/plugins/acl/plugin.info.txt
+++ b/lib/plugins/acl/plugin.info.txt
@@ -1,7 +1,7 @@
 base   acl
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-02-17
+date   2014-06-04
 name   ACL Manager
 desc   Manage Page Access Control Lists
 url    http://dokuwiki.org/plugin:acl
diff --git a/lib/plugins/authad/lang/fa/lang.php b/lib/plugins/authad/lang/fa/lang.php
new file mode 100644
index 000000000..1ea73cfdb
--- /dev/null
+++ b/lib/plugins/authad/lang/fa/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hamid <zarrabi@sharif.edu>
+ */
+$lang['domain']                = 'دامنه‌ی ورود';
diff --git a/lib/plugins/authad/lang/pt-br/lang.php b/lib/plugins/authad/lang/pt-br/lang.php
new file mode 100644
index 000000000..5fa963d4e
--- /dev/null
+++ b/lib/plugins/authad/lang/pt-br/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Felipe Castro <fefcas@gmail.com>
+ */
+$lang['domain']                = 'Domínio de "Logon"';
diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt
index 8774fcf3c..dc0629189 100644
--- a/lib/plugins/authad/plugin.info.txt
+++ b/lib/plugins/authad/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authad
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-02-14
+date   2014-04-03
 name   Active Directory Auth Plugin
 desc   Provides user authentication against a Microsoft Active Directory
 url    http://www.dokuwiki.org/plugin:authad
diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index 7e35ef632..e3d85cb87 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
@@ -19,7 +20,6 @@ $lang['userscope']             = '限制使用者搜索的範圍';
 $lang['groupscope']            = '限制群組搜索的範圍';
 $lang['groupkey']              = '以其他使用者屬性 (而非標準 AD 群組) 來把使用者分組，例如以部門或電話號碼分類';
 $lang['debug']                 = '有錯誤時，顯示額外除錯資訊';
-
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
diff --git a/lib/plugins/authldap/plugin.info.txt b/lib/plugins/authldap/plugin.info.txt
index 0d0b13f65..964fbb994 100644
--- a/lib/plugins/authldap/plugin.info.txt
+++ b/lib/plugins/authldap/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authldap
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-04-19
+date   2014-05-18
 name   LDAP Auth Plugin
 desc   Provides user authentication against an LDAP server
 url    http://www.dokuwiki.org/plugin:authldap
diff --git a/lib/plugins/authmysql/plugin.info.txt b/lib/plugins/authmysql/plugin.info.txt
index 3e889d11e..fa00fccf4 100644
--- a/lib/plugins/authmysql/plugin.info.txt
+++ b/lib/plugins/authmysql/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authmysql
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-02-16
+date   2014-02-15
 name   MYSQL Auth Plugin
 desc   Provides user authentication against a MySQL database
 url    http://www.dokuwiki.org/plugin:authmysql
diff --git a/lib/plugins/authpgsql/lang/es/settings.php b/lib/plugins/authpgsql/lang/es/settings.php
index 2e02fc0ec..abfb00d38 100644
--- a/lib/plugins/authpgsql/lang/es/settings.php
+++ b/lib/plugins/authpgsql/lang/es/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
+ * @author pokesakura <pokesakura@gmail.com>
  */
 $lang['server']                = 'Su servidor PostgreSQL';
 $lang['port']                  = 'Puerto de su servidor PostgreSQL';
@@ -17,10 +18,21 @@ $lang['checkPass']             = 'Sentencia SQL para el control de las contrase�
 $lang['getUserInfo']           = 'Sentencia SQL para recuperar información del usuario';
 $lang['getGroups']             = 'Sentencia SQL para recuperar la pertenencia a grupos de un usuario';
 $lang['getUsers']              = 'Sentencia SQL para enumerar todos los usuarios';
+$lang['FilterLogin']           = 'Sentencia SQL para filtrar a los usuarios por su login';
+$lang['FilterName']            = 'Sentencia SQL para filtrar a los usuarios por su nombre completo';
+$lang['FilterEmail']           = 'Sentencia SQL para filtrar a los usuarios por su correo electrónico';
+$lang['FilterGroup']           = 'Sentencia SQL para filtrar a los usuarios por su membresía en un grupo';
+$lang['SortOrder']             = 'Sentencia SQL para ordenar a los usuarios';
 $lang['addUser']               = 'Sentencia de SQL para agregar un nuevo usuario';
 $lang['addGroup']              = 'Sentencia de SQL para agregar un nuevo grupo';
 $lang['addUserGroup']          = 'Sentencia SQL para agregar un usuario a un grupo existente';
 $lang['delGroup']              = 'Instrucción SQL para eliminar un grupo';
 $lang['getUserID']             = 'Sentencia SQL para obtener la clave principal de un usuario';
 $lang['delUser']               = 'Sentencia SQL para eliminar un usuario';
+$lang['delUserRefs']           = 'Sentencia SQL para remover a un usuario de su memebresia en todos los grupos';
+$lang['updateUser']            = 'Sentencia SQL para actualizar los datos del usuario';
+$lang['UpdateLogin']           = 'Sentencia de actualizacion para el login del usuario';
+$lang['UpdatePass']            = 'Sentencia de actualizacion para el password del usuario';
+$lang['UpdateEmail']           = 'Sentencia de actualizacion del correo electrónico del usuario';
+$lang['UpdateName']            = 'Sentencia de actualizacion del nombre completo del usuario';
 $lang['getGroupID']            = 'Sentencia SQL para obtener la clave principal de un grupo dado';
diff --git a/lib/plugins/authpgsql/plugin.info.txt b/lib/plugins/authpgsql/plugin.info.txt
index aecab914e..59b7d89a9 100644
--- a/lib/plugins/authpgsql/plugin.info.txt
+++ b/lib/plugins/authpgsql/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authpgsql
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-02-16
+date   2014-02-15
 name   PostgreSQL Auth Plugin
 desc   Provides user authentication against a PostgreSQL database
 url    http://www.dokuwiki.org/plugin:authpgsql
diff --git a/lib/plugins/authplain/plugin.info.txt b/lib/plugins/authplain/plugin.info.txt
index b63ee53e4..2659ac7ad 100644
--- a/lib/plugins/authplain/plugin.info.txt
+++ b/lib/plugins/authplain/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authplain
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2012-11-09
+date   2014-07-01
 name   Plain Auth Plugin
 desc   Provides user authentication against DokuWiki's local password storage
 url    http://www.dokuwiki.org/plugin:authplain
diff --git a/lib/plugins/config/plugin.info.txt b/lib/plugins/config/plugin.info.txt
index 510be3be4..9472346b9 100644
--- a/lib/plugins/config/plugin.info.txt
+++ b/lib/plugins/config/plugin.info.txt
@@ -1,7 +1,7 @@
 base   config
 author Christopher Smith
 email  chris@jalakai.co.uk
-date   2013-02-24
+date   2014-03-18
 name   Configuration Manager
 desc   Manage Dokuwiki's Configuration Settings
 url    http://dokuwiki.org/plugin:config
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index b0e3b4ff7..ce5495e24 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -7,6 +7,7 @@
  * @author Joerg <scooter22@gmx.de>
  * @author Simon <st103267@stud.uni-stuttgart.de>
  * @author Hoisl <hoisl@gmx.at>
+ * @author Dominik Mahr <drache.mahr@gmx.de>
  */
 $lang['menu']                  = 'Erweiterungen verwalten';
 $lang['tab_plugins']           = 'Installierte Plugins';
@@ -88,3 +89,4 @@ $lang['nopluginperms']         = 'Das Plugin-Verzeichnis ist schreibgeschützt';
 $lang['git']                   = 'Diese Erweiterung wurde über git installiert und sollte daher nicht hier aktualisiert werden.';
 $lang['install_url']           = 'Von Webadresse (URL) installieren';
 $lang['install_upload']        = 'Erweiterung hochladen:';
+$lang['repo_error']            = 'Es konnte keine Verbindung zum Plugin-Verzeichnis hergestellt werden. Stellen sie sicher das der Server Verbindung mit www.dokuwiki.org aufnehmen darf und überprüfen sie ihre Proxy Einstellungen.';
diff --git a/lib/plugins/extension/lang/it/lang.php b/lib/plugins/extension/lang/it/lang.php
index fbf163d57..7dff6c5b2 100644
--- a/lib/plugins/extension/lang/it/lang.php
+++ b/lib/plugins/extension/lang/it/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Francesco <francesco.cavalli@hotmail.com>
+ * @author Fabio <fabioslurp@yahoo.it>
  */
 $lang['btn_enable']            = 'Abilita';
 $lang['btn_disable']           = 'Disabilita';
@@ -36,6 +37,7 @@ $lang['status_template']       = 'modello';
 $lang['error_badurl']          = 'URLs deve iniziare con http o https';
 $lang['error_dircreate']       = 'Impossibile creare una cartella temporanea per ricevere il download';
 $lang['error_download']        = 'Impossibile scaricare il file: %s';
+$lang['noperms']               = 'La directory Extension non è scrivibile';
 $lang['notplperms']            = 'Il modello di cartella non è scrivibile';
 $lang['nopluginperms']         = 'La cartella plugin non è scrivibile';
 $lang['install_url']           = 'Installa da URL:';
diff --git a/lib/plugins/extension/lang/pt-br/intro_install.txt b/lib/plugins/extension/lang/pt-br/intro_install.txt
new file mode 100644
index 000000000..08527b0f6
--- /dev/null
+++ b/lib/plugins/extension/lang/pt-br/intro_install.txt
@@ -0,0 +1 @@
+Aqui você pode instalar extensões e modelos manualmente, ou subindo eles ou submetendo uma URL de baixar diretamente.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt-br/intro_plugins.txt b/lib/plugins/extension/lang/pt-br/intro_plugins.txt
new file mode 100644
index 000000000..e0a8c7f3f
--- /dev/null
+++ b/lib/plugins/extension/lang/pt-br/intro_plugins.txt
@@ -0,0 +1 @@
+Estas são as extensões instaladas atualmente no seu DokuWiki. Você pode habilitar ou desabilitar ou desinstalar completamente elas aqui. Atualizações das extensões também são mostradas, certifique-se de ler a documentação da extensão antes de atualizá-la.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt-br/intro_search.txt b/lib/plugins/extension/lang/pt-br/intro_search.txt
new file mode 100644
index 000000000..f2101d73b
--- /dev/null
+++ b/lib/plugins/extension/lang/pt-br/intro_search.txt
@@ -0,0 +1 @@
+Esta aba lhe dá acesso a extensões e modelos disponibilizados por terceiros para o DokuWiki. Favor ter cuidado pois instalar código de terceiros pode acarretar um **risco de segurança**, você poderia ler sobre [[doku>security#plugin_security|segurança de extensões]] primeiramente.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt-br/intro_templates.txt b/lib/plugins/extension/lang/pt-br/intro_templates.txt
new file mode 100644
index 000000000..aa3e07f0c
--- /dev/null
+++ b/lib/plugins/extension/lang/pt-br/intro_templates.txt
@@ -0,0 +1 @@
+Estes são os modelos instalados atualmente no seu DokuWiki. Você pode selecionar o modelo a ser usado no [[?do=admin&page=config|Configuration Manager]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt-br/lang.php b/lib/plugins/extension/lang/pt-br/lang.php
new file mode 100644
index 000000000..0d897616a
--- /dev/null
+++ b/lib/plugins/extension/lang/pt-br/lang.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Felipe Castro <fefcas@gmail.com>
+ */
+$lang['menu']                  = 'Gerenciador de extensões';
+$lang['tab_plugins']           = 'Extensões instaladas';
+$lang['tab_templates']         = 'Modelos instalados';
+$lang['tab_search']            = 'Procurar e instalar';
+$lang['tab_install']           = 'Instalar manualmente';
+$lang['notimplemented']        = 'Esta função ainda não foi implementada';
+$lang['notinstalled']          = 'Esta extensão não está instalada';
+$lang['alreadyenabled']        = 'Esta extensão já foi habilitada';
+$lang['alreadydisabled']       = 'Esta extensão já foi desabilitada';
+$lang['pluginlistsaveerror']   = 'Houve um erro ao salvar a lista de extensões';
+$lang['unknownauthor']         = 'Autor desconhecido';
+$lang['unknownversion']        = 'Versão desconhecida';
+$lang['btn_info']              = 'Mostrar mais informações';
+$lang['btn_update']            = 'Atualizar';
+$lang['btn_uninstall']         = 'Desinstalar';
+$lang['btn_enable']            = 'Habilitar';
+$lang['btn_disable']           = 'Desabilitar';
+$lang['btn_install']           = 'Instalar';
+$lang['btn_reinstall']         = 'Re-instalar';
+$lang['js']['reallydel']       = 'Quer mesmo desinstalar esta extensão?';
+$lang['search_for']            = 'Procurar extensão:';
+$lang['search']                = 'Procurar';
+$lang['extensionby']           = '<strong>%s</strong> de %s';
+$lang['screenshot']            = 'Tela congelada de %s';
+$lang['popularity']            = 'Popularidade: %s%%';
+$lang['homepage_link']         = 'Docs';
+$lang['bugs_features']         = 'Erros';
+$lang['tags']                  = 'Etiquetas:';
+$lang['author_hint']           = 'Procurar extensões deste autor';
+$lang['installed']             = 'Instalado:';
+$lang['downloadurl']           = 'URL para baixar:';
+$lang['repository']            = 'Repositório:';
+$lang['unknown']               = '<em>desconhecido</em>';
+$lang['installed_version']     = 'Versão instalada:';
+$lang['install_date']          = 'Sua última atualização:';
+$lang['available_version']     = 'Versão disponível:';
+$lang['compatible']            = 'Compatível com:';
+$lang['depends']               = 'Depende de:';
+$lang['similar']               = 'Similar a:';
+$lang['conflicts']             = 'Colide com:';
+$lang['donate']                = 'Gostou deste?';
+$lang['donate_action']         = 'Pague um café ao autor!';
+$lang['repo_retry']            = 'Tentar de novo';
+$lang['provides']              = 'Disponibiliza:';
+$lang['status']                = 'Estado:';
+$lang['status_installed']      = 'instalado';
+$lang['status_not_installed']  = 'não instalado';
+$lang['status_protected']      = 'protegido';
+$lang['status_enabled']        = 'habilitado';
+$lang['status_disabled']       = 'desabilitado';
+$lang['status_unmodifiable']   = 'não modificável';
+$lang['status_plugin']         = 'extensão';
+$lang['status_template']       = 'modelo';
+$lang['status_bundled']        = 'agrupado';
+$lang['msg_enabled']           = 'Extensão %s habilitada';
+$lang['msg_disabled']          = 'Extensão %s desabilitada';
+$lang['msg_delete_success']    = 'Extensão desinstalada';
+$lang['msg_template_install_success'] = 'Modelo %s instalado com sucesso';
+$lang['msg_template_update_success'] = 'Modelo %s atualizado com sucesso';
+$lang['msg_plugin_install_success'] = 'Extensão %s instalada com sucesso';
+$lang['msg_plugin_update_success'] = 'Extensão %s atualizada com sucesso';
+$lang['msg_upload_failed']     = 'Subida do arquivo falhou';
+$lang['missing_dependency']    = '<strong>Dependência faltante ou desabilitada:</strong> %s';
+$lang['security_issue']        = '<strong>Problema com segurança:</strong> %s';
+$lang['security_warning']      = '<strong>Aviso sobre segurança:</strong> %s';
+$lang['update_available']      = '<strong>Atualização:</strong> Nova versão %s está disponível.';
+$lang['wrong_folder']          = '<strong>Extensão instalada incorretamente:</strong> Renomeie o diretório de extensões "%s" para "%s".';
+$lang['url_change']            = '<strong>URL mudou:</strong> A URL para baixar mudou desde a última baixada. Verifique se a nova URL é válida antes de atualizar a extensão.<br />Novo: %s<br />Velho: %s';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index d524f072b..fa1625f28 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ * @author Igor Degraf <igordegraf@gmail.com>
  */
 $lang['menu']                  = 'Управление дополнениями';
 $lang['tab_plugins']           = 'Установленные плагины';
@@ -58,3 +59,10 @@ $lang['msg_template_install_success'] = 'Шаблон %s успешно уста
 $lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён';
 $lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен';
 $lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён';
+$lang['noperms']               = 'Папка для расширений не доступна на запись';
+$lang['notplperms']            = 'Папка для шаблонов не доступна на запись';
+$lang['nopluginperms']         = 'Папка плагинов не доступна на запись';
+$lang['git']                   = 'Это расширение было установлено через git, Вы не можете обновить его тут.';
+$lang['install_url']           = 'Установить с адреса URL:';
+$lang['install_upload']        = 'Скачать расширение:';
+$lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org и также проверьте настройки соединения прокси.';
diff --git a/lib/plugins/extension/lang/zh-tw/lang.php b/lib/plugins/extension/lang/zh-tw/lang.php
new file mode 100644
index 000000000..304aed5ee
--- /dev/null
+++ b/lib/plugins/extension/lang/zh-tw/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Stan <talktostan@gmail.com>
+ */
+$lang['tab_templates']         = '已安裝裝模版
+';
+$lang['tab_search']            = '搜尋與安裝';
+$lang['btn_update']            = '更新';
diff --git a/lib/plugins/extension/plugin.info.txt b/lib/plugins/extension/plugin.info.txt
index ef16d78a1..ee9830628 100644
--- a/lib/plugins/extension/plugin.info.txt
+++ b/lib/plugins/extension/plugin.info.txt
@@ -1,7 +1,7 @@
 base   extension
 author Michael Hamann
 email  michael@content-space.de
-date   2013-08-01
+date   2014-06-15
 name   Extension Manager
 desc   Allows managing and installing plugins and templates
 url    https://www.dokuwiki.org/plugin:extension
diff --git a/lib/plugins/info/plugin.info.txt b/lib/plugins/info/plugin.info.txt
index 053743639..7773a419d 100644
--- a/lib/plugins/info/plugin.info.txt
+++ b/lib/plugins/info/plugin.info.txt
@@ -1,7 +1,7 @@
 base info
 author Andreas Gohr
 email andi@splitbrain.org
-date 2013-02-16
+date 2014-03-05
 name Info Plugin
 desc Displays information about various DokuWiki internals
 url http://dokuwiki.org/plugin:info
diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt
index 4dc971d3a..eadfffaa0 100644
--- a/lib/plugins/popularity/plugin.info.txt
+++ b/lib/plugins/popularity/plugin.info.txt
@@ -1,7 +1,7 @@
 base    popularity
 author  Andreas Gohr
 email   andi@splitbrain.org
-date    2012-11-29
+date    2013-10-14
 name    Popularity Feedback Plugin
 desc    Send anonymous data about your wiki to the DokuWiki developers
 url     http://www.dokuwiki.org/plugin:popularity
diff --git a/lib/plugins/revert/plugin.info.txt b/lib/plugins/revert/plugin.info.txt
index 482b68dc4..8d107dc32 100644
--- a/lib/plugins/revert/plugin.info.txt
+++ b/lib/plugins/revert/plugin.info.txt
@@ -1,7 +1,7 @@
 base   revert
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-03-09
+date   2013-11-21
 name   Revert Manager
 desc   Allows you to mass revert recent edits to remove Spam or vandalism
 url    http://dokuwiki.org/plugin:revert
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']           = 'ارسال ایمیل آگاهی‌دهنده با مشکل مواجه شد';
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';
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 для исправления';
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 個。';
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
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index 9d062655d..804d595ae 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
 base     dokuwiki
 author   Anika Henke
 email    anika@selfthinker.org
-date     2013-05-02
+date     2014-06-04
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki