54 files changed, 914 insertions, 43 deletions
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 7958cd2da..2aca0e218 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -57,6 +57,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         if(substr($id, 0 , 9) == 'template:'){
             $this->base = substr($id, 9);
             $this->is_template = true;
+        } else {
+            $this->is_template = false;
         }
 
         $this->localInfo = array();
@@ -290,7 +292,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function getUpdateDate() {
         if (!empty($this->managerData['updated'])) return $this->managerData['updated'];
-        return false;
+        return $this->getInstallDate();
     }
 
     /**
@@ -575,6 +577,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
         try {
             $installed = $this->installArchive("$tmp/upload.archive", true, $basename);
+            $this->updateManagerData('', $installed);
             // purge cache
             $this->purgeCache();
         }catch (Exception $e){
@@ -594,12 +597,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         try {
             $path      = $this->download($url);
             $installed = $this->installArchive($path, true);
+            $this->updateManagerData($url, $installed);
 
-            // purge caches
-            foreach($installed as $ext => $info){
-                $this->setExtension($ext);
-                $this->purgeCache();
-            }
+            // purge cache
+            $this->purgeCache();
         }catch (Exception $e){
             throw $e;
         }
@@ -613,8 +614,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The list of installed extensions
      */
     public function installOrUpdate() {
-        $path      = $this->download($this->getDownloadURL());
+        $url       = $this->getDownloadURL();
+        $path      = $this->download($url);
         $installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
+        $this->updateManagerData($url, $installed);
 
         // refresh extension information
         if (!isset($installed[$this->getID()])) {
@@ -729,6 +732,37 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     }
 
     /**
+     * Save the given URL and current datetime in the manager.dat file of all installed extensions
+     *
+     * @param string $url       Where the extension was downloaded from. (empty for manual installs via upload)
+     * @param array  $installed Optional list of installed plugins
+     */
+    protected function updateManagerData($url = '', $installed = null) {
+        $origID = $this->getID();
+
+        if(is_null($installed)) {
+            $installed = array($origID);
+        }
+
+        foreach($installed as $ext => $info) {
+            if($this->getID() != $ext) $this->setExtension($ext);
+            if($url) {
+                $this->managerData['downloadurl'] = $url;
+            } elseif(isset($this->managerData['downloadurl'])) {
+                unset($this->managerData['downloadurl']);
+            }
+            if(isset($this->managerData['installed'])) {
+                $this->managerData['updated'] = date('r');
+            } else {
+                $this->managerData['installed'] = date('r');
+            }
+            $this->writeManagerData();
+        }
+
+        if($this->getID() != $origID) $this->setExtension($origID);
+    }
+
+    /**
      * Read the manager.dat file
      */
     protected function readManagerData() {
diff --git a/lib/plugins/extension/images/disabled.png b/lib/plugins/extension/images/disabled.png
index 7a0dbb3b5..93a813642 100644
--- a/lib/plugins/extension/images/disabled.png
+++ b/lib/plugins/extension/images/disabled.png
diff --git a/lib/plugins/extension/images/enabled.png b/lib/plugins/extension/images/enabled.png
index 7c051cda1..92d958802 100644
--- a/lib/plugins/extension/images/enabled.png
+++ b/lib/plugins/extension/images/enabled.png
diff --git a/lib/plugins/extension/images/license.txt b/lib/plugins/extension/images/license.txt
index 254b9cdf6..44e176ac9 100644
--- a/lib/plugins/extension/images/license.txt
+++ b/lib/plugins/extension/images/license.txt
@@ -1,4 +1,4 @@
-enabled.png - CC-BY-ND, (c) Emey87 http://www.iconfinder.com/icondetails/65590/48/lightbulb_icon
-disabled.png - CC-BY-ND, (c) Emey87 http://www.iconfinder.com/icondetails/65589/48/idea_lightbulb_off_icon
+enabled.png - CC0, (c) Tanguy Ortolo
+disabled.png - public domain, (c) Tango Desktop Project http://commons.wikimedia.org/wiki/File:Dialog-information.svg
 plugin.png - public domain, (c) nicubunu, http://openclipart.org/detail/15093/blue-jigsaw-piece-07-by-nicubunu
 template.png - public domain, (c) mathec, http://openclipart.org/detail/166596/palette-by-mathec
diff --git a/lib/plugins/extension/lang/cs/intro_install.txt b/lib/plugins/extension/lang/cs/intro_install.txt
new file mode 100644
index 000000000..b274959b9
--- /dev/null
+++ b/lib/plugins/extension/lang/cs/intro_install.txt
@@ -0,0 +1 @@
+Zde můžete ručně instalovat zásuvné moduly a šablony vzhledu, buď nahráním, nebo zadáním přímé URL pro stažení.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php
new file mode 100644
index 000000000..27b3a94a3
--- /dev/null
+++ b/lib/plugins/extension/lang/cs/lang.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Viktor Zavadil <vzavadil@newps.cz>
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
+ */
+$lang['menu']                  = 'Manager rozšíření';
+$lang['tab_plugins']           = 'Instalované moduly';
+$lang['tab_templates']         = 'Instalované šablony';
+$lang['tab_search']            = 'Vyhledej a instaluj';
+$lang['tab_install']           = 'Ruční instalování';
+$lang['notimplemented']        = 'Tato vychytávka není dosud implementována';
+$lang['notinstalled']          = 'Toto rozšíření není instalováno';
+$lang['alreadyenabled']        = 'Toto rozšíření je již povoleno';
+$lang['alreadydisabled']       = 'Toto rozšíření je již vypnuto';
+$lang['unknownauthor']         = 'Neznámý autor';
+$lang['unknownversion']        = 'Neznámá verze';
+$lang['btn_info']              = 'Zobrazit více informací';
+$lang['btn_update']            = 'Aktualizovat';
+$lang['btn_uninstall']         = 'Odinstalovat';
+$lang['btn_enable']            = 'Povolit';
+$lang['btn_disable']           = 'Zakázat';
+$lang['btn_install']           = 'Instalovat';
+$lang['btn_reinstall']         = 'Přeinstalovat';
+$lang['js']['reallydel']       = 'Opravdu odinstalovat toto rozšíření?';
+$lang['search_for']            = 'Hledat rozšíření:';
+$lang['search']                = 'Hledat';
+$lang['popularity']            = 'Popularita: %s%%';
+$lang['homepage_link']         = 'Dokumenty';
+$lang['bugs_features']         = 'Chyby';
+$lang['tags']                  = 'Štítky:';
+$lang['author_hint']           = 'Vyhledat rozšíření podle tohoto autora';
+$lang['installed']             = 'Nainstalováno:';
+$lang['repository']            = 'Repozitář:';
+$lang['unknown']               = '<em>neznámý</em>';
+$lang['installed_version']     = 'Nainstalovaná verze:';
+$lang['install_date']          = 'Poslední aktualizace';
+$lang['available_version']     = 'Dostupná verze:';
+$lang['compatible']            = 'Kompatibilní s:';
+$lang['depends']               = 'Závisí na:';
+$lang['similar']               = 'Podobný jako:';
+$lang['donate']                = 'Líbí se ti to?';
+$lang['donate_action']         = 'Kup autorovi kávu!';
+$lang['repo_retry']            = 'Opakovat';
+$lang['provides']              = 'Poskytuje:';
+$lang['status']                = 'Stav:';
+$lang['status_installed']      = 'instalovaný';
+$lang['status_not_installed']  = 'nenainstalovaný';
+$lang['status_protected']      = 'chráněný';
+$lang['status_enabled']        = 'povolený';
+$lang['status_disabled']       = 'zakázaný';
+$lang['status_unmodifiable']   = 'neměnný';
+$lang['status_plugin']         = 'zásuvný modul';
+$lang['status_template']       = 'šablona';
+$lang['msg_delete_success']    = 'Rozšíření odinstalováno';
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index 8068ce830..ce5495e24 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -6,6 +6,8 @@
  * @author H. Richard <wanderer379@t-online.de>
  * @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';
@@ -74,6 +76,7 @@ $lang['security_issue']        = '<strong>Sicherheitsproblem:</strong> %s';
 $lang['security_warning']      = '<strong>Sicherheitswarnung:</strong> %s';
 $lang['update_available']      = '<strong>Update:</strong> Version %s steht zum Download bereit.';
 $lang['wrong_folder']          = '<strong>Plugin wurde nicht korrekt installiert:</strong> Benennen Sie das Plugin-Verzeichnis "%s" in "%s" um.';
+$lang['url_change']            = '<strong>URL geändert:</strong> Die Download URL wurde seit dem letzten Download geändert. Internetadresse vor Aktualisierung der Erweiterung auf Gültigkeit prüfen.<br />Neu: %s<br />Alt: %s';
 $lang['error_badurl']          = 'URLs sollten mit http oder https beginnen';
 $lang['error_dircreate']       = 'Temporären Ordner konnte nicht erstellt werden, um Download zu empfangen';
 $lang['error_download']        = 'Download der Datei: %s nicht möglich.';
@@ -83,6 +86,7 @@ $lang['error_copy']            = 'Beim Versuch Dateien in den Ordner <em>%s</em>
 $lang['noperms']               = 'Das Erweiterungs-Verzeichnis ist schreibgeschützt';
 $lang['notplperms']            = 'Das Template-Verzeichnis ist schreibgeschützt';
 $lang['nopluginperms']         = 'Das Plugin-Verzeichnis ist schreibgeschützt';
-$lang['git']                   = 'Diese Erweiterung wurde über git installiert, daher kann diese nicht hier aktualisiert werden.';
+$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/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 5224f694a..72c9b9e2d 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -96,4 +96,6 @@ $lang['nopluginperms']                = 'Plugin directory is not writable';
 $lang['git']                          = 'This extension was installed via git, you may not want to update it here.';
 
 $lang['install_url']                  = 'Install from URL:';
-$lang['install_upload']               = 'Upload Extension:';
-\ No newline at end of file
+$lang['install_upload']               = 'Upload Extension:';
+
+$lang['repo_error']                   = 'The plugin repository could not be contacted. Make sure your server is allowed to contact www.dokuwiki.org and check your proxy settings.';
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/es/intro_install.txt b/lib/plugins/extension/lang/es/intro_install.txt
new file mode 100644
index 000000000..533396b27
--- /dev/null
+++ b/lib/plugins/extension/lang/es/intro_install.txt
@@ -0,0 +1 @@
+Aquí se puede instalar manualmente los plugins y las plantillas, ya sea cargándolos o dando una URL de descarga directa.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/es/intro_templates.txt b/lib/plugins/extension/lang/es/intro_templates.txt
new file mode 100644
index 000000000..4ede9a1a9
--- /dev/null
+++ b/lib/plugins/extension/lang/es/intro_templates.txt
@@ -0,0 +1 @@
+Estas son las plantillas actualmente instalados en su DokuWiki. Puede seleccionar la plantilla que se utilizará en [[?do=admin&page=config|Configuration Manager]]
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/es/lang.php b/lib/plugins/extension/lang/es/lang.php
new file mode 100644
index 000000000..63742c3b3
--- /dev/null
+++ b/lib/plugins/extension/lang/es/lang.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Antonio Castilla <antoniocastilla@trazoide.com>
+ * @author Jonathan Hernández <me@jhalicea.com>
+ */
+$lang['menu']                  = 'Administrador de Extensiones ';
+$lang['tab_plugins']           = 'Plugins instalados';
+$lang['tab_templates']         = 'Plantillas instaladas';
+$lang['tab_search']            = 'Buscar e instalar';
+$lang['tab_install']           = 'Instalación manual';
+$lang['notimplemented']        = 'Esta característica no se ha implementado aún';
+$lang['notinstalled']          = 'Esta expensión no está instalada';
+$lang['alreadyenabled']        = 'Esta extensión ya había sido activada';
+$lang['alreadydisabled']       = 'Esta extensión ya había sido desactivada';
+$lang['pluginlistsaveerror']   = 'Se ha producido un error al guardar la lista de plugins';
+$lang['unknownauthor']         = 'autor desconocido';
+$lang['unknownversion']        = 'versión desconocida';
+$lang['btn_info']              = 'Mostrar más información';
+$lang['btn_update']            = 'Actualizar';
+$lang['btn_uninstall']         = 'Desinstalar';
+$lang['btn_enable']            = 'Activar';
+$lang['btn_disable']           = 'Desactivar';
+$lang['btn_install']           = 'Instalar';
+$lang['btn_reinstall']         = 'Reinstalar';
+$lang['js']['reallydel']       = '¿Realmente quiere desinstalar esta extensión?';
+$lang['search_for']            = 'Extensión de búsqueda :';
+$lang['search']                = 'Buscar';
+$lang['extensionby']           = '<strong>%s</strong> por %s';
+$lang['screenshot']            = 'Captura de %s';
+$lang['popularity']            = 'Popularidad:%s%%';
+$lang['homepage_link']         = 'Documentos';
+$lang['bugs_features']         = 'Bugs';
+$lang['tags']                  = 'Etiquetas:';
+$lang['author_hint']           = 'Buscar extensiones de este autor';
+$lang['installed']             = 'Instalado:';
+$lang['downloadurl']           = 'URL de descarga:';
+$lang['repository']            = 'Repositorio:';
+$lang['unknown']               = '<em>desconocido</em>';
+$lang['installed_version']     = 'Versión instalada:';
+$lang['install_date']          = 'Tú última actualización:';
+$lang['available_version']     = 'Versión disponible:';
+$lang['compatible']            = 'Compatible con:';
+$lang['depends']               = 'Dependencias:';
+$lang['similar']               = 'Similar a:';
+$lang['conflicts']             = 'Conflictos con:';
+$lang['donate']                = '¿Cómo está?';
+$lang['donate_action']         = '¡Págale un café al autor!';
+$lang['repo_retry']            = 'Trate otra vez';
+$lang['provides']              = 'Provee: ';
+$lang['status']                = 'Estado:';
+$lang['status_installed']      = 'instalado';
+$lang['status_not_installed']  = 'no instalado';
+$lang['status_protected']      = 'protegido';
+$lang['status_enabled']        = 'activado';
+$lang['status_disabled']       = 'desactivado';
+$lang['status_unmodifiable']   = 'no modificable';
+$lang['status_plugin']         = 'plugin';
+$lang['status_template']       = 'plantilla';
+$lang['status_bundled']        = 'agrupado';
+$lang['msg_enabled']           = 'Plugin %s activado';
+$lang['msg_disabled']          = 'Plugin %s desactivado';
+$lang['msg_delete_success']    = 'Extensión desinstalada';
+$lang['msg_template_install_success'] = 'Plantilla %s instalada con éxito';
+$lang['msg_template_update_success'] = 'Plantilla %s actualizada con éxito';
+$lang['msg_plugin_install_success'] = 'Plugin %s instalado con éxito';
+$lang['msg_plugin_update_success'] = 'Plugin %s actualizado con éxito';
+$lang['msg_upload_failed']     = 'Falló la carga del archivo';
+$lang['missing_dependency']    = '<strong>Dependencia deshabilitada o perdida:</strong> %s';
+$lang['security_issue']        = '<strong>Problema de seguridad:</strong> %s';
+$lang['security_warning']      = '<strong>Aviso de seguridad:</strong> %s';
+$lang['update_available']      = '<strong>Actualizar:</strong> Nueva versión %s disponible.';
+$lang['wrong_folder']          = '<strong>"Plugin" instalado incorrectamente:</strong> Cambie el nombre del directorio del plugin "%s" a "%s".';
+$lang['url_change']            = '<strong>URL actualizada:</strong> El Download URL ha cambiado desde el último download. Verifica si el nuevo URL es valido antes de actualizar la extensión .<br />Nuevo: %s<br />Viejo: %s';
+$lang['error_badurl']          = 'URLs deberían empezar con http o https';
+$lang['error_dircreate']       = 'No es posible de crear un directorio temporero para poder recibir el download';
+$lang['error_download']        = 'No es posible descargar el documento: %s';
+$lang['git']                   = 'Esta extensión fue instalada a través de git, quizás usted no quiera actualizarla aquí mismo.';
+$lang['install_url']           = 'Instalar desde URL:';
+$lang['install_upload']        = 'Subir Extensión:';
+$lang['repo_error']            = 'El repositorio de plugins no puede ser contactado. Asegúrese que su servidor pueda contactar www.dokuwiki.org y verificar la configuración de su proxy.';
diff --git a/lib/plugins/extension/lang/fa/lang.php b/lib/plugins/extension/lang/fa/lang.php
new file mode 100644
index 000000000..95c3e9652
--- /dev/null
+++ b/lib/plugins/extension/lang/fa/lang.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mohamad Mehdi Habibi <habibi.esf@gmail.com>
+ */
+$lang['menu']                  = 'مدیریت افزونه ها';
+$lang['tab_plugins']           = 'پلاگین های نصب شده';
+$lang['tab_templates']         = 'قالب های نصب شده';
+$lang['tab_search']            = 'جستجو و نصب';
+$lang['tab_install']           = 'نصب دستی';
+$lang['notinstalled']          = 'این افزونه نصب نشده است';
+$lang['alreadyenabled']        = 'این افزونه فعال شده است';
+$lang['alreadydisabled']       = 'این افزونه غیرفعال شده است';
+$lang['unknownversion']        = 'نسخه ناشناخته';
+$lang['btn_info']              = 'نمایش اطلاعات بیشتر';
+$lang['btn_update']            = 'به روز رسانی';
+$lang['btn_enable']            = 'فعال';
+$lang['btn_disable']           = 'غیرفعال';
+$lang['btn_install']           = 'نصب';
+$lang['btn_reinstall']         = 'نصب مجدد';
+$lang['search_for']            = 'جستجوی افزونه:';
+$lang['search']                = 'جستجو';
+$lang['tags']                  = 'برچسب ها:';
+$lang['installed_version']     = 'نسخه نصب شده:';
+$lang['available_version']     = 'نسخه در دسترس:';
+$lang['repo_retry']            = 'دوباره';
+$lang['status']                = 'وضعیت';
+$lang['status_installed']      = 'نصب شده';
+$lang['status_not_installed']  = 'نصب نشده';
+$lang['status_enabled']        = 'فعال';
+$lang['status_disabled']       = 'غیرفعال';
+$lang['status_plugin']         = 'پلاگین';
+$lang['status_template']       = 'قالب';
+$lang['noperms']               = 'پوشه افزونه ها قابل نوشتن نیست';
+$lang['notplperms']            = 'پوشه قالب ها قابل نوشتن نیست';
+$lang['nopluginperms']         = 'پوشه پلاگین ها قابل نوشتن نیست';
+$lang['install_url']           = 'نصب از آدرس:';
+$lang['install_upload']        = 'بارگذاری افزونه:';
diff --git a/lib/plugins/extension/lang/fr/intro_install.txt b/lib/plugins/extension/lang/fr/intro_install.txt
index 6f68a2606..5d287b818 100644
--- a/lib/plugins/extension/lang/fr/intro_install.txt
+++ b/lib/plugins/extension/lang/fr/intro_install.txt
@@ -1 +1 @@
-Ici, vous pouvez installer des extensions, greffons et modèles. Soit en les téléversant, soit en indiquant un URL de téléchargement.
-\ No newline at end of file
+Ici, vous pouvez installer des extensions, greffons et thèmes. Soit en les téléversant, soit en indiquant un URL de téléchargement.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/fr/intro_templates.txt b/lib/plugins/extension/lang/fr/intro_templates.txt
index fefdb5538..a0a1336ea 100644
--- a/lib/plugins/extension/lang/fr/intro_templates.txt
+++ b/lib/plugins/extension/lang/fr/intro_templates.txt
@@ -1 +1 @@
-Voici la liste des modèles actuellement installés. Le [[?do=admin&page=config|gestionnaire de configuration]] vous permet de choisir le modèle à utiliser.
-\ No newline at end of file
+Voici la liste des thèmes actuellement installés. Le [[?do=admin&page=config|gestionnaire de configuration]] vous permet de choisir le thème à utiliser.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/fr/lang.php b/lib/plugins/extension/lang/fr/lang.php
index c2dae0fc9..88234efd0 100644
--- a/lib/plugins/extension/lang/fr/lang.php
+++ b/lib/plugins/extension/lang/fr/lang.php
@@ -7,7 +7,7 @@
  */
 $lang['menu']                  = 'Gestionnaire d\'extension';
 $lang['tab_plugins']           = 'Greffons installés';
-$lang['tab_templates']         = 'Modèles installés';
+$lang['tab_templates']         = 'Thèmes installés';
 $lang['tab_search']            = 'Rechercher et installer';
 $lang['tab_install']           = 'Installation manuelle';
 $lang['notimplemented']        = 'Cette fonctionnalité n\'est pas encore installée';
@@ -57,13 +57,13 @@ $lang['status_enabled']        = 'activé';
 $lang['status_disabled']       = 'désactivé';
 $lang['status_unmodifiable']   = 'non modifiable';
 $lang['status_plugin']         = 'greffon';
-$lang['status_template']       = 'modèle';
+$lang['status_template']       = 'thème';
 $lang['status_bundled']        = 'fourni';
 $lang['msg_enabled']           = 'Greffon %s activé';
 $lang['msg_disabled']          = 'Greffon %s désactivé';
 $lang['msg_delete_success']    = 'Extension désinstallée';
-$lang['msg_template_install_success'] = 'Modèle %s installée avec succès';
-$lang['msg_template_update_success'] = 'Modèle %s mis à jour avec succès';
+$lang['msg_template_install_success'] = 'Thème %s installée avec succès';
+$lang['msg_template_update_success'] = 'Thème %s mis à jour avec succès';
 $lang['msg_plugin_install_success'] = 'Greffon %s installé avec succès';
 $lang['msg_plugin_update_success'] = 'Greffon %s mis à jour avec succès';
 $lang['msg_upload_failed']     = 'Téléversement échoué';
@@ -80,8 +80,9 @@ $lang['error_decompress']      = 'Impossible de décompresser le fichier téléc
 $lang['error_findfolder']      = 'Impossible d\'idnetifier le dossier de l\'extension. vous devez procéder à une installation manuelle.';
 $lang['error_copy']            = 'Une erreur de copie de fichier s\'est produite lors de l\'installation des fichiers dans le dossier <em>%s</em>. Il se peut que le disque soit plein, ou que les permissions d\'accès aux fichiers soient incorrectes. Il est possible que le greffon soit partiellement installé et que cela laisse votre installation de DoluWiki instable.';
 $lang['noperms']               = 'Impossible d\'écrire dans le dossier des extensions.';
-$lang['notplperms']            = 'Impossible d\'écrire dans le dossier des modèles.';
+$lang['notplperms']            = 'Impossible d\'écrire dans le dossier des thèmes.';
 $lang['nopluginperms']         = 'Impossible d\'écrire dans le dossier des greffons.';
 $lang['git']                   = 'Cette extension a été installé via git, vous voudrez peut-être ne pas la mettre à jour ici.';
 $lang['install_url']           = 'Installez depuis l\'URL :';
 $lang['install_upload']        = 'Téléversez l\'extension :';
+$lang['repo_error']            = 'L\'entrepôt d\'extensions est injoignable. Veuillez vous assurer que le server web est autorisé à contacter www.dokuwiki.org et vérifier les réglages de proxy.';
diff --git a/lib/plugins/extension/lang/hr/intro_install.txt b/lib/plugins/extension/lang/hr/intro_install.txt
new file mode 100644
index 000000000..fc2d22f52
--- /dev/null
+++ b/lib/plugins/extension/lang/hr/intro_install.txt
@@ -0,0 +1 @@
+Ovdje možete ručno instalirati dodatak (plugin) i predložak (template) bilo učitavanjem ili specificiranjem URL-a za direktno učitavanje.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hr/intro_plugins.txt b/lib/plugins/extension/lang/hr/intro_plugins.txt
new file mode 100644
index 000000000..fdc629d62
--- /dev/null
+++ b/lib/plugins/extension/lang/hr/intro_plugins.txt
@@ -0,0 +1 @@
+Ovo su dodaci (plugin) trenutno instalirani na Vašem DokuWiku-u. Možete ih omogućiti, onemogućiti ili u potpunosti deinstalirati. Nadogradnje dodataka su također prikazane, obavezno pročitajte dokumentaciju  dodatka prije nadogradnje.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hr/intro_search.txt b/lib/plugins/extension/lang/hr/intro_search.txt
new file mode 100644
index 000000000..93bf4b000
--- /dev/null
+++ b/lib/plugins/extension/lang/hr/intro_search.txt
@@ -0,0 +1 @@
+Ovaj tab vam pruža pristup dostupnim dodatcima i predlošcima za DokuWiki od treće strane. Molimo budite svjesni da instaliranje koda od treće strane može biti **sigurnosni rizik**, možda želite prvo pročitati o [[doku>security#plugin_security|sigurnosti dodataka]].
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hr/intro_templates.txt b/lib/plugins/extension/lang/hr/intro_templates.txt
new file mode 100644
index 000000000..968906cf9
--- /dev/null
+++ b/lib/plugins/extension/lang/hr/intro_templates.txt
@@ -0,0 +1 @@
+Ovo su predlošci trenutno instalirani na Vašem DokuWiki-u. Možete odabrati koji se predložak koristi na [[?do=admin&page=config|Upravitelju postavki]].
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hr/lang.php b/lib/plugins/extension/lang/hr/lang.php
new file mode 100644
index 000000000..4905fe864
--- /dev/null
+++ b/lib/plugins/extension/lang/hr/lang.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Davor Turkalj <turki.bsc@gmail.com>
+ */
+$lang['menu']                  = 'Upravitelj dodataka';
+$lang['tab_plugins']           = 'Instalirani dodatci';
+$lang['tab_templates']         = 'Instalirani predlošci';
+$lang['tab_search']            = 'Potraži i instaliraj';
+$lang['tab_install']           = 'Ručno instaliranje';
+$lang['notimplemented']        = 'Ova mogućnost još nije napravljena';
+$lang['notinstalled']          = 'Dodatak nije instaliran';
+$lang['alreadyenabled']        = 'Ovaj dodatak je već omogućen';
+$lang['alreadydisabled']       = 'Ovaj dodatak je već onemogućen';
+$lang['pluginlistsaveerror']   = 'Dogodila se greška pri snimanju liste dodataka';
+$lang['unknownauthor']         = 'Nepoznat autor';
+$lang['unknownversion']        = 'Nepoznata inačica';
+$lang['btn_info']              = 'Prikaži više informacija';
+$lang['btn_update']            = 'Dopuni';
+$lang['btn_uninstall']         = 'Ukloni';
+$lang['btn_enable']            = 'Omogući';
+$lang['btn_disable']           = 'Onemogući';
+$lang['btn_install']           = 'Postavi';
+$lang['btn_reinstall']         = 'Ponovno postavi';
+$lang['js']['reallydel']       = 'Zaista ukloniti ovo proširenje?';
+$lang['search_for']            = 'Pretraži proširenja';
+$lang['search']                = 'Pretraži';
+$lang['extensionby']           = '<strong>%s</strong> po %s';
+$lang['screenshot']            = 'Slika zaslona od %s';
+$lang['popularity']            = 'Popularnost: %s%%';
+$lang['homepage_link']         = 'Upute';
+$lang['bugs_features']         = 'Greške';
+$lang['tags']                  = 'Oznake:';
+$lang['author_hint']           = 'Potraži dodatke od ovog autora';
+$lang['installed']             = 'Postavljeno:';
+$lang['downloadurl']           = 'URL adresa preuzimanja:';
+$lang['repository']            = 'Repozitorij:';
+$lang['unknown']               = '<em>nepoznat</em>';
+$lang['installed_version']     = 'Postavljena inačica:';
+$lang['install_date']          = 'Vaše zadnje osvježavanje:';
+$lang['available_version']     = 'Dostupna inačica';
+$lang['compatible']            = 'Kompatibilan s:';
+$lang['depends']               = 'Zavisi o:';
+$lang['similar']               = 'Sličan s:';
+$lang['conflicts']             = 'U sukobu s:';
+$lang['donate']                = 'Poput ovog?';
+$lang['donate_action']         = 'Kupite autoru kavu!';
+$lang['repo_retry']            = 'Ponovi';
+$lang['provides']              = 'Osigurava:';
+$lang['status']                = 'Status:';
+$lang['status_installed']      = 'ugrađen';
+$lang['status_not_installed']  = 'nije ugrađen';
+$lang['status_protected']      = 'zaštićen';
+$lang['status_enabled']        = 'omogućen';
+$lang['status_disabled']       = 'onemogućen';
+$lang['status_unmodifiable']   = 'neizmjenjiv';
+$lang['status_plugin']         = 'dodatak';
+$lang['status_template']       = 'predložak';
+$lang['status_bundled']        = 'ugrađen';
+$lang['msg_enabled']           = 'Dodatak %s omogućen';
+$lang['msg_disabled']          = 'Dodatak %s onemogućen';
+$lang['msg_delete_success']    = 'Proširenje uklonjeno';
+$lang['msg_template_install_success'] = 'Predložak %s uspješno ugrađen';
+$lang['msg_template_update_success'] = 'Predložak %s uspješno nadograđen';
+$lang['msg_plugin_install_success'] = 'Dodatak %s uspješno ugrađen';
+$lang['msg_plugin_update_success'] = 'Dodatak %s uspješno nadograđen';
+$lang['msg_upload_failed']     = 'Učitavanje datoteke nije uspjelo';
+$lang['missing_dependency']    = '<strong>Nedostaje ili onemogućena zavisnost:</strong> %s';
+$lang['security_issue']        = '<strong>Sigurnosno pitanje:</strong> %s';
+$lang['security_warning']      = '<strong>Sigurnosno upozorenje:</strong> %s';
+$lang['update_available']      = '<strong>Nadogranja:</strong> Nova inačica %s je dostupna.';
+$lang['wrong_folder']          = '<strong>Dodatak neispravno ugrađen:</strong> Preimenujte mapu dodatka iz "%s" u "%s".';
+$lang['url_change']            = '<strong>URL izmijenjen:</strong> Adresa za preuzimanje je promijenjena od zadnjeg preuzimanja. Provjerite da li je novu URL valjan prije nadogradnje proširenja.<br />Novi: %s<br />Stari: %s';
+$lang['error_badurl']          = 'URL adrese trebaju započinjati sa http ili https';
+$lang['error_dircreate']       = 'Ne mogu napraviti privremenu mapu za prihvat preuzimanja';
+$lang['error_download']        = 'Ne mogu preuzeti datoteku: %s';
+$lang['error_decompress']      = 'Ne mogu raspakirati preuzetu datoteku. To može biti rezultati lošeg preuzimanja i tada treba pokušati ponovo; ili format sažimanja je nepoznat i u tom slučaju treba datoteku ručno preuzeti i ugraditi.';
+$lang['error_findfolder']      = 'Ne mogu odrediti mapu proširenja, trebate ga ručno preuzeti i ugraditi';
+$lang['error_copy']            = 'Dogodila se greška pri kopiranju dok je pokušavanja ugradnja datoteka u mapu <em>%s</em>: disk može biti pun ili dozvole pristupa nisu dobre. Ovo može rezultirati djelomično ugrađenim dodatkom i može učiniti Vaš wiki nestabilnim';
+$lang['noperms']               = 'Nije moguće pisati u mapu proširanja';
+$lang['notplperms']            = 'Nije moguće pisati u mapu predloška';
+$lang['nopluginperms']         = 'Nije moguće pisati u mapu dodatka';
+$lang['git']                   = 'Proširenje je ugrađeno preko Git-a, možda ga ne želite nadograđivati ovdje.';
+$lang['install_url']           = 'Ugradi s URL-a:';
+$lang['install_upload']        = 'Učitaj proširenje:';
+$lang['repo_error']            = 'Repozitorij dodataka nije dostupan. Budite sigurni da server može pristupiti www.dokuwiki.org i provjerite proxy postavke.';
diff --git a/lib/plugins/extension/lang/hu/intro_install.txt b/lib/plugins/extension/lang/hu/intro_install.txt
new file mode 100644
index 000000000..8427e7dc6
--- /dev/null
+++ b/lib/plugins/extension/lang/hu/intro_install.txt
@@ -0,0 +1 @@
+Itt új modulokat és sablonokat telepíthetsz feltöltéssel vagy a csomagra hivatkozó URL megadásával.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hu/intro_plugins.txt b/lib/plugins/extension/lang/hu/intro_plugins.txt
new file mode 100644
index 000000000..8a3e92ddb
--- /dev/null
+++ b/lib/plugins/extension/lang/hu/intro_plugins.txt
@@ -0,0 +1 @@
+A DokuWiki rendszerben telepített modulok az alábbiak. Engedélyezheted, letilthatod vagy teljesen le is törölheted ezeket. A modulokhoz tartozó frissítések is itt láthatók, viszont frissítés előtt mindenképp olvasd el az utasításokat a modul dokumentációjában is!
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hu/intro_search.txt b/lib/plugins/extension/lang/hu/intro_search.txt
new file mode 100644
index 000000000..87a2a5d64
--- /dev/null
+++ b/lib/plugins/extension/lang/hu/intro_search.txt
@@ -0,0 +1 @@
+Ezen a fülön harmadik fél által készített modulokat és sablonokat találsz a DokuWiki-hez. Ne feledd, hogy a harmadik féltől származó kódok **biztonsági kockázatot** jelenthetnek, ennek a [[doku>security#plugin_security|modulok biztonsága]] oldalon olvashatsz utána a telepítés előtt.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hu/intro_templates.txt b/lib/plugins/extension/lang/hu/intro_templates.txt
new file mode 100644
index 000000000..c0ad92b35
--- /dev/null
+++ b/lib/plugins/extension/lang/hu/intro_templates.txt
@@ -0,0 +1 @@
+A DokuWiki rendszerben telepített sablonok az alábbiak. A használt sablont a [[?do=admin&page=config|Beállítóközpontban]] választhatod ki.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hu/lang.php b/lib/plugins/extension/lang/hu/lang.php
new file mode 100644
index 000000000..a27b5a307
--- /dev/null
+++ b/lib/plugins/extension/lang/hu/lang.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Marton Sebok <sebokmarton@gmail.com>
+ */
+$lang['menu']                  = 'Bővítménykezelő';
+$lang['tab_plugins']           = 'Telepített modulok';
+$lang['tab_templates']         = 'Telepített sablonok';
+$lang['tab_search']            = 'Keresés és telepítés';
+$lang['tab_install']           = 'Kézi telepítés';
+$lang['notimplemented']        = 'Ez a funkció még nincs implementálva';
+$lang['notinstalled']          = 'Ez a bővítmény nincs telepítve';
+$lang['alreadyenabled']        = 'Ez a bővítmény már engedélyezve van';
+$lang['alreadydisabled']       = 'Ez a bővítmény már le van tiltva';
+$lang['pluginlistsaveerror']   = 'Hiba történt a modulok listájának mentésekor';
+$lang['unknownauthor']         = 'Ismeretlen szerző';
+$lang['unknownversion']        = 'Ismeretlen verzió';
+$lang['btn_info']              = 'További információk megjelenítése';
+$lang['btn_update']            = 'Frissítés';
+$lang['btn_uninstall']         = 'Törlés';
+$lang['btn_enable']            = 'Engedélyezés';
+$lang['btn_disable']           = 'Letiltás';
+$lang['btn_install']           = 'Telepítés';
+$lang['btn_reinstall']         = 'Újratelepítés';
+$lang['js']['reallydel']       = 'Biztosan törlöd ezt a bővítményt?';
+$lang['search_for']            = 'Bővítmények keresése:';
+$lang['search']                = 'Keresés';
+$lang['extensionby']           = '<strong>%s</strong>, %s szerzőtől';
+$lang['screenshot']            = '%s képernyőképe';
+$lang['popularity']            = 'Népszerűség: %s%%';
+$lang['homepage_link']         = 'Dokumentáció';
+$lang['bugs_features']         = 'Hibák';
+$lang['tags']                  = 'Címkék:';
+$lang['author_hint']           = 'Bővítmények keresése ettől a szerzőtől';
+$lang['installed']             = 'Telepítve:';
+$lang['downloadurl']           = 'Csomag URL:';
+$lang['repository']            = 'Repository:';
+$lang['unknown']               = '<em>ismeretlen</em>';
+$lang['installed_version']     = 'Telepített verzió:';
+$lang['install_date']          = 'Utoljára frissítve:';
+$lang['available_version']     = 'Elérhető verzió:';
+$lang['compatible']            = 'Kompatibilis rendszerek:';
+$lang['depends']               = 'Függőségek:';
+$lang['similar']               = 'Hasonló bővítmények:';
+$lang['conflicts']             = 'Ütközést okozó bővítmények:';
+$lang['donate']                = 'Tetszik?';
+$lang['donate_action']         = 'Hívd meg a szerzőjét egy kávéra!';
+$lang['repo_retry']            = 'Újra';
+$lang['provides']              = 'Szolgáltatások:';
+$lang['status']                = 'Állapot:';
+$lang['status_installed']      = 'telepítve';
+$lang['status_not_installed']  = 'nincs telepítve';
+$lang['status_protected']      = 'védett';
+$lang['status_enabled']        = 'engedélyezve';
+$lang['status_disabled']       = 'letiltva';
+$lang['status_unmodifiable']   = 'nem lehet módosítani';
+$lang['status_plugin']         = 'modul';
+$lang['status_template']       = 'sablon';
+$lang['status_bundled']        = 'beépített';
+$lang['msg_enabled']           = 'A(z) %s modul engedélyezve';
+$lang['msg_disabled']          = 'A(z) %s modul letiltva';
+$lang['msg_delete_success']    = 'A bővítmény törölve';
+$lang['msg_template_install_success'] = 'A(z) %s sablon sikeresen telepítve';
+$lang['msg_template_update_success'] = 'A(z) %s sablon sikeresen frissítve';
+$lang['msg_plugin_install_success'] = 'A(z) %s modul sikeresen telepítve';
+$lang['msg_plugin_update_success'] = 'A(z) %s modul sikeresen frissítve';
+$lang['msg_upload_failed']     = 'A fájl feltöltése sikertelen';
+$lang['missing_dependency']    = '<strong>Hiányzó vagy letiltott függőség:</strong> %s';
+$lang['security_issue']        = '<strong>Biztonsági probléma:</strong> %s';
+$lang['security_warning']      = '<strong>Biztonsági figyelmeztetés:</strong> %s';
+$lang['update_available']      = '<strong>Frissítés:</strong> Elérhető %s új verziója.';
+$lang['wrong_folder']          = '<strong>A modul telepítése sikertelen:</strong> Nevezd át a modul könyvtárát "%s" névről "%s" névre!';
+$lang['url_change']            = '<strong>Az URL megváltozott:</strong> A csomag URL-je megváltozott az utolsó letöltés óta. A bővítmény frissítése előtt ellenőrizd az új URL helyességét!<br />Új: %s<br />Régi: %s';
+$lang['error_badurl']          = 'Az URL-nek "http"-vel vagy "https"-sel kell kezdődnie';
+$lang['error_dircreate']       = 'A letöltéshez az ideiglenes könyvtár létrehozása sikertelen';
+$lang['error_download']        = 'A(z) %s fájl letöltése sikertelen';
+$lang['error_decompress']      = 'A letöltött fájlt nem lehet kicsomagolni. Ezt okozhatja a fájl sérülése (ebben az esetben próbáld újra letölteni) vagy egy ismeretlen tömörítési formátum használata (ilyenkor kézzel kell telepítened).';
+$lang['error_findfolder']      = 'A bővítményhez tartozó könyvtárat nem sikerült megállapítani, kézzel kell letöltened és telepítened';
+$lang['error_copy']            = 'Egy fájl másolása közben hiba történt a <em>%s</em> könyvtárban: lehet, hogy a lemez megtelt vagy nincsenek megfelelő írási jogaid. A telepítés megszakadása a modul hibás működését eredményezheti és instabil állapotba hozhatja a wikit';
+$lang['noperms']               = 'A bővítmény könyvtára nem írható';
+$lang['notplperms']            = 'A sablon könyvtára nem írható';
+$lang['nopluginperms']         = 'A modul könyvtára nem írható';
+$lang['git']                   = 'Ezt a bővítményt git-tel telepítették, lehet, hogy nem itt célszerű frissíteni';
+$lang['install_url']           = 'Telepítés erről az URL-ről:';
+$lang['install_upload']        = 'Bővítmény feltöltése:';
+$lang['repo_error']            = 'A modul repository-ja nem érhető el. Bizonyosodj meg róla, hogy a szervereden engedélyezett a www.dokuwiki.org cím elérése és ellenőrizd a proxy beállításaidat!';
diff --git a/lib/plugins/extension/lang/it/lang.php b/lib/plugins/extension/lang/it/lang.php
new file mode 100644
index 000000000..7dff6c5b2
--- /dev/null
+++ b/lib/plugins/extension/lang/it/lang.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @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';
+$lang['btn_install']           = 'Installa';
+$lang['btn_reinstall']         = 'Reinstalla';
+$lang['search']                = 'Cerca';
+$lang['homepage_link']         = 'Documenti';
+$lang['bugs_features']         = 'Bug';
+$lang['tags']                  = 'Tag:';
+$lang['author_hint']           = 'Cerca estensioni per questo autore';
+$lang['installed']             = 'Installato:';
+$lang['downloadurl']           = 'URL download:';
+$lang['repository']            = 'Repository';
+$lang['installed_version']     = 'Versione installata';
+$lang['install_date']          = 'Il tuo ultimo aggiornamento:';
+$lang['available_version']     = 'Versione disponibile:';
+$lang['compatible']            = 'Compatibile con:';
+$lang['similar']               = 'Simile a:';
+$lang['donate']                = 'Simile a questo?';
+$lang['repo_retry']            = 'Riprova';
+$lang['status']                = 'Status:';
+$lang['status_installed']      = 'installato';
+$lang['status_not_installed']  = 'non installato';
+$lang['status_protected']      = 'protetto';
+$lang['status_enabled']        = 'abilitato';
+$lang['status_disabled']       = 'disabilitato';
+$lang['status_unmodifiable']   = 'inmodificabile';
+$lang['status_plugin']         = 'plugin';
+$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/ja/intro_install.txt b/lib/plugins/extension/lang/ja/intro_install.txt
index 889ed6879..9f99b8202 100644
--- a/lib/plugins/extension/lang/ja/intro_install.txt
+++ b/lib/plugins/extension/lang/ja/intro_install.txt
@@ -1 +1 @@
-ここでは、アップロードするかダウンロードURLを指定して、手動でプラグインやテンプレートをインストールできます。
+アップロードするかダウンロードURLを指定して、手動でプラグインやテンプレートをインストールできます。
diff --git a/lib/plugins/extension/lang/ja/intro_plugins.txt b/lib/plugins/extension/lang/ja/intro_plugins.txt
index 9bfc68431..b8251c7e8 100644
--- a/lib/plugins/extension/lang/ja/intro_plugins.txt
+++ b/lib/plugins/extension/lang/ja/intro_plugins.txt
@@ -1 +1 @@
-このDokuWikiに現在インストールされているプラグインです。ここでは、これらプラグインを有効化、無効化、アンインストールすることができます。同様にプラグインのアップデートも表示されます。アップデート前に、プラグインのマニュアルをお読みください。
-\ No newline at end of file
+このDokuWikiに現在インストールされているプラグインです。これらプラグインを有効化、無効化、アンインストールできます。更新はできる場合のみ表示されます。更新前に、プラグインの解説をお読みください。
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ja/intro_templates.txt b/lib/plugins/extension/lang/ja/intro_templates.txt
index f97694aaa..5de6d2f0d 100644
--- a/lib/plugins/extension/lang/ja/intro_templates.txt
+++ b/lib/plugins/extension/lang/ja/intro_templates.txt
@@ -1 +1 @@
-このDokuWikiに現在インストールされているテンプレートです。[[?do=admin&page=config|設定管理]]で使用するテンプレートを選択できます。
-\ No newline at end of file
+このDokuWikiに現在インストールされているテンプレートです。使用するテンプレートは[[?do=admin&page=config|設定管理]]で選択できます。
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ja/lang.php b/lib/plugins/extension/lang/ja/lang.php
index 0401d7630..dec46d629 100644
--- a/lib/plugins/extension/lang/ja/lang.php
+++ b/lib/plugins/extension/lang/ja/lang.php
@@ -4,10 +4,12 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Hideaki SAWADA <chuno@live.jp>
+ * @author PzF_X <jp_minecraft@yahoo.co.jp>
  */
 $lang['menu']                  = '拡張機能管理';
 $lang['tab_plugins']           = 'インストール済プラグイン';
 $lang['tab_templates']         = 'インストール済テンプレート';
+$lang['tab_search']            = '検索とインストール';
 $lang['tab_install']           = '手動インストール';
 $lang['notimplemented']        = 'この機能は未実装です。';
 $lang['notinstalled']          = 'この拡張機能はインストールされていません。';
@@ -17,21 +19,44 @@ $lang['pluginlistsaveerror']   = 'プラグイン一覧の保存中にエラー�
 $lang['unknownauthor']         = '作者不明';
 $lang['unknownversion']        = 'バージョン不明';
 $lang['btn_info']              = '詳細情報を表示する。';
-$lang['btn_update']            = 'アップデート';
+$lang['btn_update']            = '更新';
 $lang['btn_uninstall']         = 'アンインストール';
 $lang['btn_enable']            = '有効化';
 $lang['btn_disable']           = '無効化';
 $lang['btn_install']           = 'インストール';
 $lang['btn_reinstall']         = '再インストール';
 $lang['js']['reallydel']       = 'この拡張機能を本当にアンインストールしますか？';
+$lang['search_for']            = '拡張機能の検索：';
+$lang['search']                = '検索';
+$lang['extensionby']           = '<strong>%s</strong> 作者： %s';
+$lang['screenshot']            = '%s のスクリーンショット';
+$lang['popularity']            = '利用状況：%s%%';
+$lang['homepage_link']         = '解説';
+$lang['bugs_features']         = 'バグ';
+$lang['tags']                  = 'タグ：';
+$lang['author_hint']           = 'この作者で拡張機能を検索';
+$lang['installed']             = 'インストール済：';
 $lang['downloadurl']           = 'ダウンロード URL：';
 $lang['repository']            = 'リポジトリ：';
+$lang['unknown']               = '<em>不明</em>';
+$lang['installed_version']     = 'インストール済バージョン：';
+$lang['install_date']          = '最終更新日：';
+$lang['available_version']     = '利用可能バージョン：';
+$lang['compatible']            = '互換：';
 $lang['depends']               = '依存：';
 $lang['similar']               = '類似：';
+$lang['conflicts']             = '競合：';
+$lang['donate']                = 'お気に入り？';
+$lang['donate_action']         = '寄付先';
+$lang['repo_retry']            = '再実行';
+$lang['provides']              = '提供：';
+$lang['status']                = '状態：';
 $lang['status_installed']      = 'インストール済';
 $lang['status_not_installed']  = '未インストール';
+$lang['status_protected']      = '保護されています';
 $lang['status_enabled']        = '有効';
 $lang['status_disabled']       = '無効';
+$lang['status_unmodifiable']   = '編集不可';
 $lang['status_plugin']         = 'プラグイン';
 $lang['status_template']       = 'テンプレート';
 $lang['status_bundled']        = '同梱';
@@ -39,16 +64,26 @@ $lang['msg_enabled']           = '%s プラグインを有効化しました。'
 $lang['msg_disabled']          = '%s プラグインを無効化しました。';
 $lang['msg_delete_success']    = '拡張機能をアンインストールしました。';
 $lang['msg_template_install_success'] = '%s テンプレートをインストールできました。';
-$lang['msg_template_update_success'] = '%s テンプレートをアップデートできました。';
+$lang['msg_template_update_success'] = '%s テンプレートを更新できました。';
 $lang['msg_plugin_install_success'] = '%s プラグインをインストールできました。';
-$lang['msg_plugin_update_success'] = '%s プラグインをアップデートできました。';
+$lang['msg_plugin_update_success'] = '%s プラグインを更新できました。';
 $lang['msg_upload_failed']     = 'ファイルのアップロードに失敗しました。';
+$lang['missing_dependency']    = '<strong>依存関係が欠落または無効：</strong> %s';
 $lang['security_issue']        = '<strong>セキュリティ問題：</strong> %s';
 $lang['security_warning']      = '<strong>セキュリティ警告：</strong> %s';
-$lang['update_available']      = '<strong>アップデート：</strong>％sの新バージョンが利用可能です。 ';
+$lang['update_available']      = '<strong>更新：</strong> %sの新バージョンが利用可能です。';
+$lang['wrong_folder']          = '<strong>プラグインは正しくインストールされませんでした：</strong> プラグインのディレクトリを "%s" から "%s" へ変更して下さい。';
+$lang['url_change']            = '<strong>URL が変更されました：</strong> 最後にダウンロードした後、ダウンロード URL が変更されました。拡張機能のアップデート前に新 URL が正しいかを確認して下さい。<br />新：%s<br />旧：%s';
 $lang['error_badurl']          = 'URLはhttpかhttpsで始まる必要があります。';
 $lang['error_dircreate']       = 'ダウンロード用の一時フォルダが作成できません。';
 $lang['error_download']        = 'ファイルをダウンロードできません：%s';
+$lang['error_decompress']      = 'ダウンロードしたファイルを解凍できません。ダウンロードの失敗の結果であれば、再度試して下さい。圧縮形式が不明の場合は、手動でダウンロード・インストールしてください。';
+$lang['error_findfolder']      = '拡張機能ディレクトリを認識できません。手動でダウンロード・インストールしてください。';
+$lang['error_copy']            = '<em>%s</em> ディレクトリのファイルをインストールしようとした時、ファイルコピーエラーが発生しました：ディスクがいっぱいかもしれませんし、ファイルのアクセス権が正しくないかもしれません。プラグインが一部分インストールされ、wiki が不安定になるかもしれません。';
 $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/ko/intro_install.txt b/lib/plugins/extension/lang/ko/intro_install.txt
new file mode 100644
index 000000000..269df29cc
--- /dev/null
+++ b/lib/plugins/extension/lang/ko/intro_install.txt
@@ -0,0 +1 @@
+여기에 플러그인과 템플릿을 수동으로 올리거나 직접 다운로드 URL을 제공하여 수동으로 설치할 수 있습니다.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ko/intro_plugins.txt b/lib/plugins/extension/lang/ko/intro_plugins.txt
new file mode 100644
index 000000000..9ac7a3d89
--- /dev/null
+++ b/lib/plugins/extension/lang/ko/intro_plugins.txt
@@ -0,0 +1 @@
+도쿠위키에 현재 설치된 플러그인입니다. 여기에서 플러그인을 활성화 또는 비활성화하거나 심지어 완전히 제거할 수 있습니다. 또한 플러그인 업데이트는 여기에 보여집니다. 업데이트하기 전에 플러그인의 설명문서를 읽으십시오.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ko/intro_search.txt b/lib/plugins/extension/lang/ko/intro_search.txt
new file mode 100644
index 000000000..b6760264e
--- /dev/null
+++ b/lib/plugins/extension/lang/ko/intro_search.txt
@@ -0,0 +1 @@
+이 탭은 도쿠위키를 위한 사용할 수 있는 모든 타사 플러그인과 템플릿에 접근하도록 제공합니다. 타사 코드를 설치하면 **보안 위험에 노출**될 수 있음을 유의하십시오, 먼저 [[doku>security#plugin_security|플러그인 보안]]에 대해 읽을 수 있습니다.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ko/intro_templates.txt b/lib/plugins/extension/lang/ko/intro_templates.txt
new file mode 100644
index 000000000..d4320b880
--- /dev/null
+++ b/lib/plugins/extension/lang/ko/intro_templates.txt
@@ -0,0 +1 @@
+도쿠위키에 현재 설치된 템플릿입니다. [[?do=admin&page=config|환경 설정 관리자]]에서 사용하는 템플릿을 선택할 수 있습니다.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ko/lang.php b/lib/plugins/extension/lang/ko/lang.php
new file mode 100644
index 000000000..53c9b4481
--- /dev/null
+++ b/lib/plugins/extension/lang/ko/lang.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Young gon Cha <garmede@gmail.com>
+ * @author Myeongjin <aranet100@gmail.com>
+ */
+$lang['menu']                  = '확장 기능 관리자';
+$lang['tab_plugins']           = '설치된 플러그인';
+$lang['tab_templates']         = '설치된 템플릿';
+$lang['tab_search']            = '검색하고 설치';
+$lang['tab_install']           = '수동 설치';
+$lang['notimplemented']        = '이 기능은 아직 구현되지 않았습니다';
+$lang['notinstalled']          = '이 확장 기능은 설치되어 있지 않습니다';
+$lang['alreadyenabled']        = '이 확장 기능이 이미 활성화되어 있습니다';
+$lang['alreadydisabled']       = '이 확장 기능이 이미 비활성화되어 있습니다';
+$lang['pluginlistsaveerror']   = '플러그인 목록을 저장하는 중 오류가 있었습니다';
+$lang['unknownauthor']         = '알 수 없는 저자';
+$lang['unknownversion']        = '알 수 없는 버전';
+$lang['btn_info']              = '정보 더 보기';
+$lang['btn_update']            = '업데이트';
+$lang['btn_uninstall']         = '제거';
+$lang['btn_enable']            = '활성화';
+$lang['btn_disable']           = '비활성화';
+$lang['btn_install']           = '설치';
+$lang['btn_reinstall']         = '다시 설치';
+$lang['js']['reallydel']       = '정말 이 확장 기능을 제거하겠습니까?';
+$lang['search_for']            = '확장 기능 검색:';
+$lang['search']                = '검색';
+$lang['extensionby']           = '<strong>%s</strong> (저자 %s)';
+$lang['screenshot']            = '%s의 스크린샷';
+$lang['popularity']            = '인기: %s%%';
+$lang['homepage_link']         = '문서';
+$lang['bugs_features']         = '버그';
+$lang['tags']                  = '태그:';
+$lang['author_hint']           = '이 저자로 확장 기능 검색';
+$lang['installed']             = '설치됨:';
+$lang['downloadurl']           = '다운로드 URL:';
+$lang['repository']            = '저장소:';
+$lang['unknown']               = '<em>알 수 없음</em>';
+$lang['installed_version']     = '설치된 버전:';
+$lang['install_date']          = '마지막 업데이트:';
+$lang['available_version']     = '가능한 버전:';
+$lang['compatible']            = '다음과의 호환성:';
+$lang['depends']               = '다음에 의존:';
+$lang['similar']               = '다음과 비슷:';
+$lang['conflicts']             = '다음과 충돌:';
+$lang['donate']                = '이것이 좋나요?';
+$lang['donate_action']         = '저자에게 커피를 사주세요!';
+$lang['repo_retry']            = '다시 시도';
+$lang['provides']              = '제공:';
+$lang['status']                = '상태:';
+$lang['status_installed']      = '설치됨';
+$lang['status_not_installed']  = '설치되지 않음';
+$lang['status_protected']      = '보호됨';
+$lang['status_enabled']        = '활성화됨';
+$lang['status_disabled']       = '비활성화됨';
+$lang['status_unmodifiable']   = '수정할 수 없음';
+$lang['status_plugin']         = '플러그인';
+$lang['status_template']       = '템플릿';
+$lang['status_bundled']        = '포함';
+$lang['msg_enabled']           = '%s 플러그인이 활성화되었습니다';
+$lang['msg_disabled']          = '%s 플러그인이 비활성화되었습니다';
+$lang['msg_delete_success']    = '확장 기능이 제거되었습니다';
+$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['msg_upload_failed']     = '파일 올리기에 실패했습니다';
+$lang['missing_dependency']    = '<strong>의존성을 잃었거나 비활성화되어 있습니다:</strong> %s';
+$lang['security_issue']        = '<strong>보안 문제:</strong> %s';
+$lang['security_warning']      = '<strong>보안 경고:</strong> %s';
+$lang['update_available']      = '<strong>업데이트:</strong> 새 버전 %s(을)를 사용할 수 있습니다.';
+$lang['wrong_folder']          = '<strong>플러그인이 올바르지 않게 설치됨:</strong> 플러그인 디렉터리를 "%s"에서 "%s"로 이름을 바꾸세요.';
+$lang['url_change']            = '<strong>URL이 바뀜:</strong> 다운로드 URL이 최신 다운로드 이래로 바뀌었습니다. 확장 기능을 업데이트하기 전에 새 URL이 올바른지 확인하세요.<br />새 URL: %s<br />오래된 URL: %s';
+$lang['error_badurl']          = 'URL은 http나 https로 시작해야 합니다';
+$lang['error_dircreate']       = '다운로드를 받을 임시 폴더를 만들 수 없습니다';
+$lang['error_download']        = '파일을 다운로드할 수 없습니다: %s';
+$lang['error_decompress']      = '다운로드한 파일의 압축을 풀 수 없습니다. 이는 아마도 잘못된 다운로드의 결과로, 이럴 경우 다시 시도해야 합니다; 또는 압축 형식을 알 수 없으며, 이럴 경우 수동으로 다운로드하고 설치해야 합니다.';
+$lang['error_findfolder']      = '확장 기능 디렉터리를 식별할 수 없습니다, 수동으로 다운로드하고 설치해야 합니다';
+$lang['error_copy']            = '<em>%s</em> 디렉터리에 파일을 설치하는 동안 파일 복사 오류가 발생했습니다: 디스크가 꽉 찼거나 파일 접근 권한이 잘못되었을 수도 있습니다. 플러그인 설치가 부분적으로 되었거나 불안정하게 위키 설치가 되었을 수 있습니다.';
+$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/lv/intro_templates.txt b/lib/plugins/extension/lang/lv/intro_templates.txt
new file mode 100644
index 000000000..1014c7c1e
--- /dev/null
+++ b/lib/plugins/extension/lang/lv/intro_templates.txt
@@ -0,0 +1 @@
+DokuWiki ir instalēti šādi šabloni. Lietojamo šablonu var norādīt  [[?do=admin&page=config|Konfigurācijas lapā]].
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/lv/lang.php b/lib/plugins/extension/lang/lv/lang.php
new file mode 100644
index 000000000..e7e9bdfd9
--- /dev/null
+++ b/lib/plugins/extension/lang/lv/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aivars Miška <allefm@gmail.com>
+ */
+$lang['msg_delete_success']    = 'Papildinājums atinstalēts';
diff --git a/lib/plugins/extension/lang/nl/intro_plugins.txt b/lib/plugins/extension/lang/nl/intro_plugins.txt
index 0077aca30..e12bdf0f8 100644
--- a/lib/plugins/extension/lang/nl/intro_plugins.txt
+++ b/lib/plugins/extension/lang/nl/intro_plugins.txt
@@ -1 +1 @@
-Dit zijn de momenteel in uw Dokuwiki geïnstalleerde plugins. U kunt deze hier aan of uitschakelen danwel geheel deïnstalleren. Plugin updates zijn hier ook opgenomen, lees de pluin documentatie voordat u update.
-\ No newline at end of file
+Dit zijn de momenteel in uw Dokuwiki geïnstalleerde plugins. U kunt deze hier aan of uitschakelen danwel geheel deïnstalleren. Plugin updates zijn hier ook opgenomen, lees de plugin documentatie voordat u update.
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/nl/intro_search.txt b/lib/plugins/extension/lang/nl/intro_search.txt
index 8fc3900ad..f0c8d7435 100644
--- a/lib/plugins/extension/lang/nl/intro_search.txt
+++ b/lib/plugins/extension/lang/nl/intro_search.txt
@@ -1 +1 @@
-Deze tab verschaft u toegang tot alle plugins en templates vervaardigd door derden en bestemd voor Dokuwiki. Houdt er rekening meel dat indien u Plugins van derden installeerd deze een **veiligheids risico ** kunnen bevatten, geadviseerd wordt om eerst te lezen [[doku>security#plugin_security|plugin security]].
-\ No newline at end of file
+Deze tab verschaft u toegang tot alle plugins en templates vervaardigd door derden en bestemd voor Dokuwiki. Houdt er rekening mee dat indien u Plugins van derden installeert deze een **veiligheids risico ** kunnen bevatten, geadviseerd wordt om eerst te lezen [[doku>security#plugin_security|plugin security]].
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/nl/intro_templates.txt b/lib/plugins/extension/lang/nl/intro_templates.txt
index 5ef23dadf..52c96cef7 100644
--- a/lib/plugins/extension/lang/nl/intro_templates.txt
+++ b/lib/plugins/extension/lang/nl/intro_templates.txt
@@ -1 +1 @@
-Deze templates zijn thans in DokuWiki geïnstalleerd. U kent een template selecteren middels [[?do=admin&page=config|Configuration Manager]] .
-\ No newline at end of file
+Deze templates zijn thans in DokuWiki geïnstalleerd. U kunt een template selecteren middels [[?do=admin&page=config|Configuration Manager]] .
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
index 2983f9fee..a54924e93 100644
--- a/lib/plugins/extension/lang/nl/lang.php
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -4,8 +4,10 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Rene <wllywlnt@yahoo.com>
+ * @author Gerrit Uitslag <klapinklapin@gmail.com>
+ * @author Johan Vervloet <johan.vervloet@gmail.com>
  */
-$lang['menu']                  = 'Extension Manager (Uitbreidings Beheerder)';
+$lang['menu']                  = 'Uitbreidingen';
 $lang['tab_plugins']           = 'Geïnstalleerde Plugins';
 $lang['tab_templates']         = 'Geïnstalleerde Templates';
 $lang['tab_search']            = 'Zoek en installeer';
@@ -24,28 +26,28 @@ $lang['btn_enable']            = 'Schakel aan';
 $lang['btn_disable']           = 'Schakel uit';
 $lang['btn_install']           = 'Installeer';
 $lang['btn_reinstall']         = 'Her-installeer';
-$lang['js']['reallydel']       = 'Wilt u deze uitbreiding deinstalleren ?';
+$lang['js']['reallydel']       = 'Wilt u deze uitbreiding deinstalleren?';
 $lang['search_for']            = 'Zoek Uitbreiding:';
 $lang['search']                = 'Zoek';
 $lang['extensionby']           = '<strong>%s</strong> by %s';
 $lang['screenshot']            = 'Schermafdruk bij %s';
 $lang['popularity']            = 'Populariteit:%s%%';
-$lang['homepage_link']         = 'Dokumenten';
+$lang['homepage_link']         = 'Documentatie';
 $lang['bugs_features']         = 'Bugs';
 $lang['tags']                  = 'Tags:';
 $lang['author_hint']           = 'Zoek uitbreidingen van deze auteur:';
 $lang['installed']             = 'Geinstalleerd:';
 $lang['downloadurl']           = 'Download URL:';
-$lang['repository']            = 'Repository ( centrale opslag)';
+$lang['repository']            = 'Centrale opslag:';
 $lang['unknown']               = '<em>onbekend</em>';
-$lang['installed_version']     = 'Geïnstalleerde versie';
-$lang['install_date']          = 'Uw laatste update :';
+$lang['installed_version']     = 'Geïnstalleerde versie:';
+$lang['install_date']          = 'Uw laatste update:';
 $lang['available_version']     = 'Beschikbare versie:';
-$lang['compatible']            = 'Compatible met :';
-$lang['depends']               = 'Afhankelijk van :';
-$lang['similar']               = 'Soortgelijk :';
-$lang['conflicts']             = 'Conflicteerd met :';
-$lang['donate']                = 'Vindt u dit leuk ?';
+$lang['compatible']            = 'Compatible met:';
+$lang['depends']               = 'Afhankelijk van:';
+$lang['similar']               = 'Soortgelijk:';
+$lang['conflicts']             = 'Conflicteerd met:';
+$lang['donate']                = 'Vindt u dit leuk?';
 $lang['donate_action']         = 'Koop een kop koffie voor de auteur!';
 $lang['repo_retry']            = 'Herhaal';
 $lang['provides']              = 'Zorgt voor:';
@@ -63,16 +65,16 @@ $lang['msg_enabled']           = 'Plugin %s ingeschakeld';
 $lang['msg_disabled']          = 'Plugin %s uitgeschakeld';
 $lang['msg_delete_success']    = 'Uitbreiding gedeinstalleerd';
 $lang['msg_template_install_success'] = 'Template %s werd succesvol geïnstalleerd';
-$lang['msg_template_update_success'] = 'Template %s werd succesvol ge-update';
+$lang['msg_template_update_success'] = 'Template %s werd succesvol geüpdatet';
 $lang['msg_plugin_install_success'] = 'Plugin %s werd succesvol geïnstalleerd';
-$lang['msg_plugin_update_success'] = 'Plugin %s werd succesvol ge-update';
+$lang['msg_plugin_update_success'] = 'Plugin %s werd succesvol geüpdatet';
 $lang['msg_upload_failed']     = 'Uploaden van het bestand is mislukt';
 $lang['missing_dependency']    = '<strong>niet aanwezige of uitgeschakelde afhankelijkheid</strong> %s';
 $lang['security_issue']        = '<strong>Veiligheids kwestie:</strong> %s';
 $lang['security_warning']      = '<strong>Veiligheids Waarschuwing</strong> %s';
 $lang['update_available']      = '<strong>Update:</strong> Nieuwe versie %s is beschikbaar.';
 $lang['wrong_folder']          = '<strong>Plugin onjuist geïnstalleerd:</strong> Hernoem de plugin directory van "%s" naar"%s"';
-$lang['url_change']            = '<strong>URL gewijzigd:</strong> Download URL is gewijzigd sinds de laatste download. Controleer of de nieuwe URL juist is voordat u de uitbreiding update. <br />Nieuw:%s<Br /> Vorig: %s';
+$lang['url_change']            = '<strong>URL gewijzigd:</strong> Download URL is gewijzigd sinds de laatste download. Controleer of de nieuwe URL juist is voordat u de uitbreiding updatet. <br />Nieuw:%s<Br /> Vorig: %s';
 $lang['error_badurl']          = 'URLs moeten beginnen met http of https';
 $lang['error_dircreate']       = 'De tijdelijke map kon niet worden gemaakt om de download te ontvangen';
 $lang['error_download']        = 'Het is niet mogelijk het bestand te downloaden: %s';
@@ -85,3 +87,4 @@ $lang['nopluginperms']         = 'Plugin directory is niet schrijfbaar';
 $lang['git']                   = 'De uitbreiding werd geïnstalleerd via git, u wilt deze hier wellicht niet aanpassen.';
 $lang['install_url']           = 'Installeer vanaf URL:';
 $lang['install_upload']        = 'Upload Uitbreiding:';
+$lang['repo_error']            = 'Er kon geen verbinding worden gemaakt met de centrale plugin opslag. Controleer of de server verbinding mag maken met www.dokuwiki.org en controleer de proxy instellingen.';
diff --git a/lib/plugins/extension/lang/pl/lang.php b/lib/plugins/extension/lang/pl/lang.php
new file mode 100644
index 000000000..4fdca79c9
--- /dev/null
+++ b/lib/plugins/extension/lang/pl/lang.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mati <mackosa@wp.pl>
+ */
+$lang['menu']                  = 'Menedżer rozszerzeń';
+$lang['tab_plugins']           = 'Zainstalowane dodatki';
+$lang['tab_search']            = 'Znajdź i zainstaluj';
+$lang['notinstalled']          = 'Te rozszerzenie nie zostało zainstalowane';
+$lang['alreadyenabled']        = 'Te rozszerzenie jest już uruchomione';
+$lang['unknownauthor']         = 'Nieznany autor';
+$lang['unknownversion']        = 'Nieznana wersja';
+$lang['btn_info']              = 'Pokaż więcej informacji';
+$lang['btn_enable']            = 'Uruchom';
+$lang['btn_disable']           = 'Wyłącz';
+$lang['btn_reinstall']         = 'Ponowna instalacja';
+$lang['js']['reallydel']       = 'Naprawdę odinstalować te rozszerzenie?';
+$lang['search']                = 'Szukaj';
+$lang['bugs_features']         = 'Błędy';
+$lang['tags']                  = 'Tagi:';
+$lang['installed']             = 'Zainstalowano:';
+$lang['repository']            = 'Repozytorium';
+$lang['installed_version']     = 'Zainstalowana wersja:';
+$lang['install_date']          = 'Twoja ostatnia aktualizacja:';
+$lang['available_version']     = 'Dostępna wersja:';
+$lang['depends']               = 'Zależy od:';
+$lang['conflicts']             = 'Konflikt z:';
+$lang['donate']                = 'Lubisz to?';
+$lang['donate_action']         = 'Kup autorowi kawę!';
+$lang['repo_retry']            = 'Ponów';
+$lang['status']                = 'Status:';
+$lang['status_installed']      = 'zainstalowano';
+$lang['status_not_installed']  = 'nie zainstalowano';
+$lang['status_enabled']        = 'uruchomione';
+$lang['status_disabled']       = 'wyłączone';
+$lang['status_plugin']         = 'dodatek';
+$lang['msg_delete_success']    = 'Rozszerzenie odinstalowane';
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/tr/lang.php b/lib/plugins/extension/lang/tr/lang.php
new file mode 100644
index 000000000..dfabfa715
--- /dev/null
+++ b/lib/plugins/extension/lang/tr/lang.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author İlker R. Kapaç <irifat@gmail.com>
+ */
+$lang['menu']                  = 'Genişletme Yöneticisi';
+$lang['tab_plugins']           = 'Kurulmuş Eklentiler';
+$lang['tab_templates']         = 'Kurulmuş Şablonlar';
+$lang['tab_search']            = 'Ara ve Kur';
+$lang['tab_install']           = 'Elle Kurulum';
+$lang['notimplemented']        = 'Bu özellik henüz uygulamaya geçmemiştir';
+$lang['notinstalled']          = 'Bu genişletme yüklü değildir';
+$lang['alreadyenabled']        = 'Bu genişletme zaten etkinleştirilmiştir.';
+$lang['alreadydisabled']       = 'Bu genişletme zaten pasifleştirilmiştir';
+$lang['pluginlistsaveerror']   = 'Eklenti listesini kaydederken bir hata oluştu.';
+$lang['unknownauthor']         = 'Bilinmeyen yazar';
+$lang['unknownversion']        = 'Bilinmeyen sürüm';
+$lang['btn_info']              = 'Daha fazla bilgi göster';
+$lang['btn_update']            = 'Güncelle';
+$lang['btn_uninstall']         = 'Kaldır';
+$lang['btn_enable']            = 'Etkinleştir';
+$lang['btn_disable']           = 'Pasifleştir';
+$lang['btn_install']           = 'Kur';
+$lang['btn_reinstall']         = 'Yeniden kur';
+$lang['js']['reallydel']       = 'Genişletme gerçekten kaldırılsın mı?';
+$lang['search_for']            = 'Genişletme Ara:';
+$lang['search']                = 'Ara';
+$lang['extensionby']           = '<strong>%s</strong> tarafından %s';
+$lang['screenshot']            = '%s ekran görüntüsü';
+$lang['popularity']            = 'Rağbet: %s%%';
+$lang['homepage_link']         = 'Belgeler';
+$lang['bugs_features']         = 'Hatalar';
+$lang['tags']                  = 'Etiketler:';
+$lang['author_hint']           = 'Bu yazarın genişletmelerini ara.';
+$lang['installed']             = 'Kurulu:';
+$lang['downloadurl']           = 'İndirme bağlantısı:';
+$lang['repository']            = 'Veri havuzu:';
+$lang['unknown']               = '<em>bilinmeyen</em>';
+$lang['installed_version']     = 'Kurulu sürüm:';
+$lang['install_date']          = 'Son güncellemeniz:';
+$lang['available_version']     = 'Müsait sürüm:';
+$lang['compatible']            = 'Şununla uyumlu:';
+$lang['depends']               = 'Şuna bağımlı';
+$lang['similar']               = 'Şununla benzer';
+$lang['conflicts']             = 'Şununla çelişir';
+$lang['donate']                = 'Beğendiniz mi?';
+$lang['donate_action']         = 'Yazara bir kahve ısmarlayın!';
+$lang['repo_retry']            = 'Yeniden dene';
+$lang['provides']              = 'Sağlar:';
+$lang['status']                = 'Durum:';
+$lang['status_installed']      = 'kurulu';
+$lang['status_not_installed']  = 'kurulu değil';
+$lang['status_protected']      = 'korunmuş';
+$lang['status_enabled']        = 'etkin';
+$lang['status_disabled']       = 'hizmet dışı';
+$lang['status_unmodifiable']   = 'değiştirilemez';
+$lang['status_plugin']         = 'eklenti';
+$lang['status_template']       = 'şablon';
diff --git a/lib/plugins/extension/lang/zh-tw/intro_install.txt b/lib/plugins/extension/lang/zh-tw/intro_install.txt
new file mode 100644
index 000000000..3ba93f5f8
--- /dev/null
+++ b/lib/plugins/extension/lang/zh-tw/intro_install.txt
@@ -0,0 +1 @@
+在此你可以透過檔案上傳或提供下載網址的方式，進行手動安裝外掛與版型風格。
+\ No newline at end of file
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..a86364d7a
--- /dev/null
+++ b/lib/plugins/extension/lang/zh-tw/lang.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Stan <talktostan@gmail.com>
+ * @author June-Hao Hou <junehao@gmail.com>
+ */
+$lang['menu']                  = '延伸功能管理';
+$lang['tab_plugins']           = '已安裝外掛';
+$lang['tab_templates']         = '已安裝裝模版
+';
+$lang['tab_search']            = '搜尋與安裝';
+$lang['tab_install']           = '手動安裝';
+$lang['notimplemented']        = '此功能尚未完成';
+$lang['notinstalled']          = '此延伸功能尚未安裝';
+$lang['alreadyenabled']        = '此延伸功能已經安裝';
+$lang['alreadydisabled']       = '此延伸功能停用';
+$lang['unknownauthor']         = '作者未知';
+$lang['unknownversion']        = '版本未知';
+$lang['btn_info']              = '顯示更多訊息';
+$lang['btn_update']            = '更新';
+$lang['btn_uninstall']         = '移除安裝';
+$lang['btn_enable']            = '啟用';
+$lang['btn_disable']           = '停用';
+$lang['btn_install']           = '安裝';
+$lang['btn_reinstall']         = '重新安裝';
+$lang['js']['reallydel']       = '確定要移除此延伸功能？';
+$lang['search_for']            = '搜尋延伸功能：';
+$lang['search']                = '搜尋';
+$lang['tags']                  = '標籤：';
+$lang['author_hint']           = '搜尋相同作者的延伸功能';
+$lang['installed']             = '已安裝：';
+$lang['downloadurl']           = '下載網址：';
+$lang['installed_version']     = '已安裝版本：';
+$lang['available_version']     = '可用版本：';
+$lang['compatible']            = '相容於：';
+$lang['repo_retry']            = '再試一次';
+$lang['status']                = '狀態：';
+$lang['status_installed']      = '已安裝';
+$lang['status_not_installed']  = '未安裝';
+$lang['status_enabled']        = '作用中';
+$lang['status_disabled']       = '停用中';
+$lang['status_plugin']         = '外掛';
+$lang['noperms']               = '延伸功能資料夾無法寫入';
+$lang['notplperms']            = '版型資料夾無法寫入';
+$lang['nopluginperms']         = '外掛資料夾無法寫入';
+$lang['git']                   = '此延伸功能是透過git安裝的，最好不要用上傳方式。';
+$lang['install_url']           = '透過網址安裝：';
+$lang['install_upload']        = '上傳延伸功能：';
diff --git a/lib/plugins/extension/lang/zh/intro_plugins.txt b/lib/plugins/extension/lang/zh/intro_plugins.txt
new file mode 100644
index 000000000..69cb343b3
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_plugins.txt
@@ -0,0 +1 @@
+这些是你当前已经安装的插件。你可以在这里启用和禁用甚至卸载它们。插件的更新信息也显示在这，请一定在更新之前阅读插件的文档。
+\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
index b9db01540..0264f3e9c 100644
--- a/lib/plugins/extension/lang/zh/lang.php
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -5,6 +5,8 @@
  * 
  * @author Cupen <Cupenoruler@foxmail.com>
  * @author xiqingongzi <Xiqingongzi@Gmail.com>
+ * @author qinghao <qingxianhao@gmail.com>
+ * @author lainme <lainme993@gmail.com>
  */
 $lang['menu']                  = '扩展管理器';
 $lang['tab_plugins']           = '安装插件';
@@ -41,10 +43,49 @@ $lang['repository']            = '版本库：';
 $lang['unknown']               = '<em>未知的</em>';
 $lang['installed_version']     = '已安装版本：';
 $lang['install_date']          = '您的最后一次升级：';
+$lang['available_version']     = '可用版本：';
+$lang['compatible']            = '兼容于：';
+$lang['depends']               = '依赖于：';
+$lang['similar']               = '相似于：';
+$lang['conflicts']             = '冲突于：';
 $lang['donate']                = '喜欢？';
 $lang['donate_action']         = '捐给作者一杯咖啡钱！';
 $lang['repo_retry']            = '重试';
+$lang['provides']              = '提供：';
 $lang['status']                = '现状：';
 $lang['status_installed']      = '已安装的';
+$lang['status_not_installed']  = '未安装';
+$lang['status_protected']      = '受保护';
+$lang['status_enabled']        = '启用';
+$lang['status_disabled']       = '禁用';
+$lang['status_unmodifiable']   = '不可修改';
 $lang['status_plugin']         = '插件';
 $lang['status_template']       = '模板';
+$lang['status_bundled']        = '内建';
+$lang['msg_enabled']           = '插件 %s 已启用';
+$lang['msg_disabled']          = '插件 %s 已禁用';
+$lang['msg_delete_success']    = '插件已经卸载';
+$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['msg_upload_failed']     = '上传文件失败';
+$lang['missing_dependency']    = '<strong>缺少或者被禁用依赖：</strong> %s';
+$lang['security_issue']        = '<strong>安全问题：</strong> %s';
+$lang['security_warning']      = '<strong>安全警告：</strong> %s';
+$lang['update_available']      = '<strong>更新：</strong>新版本 %s 已经可用。';
+$lang['wrong_folder']          = '<strong>插件安装不正确：</strong>重命名插件目录 "%s" 为 "%s"。';
+$lang['url_change']            = '<strong>URL已改变：</strong>自上次下载以来的下载 URL 已经改变。请在更新扩展前检查新 URL 是否有效。<br />新的：%s<br />旧的：%s';
+$lang['error_badurl']          = 'URL 应当以 http 或者 https 作为开头';
+$lang['error_dircreate']       = '无法创建用于保存下载的临时文件夹';
+$lang['error_download']        = '无法下载文件：%s';
+$lang['error_decompress']      = '无法解压下载的文件。这可能是由于文件损坏，在这种情况下您可以重试。这也可能是由于压缩格式是未知的，在这种情况下您需要手动下载并且安装。';
+$lang['error_findfolder']      = '无法识别扩展目录，您需要手动下载和安装';
+$lang['error_copy']            = '在尝试安装文件到目录 <em>%s</em> 时出现文件复制错误：磁盘可能已满或者文件访问权限不正确。这可能导致插件被部分安装并使您的维基处在不稳定状态';
+$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/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