From 741b8a48682890ee68e3f650510fec9a4d47d5b0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 14 Feb 2014 13:57:50 +0100
Subject: Show a domain dropdown when multiple AD domains are configured

This integrates the functionality of the now outdated addomain plugin
directly into the authad plugin and makes multi-domain setups usable
without SSO.

See also https://github.com/cosmocode/dokuwiki-plugin-addomain
---
 lib/plugins/authad/action.php      | 91 ++++++++++++++++++++++++++++++++++++++
 lib/plugins/authad/auth.php        | 25 +++++++++++
 lib/plugins/authad/plugin.info.txt |  2 +-
 3 files changed, 117 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/action.php b/lib/plugins/authad/action.php
index e69de29bb..97be9897e 100644
--- a/lib/plugins/authad/action.php
+++ b/lib/plugins/authad/action.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * DokuWiki Plugin addomain (Action Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <gohr@cosmocode.de>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class action_plugin_addomain
+ */
+class action_plugin_authad extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     */
+    public function register(Doku_Event_Handler &$controller) {
+
+        $controller->register_hook('AUTH_LOGIN_CHECK', 'BEFORE', $this, 'handle_auth_login_check');
+        $controller->register_hook('HTML_LOGINFORM_OUTPUT', 'BEFORE', $this, 'handle_html_loginform_output');
+
+    }
+
+    /**
+     * Adds the selected domain as user postfix when attempting a login
+     *
+     * @param Doku_Event $event
+     * @param array      $param
+     */
+    public function handle_auth_login_check(Doku_Event &$event, $param) {
+        global $INPUT;
+
+        /** @var auth_plugin_authad $auth */
+        global $auth;
+        if(!is_a($auth, 'auth_plugin_authad')) return; // AD not even used
+
+        if($INPUT->str('dom')) {
+            $usr = $auth->cleanUser($event->data['user']);
+            $dom = $auth->_userDomain($usr);
+            if(!$dom) {
+                $usr = "$usr@".$INPUT->str('dom');
+            }
+            $INPUT->post->set('u', $usr);
+            $event->data['user'] = $usr;
+        }
+    }
+
+    /**
+     * Shows a domain selection in the login form when more than one domain is configured
+     *
+     * @param Doku_Event $event
+     * @param array      $param
+     */
+    public function handle_html_loginform_output(Doku_Event &$event, $param) {
+        global $INPUT;
+        /** @var auth_plugin_authad $auth */
+        global $auth;
+        if(!is_a($auth, 'auth_plugin_authad')) return; // AD not even used
+        $domains = $auth->_getConfiguredDomains();
+        if(count($domains) <= 1) return; // no choice at all
+
+        /** @var Doku_Form $form */
+        $form =& $event->data;
+
+        // any default?
+        $dom = '';
+        if($INPUT->has('u')) {
+            $usr = $auth->cleanUser($INPUT->str('u'));
+            $dom = $auth->_userDomain($usr);
+
+            // update user field value
+            if($dom) {
+                $usr          = $auth->_userName($usr);
+                $pos          = $form->findElementByAttribute('name', 'u');
+                $ele          =& $form->getElementAt($pos);
+                $ele['value'] = $usr;
+            }
+        }
+
+        // add select box
+        $element = form_makeListboxField('dom', $domains, $dom, $this->getLang('domain'), '', 'block');
+        $pos     = $form->findElementByAttribute('name', 'p');
+        $form->insertElement($pos + 1, $element);
+    }
+
+}
+
+// vim:ts=4:sw=4:et:
\ No newline at end of file
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index e1d758fb8..db9b179a6 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -511,6 +511,31 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         return $opts;
     }
 
+    /**
+     * Returns a list of configured domains
+     *
+     * The default domain has an empty string as key
+     *
+     * @return array associative array(key => domain)
+     */
+    public function _getConfiguredDomains() {
+        $domains = array();
+        if(empty($this->conf['account_suffix'])) return $domains; // not configured yet
+
+        // add default domain, using the name from account suffix
+        $domains[''] = ltrim($this->conf['account_suffix'], '@');
+
+        // find additional domains
+        foreach($this->conf as $key => $val) {
+            if(is_array($val) && isset($val['account_suffix'])) {
+                $domains[$key] = ltrim($val['account_suffix'], '@');
+            }
+        }
+        ksort($domains);
+
+        return $domains;
+    }
+
     /**
      * Check provided user and userinfo for matching patterns
      *
diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt
index 3af1ddfbe..8774fcf3c 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   2013-04-25
+date   2014-02-14
 name   Active Directory Auth Plugin
 desc   Provides user authentication against a Microsoft Active Directory
 url    http://www.dokuwiki.org/plugin:authad
-- 
cgit v1.2.3


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


From dfe934f96f476bdcf60d82feceb4d2a78df28ca0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 16 Feb 2014 20:52:10 +0100
Subject: Switched file icons against generated ones, added 32x32 versions

---
 lib/exe/css.php                     |   6 +++---
 lib/images/fileicons/16x16/7z.png   | Bin 0 -> 415 bytes
 lib/images/fileicons/16x16/bz2.png  | Bin 0 -> 419 bytes
 lib/images/fileicons/16x16/conf.png | Bin 0 -> 402 bytes
 lib/images/fileicons/16x16/csv.png  | Bin 0 -> 409 bytes
 lib/images/fileicons/16x16/deb.png  | Bin 0 -> 421 bytes
 lib/images/fileicons/16x16/doc.png  | Bin 0 -> 410 bytes
 lib/images/fileicons/16x16/docx.png | Bin 0 -> 415 bytes
 lib/images/fileicons/16x16/file.png | Bin 0 -> 319 bytes
 lib/images/fileicons/16x16/gif.png  | Bin 0 -> 414 bytes
 lib/images/fileicons/16x16/gz.png   | Bin 0 -> 417 bytes
 lib/images/fileicons/16x16/htm.png  | Bin 0 -> 402 bytes
 lib/images/fileicons/16x16/html.png | Bin 0 -> 391 bytes
 lib/images/fileicons/16x16/ico.png  | Bin 0 -> 413 bytes
 lib/images/fileicons/16x16/jpeg.png | Bin 0 -> 424 bytes
 lib/images/fileicons/16x16/jpg.png  | Bin 0 -> 418 bytes
 lib/images/fileicons/16x16/mp3.png  | Bin 0 -> 415 bytes
 lib/images/fileicons/16x16/mp4.png  | Bin 0 -> 419 bytes
 lib/images/fileicons/16x16/odc.png  | Bin 0 -> 407 bytes
 lib/images/fileicons/16x16/odf.png  | Bin 0 -> 411 bytes
 lib/images/fileicons/16x16/odg.png  | Bin 0 -> 411 bytes
 lib/images/fileicons/16x16/odi.png  | Bin 0 -> 398 bytes
 lib/images/fileicons/16x16/odp.png  | Bin 0 -> 404 bytes
 lib/images/fileicons/16x16/ods.png  | Bin 0 -> 416 bytes
 lib/images/fileicons/16x16/odt.png  | Bin 0 -> 403 bytes
 lib/images/fileicons/16x16/ogg.png  | Bin 0 -> 408 bytes
 lib/images/fileicons/16x16/ogv.png  | Bin 0 -> 412 bytes
 lib/images/fileicons/16x16/pdf.png  | Bin 0 -> 419 bytes
 lib/images/fileicons/16x16/png.png  | Bin 0 -> 412 bytes
 lib/images/fileicons/16x16/ppt.png  | Bin 0 -> 412 bytes
 lib/images/fileicons/16x16/pptx.png | Bin 0 -> 414 bytes
 lib/images/fileicons/16x16/ps.png   | Bin 0 -> 416 bytes
 lib/images/fileicons/16x16/rar.png  | Bin 0 -> 418 bytes
 lib/images/fileicons/16x16/rpm.png  | Bin 0 -> 415 bytes
 lib/images/fileicons/16x16/rtf.png  | Bin 0 -> 418 bytes
 lib/images/fileicons/16x16/swf.png  | Bin 0 -> 416 bytes
 lib/images/fileicons/16x16/sxc.png  | Bin 0 -> 420 bytes
 lib/images/fileicons/16x16/sxd.png  | Bin 0 -> 424 bytes
 lib/images/fileicons/16x16/sxi.png  | Bin 0 -> 414 bytes
 lib/images/fileicons/16x16/sxw.png  | Bin 0 -> 417 bytes
 lib/images/fileicons/16x16/tar.png  | Bin 0 -> 417 bytes
 lib/images/fileicons/16x16/tgz.png  | Bin 0 -> 417 bytes
 lib/images/fileicons/16x16/txt.png  | Bin 0 -> 407 bytes
 lib/images/fileicons/16x16/wav.png  | Bin 0 -> 415 bytes
 lib/images/fileicons/16x16/webm.png | Bin 0 -> 412 bytes
 lib/images/fileicons/16x16/xls.png  | Bin 0 -> 415 bytes
 lib/images/fileicons/16x16/xlsx.png | Bin 0 -> 425 bytes
 lib/images/fileicons/16x16/xml.png  | Bin 0 -> 400 bytes
 lib/images/fileicons/16x16/zip.png  | Bin 0 -> 418 bytes
 lib/images/fileicons/32x32/7z.png   | Bin 0 -> 992 bytes
 lib/images/fileicons/32x32/bz2.png  | Bin 0 -> 1001 bytes
 lib/images/fileicons/32x32/conf.png | Bin 0 -> 832 bytes
 lib/images/fileicons/32x32/csv.png  | Bin 0 -> 819 bytes
 lib/images/fileicons/32x32/deb.png  | Bin 0 -> 991 bytes
 lib/images/fileicons/32x32/doc.png  | Bin 0 -> 1034 bytes
 lib/images/fileicons/32x32/docx.png | Bin 0 -> 1078 bytes
 lib/images/fileicons/32x32/file.png | Bin 0 -> 605 bytes
 lib/images/fileicons/32x32/gif.png  | Bin 0 -> 944 bytes
 lib/images/fileicons/32x32/gz.png   | Bin 0 -> 994 bytes
 lib/images/fileicons/32x32/htm.png  | Bin 0 -> 819 bytes
 lib/images/fileicons/32x32/html.png | Bin 0 -> 827 bytes
 lib/images/fileicons/32x32/ico.png  | Bin 0 -> 941 bytes
 lib/images/fileicons/32x32/jpeg.png | Bin 0 -> 966 bytes
 lib/images/fileicons/32x32/jpg.png  | Bin 0 -> 949 bytes
 lib/images/fileicons/32x32/mp3.png  | Bin 0 -> 947 bytes
 lib/images/fileicons/32x32/mp4.png  | Bin 0 -> 1197 bytes
 lib/images/fileicons/32x32/odc.png  | Bin 0 -> 1061 bytes
 lib/images/fileicons/32x32/odf.png  | Bin 0 -> 1059 bytes
 lib/images/fileicons/32x32/odg.png  | Bin 0 -> 1066 bytes
 lib/images/fileicons/32x32/odi.png  | Bin 0 -> 1058 bytes
 lib/images/fileicons/32x32/odp.png  | Bin 0 -> 1060 bytes
 lib/images/fileicons/32x32/ods.png  | Bin 0 -> 1063 bytes
 lib/images/fileicons/32x32/odt.png  | Bin 0 -> 1060 bytes
 lib/images/fileicons/32x32/ogg.png  | Bin 0 -> 950 bytes
 lib/images/fileicons/32x32/ogv.png  | Bin 0 -> 1187 bytes
 lib/images/fileicons/32x32/pdf.png  | Bin 0 -> 1072 bytes
 lib/images/fileicons/32x32/png.png  | Bin 0 -> 957 bytes
 lib/images/fileicons/32x32/ppt.png  | Bin 0 -> 871 bytes
 lib/images/fileicons/32x32/pptx.png | Bin 0 -> 924 bytes
 lib/images/fileicons/32x32/ps.png   | Bin 0 -> 595 bytes
 lib/images/fileicons/32x32/rar.png  | Bin 0 -> 1000 bytes
 lib/images/fileicons/32x32/rpm.png  | Bin 0 -> 1001 bytes
 lib/images/fileicons/32x32/rtf.png  | Bin 0 -> 1035 bytes
 lib/images/fileicons/32x32/swf.png  | Bin 0 -> 1268 bytes
 lib/images/fileicons/32x32/sxc.png  | Bin 0 -> 1078 bytes
 lib/images/fileicons/32x32/sxd.png  | Bin 0 -> 1079 bytes
 lib/images/fileicons/32x32/sxi.png  | Bin 0 -> 1067 bytes
 lib/images/fileicons/32x32/sxw.png  | Bin 0 -> 1086 bytes
 lib/images/fileicons/32x32/tar.png  | Bin 0 -> 987 bytes
 lib/images/fileicons/32x32/tgz.png  | Bin 0 -> 999 bytes
 lib/images/fileicons/32x32/txt.png  | Bin 0 -> 836 bytes
 lib/images/fileicons/32x32/wav.png  | Bin 0 -> 944 bytes
 lib/images/fileicons/32x32/webm.png | Bin 0 -> 1232 bytes
 lib/images/fileicons/32x32/xls.png  | Bin 0 -> 1137 bytes
 lib/images/fileicons/32x32/xlsx.png | Bin 0 -> 1182 bytes
 lib/images/fileicons/32x32/xml.png  | Bin 0 -> 818 bytes
 lib/images/fileicons/32x32/zip.png  | Bin 0 -> 987 bytes
 lib/images/fileicons/7z.png         | Bin 651 -> 0 bytes
 lib/images/fileicons/audio.png      | Bin 727 -> 0 bytes
 lib/images/fileicons/bz2.png        | Bin 641 -> 0 bytes
 lib/images/fileicons/c.png          | Bin 759 -> 0 bytes
 lib/images/fileicons/conf.png       | Bin 664 -> 0 bytes
 lib/images/fileicons/cpp.png        | Bin 822 -> 0 bytes
 lib/images/fileicons/cs.png         | Bin 771 -> 0 bytes
 lib/images/fileicons/css.png        | Bin 843 -> 0 bytes
 lib/images/fileicons/csv.png        | Bin 400 -> 0 bytes
 lib/images/fileicons/deb.png        | Bin 646 -> 0 bytes
 lib/images/fileicons/doc.png        | Bin 583 -> 0 bytes
 lib/images/fileicons/docx.png       | Bin 583 -> 0 bytes
 lib/images/fileicons/file.png       | Bin 581 -> 0 bytes
 lib/images/fileicons/generate.php   |  35 +++++++++++++++++++++++++++++++++++
 lib/images/fileicons/gif.png        | Bin 907 -> 0 bytes
 lib/images/fileicons/gz.png         | Bin 643 -> 0 bytes
 lib/images/fileicons/htm.png        | Bin 695 -> 0 bytes
 lib/images/fileicons/html.png       | Bin 695 -> 0 bytes
 lib/images/fileicons/ico.png        | Bin 907 -> 0 bytes
 lib/images/fileicons/index.php      |  23 +++++++++++++++++++++--
 lib/images/fileicons/java.png       | Bin 739 -> 0 bytes
 lib/images/fileicons/jpeg.png       | Bin 907 -> 0 bytes
 lib/images/fileicons/jpg.png        | Bin 907 -> 0 bytes
 lib/images/fileicons/js.png         | Bin 809 -> 0 bytes
 lib/images/fileicons/lua.png        | Bin 440 -> 0 bytes
 lib/images/fileicons/mp3.png        | Bin 831 -> 0 bytes
 lib/images/fileicons/mp4.png        | Bin 740 -> 0 bytes
 lib/images/fileicons/odc.png        | Bin 682 -> 0 bytes
 lib/images/fileicons/odf.png        | Bin 746 -> 0 bytes
 lib/images/fileicons/odg.png        | Bin 735 -> 0 bytes
 lib/images/fileicons/odi.png        | Bin 735 -> 0 bytes
 lib/images/fileicons/odp.png        | Bin 687 -> 0 bytes
 lib/images/fileicons/ods.png        | Bin 682 -> 0 bytes
 lib/images/fileicons/odt.png        | Bin 522 -> 0 bytes
 lib/images/fileicons/ogg.png        | Bin 807 -> 0 bytes
 lib/images/fileicons/ogv.png        | Bin 740 -> 0 bytes
 lib/images/fileicons/pdf.png        | Bin 592 -> 0 bytes
 lib/images/fileicons/php.png        | Bin 749 -> 0 bytes
 lib/images/fileicons/pl.png         | Bin 685 -> 0 bytes
 lib/images/fileicons/png.png        | Bin 907 -> 0 bytes
 lib/images/fileicons/ppt.png        | Bin 697 -> 0 bytes
 lib/images/fileicons/pptx.png       | Bin 697 -> 0 bytes
 lib/images/fileicons/ps.png         | Bin 470 -> 0 bytes
 lib/images/fileicons/py.png         | Bin 683 -> 0 bytes
 lib/images/fileicons/rar.png        | Bin 557 -> 0 bytes
 lib/images/fileicons/rb.png         | Bin 802 -> 0 bytes
 lib/images/fileicons/rpm.png        | Bin 555 -> 0 bytes
 lib/images/fileicons/rtf.png        | Bin 402 -> 0 bytes
 lib/images/fileicons/sql.png        | Bin 813 -> 0 bytes
 lib/images/fileicons/swf.png        | Bin 732 -> 0 bytes
 lib/images/fileicons/sxc.png        | Bin 682 -> 0 bytes
 lib/images/fileicons/sxd.png        | Bin 735 -> 0 bytes
 lib/images/fileicons/sxi.png        | Bin 687 -> 0 bytes
 lib/images/fileicons/sxw.png        | Bin 522 -> 0 bytes
 lib/images/fileicons/tar.png        | Bin 663 -> 0 bytes
 lib/images/fileicons/tgz.png        | Bin 643 -> 0 bytes
 lib/images/fileicons/txt.png        | Bin 466 -> 0 bytes
 lib/images/fileicons/wav.png        | Bin 820 -> 0 bytes
 lib/images/fileicons/webm.png       | Bin 740 -> 0 bytes
 lib/images/fileicons/xls.png        | Bin 670 -> 0 bytes
 lib/images/fileicons/xlsx.png       | Bin 670 -> 0 bytes
 lib/images/fileicons/xml.png        | Bin 409 -> 0 bytes
 lib/images/fileicons/zip.png        | Bin 800 -> 0 bytes
 160 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 lib/images/fileicons/16x16/7z.png
 create mode 100644 lib/images/fileicons/16x16/bz2.png
 create mode 100644 lib/images/fileicons/16x16/conf.png
 create mode 100644 lib/images/fileicons/16x16/csv.png
 create mode 100644 lib/images/fileicons/16x16/deb.png
 create mode 100644 lib/images/fileicons/16x16/doc.png
 create mode 100644 lib/images/fileicons/16x16/docx.png
 create mode 100644 lib/images/fileicons/16x16/file.png
 create mode 100644 lib/images/fileicons/16x16/gif.png
 create mode 100644 lib/images/fileicons/16x16/gz.png
 create mode 100644 lib/images/fileicons/16x16/htm.png
 create mode 100644 lib/images/fileicons/16x16/html.png
 create mode 100644 lib/images/fileicons/16x16/ico.png
 create mode 100644 lib/images/fileicons/16x16/jpeg.png
 create mode 100644 lib/images/fileicons/16x16/jpg.png
 create mode 100644 lib/images/fileicons/16x16/mp3.png
 create mode 100644 lib/images/fileicons/16x16/mp4.png
 create mode 100644 lib/images/fileicons/16x16/odc.png
 create mode 100644 lib/images/fileicons/16x16/odf.png
 create mode 100644 lib/images/fileicons/16x16/odg.png
 create mode 100644 lib/images/fileicons/16x16/odi.png
 create mode 100644 lib/images/fileicons/16x16/odp.png
 create mode 100644 lib/images/fileicons/16x16/ods.png
 create mode 100644 lib/images/fileicons/16x16/odt.png
 create mode 100644 lib/images/fileicons/16x16/ogg.png
 create mode 100644 lib/images/fileicons/16x16/ogv.png
 create mode 100644 lib/images/fileicons/16x16/pdf.png
 create mode 100644 lib/images/fileicons/16x16/png.png
 create mode 100644 lib/images/fileicons/16x16/ppt.png
 create mode 100644 lib/images/fileicons/16x16/pptx.png
 create mode 100644 lib/images/fileicons/16x16/ps.png
 create mode 100644 lib/images/fileicons/16x16/rar.png
 create mode 100644 lib/images/fileicons/16x16/rpm.png
 create mode 100644 lib/images/fileicons/16x16/rtf.png
 create mode 100644 lib/images/fileicons/16x16/swf.png
 create mode 100644 lib/images/fileicons/16x16/sxc.png
 create mode 100644 lib/images/fileicons/16x16/sxd.png
 create mode 100644 lib/images/fileicons/16x16/sxi.png
 create mode 100644 lib/images/fileicons/16x16/sxw.png
 create mode 100644 lib/images/fileicons/16x16/tar.png
 create mode 100644 lib/images/fileicons/16x16/tgz.png
 create mode 100644 lib/images/fileicons/16x16/txt.png
 create mode 100644 lib/images/fileicons/16x16/wav.png
 create mode 100644 lib/images/fileicons/16x16/webm.png
 create mode 100644 lib/images/fileicons/16x16/xls.png
 create mode 100644 lib/images/fileicons/16x16/xlsx.png
 create mode 100644 lib/images/fileicons/16x16/xml.png
 create mode 100644 lib/images/fileicons/16x16/zip.png
 create mode 100644 lib/images/fileicons/32x32/7z.png
 create mode 100644 lib/images/fileicons/32x32/bz2.png
 create mode 100644 lib/images/fileicons/32x32/conf.png
 create mode 100644 lib/images/fileicons/32x32/csv.png
 create mode 100644 lib/images/fileicons/32x32/deb.png
 create mode 100644 lib/images/fileicons/32x32/doc.png
 create mode 100644 lib/images/fileicons/32x32/docx.png
 create mode 100644 lib/images/fileicons/32x32/file.png
 create mode 100644 lib/images/fileicons/32x32/gif.png
 create mode 100644 lib/images/fileicons/32x32/gz.png
 create mode 100644 lib/images/fileicons/32x32/htm.png
 create mode 100644 lib/images/fileicons/32x32/html.png
 create mode 100644 lib/images/fileicons/32x32/ico.png
 create mode 100644 lib/images/fileicons/32x32/jpeg.png
 create mode 100644 lib/images/fileicons/32x32/jpg.png
 create mode 100644 lib/images/fileicons/32x32/mp3.png
 create mode 100644 lib/images/fileicons/32x32/mp4.png
 create mode 100644 lib/images/fileicons/32x32/odc.png
 create mode 100644 lib/images/fileicons/32x32/odf.png
 create mode 100644 lib/images/fileicons/32x32/odg.png
 create mode 100644 lib/images/fileicons/32x32/odi.png
 create mode 100644 lib/images/fileicons/32x32/odp.png
 create mode 100644 lib/images/fileicons/32x32/ods.png
 create mode 100644 lib/images/fileicons/32x32/odt.png
 create mode 100644 lib/images/fileicons/32x32/ogg.png
 create mode 100644 lib/images/fileicons/32x32/ogv.png
 create mode 100644 lib/images/fileicons/32x32/pdf.png
 create mode 100644 lib/images/fileicons/32x32/png.png
 create mode 100644 lib/images/fileicons/32x32/ppt.png
 create mode 100644 lib/images/fileicons/32x32/pptx.png
 create mode 100644 lib/images/fileicons/32x32/ps.png
 create mode 100644 lib/images/fileicons/32x32/rar.png
 create mode 100644 lib/images/fileicons/32x32/rpm.png
 create mode 100644 lib/images/fileicons/32x32/rtf.png
 create mode 100644 lib/images/fileicons/32x32/swf.png
 create mode 100644 lib/images/fileicons/32x32/sxc.png
 create mode 100644 lib/images/fileicons/32x32/sxd.png
 create mode 100644 lib/images/fileicons/32x32/sxi.png
 create mode 100644 lib/images/fileicons/32x32/sxw.png
 create mode 100644 lib/images/fileicons/32x32/tar.png
 create mode 100644 lib/images/fileicons/32x32/tgz.png
 create mode 100644 lib/images/fileicons/32x32/txt.png
 create mode 100644 lib/images/fileicons/32x32/wav.png
 create mode 100644 lib/images/fileicons/32x32/webm.png
 create mode 100644 lib/images/fileicons/32x32/xls.png
 create mode 100644 lib/images/fileicons/32x32/xlsx.png
 create mode 100644 lib/images/fileicons/32x32/xml.png
 create mode 100644 lib/images/fileicons/32x32/zip.png
 delete mode 100644 lib/images/fileicons/7z.png
 delete mode 100644 lib/images/fileicons/audio.png
 delete mode 100644 lib/images/fileicons/bz2.png
 delete mode 100644 lib/images/fileicons/c.png
 delete mode 100644 lib/images/fileicons/conf.png
 delete mode 100644 lib/images/fileicons/cpp.png
 delete mode 100644 lib/images/fileicons/cs.png
 delete mode 100644 lib/images/fileicons/css.png
 delete mode 100644 lib/images/fileicons/csv.png
 delete mode 100644 lib/images/fileicons/deb.png
 delete mode 100644 lib/images/fileicons/doc.png
 delete mode 100644 lib/images/fileicons/docx.png
 delete mode 100644 lib/images/fileicons/file.png
 create mode 100644 lib/images/fileicons/generate.php
 delete mode 100644 lib/images/fileicons/gif.png
 delete mode 100644 lib/images/fileicons/gz.png
 delete mode 100644 lib/images/fileicons/htm.png
 delete mode 100644 lib/images/fileicons/html.png
 delete mode 100644 lib/images/fileicons/ico.png
 delete mode 100644 lib/images/fileicons/java.png
 delete mode 100644 lib/images/fileicons/jpeg.png
 delete mode 100644 lib/images/fileicons/jpg.png
 delete mode 100644 lib/images/fileicons/js.png
 delete mode 100644 lib/images/fileicons/lua.png
 delete mode 100644 lib/images/fileicons/mp3.png
 delete mode 100644 lib/images/fileicons/mp4.png
 delete mode 100644 lib/images/fileicons/odc.png
 delete mode 100644 lib/images/fileicons/odf.png
 delete mode 100644 lib/images/fileicons/odg.png
 delete mode 100644 lib/images/fileicons/odi.png
 delete mode 100644 lib/images/fileicons/odp.png
 delete mode 100644 lib/images/fileicons/ods.png
 delete mode 100644 lib/images/fileicons/odt.png
 delete mode 100644 lib/images/fileicons/ogg.png
 delete mode 100644 lib/images/fileicons/ogv.png
 delete mode 100644 lib/images/fileicons/pdf.png
 delete mode 100644 lib/images/fileicons/php.png
 delete mode 100644 lib/images/fileicons/pl.png
 delete mode 100644 lib/images/fileicons/png.png
 delete mode 100644 lib/images/fileicons/ppt.png
 delete mode 100644 lib/images/fileicons/pptx.png
 delete mode 100644 lib/images/fileicons/ps.png
 delete mode 100644 lib/images/fileicons/py.png
 delete mode 100644 lib/images/fileicons/rar.png
 delete mode 100644 lib/images/fileicons/rb.png
 delete mode 100644 lib/images/fileicons/rpm.png
 delete mode 100644 lib/images/fileicons/rtf.png
 delete mode 100644 lib/images/fileicons/sql.png
 delete mode 100644 lib/images/fileicons/swf.png
 delete mode 100644 lib/images/fileicons/sxc.png
 delete mode 100644 lib/images/fileicons/sxd.png
 delete mode 100644 lib/images/fileicons/sxi.png
 delete mode 100644 lib/images/fileicons/sxw.png
 delete mode 100644 lib/images/fileicons/tar.png
 delete mode 100644 lib/images/fileicons/tgz.png
 delete mode 100644 lib/images/fileicons/txt.png
 delete mode 100644 lib/images/fileicons/wav.png
 delete mode 100644 lib/images/fileicons/webm.png
 delete mode 100644 lib/images/fileicons/xls.png
 delete mode 100644 lib/images/fileicons/xlsx.png
 delete mode 100644 lib/images/fileicons/xml.png
 delete mode 100644 lib/images/fileicons/zip.png

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index cab7384b2..128fd5389 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -369,7 +369,7 @@ function css_filetypes(){
 
     // default style
     echo '.mediafile {';
-    echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/file.png) 0px 1px no-repeat;';
+    echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/16x16/file.png) 0px 1px no-repeat;';
     echo ' padding-left: 18px;';
     echo ' padding-bottom: 1px;';
     echo '}';
@@ -377,7 +377,7 @@ function css_filetypes(){
     // additional styles when icon available
     // scan directory for all icons
     $exts = array();
-    if($dh = opendir(DOKU_INC.'lib/images/fileicons')){
+    if($dh = opendir(DOKU_INC.'lib/images/fileicons/16x16')){
         while(false !== ($file = readdir($dh))){
             if(preg_match('/([_\-a-z0-9]+(?:\.[_\-a-z0-9]+)*?)\.(png|gif)/i',$file,$match)){
                 $ext = strtolower($match[1]);
@@ -392,7 +392,7 @@ function css_filetypes(){
     foreach($exts as $ext=>$type){
         $class = preg_replace('/[^_\-a-z0-9]+/','_',$ext);
         echo ".mf_$class {";
-        echo '  background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.$type.')';
+        echo '  background-image: url('.DOKU_BASE.'lib/images/fileicons/16x16/'.$ext.$type.')';
         echo '}';
     }
 }
diff --git a/lib/images/fileicons/16x16/7z.png b/lib/images/fileicons/16x16/7z.png
new file mode 100644
index 000000000..037cd73a0
Binary files /dev/null and b/lib/images/fileicons/16x16/7z.png differ
diff --git a/lib/images/fileicons/16x16/bz2.png b/lib/images/fileicons/16x16/bz2.png
new file mode 100644
index 000000000..a4bcc70a1
Binary files /dev/null and b/lib/images/fileicons/16x16/bz2.png differ
diff --git a/lib/images/fileicons/16x16/conf.png b/lib/images/fileicons/16x16/conf.png
new file mode 100644
index 000000000..94ace02cf
Binary files /dev/null and b/lib/images/fileicons/16x16/conf.png differ
diff --git a/lib/images/fileicons/16x16/csv.png b/lib/images/fileicons/16x16/csv.png
new file mode 100644
index 000000000..af37ba577
Binary files /dev/null and b/lib/images/fileicons/16x16/csv.png differ
diff --git a/lib/images/fileicons/16x16/deb.png b/lib/images/fileicons/16x16/deb.png
new file mode 100644
index 000000000..9eb29019b
Binary files /dev/null and b/lib/images/fileicons/16x16/deb.png differ
diff --git a/lib/images/fileicons/16x16/doc.png b/lib/images/fileicons/16x16/doc.png
new file mode 100644
index 000000000..925494576
Binary files /dev/null and b/lib/images/fileicons/16x16/doc.png differ
diff --git a/lib/images/fileicons/16x16/docx.png b/lib/images/fileicons/16x16/docx.png
new file mode 100644
index 000000000..5bae13f9e
Binary files /dev/null and b/lib/images/fileicons/16x16/docx.png differ
diff --git a/lib/images/fileicons/16x16/file.png b/lib/images/fileicons/16x16/file.png
new file mode 100644
index 000000000..8f31d38ac
Binary files /dev/null and b/lib/images/fileicons/16x16/file.png differ
diff --git a/lib/images/fileicons/16x16/gif.png b/lib/images/fileicons/16x16/gif.png
new file mode 100644
index 000000000..d8eb57e54
Binary files /dev/null and b/lib/images/fileicons/16x16/gif.png differ
diff --git a/lib/images/fileicons/16x16/gz.png b/lib/images/fileicons/16x16/gz.png
new file mode 100644
index 000000000..0a0a4b94f
Binary files /dev/null and b/lib/images/fileicons/16x16/gz.png differ
diff --git a/lib/images/fileicons/16x16/htm.png b/lib/images/fileicons/16x16/htm.png
new file mode 100644
index 000000000..8312c33a8
Binary files /dev/null and b/lib/images/fileicons/16x16/htm.png differ
diff --git a/lib/images/fileicons/16x16/html.png b/lib/images/fileicons/16x16/html.png
new file mode 100644
index 000000000..7a7fcc0fa
Binary files /dev/null and b/lib/images/fileicons/16x16/html.png differ
diff --git a/lib/images/fileicons/16x16/ico.png b/lib/images/fileicons/16x16/ico.png
new file mode 100644
index 000000000..9d4259c1b
Binary files /dev/null and b/lib/images/fileicons/16x16/ico.png differ
diff --git a/lib/images/fileicons/16x16/jpeg.png b/lib/images/fileicons/16x16/jpeg.png
new file mode 100644
index 000000000..3a7d8a7f9
Binary files /dev/null and b/lib/images/fileicons/16x16/jpeg.png differ
diff --git a/lib/images/fileicons/16x16/jpg.png b/lib/images/fileicons/16x16/jpg.png
new file mode 100644
index 000000000..7152ebdb6
Binary files /dev/null and b/lib/images/fileicons/16x16/jpg.png differ
diff --git a/lib/images/fileicons/16x16/mp3.png b/lib/images/fileicons/16x16/mp3.png
new file mode 100644
index 000000000..7c6d37184
Binary files /dev/null and b/lib/images/fileicons/16x16/mp3.png differ
diff --git a/lib/images/fileicons/16x16/mp4.png b/lib/images/fileicons/16x16/mp4.png
new file mode 100644
index 000000000..ee5b91150
Binary files /dev/null and b/lib/images/fileicons/16x16/mp4.png differ
diff --git a/lib/images/fileicons/16x16/odc.png b/lib/images/fileicons/16x16/odc.png
new file mode 100644
index 000000000..331140552
Binary files /dev/null and b/lib/images/fileicons/16x16/odc.png differ
diff --git a/lib/images/fileicons/16x16/odf.png b/lib/images/fileicons/16x16/odf.png
new file mode 100644
index 000000000..eccae9e20
Binary files /dev/null and b/lib/images/fileicons/16x16/odf.png differ
diff --git a/lib/images/fileicons/16x16/odg.png b/lib/images/fileicons/16x16/odg.png
new file mode 100644
index 000000000..5224425e6
Binary files /dev/null and b/lib/images/fileicons/16x16/odg.png differ
diff --git a/lib/images/fileicons/16x16/odi.png b/lib/images/fileicons/16x16/odi.png
new file mode 100644
index 000000000..b57fd974d
Binary files /dev/null and b/lib/images/fileicons/16x16/odi.png differ
diff --git a/lib/images/fileicons/16x16/odp.png b/lib/images/fileicons/16x16/odp.png
new file mode 100644
index 000000000..81d1023c0
Binary files /dev/null and b/lib/images/fileicons/16x16/odp.png differ
diff --git a/lib/images/fileicons/16x16/ods.png b/lib/images/fileicons/16x16/ods.png
new file mode 100644
index 000000000..77e6d5366
Binary files /dev/null and b/lib/images/fileicons/16x16/ods.png differ
diff --git a/lib/images/fileicons/16x16/odt.png b/lib/images/fileicons/16x16/odt.png
new file mode 100644
index 000000000..8490eec74
Binary files /dev/null and b/lib/images/fileicons/16x16/odt.png differ
diff --git a/lib/images/fileicons/16x16/ogg.png b/lib/images/fileicons/16x16/ogg.png
new file mode 100644
index 000000000..38f615c99
Binary files /dev/null and b/lib/images/fileicons/16x16/ogg.png differ
diff --git a/lib/images/fileicons/16x16/ogv.png b/lib/images/fileicons/16x16/ogv.png
new file mode 100644
index 000000000..a937dfc4c
Binary files /dev/null and b/lib/images/fileicons/16x16/ogv.png differ
diff --git a/lib/images/fileicons/16x16/pdf.png b/lib/images/fileicons/16x16/pdf.png
new file mode 100644
index 000000000..a3a30e475
Binary files /dev/null and b/lib/images/fileicons/16x16/pdf.png differ
diff --git a/lib/images/fileicons/16x16/png.png b/lib/images/fileicons/16x16/png.png
new file mode 100644
index 000000000..00ce3e400
Binary files /dev/null and b/lib/images/fileicons/16x16/png.png differ
diff --git a/lib/images/fileicons/16x16/ppt.png b/lib/images/fileicons/16x16/ppt.png
new file mode 100644
index 000000000..3355c2712
Binary files /dev/null and b/lib/images/fileicons/16x16/ppt.png differ
diff --git a/lib/images/fileicons/16x16/pptx.png b/lib/images/fileicons/16x16/pptx.png
new file mode 100644
index 000000000..269cdb8fc
Binary files /dev/null and b/lib/images/fileicons/16x16/pptx.png differ
diff --git a/lib/images/fileicons/16x16/ps.png b/lib/images/fileicons/16x16/ps.png
new file mode 100644
index 000000000..089caeb7a
Binary files /dev/null and b/lib/images/fileicons/16x16/ps.png differ
diff --git a/lib/images/fileicons/16x16/rar.png b/lib/images/fileicons/16x16/rar.png
new file mode 100644
index 000000000..f15d4ce5b
Binary files /dev/null and b/lib/images/fileicons/16x16/rar.png differ
diff --git a/lib/images/fileicons/16x16/rpm.png b/lib/images/fileicons/16x16/rpm.png
new file mode 100644
index 000000000..831424ff5
Binary files /dev/null and b/lib/images/fileicons/16x16/rpm.png differ
diff --git a/lib/images/fileicons/16x16/rtf.png b/lib/images/fileicons/16x16/rtf.png
new file mode 100644
index 000000000..bbc425ca3
Binary files /dev/null and b/lib/images/fileicons/16x16/rtf.png differ
diff --git a/lib/images/fileicons/16x16/swf.png b/lib/images/fileicons/16x16/swf.png
new file mode 100644
index 000000000..b45a72cc9
Binary files /dev/null and b/lib/images/fileicons/16x16/swf.png differ
diff --git a/lib/images/fileicons/16x16/sxc.png b/lib/images/fileicons/16x16/sxc.png
new file mode 100644
index 000000000..c96cf303f
Binary files /dev/null and b/lib/images/fileicons/16x16/sxc.png differ
diff --git a/lib/images/fileicons/16x16/sxd.png b/lib/images/fileicons/16x16/sxd.png
new file mode 100644
index 000000000..124b928e1
Binary files /dev/null and b/lib/images/fileicons/16x16/sxd.png differ
diff --git a/lib/images/fileicons/16x16/sxi.png b/lib/images/fileicons/16x16/sxi.png
new file mode 100644
index 000000000..8a5e23033
Binary files /dev/null and b/lib/images/fileicons/16x16/sxi.png differ
diff --git a/lib/images/fileicons/16x16/sxw.png b/lib/images/fileicons/16x16/sxw.png
new file mode 100644
index 000000000..9a903791c
Binary files /dev/null and b/lib/images/fileicons/16x16/sxw.png differ
diff --git a/lib/images/fileicons/16x16/tar.png b/lib/images/fileicons/16x16/tar.png
new file mode 100644
index 000000000..e57029adc
Binary files /dev/null and b/lib/images/fileicons/16x16/tar.png differ
diff --git a/lib/images/fileicons/16x16/tgz.png b/lib/images/fileicons/16x16/tgz.png
new file mode 100644
index 000000000..25ef9e15a
Binary files /dev/null and b/lib/images/fileicons/16x16/tgz.png differ
diff --git a/lib/images/fileicons/16x16/txt.png b/lib/images/fileicons/16x16/txt.png
new file mode 100644
index 000000000..4fd921655
Binary files /dev/null and b/lib/images/fileicons/16x16/txt.png differ
diff --git a/lib/images/fileicons/16x16/wav.png b/lib/images/fileicons/16x16/wav.png
new file mode 100644
index 000000000..c8880c62e
Binary files /dev/null and b/lib/images/fileicons/16x16/wav.png differ
diff --git a/lib/images/fileicons/16x16/webm.png b/lib/images/fileicons/16x16/webm.png
new file mode 100644
index 000000000..55db61914
Binary files /dev/null and b/lib/images/fileicons/16x16/webm.png differ
diff --git a/lib/images/fileicons/16x16/xls.png b/lib/images/fileicons/16x16/xls.png
new file mode 100644
index 000000000..5ac56f20d
Binary files /dev/null and b/lib/images/fileicons/16x16/xls.png differ
diff --git a/lib/images/fileicons/16x16/xlsx.png b/lib/images/fileicons/16x16/xlsx.png
new file mode 100644
index 000000000..89c84c522
Binary files /dev/null and b/lib/images/fileicons/16x16/xlsx.png differ
diff --git a/lib/images/fileicons/16x16/xml.png b/lib/images/fileicons/16x16/xml.png
new file mode 100644
index 000000000..fb960477e
Binary files /dev/null and b/lib/images/fileicons/16x16/xml.png differ
diff --git a/lib/images/fileicons/16x16/zip.png b/lib/images/fileicons/16x16/zip.png
new file mode 100644
index 000000000..4a36a35ff
Binary files /dev/null and b/lib/images/fileicons/16x16/zip.png differ
diff --git a/lib/images/fileicons/32x32/7z.png b/lib/images/fileicons/32x32/7z.png
new file mode 100644
index 000000000..9ba7da94a
Binary files /dev/null and b/lib/images/fileicons/32x32/7z.png differ
diff --git a/lib/images/fileicons/32x32/bz2.png b/lib/images/fileicons/32x32/bz2.png
new file mode 100644
index 000000000..7be9b7c06
Binary files /dev/null and b/lib/images/fileicons/32x32/bz2.png differ
diff --git a/lib/images/fileicons/32x32/conf.png b/lib/images/fileicons/32x32/conf.png
new file mode 100644
index 000000000..91a8a10de
Binary files /dev/null and b/lib/images/fileicons/32x32/conf.png differ
diff --git a/lib/images/fileicons/32x32/csv.png b/lib/images/fileicons/32x32/csv.png
new file mode 100644
index 000000000..3ee42f047
Binary files /dev/null and b/lib/images/fileicons/32x32/csv.png differ
diff --git a/lib/images/fileicons/32x32/deb.png b/lib/images/fileicons/32x32/deb.png
new file mode 100644
index 000000000..8d625ccf2
Binary files /dev/null and b/lib/images/fileicons/32x32/deb.png differ
diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png
new file mode 100644
index 000000000..8369c1f73
Binary files /dev/null and b/lib/images/fileicons/32x32/doc.png differ
diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png
new file mode 100644
index 000000000..ce5dfb3d3
Binary files /dev/null and b/lib/images/fileicons/32x32/docx.png differ
diff --git a/lib/images/fileicons/32x32/file.png b/lib/images/fileicons/32x32/file.png
new file mode 100644
index 000000000..52318f6e2
Binary files /dev/null and b/lib/images/fileicons/32x32/file.png differ
diff --git a/lib/images/fileicons/32x32/gif.png b/lib/images/fileicons/32x32/gif.png
new file mode 100644
index 000000000..7e5608b75
Binary files /dev/null and b/lib/images/fileicons/32x32/gif.png differ
diff --git a/lib/images/fileicons/32x32/gz.png b/lib/images/fileicons/32x32/gz.png
new file mode 100644
index 000000000..573ce7afd
Binary files /dev/null and b/lib/images/fileicons/32x32/gz.png differ
diff --git a/lib/images/fileicons/32x32/htm.png b/lib/images/fileicons/32x32/htm.png
new file mode 100644
index 000000000..132963be5
Binary files /dev/null and b/lib/images/fileicons/32x32/htm.png differ
diff --git a/lib/images/fileicons/32x32/html.png b/lib/images/fileicons/32x32/html.png
new file mode 100644
index 000000000..fb15689c0
Binary files /dev/null and b/lib/images/fileicons/32x32/html.png differ
diff --git a/lib/images/fileicons/32x32/ico.png b/lib/images/fileicons/32x32/ico.png
new file mode 100644
index 000000000..0fe7053b0
Binary files /dev/null and b/lib/images/fileicons/32x32/ico.png differ
diff --git a/lib/images/fileicons/32x32/jpeg.png b/lib/images/fileicons/32x32/jpeg.png
new file mode 100644
index 000000000..b6707a603
Binary files /dev/null and b/lib/images/fileicons/32x32/jpeg.png differ
diff --git a/lib/images/fileicons/32x32/jpg.png b/lib/images/fileicons/32x32/jpg.png
new file mode 100644
index 000000000..1c8b706e8
Binary files /dev/null and b/lib/images/fileicons/32x32/jpg.png differ
diff --git a/lib/images/fileicons/32x32/mp3.png b/lib/images/fileicons/32x32/mp3.png
new file mode 100644
index 000000000..1acd83276
Binary files /dev/null and b/lib/images/fileicons/32x32/mp3.png differ
diff --git a/lib/images/fileicons/32x32/mp4.png b/lib/images/fileicons/32x32/mp4.png
new file mode 100644
index 000000000..03db6f450
Binary files /dev/null and b/lib/images/fileicons/32x32/mp4.png differ
diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png
new file mode 100644
index 000000000..9a34f2129
Binary files /dev/null and b/lib/images/fileicons/32x32/odc.png differ
diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png
new file mode 100644
index 000000000..e3b4333ad
Binary files /dev/null and b/lib/images/fileicons/32x32/odf.png differ
diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png
new file mode 100644
index 000000000..c3b192b2d
Binary files /dev/null and b/lib/images/fileicons/32x32/odg.png differ
diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png
new file mode 100644
index 000000000..6baa69407
Binary files /dev/null and b/lib/images/fileicons/32x32/odi.png differ
diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png
new file mode 100644
index 000000000..8e09dd6e4
Binary files /dev/null and b/lib/images/fileicons/32x32/odp.png differ
diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png
new file mode 100644
index 000000000..90892f3d4
Binary files /dev/null and b/lib/images/fileicons/32x32/ods.png differ
diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png
new file mode 100644
index 000000000..22ec1fffb
Binary files /dev/null and b/lib/images/fileicons/32x32/odt.png differ
diff --git a/lib/images/fileicons/32x32/ogg.png b/lib/images/fileicons/32x32/ogg.png
new file mode 100644
index 000000000..f988fabc3
Binary files /dev/null and b/lib/images/fileicons/32x32/ogg.png differ
diff --git a/lib/images/fileicons/32x32/ogv.png b/lib/images/fileicons/32x32/ogv.png
new file mode 100644
index 000000000..1083455fb
Binary files /dev/null and b/lib/images/fileicons/32x32/ogv.png differ
diff --git a/lib/images/fileicons/32x32/pdf.png b/lib/images/fileicons/32x32/pdf.png
new file mode 100644
index 000000000..8e8b45472
Binary files /dev/null and b/lib/images/fileicons/32x32/pdf.png differ
diff --git a/lib/images/fileicons/32x32/png.png b/lib/images/fileicons/32x32/png.png
new file mode 100644
index 000000000..deb47e44e
Binary files /dev/null and b/lib/images/fileicons/32x32/png.png differ
diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png
new file mode 100644
index 000000000..84b523a23
Binary files /dev/null and b/lib/images/fileicons/32x32/ppt.png differ
diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png
new file mode 100644
index 000000000..1446cf4de
Binary files /dev/null and b/lib/images/fileicons/32x32/pptx.png differ
diff --git a/lib/images/fileicons/32x32/ps.png b/lib/images/fileicons/32x32/ps.png
new file mode 100644
index 000000000..d540743f9
Binary files /dev/null and b/lib/images/fileicons/32x32/ps.png differ
diff --git a/lib/images/fileicons/32x32/rar.png b/lib/images/fileicons/32x32/rar.png
new file mode 100644
index 000000000..4af2a4d46
Binary files /dev/null and b/lib/images/fileicons/32x32/rar.png differ
diff --git a/lib/images/fileicons/32x32/rpm.png b/lib/images/fileicons/32x32/rpm.png
new file mode 100644
index 000000000..2ec5f4e1b
Binary files /dev/null and b/lib/images/fileicons/32x32/rpm.png differ
diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png
new file mode 100644
index 000000000..fcbcd001a
Binary files /dev/null and b/lib/images/fileicons/32x32/rtf.png differ
diff --git a/lib/images/fileicons/32x32/swf.png b/lib/images/fileicons/32x32/swf.png
new file mode 100644
index 000000000..b43642905
Binary files /dev/null and b/lib/images/fileicons/32x32/swf.png differ
diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png
new file mode 100644
index 000000000..50676be6a
Binary files /dev/null and b/lib/images/fileicons/32x32/sxc.png differ
diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png
new file mode 100644
index 000000000..f715a8ff0
Binary files /dev/null and b/lib/images/fileicons/32x32/sxd.png differ
diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png
new file mode 100644
index 000000000..3d9f31d3b
Binary files /dev/null and b/lib/images/fileicons/32x32/sxi.png differ
diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png
new file mode 100644
index 000000000..bd8ab1436
Binary files /dev/null and b/lib/images/fileicons/32x32/sxw.png differ
diff --git a/lib/images/fileicons/32x32/tar.png b/lib/images/fileicons/32x32/tar.png
new file mode 100644
index 000000000..4a420a22a
Binary files /dev/null and b/lib/images/fileicons/32x32/tar.png differ
diff --git a/lib/images/fileicons/32x32/tgz.png b/lib/images/fileicons/32x32/tgz.png
new file mode 100644
index 000000000..8cf6af41a
Binary files /dev/null and b/lib/images/fileicons/32x32/tgz.png differ
diff --git a/lib/images/fileicons/32x32/txt.png b/lib/images/fileicons/32x32/txt.png
new file mode 100644
index 000000000..d9ff7d595
Binary files /dev/null and b/lib/images/fileicons/32x32/txt.png differ
diff --git a/lib/images/fileicons/32x32/wav.png b/lib/images/fileicons/32x32/wav.png
new file mode 100644
index 000000000..c39a8445f
Binary files /dev/null and b/lib/images/fileicons/32x32/wav.png differ
diff --git a/lib/images/fileicons/32x32/webm.png b/lib/images/fileicons/32x32/webm.png
new file mode 100644
index 000000000..99b9c87b2
Binary files /dev/null and b/lib/images/fileicons/32x32/webm.png differ
diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png
new file mode 100644
index 000000000..7447d9cdf
Binary files /dev/null and b/lib/images/fileicons/32x32/xls.png differ
diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png
new file mode 100644
index 000000000..920217267
Binary files /dev/null and b/lib/images/fileicons/32x32/xlsx.png differ
diff --git a/lib/images/fileicons/32x32/xml.png b/lib/images/fileicons/32x32/xml.png
new file mode 100644
index 000000000..bae059156
Binary files /dev/null and b/lib/images/fileicons/32x32/xml.png differ
diff --git a/lib/images/fileicons/32x32/zip.png b/lib/images/fileicons/32x32/zip.png
new file mode 100644
index 000000000..f07d18e2c
Binary files /dev/null and b/lib/images/fileicons/32x32/zip.png differ
diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png
deleted file mode 100644
index 52f7d5d72..000000000
Binary files a/lib/images/fileicons/7z.png and /dev/null differ
diff --git a/lib/images/fileicons/audio.png b/lib/images/fileicons/audio.png
deleted file mode 100644
index 98883256d..000000000
Binary files a/lib/images/fileicons/audio.png and /dev/null differ
diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png
deleted file mode 100644
index 6ec2f98ef..000000000
Binary files a/lib/images/fileicons/bz2.png and /dev/null differ
diff --git a/lib/images/fileicons/c.png b/lib/images/fileicons/c.png
deleted file mode 100644
index 6f57337c7..000000000
Binary files a/lib/images/fileicons/c.png and /dev/null differ
diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png
deleted file mode 100644
index 20c20fa3d..000000000
Binary files a/lib/images/fileicons/conf.png and /dev/null differ
diff --git a/lib/images/fileicons/cpp.png b/lib/images/fileicons/cpp.png
deleted file mode 100644
index 6f2797da5..000000000
Binary files a/lib/images/fileicons/cpp.png and /dev/null differ
diff --git a/lib/images/fileicons/cs.png b/lib/images/fileicons/cs.png
deleted file mode 100644
index d3afa112c..000000000
Binary files a/lib/images/fileicons/cs.png and /dev/null differ
diff --git a/lib/images/fileicons/css.png b/lib/images/fileicons/css.png
deleted file mode 100644
index 89c1537fd..000000000
Binary files a/lib/images/fileicons/css.png and /dev/null differ
diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png
deleted file mode 100644
index b604453c4..000000000
Binary files a/lib/images/fileicons/csv.png and /dev/null differ
diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png
deleted file mode 100644
index 8fe57327a..000000000
Binary files a/lib/images/fileicons/deb.png and /dev/null differ
diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png
deleted file mode 100644
index 79d8ff1cd..000000000
Binary files a/lib/images/fileicons/doc.png and /dev/null differ
diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png
deleted file mode 100644
index 79d8ff1cd..000000000
Binary files a/lib/images/fileicons/docx.png and /dev/null differ
diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png
deleted file mode 100644
index 8158a8a21..000000000
Binary files a/lib/images/fileicons/file.png and /dev/null differ
diff --git a/lib/images/fileicons/generate.php b/lib/images/fileicons/generate.php
new file mode 100644
index 000000000..2dd25eb33
--- /dev/null
+++ b/lib/images/fileicons/generate.php
@@ -0,0 +1,35 @@
+<?php
+
+// this is not provided by DokuWiki and needs to checked out separately from
+// https://github.com/splitbrain/file-icon-generator
+require '/home/andi/projects/fileiconbuilder/FileIconBuilder.php';
+
+if('cli' != php_sapi_name()) die('This has to be run from command line');
+if(!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__).'/../../../').'/');
+define('NOSESSION', 1);
+require_once(DOKU_INC.'inc/init.php');
+
+
+/**
+ * Class DokuFileIconBuilder
+ *
+ * overwrite mime type loading with loading DokuWiki's mime type config instead
+ */
+class DokuFileIconBuilder extends FileIconBuilder {
+
+    protected function loadmimetypes(){
+        $this->mimetypes = getMimeTypes();
+        foreach(array_keys($this->mimetypes) as $ext) {
+            $this->mimetypes[$ext] = ltrim($this->mimetypes[$ext], '!');
+        }
+    }
+}
+
+
+echo "Important: you should enable the commented file types in mime.conf to make sure the icon are generated!\n";
+
+// generate all the icons
+$DFIB = new DokuFileIconBuilder();
+$DFIB->createAll(__DIR__);
+
+echo "generation done\n";
diff --git a/lib/images/fileicons/gif.png b/lib/images/fileicons/gif.png
deleted file mode 100644
index 1d9dd562a..000000000
Binary files a/lib/images/fileicons/gif.png and /dev/null differ
diff --git a/lib/images/fileicons/gz.png b/lib/images/fileicons/gz.png
deleted file mode 100644
index 48f19596c..000000000
Binary files a/lib/images/fileicons/gz.png and /dev/null differ
diff --git a/lib/images/fileicons/htm.png b/lib/images/fileicons/htm.png
deleted file mode 100644
index d45e4c19a..000000000
Binary files a/lib/images/fileicons/htm.png and /dev/null differ
diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png
deleted file mode 100644
index d45e4c19a..000000000
Binary files a/lib/images/fileicons/html.png and /dev/null differ
diff --git a/lib/images/fileicons/ico.png b/lib/images/fileicons/ico.png
deleted file mode 100644
index 1d9dd562a..000000000
Binary files a/lib/images/fileicons/ico.png and /dev/null differ
diff --git a/lib/images/fileicons/index.php b/lib/images/fileicons/index.php
index f90e7e6f0..28de26062 100644
--- a/lib/images/fileicons/index.php
+++ b/lib/images/fileicons/index.php
@@ -30,7 +30,7 @@
 
 <div class="white box">
 <?php
-foreach (glob('*.png') as $img) {
+foreach (glob('16x16/*.png') as $img) {
     echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
 }
 ?>
@@ -38,11 +38,30 @@ foreach (glob('*.png') as $img) {
 
 <div class="black box">
 <?php
-foreach (glob('*.png') as $img) {
+foreach (glob('16x16/*.png') as $img) {
     echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
 }
 ?>
 </div>
 
+<br style="clear: left" />
+
+<div class="white box">
+    <?php
+    foreach (glob('32x32/*.png') as $img) {
+        echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+    }
+    ?>
+</div>
+
+<div class="black box">
+    <?php
+    foreach (glob('32x32/*.png') as $img) {
+        echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+    }
+    ?>
+</div>
+
+
 </body>
 </html>
diff --git a/lib/images/fileicons/java.png b/lib/images/fileicons/java.png
deleted file mode 100644
index c5f2fd09f..000000000
Binary files a/lib/images/fileicons/java.png and /dev/null differ
diff --git a/lib/images/fileicons/jpeg.png b/lib/images/fileicons/jpeg.png
deleted file mode 100644
index 1d9dd562a..000000000
Binary files a/lib/images/fileicons/jpeg.png and /dev/null differ
diff --git a/lib/images/fileicons/jpg.png b/lib/images/fileicons/jpg.png
deleted file mode 100644
index 1d9dd562a..000000000
Binary files a/lib/images/fileicons/jpg.png and /dev/null differ
diff --git a/lib/images/fileicons/js.png b/lib/images/fileicons/js.png
deleted file mode 100644
index 0c314eb56..000000000
Binary files a/lib/images/fileicons/js.png and /dev/null differ
diff --git a/lib/images/fileicons/lua.png b/lib/images/fileicons/lua.png
deleted file mode 100644
index 994c6e8f0..000000000
Binary files a/lib/images/fileicons/lua.png and /dev/null differ
diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png
deleted file mode 100644
index 411dad080..000000000
Binary files a/lib/images/fileicons/mp3.png and /dev/null differ
diff --git a/lib/images/fileicons/mp4.png b/lib/images/fileicons/mp4.png
deleted file mode 100644
index b89fc5299..000000000
Binary files a/lib/images/fileicons/mp4.png and /dev/null differ
diff --git a/lib/images/fileicons/odc.png b/lib/images/fileicons/odc.png
deleted file mode 100644
index 4d6676c3a..000000000
Binary files a/lib/images/fileicons/odc.png and /dev/null differ
diff --git a/lib/images/fileicons/odf.png b/lib/images/fileicons/odf.png
deleted file mode 100644
index cb88d68e6..000000000
Binary files a/lib/images/fileicons/odf.png and /dev/null differ
diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png
deleted file mode 100644
index a07216f4a..000000000
Binary files a/lib/images/fileicons/odg.png and /dev/null differ
diff --git a/lib/images/fileicons/odi.png b/lib/images/fileicons/odi.png
deleted file mode 100644
index a07216f4a..000000000
Binary files a/lib/images/fileicons/odi.png and /dev/null differ
diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png
deleted file mode 100644
index 2f2574af6..000000000
Binary files a/lib/images/fileicons/odp.png and /dev/null differ
diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png
deleted file mode 100644
index 4d6676c3a..000000000
Binary files a/lib/images/fileicons/ods.png and /dev/null differ
diff --git a/lib/images/fileicons/odt.png b/lib/images/fileicons/odt.png
deleted file mode 100644
index f9c126efd..000000000
Binary files a/lib/images/fileicons/odt.png and /dev/null differ
diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png
deleted file mode 100644
index 0a21eae65..000000000
Binary files a/lib/images/fileicons/ogg.png and /dev/null differ
diff --git a/lib/images/fileicons/ogv.png b/lib/images/fileicons/ogv.png
deleted file mode 100644
index b89fc5299..000000000
Binary files a/lib/images/fileicons/ogv.png and /dev/null differ
diff --git a/lib/images/fileicons/pdf.png b/lib/images/fileicons/pdf.png
deleted file mode 100644
index 029dcffec..000000000
Binary files a/lib/images/fileicons/pdf.png and /dev/null differ
diff --git a/lib/images/fileicons/php.png b/lib/images/fileicons/php.png
deleted file mode 100644
index f81e405de..000000000
Binary files a/lib/images/fileicons/php.png and /dev/null differ
diff --git a/lib/images/fileicons/pl.png b/lib/images/fileicons/pl.png
deleted file mode 100644
index 92f3f9754..000000000
Binary files a/lib/images/fileicons/pl.png and /dev/null differ
diff --git a/lib/images/fileicons/png.png b/lib/images/fileicons/png.png
deleted file mode 100644
index 1d9dd562a..000000000
Binary files a/lib/images/fileicons/png.png and /dev/null differ
diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png
deleted file mode 100644
index b7afb2266..000000000
Binary files a/lib/images/fileicons/ppt.png and /dev/null differ
diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png
deleted file mode 100644
index b7afb2266..000000000
Binary files a/lib/images/fileicons/pptx.png and /dev/null differ
diff --git a/lib/images/fileicons/ps.png b/lib/images/fileicons/ps.png
deleted file mode 100644
index 40a80baad..000000000
Binary files a/lib/images/fileicons/ps.png and /dev/null differ
diff --git a/lib/images/fileicons/py.png b/lib/images/fileicons/py.png
deleted file mode 100644
index 15a727c54..000000000
Binary files a/lib/images/fileicons/py.png and /dev/null differ
diff --git a/lib/images/fileicons/rar.png b/lib/images/fileicons/rar.png
deleted file mode 100644
index c761a4f7f..000000000
Binary files a/lib/images/fileicons/rar.png and /dev/null differ
diff --git a/lib/images/fileicons/rb.png b/lib/images/fileicons/rb.png
deleted file mode 100644
index 408f708a1..000000000
Binary files a/lib/images/fileicons/rb.png and /dev/null differ
diff --git a/lib/images/fileicons/rpm.png b/lib/images/fileicons/rpm.png
deleted file mode 100644
index 5cf727de0..000000000
Binary files a/lib/images/fileicons/rpm.png and /dev/null differ
diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png
deleted file mode 100644
index 99fe3d8fd..000000000
Binary files a/lib/images/fileicons/rtf.png and /dev/null differ
diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png
deleted file mode 100644
index a7b0684c7..000000000
Binary files a/lib/images/fileicons/sql.png and /dev/null differ
diff --git a/lib/images/fileicons/swf.png b/lib/images/fileicons/swf.png
deleted file mode 100644
index ecc7309ad..000000000
Binary files a/lib/images/fileicons/swf.png and /dev/null differ
diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png
deleted file mode 100644
index 4d6676c3a..000000000
Binary files a/lib/images/fileicons/sxc.png and /dev/null differ
diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png
deleted file mode 100644
index a07216f4a..000000000
Binary files a/lib/images/fileicons/sxd.png and /dev/null differ
diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png
deleted file mode 100644
index 2f2574af6..000000000
Binary files a/lib/images/fileicons/sxi.png and /dev/null differ
diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png
deleted file mode 100644
index f9c126efd..000000000
Binary files a/lib/images/fileicons/sxw.png and /dev/null differ
diff --git a/lib/images/fileicons/tar.png b/lib/images/fileicons/tar.png
deleted file mode 100644
index a28c86f2d..000000000
Binary files a/lib/images/fileicons/tar.png and /dev/null differ
diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png
deleted file mode 100644
index 48f19596c..000000000
Binary files a/lib/images/fileicons/tgz.png and /dev/null differ
diff --git a/lib/images/fileicons/txt.png b/lib/images/fileicons/txt.png
deleted file mode 100644
index bb94949f6..000000000
Binary files a/lib/images/fileicons/txt.png and /dev/null differ
diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png
deleted file mode 100644
index c167f4fdb..000000000
Binary files a/lib/images/fileicons/wav.png and /dev/null differ
diff --git a/lib/images/fileicons/webm.png b/lib/images/fileicons/webm.png
deleted file mode 100644
index b89fc5299..000000000
Binary files a/lib/images/fileicons/webm.png and /dev/null differ
diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png
deleted file mode 100644
index 24911b802..000000000
Binary files a/lib/images/fileicons/xls.png and /dev/null differ
diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png
deleted file mode 100644
index 24911b802..000000000
Binary files a/lib/images/fileicons/xlsx.png and /dev/null differ
diff --git a/lib/images/fileicons/xml.png b/lib/images/fileicons/xml.png
deleted file mode 100644
index ae9831b34..000000000
Binary files a/lib/images/fileicons/xml.png and /dev/null differ
diff --git a/lib/images/fileicons/zip.png b/lib/images/fileicons/zip.png
deleted file mode 100644
index fb8850c9a..000000000
Binary files a/lib/images/fileicons/zip.png and /dev/null differ
-- 
cgit v1.2.3


From 56b0b744e40b19048e14cee4ff6caf69858d9fd6 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 18 Feb 2014 13:50:12 +0100
Subject: PHPDocs js.php

---
 lib/exe/js.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 04413b409..8f16f4a96 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -220,6 +220,12 @@ function js_pluginstrings() {
     return $pluginstrings;
 }
 
+/**
+ * Return an two-dimensional array with strings from the language file of current active template.
+ *
+ * - $lang['js'] must be an array.
+ * - Nothing is returned for template without an entry for $lang['js']
+ */
 function js_templatestrings() {
     global $conf;
     $templatestrings = array();
-- 
cgit v1.2.3


From fd3ec3c5b9b8af10dd89982ddbdf29ba7a13d700 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 18 Feb 2014 23:02:26 +0100
Subject: file icon updates

now we no longer limit generation to the extensions in mime types,
because file icons are used in downloadable code blocks, too.

All icons were regenerated with the latest update of the generator.
---
 lib/images/fileicons/16x16/asm.png  | Bin 0 -> 424 bytes
 lib/images/fileicons/16x16/bash.png | Bin 0 -> 435 bytes
 lib/images/fileicons/16x16/c.png    | Bin 0 -> 413 bytes
 lib/images/fileicons/16x16/cc.png   | Bin 0 -> 410 bytes
 lib/images/fileicons/16x16/cpp.png  | Bin 0 -> 429 bytes
 lib/images/fileicons/16x16/csh.png  | Bin 0 -> 430 bytes
 lib/images/fileicons/16x16/css.png  | Bin 0 -> 430 bytes
 lib/images/fileicons/16x16/diff.png | Bin 0 -> 428 bytes
 lib/images/fileicons/16x16/doc.png  | Bin 410 -> 405 bytes
 lib/images/fileicons/16x16/docx.png | Bin 415 -> 402 bytes
 lib/images/fileicons/16x16/gif.png  | Bin 414 -> 407 bytes
 lib/images/fileicons/16x16/h.png    | Bin 0 -> 411 bytes
 lib/images/fileicons/16x16/hpp.png  | Bin 0 -> 417 bytes
 lib/images/fileicons/16x16/htm.png  | Bin 402 -> 422 bytes
 lib/images/fileicons/16x16/html.png | Bin 391 -> 422 bytes
 lib/images/fileicons/16x16/ico.png  | Bin 413 -> 405 bytes
 lib/images/fileicons/16x16/java.png | Bin 0 -> 420 bytes
 lib/images/fileicons/16x16/jpeg.png | Bin 424 -> 412 bytes
 lib/images/fileicons/16x16/jpg.png  | Bin 418 -> 412 bytes
 lib/images/fileicons/16x16/js.png   | Bin 0 -> 420 bytes
 lib/images/fileicons/16x16/json.png | Bin 0 -> 434 bytes
 lib/images/fileicons/16x16/odc.png  | Bin 407 -> 403 bytes
 lib/images/fileicons/16x16/odf.png  | Bin 411 -> 408 bytes
 lib/images/fileicons/16x16/odg.png  | Bin 411 -> 405 bytes
 lib/images/fileicons/16x16/odi.png  | Bin 398 -> 398 bytes
 lib/images/fileicons/16x16/odp.png  | Bin 404 -> 406 bytes
 lib/images/fileicons/16x16/ods.png  | Bin 416 -> 409 bytes
 lib/images/fileicons/16x16/odt.png  | Bin 403 -> 406 bytes
 lib/images/fileicons/16x16/pas.png  | Bin 0 -> 435 bytes
 lib/images/fileicons/16x16/pdf.png  | Bin 419 -> 425 bytes
 lib/images/fileicons/16x16/pl.png   | Bin 0 -> 417 bytes
 lib/images/fileicons/16x16/png.png  | Bin 412 -> 417 bytes
 lib/images/fileicons/16x16/ppt.png  | Bin 412 -> 415 bytes
 lib/images/fileicons/16x16/pptx.png | Bin 414 -> 407 bytes
 lib/images/fileicons/16x16/ps.png   | Bin 416 -> 424 bytes
 lib/images/fileicons/16x16/py.png   | Bin 0 -> 426 bytes
 lib/images/fileicons/16x16/rtf.png  | Bin 418 -> 422 bytes
 lib/images/fileicons/16x16/sh.png   | Bin 0 -> 422 bytes
 lib/images/fileicons/16x16/sxc.png  | Bin 420 -> 416 bytes
 lib/images/fileicons/16x16/sxd.png  | Bin 424 -> 420 bytes
 lib/images/fileicons/16x16/sxi.png  | Bin 414 -> 408 bytes
 lib/images/fileicons/16x16/sxw.png  | Bin 417 -> 410 bytes
 lib/images/fileicons/16x16/xls.png  | Bin 415 -> 408 bytes
 lib/images/fileicons/16x16/xlsx.png | Bin 425 -> 419 bytes
 lib/images/fileicons/16x16/xml.png  | Bin 400 -> 400 bytes
 lib/images/fileicons/32x32/asm.png  | Bin 0 -> 988 bytes
 lib/images/fileicons/32x32/bash.png | Bin 0 -> 993 bytes
 lib/images/fileicons/32x32/c.png    | Bin 0 -> 945 bytes
 lib/images/fileicons/32x32/cc.png   | Bin 0 -> 953 bytes
 lib/images/fileicons/32x32/cpp.png  | Bin 0 -> 958 bytes
 lib/images/fileicons/32x32/csh.png  | Bin 0 -> 981 bytes
 lib/images/fileicons/32x32/css.png  | Bin 0 -> 967 bytes
 lib/images/fileicons/32x32/diff.png | Bin 0 -> 975 bytes
 lib/images/fileicons/32x32/doc.png  | Bin 1034 -> 1032 bytes
 lib/images/fileicons/32x32/docx.png | Bin 1078 -> 1062 bytes
 lib/images/fileicons/32x32/gif.png  | Bin 944 -> 944 bytes
 lib/images/fileicons/32x32/h.png    | Bin 0 -> 939 bytes
 lib/images/fileicons/32x32/hpp.png  | Bin 0 -> 975 bytes
 lib/images/fileicons/32x32/htm.png  | Bin 819 -> 982 bytes
 lib/images/fileicons/32x32/html.png | Bin 827 -> 982 bytes
 lib/images/fileicons/32x32/ico.png  | Bin 941 -> 941 bytes
 lib/images/fileicons/32x32/java.png | Bin 0 -> 992 bytes
 lib/images/fileicons/32x32/jpeg.png | Bin 966 -> 948 bytes
 lib/images/fileicons/32x32/jpg.png  | Bin 949 -> 948 bytes
 lib/images/fileicons/32x32/js.png   | Bin 0 -> 959 bytes
 lib/images/fileicons/32x32/json.png | Bin 0 -> 1001 bytes
 lib/images/fileicons/32x32/odc.png  | Bin 1061 -> 1058 bytes
 lib/images/fileicons/32x32/odf.png  | Bin 1059 -> 1056 bytes
 lib/images/fileicons/32x32/odg.png  | Bin 1066 -> 1065 bytes
 lib/images/fileicons/32x32/odi.png  | Bin 1058 -> 1056 bytes
 lib/images/fileicons/32x32/odp.png  | Bin 1060 -> 1060 bytes
 lib/images/fileicons/32x32/ods.png  | Bin 1063 -> 1063 bytes
 lib/images/fileicons/32x32/odt.png  | Bin 1060 -> 1060 bytes
 lib/images/fileicons/32x32/pas.png  | Bin 0 -> 975 bytes
 lib/images/fileicons/32x32/pdf.png  | Bin 1072 -> 1076 bytes
 lib/images/fileicons/32x32/pl.png   | Bin 0 -> 950 bytes
 lib/images/fileicons/32x32/png.png  | Bin 957 -> 957 bytes
 lib/images/fileicons/32x32/ppt.png  | Bin 871 -> 872 bytes
 lib/images/fileicons/32x32/pptx.png | Bin 924 -> 917 bytes
 lib/images/fileicons/32x32/ps.png   | Bin 595 -> 1086 bytes
 lib/images/fileicons/32x32/py.png   | Bin 0 -> 965 bytes
 lib/images/fileicons/32x32/rtf.png  | Bin 1035 -> 861 bytes
 lib/images/fileicons/32x32/sh.png   | Bin 0 -> 961 bytes
 lib/images/fileicons/32x32/sxc.png  | Bin 1078 -> 1074 bytes
 lib/images/fileicons/32x32/sxd.png  | Bin 1079 -> 1078 bytes
 lib/images/fileicons/32x32/sxi.png  | Bin 1067 -> 1066 bytes
 lib/images/fileicons/32x32/sxw.png  | Bin 1086 -> 1076 bytes
 lib/images/fileicons/32x32/xls.png  | Bin 1137 -> 1137 bytes
 lib/images/fileicons/32x32/xlsx.png | Bin 1182 -> 1174 bytes
 lib/images/fileicons/32x32/xml.png  | Bin 818 -> 615 bytes
 lib/images/fileicons/generate.php   |  47 +++++++++++++++++++++---------------
 91 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 lib/images/fileicons/16x16/asm.png
 create mode 100644 lib/images/fileicons/16x16/bash.png
 create mode 100644 lib/images/fileicons/16x16/c.png
 create mode 100644 lib/images/fileicons/16x16/cc.png
 create mode 100644 lib/images/fileicons/16x16/cpp.png
 create mode 100644 lib/images/fileicons/16x16/csh.png
 create mode 100644 lib/images/fileicons/16x16/css.png
 create mode 100644 lib/images/fileicons/16x16/diff.png
 create mode 100644 lib/images/fileicons/16x16/h.png
 create mode 100644 lib/images/fileicons/16x16/hpp.png
 create mode 100644 lib/images/fileicons/16x16/java.png
 create mode 100644 lib/images/fileicons/16x16/js.png
 create mode 100644 lib/images/fileicons/16x16/json.png
 create mode 100644 lib/images/fileicons/16x16/pas.png
 create mode 100644 lib/images/fileicons/16x16/pl.png
 create mode 100644 lib/images/fileicons/16x16/py.png
 create mode 100644 lib/images/fileicons/16x16/sh.png
 create mode 100644 lib/images/fileicons/32x32/asm.png
 create mode 100644 lib/images/fileicons/32x32/bash.png
 create mode 100644 lib/images/fileicons/32x32/c.png
 create mode 100644 lib/images/fileicons/32x32/cc.png
 create mode 100644 lib/images/fileicons/32x32/cpp.png
 create mode 100644 lib/images/fileicons/32x32/csh.png
 create mode 100644 lib/images/fileicons/32x32/css.png
 create mode 100644 lib/images/fileicons/32x32/diff.png
 create mode 100644 lib/images/fileicons/32x32/h.png
 create mode 100644 lib/images/fileicons/32x32/hpp.png
 create mode 100644 lib/images/fileicons/32x32/java.png
 create mode 100644 lib/images/fileicons/32x32/js.png
 create mode 100644 lib/images/fileicons/32x32/json.png
 create mode 100644 lib/images/fileicons/32x32/pas.png
 create mode 100644 lib/images/fileicons/32x32/pl.png
 create mode 100644 lib/images/fileicons/32x32/py.png
 create mode 100644 lib/images/fileicons/32x32/sh.png

(limited to 'lib')

diff --git a/lib/images/fileicons/16x16/asm.png b/lib/images/fileicons/16x16/asm.png
new file mode 100644
index 000000000..a88d01665
Binary files /dev/null and b/lib/images/fileicons/16x16/asm.png differ
diff --git a/lib/images/fileicons/16x16/bash.png b/lib/images/fileicons/16x16/bash.png
new file mode 100644
index 000000000..047be8c6a
Binary files /dev/null and b/lib/images/fileicons/16x16/bash.png differ
diff --git a/lib/images/fileicons/16x16/c.png b/lib/images/fileicons/16x16/c.png
new file mode 100644
index 000000000..5e91b8473
Binary files /dev/null and b/lib/images/fileicons/16x16/c.png differ
diff --git a/lib/images/fileicons/16x16/cc.png b/lib/images/fileicons/16x16/cc.png
new file mode 100644
index 000000000..432c95901
Binary files /dev/null and b/lib/images/fileicons/16x16/cc.png differ
diff --git a/lib/images/fileicons/16x16/cpp.png b/lib/images/fileicons/16x16/cpp.png
new file mode 100644
index 000000000..6c6be4263
Binary files /dev/null and b/lib/images/fileicons/16x16/cpp.png differ
diff --git a/lib/images/fileicons/16x16/csh.png b/lib/images/fileicons/16x16/csh.png
new file mode 100644
index 000000000..14e01b2a7
Binary files /dev/null and b/lib/images/fileicons/16x16/csh.png differ
diff --git a/lib/images/fileicons/16x16/css.png b/lib/images/fileicons/16x16/css.png
new file mode 100644
index 000000000..5638f1879
Binary files /dev/null and b/lib/images/fileicons/16x16/css.png differ
diff --git a/lib/images/fileicons/16x16/diff.png b/lib/images/fileicons/16x16/diff.png
new file mode 100644
index 000000000..c81c4ff2c
Binary files /dev/null and b/lib/images/fileicons/16x16/diff.png differ
diff --git a/lib/images/fileicons/16x16/doc.png b/lib/images/fileicons/16x16/doc.png
index 925494576..9324f20b3 100644
Binary files a/lib/images/fileicons/16x16/doc.png and b/lib/images/fileicons/16x16/doc.png differ
diff --git a/lib/images/fileicons/16x16/docx.png b/lib/images/fileicons/16x16/docx.png
index 5bae13f9e..e3986295d 100644
Binary files a/lib/images/fileicons/16x16/docx.png and b/lib/images/fileicons/16x16/docx.png differ
diff --git a/lib/images/fileicons/16x16/gif.png b/lib/images/fileicons/16x16/gif.png
index d8eb57e54..bcbb8366b 100644
Binary files a/lib/images/fileicons/16x16/gif.png and b/lib/images/fileicons/16x16/gif.png differ
diff --git a/lib/images/fileicons/16x16/h.png b/lib/images/fileicons/16x16/h.png
new file mode 100644
index 000000000..a208d3159
Binary files /dev/null and b/lib/images/fileicons/16x16/h.png differ
diff --git a/lib/images/fileicons/16x16/hpp.png b/lib/images/fileicons/16x16/hpp.png
new file mode 100644
index 000000000..decd78b7e
Binary files /dev/null and b/lib/images/fileicons/16x16/hpp.png differ
diff --git a/lib/images/fileicons/16x16/htm.png b/lib/images/fileicons/16x16/htm.png
index 8312c33a8..e0ead2bff 100644
Binary files a/lib/images/fileicons/16x16/htm.png and b/lib/images/fileicons/16x16/htm.png differ
diff --git a/lib/images/fileicons/16x16/html.png b/lib/images/fileicons/16x16/html.png
index 7a7fcc0fa..e0ead2bff 100644
Binary files a/lib/images/fileicons/16x16/html.png and b/lib/images/fileicons/16x16/html.png differ
diff --git a/lib/images/fileicons/16x16/ico.png b/lib/images/fileicons/16x16/ico.png
index 9d4259c1b..93343717c 100644
Binary files a/lib/images/fileicons/16x16/ico.png and b/lib/images/fileicons/16x16/ico.png differ
diff --git a/lib/images/fileicons/16x16/java.png b/lib/images/fileicons/16x16/java.png
new file mode 100644
index 000000000..6adebc02b
Binary files /dev/null and b/lib/images/fileicons/16x16/java.png differ
diff --git a/lib/images/fileicons/16x16/jpeg.png b/lib/images/fileicons/16x16/jpeg.png
index 3a7d8a7f9..29dea5761 100644
Binary files a/lib/images/fileicons/16x16/jpeg.png and b/lib/images/fileicons/16x16/jpeg.png differ
diff --git a/lib/images/fileicons/16x16/jpg.png b/lib/images/fileicons/16x16/jpg.png
index 7152ebdb6..29dea5761 100644
Binary files a/lib/images/fileicons/16x16/jpg.png and b/lib/images/fileicons/16x16/jpg.png differ
diff --git a/lib/images/fileicons/16x16/js.png b/lib/images/fileicons/16x16/js.png
new file mode 100644
index 000000000..37d3a7958
Binary files /dev/null and b/lib/images/fileicons/16x16/js.png differ
diff --git a/lib/images/fileicons/16x16/json.png b/lib/images/fileicons/16x16/json.png
new file mode 100644
index 000000000..0f32375e6
Binary files /dev/null and b/lib/images/fileicons/16x16/json.png differ
diff --git a/lib/images/fileicons/16x16/odc.png b/lib/images/fileicons/16x16/odc.png
index 331140552..b2a879a84 100644
Binary files a/lib/images/fileicons/16x16/odc.png and b/lib/images/fileicons/16x16/odc.png differ
diff --git a/lib/images/fileicons/16x16/odf.png b/lib/images/fileicons/16x16/odf.png
index eccae9e20..65db17827 100644
Binary files a/lib/images/fileicons/16x16/odf.png and b/lib/images/fileicons/16x16/odf.png differ
diff --git a/lib/images/fileicons/16x16/odg.png b/lib/images/fileicons/16x16/odg.png
index 5224425e6..bab8fe1a7 100644
Binary files a/lib/images/fileicons/16x16/odg.png and b/lib/images/fileicons/16x16/odg.png differ
diff --git a/lib/images/fileicons/16x16/odi.png b/lib/images/fileicons/16x16/odi.png
index b57fd974d..f0df8e582 100644
Binary files a/lib/images/fileicons/16x16/odi.png and b/lib/images/fileicons/16x16/odi.png differ
diff --git a/lib/images/fileicons/16x16/odp.png b/lib/images/fileicons/16x16/odp.png
index 81d1023c0..4008c4e54 100644
Binary files a/lib/images/fileicons/16x16/odp.png and b/lib/images/fileicons/16x16/odp.png differ
diff --git a/lib/images/fileicons/16x16/ods.png b/lib/images/fileicons/16x16/ods.png
index 77e6d5366..c7d5e263c 100644
Binary files a/lib/images/fileicons/16x16/ods.png and b/lib/images/fileicons/16x16/ods.png differ
diff --git a/lib/images/fileicons/16x16/odt.png b/lib/images/fileicons/16x16/odt.png
index 8490eec74..8fd5fd35c 100644
Binary files a/lib/images/fileicons/16x16/odt.png and b/lib/images/fileicons/16x16/odt.png differ
diff --git a/lib/images/fileicons/16x16/pas.png b/lib/images/fileicons/16x16/pas.png
new file mode 100644
index 000000000..0a91eff4a
Binary files /dev/null and b/lib/images/fileicons/16x16/pas.png differ
diff --git a/lib/images/fileicons/16x16/pdf.png b/lib/images/fileicons/16x16/pdf.png
index a3a30e475..1bc154641 100644
Binary files a/lib/images/fileicons/16x16/pdf.png and b/lib/images/fileicons/16x16/pdf.png differ
diff --git a/lib/images/fileicons/16x16/pl.png b/lib/images/fileicons/16x16/pl.png
new file mode 100644
index 000000000..7f43f6399
Binary files /dev/null and b/lib/images/fileicons/16x16/pl.png differ
diff --git a/lib/images/fileicons/16x16/png.png b/lib/images/fileicons/16x16/png.png
index 00ce3e400..007270532 100644
Binary files a/lib/images/fileicons/16x16/png.png and b/lib/images/fileicons/16x16/png.png differ
diff --git a/lib/images/fileicons/16x16/ppt.png b/lib/images/fileicons/16x16/ppt.png
index 3355c2712..e097ceb90 100644
Binary files a/lib/images/fileicons/16x16/ppt.png and b/lib/images/fileicons/16x16/ppt.png differ
diff --git a/lib/images/fileicons/16x16/pptx.png b/lib/images/fileicons/16x16/pptx.png
index 269cdb8fc..9dda61a12 100644
Binary files a/lib/images/fileicons/16x16/pptx.png and b/lib/images/fileicons/16x16/pptx.png differ
diff --git a/lib/images/fileicons/16x16/ps.png b/lib/images/fileicons/16x16/ps.png
index 089caeb7a..e61d1aa7e 100644
Binary files a/lib/images/fileicons/16x16/ps.png and b/lib/images/fileicons/16x16/ps.png differ
diff --git a/lib/images/fileicons/16x16/py.png b/lib/images/fileicons/16x16/py.png
new file mode 100644
index 000000000..4745cb972
Binary files /dev/null and b/lib/images/fileicons/16x16/py.png differ
diff --git a/lib/images/fileicons/16x16/rtf.png b/lib/images/fileicons/16x16/rtf.png
index bbc425ca3..4486932ed 100644
Binary files a/lib/images/fileicons/16x16/rtf.png and b/lib/images/fileicons/16x16/rtf.png differ
diff --git a/lib/images/fileicons/16x16/sh.png b/lib/images/fileicons/16x16/sh.png
new file mode 100644
index 000000000..60266bf3c
Binary files /dev/null and b/lib/images/fileicons/16x16/sh.png differ
diff --git a/lib/images/fileicons/16x16/sxc.png b/lib/images/fileicons/16x16/sxc.png
index c96cf303f..6084d49b7 100644
Binary files a/lib/images/fileicons/16x16/sxc.png and b/lib/images/fileicons/16x16/sxc.png differ
diff --git a/lib/images/fileicons/16x16/sxd.png b/lib/images/fileicons/16x16/sxd.png
index 124b928e1..aecd863a0 100644
Binary files a/lib/images/fileicons/16x16/sxd.png and b/lib/images/fileicons/16x16/sxd.png differ
diff --git a/lib/images/fileicons/16x16/sxi.png b/lib/images/fileicons/16x16/sxi.png
index 8a5e23033..b34b33ca3 100644
Binary files a/lib/images/fileicons/16x16/sxi.png and b/lib/images/fileicons/16x16/sxi.png differ
diff --git a/lib/images/fileicons/16x16/sxw.png b/lib/images/fileicons/16x16/sxw.png
index 9a903791c..a30869d9d 100644
Binary files a/lib/images/fileicons/16x16/sxw.png and b/lib/images/fileicons/16x16/sxw.png differ
diff --git a/lib/images/fileicons/16x16/xls.png b/lib/images/fileicons/16x16/xls.png
index 5ac56f20d..12a32a295 100644
Binary files a/lib/images/fileicons/16x16/xls.png and b/lib/images/fileicons/16x16/xls.png differ
diff --git a/lib/images/fileicons/16x16/xlsx.png b/lib/images/fileicons/16x16/xlsx.png
index 89c84c522..b2e85489d 100644
Binary files a/lib/images/fileicons/16x16/xlsx.png and b/lib/images/fileicons/16x16/xlsx.png differ
diff --git a/lib/images/fileicons/16x16/xml.png b/lib/images/fileicons/16x16/xml.png
index fb960477e..4480a6385 100644
Binary files a/lib/images/fileicons/16x16/xml.png and b/lib/images/fileicons/16x16/xml.png differ
diff --git a/lib/images/fileicons/32x32/asm.png b/lib/images/fileicons/32x32/asm.png
new file mode 100644
index 000000000..d9e336cdb
Binary files /dev/null and b/lib/images/fileicons/32x32/asm.png differ
diff --git a/lib/images/fileicons/32x32/bash.png b/lib/images/fileicons/32x32/bash.png
new file mode 100644
index 000000000..7a49f285a
Binary files /dev/null and b/lib/images/fileicons/32x32/bash.png differ
diff --git a/lib/images/fileicons/32x32/c.png b/lib/images/fileicons/32x32/c.png
new file mode 100644
index 000000000..4e0dc92b7
Binary files /dev/null and b/lib/images/fileicons/32x32/c.png differ
diff --git a/lib/images/fileicons/32x32/cc.png b/lib/images/fileicons/32x32/cc.png
new file mode 100644
index 000000000..5e21e28ba
Binary files /dev/null and b/lib/images/fileicons/32x32/cc.png differ
diff --git a/lib/images/fileicons/32x32/cpp.png b/lib/images/fileicons/32x32/cpp.png
new file mode 100644
index 000000000..18a0d0a92
Binary files /dev/null and b/lib/images/fileicons/32x32/cpp.png differ
diff --git a/lib/images/fileicons/32x32/csh.png b/lib/images/fileicons/32x32/csh.png
new file mode 100644
index 000000000..3f060c885
Binary files /dev/null and b/lib/images/fileicons/32x32/csh.png differ
diff --git a/lib/images/fileicons/32x32/css.png b/lib/images/fileicons/32x32/css.png
new file mode 100644
index 000000000..7ae0937c7
Binary files /dev/null and b/lib/images/fileicons/32x32/css.png differ
diff --git a/lib/images/fileicons/32x32/diff.png b/lib/images/fileicons/32x32/diff.png
new file mode 100644
index 000000000..0cda679c7
Binary files /dev/null and b/lib/images/fileicons/32x32/diff.png differ
diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png
index 8369c1f73..c1e543a57 100644
Binary files a/lib/images/fileicons/32x32/doc.png and b/lib/images/fileicons/32x32/doc.png differ
diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png
index ce5dfb3d3..36b6ea5fd 100644
Binary files a/lib/images/fileicons/32x32/docx.png and b/lib/images/fileicons/32x32/docx.png differ
diff --git a/lib/images/fileicons/32x32/gif.png b/lib/images/fileicons/32x32/gif.png
index 7e5608b75..e39af08cc 100644
Binary files a/lib/images/fileicons/32x32/gif.png and b/lib/images/fileicons/32x32/gif.png differ
diff --git a/lib/images/fileicons/32x32/h.png b/lib/images/fileicons/32x32/h.png
new file mode 100644
index 000000000..5bca1ab4c
Binary files /dev/null and b/lib/images/fileicons/32x32/h.png differ
diff --git a/lib/images/fileicons/32x32/hpp.png b/lib/images/fileicons/32x32/hpp.png
new file mode 100644
index 000000000..0ccd65af0
Binary files /dev/null and b/lib/images/fileicons/32x32/hpp.png differ
diff --git a/lib/images/fileicons/32x32/htm.png b/lib/images/fileicons/32x32/htm.png
index 132963be5..f52a826f4 100644
Binary files a/lib/images/fileicons/32x32/htm.png and b/lib/images/fileicons/32x32/htm.png differ
diff --git a/lib/images/fileicons/32x32/html.png b/lib/images/fileicons/32x32/html.png
index fb15689c0..f52a826f4 100644
Binary files a/lib/images/fileicons/32x32/html.png and b/lib/images/fileicons/32x32/html.png differ
diff --git a/lib/images/fileicons/32x32/ico.png b/lib/images/fileicons/32x32/ico.png
index 0fe7053b0..0a219e6f2 100644
Binary files a/lib/images/fileicons/32x32/ico.png and b/lib/images/fileicons/32x32/ico.png differ
diff --git a/lib/images/fileicons/32x32/java.png b/lib/images/fileicons/32x32/java.png
new file mode 100644
index 000000000..d3a66c4dd
Binary files /dev/null and b/lib/images/fileicons/32x32/java.png differ
diff --git a/lib/images/fileicons/32x32/jpeg.png b/lib/images/fileicons/32x32/jpeg.png
index b6707a603..5fb71dd73 100644
Binary files a/lib/images/fileicons/32x32/jpeg.png and b/lib/images/fileicons/32x32/jpeg.png differ
diff --git a/lib/images/fileicons/32x32/jpg.png b/lib/images/fileicons/32x32/jpg.png
index 1c8b706e8..5fb71dd73 100644
Binary files a/lib/images/fileicons/32x32/jpg.png and b/lib/images/fileicons/32x32/jpg.png differ
diff --git a/lib/images/fileicons/32x32/js.png b/lib/images/fileicons/32x32/js.png
new file mode 100644
index 000000000..741b175d3
Binary files /dev/null and b/lib/images/fileicons/32x32/js.png differ
diff --git a/lib/images/fileicons/32x32/json.png b/lib/images/fileicons/32x32/json.png
new file mode 100644
index 000000000..2a2a381ec
Binary files /dev/null and b/lib/images/fileicons/32x32/json.png differ
diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png
index 9a34f2129..ebb15681e 100644
Binary files a/lib/images/fileicons/32x32/odc.png and b/lib/images/fileicons/32x32/odc.png differ
diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png
index e3b4333ad..97e4c45b3 100644
Binary files a/lib/images/fileicons/32x32/odf.png and b/lib/images/fileicons/32x32/odf.png differ
diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png
index c3b192b2d..b2aae1e03 100644
Binary files a/lib/images/fileicons/32x32/odg.png and b/lib/images/fileicons/32x32/odg.png differ
diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png
index 6baa69407..8176d2daa 100644
Binary files a/lib/images/fileicons/32x32/odi.png and b/lib/images/fileicons/32x32/odi.png differ
diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png
index 8e09dd6e4..8e27fd62e 100644
Binary files a/lib/images/fileicons/32x32/odp.png and b/lib/images/fileicons/32x32/odp.png differ
diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png
index 90892f3d4..9319b6acc 100644
Binary files a/lib/images/fileicons/32x32/ods.png and b/lib/images/fileicons/32x32/ods.png differ
diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png
index 22ec1fffb..13eb496d3 100644
Binary files a/lib/images/fileicons/32x32/odt.png and b/lib/images/fileicons/32x32/odt.png differ
diff --git a/lib/images/fileicons/32x32/pas.png b/lib/images/fileicons/32x32/pas.png
new file mode 100644
index 000000000..e71796d8a
Binary files /dev/null and b/lib/images/fileicons/32x32/pas.png differ
diff --git a/lib/images/fileicons/32x32/pdf.png b/lib/images/fileicons/32x32/pdf.png
index 8e8b45472..0efa0dc31 100644
Binary files a/lib/images/fileicons/32x32/pdf.png and b/lib/images/fileicons/32x32/pdf.png differ
diff --git a/lib/images/fileicons/32x32/pl.png b/lib/images/fileicons/32x32/pl.png
new file mode 100644
index 000000000..a7bbfedf1
Binary files /dev/null and b/lib/images/fileicons/32x32/pl.png differ
diff --git a/lib/images/fileicons/32x32/png.png b/lib/images/fileicons/32x32/png.png
index deb47e44e..0ecd29691 100644
Binary files a/lib/images/fileicons/32x32/png.png and b/lib/images/fileicons/32x32/png.png differ
diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png
index 84b523a23..17dc7fda3 100644
Binary files a/lib/images/fileicons/32x32/ppt.png and b/lib/images/fileicons/32x32/ppt.png differ
diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png
index 1446cf4de..cc42cf0e1 100644
Binary files a/lib/images/fileicons/32x32/pptx.png and b/lib/images/fileicons/32x32/pptx.png differ
diff --git a/lib/images/fileicons/32x32/ps.png b/lib/images/fileicons/32x32/ps.png
index d540743f9..e1a74988d 100644
Binary files a/lib/images/fileicons/32x32/ps.png and b/lib/images/fileicons/32x32/ps.png differ
diff --git a/lib/images/fileicons/32x32/py.png b/lib/images/fileicons/32x32/py.png
new file mode 100644
index 000000000..2ce622aeb
Binary files /dev/null and b/lib/images/fileicons/32x32/py.png differ
diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png
index fcbcd001a..0ad836e0c 100644
Binary files a/lib/images/fileicons/32x32/rtf.png and b/lib/images/fileicons/32x32/rtf.png differ
diff --git a/lib/images/fileicons/32x32/sh.png b/lib/images/fileicons/32x32/sh.png
new file mode 100644
index 000000000..1c2dbb29d
Binary files /dev/null and b/lib/images/fileicons/32x32/sh.png differ
diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png
index 50676be6a..fbd28e3de 100644
Binary files a/lib/images/fileicons/32x32/sxc.png and b/lib/images/fileicons/32x32/sxc.png differ
diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png
index f715a8ff0..243c18861 100644
Binary files a/lib/images/fileicons/32x32/sxd.png and b/lib/images/fileicons/32x32/sxd.png differ
diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png
index 3d9f31d3b..5c699f6eb 100644
Binary files a/lib/images/fileicons/32x32/sxi.png and b/lib/images/fileicons/32x32/sxi.png differ
diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png
index bd8ab1436..944989e87 100644
Binary files a/lib/images/fileicons/32x32/sxw.png and b/lib/images/fileicons/32x32/sxw.png differ
diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png
index 7447d9cdf..38e2b235b 100644
Binary files a/lib/images/fileicons/32x32/xls.png and b/lib/images/fileicons/32x32/xls.png differ
diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png
index 920217267..773e49f77 100644
Binary files a/lib/images/fileicons/32x32/xlsx.png and b/lib/images/fileicons/32x32/xlsx.png differ
diff --git a/lib/images/fileicons/32x32/xml.png b/lib/images/fileicons/32x32/xml.png
index bae059156..4ea3b1f6c 100644
Binary files a/lib/images/fileicons/32x32/xml.png and b/lib/images/fileicons/32x32/xml.png differ
diff --git a/lib/images/fileicons/generate.php b/lib/images/fileicons/generate.php
index 2dd25eb33..b08749f49 100644
--- a/lib/images/fileicons/generate.php
+++ b/lib/images/fileicons/generate.php
@@ -9,27 +9,36 @@ if(!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__).'/../../.
 define('NOSESSION', 1);
 require_once(DOKU_INC.'inc/init.php');
 
+$extensions = array(
+    'jpg', 'gif', 'png', 'ico',
+    'swf', 'mp3', 'ogg', 'wav', 'webm', 'ogv', 'mp4',
+    'tgz', 'tar', 'gz', 'bz2', 'zip', 'rar', '7z',
+    'pdf', 'ps',
+    'rpm', 'deb',
+    'doc', 'xls', 'ppt', 'rtf',
+    'docx', 'xlsx', 'pptx',
+    'sxw', 'sxc', 'sxi', 'sxd',
+    'odc', 'odf', 'odg', 'odi', 'odp', 'ods', 'odt',
+    'html', 'htm', 'txt', 'conf', 'xml', 'csv',
+    // these might be used in downloadable code blocks:
+    'c', 'cc', 'cpp', 'h', 'hpp', 'csh', 'diff', 'java', 'pas',
+    'pl', 'py', 'sh', 'bash', 'asm', 'htm', 'css', 'js', 'json'
+);
 
-/**
- * Class DokuFileIconBuilder
- *
- * overwrite mime type loading with loading DokuWiki's mime type config instead
- */
-class DokuFileIconBuilder extends FileIconBuilder {
-
-    protected function loadmimetypes(){
-        $this->mimetypes = getMimeTypes();
-        foreach(array_keys($this->mimetypes) as $ext) {
-            $this->mimetypes[$ext] = ltrim($this->mimetypes[$ext], '!');
-        }
-    }
+// generate all the icons
+@mkdir('16x16');
+@mkdir('32x32');
+
+$DFIB = new FileIconBuilder();
+foreach($extensions as $ext) {
+    echo "$ext\n";
+    $DFIB->create16x16($ext,"16x16/$ext.png");
+    $DFIB->create32x32($ext,"32x32/$ext.png");
 }
 
+copy("16x16/jpg.png", "16x16/jpeg.png");
+copy("32x32/jpg.png", "32x32/jpeg.png");
 
-echo "Important: you should enable the commented file types in mime.conf to make sure the icon are generated!\n";
-
-// generate all the icons
-$DFIB = new DokuFileIconBuilder();
-$DFIB->createAll(__DIR__);
+copy("16x16/htm.png", "16x16/html.png");
+copy("32x32/htm.png", "32x32/html.png");
 
-echo "generation done\n";
-- 
cgit v1.2.3


From 0b1e5003aae587074526c6b2ef19cb84670195e8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 23 Feb 2014 21:20:39 +0000
Subject: made search form styles independent from sitetools ID

---
 lib/tpl/dokuwiki/css/design.less | 64 ++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 42292de49..b18daaad7 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -186,50 +186,50 @@
     text-align: right;
 
     form.search {
-        display: block;
         font-size: 0.875em;
-        position: relative;
+    }
+}
 
-        input.edit {
-            width: 18em;
-            padding: .35em 22px .35em .1em;
-        }
+[dir=rtl] #dokuwiki__sitetools {
+    text-align: left;
+}
 
-        input.button {
-            background: transparent url(images/search.png) no-repeat 0 0;
-            border-width: 0;
-            width: 19px;
-            height: 14px;
-            text-indent: -99999px;
-            margin-left: -20px;
-            box-shadow: none;
-            padding: 0;
-        }
+form.search {
+    display: block;
+    position: relative;
+    margin-bottom: 0.5em;
+
+    input.edit {
+        width: 18em;
+        padding: .35em 22px .35em .1em;
     }
 
-    ul {
-        margin-top: 0.5em;
+    input.button {
+        background: transparent url(images/search.png) no-repeat 0 0;
+        border-width: 0;
+        width: 19px;
+        height: 14px;
+        text-indent: -99999px;
+        margin-left: -20px;
+        box-shadow: none;
+        padding: 0;
     }
 }
 
-[dir=rtl] #dokuwiki__sitetools {
-    text-align: left;
-
-    form.search {
-        input.edit {
-            padding: .35em .1em .35em 22px;
-        }
+[dir=rtl] form.search {
+    input.edit {
+        padding: .35em .1em .35em 22px;
+    }
 
-        input.button {
-            background-position: 5px 0;
-            margin-left: 0;
-            margin-right: -20px;
-            position: relative;
-        }
+    input.button {
+        background-position: 5px 0;
+        margin-left: 0;
+        margin-right: -20px;
+        position: relative;
     }
 }
 
-#IE7 #dokuwiki__sitetools form.search {
+#IE7 form.search {
     min-height: 1px;
     z-index: 21;
 }
-- 
cgit v1.2.3


From 1e94c175409c39f190b7da3a1941230f3758513c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 23 Feb 2014 21:38:28 +0000
Subject: made sidebar content styles re-usable outside of ID (added class:
 aside)

---
 lib/tpl/dokuwiki/css/content.less | 22 +++++++++++-----------
 lib/tpl/dokuwiki/css/design.less  | 15 ++++++---------
 lib/tpl/dokuwiki/main.php         |  2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index a5ffbf2be..a2e343a33 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -67,19 +67,19 @@
 
 /*____________ lists ____________*/
 
-#dokuwiki__content ul li,
-#dokuwiki__aside ul li {
-    color: @ini_text_alt;
-}
+.dokuwiki .page,
+.dokuwiki .aside {
+    ul li {
+        color: @ini_text_alt;
+    }
 
-#dokuwiki__content ol li,
-#dokuwiki__aside ol li {
-    color: @ini_text_neu;
-}
+    ol li {
+        color: @ini_text_neu;
+    }
 
-#dokuwiki__content li .li,
-#dokuwiki__aside li .li {
-    color: @ini_text;
+    li .li {
+        color: @ini_text;
+    }
 }
 
 /*____________ tables ____________*/
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index b18daaad7..46b4a045b 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -278,13 +278,10 @@ form.search {
 /* sidebar
 ********************************************************************/
 
-#dokuwiki__aside {
-
-    > .pad {
-        font-size: 0.875em;
-        overflow: hidden;
-        word-wrap: break-word;
-    }
+.dokuwiki .aside {
+    font-size: 0.875em;
+    overflow: hidden;
+    word-wrap: break-word;
 
     /* make sidebar more condensed */
 
@@ -340,8 +337,8 @@ form.search {
     }
 }
 
-[dir=rtl] #dokuwiki__aside ul,
-[dir=rtl] #dokuwiki__aside ol {
+[dir=rtl] .dokuwiki .aside ul,
+[dir=rtl] .dokuwiki .aside ol {
     padding-right: .5em;
 }
 
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 3bc46406a..44fef81eb 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -36,7 +36,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 
             <?php if($showSidebar): ?>
                 <!-- ********** ASIDE ********** -->
-                <div id="dokuwiki__aside"><div class="pad include group">
+                <div id="dokuwiki__aside"><div class="pad aside include group">
                     <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
                     <div class="content">
                         <?php tpl_flush() ?>
-- 
cgit v1.2.3


From 4d51938bb0516f7cc033d8c93131f56af7525da0 Mon Sep 17 00:00:00 2001
From: Rene <wllywlnt@yahoo.com>
Date: Sun, 23 Feb 2014 22:56:02 +0100
Subject: translation update

---
 lib/plugins/extension/lang/nl/intro_install.txt   |  1 +
 lib/plugins/extension/lang/nl/intro_plugins.txt   |  1 +
 lib/plugins/extension/lang/nl/intro_search.txt    |  1 +
 lib/plugins/extension/lang/nl/intro_templates.txt |  1 +
 lib/plugins/extension/lang/nl/lang.php            | 33 +++++++++++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 lib/plugins/extension/lang/nl/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/nl/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/nl/intro_search.txt
 create mode 100644 lib/plugins/extension/lang/nl/intro_templates.txt
 create mode 100644 lib/plugins/extension/lang/nl/lang.php

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/nl/intro_install.txt b/lib/plugins/extension/lang/nl/intro_install.txt
new file mode 100644
index 000000000..6a0b41055
--- /dev/null
+++ b/lib/plugins/extension/lang/nl/intro_install.txt
@@ -0,0 +1 @@
+Hier kunt u handmatig plugins en templates installeren door deze te uploaden of door een directe download URL op te geven.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/nl/intro_plugins.txt b/lib/plugins/extension/lang/nl/intro_plugins.txt
new file mode 100644
index 000000000..0077aca30
--- /dev/null
+++ b/lib/plugins/extension/lang/nl/intro_plugins.txt
@@ -0,0 +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
diff --git a/lib/plugins/extension/lang/nl/intro_search.txt b/lib/plugins/extension/lang/nl/intro_search.txt
new file mode 100644
index 000000000..8fc3900ad
--- /dev/null
+++ b/lib/plugins/extension/lang/nl/intro_search.txt
@@ -0,0 +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
diff --git a/lib/plugins/extension/lang/nl/intro_templates.txt b/lib/plugins/extension/lang/nl/intro_templates.txt
new file mode 100644
index 000000000..5ef23dadf
--- /dev/null
+++ b/lib/plugins/extension/lang/nl/intro_templates.txt
@@ -0,0 +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
diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
new file mode 100644
index 000000000..1aad6a531
--- /dev/null
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Rene <wllywlnt@yahoo.com>
+ */
+$lang['menu']                  = 'Extension Manager (Uitbreidings Beheerder)';
+$lang['tab_plugins']           = 'Geïnstalleerde Plugins';
+$lang['tab_templates']         = 'Geïnstalleerde Templates';
+$lang['tab_search']            = 'Zoek en installeer';
+$lang['tab_install']           = 'Handmatige installatie';
+$lang['notimplemented']        = 'Deze toepassing is nog niet geïnstalleerd';
+$lang['notinstalled']          = 'Deze uitbreiding is nog niet geïnstalleerd';
+$lang['alreadyenabled']        = 'Deze uitbreiding is reeds ingeschakeld';
+$lang['alreadydisabled']       = 'Deze uitbreiding is reeds uitgeschakeld';
+$lang['pluginlistsaveerror']   = 'Fout bij het opslaan van de plugin lijst';
+$lang['unknownauthor']         = 'Onbekende auteur';
+$lang['unknownversion']        = 'Onbekende versie';
+$lang['btn_info']              = 'Toon meer informatie';
+$lang['btn_update']            = 'Update';
+$lang['btn_uninstall']         = 'Deinstalleer';
+$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['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';
-- 
cgit v1.2.3


From 370fac6347ec430cd72e724f45431a294b4f6662 Mon Sep 17 00:00:00 2001
From: Rene <wllywlnt@yahoo.com>
Date: Sun, 23 Feb 2014 23:15:57 +0100
Subject: translation update

---
 lib/plugins/extension/lang/nl/lang.php | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 lib/plugins/extension/lang/nl/lang.php

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
new file mode 100644
index 000000000..67b99c54d
--- /dev/null
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Rene <wllywlnt@yahoo.com>
+ */
+$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['unknown']               = '<em>onbekend</em>';
+$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['donate_action']         = 'Koop een kop koffie voor de auteur!';
+$lang['repo_retry']            = 'Herhaal';
+$lang['provides']              = 'Zorgt voor:';
+$lang['status']                = 'Status:';
+$lang['status_installed']      = 'Geïnstalleerd';
+$lang['status_not_installed']  = 'niet geïnstalleerd ';
+$lang['status_protected']      = 'beschermd';
+$lang['status_enabled']        = 'ingeschakeld';
+$lang['status_disabled']       = 'uitgeschakeld';
+$lang['status_unmodifiable']   = 'Niet wijzigbaar';
+$lang['status_plugin']         = 'plugin';
+$lang['status_template']       = 'template';
+$lang['status_bundled']        = 'Gebundeld';
+$lang['msg_enabled']           = 'Plugin %s ingeschakeld';
+$lang['msg_disabled']          = 'Plugin %s uitgeschakeld';
-- 
cgit v1.2.3


From 4292840ce374036541a92449670ed9ae83a3c64d Mon Sep 17 00:00:00 2001
From: Rene <wllywlnt@yahoo.com>
Date: Mon, 24 Feb 2014 07:30:58 +0100
Subject: translation update

---
 lib/plugins/extension/lang/nl/lang.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 lib/plugins/extension/lang/nl/lang.php

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
new file mode 100644
index 000000000..2d2b3d25b
--- /dev/null
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Rene <wllywlnt@yahoo.com>
+ */
+$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_plugin_install_success'] = 'Plugin %s werd succesvol geïnstalleerd';
+$lang['msg_plugin_update_success'] = 'Plugin %s werd succesvol ge-update';
+$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['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';
+$lang['error_decompress']      = 'Onmogelijk om het gedownloade bestand uit te pakken. Dit is wellicht het gevolg van een onvolledige/onjuiste download, in welk geval u het nog eens moet proberen; of het compressie formaat is onbekend in welk geval u het bestand handmatig moet downloaden en installeren.';
+$lang['error_findfolder']      = 'Onmogelijk om de uitbreidings directory te vinden, u moet het zelf downloaden en installeren';
+$lang['error_copy']            = 'Er was een bestand kopieer fout tijdens het installeren van bestanden in directory <em>%s</em>: de schijf kan vol zijn of de bestand toegangs rechten kunnen onjuist zijn. Dit kan tot gevolg hebben dat de plugin slechts gedeeltelijk werd geïnstalleerd waardoor uw wiki installatie onstabiel is ';
+$lang['noperms']               = 'Uitbreidings directory is niet schrijfbaar';
+$lang['notplperms']            = 'Template directory is niet schrijfbaar';
+$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:';
-- 
cgit v1.2.3


From 9ea5b41c02991d1562aeed7142b3080f6970f417 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 25 Feb 2014 00:51:23 +0000
Subject: removed language files for removed plugin plugin

---
 lib/plugins/plugin/lang/cs/admin_plugin.txt |  3 --
 lib/plugins/plugin/lang/cs/lang.php         | 66 ---------------------------
 lib/plugins/plugin/lang/el/admin_plugin.txt |  5 ---
 lib/plugins/plugin/lang/el/lang.php         | 58 ------------------------
 lib/plugins/plugin/lang/fr/admin_plugin.txt |  4 --
 lib/plugins/plugin/lang/fr/lang.php         | 69 -----------------------------
 lib/plugins/plugin/lang/hu/admin_plugin.txt |  4 --
 lib/plugins/plugin/lang/hu/lang.php         | 59 ------------------------
 lib/plugins/plugin/lang/id/lang.php         | 32 -------------
 lib/plugins/plugin/lang/pl/admin_plugin.txt |  5 ---
 lib/plugins/plugin/lang/pl/lang.php         | 63 --------------------------
 lib/plugins/plugin/lang/sk/admin_plugin.txt |  4 --
 lib/plugins/plugin/lang/sk/lang.php         | 55 -----------------------
 lib/plugins/plugin/lang/sl/admin_plugin.txt |  3 --
 lib/plugins/plugin/lang/sl/lang.php         | 55 -----------------------
 lib/plugins/plugin/lang/tr/admin_plugin.txt |  3 --
 lib/plugins/plugin/lang/tr/lang.php         | 55 -----------------------
 17 files changed, 543 deletions(-)
 delete mode 100644 lib/plugins/plugin/lang/cs/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/cs/lang.php
 delete mode 100644 lib/plugins/plugin/lang/el/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/el/lang.php
 delete mode 100644 lib/plugins/plugin/lang/fr/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/fr/lang.php
 delete mode 100644 lib/plugins/plugin/lang/hu/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/hu/lang.php
 delete mode 100644 lib/plugins/plugin/lang/id/lang.php
 delete mode 100644 lib/plugins/plugin/lang/pl/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/pl/lang.php
 delete mode 100644 lib/plugins/plugin/lang/sk/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/sk/lang.php
 delete mode 100644 lib/plugins/plugin/lang/sl/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/sl/lang.php
 delete mode 100644 lib/plugins/plugin/lang/tr/admin_plugin.txt
 delete mode 100644 lib/plugins/plugin/lang/tr/lang.php

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/cs/admin_plugin.txt b/lib/plugins/plugin/lang/cs/admin_plugin.txt
deleted file mode 100644
index 6ebf1e78f..000000000
--- a/lib/plugins/plugin/lang/cs/admin_plugin.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== Správa pluginů ======
-
-Na této stránce lze spravovat pluginy DokuWiki [[doku>plugins|plugins]]. Aby bylo možné stahovat a instalovat pluginy, musí mít webový server přístup pro zápis do adresáře //plugin//.
diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php
deleted file mode 100644
index 8917f8ef6..000000000
--- a/lib/plugins/plugin/lang/cs/lang.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Tomas Valenta <t.valenta@sh.cvut.cz>
- * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
- * @author Bohumir Zamecnik <bohumir@zamecnik.org>
- * @author tomas@valenta.cz
- * @author Marek Sacha <sachamar@fel.cvut.cz>
- * @author Lefty <lefty@multihost.cz>
- * @author Vojta Beran <xmamut@email.cz>
- * @author zbynek.krivka@seznam.cz
- * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
- * @author Jakub A. Těšínský (j@kub.cz)
- * @author mkucera66@seznam.cz
- * @author Zbyněk Křivka <krivka@fit.vutbr.cz>
- * @author Gerrit Uitslag <klapinklapin@gmail.com>
- * @author Petr Klíma <qaxi@seznam.cz>
- */
-$lang['menu']                  = 'Správa pluginů';
-$lang['download']              = 'Stáhnout a instalovat plugin';
-$lang['manage']                = 'Seznam instalovaných pluginů';
-$lang['btn_info']              = 'info';
-$lang['btn_update']            = 'aktualizovat';
-$lang['btn_delete']            = 'smazat';
-$lang['btn_settings']          = 'nastavení';
-$lang['btn_download']          = 'Stáhnout';
-$lang['btn_enable']            = 'Uložit';
-$lang['url']                   = 'URL';
-$lang['installed']             = 'Instalován:';
-$lang['lastupdate']            = 'Poslední aktualizace:';
-$lang['source']                = 'Zdroj:';
-$lang['unknown']               = 'neznámý';
-$lang['updating']              = 'Aktualizuji ...';
-$lang['updated']               = 'Modul %s úspěšně aktualizován';
-$lang['updates']               = 'Následující pluginy byly úspěšně aktualizovány';
-$lang['update_none']           = 'Žádné aktualizace nenalezeny.';
-$lang['deleting']              = 'Probíhá mazání ...';
-$lang['deleted']               = 'Plugin %s smazán.';
-$lang['downloading']           = 'Stahuji ...';
-$lang['downloaded']            = 'Plugin %s nainstalován';
-$lang['downloads']             = 'Následující pluginy byly úspěšně instalovány:';
-$lang['download_none']         = 'Žádné pluginy nebyly nenalezeny, nebo se vyskytla nějaká chyba při
-stahování a instalaci.';
-$lang['plugin']                = 'Plugin:';
-$lang['components']            = 'Součásti';
-$lang['noinfo']                = 'Plugin nevrátil žádné informace. Může být poškozen nebo špatný.';
-$lang['name']                  = 'Jméno:';
-$lang['date']                  = 'Datum:';
-$lang['type']                  = 'Typ:';
-$lang['desc']                  = 'Popis:';
-$lang['author']                = 'Autor:';
-$lang['www']                   = 'Web:';
-$lang['error']                 = 'Nastala neznámá chyba.';
-$lang['error_download']        = 'Nelze stáhnout soubor s pluginem: %s';
-$lang['error_badurl']          = 'URL je zřejmě chybná - nelze z ní určit název souboru';
-$lang['error_dircreate']       = 'Nelze vytvořit dočasný adresář ke stažení dat';
-$lang['error_decompress']      = 'Správce pluginů nemůže rozbalit stažený soubor. Toto může být způsobeno chybou při stahování. Můžete se pokusit stahování opakovat. Chyba může být také v kompresním formátu souboru. V tom případě bude nutné stáhnout a nainstalovat plugin ručně.';
-$lang['error_copy']            = 'Došlo k chybě při instalaci pluginu <em>%s</em>. Je možné, že na disku není volné místo, nebo mohou být špatně nastavena přístupová práva. Pozor, mohlo dojít k částečné a tudíž chybné instalaci pluginu a tím může být ohrožena stabilita wiki.';
-$lang['error_delete']          = 'Došlo k chybě při pokusu o smazání pluginu <em>%s</em>. Nejspíše je chyba v nastavení přístupových práv k některým souborům či adresářům.';
-$lang['enabled']               = 'Plugin %s aktivován.';
-$lang['notenabled']            = 'Plugin %s nelze aktivovat, zkontrolujte práva k souborům.';
-$lang['disabled']              = 'Plugin %s deaktivován.';
-$lang['notdisabled']           = 'Plugin %s nelze deaktivovat, zkontrolujte práva k souborům.';
-$lang['packageinstalled']      = 'Balíček pluginů (%d plugin(ů): %s) úspěšně nainstalován.';
diff --git a/lib/plugins/plugin/lang/el/admin_plugin.txt b/lib/plugins/plugin/lang/el/admin_plugin.txt
deleted file mode 100644
index 8b292935d..000000000
--- a/lib/plugins/plugin/lang/el/admin_plugin.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-====== Διαχείριση Επεκτάσεων ======
-
-Σε αυτή την σελίδα μπορείτε να διαχειριστείτε τις [[doku>plugins|επεκτάσεις]] του Dokuwiki σας. Για να μπορέσετε να εγκαταστήσετε νέες επεκτάσεις, ο αντίστοιχος φάκελος συστήματος θα πρέπει να είναι εγγράψιμος από τον χρήστη κάτω από τον οποίο εκτελείται η εφαρμογή του εξυπηρετητή σας.
-
-
diff --git a/lib/plugins/plugin/lang/el/lang.php b/lib/plugins/plugin/lang/el/lang.php
deleted file mode 100644
index f50e26c46..000000000
--- a/lib/plugins/plugin/lang/el/lang.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Christopher Smith <chris@jalakai.co.uk>
- * @author Thanos Massias <tm@thriasio.gr>
- * @author Αθανάσιος Νταής <homunculus@wana.gr>
- * @author Konstantinos Koryllos <koryllos@gmail.com>
- * @author George Petsagourakis <petsagouris@gmail.com>
- * @author Petros Vidalis <pvidalis@gmail.com>
- * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
- */
-$lang['menu']                  = 'Διαχείριση Επεκτάσεων';
-$lang['download']              = 'Κατεβάστε και εγκαταστήστε μια νέα επέκταση (plugin)';
-$lang['manage']                = 'Εγκατεστημένες επεκτάσεις';
-$lang['btn_info']              = 'πληροφορίες';
-$lang['btn_update']            = 'ενημέρωση';
-$lang['btn_delete']            = 'διαγραφή';
-$lang['btn_settings']          = 'ρυθμίσεις';
-$lang['btn_download']          = 'Μεταφόρτωση';
-$lang['btn_enable']            = 'Αποθήκευση';
-$lang['url']                   = 'URL';
-$lang['installed']             = 'Εγκατεστημένη:';
-$lang['lastupdate']            = 'Τελευταία ενημέρωση:';
-$lang['source']                = 'Προέλευση:';
-$lang['unknown']               = 'άγνωστο';
-$lang['updating']              = 'Σε διαδικασία ενημέρωσης ...';
-$lang['updated']               = 'Η επέκταση %s ενημερώθηκε με επιτυχία';
-$lang['updates']               = 'Οι παρακάτω επεκτάσεις ενημερώθηκαν με επιτυχία:';
-$lang['update_none']           = 'Δεν βρέθηκαν ενημερώσεις.';
-$lang['deleting']              = 'Σε διαδικασία διαγραφής ...';
-$lang['deleted']               = 'Η επέκταση %s διαγράφηκε.';
-$lang['downloading']           = 'Σε διαδικασία μεταφόρτωσης ...';
-$lang['downloaded']            = 'Η επέκταση %s εγκαταστάθηκε με επιτυχία';
-$lang['downloads']             = 'Οι παρακάτω επεκτάσεις εγκαταστάθηκαν με επιτυχία:';
-$lang['download_none']         = 'Δεν βρέθηκαν επεκτάσεις ή εμφανίστηκε κάποιο πρόβλημα κατά την σχετική διαδικασία.';
-$lang['plugin']                = 'Επέκταση:';
-$lang['components']            = 'Συστατικά';
-$lang['noinfo']                = 'Αυτή η επέκταση δεν επέστρεψε κάποια πληροφορία - η επέκταση μπορεί να μην λειτουργεί κανονικά.';
-$lang['name']                  = 'Όνομα:';
-$lang['date']                  = 'Ημερομηνία:';
-$lang['type']                  = 'Τύπος:';
-$lang['desc']                  = 'Περιγραφή:';
-$lang['author']                = 'Συγγραφέας:';
-$lang['www']                   = 'Διεύθυνση στο διαδίκτυο:';
-$lang['error']                 = 'Εμφανίστηκε άγνωστο σφάλμα.';
-$lang['error_download']        = 'Δεν είναι δυνατή η μεταφόρτωση του αρχείου: %s';
-$lang['error_badurl']          = 'Το URL είναι μάλλον λανθασμένο - είναι αδύνατον να εξαχθεί το όνομα αρχείου από αυτό το URL';
-$lang['error_dircreate']       = 'Δεν είναι δυνατή η δημιουργία ενός προσωρινού φακέλου αποθήκευσης των μεταφορτώσεων';
-$lang['error_decompress']      = 'Δεν είναι δυνατή η αποσυμπίεση των μεταφορτώσεων. Αυτό μπορεί να οφείλεται σε μερική λήψη των μεταφορτώσεων, οπότε θα πρέπει να επαναλάβετε την διαδικασία ή το σύστημά σας δεν μπορεί να διαχειριστεί το συγκεκριμένο είδος συμπίεσης, οπότε θα πρέπει να εγκαταστήσετε την επέκταση χειροκίνητα.';
-$lang['error_copy']            = 'Εμφανίστηκε ένα σφάλμα αντιγραφής αρχείων κατά την διάρκεια εγκατάστασης της επέκτασης <em>%s</em>: ο δίσκος μπορεί να είναι γεμάτος ή να μην είναι σωστά ρυθμισμένα τα δικαιώματα πρόσβασης. Αυτό το γεγονός μπορεί να οδήγησε σε μερική εγκατάσταση της επέκτασης και άρα η DokuWiki εγκατάστασή σας να εμφανίσει προβλήματα σταθερότητας.';
-$lang['error_delete']          = 'Εμφανίστηκε ένα σφάλμα κατά την διαδικασία διαγραφής της επέκτασης <em>%s</em>.  Η πιθανότερη αιτία είναι να μην είναι σωστά ρυθμισμένα τα δικαιώματα πρόσβασης.';
-$lang['enabled']               = 'Η επέκταση %s ενεργοποιήθηκε.';
-$lang['notenabled']            = 'Η επέκταση %s δεν μπορεί να ενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.';
-$lang['disabled']              = 'Η επέκταση %s απενεργοποιήθηκε.';
-$lang['notdisabled']           = 'Η επέκταση %s δεν μπορεί να απενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.';
-$lang['packageinstalled']      = 'Το πακέτο της επέκτασης (%d επέκταση(εις): %s) εγκαστήθηκε επιτυχημένα.';
diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt
deleted file mode 100644
index b7beba25a..000000000
--- a/lib/plugins/plugin/lang/fr/admin_plugin.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Gestion des extensions ======
-
-Cette page vous permet de gérer tout ce qui a trait aux [[doku>fr:plugins|extensions]] de DokuWiki. Pour pouvoir télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur web.
-
diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php
deleted file mode 100644
index 0592f3c7d..000000000
--- a/lib/plugins/plugin/lang/fr/lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Guy Brand <gb@unistra.fr>
- * @author Delassaux Julien <julien@delassaux.fr>
- * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
- * @author stephane.gully@gmail.com
- * @author Guillaume Turri <guillaume.turri@gmail.com>
- * @author Erik Pedersen <erik.pedersen@shaw.ca>
- * @author olivier duperray <duperray.olivier@laposte.net>
- * @author Vincent Feltz <psycho@feltzv.fr>
- * @author Philippe Bajoit <philippe.bajoit@gmail.com>
- * @author Florian Gaub <floriang@floriang.net>
- * @author Samuel Dorsaz samuel.dorsaz@novelion.net
- * @author Johan Guilbaud <guilbaud.johan@gmail.com>
- * @author schplurtz@laposte.net
- * @author skimpax@gmail.com
- * @author Yannick Aure <yannick.aure@gmail.com>
- * @author Olivier DUVAL <zorky00@gmail.com>
- * @author Anael Mobilia <contrib@anael.eu>
- * @author Bruno Veilleux <bruno.vey@gmail.com>
- */
-$lang['menu']                  = 'Gestion des extensions';
-$lang['download']              = 'Télécharger et installer une nouvelle extension';
-$lang['manage']                = 'Extensions installées';
-$lang['btn_info']              = 'Info';
-$lang['btn_update']            = 'Mettre à jour';
-$lang['btn_delete']            = 'Supprimer';
-$lang['btn_settings']          = 'Paramètres';
-$lang['btn_download']          = 'Télécharger';
-$lang['btn_enable']            = 'Enregistrer';
-$lang['url']                   = 'URL';
-$lang['installed']             = 'Installé :';
-$lang['lastupdate']            = 'Dernière mise à jour :';
-$lang['source']                = 'Source :';
-$lang['unknown']               = 'inconnu';
-$lang['updating']              = 'Mise à jour…';
-$lang['updated']               = 'Extension %s mise à jour avec succès';
-$lang['updates']               = 'Les extensions suivantes ont été mises à jour avec succès';
-$lang['update_none']           = 'Aucune mise à jour n\'a été trouvée.';
-$lang['deleting']              = 'Suppression…';
-$lang['deleted']               = 'Extension %s supprimée.';
-$lang['downloading']           = 'Téléchargement…';
-$lang['downloaded']            = 'Extension %s installée avec succès';
-$lang['downloads']             = 'Les extensions suivantes ont été installées avec succès :';
-$lang['download_none']         = 'Aucune extension n\'a été trouvée, ou un problème inconnu est survenu durant le téléchargement et l\'installation.';
-$lang['plugin']                = 'Extension :';
-$lang['components']            = 'Composants';
-$lang['noinfo']                = 'Cette extension n\'a transmis aucune information, elle pourrait être invalide.';
-$lang['name']                  = 'Nom :';
-$lang['date']                  = 'Date :';
-$lang['type']                  = 'Type :';
-$lang['desc']                  = 'Description :';
-$lang['author']                = 'Auteur :';
-$lang['www']                   = 'Site web :';
-$lang['error']                 = 'Une erreur inconnue est survenue.';
-$lang['error_download']        = 'Impossible de télécharger le fichier de l\'extension : %s';
-$lang['error_badurl']          = 'URL suspecte : impossible de déterminer le nom du fichier à partir de l\'URL';
-$lang['error_dircreate']       = 'Impossible de créer le répertoire temporaire pour effectuer le téléchargement';
-$lang['error_decompress']      = 'Le gestionnaire d\'extensions a été incapable de décompresser le fichier téléchargé. Ceci peut être le résultat d\'un mauvais téléchargement, auquel cas vous devriez réessayer ; ou bien le format de compression est inconnu, auquel cas vous devez télécharger et installer l\'extension manuellement.';
-$lang['error_copy']            = 'Une erreur de copie est survenue lors de l\'installation des fichiers de l\'extension <em>%s</em> : le disque est peut-être plein ou les autorisations d\'accès sont incorrects. Il a pu en résulter une installation partielle de l\'extension et laisser votre installation du wiki instable.';
-$lang['error_delete']          = 'Une erreur est survenue lors de la suppression de l\'extension <em>%s</em>. La raison la plus probable est l\'insuffisance des autorisations sur les fichiers ou les répertoires.';
-$lang['enabled']               = 'Extension %s activée.';
-$lang['notenabled']            = 'L\'extension %s n\'a pas pu être activée, vérifiez les autorisations des fichiers.';
-$lang['disabled']              = 'Extension %s désactivée.';
-$lang['notdisabled']           = 'L\'extension %s n\'a pas pu être désactivée, vérifiez les autorisations des fichiers.';
-$lang['packageinstalled']      = 'Ensemble d\'extensions (%d extension(s): %s) installé avec succès.';
diff --git a/lib/plugins/plugin/lang/hu/admin_plugin.txt b/lib/plugins/plugin/lang/hu/admin_plugin.txt
deleted file mode 100644
index cf4a3b316..000000000
--- a/lib/plugins/plugin/lang/hu/admin_plugin.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Bővítménykezelő ======
-
-Ezen az oldalon a Dokuwiki [[doku>plugins|bővítményeivel]] kapcsolatos teendőket láthatod el. A webkiszolgálónak tudnia kell írni a //plugin// könyvtárba az új bővítmények letöltéséhez és telepítéséhez.
-
diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php
deleted file mode 100644
index 7fb237a32..000000000
--- a/lib/plugins/plugin/lang/hu/lang.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Sandor TIHANYI <stihanyi+dw@gmail.com>
- * @author Siaynoq Mage <siaynoqmage@gmail.com>
- * @author schilling.janos@gmail.com
- * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
- * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
- * @author David Szabo <szabo.david@gyumolcstarhely.hu>
- * @author Marton Sebok <sebokmarton@gmail.com>
- * @author Marina Vladi <deldadam@gmail.com>
- */
-$lang['menu']                  = 'Bővítménykezelő';
-$lang['download']              = 'Új bővítmény letöltése és telepítése';
-$lang['manage']                = 'Telepített bővítmények';
-$lang['btn_info']              = 'infó';
-$lang['btn_update']            = 'frissítés';
-$lang['btn_delete']            = 'törlés';
-$lang['btn_settings']          = 'beállítások';
-$lang['btn_download']          = 'Letöltés';
-$lang['btn_enable']            = 'Mentés';
-$lang['url']                   = 'URL-cím';
-$lang['installed']             = 'Telepítve:';
-$lang['lastupdate']            = 'Utolsó frissítés:';
-$lang['source']                = 'Forrás:';
-$lang['unknown']               = 'ismeretlen';
-$lang['updating']              = 'Frissítés...';
-$lang['updated']               = 'A(z) %s bővítmény frissítése sikeres.';
-$lang['updates']               = 'A következő bővítmények frissítése sikeres:';
-$lang['update_none']           = 'Nem találtam újabb verziót.';
-$lang['deleting']              = 'Törlés...';
-$lang['deleted']               = 'A(z) %s bővítményt eltávolítva.';
-$lang['downloading']           = 'Letöltés...';
-$lang['downloaded']            = 'A(z) %s bővítmény telepítése sikeres.';
-$lang['downloads']             = 'A következő bővítmények telepítése sikeres.';
-$lang['download_none']         = 'Nem találtam bővítményt vagy ismeretlen hiba történt a letöltés/telepítés közben.';
-$lang['plugin']                = 'Bővítmény:';
-$lang['components']            = 'Részek';
-$lang['noinfo']                = 'Ez a bővítmény nem tartalmaz információt, lehet, hogy hibás.';
-$lang['name']                  = 'Név:';
-$lang['date']                  = 'Dátum:';
-$lang['type']                  = 'Típus:';
-$lang['desc']                  = 'Leírás:';
-$lang['author']                = 'Szerző:';
-$lang['www']                   = 'Web:';
-$lang['error']                 = 'Ismeretlen hiba lépett fel.';
-$lang['error_download']        = 'Nem tudom letölteni a fájlt a bővítményhez: %s';
-$lang['error_badurl']          = 'Feltehetően rossz URL - nem tudom meghatározni a fájlnevet az URL-ből.';
-$lang['error_dircreate']       = 'Nem tudom létrehozni az átmeneti könyvtárat a letöltéshez.';
-$lang['error_decompress']      = 'A Bővítménykezelő nem tudta a letöltött állományt kicsomagolni. Ennek oka lehet hibás letöltés, ebben az esetben újra letöltéssel próbálkozhatsz, esetleg a tömörítés módja ismeretlen, ebben az esetben kézzel kell letölteni és telepíteni a bővítményt.';
-$lang['error_copy']            = 'Fájl másolási hiba történt a(z) <em>%s</em> bővítmény telepítése közben: vagy a lemezterület fogyott el, vagy az állomány hozzáférési jogosultságai nem megfelelőek. Emiatt előfordulhat, hogy a bővítményt csak részben sikerült telepíteni és a wiki összeomolhat.';
-$lang['error_delete']          = 'Hiba történt a(z) <em>%s</em> bővítmény eltávolítása közben. A legvalószínűbb ok, hogy a könyvtár vagy állomány hozzáférési jogosultságai nem megfelelőek.';
-$lang['enabled']               = 'A(z) %s bővítmény bekapcsolva.';
-$lang['notenabled']            = 'A(z) %s bővítmény engedélyezése nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.';
-$lang['disabled']              = 'A(z) %s bővítmény kikapcsolva.';
-$lang['notdisabled']           = 'A(z) %s bővítmény kikapcsolása nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.';
-$lang['packageinstalled']      = 'A bővítménycsomag(ok) feltelepült(ek): %d plugin(s): %s';
diff --git a/lib/plugins/plugin/lang/id/lang.php b/lib/plugins/plugin/lang/id/lang.php
deleted file mode 100644
index 2653b075e..000000000
--- a/lib/plugins/plugin/lang/id/lang.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Irwan Butar Butar <irwansah.putra@gmail.com>
- * @author Yustinus Waruwu <juswaruwu@gmail.com>
- */
-$lang['btn_info']              = 'Info';
-$lang['btn_update']            = 'Baharui';
-$lang['btn_delete']            = 'Hapus';
-$lang['btn_settings']          = 'Pengaturan';
-$lang['btn_download']          = 'Unduh';
-$lang['btn_enable']            = 'Simpan';
-$lang['url']                   = 'URL';
-$lang['installed']             = 'Instal';
-$lang['lastupdate']            = 'Pembaharuan terakhir:';
-$lang['source']                = 'Sumber:';
-$lang['unknown']               = 'Tidak kenal';
-$lang['updating']              = 'Terbaharui ...';
-$lang['update_none']           = 'Tidak ditemukan pembaharuan';
-$lang['deleting']              = 'Terhapus ...';
-$lang['deleted']               = 'Hapus Plugin %s.';
-$lang['downloading']           = 'Unduh ...';
-$lang['plugin']                = 'Plugin:';
-$lang['components']            = 'Komponen';
-$lang['name']                  = 'Nama:';
-$lang['date']                  = 'Tanggal:';
-$lang['type']                  = 'Tipe:';
-$lang['desc']                  = 'Penjelasan:';
-$lang['author']                = 'Autor:';
-$lang['www']                   = 'Web:';
diff --git a/lib/plugins/plugin/lang/pl/admin_plugin.txt b/lib/plugins/plugin/lang/pl/admin_plugin.txt
deleted file mode 100644
index f01048198..000000000
--- a/lib/plugins/plugin/lang/pl/admin_plugin.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-====== Menadżer wtyczek ======
-
-Na tej stronie możesz zarządzać wszystkim co jest związane z [[doku>plugins|wtyczkami]] Dokuwiki. Aby móc ściągnąć i zainstalować wtyczkę, serwer WWW musi mieć prawo do zapisu w katalogu ''plugins''.
-
-
diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php
deleted file mode 100644
index eae91f33e..000000000
--- a/lib/plugins/plugin/lang/pl/lang.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Michał Tkacz <mehow@autocom.pl>
- * @author Grzegorz Żur <grzegorz.zur@gmail.com>
- * @author Mariusz Kujawski <marinespl@gmail.com>
- * @author Maciej Kurczewski <pipijajko@gmail.com>
- * @author Sławomir Boczek <slawkens@gmail.com>
- * @author sleshek@wp.pl
- * @author Leszek Stachowski <shazarre@gmail.com>
- * @author maros <dobrimaros@yahoo.pl>
- * @author Grzegorz Widła <dzesdzes@gmail.com>
- * @author Łukasz Chmaj <teachmeter@gmail.com>
- * @author Begina Felicysym <begina.felicysym@wp.eu>
- * @author Aoi Karasu <aoikarasu@gmail.com>
- */
-$lang['menu']                  = 'Menadżer wtyczek';
-$lang['download']              = 'Ściągnij i zainstaluj nową wtyczkę';
-$lang['manage']                = 'Zainstalowane Wtyczki';
-$lang['btn_info']              = 'Informacje';
-$lang['btn_update']            = 'Aktualizuj';
-$lang['btn_delete']            = 'Usuń';
-$lang['btn_settings']          = 'Ustawienia';
-$lang['btn_download']          = 'Pobierz';
-$lang['btn_enable']            = 'Zapisz';
-$lang['url']                   = 'Adres URL';
-$lang['installed']             = 'Instalacja:';
-$lang['lastupdate']            = 'Ostatnio zaktualizowana:';
-$lang['source']                = 'Źródło:';
-$lang['unknown']               = 'nieznane';
-$lang['updating']              = 'Aktualizuję...';
-$lang['updated']               = 'Aktualizacja wtyczki %s pomyślnie ściągnięta';
-$lang['updates']               = 'Aktualizacje następujących wtyczek zostały pomyślnie ściągnięte';
-$lang['update_none']           = 'Nie znaleziono aktualizacji.';
-$lang['deleting']              = 'Usuwam...';
-$lang['deleted']               = 'Wtyczka %s usunięta.';
-$lang['downloading']           = 'Pobieram...';
-$lang['downloaded']            = 'Wtyczka %s pomyślnie zainstalowana';
-$lang['downloads']             = 'Następujące wtyczki zostały pomyślnie zainstalowane:';
-$lang['download_none']         = 'Nie znaleziono wtyczek lub wystąpił nieznany problem podczas ściągania i instalacji.';
-$lang['plugin']                = 'Wtyczka:';
-$lang['components']            = 'Składniki';
-$lang['noinfo']                = 'Ta wtyczka nie zwróciła żadnych informacji, może być niepoprawna.';
-$lang['name']                  = 'Nazwa:';
-$lang['date']                  = 'Data:';
-$lang['type']                  = 'Typ:';
-$lang['desc']                  = 'Opis:';
-$lang['author']                = 'Autor:';
-$lang['www']                   = 'WWW:';
-$lang['error']                 = 'Wystąpił nieznany błąd.';
-$lang['error_download']        = 'Nie powiodło się ściągnięcie pliku wtyczki: %s';
-$lang['error_badurl']          = 'Prawdopodobnie zły url - nie da się ustalić nazwy pliku na podstawie urla';
-$lang['error_dircreate']       = 'Nie powiodło się stworzenie tymczasowego katalogu na pobrane pliki';
-$lang['error_decompress']      = 'Menadżer wtyczek nie był w stanie rozpakować ściągniętego pliku. Może to być spowodowane przez nieudany transfer (w takim przypadku powinieneś spróbować ponownie) lub nieznany format kompresji (w takim przypadku będziesz musiał ściągnąć i zainstalować wtyczkę ręcznie).';
-$lang['error_copy']            = 'Wystąpił błąd podczas kopiowania pliku w trakcie instalacji wtyczki %s: być może dysk jest pełny lub prawa dostępu są niepoprawne. Efektem może być częściowo zainstalowana wtyczka co może spowodować niestabilność Twojej instalacji wiki.';
-$lang['error_delete']          = 'Wystąpił błąd przy próbie usunięcia wtyczki <em>%s</em>. Prawdopodobną przyczyną są niewystarczające uprawnienia do katalogu.';
-$lang['enabled']               = 'Wtyczka %s włączona.';
-$lang['notenabled']            = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.';
-$lang['disabled']              = 'Wtyczka %s wyłączona.';
-$lang['notdisabled']           = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.';
-$lang['packageinstalled']      = 'Pakiet wtyczek (%d wtyczki: %s) zainstalowany pomyślnie.';
diff --git a/lib/plugins/plugin/lang/sk/admin_plugin.txt b/lib/plugins/plugin/lang/sk/admin_plugin.txt
deleted file mode 100644
index ad3ae7f58..000000000
--- a/lib/plugins/plugin/lang/sk/admin_plugin.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Správa pluginov ======
-
-Na tejto stránke je možné spravovať [[doku>plugins|pluginy]] Dokuwiki. Aby bolo možné sťahovať a inštalovať pluginy, musí mať webový server prístup pre zápis do adresára //plugin//.
-
diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php
deleted file mode 100644
index 35c07cf80..000000000
--- a/lib/plugins/plugin/lang/sk/lang.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Ondrej Végh <ov@vsieti.sk>
- * @author Michal Mesko <michal.mesko@gmail.com>
- * @author exusik@gmail.com
- * @author Martin Michalek <michalek.dev@gmail.com>
- */
-$lang['menu']                  = 'Správa pluginov';
-$lang['download']              = 'Stiahnuť a nainštalovať plugin';
-$lang['manage']                = 'Nainštalované pluginy';
-$lang['btn_info']              = 'info';
-$lang['btn_update']            = 'aktualizovať';
-$lang['btn_delete']            = 'zmazať';
-$lang['btn_settings']          = 'nastavenia';
-$lang['btn_download']          = 'Stiahnuť';
-$lang['btn_enable']            = 'Uložiť';
-$lang['url']                   = 'URL';
-$lang['installed']             = 'Nainštalovaný:';
-$lang['lastupdate']            = 'Aktualizovaný:';
-$lang['source']                = 'Zdroj:';
-$lang['unknown']               = 'neznámy';
-$lang['updating']              = 'Aktualizuje sa ...';
-$lang['updated']               = 'Plugin %s bol úspešne aktualizovaný';
-$lang['updates']               = 'Nasledujúce pluginy bol úspešne aktualizované:';
-$lang['update_none']           = 'Neboli nájdené žiadne aktualizácie.';
-$lang['deleting']              = 'Vymazáva sa ...';
-$lang['deleted']               = 'Plugin %s bol zmazaný.';
-$lang['downloading']           = 'Sťahuje sa ...';
-$lang['downloaded']            = 'Plugin %s bol úspešne stiahnutý';
-$lang['downloads']             = 'Nasledujúce pluginy bol úspešne stiahnuté:';
-$lang['download_none']         = 'Neboli nájdené žiadne pluginy alebo nastal neznámy problém počas sťahovania a inštalácie pluginov.';
-$lang['plugin']                = 'Plugin:';
-$lang['components']            = 'Súčasti';
-$lang['noinfo']                = 'Tento plugin neobsahuje žiadne informácie, je možné, že je chybný.';
-$lang['name']                  = 'názov:';
-$lang['date']                  = 'Dátum:';
-$lang['type']                  = 'Typ:';
-$lang['desc']                  = 'Popis:';
-$lang['author']                = 'Autor:';
-$lang['www']                   = 'Web:';
-$lang['error']                 = 'Nastala neznáma chyba.';
-$lang['error_download']        = 'Nie je možné stiahnuť súbor pluginu: %s';
-$lang['error_badurl']          = 'Pravdepodobne zlá url adresa - nie je možné z nej určiť meno súboru';
-$lang['error_dircreate']       = 'Nie je možné vytvoriť dočasný adresár pre uloženie sťahovaného súboru';
-$lang['error_decompress']      = 'Správca pluginov nedokáže dekomprimovať stiahnutý súbor. Môže to byť dôsledok zlého stiahnutia, v tom prípade to skúste znovu, alebo môže ísť o neznámy formát súboru, v tom prípade musíte stiahnuť a nainštalovať plugin manuálne.';
-$lang['error_copy']            = 'Nastala chyba kopírovania súboru počas pokusu inštalovať súbory pluginu<em>%s</em>: disk môže byť plný alebo prístupové práva k súboru môžu byť nesprávne. Toto môže mať za následok čiastočne nainštalovanie pluginu a nestabilitu vašej DokuWiki.';
-$lang['error_delete']          = 'Nastala chyba počas pokusu o zmazanie pluginu <em>%s</em>.  Najpravdepodobnejším dôvodom môžu byť nedostatočné prístupové práva pre súbor alebo adresár';
-$lang['enabled']               = 'Plugin %s aktivovaný.';
-$lang['notenabled']            = 'Plugin %s nemôže byť aktivovaný, skontrolujte prístupové práva.';
-$lang['disabled']              = 'Plugin %s deaktivovaný.';
-$lang['notdisabled']           = 'Plugin %s nemôže byť deaktivovaný, skontrolujte prístupové práva.';
-$lang['packageinstalled']      = 'Plugin package (%d plugin(s): %s) úspešne inštalovaný.';
diff --git a/lib/plugins/plugin/lang/sl/admin_plugin.txt b/lib/plugins/plugin/lang/sl/admin_plugin.txt
deleted file mode 100644
index 5fd02e1ba..000000000
--- a/lib/plugins/plugin/lang/sl/admin_plugin.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== Upravljanje vstavkov ======
-
-Na tej strani je mogoče spreminjati in prilagajati nastavitve DokuWiki [[doku>plugins|vstavkov]]. Za prejemanje in nameščanje vstavkov v ustrezne mape, morajo imeti te določena ustrezna dovoljenja za pisanje spletnega strežnika.
diff --git a/lib/plugins/plugin/lang/sl/lang.php b/lib/plugins/plugin/lang/sl/lang.php
deleted file mode 100644
index e205c57f5..000000000
--- a/lib/plugins/plugin/lang/sl/lang.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Dejan Levec <webphp@gmail.com>
- * @author Boštjan Seničar <senicar@gmail.com>
- * @author Gregor Skumavc (grega.skumavc@gmail.com)
- * @author Matej Urbančič (mateju@svn.gnome.org)
- */
-$lang['menu']                  = 'Upravljanje vstavkov';
-$lang['download']              = 'Prejmi in namesti nov vstavek';
-$lang['manage']                = 'Nameščeni vstavki';
-$lang['btn_info']              = 'Podrobnosti';
-$lang['btn_update']            = 'Posodobi';
-$lang['btn_delete']            = 'Izbriši';
-$lang['btn_settings']          = 'Nastavitve';
-$lang['btn_download']          = 'Prejmi';
-$lang['btn_enable']            = 'Shrani';
-$lang['url']                   = 'URL';
-$lang['installed']             = 'Nameščeno:';
-$lang['lastupdate']            = 'Nazadnje posodobljeno:';
-$lang['source']                = 'Vir:';
-$lang['unknown']               = 'neznano';
-$lang['updating']              = 'Posodabljanje ...';
-$lang['updated']               = 'Vstavek %s je uspešno posodobljen';
-$lang['updates']               = 'Navedeni vstavki so uspešno posodobljeni';
-$lang['update_none']           = 'Posodobitev ni mogoče najti.';
-$lang['deleting']              = 'Brisanje ...';
-$lang['deleted']               = 'Vstavek %s je izbrisan.';
-$lang['downloading']           = 'Prejemanje ...';
-$lang['downloaded']            = 'Vstavek %s je uspešno nameščen';
-$lang['downloads']             = 'Navedeni vstavki so uspešno nameščeni:';
-$lang['download_none']         = 'Vstavkov ni mogoče najti ali pa je prišlo do napake med prejemanjem in nameščanjem.';
-$lang['plugin']                = 'Vstavek:';
-$lang['components']            = 'Sestavni deli';
-$lang['noinfo']                = 'Vstavek nima vpisanih podrobnih podatkov, kar pomeni, da je morda neveljaven.';
-$lang['name']                  = 'Ime:';
-$lang['date']                  = 'Datum:';
-$lang['type']                  = 'Vrsta:';
-$lang['desc']                  = 'Opis:';
-$lang['author']                = 'Avtor:';
-$lang['www']                   = 'Spletna stran:';
-$lang['error']                 = 'Prišlo je do neznane napake.';
-$lang['error_download']        = 'Ni mogoče prejeti datoteke vstavka: %s';
-$lang['error_badurl']          = 'Napaka naslova URL - ni mogoče določiti imena datoteke iz naslova URL';
-$lang['error_dircreate']       = 'Ni mogoče ustvariti začasne mape za prejemanje';
-$lang['error_decompress']      = 'Z upravljalnikom vstavkov ni mogoče razširiti prejetega arhiva vstavka. Najverjetneje je prišlo do napake med prejemanjem datoteke ali pa zapis arhiva ni znan. Poskusite znova ali pa napako odpravite z ročnim nameščanjem vstavka.';
-$lang['error_copy']            = 'Prišlo je do napake med nameščanjem datotek vstavka <em>%s</em>: najverjetneje so težave s prostorom za namestitev ali pa ni ustreznih dovoljenj za nameščanje. Zaradi nepopolne namestitve lahko nastopijo težave v delovanju sistema Wiki.';
-$lang['error_delete']          = 'Prišlo je do napake med brisanjem vstavka <em>%s</em>: najverjetneje ni ustreznih dovoljenj za dostop do datoteke ali mape';
-$lang['enabled']               = 'Vstavek %s je omogočen.';
-$lang['notenabled']            = 'Vstavka %s ni mogoče omogočiti zaradi neustreznih dovoljen.';
-$lang['disabled']              = 'Vstavek %s je onemogočen.';
-$lang['notdisabled']           = 'Vstavka %s ni mogoče onemogočiti zaradi neustreznih dovoljen.';
-$lang['packageinstalled']      = 'Paket vstavka (%d vstavkov: %s) je uspešno nameščen.';
diff --git a/lib/plugins/plugin/lang/tr/admin_plugin.txt b/lib/plugins/plugin/lang/tr/admin_plugin.txt
deleted file mode 100644
index 956d701f6..000000000
--- a/lib/plugins/plugin/lang/tr/admin_plugin.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== Eklenti Yönetimi ======
-
-Bu sayfada DokuWiki [[doku>plugins|eklentileri]] ile ilgili herşeyi düzenleyebilirsiniz. Eklenti kurup indirmek için, eklenti dizininin yazılabilir olması gerekmektedir.
diff --git a/lib/plugins/plugin/lang/tr/lang.php b/lib/plugins/plugin/lang/tr/lang.php
deleted file mode 100644
index a4feea8cd..000000000
--- a/lib/plugins/plugin/lang/tr/lang.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Aydın Coşkuner <aydinweb@gmail.com>
- * @author Cihan Kahveci <kahvecicihan@gmail.com>
- * @author Yavuz Selim <yavuzselim@gmail.com>
- * @author Caleb Maclennan <caleb@alerque.com>
- * @author farukerdemoncel@gmail.com
- */
-$lang['menu']                  = 'Eklenti Yönetimi';
-$lang['download']              = 'Yeni bir eklenti indirip kur';
-$lang['manage']                = 'Kurulmuş Eklentiler';
-$lang['btn_info']              = 'bilgi';
-$lang['btn_update']            = 'güncelle';
-$lang['btn_delete']            = 'sil';
-$lang['btn_settings']          = 'Ayarlar';
-$lang['btn_download']          = 'İndir';
-$lang['btn_enable']            = 'Kaydet';
-$lang['url']                   = 'Web Adresi';
-$lang['installed']             = 'Kuruldu:';
-$lang['lastupdate']            = 'Son güncelleştirme:';
-$lang['source']                = 'Kaynak:';
-$lang['unknown']               = 'bilinmiyor';
-$lang['updating']              = 'Güncelleştiriyor ...';
-$lang['updated']               = '%s eklentisi başarıyla güncellendi';
-$lang['updates']               = 'Şu eklentiler başarıyla güncellendi';
-$lang['update_none']           = 'Yeni bir güncelleme bulunamadı.';
-$lang['deleting']              = 'Siliniyor ...';
-$lang['deleted']               = '%s eklentisi silindi.';
-$lang['downloading']           = 'İndiriyor ...';
-$lang['downloaded']            = '%s eklentisi başarıyla kuruldu';
-$lang['downloads']             = 'Şu eklentiler başarıyla kuruldu:';
-$lang['download_none']         = 'Eklenti bulunamadı veya indirirken/kurarken bilinmeyen bir hata oluştu.';
-$lang['plugin']                = 'Eklenti:';
-$lang['components']            = 'Parçalar';
-$lang['noinfo']                = 'Bu eklentinin bilgileri alınamadı, geçerli bir eklenti olmayabilir.';
-$lang['name']                  = 'Ad:';
-$lang['date']                  = 'Tarih:';
-$lang['type']                  = 'Tür:';
-$lang['desc']                  = 'Açıklama:';
-$lang['author']                = 'Yazar:';
-$lang['www']                   = 'Web Adresi:';
-$lang['error']                 = 'Bilinmeyen bir hata oluştu.';
-$lang['error_download']        = 'Şu eklenti indirilemedi: %s';
-$lang['error_badurl']          = 'Yanlış adres olabilir - verilen adresten dosya adı alınamadı';
-$lang['error_dircreate']       = 'İndirmek için geçici klasör oluşturulamadı';
-$lang['error_decompress']      = 'Eklenti yöneticisi indirilen sıkıştırılmış dosyayı açamadı. Bu yanlış indirmeden kaynaklanabilir (bu durumda tekrar denemelisiniz). Ya da indirilen dosyanın sıkıştırma biçimi bilinmemektedir (bu durumda eklentiyi indirerek kendiniz kurmalısınız).';
-$lang['error_copy']            = '<em>%s</em> eklentisi dosyalarını kurmaya çalışırken kopyalama hatası ortaya çıktı. Sürücü dolu olabilir veya yazma yetkisi bulunmuyor olabilir. Bunun sebebi tam kurulmamış bir eklentinin wiki kurulumunu bozması olabilir.';
-$lang['error_delete']          = '<em>%s</em> eklentisini silerken bir hata oluştu. Bu hata yetersiz dosya/klasör erişim yetkisinden kaynaklanabilir.';
-$lang['enabled']               = '%s eklentisi etkinleştirildi.';
-$lang['notenabled']            = '%s eklentisi etkinleştirilemedi, dosya yetkilerini kontrol edin.';
-$lang['disabled']              = '%s eklentisi devre dışı bırakıldı.';
-$lang['notdisabled']           = '%s eklentisi devre dışı bırakılamadı, dosya yetkilerini kontrol edin.';
-- 
cgit v1.2.3


From fd51467adc437f0a764f96cd4b94ff58a2ad8160 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Tue, 25 Feb 2014 10:40:57 +0100
Subject: translation update

---
 lib/plugins/extension/lang/sk/lang.php | 58 ++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 lib/plugins/extension/lang/sk/lang.php

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/sk/lang.php b/lib/plugins/extension/lang/sk/lang.php
new file mode 100644
index 000000000..d00c2e32b
--- /dev/null
+++ b/lib/plugins/extension/lang/sk/lang.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Martin Michalek <michalek.dev@gmail.com>
+ */
+$lang['tab_plugins']           = 'Inštalované pluginy';
+$lang['tab_templates']         = 'Inštalované šablóny';
+$lang['tab_search']            = 'Hľadanie e inštalácia';
+$lang['tab_install']           = 'Manuálna inštalácia';
+$lang['notimplemented']        = 'Táto vlastnosť ešte nebola implementovaná';
+$lang['unknownauthor']         = 'Neznámy autor';
+$lang['unknownversion']        = 'Neznáma verzia';
+$lang['btn_info']              = 'Viac informácií';
+$lang['btn_update']            = 'Aktualizácia';
+$lang['btn_uninstall']         = 'Odinštalovanie';
+$lang['btn_enable']            = 'Povolenie';
+$lang['btn_disable']           = 'Zablokovanie';
+$lang['btn_install']           = 'Inštalácia';
+$lang['btn_reinstall']         = 'Re-Inštalácia';
+$lang['search']                = 'Vyhľadávanie';
+$lang['extensionby']           = '<strong>%s</strong> od %s';
+$lang['screenshot']            = 'Obrázok od %s';
+$lang['popularity']            = 'Popularita: %s%%';
+$lang['homepage_link']         = 'Dokumentácia';
+$lang['bugs_features']         = 'Chyby:';
+$lang['tags']                  = 'Kľúčové slová:';
+$lang['unknown']               = '<em>neznámy</em>';
+$lang['installed_version']     = 'Inštalovaná verzia:';
+$lang['install_date']          = 'Posledná aktualizácia:';
+$lang['available_version']     = 'Dostupné verzie:';
+$lang['compatible']            = 'Kompaktibilita:';
+$lang['similar']               = 'Podobné:';
+$lang['conflicts']             = 'V konflikte:';
+$lang['status_installed']      = 'inštalovaný';
+$lang['status_not_installed']  = 'neinštalovaný';
+$lang['status_protected']      = 'chránený';
+$lang['status_enabled']        = 'povolený';
+$lang['status_disabled']       = 'nepovolený';
+$lang['status_plugin']         = 'plugin';
+$lang['status_template']       = 'šablóna';
+$lang['msg_enabled']           = 'Plugin %s povolený';
+$lang['msg_disabled']          = 'Plugin %s nepovolený';
+$lang['msg_template_install_success'] = 'Šablóna %s úspešne nainštalovaná';
+$lang['msg_template_update_success'] = 'Šablóna %s úspešne aktualizovaná';
+$lang['msg_plugin_install_success'] = 'Plugin %s úspešne nainštalovaný';
+$lang['msg_plugin_update_success'] = 'Plugin %s úspešne aktualizovaný';
+$lang['msg_upload_failed']     = 'Nahrávanie súboru zlyhalo';
+$lang['update_available']      = '<strong>Aktualizácia:</strong> Nová verzia %s.';
+$lang['wrong_folder']          = '<strong>Plugin nesprávne nainštalovaný:</strong> Premenujte adresár s pluginom "%s" na "%s".';
+$lang['error_badurl']          = 'URL by mali mať na začiatku http alebo https';
+$lang['error_dircreate']       = 'Nie je možné vytvoriť dočasný adresár pre uloženie sťahovaného súboru';
+$lang['error_download']        = 'Nie je možné stiahnuť súbor: %s';
+$lang['error_decompress']      = 'Nie je možné dekomprimovať stiahnutý súbor. Môže to byť dôvodom chyby sťahovania (v tom prípade to skúste znova) alebo neznámym kompresným formátom (v tom prípade musíte stiahnuť a inštalovať manuálne).';
+$lang['error_copy']            = 'Chyba kopírovania pri inštalácii do adresára <em>%s</em>: disk môže byť plný alebo nemáte potrebné prístupové oprávnenie. Dôsledkom može byť čiastočne inštalovaný plugin a nestabilná wiki inštalácia.';
+$lang['nopluginperms']         = 'Adresár s pluginom nie je zapisovateľný.';
+$lang['install_url']           = 'Inštalácia z URL:';
-- 
cgit v1.2.3


From cdc6cb5b5424420efd689aaab13341628529c0be Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Thu, 27 Feb 2014 17:31:41 +0100
Subject: translation update

---
 lib/plugins/extension/lang/ja/intro_install.txt   |  1 +
 lib/plugins/extension/lang/ja/intro_plugins.txt   |  1 +
 lib/plugins/extension/lang/ja/intro_search.txt    |  1 +
 lib/plugins/extension/lang/ja/intro_templates.txt |  1 +
 lib/plugins/extension/lang/ja/lang.php            | 54 +++++++++++++++++++++++
 5 files changed, 58 insertions(+)
 create mode 100644 lib/plugins/extension/lang/ja/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/ja/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/ja/intro_search.txt
 create mode 100644 lib/plugins/extension/lang/ja/intro_templates.txt
 create mode 100644 lib/plugins/extension/lang/ja/lang.php

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/ja/intro_install.txt b/lib/plugins/extension/lang/ja/intro_install.txt
new file mode 100644
index 000000000..889ed6879
--- /dev/null
+++ b/lib/plugins/extension/lang/ja/intro_install.txt
@@ -0,0 +1 @@
+ここでは、アップロードするかダウンロードURLを指定して、手動でプラグインやテンプレートをインストールできます。
diff --git a/lib/plugins/extension/lang/ja/intro_plugins.txt b/lib/plugins/extension/lang/ja/intro_plugins.txt
new file mode 100644
index 000000000..9bfc68431
--- /dev/null
+++ b/lib/plugins/extension/lang/ja/intro_plugins.txt
@@ -0,0 +1 @@
+このDokuWikiに現在インストールされているプラグインです。ここでは、これらプラグインを有効化、無効化、アンインストールすることができます。同様にプラグインのアップデートも表示されます。アップデート前に、プラグインのマニュアルをお読みください。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ja/intro_search.txt b/lib/plugins/extension/lang/ja/intro_search.txt
new file mode 100644
index 000000000..66d977b1b
--- /dev/null
+++ b/lib/plugins/extension/lang/ja/intro_search.txt
@@ -0,0 +1 @@
+このタブでは、DokuWiki用の利用可能なすべてのサードパーティのプラグインとテンプレートにアクセスできます。サードパーティ製のコードには、**セキュリティ上のリスク**の可能性があることに注意してください、最初に[[doku>ja:security#プラグインのセキュリティ|プラグインのセキュリティ]]を読むことをお勧めします。
\ 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
new file mode 100644
index 000000000..f97694aaa
--- /dev/null
+++ b/lib/plugins/extension/lang/ja/intro_templates.txt
@@ -0,0 +1 @@
+この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
new file mode 100644
index 000000000..0401d7630
--- /dev/null
+++ b/lib/plugins/extension/lang/ja/lang.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hideaki SAWADA <chuno@live.jp>
+ */
+$lang['menu']                  = '拡張機能管理';
+$lang['tab_plugins']           = 'インストール済プラグイン';
+$lang['tab_templates']         = 'インストール済テンプレート';
+$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['downloadurl']           = 'ダウンロード URL：';
+$lang['repository']            = 'リポジトリ：';
+$lang['depends']               = '依存：';
+$lang['similar']               = '類似：';
+$lang['status_installed']      = 'インストール済';
+$lang['status_not_installed']  = '未インストール';
+$lang['status_enabled']        = '有効';
+$lang['status_disabled']       = '無効';
+$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['security_issue']        = '<strong>セキュリティ問題：</strong> %s';
+$lang['security_warning']      = '<strong>セキュリティ警告：</strong> %s';
+$lang['update_available']      = '<strong>アップデート：</strong>％sの新バージョンが利用可能です。 ';
+$lang['error_badurl']          = 'URLはhttpかhttpsで始まる必要があります。';
+$lang['error_dircreate']       = 'ダウンロード用の一時フォルダが作成できません。';
+$lang['error_download']        = 'ファイルをダウンロードできません：%s';
+$lang['noperms']               = '拡張機能ディレクトリが書き込み不可です。';
+$lang['notplperms']            = 'テンプレートディレクトリが書き込み不可です。';
+$lang['nopluginperms']         = 'プラグインディレクトリが書き込み不可です。';
-- 
cgit v1.2.3


From 2650e2e10d5ba44aafa270734f19a38a24df8a7b Mon Sep 17 00:00:00 2001
From: "H. Richard" <wanderer379@t-online.de>
Date: Thu, 27 Feb 2014 22:01:02 +0100
Subject: translation update

---
 lib/plugins/extension/lang/de/intro_install.txt   |  1 +
 lib/plugins/extension/lang/de/intro_plugins.txt   |  1 +
 lib/plugins/extension/lang/de/intro_search.txt    |  1 +
 lib/plugins/extension/lang/de/intro_templates.txt |  1 +
 lib/plugins/extension/lang/de/lang.php            | 74 +++++++++++++++++++++++
 5 files changed, 78 insertions(+)
 create mode 100644 lib/plugins/extension/lang/de/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/de/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/de/intro_search.txt
 create mode 100644 lib/plugins/extension/lang/de/intro_templates.txt
 create mode 100644 lib/plugins/extension/lang/de/lang.php

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/de/intro_install.txt b/lib/plugins/extension/lang/de/intro_install.txt
new file mode 100644
index 000000000..4ecebe959
--- /dev/null
+++ b/lib/plugins/extension/lang/de/intro_install.txt
@@ -0,0 +1 @@
+Hier können Sie Plugins und Templates von Hand installieren indem Sie sie hochladen oder eine Download-URL angeben.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/de/intro_plugins.txt b/lib/plugins/extension/lang/de/intro_plugins.txt
new file mode 100644
index 000000000..a14304fe4
--- /dev/null
+++ b/lib/plugins/extension/lang/de/intro_plugins.txt
@@ -0,0 +1 @@
+Dies sind die Plugin's, die schon installiert sind. Sie können sie hier an- oder abschalten oder sie komplett deinstallieren. Außerdem werden hier Updates zu den installiereten Plugin's angezeigt. Bitte lesen Sie vor einem Update die zugehörige Dokumentation.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/de/intro_search.txt b/lib/plugins/extension/lang/de/intro_search.txt
new file mode 100644
index 000000000..02f01acb9
--- /dev/null
+++ b/lib/plugins/extension/lang/de/intro_search.txt
@@ -0,0 +1 @@
+Dieser Tab gibt Ihnen Zugriff auf alle vorhandenen Plugin's und Templates für DokuWiki, die von dritte Seite angeboten werden. Bitte seien Sie sich dessen bewusst, dass dieser Code ein Sicherheitsrisiko darstellen kann. Sie sollten vor einer Installation weiter dazu lesen: [[doku>security#plugin_security|plugin security]]
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/de/intro_templates.txt b/lib/plugins/extension/lang/de/intro_templates.txt
new file mode 100644
index 000000000..be26c00ac
--- /dev/null
+++ b/lib/plugins/extension/lang/de/intro_templates.txt
@@ -0,0 +1 @@
+Dies sind die in Ihrem Dokuwiki installierten Templates. Sie können das gewünschte Template hier:  [[?do=admin&page=config|Configuration Manager]] aussuchen.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
new file mode 100644
index 000000000..8aca8646e
--- /dev/null
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author H. Richard <wanderer379@t-online.de>
+ */
+$lang['menu']                  = 'Erweiterungen verwalten';
+$lang['tab_plugins']           = 'installierte Plugin\'s';
+$lang['tab_templates']         = 'installierte Templates';
+$lang['tab_search']            = 'Suchen und installieren';
+$lang['tab_install']           = 'händisch installieren';
+$lang['notimplemented']        = 'Diese Fähigkeit/Eigenschaft wurde noch nicht implementiert';
+$lang['notinstalled']          = 'Diese Erweiterung ist nicht installiert';
+$lang['alreadyenabled']        = 'Diese Erweiterung wurde bereits angeschaltet';
+$lang['alreadydisabled']       = 'Diese Erweiterung wurde bereits abgeschaltet';
+$lang['pluginlistsaveerror']   = 'Es gab einen Fehler beim Speichern der Plugin-Liste';
+$lang['unknownauthor']         = 'Unbekannter Autor';
+$lang['unknownversion']        = 'Unbekannte Version';
+$lang['btn_info']              = 'Zeige weitere Info';
+$lang['btn_update']            = 'Update';
+$lang['btn_uninstall']         = 'Deinstallation';
+$lang['btn_enable']            = 'Anschalten (enable)';
+$lang['btn_disable']           = 'Abschalten (disable)';
+$lang['btn_install']           = 'Installieren';
+$lang['btn_reinstall']         = 'Von neuem installieren';
+$lang['js']['reallydel']       = 'Wollen Sie diese Erweiterung wirklich installieren?';
+$lang['search_for']            = 'Erweiterung suchen:';
+$lang['search']                = 'Suchen';
+$lang['extensionby']           = '<fett>%s</fett> mit %s';
+$lang['screenshot']            = 'Bildschirmfoto mit %s';
+$lang['popularity']            = 'Popularität: %s%%';
+$lang['homepage_link']         = 'Dokumentation';
+$lang['bugs_features']         = 'Fehler';
+$lang['tags']                  = 'Kennwörter';
+$lang['author_hint']           = 'Suche Erweiterungen mittels Name des Autor\'s';
+$lang['installed']             = 'Installiert:';
+$lang['downloadurl']           = 'URL zum Herunterladen';
+$lang['unknown']               = '<em>unbekannt</em>';
+$lang['installed_version']     = 'Installierte Version';
+$lang['install_date']          = 'Ihr letztes Update:';
+$lang['available_version']     = 'Verfügbare Version: ';
+$lang['compatible']            = 'verträglich mit:';
+$lang['depends']               = 'hängt ab von:';
+$lang['similar']               = 'Ist ähnlich zu:';
+$lang['conflicts']             = 'ist in Konflikt mit:';
+$lang['donate']                = 'ist dies ähnlich?';
+$lang['donate_action']         = 'Spendieren Sie dem Autor einen Kaffee!';
+$lang['repo_retry']            = 'Versuchen Sie\'s noch mal!';
+$lang['provides']              = 'Stellt zur Verfügung';
+$lang['status']                = 'Status';
+$lang['status_installed']      = 'installiert';
+$lang['status_not_installed']  = 'nicht installiert';
+$lang['status_protected']      = 'geschützt';
+$lang['status_enabled']        = 'angeschaltet (enabled)';
+$lang['status_disabled']       = 'abgeschaltet (disabled)';
+$lang['status_unmodifiable']   = 'unveränderlich';
+$lang['status_plugin']         = 'Plugin';
+$lang['status_template']       = 'Mustervorgabe (Template)';
+$lang['status_bundled']        = 'verbunden';
+$lang['msg_enabled']           = 'Plugin %s ist angeschaltet';
+$lang['msg_disabled']          = 'Erweiterung %s ist abgeschaltet';
+$lang['msg_delete_success']    = 'diese Erweiterung ist nicht installiert';
+$lang['msg_template_install_success'] = 'Das Template %s wurde erfolgreich installiert';
+$lang['msg_template_update_success'] = 'Das Update des Templates %s war erfolgreich ';
+$lang['msg_plugin_install_success'] = 'Das Plugin %s wurde erfolgreich installiert';
+$lang['msg_plugin_update_success'] = 'Das Update des Plugin\'s %s war erfolgreich';
+$lang['msg_upload_failed']     = 'Fehler beim Hochladen der Datei';
+$lang['missing_dependency']    = '<fett>fehlende oder abgeschaltete Abhängigkeit:<fett>%s';
+$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['install_url']           = 'Von der Webadresse (URL) installieren';
+$lang['install_upload']        = 'Erweiterung hochladen:';
-- 
cgit v1.2.3


From fee031291e3986d3f7fb0418934ca39ea74f7621 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 28 Feb 2014 11:13:48 +0100
Subject: improved German translation

---
 lib/plugins/extension/lang/de/intro_plugins.txt   |  2 +-
 lib/plugins/extension/lang/de/intro_search.txt    |  2 +-
 lib/plugins/extension/lang/de/intro_templates.txt |  2 +-
 lib/plugins/extension/lang/de/lang.php            | 71 +++++++++++------------
 4 files changed, 38 insertions(+), 39 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/de/intro_plugins.txt b/lib/plugins/extension/lang/de/intro_plugins.txt
index a14304fe4..1a1521050 100644
--- a/lib/plugins/extension/lang/de/intro_plugins.txt
+++ b/lib/plugins/extension/lang/de/intro_plugins.txt
@@ -1 +1 @@
-Dies sind die Plugin's, die schon installiert sind. Sie können sie hier an- oder abschalten oder sie komplett deinstallieren. Außerdem werden hier Updates zu den installiereten Plugin's angezeigt. Bitte lesen Sie vor einem Update die zugehörige Dokumentation.
\ No newline at end of file
+Dies sind die Plugins, die bereits installiert sind. Sie können sie hier an- oder abschalten oder sie komplett deinstallieren. Außerdem werden hier Updates zu den installiereten Plugins angezeigt. Bitte lesen Sie vor einem Update die zugehörige Dokumentation.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/de/intro_search.txt b/lib/plugins/extension/lang/de/intro_search.txt
index 02f01acb9..7df8de185 100644
--- a/lib/plugins/extension/lang/de/intro_search.txt
+++ b/lib/plugins/extension/lang/de/intro_search.txt
@@ -1 +1 @@
-Dieser Tab gibt Ihnen Zugriff auf alle vorhandenen Plugin's und Templates für DokuWiki, die von dritte Seite angeboten werden. Bitte seien Sie sich dessen bewusst, dass dieser Code ein Sicherheitsrisiko darstellen kann. Sie sollten vor einer Installation weiter dazu lesen: [[doku>security#plugin_security|plugin security]]
\ No newline at end of file
+Dieser Tab gibt Ihnen Zugriff auf alle vorhandenen Plugins und Templates für DokuWiki. Bitte bedenken sie das jede installierte Erweiterung ein Sicherheitsrisiko darstellen kann. Sie sollten vor einer Installation die [[doku>security#plugin_security|Plugin Security]] Informationen lesen.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/de/intro_templates.txt b/lib/plugins/extension/lang/de/intro_templates.txt
index be26c00ac..d71ce6237 100644
--- a/lib/plugins/extension/lang/de/intro_templates.txt
+++ b/lib/plugins/extension/lang/de/intro_templates.txt
@@ -1 +1 @@
-Dies sind die in Ihrem Dokuwiki installierten Templates. Sie können das gewünschte Template hier:  [[?do=admin&page=config|Configuration Manager]] aussuchen.
\ No newline at end of file
+Dies sind die in Ihrem Dokuwiki installierten Templates. Sie können das gewünschte Template im [[?do=admin&page=config|Konfigurations Manager]] aktivieren.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index 8aca8646e..10d501130 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -6,69 +6,68 @@
  * @author H. Richard <wanderer379@t-online.de>
  */
 $lang['menu']                  = 'Erweiterungen verwalten';
-$lang['tab_plugins']           = 'installierte Plugin\'s';
-$lang['tab_templates']         = 'installierte Templates';
-$lang['tab_search']            = 'Suchen und installieren';
-$lang['tab_install']           = 'händisch installieren';
-$lang['notimplemented']        = 'Diese Fähigkeit/Eigenschaft wurde noch nicht implementiert';
+$lang['tab_plugins']           = 'Installierte Plugins';
+$lang['tab_templates']         = 'Installierte Templates';
+$lang['tab_search']            = 'Suchen und Installieren';
+$lang['tab_install']           = 'Händisch installieren';
+$lang['notimplemented']        = 'Dieses Fähigkeit/Eigenschaft wurde noch nicht implementiert';
 $lang['notinstalled']          = 'Diese Erweiterung ist nicht installiert';
-$lang['alreadyenabled']        = 'Diese Erweiterung wurde bereits angeschaltet';
-$lang['alreadydisabled']       = 'Diese Erweiterung wurde bereits abgeschaltet';
+$lang['alreadyenabled']        = 'Diese Erweiterung ist bereits aktiviert';
+$lang['alreadydisabled']       = 'Diese Erweiterung ist bereits deaktiviert';
 $lang['pluginlistsaveerror']   = 'Es gab einen Fehler beim Speichern der Plugin-Liste';
 $lang['unknownauthor']         = 'Unbekannter Autor';
 $lang['unknownversion']        = 'Unbekannte Version';
 $lang['btn_info']              = 'Zeige weitere Info';
 $lang['btn_update']            = 'Update';
 $lang['btn_uninstall']         = 'Deinstallation';
-$lang['btn_enable']            = 'Anschalten (enable)';
-$lang['btn_disable']           = 'Abschalten (disable)';
+$lang['btn_enable']            = 'Aktivieren';
+$lang['btn_disable']           = 'Deaktivieren';
 $lang['btn_install']           = 'Installieren';
-$lang['btn_reinstall']         = 'Von neuem installieren';
-$lang['js']['reallydel']       = 'Wollen Sie diese Erweiterung wirklich installieren?';
+$lang['btn_reinstall']         = 'Neu installieren';
+$lang['js']['reallydel']       = 'Wollen Sie diese Erweiterung wirklich löschen?';
 $lang['search_for']            = 'Erweiterung suchen:';
 $lang['search']                = 'Suchen';
-$lang['extensionby']           = '<fett>%s</fett> mit %s';
-$lang['screenshot']            = 'Bildschirmfoto mit %s';
+$lang['extensionby']           = '<strong>%s</strong> von %s';
+$lang['screenshot']            = 'Bildschirmfoto von %s';
 $lang['popularity']            = 'Popularität: %s%%';
-$lang['homepage_link']         = 'Dokumentation';
-$lang['bugs_features']         = 'Fehler';
-$lang['tags']                  = 'Kennwörter';
-$lang['author_hint']           = 'Suche Erweiterungen mittels Name des Autor\'s';
+$lang['homepage_link']         = 'Doku';
+$lang['bugs_features']         = 'Bugs';
+$lang['tags']                  = 'Schlagworte';
+$lang['author_hint']           = 'Suche weitere Erweiterungen dieses Autors';
 $lang['installed']             = 'Installiert:';
 $lang['downloadurl']           = 'URL zum Herunterladen';
 $lang['unknown']               = '<em>unbekannt</em>';
 $lang['installed_version']     = 'Installierte Version';
 $lang['install_date']          = 'Ihr letztes Update:';
 $lang['available_version']     = 'Verfügbare Version: ';
-$lang['compatible']            = 'verträglich mit:';
-$lang['depends']               = 'hängt ab von:';
+$lang['compatible']            = 'Kompatibel mit:';
+$lang['depends']               = 'Benötigt:';
 $lang['similar']               = 'Ist ähnlich zu:';
-$lang['conflicts']             = 'ist in Konflikt mit:';
-$lang['donate']                = 'ist dies ähnlich?';
+$lang['conflicts']             = 'Nicht kompatibel mit:';
+$lang['donate']                = 'Nützlich?';
 $lang['donate_action']         = 'Spendieren Sie dem Autor einen Kaffee!';
-$lang['repo_retry']            = 'Versuchen Sie\'s noch mal!';
-$lang['provides']              = 'Stellt zur Verfügung';
+$lang['repo_retry']            = 'Neu versuchen';
+$lang['provides']              = 'Enthält';
 $lang['status']                = 'Status';
 $lang['status_installed']      = 'installiert';
 $lang['status_not_installed']  = 'nicht installiert';
 $lang['status_protected']      = 'geschützt';
-$lang['status_enabled']        = 'angeschaltet (enabled)';
-$lang['status_disabled']       = 'abgeschaltet (disabled)';
+$lang['status_enabled']        = 'aktiviert';
+$lang['status_disabled']       = 'deaktiviert';
 $lang['status_unmodifiable']   = 'unveränderlich';
 $lang['status_plugin']         = 'Plugin';
-$lang['status_template']       = 'Mustervorgabe (Template)';
-$lang['status_bundled']        = 'verbunden';
-$lang['msg_enabled']           = 'Plugin %s ist angeschaltet';
-$lang['msg_disabled']          = 'Erweiterung %s ist abgeschaltet';
-$lang['msg_delete_success']    = 'diese Erweiterung ist nicht installiert';
+$lang['status_template']       = 'Template';
+$lang['msg_enabled']           = 'Plugin %s ist aktiviert';
+$lang['msg_disabled']          = 'Erweiterung %s ist deaktiviert';
+$lang['msg_delete_success']    = 'Erweiterung wurde entfernt';
 $lang['msg_template_install_success'] = 'Das Template %s wurde erfolgreich installiert';
 $lang['msg_template_update_success'] = 'Das Update des Templates %s war erfolgreich ';
 $lang['msg_plugin_install_success'] = 'Das Plugin %s wurde erfolgreich installiert';
-$lang['msg_plugin_update_success'] = 'Das Update des Plugin\'s %s war erfolgreich';
+$lang['msg_plugin_update_success'] = 'Das Update des Plugins %s war erfolgreich';
 $lang['msg_upload_failed']     = 'Fehler beim Hochladen der Datei';
-$lang['missing_dependency']    = '<fett>fehlende oder abgeschaltete Abhängigkeit:<fett>%s';
-$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['install_url']           = 'Von der Webadresse (URL) installieren';
+$lang['missing_dependency']    = '<strong>fehlende oder deaktivierte Abhängigkeit:<strong>%s';
+$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['install_url']           = 'Von Webadresse (URL) installieren';
 $lang['install_upload']        = 'Erweiterung hochladen:';
-- 
cgit v1.2.3


From e30b0f289638b91494ea96d307fd82e1458d6dcf Mon Sep 17 00:00:00 2001
From: Wild <wild.dagger@free.fr>
Date: Sat, 22 Feb 2014 12:47:47 +0100
Subject: translation update

---
 lib/plugins/authad/lang/fr/settings.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php
index 84e0d00d9..d05390efc 100644
--- a/lib/plugins/authad/lang/fr/settings.php
+++ b/lib/plugins/authad/lang/fr/settings.php
@@ -4,7 +4,6 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
- * @author Momo50 <c.brothelande@gmail.com>
  */
 $lang['account_suffix']        = 'Le suffixe de votre compte. Ex.: <code>@mon.domaine.org</code>';
 $lang['base_dn']               = 'Votre nom de domaine de base. <code>DC=mon,DC=domaine,DC=org</code>';
@@ -12,7 +11,6 @@ $lang['domain_controllers']    = 'Une liste de contrôleurs de domaine séparés
 $lang['admin_username']        = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.';
 $lang['admin_password']        = 'Le mot de passe de l\'utilisateur ci-dessus.';
 $lang['sso']                   = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?';
-$lang['sso_charset']           = 'Le jeu de caractères de votre serveur web va passer le nom d\'utilisateur Kerberos ou NTLM. Vide pour UTF-8 ou latin-1. Nécessite l\'extension iconv.';
 $lang['real_primarygroup']     = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?';
 $lang['use_ssl']               = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.';
 $lang['use_tls']               = 'Utiliser une connexion TLS? Si utilisée, n\'activez pas SSL ci-dessus.';
-- 
cgit v1.2.3


From 176279377b99c01aa3ca08bd1a25b134fe7f97b0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 28 Feb 2014 11:20:26 +0100
Subject: fixed merge error

---
 lib/plugins/authad/lang/fr/settings.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php
index d05390efc..84e0d00d9 100644
--- a/lib/plugins/authad/lang/fr/settings.php
+++ b/lib/plugins/authad/lang/fr/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
+ * @author Momo50 <c.brothelande@gmail.com>
  */
 $lang['account_suffix']        = 'Le suffixe de votre compte. Ex.: <code>@mon.domaine.org</code>';
 $lang['base_dn']               = 'Votre nom de domaine de base. <code>DC=mon,DC=domaine,DC=org</code>';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = 'Une liste de contrôleurs de domaine séparés
 $lang['admin_username']        = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.';
 $lang['admin_password']        = 'Le mot de passe de l\'utilisateur ci-dessus.';
 $lang['sso']                   = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?';
+$lang['sso_charset']           = 'Le jeu de caractères de votre serveur web va passer le nom d\'utilisateur Kerberos ou NTLM. Vide pour UTF-8 ou latin-1. Nécessite l\'extension iconv.';
 $lang['real_primarygroup']     = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?';
 $lang['use_ssl']               = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.';
 $lang['use_tls']               = 'Utiliser une connexion TLS? Si utilisée, n\'activez pas SSL ci-dessus.';
-- 
cgit v1.2.3


From 85db969ec27b3f6e656d04a114174a630be90d4c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 28 Feb 2014 11:23:43 +0100
Subject: added missing language strings

---
 lib/plugins/authad/lang/de/lang.php | 10 ++++++++++
 lib/plugins/authad/lang/en/lang.php | 10 ++++++++++
 lib/plugins/authad/lang/ko/lang.php | 10 ++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 lib/plugins/authad/lang/de/lang.php
 create mode 100644 lib/plugins/authad/lang/en/lang.php
 create mode 100644 lib/plugins/authad/lang/ko/lang.php

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/de/lang.php b/lib/plugins/authad/lang/de/lang.php
new file mode 100644
index 000000000..3f275750c
--- /dev/null
+++ b/lib/plugins/authad/lang/de/lang.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * German language file for addomain plugin
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+
+$lang['domain'] = 'Anmelde-Domäne';
+
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/authad/lang/en/lang.php b/lib/plugins/authad/lang/en/lang.php
new file mode 100644
index 000000000..e2967d662
--- /dev/null
+++ b/lib/plugins/authad/lang/en/lang.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * English language file for addomain plugin
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+
+$lang['domain'] = 'Logon Domain';
+
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/authad/lang/ko/lang.php b/lib/plugins/authad/lang/ko/lang.php
new file mode 100644
index 000000000..1aa436708
--- /dev/null
+++ b/lib/plugins/authad/lang/ko/lang.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Korean language file for addomain plugin
+ *
+ * @author Myeongjin <aranet100@gmail.com>
+ */
+
+$lang['domain'] = '로그온 도메인';
+
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 8743dba0f5f8e6b92be336cafca4c71d0e137bcd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 28 Feb 2014 13:23:18 +0100
Subject: removed script, added README instead

---
 lib/images/fileicons/README       |  2 ++
 lib/images/fileicons/generate.php | 44 ---------------------------------------
 2 files changed, 2 insertions(+), 44 deletions(-)
 create mode 100644 lib/images/fileicons/README
 delete mode 100644 lib/images/fileicons/generate.php

(limited to 'lib')

diff --git a/lib/images/fileicons/README b/lib/images/fileicons/README
new file mode 100644
index 000000000..05385861e
--- /dev/null
+++ b/lib/images/fileicons/README
@@ -0,0 +1,2 @@
+For the generator of these files see
+https://github.com/splitbrain/file-icon-generator/blob/master/example-dokuwiki.php
diff --git a/lib/images/fileicons/generate.php b/lib/images/fileicons/generate.php
deleted file mode 100644
index b08749f49..000000000
--- a/lib/images/fileicons/generate.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-// this is not provided by DokuWiki and needs to checked out separately from
-// https://github.com/splitbrain/file-icon-generator
-require '/home/andi/projects/fileiconbuilder/FileIconBuilder.php';
-
-if('cli' != php_sapi_name()) die('This has to be run from command line');
-if(!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__).'/../../../').'/');
-define('NOSESSION', 1);
-require_once(DOKU_INC.'inc/init.php');
-
-$extensions = array(
-    'jpg', 'gif', 'png', 'ico',
-    'swf', 'mp3', 'ogg', 'wav', 'webm', 'ogv', 'mp4',
-    'tgz', 'tar', 'gz', 'bz2', 'zip', 'rar', '7z',
-    'pdf', 'ps',
-    'rpm', 'deb',
-    'doc', 'xls', 'ppt', 'rtf',
-    'docx', 'xlsx', 'pptx',
-    'sxw', 'sxc', 'sxi', 'sxd',
-    'odc', 'odf', 'odg', 'odi', 'odp', 'ods', 'odt',
-    'html', 'htm', 'txt', 'conf', 'xml', 'csv',
-    // these might be used in downloadable code blocks:
-    'c', 'cc', 'cpp', 'h', 'hpp', 'csh', 'diff', 'java', 'pas',
-    'pl', 'py', 'sh', 'bash', 'asm', 'htm', 'css', 'js', 'json'
-);
-
-// generate all the icons
-@mkdir('16x16');
-@mkdir('32x32');
-
-$DFIB = new FileIconBuilder();
-foreach($extensions as $ext) {
-    echo "$ext\n";
-    $DFIB->create16x16($ext,"16x16/$ext.png");
-    $DFIB->create32x32($ext,"32x32/$ext.png");
-}
-
-copy("16x16/jpg.png", "16x16/jpeg.png");
-copy("32x32/jpg.png", "32x32/jpeg.png");
-
-copy("16x16/htm.png", "16x16/html.png");
-copy("32x32/htm.png", "32x32/html.png");
-
-- 
cgit v1.2.3


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

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

(limited to 'lib')

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


From ddf7ce094f821dc45273f75203e5da7838d96e96 Mon Sep 17 00:00:00 2001
From: Cupen <Cupenoruler@foxmail.com>
Date: Wed, 5 Mar 2014 09:26:40 +0100
Subject: translation update

---
 lib/plugins/extension/lang/zh/intro_install.txt   |  1 +
 lib/plugins/extension/lang/zh/intro_search.txt    |  1 +
 lib/plugins/extension/lang/zh/intro_templates.txt |  1 +
 lib/plugins/extension/lang/zh/lang.php            | 33 +++++++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 lib/plugins/extension/lang/zh/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/zh/intro_search.txt
 create mode 100644 lib/plugins/extension/lang/zh/intro_templates.txt
 create mode 100644 lib/plugins/extension/lang/zh/lang.php

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/zh/intro_install.txt b/lib/plugins/extension/lang/zh/intro_install.txt
new file mode 100644
index 000000000..640839319
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_install.txt
@@ -0,0 +1 @@
+你可以通过上传或直接提供下载链接来安装插件和模板。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/intro_search.txt b/lib/plugins/extension/lang/zh/intro_search.txt
new file mode 100644
index 000000000..0059075c0
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_search.txt
@@ -0,0 +1 @@
+这个标签会为你展示所有DokuWiki的第三方插件和模板。但你需要知道这些由第三方提供的代码可能会给你带来**安全方面的风险**，你最好先读一下[[doku>security#plugin_security|插件安全性]]。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/intro_templates.txt b/lib/plugins/extension/lang/zh/intro_templates.txt
new file mode 100644
index 000000000..20575d381
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_templates.txt
@@ -0,0 +1 @@
+DokuWiki当前所使用的模板已经安装了，你可以在[[?do=admin&page=config|配置管理器]]里选择你要的模板。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
new file mode 100644
index 000000000..b5d77b1dd
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Cupen <Cupenoruler@foxmail.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> by %s';
+$lang['screenshot']            = '%s 的截图';
+$lang['popularity']            = '人气: %s%%';
+$lang['homepage_link']         = '文档';
-- 
cgit v1.2.3


From 9a9ddee0317986914ffa1990917c4267b04b5370 Mon Sep 17 00:00:00 2001
From: xiqingongzi <Xiqingongzi@Gmail.com>
Date: Wed, 5 Mar 2014 14:36:01 +0100
Subject: translation update

---
 lib/plugins/extension/lang/zh/lang.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
index b5d77b1dd..b9db01540 100644
--- a/lib/plugins/extension/lang/zh/lang.php
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Cupen <Cupenoruler@foxmail.com>
+ * @author xiqingongzi <Xiqingongzi@Gmail.com>
  */
 $lang['menu']                  = '扩展管理器';
 $lang['tab_plugins']           = '安装插件';
@@ -31,3 +32,19 @@ $lang['extensionby']           = '<strong>%s</strong> by %s';
 $lang['screenshot']            = '%s 的截图';
 $lang['popularity']            = '人气: %s%%';
 $lang['homepage_link']         = '文档';
+$lang['bugs_features']         = '错误';
+$lang['tags']                  = '标签：';
+$lang['author_hint']           = '搜索这个作者的插件';
+$lang['installed']             = '已安装的：';
+$lang['downloadurl']           = '下载地址：';
+$lang['repository']            = '版本库：';
+$lang['unknown']               = '<em>未知的</em>';
+$lang['installed_version']     = '已安装版本：';
+$lang['install_date']          = '您的最后一次升级：';
+$lang['donate']                = '喜欢？';
+$lang['donate_action']         = '捐给作者一杯咖啡钱！';
+$lang['repo_retry']            = '重试';
+$lang['status']                = '现状：';
+$lang['status_installed']      = '已安装的';
+$lang['status_plugin']         = '插件';
+$lang['status_template']       = '模板';
-- 
cgit v1.2.3


From 793c31f2960e132db444a6640c87d4fe5d8df49e Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 5 Mar 2014 21:03:18 +0000
Subject: fix misspelled variable name,

---
 lib/exe/fetch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index 5f82ad0e0..933367e35 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -79,7 +79,7 @@ if (defined('SIMPLE_TEST')) {
 
     //handle image resizing/cropping
     if((substr($MIME, 0, 5) == 'image') && ($WIDTH || $HEIGHT)) {
-        if($HEIGHT && $WDITH) {
+        if($HEIGHT && $WIDTH) {
             $data['file'] = $FILE = media_crop_image($data['file'], $EXT, $WIDTH, $HEIGHT);
         } else {
             $data['file'] = $FILE = media_resize_image($data['file'], $EXT, $WIDTH, $HEIGHT);
-- 
cgit v1.2.3


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

---
 lib/exe/mediamanager.php          | 4 ++--
 lib/plugins/acl/admin.php         | 2 +-
 lib/plugins/usermanager/admin.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index d94a24c74..7044232ce 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -57,7 +57,7 @@
     }
 
     // give info on PHP caught upload errors
-    if($_FILES['upload']['error']){
+    if(!empty($_FILES['upload']['error'])){
         switch($_FILES['upload']['error']){
             case 1:
             case 2:
@@ -71,7 +71,7 @@
     }
 
     // handle upload
-    if($_FILES['upload']['tmp_name']){
+    if(!empty($_FILES['upload']['tmp_name'])){
         $JUMPTO = media_upload($NS,$AUTH);
         if($JUMPTO) $NS = getNS($JUMPTO);
     }
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 6c7c28ff6..00bf9969f 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -488,7 +488,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
     function _html_list_acl($item){
         $ret = '';
         // what to display
-        if($item['label']){
+        if(!empty($item['label'])){
             $base = $item['label'];
         }else{
             $base = ':'.$item['id'];
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index eadfb76ad..b67d91b36 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -53,7 +53,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
 
         // attempt to retrieve any import failures from the session
-        if ($_SESSION['import_failures']){
+        if (!empty($_SESSION['import_failures'])){
             $this->_import_failures = $_SESSION['import_failures'];
         }
     }
-- 
cgit v1.2.3


From d072820d2d17a702aaa47a0dccb89cd50f982b98 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 5 Mar 2014 22:11:19 +0000
Subject: improvements in acl plugin to avoid missing var errors

---
 lib/plugins/acl/admin.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 00bf9969f..de38aedd5 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -268,7 +268,10 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         usort($data,array($this,'_tree_sort'));
         $count = count($data);
         if($count>0) for($i=1; $i<$count; $i++){
-            if($data[$i-1]['id'] == $data[$i]['id'] && $data[$i-1]['type'] == $data[$i]['type']) unset($data[$i]);
+            if($data[$i-1]['id'] == $data[$i]['id'] && $data[$i-1]['type'] == $data[$i]['type']) {
+                unset($data[$i]);
+                $i++;  // duplicate found, next $i can't be a duplicate, so skip forward one
+            }
         }
         return $data;
     }
@@ -496,8 +499,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         // highlight?
-        if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id']))
+        if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id'])) {
             $cl = ' cur';
+        } else {
+            $cl = '';
+        }
 
         // namespace or page?
         if($item['type']=='d'){
-- 
cgit v1.2.3


From 3cd4fc17379f0f917d5e1ed4d20decfb662aaf32 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 5 Mar 2014 22:18:08 +0000
Subject: remove '&' from object parameters, PHP5 style not E_ALL

---
 lib/plugins/info/syntax.php | 4 ++--
 lib/plugins/syntax.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index f8c6eb484..9265f44d5 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -48,7 +48,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
     /**
      * Handle the match
      */
-    function handle($match, $state, $pos, Doku_Handler &$handler){
+    function handle($match, $state, $pos, Doku_Handler $handler){
         $match = substr($match,7,-2); //strip ~~INFO: from start and ~~ from end
         return array(strtolower($match));
     }
@@ -56,7 +56,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
     /**
      * Create output
      */
-    function render($format, Doku_Renderer &$renderer, $data) {
+    function render($format, Doku_Renderer $renderer, $data) {
         if($format == 'xhtml'){
             /** @var Doku_Renderer_xhtml $renderer */
             //handle various info stuff
diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
index 7ab9c30e1..ec90993cf 100644
--- a/lib/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -66,7 +66,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * @param   Doku_Handler $handler Reference to the Doku_Handler object
      * @return  array Return an array with all data you want to use in render
      */
-    function handle($match, $state, $pos, Doku_Handler &$handler){
+    function handle($match, $state, $pos, Doku_Handler $handler){
         trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
     }
 
@@ -93,7 +93,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * @param   $data     array         data created by handler()
      * @return  boolean                 rendered correctly?
      */
-    function render($format, Doku_Renderer &$renderer, $data) {
+    function render($format, Doku_Renderer $renderer, $data) {
         trigger_error('render() not implemented in '.get_class($this), E_USER_WARNING);
 
     }
-- 
cgit v1.2.3


From a854a9a897ade35800abd440c29787ec8429c678 Mon Sep 17 00:00:00 2001
From: Joerg <scooter22@gmx.de>
Date: Thu, 6 Mar 2014 10:46:06 +0100
Subject: translation update

---
 lib/plugins/authad/lang/de/lang.php    | 10 ++++------
 lib/plugins/extension/lang/de/lang.php | 10 ++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/de/lang.php b/lib/plugins/authad/lang/de/lang.php
index 3f275750c..eea511d1b 100644
--- a/lib/plugins/authad/lang/de/lang.php
+++ b/lib/plugins/authad/lang/de/lang.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * German language file for addomain plugin
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
-
-$lang['domain'] = 'Anmelde-Domäne';
-
-//Setup VIM: ex: et ts=4 :
+$lang['domain']                = 'Anmelde-Domäne';
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index 10d501130..f2333cc25 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author H. Richard <wanderer379@t-online.de>
+ * @author Joerg <scooter22@gmx.de>
  */
 $lang['menu']                  = 'Erweiterungen verwalten';
 $lang['tab_plugins']           = 'Installierte Plugins';
@@ -36,6 +37,7 @@ $lang['tags']                  = 'Schlagworte';
 $lang['author_hint']           = 'Suche weitere Erweiterungen dieses Autors';
 $lang['installed']             = 'Installiert:';
 $lang['downloadurl']           = 'URL zum Herunterladen';
+$lang['repository']            = 'Quelle:';
 $lang['unknown']               = '<em>unbekannt</em>';
 $lang['installed_version']     = 'Installierte Version';
 $lang['install_date']          = 'Ihr letztes Update:';
@@ -57,6 +59,7 @@ $lang['status_disabled']       = 'deaktiviert';
 $lang['status_unmodifiable']   = 'unveränderlich';
 $lang['status_plugin']         = 'Plugin';
 $lang['status_template']       = 'Template';
+$lang['status_bundled']        = 'gebündelt';
 $lang['msg_enabled']           = 'Plugin %s ist aktiviert';
 $lang['msg_disabled']          = 'Erweiterung %s ist deaktiviert';
 $lang['msg_delete_success']    = 'Erweiterung wurde entfernt';
@@ -66,8 +69,15 @@ $lang['msg_plugin_install_success'] = 'Das Plugin %s wurde erfolgreich installie
 $lang['msg_plugin_update_success'] = 'Das Update des Plugins %s war erfolgreich';
 $lang['msg_upload_failed']     = 'Fehler beim Hochladen der Datei';
 $lang['missing_dependency']    = '<strong>fehlende oder deaktivierte Abhängigkeit:<strong>%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.';
+$lang['error_decompress']      = 'Die heruntergeladene Datei konnte nicht entpackt werden. Dies kann die Folge eines fehlerhaften Downloads sein. In diesem Fall sollten Sie versuchen den Vorgang zu wiederholen. Es kann auch die Folge eines unbekannten Kompressionsformates sein, in diesem ​​Fall müssen Sie die Datei selber herunterladen und manuell installieren.';
+$lang['error_findfolder']      = 'Das Erweiterungs-Verzeichnis konnte nicht identifiziert werden, laden und installieren sie die Datei manuell.';
+$lang['error_copy']            = 'Beim Versuch Dateien in den Ordner <em>%s</em>: zu installieren trat ein Kopierfehler auf. Die Dateizugriffsberechtigungen könnten falsch sein. Dies kann an einem unvollständig installierten Plugin liegen und beeinträchtigt somit die Stabilität Ihre Wiki-Installation.';
 $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['install_url']           = 'Von Webadresse (URL) installieren';
 $lang['install_upload']        = 'Erweiterung hochladen:';
-- 
cgit v1.2.3


From 99327e8e4c6bc07af2ebfc62bffee62f35c34025 Mon Sep 17 00:00:00 2001
From: Juan De La Cruz <juann.dlc@gmail.com>
Date: Thu, 6 Mar 2014 15:10:56 +0100
Subject: translation update

---
 lib/plugins/authad/lang/es/lang.php     | 8 ++++++++
 lib/plugins/authad/lang/es/settings.php | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 lib/plugins/authad/lang/es/lang.php

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/es/lang.php b/lib/plugins/authad/lang/es/lang.php
new file mode 100644
index 000000000..c5b242cba
--- /dev/null
+++ b/lib/plugins/authad/lang/es/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Juan De La Cruz <juann.dlc@gmail.com>
+ */
+$lang['domain']                = 'Dominio de inicio';
diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php
index 98b78056b..9dbd44be8 100644
--- a/lib/plugins/authad/lang/es/settings.php
+++ b/lib/plugins/authad/lang/es/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author monica <may.dorado@gmail.com>
  * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Juan De La Cruz <juann.dlc@gmail.com>
  */
 $lang['account_suffix']        = 'Su cuenta, sufijo. Ejem. <code> @ my.domain.org </ code>';
 $lang['base_dn']               = 'Su base DN. Ejem. <code>DC=my,DC=dominio,DC=org</code>';
@@ -13,3 +14,4 @@ $lang['admin_username']        = 'Un usuario con privilegios de Active Directory
 $lang['admin_password']        = 'La contraseña del usuario anterior.';
 $lang['sso']                   = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?';
 $lang['sso_charset']           = 'La codificación con que tu servidor web pasará el nombre de usuario Kerberos o NTLM. Si es UTF-8 o latin-1 dejar en blanco. Requiere la extensión iconv.';
+$lang['debug']                 = 'Mostrar información adicional de depuración sobre los errores?';
-- 
cgit v1.2.3


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

---
 lib/plugins/acl/lang/et/lang.php         | 4 ++--
 lib/plugins/usermanager/lang/et/lang.php | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
index bc4c73a16..ad2e9ffc9 100644
--- a/lib/plugins/acl/lang/et/lang.php
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Estonian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Oliver S6ro <seem.iges@mail.ee>
  * @author Aari Juhanson <aari@vmg.vil.ee>
  * @author Kaiko Kaur <kaiko@kultuur.edu.ee>
diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php
index 2161df918..93b28a6b8 100644
--- a/lib/plugins/usermanager/lang/et/lang.php
+++ b/lib/plugins/usermanager/lang/et/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Estonian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author kristian.kankainen@kuu.la
  * @author Rivo Zängov <eraser@eraser.ee>
  */
-- 
cgit v1.2.3


From a96178004fc8b519df17f6cb907e1c067b964bb2 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Thu, 6 Mar 2014 20:03:30 +0000
Subject: remove reference to reference from comments

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

(limited to 'lib')

diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
index ec90993cf..42a4903ec 100644
--- a/lib/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -63,7 +63,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * @param   string       $match   The text matched by the patterns
      * @param   int          $state   The lexer state for the match
      * @param   int          $pos     The character position of the matched text
-     * @param   Doku_Handler $handler Reference to the Doku_Handler object
+     * @param   Doku_Handler $handler The Doku_Handler object
      * @return  array Return an array with all data you want to use in render
      */
     function handle($match, $state, $pos, Doku_Handler $handler){
@@ -89,7 +89,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * created
      *
      * @param   $format   string        output format being rendered
-     * @param   $renderer Doku_Renderer reference to the current renderer object
+     * @param   $renderer Doku_Renderer the current renderer object
      * @param   $data     array         data created by handler()
      * @return  boolean                 rendered correctly?
      */
-- 
cgit v1.2.3


From d66eecafc4ddd78e452b0799a161dd8bfd682183 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 6 Mar 2014 23:26:31 +0100
Subject: moved 16x16 icons to their original locations

for backwards compatibility
---
 lib/exe/css.php                     |   6 +++---
 lib/images/fileicons/16x16/7z.png   | Bin 415 -> 0 bytes
 lib/images/fileicons/16x16/asm.png  | Bin 424 -> 0 bytes
 lib/images/fileicons/16x16/bash.png | Bin 435 -> 0 bytes
 lib/images/fileicons/16x16/bz2.png  | Bin 419 -> 0 bytes
 lib/images/fileicons/16x16/c.png    | Bin 413 -> 0 bytes
 lib/images/fileicons/16x16/cc.png   | Bin 410 -> 0 bytes
 lib/images/fileicons/16x16/conf.png | Bin 402 -> 0 bytes
 lib/images/fileicons/16x16/cpp.png  | Bin 429 -> 0 bytes
 lib/images/fileicons/16x16/csh.png  | Bin 430 -> 0 bytes
 lib/images/fileicons/16x16/css.png  | Bin 430 -> 0 bytes
 lib/images/fileicons/16x16/csv.png  | Bin 409 -> 0 bytes
 lib/images/fileicons/16x16/deb.png  | Bin 421 -> 0 bytes
 lib/images/fileicons/16x16/diff.png | Bin 428 -> 0 bytes
 lib/images/fileicons/16x16/doc.png  | Bin 405 -> 0 bytes
 lib/images/fileicons/16x16/docx.png | Bin 402 -> 0 bytes
 lib/images/fileicons/16x16/file.png | Bin 319 -> 0 bytes
 lib/images/fileicons/16x16/gif.png  | Bin 407 -> 0 bytes
 lib/images/fileicons/16x16/gz.png   | Bin 417 -> 0 bytes
 lib/images/fileicons/16x16/h.png    | Bin 411 -> 0 bytes
 lib/images/fileicons/16x16/hpp.png  | Bin 417 -> 0 bytes
 lib/images/fileicons/16x16/htm.png  | Bin 422 -> 0 bytes
 lib/images/fileicons/16x16/html.png | Bin 422 -> 0 bytes
 lib/images/fileicons/16x16/ico.png  | Bin 405 -> 0 bytes
 lib/images/fileicons/16x16/java.png | Bin 420 -> 0 bytes
 lib/images/fileicons/16x16/jpeg.png | Bin 412 -> 0 bytes
 lib/images/fileicons/16x16/jpg.png  | Bin 412 -> 0 bytes
 lib/images/fileicons/16x16/js.png   | Bin 420 -> 0 bytes
 lib/images/fileicons/16x16/json.png | Bin 434 -> 0 bytes
 lib/images/fileicons/16x16/mp3.png  | Bin 415 -> 0 bytes
 lib/images/fileicons/16x16/mp4.png  | Bin 419 -> 0 bytes
 lib/images/fileicons/16x16/odc.png  | Bin 403 -> 0 bytes
 lib/images/fileicons/16x16/odf.png  | Bin 408 -> 0 bytes
 lib/images/fileicons/16x16/odg.png  | Bin 405 -> 0 bytes
 lib/images/fileicons/16x16/odi.png  | Bin 398 -> 0 bytes
 lib/images/fileicons/16x16/odp.png  | Bin 406 -> 0 bytes
 lib/images/fileicons/16x16/ods.png  | Bin 409 -> 0 bytes
 lib/images/fileicons/16x16/odt.png  | Bin 406 -> 0 bytes
 lib/images/fileicons/16x16/ogg.png  | Bin 408 -> 0 bytes
 lib/images/fileicons/16x16/ogv.png  | Bin 412 -> 0 bytes
 lib/images/fileicons/16x16/pas.png  | Bin 435 -> 0 bytes
 lib/images/fileicons/16x16/pdf.png  | Bin 425 -> 0 bytes
 lib/images/fileicons/16x16/pl.png   | Bin 417 -> 0 bytes
 lib/images/fileicons/16x16/png.png  | Bin 417 -> 0 bytes
 lib/images/fileicons/16x16/ppt.png  | Bin 415 -> 0 bytes
 lib/images/fileicons/16x16/pptx.png | Bin 407 -> 0 bytes
 lib/images/fileicons/16x16/ps.png   | Bin 424 -> 0 bytes
 lib/images/fileicons/16x16/py.png   | Bin 426 -> 0 bytes
 lib/images/fileicons/16x16/rar.png  | Bin 418 -> 0 bytes
 lib/images/fileicons/16x16/rpm.png  | Bin 415 -> 0 bytes
 lib/images/fileicons/16x16/rtf.png  | Bin 422 -> 0 bytes
 lib/images/fileicons/16x16/sh.png   | Bin 422 -> 0 bytes
 lib/images/fileicons/16x16/swf.png  | Bin 416 -> 0 bytes
 lib/images/fileicons/16x16/sxc.png  | Bin 416 -> 0 bytes
 lib/images/fileicons/16x16/sxd.png  | Bin 420 -> 0 bytes
 lib/images/fileicons/16x16/sxi.png  | Bin 408 -> 0 bytes
 lib/images/fileicons/16x16/sxw.png  | Bin 410 -> 0 bytes
 lib/images/fileicons/16x16/tar.png  | Bin 417 -> 0 bytes
 lib/images/fileicons/16x16/tgz.png  | Bin 417 -> 0 bytes
 lib/images/fileicons/16x16/txt.png  | Bin 407 -> 0 bytes
 lib/images/fileicons/16x16/wav.png  | Bin 415 -> 0 bytes
 lib/images/fileicons/16x16/webm.png | Bin 412 -> 0 bytes
 lib/images/fileicons/16x16/xls.png  | Bin 408 -> 0 bytes
 lib/images/fileicons/16x16/xlsx.png | Bin 419 -> 0 bytes
 lib/images/fileicons/16x16/xml.png  | Bin 400 -> 0 bytes
 lib/images/fileicons/16x16/zip.png  | Bin 418 -> 0 bytes
 lib/images/fileicons/7z.png         | Bin 0 -> 415 bytes
 lib/images/fileicons/asm.png        | Bin 0 -> 424 bytes
 lib/images/fileicons/bash.png       | Bin 0 -> 435 bytes
 lib/images/fileicons/bz2.png        | Bin 0 -> 419 bytes
 lib/images/fileicons/c.png          | Bin 0 -> 413 bytes
 lib/images/fileicons/cc.png         | Bin 0 -> 410 bytes
 lib/images/fileicons/conf.png       | Bin 0 -> 402 bytes
 lib/images/fileicons/cpp.png        | Bin 0 -> 429 bytes
 lib/images/fileicons/csh.png        | Bin 0 -> 430 bytes
 lib/images/fileicons/css.png        | Bin 0 -> 430 bytes
 lib/images/fileicons/csv.png        | Bin 0 -> 409 bytes
 lib/images/fileicons/deb.png        | Bin 0 -> 421 bytes
 lib/images/fileicons/diff.png       | Bin 0 -> 428 bytes
 lib/images/fileicons/doc.png        | Bin 0 -> 405 bytes
 lib/images/fileicons/docx.png       | Bin 0 -> 402 bytes
 lib/images/fileicons/file.png       | Bin 0 -> 319 bytes
 lib/images/fileicons/gif.png        | Bin 0 -> 407 bytes
 lib/images/fileicons/gz.png         | Bin 0 -> 417 bytes
 lib/images/fileicons/h.png          | Bin 0 -> 411 bytes
 lib/images/fileicons/hpp.png        | Bin 0 -> 417 bytes
 lib/images/fileicons/htm.png        | Bin 0 -> 422 bytes
 lib/images/fileicons/html.png       | Bin 0 -> 422 bytes
 lib/images/fileicons/ico.png        | Bin 0 -> 405 bytes
 lib/images/fileicons/java.png       | Bin 0 -> 420 bytes
 lib/images/fileicons/jpeg.png       | Bin 0 -> 412 bytes
 lib/images/fileicons/jpg.png        | Bin 0 -> 412 bytes
 lib/images/fileicons/js.png         | Bin 0 -> 420 bytes
 lib/images/fileicons/json.png       | Bin 0 -> 434 bytes
 lib/images/fileicons/mp3.png        | Bin 0 -> 415 bytes
 lib/images/fileicons/mp4.png        | Bin 0 -> 419 bytes
 lib/images/fileicons/odc.png        | Bin 0 -> 403 bytes
 lib/images/fileicons/odf.png        | Bin 0 -> 408 bytes
 lib/images/fileicons/odg.png        | Bin 0 -> 405 bytes
 lib/images/fileicons/odi.png        | Bin 0 -> 398 bytes
 lib/images/fileicons/odp.png        | Bin 0 -> 406 bytes
 lib/images/fileicons/ods.png        | Bin 0 -> 409 bytes
 lib/images/fileicons/odt.png        | Bin 0 -> 406 bytes
 lib/images/fileicons/ogg.png        | Bin 0 -> 408 bytes
 lib/images/fileicons/ogv.png        | Bin 0 -> 412 bytes
 lib/images/fileicons/pas.png        | Bin 0 -> 435 bytes
 lib/images/fileicons/pdf.png        | Bin 0 -> 425 bytes
 lib/images/fileicons/pl.png         | Bin 0 -> 417 bytes
 lib/images/fileicons/png.png        | Bin 0 -> 417 bytes
 lib/images/fileicons/ppt.png        | Bin 0 -> 415 bytes
 lib/images/fileicons/pptx.png       | Bin 0 -> 407 bytes
 lib/images/fileicons/ps.png         | Bin 0 -> 424 bytes
 lib/images/fileicons/py.png         | Bin 0 -> 426 bytes
 lib/images/fileicons/rar.png        | Bin 0 -> 418 bytes
 lib/images/fileicons/rpm.png        | Bin 0 -> 415 bytes
 lib/images/fileicons/rtf.png        | Bin 0 -> 422 bytes
 lib/images/fileicons/sh.png         | Bin 0 -> 422 bytes
 lib/images/fileicons/swf.png        | Bin 0 -> 416 bytes
 lib/images/fileicons/sxc.png        | Bin 0 -> 416 bytes
 lib/images/fileicons/sxd.png        | Bin 0 -> 420 bytes
 lib/images/fileicons/sxi.png        | Bin 0 -> 408 bytes
 lib/images/fileicons/sxw.png        | Bin 0 -> 410 bytes
 lib/images/fileicons/tar.png        | Bin 0 -> 417 bytes
 lib/images/fileicons/tgz.png        | Bin 0 -> 417 bytes
 lib/images/fileicons/txt.png        | Bin 0 -> 407 bytes
 lib/images/fileicons/wav.png        | Bin 0 -> 415 bytes
 lib/images/fileicons/webm.png       | Bin 0 -> 412 bytes
 lib/images/fileicons/xls.png        | Bin 0 -> 408 bytes
 lib/images/fileicons/xlsx.png       | Bin 0 -> 419 bytes
 lib/images/fileicons/xml.png        | Bin 0 -> 400 bytes
 lib/images/fileicons/zip.png        | Bin 0 -> 418 bytes
 131 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 lib/images/fileicons/16x16/7z.png
 delete mode 100644 lib/images/fileicons/16x16/asm.png
 delete mode 100644 lib/images/fileicons/16x16/bash.png
 delete mode 100644 lib/images/fileicons/16x16/bz2.png
 delete mode 100644 lib/images/fileicons/16x16/c.png
 delete mode 100644 lib/images/fileicons/16x16/cc.png
 delete mode 100644 lib/images/fileicons/16x16/conf.png
 delete mode 100644 lib/images/fileicons/16x16/cpp.png
 delete mode 100644 lib/images/fileicons/16x16/csh.png
 delete mode 100644 lib/images/fileicons/16x16/css.png
 delete mode 100644 lib/images/fileicons/16x16/csv.png
 delete mode 100644 lib/images/fileicons/16x16/deb.png
 delete mode 100644 lib/images/fileicons/16x16/diff.png
 delete mode 100644 lib/images/fileicons/16x16/doc.png
 delete mode 100644 lib/images/fileicons/16x16/docx.png
 delete mode 100644 lib/images/fileicons/16x16/file.png
 delete mode 100644 lib/images/fileicons/16x16/gif.png
 delete mode 100644 lib/images/fileicons/16x16/gz.png
 delete mode 100644 lib/images/fileicons/16x16/h.png
 delete mode 100644 lib/images/fileicons/16x16/hpp.png
 delete mode 100644 lib/images/fileicons/16x16/htm.png
 delete mode 100644 lib/images/fileicons/16x16/html.png
 delete mode 100644 lib/images/fileicons/16x16/ico.png
 delete mode 100644 lib/images/fileicons/16x16/java.png
 delete mode 100644 lib/images/fileicons/16x16/jpeg.png
 delete mode 100644 lib/images/fileicons/16x16/jpg.png
 delete mode 100644 lib/images/fileicons/16x16/js.png
 delete mode 100644 lib/images/fileicons/16x16/json.png
 delete mode 100644 lib/images/fileicons/16x16/mp3.png
 delete mode 100644 lib/images/fileicons/16x16/mp4.png
 delete mode 100644 lib/images/fileicons/16x16/odc.png
 delete mode 100644 lib/images/fileicons/16x16/odf.png
 delete mode 100644 lib/images/fileicons/16x16/odg.png
 delete mode 100644 lib/images/fileicons/16x16/odi.png
 delete mode 100644 lib/images/fileicons/16x16/odp.png
 delete mode 100644 lib/images/fileicons/16x16/ods.png
 delete mode 100644 lib/images/fileicons/16x16/odt.png
 delete mode 100644 lib/images/fileicons/16x16/ogg.png
 delete mode 100644 lib/images/fileicons/16x16/ogv.png
 delete mode 100644 lib/images/fileicons/16x16/pas.png
 delete mode 100644 lib/images/fileicons/16x16/pdf.png
 delete mode 100644 lib/images/fileicons/16x16/pl.png
 delete mode 100644 lib/images/fileicons/16x16/png.png
 delete mode 100644 lib/images/fileicons/16x16/ppt.png
 delete mode 100644 lib/images/fileicons/16x16/pptx.png
 delete mode 100644 lib/images/fileicons/16x16/ps.png
 delete mode 100644 lib/images/fileicons/16x16/py.png
 delete mode 100644 lib/images/fileicons/16x16/rar.png
 delete mode 100644 lib/images/fileicons/16x16/rpm.png
 delete mode 100644 lib/images/fileicons/16x16/rtf.png
 delete mode 100644 lib/images/fileicons/16x16/sh.png
 delete mode 100644 lib/images/fileicons/16x16/swf.png
 delete mode 100644 lib/images/fileicons/16x16/sxc.png
 delete mode 100644 lib/images/fileicons/16x16/sxd.png
 delete mode 100644 lib/images/fileicons/16x16/sxi.png
 delete mode 100644 lib/images/fileicons/16x16/sxw.png
 delete mode 100644 lib/images/fileicons/16x16/tar.png
 delete mode 100644 lib/images/fileicons/16x16/tgz.png
 delete mode 100644 lib/images/fileicons/16x16/txt.png
 delete mode 100644 lib/images/fileicons/16x16/wav.png
 delete mode 100644 lib/images/fileicons/16x16/webm.png
 delete mode 100644 lib/images/fileicons/16x16/xls.png
 delete mode 100644 lib/images/fileicons/16x16/xlsx.png
 delete mode 100644 lib/images/fileicons/16x16/xml.png
 delete mode 100644 lib/images/fileicons/16x16/zip.png
 create mode 100644 lib/images/fileicons/7z.png
 create mode 100644 lib/images/fileicons/asm.png
 create mode 100644 lib/images/fileicons/bash.png
 create mode 100644 lib/images/fileicons/bz2.png
 create mode 100644 lib/images/fileicons/c.png
 create mode 100644 lib/images/fileicons/cc.png
 create mode 100644 lib/images/fileicons/conf.png
 create mode 100644 lib/images/fileicons/cpp.png
 create mode 100644 lib/images/fileicons/csh.png
 create mode 100644 lib/images/fileicons/css.png
 create mode 100644 lib/images/fileicons/csv.png
 create mode 100644 lib/images/fileicons/deb.png
 create mode 100644 lib/images/fileicons/diff.png
 create mode 100644 lib/images/fileicons/doc.png
 create mode 100644 lib/images/fileicons/docx.png
 create mode 100644 lib/images/fileicons/file.png
 create mode 100644 lib/images/fileicons/gif.png
 create mode 100644 lib/images/fileicons/gz.png
 create mode 100644 lib/images/fileicons/h.png
 create mode 100644 lib/images/fileicons/hpp.png
 create mode 100644 lib/images/fileicons/htm.png
 create mode 100644 lib/images/fileicons/html.png
 create mode 100644 lib/images/fileicons/ico.png
 create mode 100644 lib/images/fileicons/java.png
 create mode 100644 lib/images/fileicons/jpeg.png
 create mode 100644 lib/images/fileicons/jpg.png
 create mode 100644 lib/images/fileicons/js.png
 create mode 100644 lib/images/fileicons/json.png
 create mode 100644 lib/images/fileicons/mp3.png
 create mode 100644 lib/images/fileicons/mp4.png
 create mode 100644 lib/images/fileicons/odc.png
 create mode 100644 lib/images/fileicons/odf.png
 create mode 100644 lib/images/fileicons/odg.png
 create mode 100644 lib/images/fileicons/odi.png
 create mode 100644 lib/images/fileicons/odp.png
 create mode 100644 lib/images/fileicons/ods.png
 create mode 100644 lib/images/fileicons/odt.png
 create mode 100644 lib/images/fileicons/ogg.png
 create mode 100644 lib/images/fileicons/ogv.png
 create mode 100644 lib/images/fileicons/pas.png
 create mode 100644 lib/images/fileicons/pdf.png
 create mode 100644 lib/images/fileicons/pl.png
 create mode 100644 lib/images/fileicons/png.png
 create mode 100644 lib/images/fileicons/ppt.png
 create mode 100644 lib/images/fileicons/pptx.png
 create mode 100644 lib/images/fileicons/ps.png
 create mode 100644 lib/images/fileicons/py.png
 create mode 100644 lib/images/fileicons/rar.png
 create mode 100644 lib/images/fileicons/rpm.png
 create mode 100644 lib/images/fileicons/rtf.png
 create mode 100644 lib/images/fileicons/sh.png
 create mode 100644 lib/images/fileicons/swf.png
 create mode 100644 lib/images/fileicons/sxc.png
 create mode 100644 lib/images/fileicons/sxd.png
 create mode 100644 lib/images/fileicons/sxi.png
 create mode 100644 lib/images/fileicons/sxw.png
 create mode 100644 lib/images/fileicons/tar.png
 create mode 100644 lib/images/fileicons/tgz.png
 create mode 100644 lib/images/fileicons/txt.png
 create mode 100644 lib/images/fileicons/wav.png
 create mode 100644 lib/images/fileicons/webm.png
 create mode 100644 lib/images/fileicons/xls.png
 create mode 100644 lib/images/fileicons/xlsx.png
 create mode 100644 lib/images/fileicons/xml.png
 create mode 100644 lib/images/fileicons/zip.png

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 128fd5389..cab7384b2 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -369,7 +369,7 @@ function css_filetypes(){
 
     // default style
     echo '.mediafile {';
-    echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/16x16/file.png) 0px 1px no-repeat;';
+    echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/file.png) 0px 1px no-repeat;';
     echo ' padding-left: 18px;';
     echo ' padding-bottom: 1px;';
     echo '}';
@@ -377,7 +377,7 @@ function css_filetypes(){
     // additional styles when icon available
     // scan directory for all icons
     $exts = array();
-    if($dh = opendir(DOKU_INC.'lib/images/fileicons/16x16')){
+    if($dh = opendir(DOKU_INC.'lib/images/fileicons')){
         while(false !== ($file = readdir($dh))){
             if(preg_match('/([_\-a-z0-9]+(?:\.[_\-a-z0-9]+)*?)\.(png|gif)/i',$file,$match)){
                 $ext = strtolower($match[1]);
@@ -392,7 +392,7 @@ function css_filetypes(){
     foreach($exts as $ext=>$type){
         $class = preg_replace('/[^_\-a-z0-9]+/','_',$ext);
         echo ".mf_$class {";
-        echo '  background-image: url('.DOKU_BASE.'lib/images/fileicons/16x16/'.$ext.$type.')';
+        echo '  background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.$type.')';
         echo '}';
     }
 }
diff --git a/lib/images/fileicons/16x16/7z.png b/lib/images/fileicons/16x16/7z.png
deleted file mode 100644
index 037cd73a0..000000000
Binary files a/lib/images/fileicons/16x16/7z.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/asm.png b/lib/images/fileicons/16x16/asm.png
deleted file mode 100644
index a88d01665..000000000
Binary files a/lib/images/fileicons/16x16/asm.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/bash.png b/lib/images/fileicons/16x16/bash.png
deleted file mode 100644
index 047be8c6a..000000000
Binary files a/lib/images/fileicons/16x16/bash.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/bz2.png b/lib/images/fileicons/16x16/bz2.png
deleted file mode 100644
index a4bcc70a1..000000000
Binary files a/lib/images/fileicons/16x16/bz2.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/c.png b/lib/images/fileicons/16x16/c.png
deleted file mode 100644
index 5e91b8473..000000000
Binary files a/lib/images/fileicons/16x16/c.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/cc.png b/lib/images/fileicons/16x16/cc.png
deleted file mode 100644
index 432c95901..000000000
Binary files a/lib/images/fileicons/16x16/cc.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/conf.png b/lib/images/fileicons/16x16/conf.png
deleted file mode 100644
index 94ace02cf..000000000
Binary files a/lib/images/fileicons/16x16/conf.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/cpp.png b/lib/images/fileicons/16x16/cpp.png
deleted file mode 100644
index 6c6be4263..000000000
Binary files a/lib/images/fileicons/16x16/cpp.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/csh.png b/lib/images/fileicons/16x16/csh.png
deleted file mode 100644
index 14e01b2a7..000000000
Binary files a/lib/images/fileicons/16x16/csh.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/css.png b/lib/images/fileicons/16x16/css.png
deleted file mode 100644
index 5638f1879..000000000
Binary files a/lib/images/fileicons/16x16/css.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/csv.png b/lib/images/fileicons/16x16/csv.png
deleted file mode 100644
index af37ba577..000000000
Binary files a/lib/images/fileicons/16x16/csv.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/deb.png b/lib/images/fileicons/16x16/deb.png
deleted file mode 100644
index 9eb29019b..000000000
Binary files a/lib/images/fileicons/16x16/deb.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/diff.png b/lib/images/fileicons/16x16/diff.png
deleted file mode 100644
index c81c4ff2c..000000000
Binary files a/lib/images/fileicons/16x16/diff.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/doc.png b/lib/images/fileicons/16x16/doc.png
deleted file mode 100644
index 9324f20b3..000000000
Binary files a/lib/images/fileicons/16x16/doc.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/docx.png b/lib/images/fileicons/16x16/docx.png
deleted file mode 100644
index e3986295d..000000000
Binary files a/lib/images/fileicons/16x16/docx.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/file.png b/lib/images/fileicons/16x16/file.png
deleted file mode 100644
index 8f31d38ac..000000000
Binary files a/lib/images/fileicons/16x16/file.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/gif.png b/lib/images/fileicons/16x16/gif.png
deleted file mode 100644
index bcbb8366b..000000000
Binary files a/lib/images/fileicons/16x16/gif.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/gz.png b/lib/images/fileicons/16x16/gz.png
deleted file mode 100644
index 0a0a4b94f..000000000
Binary files a/lib/images/fileicons/16x16/gz.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/h.png b/lib/images/fileicons/16x16/h.png
deleted file mode 100644
index a208d3159..000000000
Binary files a/lib/images/fileicons/16x16/h.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/hpp.png b/lib/images/fileicons/16x16/hpp.png
deleted file mode 100644
index decd78b7e..000000000
Binary files a/lib/images/fileicons/16x16/hpp.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/htm.png b/lib/images/fileicons/16x16/htm.png
deleted file mode 100644
index e0ead2bff..000000000
Binary files a/lib/images/fileicons/16x16/htm.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/html.png b/lib/images/fileicons/16x16/html.png
deleted file mode 100644
index e0ead2bff..000000000
Binary files a/lib/images/fileicons/16x16/html.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/ico.png b/lib/images/fileicons/16x16/ico.png
deleted file mode 100644
index 93343717c..000000000
Binary files a/lib/images/fileicons/16x16/ico.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/java.png b/lib/images/fileicons/16x16/java.png
deleted file mode 100644
index 6adebc02b..000000000
Binary files a/lib/images/fileicons/16x16/java.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/jpeg.png b/lib/images/fileicons/16x16/jpeg.png
deleted file mode 100644
index 29dea5761..000000000
Binary files a/lib/images/fileicons/16x16/jpeg.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/jpg.png b/lib/images/fileicons/16x16/jpg.png
deleted file mode 100644
index 29dea5761..000000000
Binary files a/lib/images/fileicons/16x16/jpg.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/js.png b/lib/images/fileicons/16x16/js.png
deleted file mode 100644
index 37d3a7958..000000000
Binary files a/lib/images/fileicons/16x16/js.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/json.png b/lib/images/fileicons/16x16/json.png
deleted file mode 100644
index 0f32375e6..000000000
Binary files a/lib/images/fileicons/16x16/json.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/mp3.png b/lib/images/fileicons/16x16/mp3.png
deleted file mode 100644
index 7c6d37184..000000000
Binary files a/lib/images/fileicons/16x16/mp3.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/mp4.png b/lib/images/fileicons/16x16/mp4.png
deleted file mode 100644
index ee5b91150..000000000
Binary files a/lib/images/fileicons/16x16/mp4.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/odc.png b/lib/images/fileicons/16x16/odc.png
deleted file mode 100644
index b2a879a84..000000000
Binary files a/lib/images/fileicons/16x16/odc.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/odf.png b/lib/images/fileicons/16x16/odf.png
deleted file mode 100644
index 65db17827..000000000
Binary files a/lib/images/fileicons/16x16/odf.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/odg.png b/lib/images/fileicons/16x16/odg.png
deleted file mode 100644
index bab8fe1a7..000000000
Binary files a/lib/images/fileicons/16x16/odg.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/odi.png b/lib/images/fileicons/16x16/odi.png
deleted file mode 100644
index f0df8e582..000000000
Binary files a/lib/images/fileicons/16x16/odi.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/odp.png b/lib/images/fileicons/16x16/odp.png
deleted file mode 100644
index 4008c4e54..000000000
Binary files a/lib/images/fileicons/16x16/odp.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/ods.png b/lib/images/fileicons/16x16/ods.png
deleted file mode 100644
index c7d5e263c..000000000
Binary files a/lib/images/fileicons/16x16/ods.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/odt.png b/lib/images/fileicons/16x16/odt.png
deleted file mode 100644
index 8fd5fd35c..000000000
Binary files a/lib/images/fileicons/16x16/odt.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/ogg.png b/lib/images/fileicons/16x16/ogg.png
deleted file mode 100644
index 38f615c99..000000000
Binary files a/lib/images/fileicons/16x16/ogg.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/ogv.png b/lib/images/fileicons/16x16/ogv.png
deleted file mode 100644
index a937dfc4c..000000000
Binary files a/lib/images/fileicons/16x16/ogv.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/pas.png b/lib/images/fileicons/16x16/pas.png
deleted file mode 100644
index 0a91eff4a..000000000
Binary files a/lib/images/fileicons/16x16/pas.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/pdf.png b/lib/images/fileicons/16x16/pdf.png
deleted file mode 100644
index 1bc154641..000000000
Binary files a/lib/images/fileicons/16x16/pdf.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/pl.png b/lib/images/fileicons/16x16/pl.png
deleted file mode 100644
index 7f43f6399..000000000
Binary files a/lib/images/fileicons/16x16/pl.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/png.png b/lib/images/fileicons/16x16/png.png
deleted file mode 100644
index 007270532..000000000
Binary files a/lib/images/fileicons/16x16/png.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/ppt.png b/lib/images/fileicons/16x16/ppt.png
deleted file mode 100644
index e097ceb90..000000000
Binary files a/lib/images/fileicons/16x16/ppt.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/pptx.png b/lib/images/fileicons/16x16/pptx.png
deleted file mode 100644
index 9dda61a12..000000000
Binary files a/lib/images/fileicons/16x16/pptx.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/ps.png b/lib/images/fileicons/16x16/ps.png
deleted file mode 100644
index e61d1aa7e..000000000
Binary files a/lib/images/fileicons/16x16/ps.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/py.png b/lib/images/fileicons/16x16/py.png
deleted file mode 100644
index 4745cb972..000000000
Binary files a/lib/images/fileicons/16x16/py.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/rar.png b/lib/images/fileicons/16x16/rar.png
deleted file mode 100644
index f15d4ce5b..000000000
Binary files a/lib/images/fileicons/16x16/rar.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/rpm.png b/lib/images/fileicons/16x16/rpm.png
deleted file mode 100644
index 831424ff5..000000000
Binary files a/lib/images/fileicons/16x16/rpm.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/rtf.png b/lib/images/fileicons/16x16/rtf.png
deleted file mode 100644
index 4486932ed..000000000
Binary files a/lib/images/fileicons/16x16/rtf.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/sh.png b/lib/images/fileicons/16x16/sh.png
deleted file mode 100644
index 60266bf3c..000000000
Binary files a/lib/images/fileicons/16x16/sh.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/swf.png b/lib/images/fileicons/16x16/swf.png
deleted file mode 100644
index b45a72cc9..000000000
Binary files a/lib/images/fileicons/16x16/swf.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/sxc.png b/lib/images/fileicons/16x16/sxc.png
deleted file mode 100644
index 6084d49b7..000000000
Binary files a/lib/images/fileicons/16x16/sxc.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/sxd.png b/lib/images/fileicons/16x16/sxd.png
deleted file mode 100644
index aecd863a0..000000000
Binary files a/lib/images/fileicons/16x16/sxd.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/sxi.png b/lib/images/fileicons/16x16/sxi.png
deleted file mode 100644
index b34b33ca3..000000000
Binary files a/lib/images/fileicons/16x16/sxi.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/sxw.png b/lib/images/fileicons/16x16/sxw.png
deleted file mode 100644
index a30869d9d..000000000
Binary files a/lib/images/fileicons/16x16/sxw.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/tar.png b/lib/images/fileicons/16x16/tar.png
deleted file mode 100644
index e57029adc..000000000
Binary files a/lib/images/fileicons/16x16/tar.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/tgz.png b/lib/images/fileicons/16x16/tgz.png
deleted file mode 100644
index 25ef9e15a..000000000
Binary files a/lib/images/fileicons/16x16/tgz.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/txt.png b/lib/images/fileicons/16x16/txt.png
deleted file mode 100644
index 4fd921655..000000000
Binary files a/lib/images/fileicons/16x16/txt.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/wav.png b/lib/images/fileicons/16x16/wav.png
deleted file mode 100644
index c8880c62e..000000000
Binary files a/lib/images/fileicons/16x16/wav.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/webm.png b/lib/images/fileicons/16x16/webm.png
deleted file mode 100644
index 55db61914..000000000
Binary files a/lib/images/fileicons/16x16/webm.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/xls.png b/lib/images/fileicons/16x16/xls.png
deleted file mode 100644
index 12a32a295..000000000
Binary files a/lib/images/fileicons/16x16/xls.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/xlsx.png b/lib/images/fileicons/16x16/xlsx.png
deleted file mode 100644
index b2e85489d..000000000
Binary files a/lib/images/fileicons/16x16/xlsx.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/xml.png b/lib/images/fileicons/16x16/xml.png
deleted file mode 100644
index 4480a6385..000000000
Binary files a/lib/images/fileicons/16x16/xml.png and /dev/null differ
diff --git a/lib/images/fileicons/16x16/zip.png b/lib/images/fileicons/16x16/zip.png
deleted file mode 100644
index 4a36a35ff..000000000
Binary files a/lib/images/fileicons/16x16/zip.png and /dev/null differ
diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png
new file mode 100644
index 000000000..037cd73a0
Binary files /dev/null and b/lib/images/fileicons/7z.png differ
diff --git a/lib/images/fileicons/asm.png b/lib/images/fileicons/asm.png
new file mode 100644
index 000000000..a88d01665
Binary files /dev/null and b/lib/images/fileicons/asm.png differ
diff --git a/lib/images/fileicons/bash.png b/lib/images/fileicons/bash.png
new file mode 100644
index 000000000..047be8c6a
Binary files /dev/null and b/lib/images/fileicons/bash.png differ
diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png
new file mode 100644
index 000000000..a4bcc70a1
Binary files /dev/null and b/lib/images/fileicons/bz2.png differ
diff --git a/lib/images/fileicons/c.png b/lib/images/fileicons/c.png
new file mode 100644
index 000000000..5e91b8473
Binary files /dev/null and b/lib/images/fileicons/c.png differ
diff --git a/lib/images/fileicons/cc.png b/lib/images/fileicons/cc.png
new file mode 100644
index 000000000..432c95901
Binary files /dev/null and b/lib/images/fileicons/cc.png differ
diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png
new file mode 100644
index 000000000..94ace02cf
Binary files /dev/null and b/lib/images/fileicons/conf.png differ
diff --git a/lib/images/fileicons/cpp.png b/lib/images/fileicons/cpp.png
new file mode 100644
index 000000000..6c6be4263
Binary files /dev/null and b/lib/images/fileicons/cpp.png differ
diff --git a/lib/images/fileicons/csh.png b/lib/images/fileicons/csh.png
new file mode 100644
index 000000000..14e01b2a7
Binary files /dev/null and b/lib/images/fileicons/csh.png differ
diff --git a/lib/images/fileicons/css.png b/lib/images/fileicons/css.png
new file mode 100644
index 000000000..5638f1879
Binary files /dev/null and b/lib/images/fileicons/css.png differ
diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png
new file mode 100644
index 000000000..af37ba577
Binary files /dev/null and b/lib/images/fileicons/csv.png differ
diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png
new file mode 100644
index 000000000..9eb29019b
Binary files /dev/null and b/lib/images/fileicons/deb.png differ
diff --git a/lib/images/fileicons/diff.png b/lib/images/fileicons/diff.png
new file mode 100644
index 000000000..c81c4ff2c
Binary files /dev/null and b/lib/images/fileicons/diff.png differ
diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png
new file mode 100644
index 000000000..9324f20b3
Binary files /dev/null and b/lib/images/fileicons/doc.png differ
diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png
new file mode 100644
index 000000000..e3986295d
Binary files /dev/null and b/lib/images/fileicons/docx.png differ
diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png
new file mode 100644
index 000000000..8f31d38ac
Binary files /dev/null and b/lib/images/fileicons/file.png differ
diff --git a/lib/images/fileicons/gif.png b/lib/images/fileicons/gif.png
new file mode 100644
index 000000000..bcbb8366b
Binary files /dev/null and b/lib/images/fileicons/gif.png differ
diff --git a/lib/images/fileicons/gz.png b/lib/images/fileicons/gz.png
new file mode 100644
index 000000000..0a0a4b94f
Binary files /dev/null and b/lib/images/fileicons/gz.png differ
diff --git a/lib/images/fileicons/h.png b/lib/images/fileicons/h.png
new file mode 100644
index 000000000..a208d3159
Binary files /dev/null and b/lib/images/fileicons/h.png differ
diff --git a/lib/images/fileicons/hpp.png b/lib/images/fileicons/hpp.png
new file mode 100644
index 000000000..decd78b7e
Binary files /dev/null and b/lib/images/fileicons/hpp.png differ
diff --git a/lib/images/fileicons/htm.png b/lib/images/fileicons/htm.png
new file mode 100644
index 000000000..e0ead2bff
Binary files /dev/null and b/lib/images/fileicons/htm.png differ
diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png
new file mode 100644
index 000000000..e0ead2bff
Binary files /dev/null and b/lib/images/fileicons/html.png differ
diff --git a/lib/images/fileicons/ico.png b/lib/images/fileicons/ico.png
new file mode 100644
index 000000000..93343717c
Binary files /dev/null and b/lib/images/fileicons/ico.png differ
diff --git a/lib/images/fileicons/java.png b/lib/images/fileicons/java.png
new file mode 100644
index 000000000..6adebc02b
Binary files /dev/null and b/lib/images/fileicons/java.png differ
diff --git a/lib/images/fileicons/jpeg.png b/lib/images/fileicons/jpeg.png
new file mode 100644
index 000000000..29dea5761
Binary files /dev/null and b/lib/images/fileicons/jpeg.png differ
diff --git a/lib/images/fileicons/jpg.png b/lib/images/fileicons/jpg.png
new file mode 100644
index 000000000..29dea5761
Binary files /dev/null and b/lib/images/fileicons/jpg.png differ
diff --git a/lib/images/fileicons/js.png b/lib/images/fileicons/js.png
new file mode 100644
index 000000000..37d3a7958
Binary files /dev/null and b/lib/images/fileicons/js.png differ
diff --git a/lib/images/fileicons/json.png b/lib/images/fileicons/json.png
new file mode 100644
index 000000000..0f32375e6
Binary files /dev/null and b/lib/images/fileicons/json.png differ
diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png
new file mode 100644
index 000000000..7c6d37184
Binary files /dev/null and b/lib/images/fileicons/mp3.png differ
diff --git a/lib/images/fileicons/mp4.png b/lib/images/fileicons/mp4.png
new file mode 100644
index 000000000..ee5b91150
Binary files /dev/null and b/lib/images/fileicons/mp4.png differ
diff --git a/lib/images/fileicons/odc.png b/lib/images/fileicons/odc.png
new file mode 100644
index 000000000..b2a879a84
Binary files /dev/null and b/lib/images/fileicons/odc.png differ
diff --git a/lib/images/fileicons/odf.png b/lib/images/fileicons/odf.png
new file mode 100644
index 000000000..65db17827
Binary files /dev/null and b/lib/images/fileicons/odf.png differ
diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png
new file mode 100644
index 000000000..bab8fe1a7
Binary files /dev/null and b/lib/images/fileicons/odg.png differ
diff --git a/lib/images/fileicons/odi.png b/lib/images/fileicons/odi.png
new file mode 100644
index 000000000..f0df8e582
Binary files /dev/null and b/lib/images/fileicons/odi.png differ
diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png
new file mode 100644
index 000000000..4008c4e54
Binary files /dev/null and b/lib/images/fileicons/odp.png differ
diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png
new file mode 100644
index 000000000..c7d5e263c
Binary files /dev/null and b/lib/images/fileicons/ods.png differ
diff --git a/lib/images/fileicons/odt.png b/lib/images/fileicons/odt.png
new file mode 100644
index 000000000..8fd5fd35c
Binary files /dev/null and b/lib/images/fileicons/odt.png differ
diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png
new file mode 100644
index 000000000..38f615c99
Binary files /dev/null and b/lib/images/fileicons/ogg.png differ
diff --git a/lib/images/fileicons/ogv.png b/lib/images/fileicons/ogv.png
new file mode 100644
index 000000000..a937dfc4c
Binary files /dev/null and b/lib/images/fileicons/ogv.png differ
diff --git a/lib/images/fileicons/pas.png b/lib/images/fileicons/pas.png
new file mode 100644
index 000000000..0a91eff4a
Binary files /dev/null and b/lib/images/fileicons/pas.png differ
diff --git a/lib/images/fileicons/pdf.png b/lib/images/fileicons/pdf.png
new file mode 100644
index 000000000..1bc154641
Binary files /dev/null and b/lib/images/fileicons/pdf.png differ
diff --git a/lib/images/fileicons/pl.png b/lib/images/fileicons/pl.png
new file mode 100644
index 000000000..7f43f6399
Binary files /dev/null and b/lib/images/fileicons/pl.png differ
diff --git a/lib/images/fileicons/png.png b/lib/images/fileicons/png.png
new file mode 100644
index 000000000..007270532
Binary files /dev/null and b/lib/images/fileicons/png.png differ
diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png
new file mode 100644
index 000000000..e097ceb90
Binary files /dev/null and b/lib/images/fileicons/ppt.png differ
diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png
new file mode 100644
index 000000000..9dda61a12
Binary files /dev/null and b/lib/images/fileicons/pptx.png differ
diff --git a/lib/images/fileicons/ps.png b/lib/images/fileicons/ps.png
new file mode 100644
index 000000000..e61d1aa7e
Binary files /dev/null and b/lib/images/fileicons/ps.png differ
diff --git a/lib/images/fileicons/py.png b/lib/images/fileicons/py.png
new file mode 100644
index 000000000..4745cb972
Binary files /dev/null and b/lib/images/fileicons/py.png differ
diff --git a/lib/images/fileicons/rar.png b/lib/images/fileicons/rar.png
new file mode 100644
index 000000000..f15d4ce5b
Binary files /dev/null and b/lib/images/fileicons/rar.png differ
diff --git a/lib/images/fileicons/rpm.png b/lib/images/fileicons/rpm.png
new file mode 100644
index 000000000..831424ff5
Binary files /dev/null and b/lib/images/fileicons/rpm.png differ
diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png
new file mode 100644
index 000000000..4486932ed
Binary files /dev/null and b/lib/images/fileicons/rtf.png differ
diff --git a/lib/images/fileicons/sh.png b/lib/images/fileicons/sh.png
new file mode 100644
index 000000000..60266bf3c
Binary files /dev/null and b/lib/images/fileicons/sh.png differ
diff --git a/lib/images/fileicons/swf.png b/lib/images/fileicons/swf.png
new file mode 100644
index 000000000..b45a72cc9
Binary files /dev/null and b/lib/images/fileicons/swf.png differ
diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png
new file mode 100644
index 000000000..6084d49b7
Binary files /dev/null and b/lib/images/fileicons/sxc.png differ
diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png
new file mode 100644
index 000000000..aecd863a0
Binary files /dev/null and b/lib/images/fileicons/sxd.png differ
diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png
new file mode 100644
index 000000000..b34b33ca3
Binary files /dev/null and b/lib/images/fileicons/sxi.png differ
diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png
new file mode 100644
index 000000000..a30869d9d
Binary files /dev/null and b/lib/images/fileicons/sxw.png differ
diff --git a/lib/images/fileicons/tar.png b/lib/images/fileicons/tar.png
new file mode 100644
index 000000000..e57029adc
Binary files /dev/null and b/lib/images/fileicons/tar.png differ
diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png
new file mode 100644
index 000000000..25ef9e15a
Binary files /dev/null and b/lib/images/fileicons/tgz.png differ
diff --git a/lib/images/fileicons/txt.png b/lib/images/fileicons/txt.png
new file mode 100644
index 000000000..4fd921655
Binary files /dev/null and b/lib/images/fileicons/txt.png differ
diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png
new file mode 100644
index 000000000..c8880c62e
Binary files /dev/null and b/lib/images/fileicons/wav.png differ
diff --git a/lib/images/fileicons/webm.png b/lib/images/fileicons/webm.png
new file mode 100644
index 000000000..55db61914
Binary files /dev/null and b/lib/images/fileicons/webm.png differ
diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png
new file mode 100644
index 000000000..12a32a295
Binary files /dev/null and b/lib/images/fileicons/xls.png differ
diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png
new file mode 100644
index 000000000..b2e85489d
Binary files /dev/null and b/lib/images/fileicons/xlsx.png differ
diff --git a/lib/images/fileicons/xml.png b/lib/images/fileicons/xml.png
new file mode 100644
index 000000000..4480a6385
Binary files /dev/null and b/lib/images/fileicons/xml.png differ
diff --git a/lib/images/fileicons/zip.png b/lib/images/fileicons/zip.png
new file mode 100644
index 000000000..4a36a35ff
Binary files /dev/null and b/lib/images/fileicons/zip.png differ
-- 
cgit v1.2.3


From ebb53cb74e5659197d0b9701b946df826eb635a6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 6 Mar 2014 23:30:45 +0100
Subject: fixed index file

---
 lib/images/fileicons/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/images/fileicons/index.php b/lib/images/fileicons/index.php
index 28de26062..09b6c9df8 100644
--- a/lib/images/fileicons/index.php
+++ b/lib/images/fileicons/index.php
@@ -30,7 +30,7 @@
 
 <div class="white box">
 <?php
-foreach (glob('16x16/*.png') as $img) {
+foreach (glob('*.png') as $img) {
     echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
 }
 ?>
@@ -38,7 +38,7 @@ foreach (glob('16x16/*.png') as $img) {
 
 <div class="black box">
 <?php
-foreach (glob('16x16/*.png') as $img) {
+foreach (glob('*.png') as $img) {
     echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
 }
 ?>
-- 
cgit v1.2.3


From 41cc488cf7e5b031d2eecb1908c635921544beca Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 6 Mar 2014 23:59:48 +0100
Subject: updated file icons once more

adjusted some colors, added a few common extensions for codeblocks
---
 lib/images/fileicons/32x32/asm.png  | Bin 988 -> 989 bytes
 lib/images/fileicons/32x32/bash.png | Bin 993 -> 993 bytes
 lib/images/fileicons/32x32/c.png    | Bin 945 -> 945 bytes
 lib/images/fileicons/32x32/cc.png   | Bin 953 -> 955 bytes
 lib/images/fileicons/32x32/cpp.png  | Bin 958 -> 960 bytes
 lib/images/fileicons/32x32/cs.png   | Bin 0 -> 960 bytes
 lib/images/fileicons/32x32/csh.png  | Bin 981 -> 981 bytes
 lib/images/fileicons/32x32/css.png  | Bin 967 -> 969 bytes
 lib/images/fileicons/32x32/diff.png | Bin 975 -> 975 bytes
 lib/images/fileicons/32x32/doc.png  | Bin 1032 -> 1030 bytes
 lib/images/fileicons/32x32/docx.png | Bin 1062 -> 1056 bytes
 lib/images/fileicons/32x32/h.png    | Bin 939 -> 941 bytes
 lib/images/fileicons/32x32/hpp.png  | Bin 975 -> 974 bytes
 lib/images/fileicons/32x32/htm.png  | Bin 982 -> 983 bytes
 lib/images/fileicons/32x32/html.png | Bin 982 -> 983 bytes
 lib/images/fileicons/32x32/java.png | Bin 992 -> 992 bytes
 lib/images/fileicons/32x32/js.png   | Bin 959 -> 960 bytes
 lib/images/fileicons/32x32/json.png | Bin 1001 -> 996 bytes
 lib/images/fileicons/32x32/lua.png  | Bin 0 -> 979 bytes
 lib/images/fileicons/32x32/odc.png  | Bin 1058 -> 1056 bytes
 lib/images/fileicons/32x32/odf.png  | Bin 1056 -> 1056 bytes
 lib/images/fileicons/32x32/odg.png  | Bin 1065 -> 1062 bytes
 lib/images/fileicons/32x32/odi.png  | Bin 1056 -> 1053 bytes
 lib/images/fileicons/32x32/odp.png  | Bin 1060 -> 1054 bytes
 lib/images/fileicons/32x32/ods.png  | Bin 1063 -> 1059 bytes
 lib/images/fileicons/32x32/odt.png  | Bin 1060 -> 1058 bytes
 lib/images/fileicons/32x32/pas.png  | Bin 975 -> 976 bytes
 lib/images/fileicons/32x32/php.png  | Bin 0 -> 974 bytes
 lib/images/fileicons/32x32/pl.png   | Bin 950 -> 951 bytes
 lib/images/fileicons/32x32/ppt.png  | Bin 872 -> 869 bytes
 lib/images/fileicons/32x32/pptx.png | Bin 917 -> 907 bytes
 lib/images/fileicons/32x32/py.png   | Bin 965 -> 966 bytes
 lib/images/fileicons/32x32/rb.png   | Bin 0 -> 953 bytes
 lib/images/fileicons/32x32/rtf.png  | Bin 861 -> 860 bytes
 lib/images/fileicons/32x32/sh.png   | Bin 961 -> 962 bytes
 lib/images/fileicons/32x32/sql.png  | Bin 0 -> 827 bytes
 lib/images/fileicons/32x32/sxc.png  | Bin 1074 -> 1074 bytes
 lib/images/fileicons/32x32/sxd.png  | Bin 1078 -> 1071 bytes
 lib/images/fileicons/32x32/sxi.png  | Bin 1066 -> 1063 bytes
 lib/images/fileicons/32x32/sxw.png  | Bin 1076 -> 1075 bytes
 lib/images/fileicons/32x32/xls.png  | Bin 1137 -> 1137 bytes
 lib/images/fileicons/32x32/xlsx.png | Bin 1174 -> 1158 bytes
 lib/images/fileicons/asm.png        | Bin 424 -> 427 bytes
 lib/images/fileicons/bash.png       | Bin 435 -> 433 bytes
 lib/images/fileicons/c.png          | Bin 413 -> 412 bytes
 lib/images/fileicons/cc.png         | Bin 410 -> 411 bytes
 lib/images/fileicons/cpp.png        | Bin 429 -> 430 bytes
 lib/images/fileicons/cs.png         | Bin 0 -> 419 bytes
 lib/images/fileicons/csh.png        | Bin 430 -> 427 bytes
 lib/images/fileicons/css.png        | Bin 430 -> 427 bytes
 lib/images/fileicons/diff.png       | Bin 428 -> 425 bytes
 lib/images/fileicons/doc.png        | Bin 405 -> 408 bytes
 lib/images/fileicons/docx.png       | Bin 402 -> 407 bytes
 lib/images/fileicons/h.png          | Bin 411 -> 411 bytes
 lib/images/fileicons/hpp.png        | Bin 417 -> 417 bytes
 lib/images/fileicons/htm.png        | Bin 422 -> 417 bytes
 lib/images/fileicons/html.png       | Bin 422 -> 417 bytes
 lib/images/fileicons/java.png       | Bin 420 -> 420 bytes
 lib/images/fileicons/js.png         | Bin 420 -> 420 bytes
 lib/images/fileicons/json.png       | Bin 434 -> 435 bytes
 lib/images/fileicons/lua.png        | Bin 0 -> 418 bytes
 lib/images/fileicons/odc.png        | Bin 403 -> 406 bytes
 lib/images/fileicons/odf.png        | Bin 408 -> 409 bytes
 lib/images/fileicons/odg.png        | Bin 405 -> 409 bytes
 lib/images/fileicons/odi.png        | Bin 398 -> 401 bytes
 lib/images/fileicons/odp.png        | Bin 406 -> 405 bytes
 lib/images/fileicons/ods.png        | Bin 409 -> 413 bytes
 lib/images/fileicons/odt.png        | Bin 406 -> 402 bytes
 lib/images/fileicons/pas.png        | Bin 435 -> 435 bytes
 lib/images/fileicons/php.png        | Bin 0 -> 424 bytes
 lib/images/fileicons/pl.png         | Bin 417 -> 418 bytes
 lib/images/fileicons/ppt.png        | Bin 415 -> 414 bytes
 lib/images/fileicons/pptx.png       | Bin 407 -> 415 bytes
 lib/images/fileicons/py.png         | Bin 426 -> 426 bytes
 lib/images/fileicons/rb.png         | Bin 0 -> 421 bytes
 lib/images/fileicons/rtf.png        | Bin 422 -> 423 bytes
 lib/images/fileicons/sh.png         | Bin 422 -> 422 bytes
 lib/images/fileicons/sql.png        | Bin 0 -> 410 bytes
 lib/images/fileicons/sxc.png        | Bin 416 -> 420 bytes
 lib/images/fileicons/sxd.png        | Bin 420 -> 418 bytes
 lib/images/fileicons/sxi.png        | Bin 408 -> 414 bytes
 lib/images/fileicons/sxw.png        | Bin 410 -> 415 bytes
 lib/images/fileicons/xls.png        | Bin 408 -> 415 bytes
 lib/images/fileicons/xlsx.png       | Bin 419 -> 428 bytes
 84 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lib/images/fileicons/32x32/cs.png
 create mode 100644 lib/images/fileicons/32x32/lua.png
 create mode 100644 lib/images/fileicons/32x32/php.png
 create mode 100644 lib/images/fileicons/32x32/rb.png
 create mode 100644 lib/images/fileicons/32x32/sql.png
 create mode 100644 lib/images/fileicons/cs.png
 create mode 100644 lib/images/fileicons/lua.png
 create mode 100644 lib/images/fileicons/php.png
 create mode 100644 lib/images/fileicons/rb.png
 create mode 100644 lib/images/fileicons/sql.png

(limited to 'lib')

diff --git a/lib/images/fileicons/32x32/asm.png b/lib/images/fileicons/32x32/asm.png
index d9e336cdb..f1a1f322b 100644
Binary files a/lib/images/fileicons/32x32/asm.png and b/lib/images/fileicons/32x32/asm.png differ
diff --git a/lib/images/fileicons/32x32/bash.png b/lib/images/fileicons/32x32/bash.png
index 7a49f285a..c28404ed1 100644
Binary files a/lib/images/fileicons/32x32/bash.png and b/lib/images/fileicons/32x32/bash.png differ
diff --git a/lib/images/fileicons/32x32/c.png b/lib/images/fileicons/32x32/c.png
index 4e0dc92b7..0a01f8f3a 100644
Binary files a/lib/images/fileicons/32x32/c.png and b/lib/images/fileicons/32x32/c.png differ
diff --git a/lib/images/fileicons/32x32/cc.png b/lib/images/fileicons/32x32/cc.png
index 5e21e28ba..b09b3357f 100644
Binary files a/lib/images/fileicons/32x32/cc.png and b/lib/images/fileicons/32x32/cc.png differ
diff --git a/lib/images/fileicons/32x32/cpp.png b/lib/images/fileicons/32x32/cpp.png
index 18a0d0a92..1ce35422c 100644
Binary files a/lib/images/fileicons/32x32/cpp.png and b/lib/images/fileicons/32x32/cpp.png differ
diff --git a/lib/images/fileicons/32x32/cs.png b/lib/images/fileicons/32x32/cs.png
new file mode 100644
index 000000000..d300f7551
Binary files /dev/null and b/lib/images/fileicons/32x32/cs.png differ
diff --git a/lib/images/fileicons/32x32/csh.png b/lib/images/fileicons/32x32/csh.png
index 3f060c885..72ecbcc52 100644
Binary files a/lib/images/fileicons/32x32/csh.png and b/lib/images/fileicons/32x32/csh.png differ
diff --git a/lib/images/fileicons/32x32/css.png b/lib/images/fileicons/32x32/css.png
index 7ae0937c7..638957637 100644
Binary files a/lib/images/fileicons/32x32/css.png and b/lib/images/fileicons/32x32/css.png differ
diff --git a/lib/images/fileicons/32x32/diff.png b/lib/images/fileicons/32x32/diff.png
index 0cda679c7..4dd98e7cc 100644
Binary files a/lib/images/fileicons/32x32/diff.png and b/lib/images/fileicons/32x32/diff.png differ
diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png
index c1e543a57..9daff79be 100644
Binary files a/lib/images/fileicons/32x32/doc.png and b/lib/images/fileicons/32x32/doc.png differ
diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png
index 36b6ea5fd..5ef454fde 100644
Binary files a/lib/images/fileicons/32x32/docx.png and b/lib/images/fileicons/32x32/docx.png differ
diff --git a/lib/images/fileicons/32x32/h.png b/lib/images/fileicons/32x32/h.png
index 5bca1ab4c..27c8ceaf3 100644
Binary files a/lib/images/fileicons/32x32/h.png and b/lib/images/fileicons/32x32/h.png differ
diff --git a/lib/images/fileicons/32x32/hpp.png b/lib/images/fileicons/32x32/hpp.png
index 0ccd65af0..04876a5d5 100644
Binary files a/lib/images/fileicons/32x32/hpp.png and b/lib/images/fileicons/32x32/hpp.png differ
diff --git a/lib/images/fileicons/32x32/htm.png b/lib/images/fileicons/32x32/htm.png
index f52a826f4..ec4f15ac6 100644
Binary files a/lib/images/fileicons/32x32/htm.png and b/lib/images/fileicons/32x32/htm.png differ
diff --git a/lib/images/fileicons/32x32/html.png b/lib/images/fileicons/32x32/html.png
index f52a826f4..ec4f15ac6 100644
Binary files a/lib/images/fileicons/32x32/html.png and b/lib/images/fileicons/32x32/html.png differ
diff --git a/lib/images/fileicons/32x32/java.png b/lib/images/fileicons/32x32/java.png
index d3a66c4dd..ee9cc4ccb 100644
Binary files a/lib/images/fileicons/32x32/java.png and b/lib/images/fileicons/32x32/java.png differ
diff --git a/lib/images/fileicons/32x32/js.png b/lib/images/fileicons/32x32/js.png
index 741b175d3..9bbbfb709 100644
Binary files a/lib/images/fileicons/32x32/js.png and b/lib/images/fileicons/32x32/js.png differ
diff --git a/lib/images/fileicons/32x32/json.png b/lib/images/fileicons/32x32/json.png
index 2a2a381ec..583ece683 100644
Binary files a/lib/images/fileicons/32x32/json.png and b/lib/images/fileicons/32x32/json.png differ
diff --git a/lib/images/fileicons/32x32/lua.png b/lib/images/fileicons/32x32/lua.png
new file mode 100644
index 000000000..9e8fc9517
Binary files /dev/null and b/lib/images/fileicons/32x32/lua.png differ
diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png
index ebb15681e..6a2a89f7d 100644
Binary files a/lib/images/fileicons/32x32/odc.png and b/lib/images/fileicons/32x32/odc.png differ
diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png
index 97e4c45b3..54fdd8a75 100644
Binary files a/lib/images/fileicons/32x32/odf.png and b/lib/images/fileicons/32x32/odf.png differ
diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png
index b2aae1e03..bd5b5bd35 100644
Binary files a/lib/images/fileicons/32x32/odg.png and b/lib/images/fileicons/32x32/odg.png differ
diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png
index 8176d2daa..90f3ac991 100644
Binary files a/lib/images/fileicons/32x32/odi.png and b/lib/images/fileicons/32x32/odi.png differ
diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png
index 8e27fd62e..3514994ae 100644
Binary files a/lib/images/fileicons/32x32/odp.png and b/lib/images/fileicons/32x32/odp.png differ
diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png
index 9319b6acc..2fd7d7ae6 100644
Binary files a/lib/images/fileicons/32x32/ods.png and b/lib/images/fileicons/32x32/ods.png differ
diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png
index 13eb496d3..a49457a03 100644
Binary files a/lib/images/fileicons/32x32/odt.png and b/lib/images/fileicons/32x32/odt.png differ
diff --git a/lib/images/fileicons/32x32/pas.png b/lib/images/fileicons/32x32/pas.png
index e71796d8a..c2c05d2d1 100644
Binary files a/lib/images/fileicons/32x32/pas.png and b/lib/images/fileicons/32x32/pas.png differ
diff --git a/lib/images/fileicons/32x32/php.png b/lib/images/fileicons/32x32/php.png
new file mode 100644
index 000000000..8f3c84e32
Binary files /dev/null and b/lib/images/fileicons/32x32/php.png differ
diff --git a/lib/images/fileicons/32x32/pl.png b/lib/images/fileicons/32x32/pl.png
index a7bbfedf1..88aa2723f 100644
Binary files a/lib/images/fileicons/32x32/pl.png and b/lib/images/fileicons/32x32/pl.png differ
diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png
index 17dc7fda3..f5f4e3b71 100644
Binary files a/lib/images/fileicons/32x32/ppt.png and b/lib/images/fileicons/32x32/ppt.png differ
diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png
index cc42cf0e1..5fa0cba9f 100644
Binary files a/lib/images/fileicons/32x32/pptx.png and b/lib/images/fileicons/32x32/pptx.png differ
diff --git a/lib/images/fileicons/32x32/py.png b/lib/images/fileicons/32x32/py.png
index 2ce622aeb..cf6e412f0 100644
Binary files a/lib/images/fileicons/32x32/py.png and b/lib/images/fileicons/32x32/py.png differ
diff --git a/lib/images/fileicons/32x32/rb.png b/lib/images/fileicons/32x32/rb.png
new file mode 100644
index 000000000..b0dfd8980
Binary files /dev/null and b/lib/images/fileicons/32x32/rb.png differ
diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png
index 0ad836e0c..c0f3272e1 100644
Binary files a/lib/images/fileicons/32x32/rtf.png and b/lib/images/fileicons/32x32/rtf.png differ
diff --git a/lib/images/fileicons/32x32/sh.png b/lib/images/fileicons/32x32/sh.png
index 1c2dbb29d..93c093ea4 100644
Binary files a/lib/images/fileicons/32x32/sh.png and b/lib/images/fileicons/32x32/sh.png differ
diff --git a/lib/images/fileicons/32x32/sql.png b/lib/images/fileicons/32x32/sql.png
new file mode 100644
index 000000000..f6436e725
Binary files /dev/null and b/lib/images/fileicons/32x32/sql.png differ
diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png
index fbd28e3de..045eb0666 100644
Binary files a/lib/images/fileicons/32x32/sxc.png and b/lib/images/fileicons/32x32/sxc.png differ
diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png
index 243c18861..cb4249d8e 100644
Binary files a/lib/images/fileicons/32x32/sxd.png and b/lib/images/fileicons/32x32/sxd.png differ
diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png
index 5c699f6eb..ad7def7de 100644
Binary files a/lib/images/fileicons/32x32/sxi.png and b/lib/images/fileicons/32x32/sxi.png differ
diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png
index 944989e87..ea1fe84de 100644
Binary files a/lib/images/fileicons/32x32/sxw.png and b/lib/images/fileicons/32x32/sxw.png differ
diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png
index 38e2b235b..6a97045df 100644
Binary files a/lib/images/fileicons/32x32/xls.png and b/lib/images/fileicons/32x32/xls.png differ
diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png
index 773e49f77..dbbd536ba 100644
Binary files a/lib/images/fileicons/32x32/xlsx.png and b/lib/images/fileicons/32x32/xlsx.png differ
diff --git a/lib/images/fileicons/asm.png b/lib/images/fileicons/asm.png
index a88d01665..1281e12b8 100644
Binary files a/lib/images/fileicons/asm.png and b/lib/images/fileicons/asm.png differ
diff --git a/lib/images/fileicons/bash.png b/lib/images/fileicons/bash.png
index 047be8c6a..257584649 100644
Binary files a/lib/images/fileicons/bash.png and b/lib/images/fileicons/bash.png differ
diff --git a/lib/images/fileicons/c.png b/lib/images/fileicons/c.png
index 5e91b8473..f0d4e9aa1 100644
Binary files a/lib/images/fileicons/c.png and b/lib/images/fileicons/c.png differ
diff --git a/lib/images/fileicons/cc.png b/lib/images/fileicons/cc.png
index 432c95901..e6f4c6457 100644
Binary files a/lib/images/fileicons/cc.png and b/lib/images/fileicons/cc.png differ
diff --git a/lib/images/fileicons/cpp.png b/lib/images/fileicons/cpp.png
index 6c6be4263..4027e4beb 100644
Binary files a/lib/images/fileicons/cpp.png and b/lib/images/fileicons/cpp.png differ
diff --git a/lib/images/fileicons/cs.png b/lib/images/fileicons/cs.png
new file mode 100644
index 000000000..31b7f7661
Binary files /dev/null and b/lib/images/fileicons/cs.png differ
diff --git a/lib/images/fileicons/csh.png b/lib/images/fileicons/csh.png
index 14e01b2a7..cc21e7995 100644
Binary files a/lib/images/fileicons/csh.png and b/lib/images/fileicons/csh.png differ
diff --git a/lib/images/fileicons/css.png b/lib/images/fileicons/css.png
index 5638f1879..abd16fa8e 100644
Binary files a/lib/images/fileicons/css.png and b/lib/images/fileicons/css.png differ
diff --git a/lib/images/fileicons/diff.png b/lib/images/fileicons/diff.png
index c81c4ff2c..1775da014 100644
Binary files a/lib/images/fileicons/diff.png and b/lib/images/fileicons/diff.png differ
diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png
index 9324f20b3..78cddc270 100644
Binary files a/lib/images/fileicons/doc.png and b/lib/images/fileicons/doc.png differ
diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png
index e3986295d..82e042953 100644
Binary files a/lib/images/fileicons/docx.png and b/lib/images/fileicons/docx.png differ
diff --git a/lib/images/fileicons/h.png b/lib/images/fileicons/h.png
index a208d3159..4afe8f84f 100644
Binary files a/lib/images/fileicons/h.png and b/lib/images/fileicons/h.png differ
diff --git a/lib/images/fileicons/hpp.png b/lib/images/fileicons/hpp.png
index decd78b7e..3ee7583d2 100644
Binary files a/lib/images/fileicons/hpp.png and b/lib/images/fileicons/hpp.png differ
diff --git a/lib/images/fileicons/htm.png b/lib/images/fileicons/htm.png
index e0ead2bff..02e81932b 100644
Binary files a/lib/images/fileicons/htm.png and b/lib/images/fileicons/htm.png differ
diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png
index e0ead2bff..02e81932b 100644
Binary files a/lib/images/fileicons/html.png and b/lib/images/fileicons/html.png differ
diff --git a/lib/images/fileicons/java.png b/lib/images/fileicons/java.png
index 6adebc02b..cf6f5b4f5 100644
Binary files a/lib/images/fileicons/java.png and b/lib/images/fileicons/java.png differ
diff --git a/lib/images/fileicons/js.png b/lib/images/fileicons/js.png
index 37d3a7958..16e3f9538 100644
Binary files a/lib/images/fileicons/js.png and b/lib/images/fileicons/js.png differ
diff --git a/lib/images/fileicons/json.png b/lib/images/fileicons/json.png
index 0f32375e6..96611cb53 100644
Binary files a/lib/images/fileicons/json.png and b/lib/images/fileicons/json.png differ
diff --git a/lib/images/fileicons/lua.png b/lib/images/fileicons/lua.png
new file mode 100644
index 000000000..81fdeea40
Binary files /dev/null and b/lib/images/fileicons/lua.png differ
diff --git a/lib/images/fileicons/odc.png b/lib/images/fileicons/odc.png
index b2a879a84..cd44bff3f 100644
Binary files a/lib/images/fileicons/odc.png and b/lib/images/fileicons/odc.png differ
diff --git a/lib/images/fileicons/odf.png b/lib/images/fileicons/odf.png
index 65db17827..b839f7809 100644
Binary files a/lib/images/fileicons/odf.png and b/lib/images/fileicons/odf.png differ
diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png
index bab8fe1a7..4537746b6 100644
Binary files a/lib/images/fileicons/odg.png and b/lib/images/fileicons/odg.png differ
diff --git a/lib/images/fileicons/odi.png b/lib/images/fileicons/odi.png
index f0df8e582..02b0a9f1d 100644
Binary files a/lib/images/fileicons/odi.png and b/lib/images/fileicons/odi.png differ
diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png
index 4008c4e54..a475943a0 100644
Binary files a/lib/images/fileicons/odp.png and b/lib/images/fileicons/odp.png differ
diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png
index c7d5e263c..f9397821b 100644
Binary files a/lib/images/fileicons/ods.png and b/lib/images/fileicons/ods.png differ
diff --git a/lib/images/fileicons/odt.png b/lib/images/fileicons/odt.png
index 8fd5fd35c..4cf0c5d02 100644
Binary files a/lib/images/fileicons/odt.png and b/lib/images/fileicons/odt.png differ
diff --git a/lib/images/fileicons/pas.png b/lib/images/fileicons/pas.png
index 0a91eff4a..0c14372d0 100644
Binary files a/lib/images/fileicons/pas.png and b/lib/images/fileicons/pas.png differ
diff --git a/lib/images/fileicons/php.png b/lib/images/fileicons/php.png
new file mode 100644
index 000000000..2deb5d3b1
Binary files /dev/null and b/lib/images/fileicons/php.png differ
diff --git a/lib/images/fileicons/pl.png b/lib/images/fileicons/pl.png
index 7f43f6399..a4fa92203 100644
Binary files a/lib/images/fileicons/pl.png and b/lib/images/fileicons/pl.png differ
diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png
index e097ceb90..e00527bc2 100644
Binary files a/lib/images/fileicons/ppt.png and b/lib/images/fileicons/ppt.png differ
diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png
index 9dda61a12..a29d7ad48 100644
Binary files a/lib/images/fileicons/pptx.png and b/lib/images/fileicons/pptx.png differ
diff --git a/lib/images/fileicons/py.png b/lib/images/fileicons/py.png
index 4745cb972..f0ed0258c 100644
Binary files a/lib/images/fileicons/py.png and b/lib/images/fileicons/py.png differ
diff --git a/lib/images/fileicons/rb.png b/lib/images/fileicons/rb.png
new file mode 100644
index 000000000..0e59207fc
Binary files /dev/null and b/lib/images/fileicons/rb.png differ
diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png
index 4486932ed..1b543471d 100644
Binary files a/lib/images/fileicons/rtf.png and b/lib/images/fileicons/rtf.png differ
diff --git a/lib/images/fileicons/sh.png b/lib/images/fileicons/sh.png
index 60266bf3c..256067106 100644
Binary files a/lib/images/fileicons/sh.png and b/lib/images/fileicons/sh.png differ
diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png
new file mode 100644
index 000000000..6697943e2
Binary files /dev/null and b/lib/images/fileicons/sql.png differ
diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png
index 6084d49b7..11254c0c8 100644
Binary files a/lib/images/fileicons/sxc.png and b/lib/images/fileicons/sxc.png differ
diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png
index aecd863a0..ece9e9089 100644
Binary files a/lib/images/fileicons/sxd.png and b/lib/images/fileicons/sxd.png differ
diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png
index b34b33ca3..981ef7637 100644
Binary files a/lib/images/fileicons/sxi.png and b/lib/images/fileicons/sxi.png differ
diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png
index a30869d9d..90dc1adab 100644
Binary files a/lib/images/fileicons/sxw.png and b/lib/images/fileicons/sxw.png differ
diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png
index 12a32a295..ae4c0287a 100644
Binary files a/lib/images/fileicons/xls.png and b/lib/images/fileicons/xls.png differ
diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png
index b2e85489d..19a54c865 100644
Binary files a/lib/images/fileicons/xlsx.png and b/lib/images/fileicons/xlsx.png differ
-- 
cgit v1.2.3


From 11942aff57864dc6f2bb6d329aecab95e27277e9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 7 Mar 2014 00:53:58 +0100
Subject: adjusted the office type color again

---
 lib/images/fileicons/32x32/doc.png  | Bin 1030 -> 1034 bytes
 lib/images/fileicons/32x32/docx.png | Bin 1056 -> 1078 bytes
 lib/images/fileicons/32x32/odc.png  | Bin 1056 -> 1061 bytes
 lib/images/fileicons/32x32/odf.png  | Bin 1056 -> 1059 bytes
 lib/images/fileicons/32x32/odg.png  | Bin 1062 -> 1066 bytes
 lib/images/fileicons/32x32/odi.png  | Bin 1053 -> 1058 bytes
 lib/images/fileicons/32x32/odp.png  | Bin 1054 -> 1060 bytes
 lib/images/fileicons/32x32/ods.png  | Bin 1059 -> 1063 bytes
 lib/images/fileicons/32x32/odt.png  | Bin 1058 -> 1060 bytes
 lib/images/fileicons/32x32/ppt.png  | Bin 869 -> 871 bytes
 lib/images/fileicons/32x32/pptx.png | Bin 907 -> 924 bytes
 lib/images/fileicons/32x32/rtf.png  | Bin 860 -> 867 bytes
 lib/images/fileicons/32x32/sxc.png  | Bin 1074 -> 1078 bytes
 lib/images/fileicons/32x32/sxd.png  | Bin 1071 -> 1079 bytes
 lib/images/fileicons/32x32/sxi.png  | Bin 1063 -> 1067 bytes
 lib/images/fileicons/32x32/sxw.png  | Bin 1075 -> 1086 bytes
 lib/images/fileicons/32x32/xls.png  | Bin 1137 -> 1137 bytes
 lib/images/fileicons/32x32/xlsx.png | Bin 1158 -> 1182 bytes
 lib/images/fileicons/doc.png        | Bin 408 -> 410 bytes
 lib/images/fileicons/docx.png       | Bin 407 -> 415 bytes
 lib/images/fileicons/odc.png        | Bin 406 -> 407 bytes
 lib/images/fileicons/odf.png        | Bin 409 -> 411 bytes
 lib/images/fileicons/odg.png        | Bin 409 -> 411 bytes
 lib/images/fileicons/odi.png        | Bin 401 -> 398 bytes
 lib/images/fileicons/odp.png        | Bin 405 -> 404 bytes
 lib/images/fileicons/ods.png        | Bin 413 -> 416 bytes
 lib/images/fileicons/odt.png        | Bin 402 -> 403 bytes
 lib/images/fileicons/ppt.png        | Bin 414 -> 412 bytes
 lib/images/fileicons/pptx.png       | Bin 415 -> 414 bytes
 lib/images/fileicons/rtf.png        | Bin 423 -> 418 bytes
 lib/images/fileicons/sxc.png        | Bin 420 -> 420 bytes
 lib/images/fileicons/sxd.png        | Bin 418 -> 424 bytes
 lib/images/fileicons/sxi.png        | Bin 414 -> 414 bytes
 lib/images/fileicons/sxw.png        | Bin 415 -> 417 bytes
 lib/images/fileicons/xls.png        | Bin 415 -> 415 bytes
 lib/images/fileicons/xlsx.png       | Bin 428 -> 425 bytes
 36 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'lib')

diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png
index 9daff79be..8369c1f73 100644
Binary files a/lib/images/fileicons/32x32/doc.png and b/lib/images/fileicons/32x32/doc.png differ
diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png
index 5ef454fde..ce5dfb3d3 100644
Binary files a/lib/images/fileicons/32x32/docx.png and b/lib/images/fileicons/32x32/docx.png differ
diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png
index 6a2a89f7d..9a34f2129 100644
Binary files a/lib/images/fileicons/32x32/odc.png and b/lib/images/fileicons/32x32/odc.png differ
diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png
index 54fdd8a75..e3b4333ad 100644
Binary files a/lib/images/fileicons/32x32/odf.png and b/lib/images/fileicons/32x32/odf.png differ
diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png
index bd5b5bd35..c3b192b2d 100644
Binary files a/lib/images/fileicons/32x32/odg.png and b/lib/images/fileicons/32x32/odg.png differ
diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png
index 90f3ac991..6baa69407 100644
Binary files a/lib/images/fileicons/32x32/odi.png and b/lib/images/fileicons/32x32/odi.png differ
diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png
index 3514994ae..8e09dd6e4 100644
Binary files a/lib/images/fileicons/32x32/odp.png and b/lib/images/fileicons/32x32/odp.png differ
diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png
index 2fd7d7ae6..90892f3d4 100644
Binary files a/lib/images/fileicons/32x32/ods.png and b/lib/images/fileicons/32x32/ods.png differ
diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png
index a49457a03..22ec1fffb 100644
Binary files a/lib/images/fileicons/32x32/odt.png and b/lib/images/fileicons/32x32/odt.png differ
diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png
index f5f4e3b71..84b523a23 100644
Binary files a/lib/images/fileicons/32x32/ppt.png and b/lib/images/fileicons/32x32/ppt.png differ
diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png
index 5fa0cba9f..1446cf4de 100644
Binary files a/lib/images/fileicons/32x32/pptx.png and b/lib/images/fileicons/32x32/pptx.png differ
diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png
index c0f3272e1..82add4fd7 100644
Binary files a/lib/images/fileicons/32x32/rtf.png and b/lib/images/fileicons/32x32/rtf.png differ
diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png
index 045eb0666..50676be6a 100644
Binary files a/lib/images/fileicons/32x32/sxc.png and b/lib/images/fileicons/32x32/sxc.png differ
diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png
index cb4249d8e..f715a8ff0 100644
Binary files a/lib/images/fileicons/32x32/sxd.png and b/lib/images/fileicons/32x32/sxd.png differ
diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png
index ad7def7de..3d9f31d3b 100644
Binary files a/lib/images/fileicons/32x32/sxi.png and b/lib/images/fileicons/32x32/sxi.png differ
diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png
index ea1fe84de..bd8ab1436 100644
Binary files a/lib/images/fileicons/32x32/sxw.png and b/lib/images/fileicons/32x32/sxw.png differ
diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png
index 6a97045df..7447d9cdf 100644
Binary files a/lib/images/fileicons/32x32/xls.png and b/lib/images/fileicons/32x32/xls.png differ
diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png
index dbbd536ba..920217267 100644
Binary files a/lib/images/fileicons/32x32/xlsx.png and b/lib/images/fileicons/32x32/xlsx.png differ
diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png
index 78cddc270..925494576 100644
Binary files a/lib/images/fileicons/doc.png and b/lib/images/fileicons/doc.png differ
diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png
index 82e042953..5bae13f9e 100644
Binary files a/lib/images/fileicons/docx.png and b/lib/images/fileicons/docx.png differ
diff --git a/lib/images/fileicons/odc.png b/lib/images/fileicons/odc.png
index cd44bff3f..331140552 100644
Binary files a/lib/images/fileicons/odc.png and b/lib/images/fileicons/odc.png differ
diff --git a/lib/images/fileicons/odf.png b/lib/images/fileicons/odf.png
index b839f7809..eccae9e20 100644
Binary files a/lib/images/fileicons/odf.png and b/lib/images/fileicons/odf.png differ
diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png
index 4537746b6..5224425e6 100644
Binary files a/lib/images/fileicons/odg.png and b/lib/images/fileicons/odg.png differ
diff --git a/lib/images/fileicons/odi.png b/lib/images/fileicons/odi.png
index 02b0a9f1d..b57fd974d 100644
Binary files a/lib/images/fileicons/odi.png and b/lib/images/fileicons/odi.png differ
diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png
index a475943a0..81d1023c0 100644
Binary files a/lib/images/fileicons/odp.png and b/lib/images/fileicons/odp.png differ
diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png
index f9397821b..77e6d5366 100644
Binary files a/lib/images/fileicons/ods.png and b/lib/images/fileicons/ods.png differ
diff --git a/lib/images/fileicons/odt.png b/lib/images/fileicons/odt.png
index 4cf0c5d02..8490eec74 100644
Binary files a/lib/images/fileicons/odt.png and b/lib/images/fileicons/odt.png differ
diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png
index e00527bc2..3355c2712 100644
Binary files a/lib/images/fileicons/ppt.png and b/lib/images/fileicons/ppt.png differ
diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png
index a29d7ad48..269cdb8fc 100644
Binary files a/lib/images/fileicons/pptx.png and b/lib/images/fileicons/pptx.png differ
diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png
index 1b543471d..bbc425ca3 100644
Binary files a/lib/images/fileicons/rtf.png and b/lib/images/fileicons/rtf.png differ
diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png
index 11254c0c8..c96cf303f 100644
Binary files a/lib/images/fileicons/sxc.png and b/lib/images/fileicons/sxc.png differ
diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png
index ece9e9089..124b928e1 100644
Binary files a/lib/images/fileicons/sxd.png and b/lib/images/fileicons/sxd.png differ
diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png
index 981ef7637..8a5e23033 100644
Binary files a/lib/images/fileicons/sxi.png and b/lib/images/fileicons/sxi.png differ
diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png
index 90dc1adab..9a903791c 100644
Binary files a/lib/images/fileicons/sxw.png and b/lib/images/fileicons/sxw.png differ
diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png
index ae4c0287a..5ac56f20d 100644
Binary files a/lib/images/fileicons/xls.png and b/lib/images/fileicons/xls.png differ
diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png
index 19a54c865..89c84c522 100644
Binary files a/lib/images/fileicons/xlsx.png and b/lib/images/fileicons/xlsx.png differ
-- 
cgit v1.2.3


From 59ac7beaa56f2b43310b88bceca6c68a685f19e6 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 8 Mar 2014 11:27:28 +0100
Subject: Extension manager: Fix cache extension to be .repo

The dot was missing i.e. the cache files had no real extension at all.
---
 lib/plugins/extension/helper/repository.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 1f603a866..6ffe89eb7 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -31,7 +31,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
             $request_data = array('fmt' => 'php');
             $request_needed = false;
             foreach ($list as $name) {
-                $cache = new cache('##extension_manager##'.$name, 'repo');
+                $cache = new cache('##extension_manager##'.$name, '.repo');
                 $result = null;
                 if (!isset($this->loaded_extensions[$name]) && $this->hasAccess() && !$cache->useCache(array('age' => 3600 * 24))) {
                     $this->loaded_extensions[$name] = true;
@@ -46,7 +46,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
                 if ($data !== false) {
                     $extensions = unserialize($data);
                     foreach ($extensions as $extension) {
-                        $cache = new cache('##extension_manager##'.$extension['plugin'], 'repo');
+                        $cache = new cache('##extension_manager##'.$extension['plugin'], '.repo');
                         $cache->storeCache(serialize($extension));
                     }
                 } else {
@@ -63,7 +63,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
      */
     public function hasAccess() {
         if ($this->has_access === null) {
-            $cache = new cache('##extension_manager###hasAccess', 'repo');
+            $cache = new cache('##extension_manager###hasAccess', '.repo');
             $result = null;
             if (!$cache->useCache(array('age' => 3600 * 24, 'purge'=>1))) {
                 $httpclient = new DokuHTTPClient();
@@ -90,7 +90,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
      * @return array The data or null if nothing was found (possibly no repository access)
      */
     public function getData($name) {
-        $cache = new cache('##extension_manager##'.$name, 'repo');
+        $cache = new cache('##extension_manager##'.$name, '.repo');
         $result = null;
         if (!isset($this->loaded_extensions[$name]) && $this->hasAccess() && !$cache->useCache(array('age' => 3600 * 24))) {
             $this->loaded_extensions[$name] = true;
@@ -130,7 +130,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
         // store cache info for each extension
         foreach($result as $ext){
             $name = $ext['plugin'];
-            $cache = new cache('##extension_manager##'.$name, 'repo');
+            $cache = new cache('##extension_manager##'.$name, '.repo');
             $cache->storeCache(serialize($ext));
             $ids[] = $name;
         }
-- 
cgit v1.2.3


From 6bc2d8e51371c2ee17233d4c76112e3fefca437f Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Sat, 8 Mar 2014 13:05:57 +0100
Subject: translation update

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

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/ru/settings.php b/lib/plugins/authldap/lang/ru/settings.php
index 2b93e0fd4..fbe75d3cb 100644
--- a/lib/plugins/authldap/lang/ru/settings.php
+++ b/lib/plugins/authldap/lang/ru/settings.php
@@ -6,6 +6,8 @@
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Erli Moen <evseev.jr@gmail.com>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
 $lang['deref']                 = 'Как расшифровывать псевдонимы?';
 $lang['bindpw']                = 'Пароль для указанного пользователя.';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
-- 
cgit v1.2.3


From 0b1e74a3a483dfda1906c0f636b27e4a15bd7a0f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 8 Mar 2014 19:14:16 +0100
Subject: avoid HTTP image screenshot urls. closes #595

---
 lib/plugins/extension/helper/list.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 01a5c516a..47edca8c1 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -188,10 +188,17 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @return string The HTML code
      */
     function make_screenshot(helper_plugin_extension_extension $extension) {
-        if($extension->getScreenshotURL()) {
+        $screen = $extension->getScreenshotURL();
+        $thumb = $extension->getThumbnailURL();
+
+        if($screen) {
+            // use protocol independent URLs for images coming from us #595
+            $screen = str_replace('http://www.dokuwiki.org', '//www.dokuwiki.org', $screen);
+            $thumb = str_replace('http://www.dokuwiki.org', '//www.dokuwiki.org', $thumb);
+
             $title = sprintf($this->getLang('screenshot'), hsc($extension->getDisplayName()));
-            $img = '<a href="'.hsc($extension->getScreenshotURL()).'" target="_blank" class="extension_screenshot">'.
-                '<img alt="'.$title.'" width="120" height="70" src="'.hsc($extension->getThumbnailURL()).'" />'.
+            $img = '<a href="'.hsc($screen).'" target="_blank" class="extension_screenshot">'.
+                '<img alt="'.$title.'" width="120" height="70" src="'.hsc($thumb).'" />'.
                 '</a>';
         } elseif($extension->isTemplate()) {
             $img = '<img alt="" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/template.png" />';
-- 
cgit v1.2.3


From 8a94404455e7db660088b91f82bf92137bad4195 Mon Sep 17 00:00:00 2001
From: Janar Leas <janar.leas@eesti.ee>
Date: Sun, 9 Mar 2014 00:21:04 +0100
Subject: translation update

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

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
index ad2e9ffc9..84e21d1f8 100644
--- a/lib/plugins/acl/lang/et/lang.php
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -8,6 +8,7 @@
  * @author Kaiko Kaur <kaiko@kultuur.edu.ee>
  * @author kristian.kankainen@kuu.la
  * @author Rivo Zängov <eraser@eraser.ee>
+ * @author Janar Leas <janar.leas@eesti.ee>
  */
 $lang['admin_acl']             = 'Ligipääsukontrolli nimekirja haldamine';
 $lang['acl_group']             = 'Grupp';
@@ -16,6 +17,8 @@ $lang['acl_perms']             = 'Lubatud';
 $lang['page']                  = 'leht';
 $lang['namespace']             = 'alajaotus';
 $lang['btn_select']            = 'Vali';
+$lang['p_choose_id']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks leheküljele <b class="aclpage">%s</b> sätestatud volitusi.';
+$lang['p_choose_ns']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks nimeruumile <b class="aclpage">%s</b> sätestatud volitusi.';
 $lang['who']                   = 'Kasutaja/Grupp';
 $lang['perm']                  = 'Õigused';
 $lang['acl_perm0']             = 'Pole';
-- 
cgit v1.2.3


From 3b7b1e523ecf0c4752f428e6c5f530988e0b80b9 Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Sun, 9 Mar 2014 15:31:27 +0100
Subject: translation update

---
 lib/plugins/authldap/lang/ru/settings.php  |  3 +++
 lib/plugins/authpgsql/lang/ru/settings.php |  2 ++
 lib/plugins/extension/lang/ru/lang.php     | 31 ++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 lib/plugins/extension/lang/ru/lang.php

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/ru/settings.php b/lib/plugins/authldap/lang/ru/settings.php
index fbe75d3cb..04a3ee784 100644
--- a/lib/plugins/authldap/lang/ru/settings.php
+++ b/lib/plugins/authldap/lang/ru/settings.php
@@ -11,3 +11,6 @@
 $lang['deref']                 = 'Как расшифровывать псевдонимы?';
 $lang['bindpw']                = 'Пароль для указанного пользователя.';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php
index 48dd2a87c..65cbce8df 100644
--- a/lib/plugins/authpgsql/lang/ru/settings.php
+++ b/lib/plugins/authpgsql/lang/ru/settings.php
@@ -5,12 +5,14 @@
  * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
 $lang['server']                = 'Ваш PostgreSQL-сервер';
 $lang['port']                  = 'Порт вашего PostgreSQL-сервера';
 $lang['user']                  = 'Имя пользователя PostgreSQL';
 $lang['password']              = 'Пароль для указанного пользователя.';
 $lang['database']              = 'Имя базы данных';
+$lang['debug']                 = 'Отображать дополнительную отладочную информацию';
 $lang['checkPass']             = 'Выражение SQL, осуществляющее проверку пароля';
 $lang['getUserInfo']           = 'Выражение SQL, осуществляющее извлечение информации о пользователе';
 $lang['getGroups']             = 'Выражение SQL, осуществляющее извлечение информации о членстве пользователе в группах';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
new file mode 100644
index 000000000..0a6df12be
--- /dev/null
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ */
+$lang['menu']                  = 'Управление дополнениями';
+$lang['tab_plugins']           = 'Установленные плагины';
+$lang['tab_templates']         = 'Установленные шаблоны';
+$lang['tab_search']            = 'Поиск и установка';
+$lang['tab_install']           = 'Ручная установка';
+$lang['notinstalled']          = 'Это дополнение не установлено';
+$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['popularity']            = 'Попоулярность: %s%%';
+$lang['bugs_features']         = 'Ошибки';
+$lang['tags']                  = 'Метки:';
+$lang['repository']            = 'Репозиторий:';
+$lang['unknown']               = '<em>неизвестно</em>';
-- 
cgit v1.2.3


From 68321121b4d24c7489400c950afdbe6eba0f417d Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Tue, 11 Mar 2014 18:06:07 +0100
Subject: translation update

---
 lib/plugins/acl/lang/ru/help.txt           |  2 +-
 lib/plugins/authad/lang/ru/lang.php        |  8 ++++++++
 lib/plugins/extension/lang/ru/lang.php     | 10 ++++++++++
 lib/plugins/popularity/lang/ru/intro.txt   |  4 ++--
 lib/plugins/usermanager/lang/ru/import.txt |  8 ++++----
 lib/plugins/usermanager/lang/ru/lang.php   |  3 ++-
 6 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 lib/plugins/authad/lang/ru/lang.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt
index ecb2fe3d0..e1b76c2c7 100644
--- a/lib/plugins/acl/lang/ru/help.txt
+++ b/lib/plugins/acl/lang/ru/help.txt
@@ -5,4 +5,4 @@
   * Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.
   * Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.
 
-Прочтение  [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики».
+Прочтение  [[doku>acl|официальной документации по правам доступа]] может помочь вам в полном понимании работы управления правами доступа в «Докувики».
diff --git a/lib/plugins/authad/lang/ru/lang.php b/lib/plugins/authad/lang/ru/lang.php
new file mode 100644
index 000000000..6f3c03e39
--- /dev/null
+++ b/lib/plugins/authad/lang/ru/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ */
+$lang['domain']                = 'Домен';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index 0a6df12be..4a36cb85d 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -29,3 +29,13 @@ $lang['bugs_features']         = 'Ошибки';
 $lang['tags']                  = 'Метки:';
 $lang['repository']            = 'Репозиторий:';
 $lang['unknown']               = '<em>неизвестно</em>';
+$lang['repo_retry']            = 'Повторить';
+$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']    = 'Дополнение удалено';
diff --git a/lib/plugins/popularity/lang/ru/intro.txt b/lib/plugins/popularity/lang/ru/intro.txt
index 52f5a0ae2..dbf0cc688 100644
--- a/lib/plugins/popularity/lang/ru/intro.txt
+++ b/lib/plugins/popularity/lang/ru/intro.txt
@@ -1,10 +1,10 @@
 ====== Сбор информации о популярности ======
 
-Этот [[doku>popularity|инструмент]] собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «ДокуВики». Эти данные помогут им понять, как именно используется «ДокуВики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям.
+Этот [[doku>popularity|инструмент]] собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «Докувики». Эти данные помогут им понять, как именно используется «Докувики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям.
 
 Отправляйте данные время от времени для того, чтобы сообщать разработчикам о том, что ваша вики «подросла». Отправленные вами данные будут идентифицированы по анонимному ID.
 
-Собранные данные содержат такую информацию, как: версия «ДокуВики», количество и размер ваших страниц и файлов, установленные плагины, информацию об установленном PHP.
+Собранные данные содержат такую информацию, как: версия «Докувики», количество и размер ваших страниц и файлов, установленные плагины, информацию об установленном PHP.
 
 Данные, которые будут отосланы, представлены ниже. Пожалуйста, используйте кнопку «Отправить данные», чтобы передать информацию.
 
diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt
index 3a25f34ce..dd2b797bc 100644
--- a/lib/plugins/usermanager/lang/ru/import.txt
+++ b/lib/plugins/usermanager/lang/ru/import.txt
@@ -1,9 +1,9 @@
 ===== Импорт нескольких пользователей =====
 
 Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
-Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы.
-Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание.
-В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей».
+Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. 
+Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание. 
+В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». 
 Повторяющиеся идентификаторы user-id будут игнорироваться.
 
-Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file
+Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю. 
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 3102ac32a..83158df31 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -19,6 +19,7 @@
  * @author Johnny Utah <pcpa@cyberpunk.su>
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Pavel <ivanovtsk@mail.ru>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
@@ -72,7 +73,7 @@ $lang['import_error_fields']   = 'Не все поля заполнены. На
 $lang['import_error_baduserid'] = 'Отсутствует идентификатор пользователя';
 $lang['import_error_badname']  = 'Имя не годится';
 $lang['import_error_badmail']  = 'Адрес электронной почты не годится';
-$lang['import_error_upload']   = 'Импорт не удался. CSV файл не загружен или пуст.';
+$lang['import_error_upload']   = 'Импорт не удался. CSV-файл не загружен или пуст.';
 $lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.';
 $lang['import_error_create']   = 'Невозможно создать пользователя';
 $lang['import_notify_fail']    = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.';
-- 
cgit v1.2.3


From abaffa745a174b306d15c70aa8610f7ef5bd3a80 Mon Sep 17 00:00:00 2001
From: Janar Leas <janar.leas@eesti.ee>
Date: Wed, 12 Mar 2014 16:26:12 +0100
Subject: translation update

---
 lib/plugins/acl/lang/et/help.txt | 9 +++++++++
 lib/plugins/acl/lang/et/lang.php | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/acl/lang/et/help.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/et/help.txt b/lib/plugins/acl/lang/et/help.txt
new file mode 100644
index 000000000..a2c8e9e95
--- /dev/null
+++ b/lib/plugins/acl/lang/et/help.txt
@@ -0,0 +1,9 @@
+=== Kiir-spikker: ===
+
+Käesoleval leheküljel saad oma wiki nimeruumidele ja lehekülgedele lisada ning eemaldada õigusi.
+  * Vasemas paanis on näidatud kõik saada olevad nimeruumid ja leheküljed.
+  * Ülal olev vorm laseb sul vaadelda ja muuta valitud rühma või kasutaja õigusi.
+  * Allolevas tabelis näidatakse kõiki hetkel sättestatud reegleid ligipääsudele.
+Saad seda kasutada reeglite hulgi muutmiseks või kustutamiseks
+
+Mõistmaks paremini DokuWiki ligipääsu halduse toimimist, võiks abiks olla [[doku>acl|ACL-i ametliku dokumentatsiooniga]] tutvumine.
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
index 84e21d1f8..199500103 100644
--- a/lib/plugins/acl/lang/et/lang.php
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -15,10 +15,15 @@ $lang['acl_group']             = 'Grupp';
 $lang['acl_user']              = 'Kasutaja';
 $lang['acl_perms']             = 'Lubatud';
 $lang['page']                  = 'leht';
-$lang['namespace']             = 'alajaotus';
+$lang['namespace']             = 'Nimeruum';
 $lang['btn_select']            = 'Vali';
+$lang['p_user_ns']             = 'Kasutaja <b class="aclgroup">%s</b> omab nimeruumis <b class="aclns">%s</b>: <i>%s</i> järgmisi õigusi.';
+$lang['p_group_ns']            = 'Rühma <b class="aclgroup">%s</b> liikmed omavad nimeruumis <b class="aclns">%s</b>: <i>%s</i> järgmisi õigusi.';
 $lang['p_choose_id']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks leheküljele <b class="aclpage">%s</b> sätestatud volitusi.';
 $lang['p_choose_ns']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks nimeruumile <b class="aclpage">%s</b> sätestatud volitusi.';
+$lang['p_inherited']           = 'Märkus: neid õigusi pole eraldi määratletud, vaid on päritud teistest rühmadest või kõrgematest nimeruumidest.';
+$lang['p_include']             = 'Kõrgemad õigused hõlmavad alamaid. Õigus loomine, üleslaadida ja kustutada rakenduvad nimeruumidele, mitte lehekülgedele.';
+$lang['where']                 = 'Lehekülg/nimeruum';
 $lang['who']                   = 'Kasutaja/Grupp';
 $lang['perm']                  = 'Õigused';
 $lang['acl_perm0']             = 'Pole';
-- 
cgit v1.2.3


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

---
 lib/plugins/acl/lang/et/lang.php          | 5 +++--
 lib/plugins/authldap/lang/et/settings.php | 9 +++++++++
 lib/plugins/usermanager/lang/et/lang.php  | 4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/et/settings.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
index 84e21d1f8..4dad6b969 100644
--- a/lib/plugins/acl/lang/et/lang.php
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -11,7 +11,7 @@
  * @author Janar Leas <janar.leas@eesti.ee>
  */
 $lang['admin_acl']             = 'Ligipääsukontrolli nimekirja haldamine';
-$lang['acl_group']             = 'Grupp';
+$lang['acl_group']             = 'Rühm';
 $lang['acl_user']              = 'Kasutaja';
 $lang['acl_perms']             = 'Lubatud';
 $lang['page']                  = 'leht';
@@ -19,7 +19,8 @@ $lang['namespace']             = 'alajaotus';
 $lang['btn_select']            = 'Vali';
 $lang['p_choose_id']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks leheküljele <b class="aclpage">%s</b> sätestatud volitusi.';
 $lang['p_choose_ns']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks nimeruumile <b class="aclpage">%s</b> sätestatud volitusi.';
-$lang['who']                   = 'Kasutaja/Grupp';
+$lang['p_isadmin']             = 'Märkus: Valitud kasutajal või rühmal on alati kõik õigused, kuna nii on sätestanud ülemkasutaja.';
+$lang['who']                   = 'Kasutaja/Rühm';
 $lang['perm']                  = 'Õigused';
 $lang['acl_perm0']             = 'Pole';
 $lang['acl_perm1']             = 'Lugemine';
diff --git a/lib/plugins/authldap/lang/et/settings.php b/lib/plugins/authldap/lang/et/settings.php
new file mode 100644
index 000000000..9bba85dda
--- /dev/null
+++ b/lib/plugins/authldap/lang/et/settings.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Janar Leas <janar.leas@eesti.ee>
+ */
+$lang['grouptree']             = 'Kus kohast kasutaja rühmi otsida. Nt. <code>ou=Rühm, dc=server, dc=tld</code';
+$lang['groupscope']            = 'Piiritle otsingu ulatus rühma otsinguga';
diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php
index 93b28a6b8..deb1e0be1 100644
--- a/lib/plugins/usermanager/lang/et/lang.php
+++ b/lib/plugins/usermanager/lang/et/lang.php
@@ -5,13 +5,14 @@
  * 
  * @author kristian.kankainen@kuu.la
  * @author Rivo Zängov <eraser@eraser.ee>
+ * @author Janar Leas <janar.leas@eesti.ee>
  */
 $lang['menu']                  = 'Kasutajate haldamine';
 $lang['user_id']               = 'Kasutaja';
 $lang['user_pass']             = 'Parool';
 $lang['user_name']             = 'Tegelik nimi';
 $lang['user_mail']             = 'E-post';
-$lang['user_groups']           = 'Grupid';
+$lang['user_groups']           = 'Rühmad';
 $lang['field']                 = 'Väli';
 $lang['value']                 = 'Väärtus';
 $lang['add']                   = 'Lisa';
@@ -29,3 +30,4 @@ $lang['prev']                  = 'eelmine';
 $lang['next']                  = 'järgmine';
 $lang['last']                  = 'viimased';
 $lang['user_notify']           = 'Teavita kasutajat';
+$lang['note_group']            = 'Kui rühma pole määratletud, siis lisatakse uued kasutajad vaikimisi rühma (%s).';
-- 
cgit v1.2.3


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

---
 lib/plugins/acl/lang/et/lang.php    | 2 ++
 lib/plugins/revert/lang/et/lang.php | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 lib/plugins/revert/lang/et/lang.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
index 84e21d1f8..bdf3dd6b5 100644
--- a/lib/plugins/acl/lang/et/lang.php
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -19,6 +19,8 @@ $lang['namespace']             = 'alajaotus';
 $lang['btn_select']            = 'Vali';
 $lang['p_choose_id']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks leheküljele <b class="aclpage">%s</b> sätestatud volitusi.';
 $lang['p_choose_ns']           = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks nimeruumile <b class="aclpage">%s</b> sätestatud volitusi.';
+$lang['p_inherited']           = 'Teadmiseks: Neid õigusi pole eralti määratletud, vaid on päritud teistest rühmadest või ülemast nimeruumist.';
+$lang['p_isadmin']             = 'Teadmiseks: Valitud rühm või kasutaja omab alati kõiki õigusi, kuna nii on sätestanud ülemkasutaja.';
 $lang['who']                   = 'Kasutaja/Grupp';
 $lang['perm']                  = 'Õigused';
 $lang['acl_perm0']             = 'Pole';
diff --git a/lib/plugins/revert/lang/et/lang.php b/lib/plugins/revert/lang/et/lang.php
new file mode 100644
index 000000000..be8fb26c1
--- /dev/null
+++ b/lib/plugins/revert/lang/et/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Janar Leas <janar.leas@eesti.ee>
+ */
+$lang['note1']                 = 'Teadmiseks: See otsing arvestab suurtähti';
+$lang['note2']                 = 'Teadmiseks: Lehekülg ennistatakse viimasele järgule, milles ei sisaldu antud rämpsu sõne <i>%s</i>.';
-- 
cgit v1.2.3