Merge branch 'master' of https://github.com/splitbrain/dokuwiki

Conflicts: lib/exe/xmlrpc.php
author: Dominik Eckelmann <deckelmann@gmail.com> 2012-03-14 12:52:36 +0100
committer: Dominik Eckelmann <deckelmann@gmail.com> 2012-03-14 12:52:36 +0100
commit: 3a6d76070be7220b8e5f7c04443aa923bc8cddf2 (patch)
tree: dfd00b5d0c5f58ee313eb376a8cb1ee99512bf83
parent: 03d7247e047c21d2733f837148a1499f56784ae3 (diff)
parent: d0caa5642f6e322a026bd5bdac4585ff1b2f40da (diff)
download: rpg-3a6d76070be7220b8e5f7c04443aa923bc8cddf2.tar.gz
rpg-3a6d76070be7220b8e5f7c04443aa923bc8cddf2.tar.bz2
221 files changed, 1402 insertions, 1387 deletions
diff --git a/COPYING b/COPYING
index d60c31a97..d159169d1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/README b/README
index 6bb9a3bd9..0490040f2 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ at http://www.dokuwiki.org/
 For Installation Instructions see
 http://www.dokuwiki.org/install
 
-DokuWiki - 2004-2011 (c) Andreas Gohr <andi@splitbrain.org>
+DokuWiki - 2004-2012 (c) Andreas Gohr <andi@splitbrain.org>
                          and the DokuWiki Community
 See COPYING and file headers for license info
 
diff --git a/_test/cases/inc/auth_password.test.php b/_test/cases/inc/auth_password.test.php
index 928552a14..394f0b2f5 100644
--- a/_test/cases/inc/auth_password.test.php
+++ b/_test/cases/inc/auth_password.test.php
@@ -12,6 +12,7 @@ class auth_password_test extends UnitTestCase {
         'md5'   => '8fa22d62408e5351553acdd91c6b7003',
         'sha1'  => 'b456d3b0efd105d613744ffd549514ecafcfc7e1',
         'ssha'  => '{SSHA}QMHG+uC7bHNYKkmoLbNsNI38/dJhYmNk',
+        'lsmd5' => '{SMD5}HGbkPrkWgy9KgcRGWlrsUWFiY2RlZmdo',
         'crypt' => 'ablvoGr1hvZ5k',
         'mysql' => '4a1fa3780bd6fd55',
         'my411' => '*e5929347e25f82e19e4ebe92f1dc6b6e7c2dbd29',
@@ -48,6 +49,11 @@ class auth_password_test extends UnitTestCase {
         }
     }
 
+    function test_bcrypt_self(){
+        $hash = auth_cryptPassword('foobcrypt','bcrypt');
+        $this->assertTrue(auth_verifyPassword('foobcrypt',$hash));
+    }
+
     function test_verifyPassword_nohash(){
         $this->assertTrue(auth_verifyPassword('foo','$1$$n1rTiFE0nRifwV/43bVon/'));
     }
diff --git a/_test/cases/inc/common_cleanText.test.php b/_test/cases/inc/common_cleanText.test.php
new file mode 100644
index 000000000..936ed1d76
--- /dev/null
+++ b/_test/cases/inc/common_cleanText.test.php
@@ -0,0 +1,34 @@
+<?php
+
+require_once DOKU_INC.'inc/init.php';
+require_once DOKU_INC.'inc/common.php';
+
+class common_clientIP_test extends UnitTestCase {
+
+    function test_unix(){
+        $unix = 'one
+                two
+
+                three';
+
+        $this->assertEqual($unix,cleanText($unix));
+    }
+
+    function test_win(){
+        $unix = 'one
+                two
+
+                three';
+        $win = 'one
+                two
+
+                three';
+
+        $this->assertEqual(bin2hex($unix),'6f6e650a2020202020202020202020202020202074776f0a0a202020202020202020202020202020207468726565');
+        $this->assertEqual(bin2hex($win),'6f6e650d0a2020202020202020202020202020202074776f0d0a0d0a202020202020202020202020202020207468726565');
+        $this->assertNotEqual($unix,$win);
+        $this->assertEqual($unix,cleanText($win));
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/parser/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index 53871e110..d0fb19570 100644
--- a/_test/cases/inc/parser/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -400,6 +400,21 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
         );
         $this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
     }
+    
+    function testWindowsShareLinkHyphen() {
+        $this->P->addMode('windowssharelink',new Doku_Parser_Mode_WindowsShareLink());
+        $this->P->parse('Foo \\\server\share-hyphen Bar');
+        $calls = array (
+        array('document_start',array()),
+        array('p_open',array()),
+        array('cdata',array("\n".'Foo ')),
+        array('windowssharelink',array('\\\server\share-hyphen',NULL)),
+        array('cdata',array(' Bar')),
+        array('p_close',array()),
+        array('document_end',array()),
+        );
+        $this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
+    }
 
     function testWindowsShareLinkInternal() {
         $this->P->addMode('internallink',new Doku_Parser_Mode_InternalLink());
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 4238f7e53..fd89a90ed 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -18,6 +18,7 @@ $conf['dmode']       = 0755;              //set directory creation mode
 $conf['lang']        = 'en';              //your language
 $conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
 $conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
+$conf['cookiedir']   = '';                //Cookie path. Leave blank for using baseurl.
 $conf['savedir']     = './data';          //where to store all the files
 $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
 $conf['mediarevisions'] = 1;              //enable/disable media revisions
@@ -27,6 +28,8 @@ $conf['mediarevisions'] = 1;              //enable/disable media revisions
 $conf['start']       = 'start';           //name of start page
 $conf['title']       = 'DokuWiki';        //what to show in the title
 $conf['template']    = 'default';         //see lib/tpl directory
+$conf['tagline']     = '';                //tagline in header (if template supports it)
+$conf['sidebar']     = 'sidebar';         //name of sidebar in root namespace (if template supports it)
 $conf['license']     = 'cc-by-nc-sa';     //see conf/license.php
 $conf['fullpath']    = 0;                 //show full path of the document or relative to datadir only? 0|1
 $conf['recent']      = 20;                //how many entries to show in recent
@@ -124,14 +127,18 @@ $conf['rss_linkto'] = 'diff';            //what page RSS entries link to:
                                          //  'page'    - the revised page itself
                                          //  'rev'     - page showing all revisions
                                          //  'current' - most recent revision of page
-$conf['rss_content'] = 'abstract';       // what to put in the items by default?
+$conf['rss_content'] = 'abstract';       //what to put in the items by default?
                                          //  'abstract' - plain text, first paragraph or so
                                          //  'diff'     - plain text unified diff wrapped in <pre> tags
                                          //  'htmldiff' - diff as HTML table
                                          //  'html'     - the full page rendered in XHTML
+$conf['rss_media']   = 'both';           //what should be listed?
+                                         //  'both'     - page and media changes
+                                         //  'pages'    - page changes only
+                                         //  'media'    - media changes only
 $conf['rss_update'] = 5*60;              //Update the RSS feed every n seconds (defaults to 5 minutes)
-$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
 $conf['rss_show_summary'] = 1;           //Add revision summary to title? 0|1
+$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
 $conf['broken_iua']  = 0;                //Platform with broken ignore_user_abort (IIS+CGI) 0|1
 $conf['xsendfile']   = 0;                //Use X-Sendfile (1 = lighttpd, 2 = standard)
 $conf['renderer_xhtml'] = 'xhtml';       //renderer to use for main page generation
diff --git a/data/_dummy b/data/_dummy
index 37ed18a63..e69de29bb 100644
--- a/data/_dummy
+++ b/data/_dummy
@@ -1 +0,0 @@
-data directory
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index b03435787..0b5480949 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -368,7 +368,7 @@ Those blocks were created by this source:
 
 ==== Syntax Highlighting ====
 
-[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax is the same like in the code and file blocks in the previous section, but this time the name of the used language is inserted inside the tag. Eg. ''<nowiki><code java></nowiki>'' or ''<nowiki><file java></nowiki>''.
+[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. ''<nowiki><code java></nowiki>'' or ''<nowiki><file java></nowiki>''.
 
 <code java>
 /**
diff --git a/doku.php b/doku.php
index e23757298..e699c818b 100644
--- a/doku.php
+++ b/doku.php
@@ -7,7 +7,7 @@
  */
 
 // update message version
-$updateVersion = 35;
+$updateVersion = 36;
 
 //  xdebug_start_profiling();
 
diff --git a/feed.php b/feed.php
index 298777eb9..98d5ef2e8 100644
--- a/feed.php
+++ b/feed.php
@@ -50,7 +50,7 @@ $rss->cssStyleSheet  = DOKU_URL.'lib/exe/css.php?s=feed';
 
 $image = new FeedImage();
 $image->title = $conf['title'];
-$image->url = tpl_getFavicon(true);
+$image->url = tpl_getMediaFile('favicon.ico', true);
 $image->link = DOKU_URL;
 $rss->image = $image;
 
@@ -117,8 +117,8 @@ function rss_parseOptions(){
                   'show_minor'   => array('minor', false),
                   // String, only used in search mode
                   'search_query' => array('q', null),
-                // One of: pages, media, both
-                  'content_type' => array('view', 'both')
+                  // One of: pages, media, both
+                  'content_type' => array('view', $conf['rss_media'])
 
                  ) as $name => $val) {
         $opt[$name] = (isset($_REQUEST[$val[0]]) && !empty($_REQUEST[$val[0]]))
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index fdf95d113..f0470e736 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -338,7 +338,10 @@ class HTTPClient {
             }
 
             // wait for stream ready or timeout (1sec)
-            if(stream_select($sel_r,$sel_w,$sel_e,1) === false) continue;
+            if(@stream_select($sel_r,$sel_w,$sel_e,1) === false){
+                usleep(1000);
+                continue;
+            }
 
             // write to stream
             $ret = fwrite($socket, substr($request,$written,4096));
@@ -577,13 +580,14 @@ class HTTPClient {
      */
     function _parseHeaders($string){
         $headers = array();
-        if (!preg_match_all('/^\s*([\w-]+)\s*:\s*([\S \t]+)\s*$/m', $string,
-                            $matches, PREG_SET_ORDER)) {
-            return $headers;
-        }
-        foreach($matches as $match){
-            list(, $key, $val) = $match;
+        $lines = explode("\n",$string);
+        array_shift($lines); //skip first line (status)
+        foreach($lines as $line){
+            list($key, $val) = explode(':',$line,2);
+            $key = trim($key);
+            $val = trim($val);
             $key = strtolower($key);
+            if(!$key) continue;
             if(isset($headers[$key])){
                 if(is_array($headers[$key])){
                     $headers[$key][] = $val;
diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index 31493c022..2558f37c6 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -47,9 +47,15 @@ class PassHash {
         }elseif(preg_match('/^md5\$(.{5})\$/',$hash,$m)){
             $method = 'djangomd5';
             $salt   = $m[1];
+        }elseif(preg_match('/^\$2a\$(.{2})\$/',$hash,$m)){
+            $method = 'bcrypt';
+            $salt   = $hash;
         }elseif(substr($hash,0,6) == '{SSHA}'){
             $method = 'ssha';
             $salt   = substr(base64_decode(substr($hash, 6)),20);
+        }elseif(substr($hash,0,6) == '{SMD5}'){
+            $method = 'lsmd5';
+            $salt   = substr(base64_decode(substr($hash, 6)),16);
         }elseif($len == 32){
             $method = 'md5';
         }elseif($len == 40){
@@ -130,6 +136,20 @@ class PassHash {
         }
     }
 
+
+    /**
+     * Password hashing method 'lsmd5'
+     *
+     * Uses salted MD5 hashs. Salt is 8 bytes long.
+     *
+     * This is the format used by LDAP.
+     */
+    public function hash_lsmd5($clear, $salt=null){
+        $this->init_salt($salt,8);
+        return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt);
+    }
+
+
     /**
      * Password hashing method 'apr1'
      *
@@ -379,4 +399,35 @@ class PassHash {
         return 'md5$'.$salt.'$'.md5($salt.$clear);
     }
 
+
+    /**
+     * Passwordhashing method 'bcrypt'
+     *
+     * Uses a modified blowfish algorithm called eksblowfish
+     * This method works on PHP 5.3+ only and will throw an exception
+     * if the needed crypt support isn't available
+     *
+     * A full hash should be given as salt (starting with $a2$) or this
+     * will break. When no salt is given, the iteration count can be set
+     * through the $compute variable.
+     *
+     * @param string $clear - the clear text to hash
+     * @param string $salt  - the salt to use, null for random
+     * @param int  $compute - the iteration count (between 4 and 31)
+     * @returns string - hashed password
+     */
+    public function hash_bcrypt($clear, $salt=null, $compute=8){
+        if(!defined('CRYPT_BLOWFISH') || CRYPT_BLOWFISH != 1){
+            throw new Exception('This PHP installation has no bcrypt support');
+        }
+
+        if(is_null($salt)){
+            if($compute < 4 || $compute > 31) $compute = 8;
+            $salt = '$2a$'.str_pad($compute, 2, '0', STR_PAD_LEFT).'$'.
+                    $this->gen_salt(22);
+        }
+
+        return crypt($password, $salt);
+    }
+
 }
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index 2fecc3032..d525b17e0 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * Increased whenever the API is changed
+ */
+define('DOKU_API_VERSION', 7);
+
 class RemoteAPICore {
 
     private $api;
@@ -194,7 +199,7 @@ class RemoteAPICore {
     function rawPage($id,$rev=''){
         $id = cleanID($id);
         if(auth_quickaclcheck($id) < AUTH_READ){
-            throw new RemoteAccessDeniedException();
+            throw new RemoteAccessDeniedException('You are not allowed to read this file', 111);
         }
         $text = rawWiki($id,$rev);
         if(!$text) {
@@ -214,12 +219,12 @@ class RemoteAPICore {
     function getAttachment($id){
         $id = cleanID($id);
         if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) {
-            throw new RemoteAccessDeniedException();
+            throw new RemoteAccessDeniedException('You are not allowed to read this file', 211);
         }
 
         $file = mediaFN($id);
         if (!@ file_exists($file)) {
-            throw new RemoteException('The requested file does not exist');
+            throw new RemoteException('The requested file does not exist', 221);
         }
 
         $data = io_readFile($file, false);
@@ -253,7 +258,7 @@ class RemoteAPICore {
     function htmlPage($id,$rev=''){
         $id = cleanID($id);
         if(auth_quickaclcheck($id) < AUTH_READ){
-            throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page');
+            throw new RemoteAccessDeniedException('You are not allowed to read this page', 111);
         }
         return p_wiki_xhtml($id,$rev,false);
     }
@@ -372,7 +377,7 @@ class RemoteAPICore {
             }
             return $data;
         } else {
-            throw new RemoteAccessDeniedException(1, 'You are not allowed to list media files.');
+            throw new RemoteAccessDeniedException('You are not allowed to list media files.', 215);
         }
     }
 
@@ -389,12 +394,12 @@ class RemoteAPICore {
     function pageInfo($id,$rev=''){
         $id = cleanID($id);
         if(auth_quickaclcheck($id) < AUTH_READ){
-            throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page');
+            throw new RemoteAccessDeniedException('You are not allowed to read this page', 111);
         }
         $file = wikiFN($id,$rev);
         $time = @filemtime($file);
         if(!$time){
-            throw new RemoteException(10, 'The requested page does not exist');
+            throw new RemoteException(10, 'The requested page does not exist', 121);
         }
 
         $info = getRevisionInfo($id, $time, 1024);
@@ -424,25 +429,25 @@ class RemoteAPICore {
         $minor = $params['minor'];
 
         if(empty($id)) {
-            throw new RemoteException(1, 'Empty page ID');
+            throw new RemoteException('Empty page ID', 131);
         }
 
         if(!page_exists($id) && trim($TEXT) == '' ) {
-            throw new RemoteException(1, 'Refusing to write an empty new wiki page');
+            throw new RemoteException('Refusing to write an empty new wiki page', 132);
         }
 
         if(auth_quickaclcheck($id) < AUTH_EDIT) {
-            throw new RemoteAccessDeniedException(1, 'You are not allowed to edit this page');
+            throw new RemoteAccessDeniedException('You are not allowed to edit this page', 112);
         }
 
         // Check, if page is locked
         if(checklock($id)) {
-            throw new RemoteException(1, 'The page is currently locked');
+            throw new RemoteException('The page is currently locked', 133);
         }
 
         // SPAM check
         if(checkwordblock()) {
-            throw new RemoteException(1, 'Positive wordblock check');
+            throw new RemoteException('Positive wordblock check', 134);
         }
 
         // autoset summary on new pages
@@ -488,7 +493,7 @@ class RemoteAPICore {
         $auth = auth_quickaclcheck(getNS($id).':*');
 
         if(!isset($id)) {
-            throw new RemoteException(1, 'Filename not given.');
+            throw new RemoteException('Filename not given.', 231);
         }
 
         global $conf;
@@ -501,7 +506,7 @@ class RemoteAPICore {
 
         $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename');
         if (is_array($res)) {
-            throw new RemoteException(-$res[1], $res[0]);
+            throw new RemoteException($res[0], -$res[1]);
         } else {
             return $res;
         }
@@ -519,11 +524,11 @@ class RemoteAPICore {
         if ($res & DOKU_MEDIA_DELETED) {
             return 0;
         } elseif ($res & DOKU_MEDIA_NOT_AUTH) {
-            throw new RemoteAccessDeniedException(1, "You don't have permissions to delete files.");
+            throw new RemoteAccessDeniedException('You don\'t have permissions to delete files.', 212);
         } elseif ($res & DOKU_MEDIA_INUSE) {
-            throw new RemoteException(1, 'File is still referenced');
+            throw new RemoteException('File is still referenced', 232);
         } else {
-            throw new RemoteException(1, 'Could not delete file');
+            throw new RemoteException('Could not delete file', 233);
         }
     }
 
@@ -543,7 +548,7 @@ class RemoteAPICore {
     function listLinks($id) {
         $id = cleanID($id);
         if(auth_quickaclcheck($id) < AUTH_READ){
-            throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page');
+            throw new RemoteAccessDeniedException('You are not allowed to read this page', 111);
         }
         $links = array();
 
@@ -592,7 +597,7 @@ class RemoteAPICore {
      */
     function getRecentChanges($timestamp) {
         if(strlen($timestamp) != 10) {
-            throw new RemoteException(20, 'The provided value is not a valid timestamp');
+            throw new RemoteException('The provided value is not a valid timestamp', 311);
         }
 
         $recents = getRecentsSince($timestamp);
@@ -614,7 +619,7 @@ class RemoteAPICore {
             return $changes;
         } else {
             // in case we still have nothing at this point
-            return new RemoteException('There are no changes in the specified timeframe');
+            return new RemoteException('There are no changes in the specified timeframe', 321);
         }
     }
 
@@ -626,7 +631,7 @@ class RemoteAPICore {
      */
     function getRecentMediaChanges($timestamp) {
         if(strlen($timestamp) != 10)
-            throw new RemoteException(20, 'The provided value is not a valid timestamp');
+            throw new RemoteException('The provided value is not a valid timestamp', 311);
 
         $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES);
 
@@ -647,7 +652,7 @@ class RemoteAPICore {
             return $changes;
         } else {
             // in case we still have nothing at this point
-            throw new RemoteException(30, 'There are no changes in the specified timeframe');
+            throw new RemoteException('There are no changes in the specified timeframe', 321);
         }
     }
 
@@ -659,14 +664,14 @@ class RemoteAPICore {
     function pageVersions($id, $first) {
         $id = cleanID($id);
         if(auth_quickaclcheck($id) < AUTH_READ) {
-            throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page');
+            throw new RemoteAccessDeniedException('You are not allowed to read this page', 111);
         }
         global $conf;
 
         $versions = array();
 
         if(empty($id)) {
-            throw new RemoteException(1, 'Empty page ID');
+            throw new RemoteException('Empty page ID', 131);
         }
 
         $revisions = getRevisions($id, $first, $conf['recent']+1);
@@ -762,7 +767,7 @@ class RemoteAPICore {
     }
 
     function getAPIVersion(){
-        return DOKU_XMLRPC_API_VERSION;
+        return DOKU_API_VERSION;
     }
 
     function login($user,$pass){
@@ -789,4 +794,5 @@ class RemoteAPICore {
     }
 
 
-}
-\ No newline at end of file
+}
+
diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php
index bbe1caf26..4689b04a6 100644
--- a/inc/Sitemapper.php
+++ b/inc/Sitemapper.php
@@ -25,7 +25,7 @@ class Sitemapper {
      * @link   https://www.google.com/webmasters/sitemaps/docs/en/about.html
      * @link   http://www.sitemaps.org/
      */
-    public function generate(){
+    public static function generate(){
         global $conf;
         if($conf['sitemap'] < 1 || !is_numeric($conf['sitemap'])) return false;
 
@@ -39,11 +39,11 @@ class Sitemapper {
 
         if(@filesize($sitemap) &&
            @filemtime($sitemap) > (time()-($conf['sitemap']*86400))){ // 60*60*24=86400
-            dbglog('Sitemapper::generate(): Sitemap up to date'); // FIXME: only in debug mode
+            dbglog('Sitemapper::generate(): Sitemap up to date');
             return false;
         }
 
-        dbglog("Sitemapper::generate(): using $sitemap"); // FIXME: Only in debug mode
+        dbglog("Sitemapper::generate(): using $sitemap");
 
         $pages = idx_get_indexer()->getPages();
         dbglog('Sitemapper::generate(): creating sitemap using '.count($pages).' pages');
@@ -77,7 +77,7 @@ class Sitemapper {
      * @return string The sitemap XML.
      * @author Michael Hamann
      */
-    private function getXML($items) {
+    private static function getXML($items) {
         ob_start();
         echo '<?xml version="1.0" encoding="UTF-8"?>'.NL;
         echo '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'.NL;
@@ -96,7 +96,7 @@ class Sitemapper {
      * @return The path to the sitemap file.
      * @author Michael Hamann
      */
-    public function getFilePath() {
+    public static function getFilePath() {
         global $conf;
 
         $sitemap = $conf['cachedir'].'/sitemap.xml';
@@ -113,7 +113,7 @@ class Sitemapper {
      * 
      * @author Michael Hamann
      */
-    public function pingSearchEngines() {
+    public static function pingSearchEngines() {
         //ping search engines...
         $http = new DokuHTTPClient();
         $http->timeout = 8;
diff --git a/inc/adLDAP.php b/inc/adLDAP.php
index a64096b85..24be6e475 100644
--- a/inc/adLDAP.php
+++ b/inc/adLDAP.php
@@ -1021,6 +1021,26 @@ class adLDAP {
     }
 
     /**
+     * Return info about the domain itself
+     *
+     * @authot Andreas Gohr <gohr@cosmocode.de>
+     * @param array $fields The fields to query
+     * @return array
+     */
+    public function domain_info($fields){
+        if (!$this->_bind){ return (false); }
+
+        $sr = ldap_read($this->_conn, $this->_base_dn, 'objectclass=*', $fields);
+        if (!$sr) {
+            return false;
+        }
+        $info = ldap_get_entries($this->_conn, $sr);
+        if(count($info)) return $info[0];
+
+        return false;
+    }
+
+    /**
     * Determine a user's password expiry date
     *
     * @param string $username The username to query
diff --git a/inc/auth.php b/inc/auth.php
index 87e5b5580..1b6b3a689 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -523,18 +523,19 @@ function auth_aclcheck($id,$user,$groups){
         $groups[] = '@ALL';
         //add User
         if($user) $groups[] = $user;
-        //build regexp
-        $regexp   = join('|',$groups);
     }else{
-        $regexp = '@ALL';
+        $groups[] = '@ALL';
     }
 
     //check exact match first
-    $matches = preg_grep('/^'.preg_quote($id,'/').'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL);
+    $matches = preg_grep('/^'.preg_quote($id,'/').'\s+(\S+)\s+/'.$ci,$AUTH_ACL);
     if(count($matches)){
         foreach($matches as $match){
             $match = preg_replace('/#.*$/','',$match); //ignore comments
             $acl   = preg_split('/\s+/',$match);
+            if (!in_array($acl[1], $groups)) {
+                continue;
+            }
             if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
             if($acl[2] > $perm){
                 $perm = $acl[2];
@@ -554,20 +555,24 @@ function auth_aclcheck($id,$user,$groups){
     }
 
     do{
-        $matches = preg_grep('/^'.preg_quote($path,'/').'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL);
+        $matches = preg_grep('/^'.preg_quote($path,'/').'\s+(\S+)\s+/'.$ci,$AUTH_ACL);
         if(count($matches)){
             foreach($matches as $match){
                 $match = preg_replace('/#.*$/','',$match); //ignore comments
                 $acl   = preg_split('/\s+/',$match);
+                if (!in_array($acl[1], $groups)) {
+                    continue;
+                }
                 if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
                 if($acl[2] > $perm){
                     $perm = $acl[2];
                 }
             }
             //we had a match - return it
-            return $perm;
+            if ($perm != -1) {
+                return $perm;
+            }
         }
-
         //get next higher namespace
         $ns   = getNS($ns);
 
@@ -582,9 +587,6 @@ function auth_aclcheck($id,$user,$groups){
             return AUTH_NONE;
         }
     }while(1); //this should never loop endless
-
-    //still here? return no permissions
-    return AUTH_NONE;
 }
 
 /**
@@ -858,32 +860,60 @@ function act_resendpwd(){
     $token = preg_replace('/[^a-f0-9]+/','',$_REQUEST['pwauth']);
 
     if($token){
-        // we're in token phase
+        // we're in token phase - get user info from token
 
         $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth';
         if(!@file_exists($tfile)){
             msg($lang['resendpwdbadauth'],-1);
+            unset($_REQUEST['pwauth']);
             return false;
         }
+        // token is only valid for 3 days
+        if( (time() - filemtime($tfile)) > (3*60*60*24) ){
+            msg($lang['resendpwdbadauth'],-1);
+            unset($_REQUEST['pwauth']);
+            @unlink($tfile);
+            return false;
+        }
+
         $user = io_readfile($tfile);
-        @unlink($tfile);
         $userinfo = $auth->getUserData($user);
         if(!$userinfo['mail']) {
             msg($lang['resendpwdnouser'], -1);
             return false;
         }
 
-        $pass = auth_pwgen();
-        if (!$auth->triggerUserMod('modify', array($user,array('pass' => $pass)))) {
-            msg('error modifying user data',-1);
-            return false;
-        }
 
-        if (auth_sendPassword($user,$pass)) {
-            msg($lang['resendpwdsuccess'],1);
-        } else {
-            msg($lang['regmailfail'],-1);
+        if(!$conf['autopasswd']){ // we let the user choose a password
+            // password given correctly?
+            if(!isset($_REQUEST['pass']) || $_REQUEST['pass'] == '') return false;
+            if($_REQUEST['pass'] != $_REQUEST['passchk']){
+                msg($lang['regbadpass'],-1);
+                return false;
+            }
+            $pass = $_REQUEST['pass'];
+
+            if (!$auth->triggerUserMod('modify', array($user,array('pass' => $pass)))) {
+                msg('error modifying user data',-1);
+                return false;
+            }
+
+        }else{ // autogenerate the password and send by mail
+
+            $pass = auth_pwgen();
+            if (!$auth->triggerUserMod('modify', array($user,array('pass' => $pass)))) {
+                msg('error modifying user data',-1);
+                return false;
+            }
+
+            if (auth_sendPassword($user,$pass)) {
+                msg($lang['resendpwdsuccess'],1);
+            } else {
+                msg($lang['regmailfail'],-1);
+            }
         }
+
+        @unlink($tfile);
         return true;
 
     } else {
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index 1fddad243..cc080dc93 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -26,6 +26,8 @@
  *   $conf['auth']['ad']['use_ssl']            = 1;
  *   $conf['auth']['ad']['use_tls']            = 1;
  *   $conf['auth']['ad']['debug']              = 1;
+ *   // warn user about expiring password this many days in advance:
+ *   $conf['auth']['ad']['expirywarn']         = 5;
  *
  *   // get additional information to the userinfo array
  *   // add a list of comma separated ldap contact fields.
@@ -44,6 +46,7 @@ class auth_ad extends auth_basic {
     var $opts = null;
     var $adldap = null;
     var $users = null;
+    var $msgshown = false;
 
     /**
      * Constructor
@@ -146,9 +149,13 @@ class auth_ad extends auth_basic {
      */
    function getUserData($user){
         global $conf;
+        global $lang;
+        global $ID;
         if(!$this->_init()) return false;
 
-        $fields = array('mail','displayname','samaccountname');
+        if($user == '') return array();
+
+        $fields = array('mail','displayname','samaccountname','lastpwd','pwdlastset','useraccountcontrol');
 
         // add additional fields to read
         $fields = array_merge($fields, $this->cnf['additional']);
@@ -156,11 +163,19 @@ class auth_ad extends auth_basic {
 
         //get info for given user
         $result = $this->adldap->user_info($user, $fields);
+        if($result == false){
+            return array();
+        }
+
         //general user info
-        $info['name'] = $result[0]['displayname'][0];
-        $info['mail'] = $result[0]['mail'][0];
-        $info['uid']  = $result[0]['samaccountname'][0];
-        $info['dn']   = $result[0]['dn'];
+        $info['name']    = $result[0]['displayname'][0];
+        $info['mail']    = $result[0]['mail'][0];
+        $info['uid']     = $result[0]['samaccountname'][0];
+        $info['dn']      = $result[0]['dn'];
+        //last password set (Windows counts from January 1st 1601)
+        $info['lastpwd'] = $result[0]['pwdlastset'][0] / 10000000 - 11644473600;
+        //will it expire?
+        $info['expires'] = !($result[0]['useraccountcontrol'][0] & 0x10000); //ADS_UF_DONT_EXPIRE_PASSWD
 
         // additional information
         foreach ($this->cnf['additional'] as $field) {
@@ -183,6 +198,29 @@ class auth_ad extends auth_basic {
             $info['grps'][] = $conf['defaultgroup'];
         }
 
+        // check expiry time
+        if($info['expires'] && $this->cnf['expirywarn']){
+            $result   = $this->adldap->domain_info(array('maxpwdage')); // maximum pass age
+            $maxage   = -1 * $result['maxpwdage'][0] / 10000000; // negative 100 nanosecs
+            $timeleft = $maxage - (time() - $info['lastpwd']);
+            $timeleft = round($timeleft/(24*60*60));
+            $info['expiresin'] = $timeleft;
+
+            // if this is the current user, warn him (once per request only)
+            if( ($_SERVER['REMOTE_USER'] == $user) &&
+                ($timeleft <= $this->cnf['expirywarn']) &&
+                !$this->msgshown
+            ){
+                $msg = sprintf($lang['authpwdexpire'],$timeleft);
+                if($this->canDo('modPass')){
+                    $url = wl($ID,array('do'=>'profile'));
+                    $msg .= ' <a href="'.$url.'">'.$lang['btn_profile'].'</a>';
+                }
+                msg($msg);
+                $this->msgshown = true;
+            }
+        }
+
         return $info;
     }
 
diff --git a/inc/changelog.php b/inc/changelog.php
index 60f9b8657..24583b341 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -188,7 +188,7 @@ function getRecents($first,$num,$ns='',$flags=0){
     // handle lines
     while ($lines_position >= 0 || (($flags & RECENTS_MEDIA_PAGES_MIXED) && $media_lines_position >=0)) {
         if (empty($rec) && $lines_position >= 0) {
-            $rec = _handleRecent(@$lines[$lines_position], $ns, $flags & ~RECENTS_MEDIA_CHANGES, $seen);
+            $rec = _handleRecent(@$lines[$lines_position], $ns, $flags, $seen);
             if (!$rec) {
                 $lines_position --;
                 continue;
@@ -197,8 +197,8 @@ function getRecents($first,$num,$ns='',$flags=0){
         if (($flags & RECENTS_MEDIA_PAGES_MIXED) && empty($media_rec) && $media_lines_position >= 0) {
             $media_rec = _handleRecent(@$media_lines[$media_lines_position], $ns, $flags | RECENTS_MEDIA_CHANGES, $seen);
             if (!$media_rec) {
-            	$media_lines_position --;
-            	continue;
+                $media_lines_position --;
+                continue;
             }
         }
         if (($flags & RECENTS_MEDIA_PAGES_MIXED) && @$media_rec['date'] >= @$rec['date']) {
@@ -320,8 +320,10 @@ function _handleRecent($line,$ns,$flags,&$seen){
     if ($recent['perms'] < AUTH_READ) return false;
 
     // check existance
-    $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
-    if((!@file_exists($fn)) && ($flags & RECENTS_SKIP_DELETED)) return false;
+    if($flags & RECENTS_SKIP_DELETED){
+        $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
+        if(!@file_exists($fn)) return false;
+    }
 
     return $recent;
 }
diff --git a/inc/html.php b/inc/html.php
index 1a2d7daef..ef95aa11f 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1176,6 +1176,7 @@ function html_diff($text='',$intro=true,$type=null){
         ptln('</div>');
     }
     ?>
+    <div class="table">
     <table class="diff diff_<?php echo $type?>">
     <tr>
     <th colspan="2" <?php echo $l_minor?>>
@@ -1187,6 +1188,7 @@ function html_diff($text='',$intro=true,$type=null){
     </tr>
     <?php echo $tdf->format($df)?>
     </table>
+    </div>
     <?php
 }
 
@@ -1661,26 +1663,48 @@ function html_admin(){
  * Form to request a new password for an existing account
  *
  * @author Benoit Chesneau <benoit@bchesneau.info>
+ * @author Andreas Gohr <gohr@cosmocode.de>
  */
 function html_resendpwd() {
     global $lang;
     global $conf;
     global $ID;
 
-    print p_locale_xhtml('resendpwd');
-    print '<div class="centeralign">'.NL;
-    $form = new Doku_Form(array('id' => 'dw__resendpwd'));
-    $form->startFieldset($lang['resendpwd']);
-    $form->addHidden('do', 'resendpwd');
-    $form->addHidden('save', '1');
-    $form->addElement(form_makeTag('br'));
-    $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], '', 'block'));
-    $form->addElement(form_makeTag('br'));
-    $form->addElement(form_makeTag('br'));
-    $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd']));
-    $form->endFieldset();
-    html_form('resendpwd', $form);
-    print '</div>'.NL;
+    $token = preg_replace('/[^a-f0-9]+/','',$_REQUEST['pwauth']);
+
+    if(!$conf['autopasswd'] && $token){
+        print p_locale_xhtml('resetpwd');
+        print '<div class="centeralign">'.NL;
+        $form = new Doku_Form(array('id' => 'dw__resendpwd'));
+        $form->startFieldset($lang['btn_resendpwd']);
+        $form->addHidden('token', $token);
+        $form->addHidden('do', 'resendpwd');
+
+        $form->addElement(form_makePasswordField('pass', $lang['pass'], '', 'block', array('size'=>'50')));
+        $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50')));
+
+        $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd']));
+        $form->endFieldset();
+        html_form('resendpwd', $form);
+        print '</div>'.NL;
+    }else{
+        print p_locale_xhtml('resendpwd');
+        print '<div class="centeralign">'.NL;
+        $form = new Doku_Form(array('id' => 'dw__resendpwd'));
+        $form->startFieldset($lang['resendpwd']);
+        $form->addHidden('do', 'resendpwd');
+        $form->addHidden('save', '1');
+        $form->addElement(form_makeTag('br'));
+        $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], '', 'block'));
+        $form->addElement(form_makeTag('br'));
+        $form->addElement(form_makeTag('br'));
+        $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd']));
+        $form->endFieldset();
+        html_form('resendpwd', $form);
+        print '</div>'.NL;
+    }
+
+
 }
 
 /**
diff --git a/inc/init.php b/inc/init.php
index ba62fe079..d57e12d7b 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -30,8 +30,8 @@ if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
     define('DOKU_E_LEVEL', E_ALL);
 }
 if (!defined('DOKU_E_LEVEL')) {
-    if(defined('E_DEPRECATED')){ // since php 5.3
-        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+    if(defined('E_DEPRECATED')){ // since php 5.3, since php 5.4 E_STRICT is part of E_ALL
+        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT);
     }else{
         error_reporting(E_ALL ^ E_NOTICE);
     }
@@ -69,16 +69,6 @@ foreach (array('default','local','protected') as $config_group) {
     }
 }
 
-//prepare language array
-global $lang;
-$lang = array();
-
-//load the language files
-require_once(DOKU_INC.'inc/lang/en/lang.php');
-if ( $conf['lang'] && $conf['lang'] != 'en' ) {
-    require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php');
-}
-
 //prepare license array()
 global $license;
 $license = array();
@@ -118,11 +108,11 @@ if (!defined('DOKU_COOKIE')) define('DOKU_COOKIE', 'DW'.md5(DOKU_REL.(($conf['se
 // define main script
 if(!defined('DOKU_SCRIPT')) define('DOKU_SCRIPT','doku.php');
 
-// define Template baseURL
+// DEPRECATED, use tpl_basedir() instead
 if(!defined('DOKU_TPL')) define('DOKU_TPL',
         DOKU_BASE.'lib/tpl/'.$conf['template'].'/');
 
-// define real Template directory
+// DEPRECATED, use tpl_incdir() instead
 if(!defined('DOKU_TPLINC')) define('DOKU_TPLINC',
         DOKU_INC.'lib/tpl/'.$conf['template'].'/');
 
@@ -214,6 +204,10 @@ $plugin_controller = new $plugin_controller_class();
 global $EVENT_HANDLER;
 $EVENT_HANDLER = new Doku_Event_Handler();
 
+$local = $conf['lang'];
+trigger_event('INIT_LANG_LOAD', $local, 'init_lang', true);
+
+
 // setup authentication system
 if (!defined('NOSESSION')) {
     auth_setup();
@@ -256,6 +250,20 @@ function init_paths(){
     $conf['media_changelog'] = $conf['metadir'].'/_media.changes';
 }
 
+function init_lang($langCode) {
+    //prepare language array
+    global $lang;
+    $lang = array();
+
+    //load the language files
+    require_once(DOKU_INC.'inc/lang/en/lang.php');
+    if ($langCode && $langCode != 'en') {
+        if (file_exists(DOKU_INC."inc/lang/$langCode/lang.php")) {
+            require_once(DOKU_INC."inc/lang/$langCode/lang.php");
+        }
+    }
+}
+
 /**
  * Checks the existance of certain files and creates them if missing.
  */
diff --git a/inc/io.php b/inc/io.php
index 034ac650e..c76d2f44c 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -63,7 +63,7 @@ function io_sweepNS($id,$basedir='datadir'){
  */
 function io_readWikiPage($file, $id, $rev=false) {
     if (empty($rev)) { $rev = false; }
-    $data = array(array($file, false), getNS($id), noNS($id), $rev);
+    $data = array(array($file, true), getNS($id), noNS($id), $rev);
     return trigger_event('IO_WIKIPAGE_READ', $data, '_io_readWikiPage_action', false);
 }
 
diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php
index 6665196f4..6de891a63 100644
--- a/inc/lang/af/lang.php
+++ b/inc/lang/af/lang.php
@@ -25,7 +25,6 @@ $lang['btn_back']              = 'Terug';
 $lang['btn_backlink']          = 'Wat skakel hierheen';
 $lang['btn_subscribe']         = 'Hou bladsy dop';
 $lang['btn_unsubscribe']       = 'Verwyder van bladsy  dophoulys';
-$lang['btn_resendpwd']         = 'E-pos nuwe wagwoord';
 $lang['btn_register']          = 'Skep gerus \'n rekening';
 $lang['loggedinas']            = 'Ingeteken as';
 $lang['user']                  = 'Gebruikernaam';
@@ -43,7 +42,6 @@ $lang['regsuccess2']           = 'Rekening geskep';
 $lang['regbadpass']            = 'Die ingetikte wagwoorde is nie dieselfde nie.';
 $lang['regpwmail']             = 'Jo DokuWiki wagwoord';
 $lang['profnoempty']           = 'Jy moet \'n name en a e-posadres in sit';
-$lang['resendpwd']             = 'Stuir vir a niwe wagwoord';
 $lang['resendpwdmissing']      = 'Jammer, jy moet ales in fil';
 $lang['resendpwdconfirm']      = '\'n Bevestigingpos is gestuur na die gekose e-posadres.';
 $lang['resendpwdsuccess']      = 'Jou nuive wagwoord was deur e-pos gesteur';
@@ -71,5 +69,3 @@ $lang['img_date']              = 'Datem';
 $lang['img_camera']            = 'Camera';
 $lang['i_wikiname']            = 'Wiki Naam';
 $lang['i_funcna']              = 'PHP funksie <code>%s</code> is nie beskibaar nie. Miskien is dit af gehaal.';
-$lang['mu_toobig']             = 'te groet';
-$lang['mu_done']               = 'klaar';
diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 02a62fe94..af92243c9 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -42,7 +42,6 @@ $lang['btn_backtomedia']       = 'ارجع إلى اختيار ملف الوسا
 $lang['btn_subscribe']         = 'ادر الاشتراكات';
 $lang['btn_profile']           = 'حدث الملف الشخصي';
 $lang['btn_reset']             = 'صفّر';
-$lang['btn_resendpwd']         = 'ارسل كلمة سر جديدة';
 $lang['btn_draft']             = 'حرر المسودة';
 $lang['btn_recover']           = 'استرجع المسودة';
 $lang['btn_draftdel']          = 'احذف المسوّدة';
@@ -77,7 +76,6 @@ $lang['profnoempty']           = 'غير مسموح باسم مستخدم أو �
 $lang['profchanged']           = 'حُدث الملف الشخصي للمستخدم بنجاح.';
 $lang['pwdforget']             = 'أنسيت كلمة السر؟ احصل على واحدة جديدة';
 $lang['resendna']              = 'هذه الويكي لا تدعم إعادة إرسال كلمة المرور.';
-$lang['resendpwd']             = 'إرسال كلمة مرور';
 $lang['resendpwdmissing']      = 'عذراّ، يجب أن تملأ كل الحقول.';
 $lang['resendpwdnouser']       = 'عذراً، لم نجد المستخدم هذا في قاعدة بياناتنا.';
 $lang['resendpwdbadauth']      = 'عذراً، رمز التفعيل هذا غير صحيح. نأكد من استخدامك كامل وصلة التأكيد.';
@@ -266,21 +264,6 @@ $lang['i_pol1']                = 'ويكي عامة؛ أي القراءة للج
 $lang['i_pol2']                = 'ويكي مغلقة؛ أي القراءة والكتابة والتحميل للمشتركين المسجلين فقط';
 $lang['i_retry']               = 'إعادة المحاولة';
 $lang['i_license']             = 'اختر الرخصة التي تريد وضع المحتوى تحتها:';
-$lang['mu_intro']              = 'هنا يمكنك رفع ملفات متعددة في وقت واحد. انقر على زر استعرض لاضافتهم إلى الطابور. انقر ارفع عند الانتهاء.';
-$lang['mu_gridname']           = 'اسم الملف';
-$lang['mu_gridsize']           = 'الحجم';
-$lang['mu_gridstat']           = 'الحالة';
-$lang['mu_namespace']          = 'نطاق';
-$lang['mu_browse']             = 'استعرض';
-$lang['mu_toobig']             = 'كبير جدا';
-$lang['mu_ready']              = 'جاهز للرفع';
-$lang['mu_done']               = 'اكتمل';
-$lang['mu_fail']               = 'فشل';
-$lang['mu_authfail']           = 'انتهت الجلسة';
-$lang['mu_progress']           = 'رُفع @PCT@% ';
-$lang['mu_filetypes']          = 'انواع الملفات المسموحة';
-$lang['mu_info']               = 'تم رفع الملفات';
-$lang['mu_lasterr']            = 'آخر خطأ:';
 $lang['recent_global']         = 'انت تراقب حاليا التغييرات داخل نطاق <b>%s</b>. يمكنك أيضا <a href="%s">عرض أحدث تغييرات الويكي كلها</a>.';
 $lang['years']                 = '%d سنة مضت';
 $lang['months']                = '%d شهرا مضى';
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index 13ba7b3c3..fff6f34b7 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -40,7 +40,6 @@ $lang['btn_subscribe']         = 'Abunə ol (bütün dəyişiklər)';
 $lang['btn_unsubscribe']       = 'Abunəlikdən çıx (bütün dəyişiklər)';
 $lang['btn_profile']           = 'Profil';
 $lang['btn_reset']             = 'Boşalt';
-$lang['btn_resendpwd']         = 'Yeni şifrəni göndər';
 $lang['btn_draft']             = 'Qaralamada düzəliş etmək';
 $lang['btn_recover']           = 'Qaralamanı qaytar';
 $lang['btn_draftdel']          = 'Qaralamanı sil';
@@ -75,7 +74,6 @@ $lang['profnoempty']           = 'istifadəci adı və e-mail ünvanı boş ola
 $lang['profchanged']           = 'İstifadəçi profili uğurla yeniləndi.';
 $lang['pwdforget']             = 'Şifrəni yaddan çıxartmısız? Buyurun yenisini əldə edin';
 $lang['resendna']              = 'Bu wiki şifrəni yenidən göndərməyi dəstəkləmir.';
-$lang['resendpwd']             = 'Yeni şifrəni göndər:';
 $lang['resendpwdmissing']      = 'Formanın bütün xanəlırini doldurun.';
 $lang['resendpwdnouser']       = 'Verilənlər bazasında bu ad ilə istifadəçi tapılmadı.';
 $lang['resendpwdbadauth']      = 'Ativləşdirmə kodu səhvdir. Link-i tam olaraq köçürdüyünüzü yoxlayın. ';
@@ -217,21 +215,6 @@ $lang['i_pol0']                = 'Tam açıq wiki (oxumaq, yazmaq, fayl yükləm
 $lang['i_pol1']                = 'Acıq wiki (oxumaq hamıya olar, yazmaq və fayl yükləmək ancaq üzv olan istifadəçilərə olar)';
 $lang['i_pol2']                = 'Bağlı wiki (uxumaq, yazmaq və yükləmək ancaq üzv olan istifadəçilərə olar)';
 $lang['i_retry']               = 'Cəhdi təkrarla';
-$lang['mu_intro']              = 'Burda siz bir neçə faylı birdən yükləyə bilərsiniz. Fayl əlavə etmək üçün "fayl seç" düyməsini sıxın. Sonda "yüklə" düyməsini sıxın.';
-$lang['mu_gridname']           = 'Faylın adı';
-$lang['mu_gridsize']           = 'Həcmi';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namespace';
-$lang['mu_browse']             = 'Fayl seç';
-$lang['mu_toobig']             = 'çox böyükdür';
-$lang['mu_ready']              = 'yükləməyə hazırdı';
-$lang['mu_done']               = 'başa çatdı';
-$lang['mu_fail']               = 'xəta baş verdi';
-$lang['mu_authfail']           = 'sessiyanın vaxtı bitdi';
-$lang['mu_progress']           = '@PCT@% yükləndi';
-$lang['mu_filetypes']          = 'İçazə olan fayl növləri';
-$lang['mu_info']               = 'fayllar yükləndi.';
-$lang['mu_lasterr']            = 'Son xəta:';
 $lang['recent_global']         = '<b>%s</b> namespace-də baş vermiş dəyışıklərə baxırsınız. Siz həmçinin <a href="%s">wiki-də bu yaxında baş vermiş bütün dəyişiklərə</a> baxa bilərsiniz.';
 $lang['years']                 = '%d il əvvəl';
 $lang['months']                = '%d ay əvvəl';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 1c6c90703..04000d10e 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -41,7 +41,6 @@ $lang['btn_backtomedia']       = 'Назад към избора на файл';
 $lang['btn_subscribe']         = 'Абонаменти';
 $lang['btn_profile']           = 'Профил';
 $lang['btn_reset']             = 'Изчистване';
-$lang['btn_resendpwd']         = 'Пращане на нова парола';
 $lang['btn_draft']             = 'Редактиране на чернова';
 $lang['btn_recover']           = 'Възстановяване на чернова';
 $lang['btn_draftdel']          = 'Изтриване на чернова';
@@ -78,7 +77,6 @@ $lang['profnoempty']           = 'Въвеждането на име и ел. п
 $lang['profchanged']           = 'Потребителският профил е обновен успешно.';
 $lang['pwdforget']             = 'Забравили сте паролата си? Получете нова';
 $lang['resendna']              = 'Wiki-то не поддържа повторно пращане на паролата.';
-$lang['resendpwd']             = 'Изпращане на нова парола за';
 $lang['resendpwdmissing']      = 'Моля, попълнете всички полета.';
 $lang['resendpwdnouser']       = 'Потребителят не е намерен в базата от данни.';
 $lang['resendpwdbadauth']      = 'Кодът за потвърждение е невалиден. Проверете дали сте използвали целия линк за потвърждение.';
@@ -276,22 +274,6 @@ $lang['i_pol1']                = 'Публично Wiki (всеки може д�
 $lang['i_pol2']                = 'Затворено Wiki (само регистрирани четат, пишат и качват)';
 $lang['i_retry']               = 'Повторен опит';
 $lang['i_license']             = 'Моля, изберете лиценз под който желаете да публикувате съдържанието:';
-$lang['mu_intro']              = 'От тук можете да качите няколко файла наведнъж. Натиснете бутона "Избиране", изберете файлове и натиснете "Качване".
-';
-$lang['mu_gridname']           = 'Име на файла';
-$lang['mu_gridsize']           = 'Големина';
-$lang['mu_gridstat']           = 'Състояние';
-$lang['mu_namespace']          = 'Именно пространство';
-$lang['mu_browse']             = 'Избиране';
-$lang['mu_toobig']             = 'прекалено голям';
-$lang['mu_ready']              = 'готов за качване';
-$lang['mu_done']               = 'качен';
-$lang['mu_fail']               = 'неуспешно качване';
-$lang['mu_authfail']           = 'приключила сесия';
-$lang['mu_progress']           = '@PCT@% качен';
-$lang['mu_filetypes']          = 'Позволени файлови разширения';
-$lang['mu_info']               = 'качени файла.';
-$lang['mu_lasterr']            = 'Последна грешка:';
 $lang['recent_global']         = 'В момента преглеждате промените в именно пространство <b>%s</b>. Може да прегледате и <a href="%s">промените в цялото Wiki</a>.';
 $lang['years']                 = 'преди %d години';
 $lang['months']                = 'преди %d месеца';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index eac9fc8d1..e299f6427 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -41,7 +41,6 @@ $lang['btn_subscribe']         = 'Subscriure\'s a la pàgina';
 $lang['btn_unsubscribe']       = 'Desubscriure\'s de la pàgina';
 $lang['btn_profile']           = 'Actualisar perfil';
 $lang['btn_reset']             = 'Reiniciar';
-$lang['btn_resendpwd']         = 'Enviar contrasenya nova';
 $lang['btn_draft']             = 'Editar borrador';
 $lang['btn_recover']           = 'Recuperar borrador';
 $lang['btn_draftdel']          = 'Borrar borrador';
@@ -76,7 +75,6 @@ $lang['profnoempty']           = 'No es permet deixar el nom o la direcció de c
 $lang['profchanged']           = 'Perfil de l\'usuari actualisat.';
 $lang['pwdforget']             = '¿Ha oblidat la contrasenya? Demane\'n una nova';
 $lang['resendna']              = 'Este wiki no permet reenviar la contrasenya.';
-$lang['resendpwd']             = 'Enviar contrasenya nova per a';
 $lang['resendpwdmissing']      = 'Disculpe, pero deu omplir tots els camps.';
 $lang['resendpwdnouser']       = 'Disculpe, pero no trobem ad est usuari en la base de senyes.';
 $lang['resendpwdbadauth']      = 'Disculpe, pero este còdic d\'autenticació no es vàlit. Verifique que haja utilisat el víncul de confirmació sancer.';
@@ -221,21 +219,6 @@ $lang['i_pol0']                = 'Wiki obert (llegir, escriure i enviar tots)';
 $lang['i_pol1']                = 'Wiki públic (llegir tots, escriure i enviar només usuaris registrats)';
 $lang['i_pol2']                = 'Wiki tancat (llegir, escriure i enviar només usuaris registrats)';
 $lang['i_retry']               = 'Reintentar';
-$lang['mu_intro']              = 'Des d\'ací pot enviar diversos archius d\'una volta. Pulse el botó d\'examinar per a afegir-los a la coa. Pulse enviar quan ho tinga.';
-$lang['mu_gridname']           = 'Nom d\'archiu';
-$lang['mu_gridsize']           = 'Tamany';
-$lang['mu_gridstat']           = 'Estat';
-$lang['mu_namespace']          = 'Espai de noms';
-$lang['mu_browse']             = 'Examinar';
-$lang['mu_toobig']             = 'massa gran';
-$lang['mu_ready']              = 'preparat per a enviar';
-$lang['mu_done']               = 'complet';
-$lang['mu_fail']               = 'fallit';
-$lang['mu_authfail']           = 'la sessió ha vençut';
-$lang['mu_progress']           = '@PCT@% enviat';
-$lang['mu_filetypes']          = 'Classes d\'archiu permeses';
-$lang['mu_info']               = 'archius enviats.';
-$lang['mu_lasterr']            = 'Últim erro:';
 $lang['recent_global']         = 'Està veent els canvis dins de l\'espai de noms <b>%s</b>. També pot <a href="%s">vore els canvis recents en el wiki sancer</a>.';
 $lang['years']                 = 'fa %d anys';
 $lang['months']                = 'fa %d mesos';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 7094df5b4..3a1412617 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -41,7 +41,6 @@ $lang['btn_subscribe']         = 'Subscripció a canvis d\'aquesta pàgina';
 $lang['btn_unsubscribe']       = 'Cancel·la subscripció a pàgina';
 $lang['btn_profile']           = 'Actualització del perfil';
 $lang['btn_reset']             = 'Reinicia';
-$lang['btn_resendpwd']         = 'Envia nova contrasenya';
 $lang['btn_draft']             = 'Edita esborrany';
 $lang['btn_recover']           = 'Recupera esborrany';
 $lang['btn_draftdel']          = 'Suprimeix esborrany';
@@ -76,7 +75,6 @@ $lang['profnoempty']           = 'No es pot deixar en blanc el nom o l\'adreça
 $lang['profchanged']           = 'El perfil d\'usuari s\'ha actualitzat correctament.';
 $lang['pwdforget']             = 'Heu oblidat la contrasenya? Podeu obtenir-ne una de nova.';
 $lang['resendna']              = 'Aquest wiki no permet tornar a enviar la contrasenya.';
-$lang['resendpwd']             = 'Enviament d\'una nova contrasenya per a';
 $lang['resendpwdmissing']      = 'Heu d\'emplenar tots els camps.';
 $lang['resendpwdnouser']       = 'No s\'ha pogut trobar aquest usuari a la base de dades.';
 $lang['resendpwdbadauth']      = 'Aquest codi d\'autenticació no és vàlid. Assegureu-vos d\'utilitzar l\'enllaç de confirmació complet.';
@@ -217,21 +215,6 @@ $lang['i_pol0']                = 'Wiki obert (tothom pot llegir, escriure i penj
 $lang['i_pol1']                = 'Wiki públic (tothom pot llegir, els usuaris registrats poden escriure i penjar fitxers)';
 $lang['i_pol2']                = 'Wiki tancat (només els usuaris registrats poden llegir, escriure i penjar fitxers)';
 $lang['i_retry']               = 'Reintenta';
-$lang['mu_intro']              = 'Aquí podeu penjar múltiples fitxers d\'una vegada. Feu clic en el botó Explora per afegir els fitxers a la cua. Després, premeu Penja.';
-$lang['mu_gridname']           = 'Nom del fitxer';
-$lang['mu_gridsize']           = 'Mida';
-$lang['mu_gridstat']           = 'Estat';
-$lang['mu_namespace']          = 'Espai';
-$lang['mu_browse']             = 'Explora';
-$lang['mu_toobig']             = 'massa gran';
-$lang['mu_ready']              = 'llest per a penjar';
-$lang['mu_done']               = 'complet';
-$lang['mu_fail']               = 'error';
-$lang['mu_authfail']           = 'la sessió ha vençut';
-$lang['mu_progress']           = 'càrrega @PCT@%';
-$lang['mu_filetypes']          = 'Tipus de fitxer permesos';
-$lang['mu_info']               = 'fitxers penjats.';
-$lang['mu_lasterr']            = 'Darrer error:';
 $lang['recent_global']         = 'Esteu veient els canvis recents de l\'espai <strong>%s</strong>. També podeu veure els <a href="%s">canvis recents de tot el wiki</a>.';
 $lang['years']                 = 'fa %d anys';
 $lang['months']                = 'fa %d mesos';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index c6eb7be49..608beafd8 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -11,6 +11,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -46,7 +47,6 @@ $lang['btn_backtomedia']       = 'Zpět do Výběru dokumentu';
 $lang['btn_subscribe']         = 'Odebírat emailem změny stránky';
 $lang['btn_profile']           = 'Upravit profil';
 $lang['btn_reset']             = 'Reset';
-$lang['btn_resendpwd']         = 'Zaslat nové heslo';
 $lang['btn_draft']             = 'Upravit koncept';
 $lang['btn_recover']           = 'Obnovit koncept';
 $lang['btn_draftdel']          = 'Vymazat koncept';
@@ -83,7 +83,6 @@ $lang['profnoempty']           = 'Nelze zadat prázdné jméno nebo mailová adr
 $lang['profchanged']           = 'Uživatelský profil změněn.';
 $lang['pwdforget']             = 'Zapomněli jste heslo? Nechte si zaslat nové';
 $lang['resendna']              = 'Tato wiki neumožňuje zasílání nových hesel.';
-$lang['resendpwd']             = 'Odeslat nové heslo pro uživatele';
 $lang['resendpwdmissing']      = 'Musíte vyplnit všechny položky.';
 $lang['resendpwdnouser']       = 'Bohužel takový uživatel v systému není.';
 $lang['resendpwdbadauth']      = 'Autorizační kód není platný. Zadali jste opravdu celý odkaz na potvrzovací stránku?';
@@ -190,6 +189,11 @@ $lang['external_edit']         = 'upraveno mimo DokuWiki';
 $lang['summary']               = 'Komentář k úpravám';
 $lang['noflash']               = 'Pro přehrání obsahu potřebujete <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
 $lang['download']              = 'Stáhnout snippet';
+$lang['tools']                 = 'Nástroje';
+$lang['user_tools']            = 'Uživatelské nástroje';
+$lang['site_tools']            = 'Nástroje pro tento web';
+$lang['page_tools']            = 'Nástroje pro stránku';
+$lang['skip_to_content']       = 'jít k obsahu';
 $lang['mail_newpage']          = 'nová stránka:';
 $lang['mail_changed']          = 'změna stránky:';
 $lang['mail_subscribe_list']   = 'stránky změněné ve jmenném prostoru:';
@@ -282,21 +286,6 @@ $lang['i_pol1']                = 'Veřejná wiki (čtení pro všechny, zápis a
 $lang['i_pol2']                = 'Uzavřená wiki (čtení, zápis a upload pouze pro registrované uživatele)';
 $lang['i_retry']               = 'Zkusit znovu';
 $lang['i_license']             = 'Vyberte prosím licenci obsahu:';
-$lang['mu_intro']              = 'Zde můžete načíst více souborů najednou. Pro přidání souborů do fronty stiskněte tlačítko "Procházet". Až budete hotovi, stiskněte "Načíst".';
-$lang['mu_gridname']           = 'Název souboru';
-$lang['mu_gridsize']           = 'Velikost';
-$lang['mu_gridstat']           = 'Stav';
-$lang['mu_namespace']          = 'Jmenný prostor';
-$lang['mu_browse']             = 'Procházet';
-$lang['mu_toobig']             = 'příliš velké';
-$lang['mu_ready']              = 'připraveno k načtení';
-$lang['mu_done']               = 'hotovo';
-$lang['mu_fail']               = 'selhalo';
-$lang['mu_authfail']           = 'vypršela session';
-$lang['mu_progress']           = '@PCT@% načten';
-$lang['mu_filetypes']          = 'Povolené typy souborů';
-$lang['mu_info']               = 'soubory načteny.';
-$lang['mu_lasterr']            = 'Poslední chyba:';
 $lang['recent_global']         = 'Právě si prohlížíte změny ve jmenném prostoru <b>%s</b>. Také si můžete <a href="%s">zobrazit změny v celé wiki</a>.';
 $lang['years']                 = 'před %d roky';
 $lang['months']                = 'před %d měsíci';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 0b6961921..641ea6552 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -48,7 +48,6 @@ $lang['btn_backtomedia']       = 'Tilbage til valg af mediefil';
 $lang['btn_subscribe']         = 'Abonnér på ændringer';
 $lang['btn_profile']           = 'Opdatér profil';
 $lang['btn_reset']             = 'Nulstil';
-$lang['btn_resendpwd']         = 'Send ny adgangskode';
 $lang['btn_draft']             = 'Redigér kladde';
 $lang['btn_recover']           = 'Gendan kladde';
 $lang['btn_draftdel']          = 'Slet kladde';
@@ -83,7 +82,6 @@ $lang['profnoempty']           = 'Tomt navn eller e-mail adresse er ikke tilladt
 $lang['profchanged']           = 'Brugerprofil opdateret korrekt.';
 $lang['pwdforget']             = 'Har du glemt dit adgangskode? Få et nyt';
 $lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.';
-$lang['resendpwd']             = 'Send nyt adgangskode for';
 $lang['resendpwdmissing']      = 'Du skal udfylde alle felter.';
 $lang['resendpwdnouser']       = 'Vi kan ikke finde denne bruger i vores database.';
 $lang['resendpwdbadauth']      = 'Beklager, denne autoriseringskode er ikke gyldig. Kontroller venligst at du benyttede det fulde link til bekræftelse.';
@@ -262,21 +260,6 @@ $lang['i_pol1']                = 'Offentlig Wiki (alle kan læse, kun registrere
 $lang['i_pol2']                = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og overføre)';
 $lang['i_retry']               = 'Forsøg igen';
 $lang['i_license']             = 'Vælg venligst licensen du vil tilføje dit indhold under:';
-$lang['mu_intro']              = 'Her kan du overføre flere filer af gangen. Klik på gennemse for at tilføje dem til køen. Tryk på overføre knappen når du er klar.';
-$lang['mu_gridname']           = 'Filnavn';
-$lang['mu_gridsize']           = 'Størrelse';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Navnerum';
-$lang['mu_browse']             = 'gennemse';
-$lang['mu_toobig']             = 'for stor';
-$lang['mu_ready']              = 'klar til overføre';
-$lang['mu_done']               = 'færdig';
-$lang['mu_fail']               = 'fejlede';
-$lang['mu_authfail']           = 'session udløb';
-$lang['mu_progress']           = '@PCT@% upload';
-$lang['mu_filetypes']          = 'Tilladte filtyper';
-$lang['mu_info']               = 'filer var overføret.';
-$lang['mu_lasterr']            = 'Sidste fejl:';
 $lang['recent_global']         = 'Du ser lige nu ændringerne i <b>%s</b> navnerummet. Du kan også <a href="%s">se de sidste ændringer for hele wiki siden </a>';
 $lang['years']                 = '%d år siden';
 $lang['months']                = '%d måned siden';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 3779d6fb3..093125aa6 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -54,7 +54,7 @@ $lang['btn_backtomedia']       = 'Zurück zur Dateiauswahl';
 $lang['btn_subscribe']         = 'Aboverwaltung';
 $lang['btn_profile']           = 'Benutzerprofil';
 $lang['btn_reset']             = 'Zurücksetzen';
-$lang['btn_resendpwd']         = 'Sende neues Passwort';
+$lang['btn_resendpwd']         = 'Setze neues Passwort';
 $lang['btn_draft']             = 'Entwurf bearbeiten';
 $lang['btn_recover']           = 'Entwurf wiederherstellen';
 $lang['btn_draftdel']          = 'Entwurf löschen';
@@ -91,7 +91,7 @@ $lang['profnoempty']           = 'Es muss ein Name oder eine E-Mail Adresse ange
 $lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
-$lang['resendpwd']             = 'Neues Passwort senden für';
+$lang['resendpwd']             = 'Neues Passwort setzen für';
 $lang['resendpwdmissing']      = 'Es tut mir Leid, aber du musst alle Felder ausfüllen.';
 $lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.';
 $lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.';
@@ -168,7 +168,7 @@ $lang['accessdenied']          = 'Du hast keinen Zugriff auf diese Seite';
 $lang['mediausage']            = 'Syntax zum Verwenden dieser Datei:';
 $lang['mediaview']             = 'Originaldatei öffnen';
 $lang['mediaroot']             = 'Wurzel';
-$lang['mediaupload']           = 'Lade hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stelle diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.';
+$lang['mediaupload']           = 'Lade hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stelle diese dem Dateinamen durch Doppelpunkt getrennt voran, nachdem Du die Datei ausgewählt hast.';
 $lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
 $lang['reference']             = 'Verwendung von';
 $lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
@@ -288,21 +288,6 @@ $lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben
 $lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
 $lang['i_retry']               = 'Wiederholen';
 $lang['i_license']             = 'Bitte wähle die Lizenz aus unter der die Wiki-Inhalte veröffentlicht werden sollen:';
-$lang['mu_intro']              = 'In diesem Bereich kannst du mehrere Dateien gleichzeitig hochladen. Benutze die Schaltfläche "Durchsuchen", um sie der Warteschlange zuzufügen. Betätige die Schaltfläche "Hochladen", um die Übertragung zu starten.';
-$lang['mu_gridname']           = 'Dateiname';
-$lang['mu_gridsize']           = 'Größe';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namensraum';
-$lang['mu_browse']             = 'Durchsuchen';
-$lang['mu_toobig']             = 'zu groß';
-$lang['mu_ready']              = 'bereit zum Hochladen';
-$lang['mu_done']               = 'fertig';
-$lang['mu_fail']               = 'gescheitert';
-$lang['mu_authfail']           = 'Sitzung abgelaufen';
-$lang['mu_progress']           = '@PCT@% hochgeladen';
-$lang['mu_filetypes']          = 'Erlaubte Dateitypen';
-$lang['mu_info']               = 'Dateien hochgeladen.';
-$lang['mu_lasterr']            = 'Letzter Fehler:';
 $lang['recent_global']         = 'Im Moment siehst du die Änderungen im Namensraum <b>%s</b>. Du kannst auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
 $lang['years']                 = 'vor %d Jahren';
 $lang['months']                = 'vor %d Monaten';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 3bd326c84..63ffd3008 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -56,7 +56,7 @@ $lang['btn_backtomedia']       = 'Zurück zur Dateiauswahl';
 $lang['btn_subscribe']         = 'Aboverwaltung';
 $lang['btn_profile']           = 'Benutzerprofil';
 $lang['btn_reset']             = 'Zurücksetzen';
-$lang['btn_resendpwd']         = 'Sende neues Passwort';
+$lang['btn_resendpwd']         = 'Setze neues Passwort';
 $lang['btn_draft']             = 'Entwurf bearbeiten';
 $lang['btn_recover']           = 'Entwurf wiederherstellen';
 $lang['btn_draftdel']          = 'Entwurf löschen';
@@ -93,7 +93,7 @@ $lang['profnoempty']           = 'Es muss ein Name und eine E-Mail-Adresse angeg
 $lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
-$lang['resendpwd']             = 'Neues Passwort senden für';
+$lang['resendpwd']             = 'Neues Passwort setzen für';
 $lang['resendpwdmissing']      = 'Es tut mir Leid, aber Sie müssen alle Felder ausfüllen.';
 $lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.';
 $lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stellen Sie sicher, dass Sie den kompletten Bestätigungslink verwendet haben.';
@@ -170,7 +170,7 @@ $lang['accessdenied']          = 'Es ist Ihnen nicht gestattet, diese Seite zu s
 $lang['mediausage']            = 'Syntax zum Verwenden dieser Datei:';
 $lang['mediaview']             = 'Originaldatei öffnen';
 $lang['mediaroot']             = 'Wurzel';
-$lang['mediaupload']           = 'Laden Sie hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stellen Sie diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.';
+$lang['mediaupload']           = 'Laden Sie hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stellen Sie diese dem Dateinamen durch Doppelpunkt getrennt voran, nachdem Sie die Datei ausgewählt haben.';
 $lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
 $lang['reference']             = 'Verwendung von';
 $lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
@@ -198,6 +198,11 @@ $lang['external_edit']         = 'Externe Bearbeitung';
 $lang['summary']               = 'Zusammenfassung';
 $lang['noflash']               = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.';
 $lang['download']              = 'Schnipsel herunterladen';
+$lang['tools']                 = 'Werkzeuge';
+$lang['user_tools']            = 'Benutzer-Werkzeuge';
+$lang['site_tools']            = 'Webseiten-Werkzeuge';
+$lang['page_tools']            = 'Seiten-Werkzeuge';
+$lang['skip_to_content']       = 'zum Inhalt springen';
 $lang['mail_newpage']          = 'Neue Seite:';
 $lang['mail_changed']          = 'Seite geändert:';
 $lang['mail_subscribe_list']   = 'Geänderte Seiten im Namensraum:';
@@ -268,6 +273,7 @@ $lang['subscr_style_digest']   = 'Zusammenfassung der Änderungen für jede ver�
 $lang['subscr_style_list']     = 'Liste der geänderten Seiten (Alle %.2f Tage)';
 $lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.';
 $lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.';
+$lang['authpwdexpire']         = 'Ihr Passwort läuft in %d Tag(en) ab, Sie sollten es bald ändern.';
 $lang['i_chooselang']          = 'Wählen Sie Ihre Sprache';
 $lang['i_installer']           = 'DokuWiki Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
@@ -290,21 +296,6 @@ $lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben
 $lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
 $lang['i_retry']               = 'Wiederholen';
 $lang['i_license']             = 'Bitte wählen Sie die Lizenz, unter die Sie Ihre Inhalte stellen möchten:';
-$lang['mu_intro']              = 'In diesem Bereich können Sie mehrere Dateien gleichzeitig hochladen. Benutzen Sie die Schaltfläche "Durchsuchen" um sie der Warteschlange zuzufügen. Betätigen Sie die Schaltfläche "Hochladen" um die Übertragung zu starten.';
-$lang['mu_gridname']           = 'Dateiname';
-$lang['mu_gridsize']           = 'Größe';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namensraum';
-$lang['mu_browse']             = 'Durchsuchen';
-$lang['mu_toobig']             = 'zu groß';
-$lang['mu_ready']              = 'bereit zum Hochladen';
-$lang['mu_done']               = 'fertig';
-$lang['mu_fail']               = 'gescheitert';
-$lang['mu_authfail']           = 'Sitzung abgelaufen';
-$lang['mu_progress']           = '@PCT@% hochgeladen';
-$lang['mu_filetypes']          = 'Erlaubte Dateitypen';
-$lang['mu_info']               = 'Dateien hochgeladen!';
-$lang['mu_lasterr']            = 'Letzter Fehler:';
 $lang['recent_global']         = 'Im Moment sehen Sie die Änderungen im Namensraum <b>%s</b>. Sie können auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
 $lang['years']                 = 'vor %d Jahren';
 $lang['months']                = 'vor %d Monaten';
diff --git a/inc/lang/de/resetpwd.txt b/inc/lang/de/resetpwd.txt
new file mode 100644
index 000000000..a0a55c67a
--- /dev/null
+++ b/inc/lang/de/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Neues Passwort setzen  ======
+
+Bitte geben Sie ein neues Passwort für Ihren Wiki-Zugang ein.
+
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 4c334c1de..95f1a1ea5 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -43,7 +43,6 @@ $lang['btn_backtomedia']       = 'Επιστροφή στην επιλογή α�
 $lang['btn_subscribe']         = 'Εγγραφή σε λήψη ενημερώσεων σελίδας';
 $lang['btn_profile']           = 'Επεξεργασία προφίλ';
 $lang['btn_reset']             = 'Ακύρωση';
-$lang['btn_resendpwd']         = 'Αποστολή νέου κωδικού';
 $lang['btn_draft']             = 'Επεξεργασία  αυτόματα αποθηκευμένης σελίδας';
 $lang['btn_recover']           = 'Επαναφορά αυτόματα αποθηκευμένης σελίδας';
 $lang['btn_draftdel']          = 'Διαγραφή αυτόματα αποθηκευμένης σελίδας';
@@ -80,7 +79,6 @@ $lang['profnoempty']           = 'Δεν επιτρέπεται κενό όνο�
 $lang['profchanged']           = 'Το προφίλ χρήστη τροποποιήθηκε επιτυχώς.';
 $lang['pwdforget']             = 'Ξεχάσατε το κωδικό σας; Αποκτήστε νέο.';
 $lang['resendna']              = 'Αυτό το wiki δεν υποστηρίζει την εκ\' νέου αποστολή κωδικών.';
-$lang['resendpwd']             = 'Αποστολή νέων κωδικών για τον χρήστη';
 $lang['resendpwdmissing']      = 'Πρέπει να συμπληρώσετε όλα τα πεδία.';
 $lang['resendpwdnouser']       = 'Αυτός ο χρήστης δεν υπάρχει στα αρχεία μας.';
 $lang['resendpwdbadauth']      = 'Αυτός ο κωδικός ενεργοποίησης δεν είναι έγκυρος.';
@@ -280,21 +278,6 @@ $lang['i_pol1']                = 'Δημόσιο Wiki (όλοι μπορούν �
 $lang['i_pol2']                = 'Κλειστό Wiki (μόνο οι εγγεγραμμένοι χρήστες μπορούν να διαβάσουν ή να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
 $lang['i_retry']               = 'Νέα προσπάθεια';
 $lang['i_license']             = 'Παρακαλώ επιλέξτε την άδεια που θα χρησιμοποιήσετε για την διάθεση του περιεχομένου σας:';
-$lang['mu_intro']              = 'Εδώ μπορείτε να φορτώσετε ταυτόχρονα πολλαπλά αρχεία. Πατήστε στο κουμπί προεπισκόπησης για να τα προσθέσετε στη λίστα. Πατήστε στο κουμπί μεταφόρτωσης όταν έχετε τελειώσει.';
-$lang['mu_gridname']           = 'Όνομα αρχείου';
-$lang['mu_gridsize']           = 'Μέγεθος';
-$lang['mu_gridstat']           = 'Κατάσταση';
-$lang['mu_namespace']          = 'Φάκελος';
-$lang['mu_browse']             = 'Επισκόπηση';
-$lang['mu_toobig']             = 'υπερβολικά μεγάλο';
-$lang['mu_ready']              = 'έτοιμο για φόρτωση';
-$lang['mu_done']               = 'ολοκληρώθηκε';
-$lang['mu_fail']               = 'απέτυχε';
-$lang['mu_authfail']           = 'η συνεδρία έληξε';
-$lang['mu_progress']           = 'φορτώθηκε @PCT@%';
-$lang['mu_filetypes']          = 'Επιτρεπτοί τύποι αρχείων';
-$lang['mu_info']               = 'τα αρχεία ανέβηκαν.';
-$lang['mu_lasterr']            = 'Τελευταίο σφάλμα:';
 $lang['recent_global']         = 'Βλέπετε τις αλλαγές εντός του φακέλου <b>%s</b>. Μπορείτε επίσης να <a href="%s">δείτε τις πρόσφατες αλλαγές σε όλο το wiki</a>.';
 $lang['years']                 = 'πριν %d χρόνια';
 $lang['months']                = 'πριν %d μήνες';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 89a7c4d40..2ba220e64 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -43,7 +43,7 @@ $lang['btn_backtomedia']       = 'Back to Mediafile Selection';
 $lang['btn_subscribe']         = 'Manage Subscriptions';
 $lang['btn_profile']           = 'Update Profile';
 $lang['btn_reset']             = 'Reset';
-$lang['btn_resendpwd']         = 'Send new password';
+$lang['btn_resendpwd']         = 'Set new password';
 $lang['btn_draft']             = 'Edit draft';
 $lang['btn_recover']           = 'Recover draft';
 $lang['btn_draftdel']          = 'Delete draft';
@@ -84,7 +84,7 @@ $lang['profchanged']           = 'User profile successfully updated.';
 
 $lang['pwdforget']             = 'Forgotten your password? Get a new one';
 $lang['resendna']              = 'This wiki does not support password resending.';
-$lang['resendpwd']             = 'Send new password for';
+$lang['resendpwd']             = 'Set new password for';
 $lang['resendpwdmissing']      = 'Sorry, you must fill in all fields.';
 $lang['resendpwdnouser']       = 'Sorry, we can\'t find this user in our database.';
 $lang['resendpwdbadauth']      = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.';
@@ -166,7 +166,7 @@ $lang['accessdenied']          = 'You are not allowed to view this page.';
 $lang['mediausage']            = 'Use the following syntax to reference this file:';
 $lang['mediaview']             = 'View original file';
 $lang['mediaroot']             = 'root';
-$lang['mediaupload']           = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons. Files also can be selected by drag and drop.';
+$lang['mediaupload']           = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your filename separated by colons after you selected the files. Files can also be selected by drag and drop.';
 $lang['mediaextchange']        = 'Filextension changed from .%s to .%s!';
 $lang['reference']             = 'References for';
 $lang['ref_inuse']             = 'The file can\'t be deleted, because it\'s still used by the following pages:';
@@ -195,6 +195,11 @@ $lang['external_edit']         = 'external edit';
 $lang['summary']               = 'Edit summary';
 $lang['noflash']               = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.';
 $lang['download']              = 'Download Snippet';
+$lang['tools']                 = 'Tools';
+$lang['user_tools']            = 'User Tools';
+$lang['site_tools']            = 'Site Tools';
+$lang['page_tools']            = 'Page Tools';
+$lang['skip_to_content']       = 'skip to content';
 
 $lang['mail_newpage']          = 'page added:';
 $lang['mail_changed']          = 'page changed:';
@@ -275,6 +280,7 @@ $lang['subscr_style_list']          = 'list of changed pages since last email (e
 /* auth.class language support */
 $lang['authmodfailed']         = 'Bad user authentication configuration. Please inform your Wiki Admin.';
 $lang['authtempfail']          = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
+$lang['authpwdexpire']         = 'Your password will expire in %d days, you should change it soon.';
 
 /* installer strings */
 $lang['i_chooselang']          = 'Choose your language';
@@ -304,22 +310,6 @@ $lang['i_pol2']                = 'Closed Wiki (read, write, upload for registere
 $lang['i_retry']               = 'Retry';
 $lang['i_license']             = 'Please choose the license you want to put your content under:';
 
-$lang['mu_intro']              = 'Here you can upload multiple files at once. Click the browse button to add them to the queue. Press upload when done.';
-$lang['mu_gridname']           = 'Filename';
-$lang['mu_gridsize']           = 'Size';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namespace';
-$lang['mu_browse']             = 'Browse';
-$lang['mu_toobig']             = 'too big';
-$lang['mu_ready']              = 'ready for upload';
-$lang['mu_done']               = 'complete';
-$lang['mu_fail']               = 'failed';
-$lang['mu_authfail']           = 'session expired';
-$lang['mu_progress']           = '@PCT@% uploaded';
-$lang['mu_filetypes']          = 'Allowed Filetypes';
-$lang['mu_info']               = 'files uploaded.';
-$lang['mu_lasterr']            = 'Last error:';
-
 $lang['recent_global']         = 'You\'re currently watching the changes inside the <b>%s</b> namespace. You can also <a href="%s">view the recent changes of the whole wiki</a>.';
 $lang['years']                 = '%d years ago';
 $lang['months']                = '%d months ago';
diff --git a/inc/lang/en/resetpwd.txt b/inc/lang/en/resetpwd.txt
new file mode 100644
index 000000000..993b48765
--- /dev/null
+++ b/inc/lang/en/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Set new password ======
+
+Please enter a new password for your account in this wiki.
+
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index c8f5694de..41c6b80d1 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -45,7 +45,6 @@ $lang['btn_backtomedia']       = 'Retroiri al elekto de dosiero';
 $lang['btn_subscribe']         = 'Aliĝi al paĝaj modifoj';
 $lang['btn_profile']           = 'Ĝisdatigi profilon';
 $lang['btn_reset']             = 'Rekomenci';
-$lang['btn_resendpwd']         = 'Sendi novan pasvorton';
 $lang['btn_draft']             = 'Redakti skizon';
 $lang['btn_recover']           = 'Restarigi skizon';
 $lang['btn_draftdel']          = 'Forigi skizon';
@@ -82,7 +81,6 @@ $lang['profnoempty']           = 'Malplena nomo aŭ retadreso ne estas permesata
 $lang['profchanged']           = 'La profilo de la uzanto estas sukcese ĝisdatigita.';
 $lang['pwdforget']             = 'Ĉu vi forgesis vian pasvorton? Prenu novan';
 $lang['resendna']              = 'Tiu ĉi vikio ne ebligas resendon de la pasvortoj.';
-$lang['resendpwd']             = 'Sendi novan pasvorton al';
 $lang['resendpwdmissing']      = 'Pardonu, vi devas plenigi ĉiujn kampojn.';
 $lang['resendpwdnouser']       = 'Pardonu, ni ne trovas tiun uzanton en nia datenbazo.';
 $lang['resendpwdbadauth']      = 'Pardonu, tiu aŭtentiga kodo ne validas. Certiĝu, ke vi uzis la kompletan konfirmigan ligilon.';
@@ -254,8 +252,8 @@ $lang['subscr_m_unsubscribe']  = 'Malaboni';
 $lang['subscr_m_subscribe']    = 'Aboni';
 $lang['subscr_m_receive']      = 'Ricevi';
 $lang['subscr_style_every']    = 'retpoŝtaĵo pro ĉiu ŝanĝo';
-$lang['subscr_style_digest']   = 'kolekta retpoŝtaĵo de ŝanĝoj por ĉiu paĝo';
-$lang['subscr_style_list']     = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo';
+$lang['subscr_style_digest']   = 'resuma retpoŝtaĵo de ŝanĝoj por ĉiu paĝo (je %.2f tagoj)';
+$lang['subscr_style_list']     = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo (je %.2f tagoj)';
 $lang['authmodfailed']         = 'Malbona agordo por identigi la uzanton. Bonvolu informi la administranton de la vikio.';
 $lang['authtempfail']          = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.';
 $lang['i_chooselang']          = 'Elektu vian lingvon';
@@ -281,21 +279,6 @@ $lang['i_pol1']                = 'Publika Vikio (legi povas ĉiuj, skribi kaj al
 $lang['i_pol2']                = 'Ferma Vikio (legi, skribi, alŝuti nur povas registritaj uzantoj)';
 $lang['i_retry']               = 'Reprovi';
 $lang['i_license']             = 'Bonvolu elekti la permesilon, sub kiun vi volas meti vian enhavon:';
-$lang['mu_intro']              = 'Ĉi tie vi povas alŝuti plurajn dosierojn multope. Klaku la esplor-butonon por aldoni ilin al la vico. Premu alŝuti kiam prete.';
-$lang['mu_gridname']           = 'Dosiernomo';
-$lang['mu_gridsize']           = 'Grandeco';
-$lang['mu_gridstat']           = 'Stato';
-$lang['mu_namespace']          = 'Nomspaco';
-$lang['mu_browse']             = 'Esplori';
-$lang['mu_toobig']             = 'tro granda';
-$lang['mu_ready']              = 'preta por alŝuti';
-$lang['mu_done']               = 'plenumite';
-$lang['mu_fail']               = 'malsukcesinte';
-$lang['mu_authfail']           = 'sekcio tro longdaŭris';
-$lang['mu_progress']           = '@PCT@% alŝutite';
-$lang['mu_filetypes']          = 'Permesitaj dosiertipoj';
-$lang['mu_info']               = 'alŝutitaj dosieroj.';
-$lang['mu_lasterr']            = 'Lasta eraro:';
 $lang['recent_global']         = 'Vi nun rigardas la ŝanĝojn ene de la nomspaco <b>%s</b>. Vi povas ankaŭ <a href="%s">vidi la freŝajn ŝanĝojn de la tuta vikio</a>.';
 $lang['years']                 = 'antaŭ %d jaroj';
 $lang['months']                = 'antaŭ %d monatoj';
@@ -321,8 +304,8 @@ $lang['media_upload']          = 'Alŝuti al la nomspaco <strong>%s</strong>.';
 $lang['media_search']          = 'Serĉi en la nomspaco <strong>%s</strong>.';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s ĉe %s';
-$lang['media_edit']            = 'Modifi';
-$lang['media_history']         = 'Tiuj estas la pli malnovaj revizioj de la dosiero.';
+$lang['media_edit']            = 'Modifi %s';
+$lang['media_history']         = 'Protokolo de %s';
 $lang['media_meta_edited']     = 'metadatumoj ŝanĝitaj';
 $lang['media_perm_read']       = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi dosierojn.';
 $lang['media_perm_upload']     = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 5164c3243..ee3da258b 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -61,7 +61,6 @@ $lang['btn_backtomedia']       = 'Volver a la selección de archivos multimedia'
 $lang['btn_subscribe']         = 'Suscribirse a cambios de la página';
 $lang['btn_profile']           = 'Actualizar perfil';
 $lang['btn_reset']             = 'Restablecer';
-$lang['btn_resendpwd']         = 'Enviar nueva contraseña';
 $lang['btn_draft']             = 'Editar borrador';
 $lang['btn_recover']           = 'Recuperar borrador';
 $lang['btn_draftdel']          = 'Eliminar borrador';
@@ -98,7 +97,6 @@ $lang['profnoempty']           = 'No se permite que el nombre o la dirección de
 $lang['profchanged']           = 'Se actualizó correctamente el perfil del usuario.';
 $lang['pwdforget']             = '¿Has olvidado tu contraseña? Consigue una nueva';
 $lang['resendna']              = 'Este wiki no brinda la posibilidad de reenvío de contraseña.';
-$lang['resendpwd']             = 'Enviar una nueva contraseña para';
 $lang['resendpwdmissing']      = 'Lo siento, debes completar todos los campos.';
 $lang['resendpwdnouser']       = 'Lo siento, no se encuentra este usuario en nuestra base de datos.';
 $lang['resendpwdbadauth']      = 'Lo siento, este código de autenticación no es válido. Asegúrate de haber usado el enlace de confirmación entero.';
@@ -282,9 +280,9 @@ $lang['i_enableacl']           = 'Habilitar ACL (recomendado) (ACL: lista de con
 $lang['i_superuser']           = 'Super-usuario';
 $lang['i_problems']            = 'El instalador encontró algunos problemas, se muestran abajo. No se puede continuar la instalación hasta que usted no los corrija.';
 $lang['i_modified']            = 'Por razones de seguridad este script sólo funcionará con una instalación nueva y no modificada de Dokuwiki. Usted debe extraer nuevamente los ficheros del paquete bajado, o bien consultar las <a href="http://dokuwiki.org/install">instrucciones de instalación de Dokuwiki</a> completas.';
-$lang['i_funcna']              = 'La función de PHP <code>%s</code> no está disponible. Tal vez su proveedor de hosting la ha deshabilitado por alguna razón?';
+$lang['i_funcna']              = 'La función de PHP <code>%s</code> no está disponible. ¿Tal vez su proveedor de hosting la ha deshabilitado por alguna razón?';
 $lang['i_phpver']              = 'Su versión de PHP <code>%s</code> es menor que la necesaria <code>%s</code>. Es necesario que actualice su instalación de PHP.';
-$lang['i_permfail']            = 'DokuWili no puede escribir <code>%s</code>. Es necesario establecer  correctamente los permisos de este directorio!';
+$lang['i_permfail']            = 'DokuWili no puede escribir <code>%s</code>. ¡Es necesario establecer  correctamente los permisos de este directorio!';
 $lang['i_confexists']          = '<code>%s</code> ya existe';
 $lang['i_writeerr']            = 'Imposible crear <code>%s</code>. Se necesita que usted controle los permisos del fichero/directorio y que cree el fichero manualmente.';
 $lang['i_badhash']             = 'dokuwiki.php no reconocido o modificado (hash=<code>%s</code>)';
@@ -297,21 +295,6 @@ $lang['i_pol1']                = 'Wiki público (leer para todos, escribir y sub
 $lang['i_pol2']                = 'Wiki cerrado (leer, escribir y subir archivos para usuarios registrados únicamente)';
 $lang['i_retry']               = 'Reintentar';
 $lang['i_license']             = 'Por favor escoja una licencia bajo la que publicar su contenido:';
-$lang['mu_intro']              = 'Puedes subir varios archivos a la vez desde aquí. Pulsa el botón del navegador para agregarlos a la cola. Pulsa "subir archivo" para proceder.';
-$lang['mu_gridname']           = 'Nombre de archivo';
-$lang['mu_gridsize']           = 'Tamaño';
-$lang['mu_gridstat']           = 'Estado';
-$lang['mu_namespace']          = 'Espacio de nombres';
-$lang['mu_browse']             = 'Buscar';
-$lang['mu_toobig']             = 'demasiado grande';
-$lang['mu_ready']              = 'listo para subir';
-$lang['mu_done']               = 'completado';
-$lang['mu_fail']               = 'falló';
-$lang['mu_authfail']           = 'la sesión caducó';
-$lang['mu_progress']           = '@PCT@% transferido';
-$lang['mu_filetypes']          = 'Tipos de archivos permitidos';
-$lang['mu_info']               = 'Archivos subidos:';
-$lang['mu_lasterr']            = 'Último error:';
 $lang['recent_global']         = 'Actualmente estás viendo los cambios dentro del namespace <b>%s</b>. También puedes <a href="%s">ver los cambios recientes en el wiki completo</a>.';
 $lang['years']                 = '%d años atrás';
 $lang['months']                = '%d meses atrás';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 6cd2f437d..5e5caa1c8 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -43,7 +43,6 @@ $lang['btn_backtomedia']       = 'Tagasi faili valikusse';
 $lang['btn_subscribe']         = 'Jälgi seda lehte (teated meilile)';
 $lang['btn_profile']           = 'Minu info';
 $lang['btn_reset']             = 'Taasta';
-$lang['btn_resendpwd']         = 'Saada uus parool';
 $lang['btn_draft']             = 'Toimeta mustandit';
 $lang['btn_recover']           = 'Taata mustand';
 $lang['btn_draftdel']          = 'Kustuta mustand';
@@ -79,7 +78,6 @@ $lang['profnoempty']           = 'Tühi nimi ega meiliaadress pole lubatud.';
 $lang['profchanged']           = 'Kasutaja info edukalt muudetud';
 $lang['pwdforget']             = 'Unustasid parooli? Tee uus';
 $lang['resendna']              = 'See wiki ei toeta parooli taassaatmist.';
-$lang['resendpwd']             = 'Saada uus parool';
 $lang['resendpwdmissing']      = 'Khmm... Sa pead täitma kõik väljad.';
 $lang['resendpwdnouser']       = 'Aga sellist kasutajat ei ole.';
 $lang['resendpwdbadauth']      = 'See autentimiskood ei ole õige. Kontrolli, et kopeerisid terve lingi.';
@@ -232,12 +230,3 @@ $lang['i_pol0']                = 'Avatud (lugemine, kirjutamine ja üleslaadimin
 $lang['i_pol1']                = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)';
 $lang['i_pol2']                = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)';
 $lang['i_retry']               = 'Proovi uuesti';
-$lang['mu_gridname']           = 'Failinimi';
-$lang['mu_gridsize']           = 'Suurus';
-$lang['mu_gridstat']           = 'Staatus';
-$lang['mu_browse']             = 'Sirvi';
-$lang['mu_toobig']             = 'liiga suur';
-$lang['mu_ready']              = 'valmis üleslaadimiseks';
-$lang['mu_done']               = 'valmis';
-$lang['mu_fail']               = 'ebaõnnestus';
-$lang['mu_lasterr']            = 'Viimane viga:';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index d02f281c3..f7a517fe4 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -40,7 +40,6 @@ $lang['btn_backtomedia']       = 'Atzera Multimedia Fitxategiaren Aukeraketara';
 $lang['btn_subscribe']         = 'Harpidetu Orri Aldaketetara';
 $lang['btn_profile']           = 'Eguneratu Profila ';
 $lang['btn_reset']             = 'Aldaketak Desegin';
-$lang['btn_resendpwd']         = 'Pasahitz berria bidali';
 $lang['btn_draft']             = 'Editatu zirriborroa';
 $lang['btn_recover']           = 'Berreskuratu zirriborroa';
 $lang['btn_draftdel']          = 'Ezabatu zirriborroa';
@@ -75,7 +74,6 @@ $lang['profnoempty']           = 'Izen edota e-posta hutsa ez dago onartua.';
 $lang['profchanged']           = 'Erabiltzaile profila arrakastaz eguneratua.';
 $lang['pwdforget']             = 'Pasahitza ahaztu duzu? Eskuratu berri bat';
 $lang['resendna']              = 'Wiki honek ez du pasahitz berbidalketa onartzen.';
-$lang['resendpwd']             = 'Bidali pasahitz berria honentzat:';
 $lang['resendpwdmissing']      = 'Barkatu, eremu guztiak bete behar dituzu.';
 $lang['resendpwdnouser']       = 'Barkatu, ez dugu erabiltzaile hori datu-basean aurkitzen';
 $lang['resendpwdbadauth']      = 'Barkatu, kautotze kodea ez da baliozkoa. Ziurtatu baieztapen esteka osoa erabili duzula.';
@@ -256,21 +254,6 @@ $lang['i_pol1']                = 'Wiki Publikoa (irakurri edonorentzat, idatzi e
 $lang['i_pol2']                = 'Wiki Itxia (irakurri, idatzi, fitxategiak igo erregistratutako erabiltzaileentzat soilik)';
 $lang['i_retry']               = 'Berriz saiatu';
 $lang['i_license']             = 'Mesedez, aukeratu zein lizentzipean ezarri nahi duzun zure edukia:';
-$lang['mu_intro']              = 'Hemen hainbat fitxategi aldi berean igo ditzakezu. Egin klik nabigazio botoian hauek ilarara gehitzeko. Sakatu igo botoia prest egotean.';
-$lang['mu_gridname']           = 'Fitxategi izena';
-$lang['mu_gridsize']           = 'Tamaina';
-$lang['mu_gridstat']           = 'Egoera';
-$lang['mu_namespace']          = 'Izen-espazioa';
-$lang['mu_browse']             = 'Nabigatu';
-$lang['mu_toobig']             = 'handiegia';
-$lang['mu_ready']              = 'igotzeko prest';
-$lang['mu_done']               = 'amaitua';
-$lang['mu_fail']               = 'hutsegitea';
-$lang['mu_authfail']           = 'saioa iraungita';
-$lang['mu_progress']           = '@PCT@% igota';
-$lang['mu_filetypes']          = 'Onartutako Fitxategi Motak';
-$lang['mu_info']               = 'igotako fitxategiak.';
-$lang['mu_lasterr']            = 'Azken errorea;';
 $lang['recent_global']         = 'Une honetan <b>%s</b> izen-espazioaren barneko aldaketak ikusten ari zara.<a href="%s"> Wiki osoaren azken aldaketak</a> ere ikusi ditzakezu.';
 $lang['years']                 = 'duela %d urte';
 $lang['months']                = 'duela %d hilabete';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index ac14ce07a..c55c3efdd 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -47,7 +47,6 @@ $lang['btn_backtomedia']       = 'بازگشت به انتخاب فایل';
 $lang['btn_subscribe']         = 'عضویت در تغییرات صفحه';
 $lang['btn_profile']           = 'به روز رسانی پروفایل';
 $lang['btn_reset']             = 'بازنشاندن';
-$lang['btn_resendpwd']         = 'یک گذرواژه‌ی جدید برای شما فرستاده شود';
 $lang['btn_draft']             = 'ویرایش پیش‌نویس';
 $lang['btn_recover']           = 'بازیابی پیش‌نویس';
 $lang['btn_draftdel']          = 'حذف پیش‌نویس';
@@ -82,7 +81,6 @@ $lang['profnoempty']           = 'نام و آدرس ایمیل باید پر ش
 $lang['profchanged']           = 'پروفایل کاربر با موفقیت به روز شد';
 $lang['pwdforget']             = 'گذرواژه‌ی خود را فراموش کرده‌اید؟ جدید دریافت کنید';
 $lang['resendna']              = 'این ویکی ارسال مجدد گذرواژه را پشتیبانی نمی‌کند';
-$lang['resendpwd']             = 'گذرواژه‌ی جدید ارسال شد';
 $lang['resendpwdmissing']      = 'متاسفم، شما باید تمام قسمت‌ها را پر کنید';
 $lang['resendpwdnouser']       = 'متاسفم، ما نتوانستیم این نام کاربری را در بانک خود پیدا کنیم';
 $lang['resendpwdbadauth']      = 'متاسفم، کد شناسایی معتبر نیست. از صحت لینک تاییدیه اطمینان حاصل کنید.';
@@ -263,21 +261,6 @@ $lang['i_pol1']                = 'ویکی عمومی (همه می‌توانن�
 $lang['i_pol2']                = 'ویکی بسته (فقط کاربران ثبت شده می‌توانند بخوانند، بنویسند و فایل ارسال کنند)';
 $lang['i_retry']               = 'تلاش مجدد';
 $lang['i_license']             = 'لطفن مجوز این محتوا را وارد کنید:';
-$lang['mu_intro']              = 'شما می‌توانید چندین فایل را با یک حرکت ارسال کنید. روی دکمه‌ی «بچر» کلیک کنید و فایل‌ها را به صف ارسال اضافه نمایید. سپس دکمه‌ی «ارسال» را فشار دهید. ';
-$lang['mu_gridname']           = 'نام فایل';
-$lang['mu_gridsize']           = 'اندازه';
-$lang['mu_gridstat']           = 'وضعیت';
-$lang['mu_namespace']          = 'فضای‌نام';
-$lang['mu_browse']             = 'بچر';
-$lang['mu_toobig']             = 'خیلی بزرگ';
-$lang['mu_ready']              = 'آماده‌ی ارسال';
-$lang['mu_done']               = 'کامل';
-$lang['mu_fail']               = 'شکست خورد';
-$lang['mu_authfail']           = 'سشن به پایان رسید';
-$lang['mu_progress']           = '@PCT@% ارسال شد';
-$lang['mu_filetypes']          = 'توسعه‌های مجاز';
-$lang['mu_info']               = 'فایل ارسال گردید';
-$lang['mu_lasterr']            = 'آخرین خطا:';
 $lang['recent_global']         = 'شما هم‌اکنون تغییرات فضای‌نام <b>%s</b> را مشاهده می‌کنید. شما هم‌چنین می‌توانید <a href="%s">تغییرات اخیر در کل ویکی را مشاهده نمایید</a>.';
 $lang['years']                 = '%d سال پیش';
 $lang['months']                = '%d ماه پیش';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 3477f15a3..ce15f68d0 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -43,7 +43,6 @@ $lang['btn_backtomedia']       = 'Takaisin mediatiedostojen valintaan';
 $lang['btn_subscribe']         = 'Tilaa muutokset';
 $lang['btn_profile']           = 'Päivitä profiili';
 $lang['btn_reset']             = 'Tyhjennä';
-$lang['btn_resendpwd']         = 'Lähetä uusi salasana';
 $lang['btn_draft']             = 'Muokkaa luonnosta';
 $lang['btn_recover']           = 'Palauta luonnos';
 $lang['btn_draftdel']          = 'Poista luonnos';
@@ -80,7 +79,6 @@ $lang['profnoempty']           = 'Tyhjä nimi tai sähköpostiosoite ei ole sall
 $lang['profchanged']           = 'Käyttäjän profiilin päivitys onnistui.';
 $lang['pwdforget']             = 'Unohtuiko salasana? Hanki uusi';
 $lang['resendna']              = 'Tämä wiki ei tue salasanan uudelleenlähettämistä.';
-$lang['resendpwd']             = 'Lähetä uusi salasana käyttäjälle';
 $lang['resendpwdmissing']      = 'Kaikki kentät on täytettävä.';
 $lang['resendpwdnouser']       = 'Käyttäjää ei löydy tietokannastamme.';
 $lang['resendpwdbadauth']      = 'Tunnistuskoodi on virheellinen. Varmista, että käytit koko varmistuslinkkiä.';
@@ -279,21 +277,6 @@ $lang['i_pol1']                = 'Julkinen Wiki (luku kaikilla, kirjoitus ja tie
 $lang['i_pol2']                = 'Suljettu Wiki (luku, kirjoitus ja tiedostojen lähetys vain rekisteröityneillä käyttäjillä)';
 $lang['i_retry']               = 'Yritä uudelleen';
 $lang['i_license']             = 'Valitse lisenssi, jonka alle haluat sisältösi laittaa:';
-$lang['mu_intro']              = 'Täällä voit lähettää useampia tiedostoja kerralla. Klikkaa Selaa-nappia lisätäksesi ne jonoon. Paina lähetä, kun olet valmis.';
-$lang['mu_gridname']           = 'Tiedoston nimi';
-$lang['mu_gridsize']           = 'Koko';
-$lang['mu_gridstat']           = 'Tilanne';
-$lang['mu_namespace']          = 'Nimiavaruus';
-$lang['mu_browse']             = 'Selaa';
-$lang['mu_toobig']             = 'liian iso';
-$lang['mu_ready']              = 'valmis lähetettäväksi';
-$lang['mu_done']               = 'valmis';
-$lang['mu_fail']               = 'epäonnistui';
-$lang['mu_authfail']           = 'istunto on vanhentunut';
-$lang['mu_progress']           = '@PCT@% lähetetty';
-$lang['mu_filetypes']          = 'Sallitut tyypit';
-$lang['mu_info']               = 'tiedostoa ladattu.';
-$lang['mu_lasterr']            = 'Edellinen virhe:';
 $lang['recent_global']         = 'Seuraat tällä hetkellä muutoksia nimiavaruuden <b>%s</b> sisällä. Voit myös <a href="%s">katsoa muutoksia koko wikissä</a>';
 $lang['years']                 = '%d vuotta sitten';
 $lang['months']                = '%d kuukautta sitten';
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index 4cb895f72..14ec8c56b 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -40,7 +40,6 @@ $lang['btn_backtomedia']       = 'Aftur til val av miðlafílu';
 $lang['btn_subscribe']         = 'Tilmelda broytingar';
 $lang['btn_profile']           = 'Dagføra vangamynd';
 $lang['btn_reset']             = 'Nullstilla';
-$lang['btn_resendpwd']         = 'Send nýtt loyniorð';
 $lang['btn_draft']             = 'Broyt kladdu';
 $lang['btn_recover']           = 'Endurbygg kladdu';
 $lang['btn_draftdel']          = 'Sletta';
@@ -75,7 +74,6 @@ $lang['profnoempty']           = 'Tómt navn ella t-post adressa er ikki loyvt.'
 $lang['profchanged']           = 'Brúkara vangamynd dagført rætt.';
 $lang['pwdforget']             = 'Gloymt títt loyniorð? Fá eitt nýtt';
 $lang['resendna']              = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.';
-$lang['resendpwd']             = 'Send nýtt loyniorð til';
 $lang['resendpwdmissing']      = 'Tú skal filla út øll økir.';
 $lang['resendpwdnouser']       = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.';
 $lang['resendpwdbadauth']      = 'Hald til góðar, hendan góðkenningar kodan er ikki gildug. Kanna eftir at tú nýtti tað fulfíggjaðu góðkenningarleinkjuna';
diff --git a/inc/lang/fr/index.txt b/inc/lang/fr/index.txt
index 14446681e..c66c656ab 100644
--- a/inc/lang/fr/index.txt
+++ b/inc/lang/fr/index.txt
@@ -1,4 +1,4 @@
 ====== Index ======
 
-Voici un index de toutes les pages disponibles, triées par [[doku>namespaces|catégorie]].
+Voici un index de toutes les pages disponibles, triées par [[doku>fr:namespaces|catégorie]].
 
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 60b86b346..140c584c3 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -22,6 +22,7 @@
  * @author Samuel Dorsaz <samuel.dorsaz@novelion.net>
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -57,7 +58,6 @@ $lang['btn_backtomedia']       = 'Retour à la sélection du fichier média';
 $lang['btn_subscribe']         = 'S\'abonner à la page';
 $lang['btn_profile']           = 'Mettre à jour le profil';
 $lang['btn_reset']             = 'Réinitialiser';
-$lang['btn_resendpwd']         = 'Envoyer le mot de passe';
 $lang['btn_draft']             = 'Modifier le brouillon';
 $lang['btn_recover']           = 'Récupérer le brouillon';
 $lang['btn_draftdel']          = 'Effacer le brouillon';
@@ -94,7 +94,6 @@ $lang['profnoempty']           = 'Un nom ou une adresse de courriel vide n\'est
 $lang['profchanged']           = 'Mise à jour du profil réussie.';
 $lang['pwdforget']             = 'Mot de passe oublié ? Faites-vous envoyer votre mot de passe ';
 $lang['resendna']              = 'Ce wiki ne permet pas le renvoi de mot de passe.';
-$lang['resendpwd']             = 'Renvoyer le mot de passe de';
 $lang['resendpwdmissing']      = 'Désolé, vous devez remplir tous les champs.';
 $lang['resendpwdnouser']       = 'Désolé, cet utilisateur est introuvable dans notre base.';
 $lang['resendpwdbadauth']      = 'Désolé, ce code d\'authentification est invalide. Assurez-vous d\'avoir utilisé le lien de confirmation.';
@@ -112,7 +111,7 @@ $lang['lockexpire']            = 'Le blocage expire à';
 $lang['js']['willexpire']      = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.';
 $lang['js']['notsavedyet']     = 'Les modifications non enregistrées seront perdues. Voulez-vous vraiment continuer ?';
 $lang['js']['searchmedia']     = 'Chercher des fichiers';
-$lang['js']['keepopen']        = 'Gardez la fenêtre ouverte pendant la sélection';
+$lang['js']['keepopen']        = 'Gardez cette fenêtre toujours ouverte';
 $lang['js']['hidedetails']     = 'Masquer détails';
 $lang['js']['mediatitle']      = 'Paramètres de lien';
 $lang['js']['mediadisplay']    = 'Type de lien';
@@ -135,12 +134,10 @@ $lang['js']['medialeft']       = 'Aligner l\'image sur la gauche.';
 $lang['js']['mediaright']      = 'Aligner l\'image sur la droite.';
 $lang['js']['mediacenter']     = 'Centrer l\'image';
 $lang['js']['medianoalign']    = 'Ne pas aligner.';
-$lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.
-                                  Vous pouvez toujours copier puis coller le lien.';
+$lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.\nVous pouvez toujours copier puis coller le lien.';
 $lang['js']['linkwiz']         = 'Assistant Lien';
 $lang['js']['linkto']          = 'Lien vers :';
 $lang['js']['del_confirm']     = 'Effacer cette entrée ?';
-$lang['js']['mu_btn']          = 'Envoyer plusieurs fichiers en même temps';
 $lang['js']['restore_confirm'] = 'Voulez vous vraiment restaurer cette version ?';
 $lang['js']['media_diff']      = 'Voir les différences:';
 $lang['js']['media_diff_both'] = 'Côte à côte';
@@ -267,8 +264,8 @@ $lang['subscr_m_unsubscribe']  = 'Annuler la souscription';
 $lang['subscr_m_subscribe']    = 'Souscrire';
 $lang['subscr_m_receive']      = 'Recevoir';
 $lang['subscr_style_every']    = 'Envoyer un courriel à chaque modification';
-$lang['subscr_style_digest']   = 'Courriel résumant les modifications de chaque page';
-$lang['subscr_style_list']     = 'Liste des pages modifiées depuis le dernier courriel';
+$lang['subscr_style_digest']   = 'Courriel, tous les %.2f jours, résumant les modifications de chaque page';
+$lang['subscr_style_list']     = 'Liste des pages modifiées depuis le dernier courriel (tous les %.2f jours)';
 $lang['authmodfailed']         = 'Mauvais paramétrage de l\'authentification. Merci d\'informer l\'administrateur du Wiki.';
 $lang['authtempfail']          = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'informer l\'administrateur du Wiki.';
 $lang['i_chooselang']          = 'Choisissez votre langue';
@@ -293,21 +290,6 @@ $lang['i_pol1']                = 'Wiki public (lecture pour tout le monde, écri
 $lang['i_pol2']                = 'Wiki fermé (lecture, écriture, envoi de fichiers pour les utilisateurs enregistrés uniquement)';
 $lang['i_retry']               = 'Réessayer';
 $lang['i_license']             = 'Veuillez choisir la licence sous laquelle placer votre contenu :';
-$lang['mu_intro']              = 'Ici vous pouvez envoyer plusieurs fichiers en même temps. Cliquez sur le bouton parcourir pour les ajouter. Cliquez sur envoyer lorsque c\'est prêt. ';
-$lang['mu_gridname']           = 'Nom du fichier';
-$lang['mu_gridsize']           = 'Taille';
-$lang['mu_gridstat']           = 'État';
-$lang['mu_namespace']          = 'Catégorie';
-$lang['mu_browse']             = 'Parcourir';
-$lang['mu_toobig']             = 'Trop gros';
-$lang['mu_ready']              = 'Prêt à envoyer';
-$lang['mu_done']               = 'Terminé';
-$lang['mu_fail']               = 'Échoué';
-$lang['mu_authfail']           = 'Session expirée';
-$lang['mu_progress']           = '@PCT@% envoyé';
-$lang['mu_filetypes']          = 'Types de fichiers acceptés';
-$lang['mu_info']               = 'fichiers envoyés.';
-$lang['mu_lasterr']            = 'Dernière erreur : ';
 $lang['recent_global']         = 'Vous êtes actuellement en train de regarder les modifications au sein de la catégorie <strong>%s</strong>. Vous pouvez aussi <a href="%s">voir les récentes modifications sur tout le wiki</a>.';
 $lang['years']                 = 'il y a %d ans';
 $lang['months']                = 'il y a %d mois';
@@ -328,13 +310,13 @@ $lang['media_list_rows']       = 'Lignes';
 $lang['media_sort_name']       = 'Tri par nom';
 $lang['media_sort_date']       = 'Tri par date';
 $lang['media_namespaces']      = 'Choisissez un espace de nom';
-$lang['media_files']           = 'Fichiers présents dans';
-$lang['media_upload']          = 'Télécharger dans la catégorie <strong>%s</strong>.';
-$lang['media_search']          = 'Chercher dans la catégorie <strong>%s</strong>.';
+$lang['media_files']           = 'Fichiers de %s';
+$lang['media_upload']          = 'Télécharger dans %s.';
+$lang['media_search']          = 'Chercher dans %s.';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s dans %s';
 $lang['media_edit']            = 'Éditer %s';
-$lang['media_history']         = 'Historique du %s';
+$lang['media_history']         = 'Historique de %s';
 $lang['media_meta_edited']     = 'métadonnées éditées';
 $lang['media_perm_read']       = 'Désolé, vous n\'avez pas les droits pour lire les fichiers.';
 $lang['media_perm_upload']     = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 01938b3a0..9636d6c15 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -4,6 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -39,12 +40,13 @@ $lang['btn_backtomedia']       = 'Volver á Selección de Arquivos-Media';
 $lang['btn_subscribe']         = 'Avísame dos trocos na páxina';
 $lang['btn_profile']           = 'Actualizar Perfil';
 $lang['btn_reset']             = 'Reiniciar';
-$lang['btn_resendpwd']         = 'Envíame un novo contrasinal';
 $lang['btn_draft']             = 'Editar borrador';
 $lang['btn_recover']           = 'Recuperar borrador';
 $lang['btn_draftdel']          = 'Eliminar borrador';
 $lang['btn_revert']            = 'Restaurar';
 $lang['btn_register']          = 'Rexístrate';
+$lang['btn_apply']             = 'Aplicar';
+$lang['btn_media']             = 'Xestor de Arquivos-Media';
 $lang['loggedinas']            = 'Iniciaches sesión como';
 $lang['user']                  = 'Nome de Usuario';
 $lang['pass']                  = 'Contrasinal';
@@ -74,7 +76,6 @@ $lang['profnoempty']           = 'Non se permite un nome ou un enderezo de corre
 $lang['profchanged']           = 'Perfil de usuario actualizado correctamente.';
 $lang['pwdforget']             = 'Esqueceches o teu contrasinal? Consegue un novo';
 $lang['resendna']              = 'Este wiki non permite o reenvío de contrasinais.';
-$lang['resendpwd']             = 'Enviar novo contrasinal para';
 $lang['resendpwdmissing']      = 'Sentímolo, tes que cubrir todos os campos.';
 $lang['resendpwdnouser']       = 'Sentímolo, non atopamos este usuario no noso banco de datos.';
 $lang['resendpwdbadauth']      = 'Sentímolo, mais este código de autorización non é válido. Asegúrate de que usaches a ligazón completa de confirmación.';
@@ -89,25 +90,9 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobrescribir arquivo existente';
 $lang['lockedby']              = 'Bloqueado actualmente por';
 $lang['lockexpire']            = 'O bloqueo remata o';
-$lang['js']['willexpire']            = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
-$lang['js']['notsavedyet']     = "Perderanse os trocos non gardados.\nEstá certo de quereres continuar?";
-$lang['rssfailed']             = 'Houbo un erro ao tentar obter esta corrente RSS: ';
-$lang['nothingfound']          = 'Non se atopou nada.';
-$lang['mediaselect']           = 'Arquivos-Media';
-$lang['fileupload']            = 'Subida de Arquivos-Media';
-$lang['uploadsucc']            = 'Subida correcta';
-$lang['uploadfail']            = 'Erra na subida. Pode que sexa un problema de permisos?';
-$lang['uploadwrong']           = 'Subida denegada. Esta extensión de arquivo non está permitida!';
-$lang['uploadexist']           = 'Xa existe o arquivo. Non se fixo nada.';
-$lang['uploadbadcontent']      = 'O contido subido non concorda coa extensión do arquivo %s.';
-$lang['uploadspam']            = 'A subida foi bloqueada pola lista negra de correo-lixo.';
-$lang['uploadxss']             = 'A subida foi bloqueada por un posíbel contido malicioso.';
-$lang['uploadsize']            = 'O arquivo subido é grande de máis. (máx. %s)';
-$lang['deletesucc']            = 'O arquivo "%s" foi eliminado.';
-$lang['deletefail']            = '"%s" non puido ser eliminado - comproba os permisos.';
-$lang['mediainuse']            = 'O arquivo "%s" non foi eliminado - aínda está en uso.';
-$lang['namespaces']            = 'Nomes de espazos';
-$lang['mediafiles']            = 'Arquivos dispoñíbeis en';
+$lang['js']['willexpire']      = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
+$lang['js']['notsavedyet']     = 'Perderanse os trocos non gardados.
+Está certo de quereres continuar?';
 $lang['js']['searchmedia']     = 'Procurar ficheiros';
 $lang['js']['keepopen']        = 'Manter a fiestra aberta na selección';
 $lang['js']['hidedetails']     = 'Agochar Pormenores';
@@ -137,6 +122,35 @@ Sempre podes copiar e colar a ligazón.';
 $lang['js']['linkwiz']         = 'Asistente de ligazóns';
 $lang['js']['linkto']          = 'Ligazón para:';
 $lang['js']['del_confirm']     = 'Estás certo de quereres eliminar os elementos seleccionados?';
+$lang['js']['restore_confirm'] = 'Realmente desexas restaurar esta versión?';
+$lang['js']['media_diff']      = 'Ver as diferencias:';
+$lang['js']['media_diff_both'] = 'Cara a Cara';
+$lang['js']['media_diff_opacity'] = 'Opacidade';
+$lang['js']['media_diff_portions'] = 'Porcións';
+$lang['js']['media_select']    = 'Selecciona arquivos...';
+$lang['js']['media_upload_btn'] = 'Subir';
+$lang['js']['media_done_btn']  = 'Feito';
+$lang['js']['media_drop']      = 'Solta aquí os arquivos a subir';
+$lang['js']['media_cancel']    = 'eliminar';
+$lang['js']['media_overwrt']   = 'Sobreescribir os arquivos existentes';
+$lang['rssfailed']             = 'Houbo un erro ao tentar obter esta corrente RSS: ';
+$lang['nothingfound']          = 'Non se atopou nada.';
+$lang['mediaselect']           = 'Arquivos-Media';
+$lang['fileupload']            = 'Subida de Arquivos-Media';
+$lang['uploadsucc']            = 'Subida correcta';
+$lang['uploadfail']            = 'Erra na subida. Pode que sexa un problema de permisos?';
+$lang['uploadwrong']           = 'Subida denegada. Esta extensión de arquivo non está permitida!';
+$lang['uploadexist']           = 'Xa existe o arquivo. Non se fixo nada.';
+$lang['uploadbadcontent']      = 'O contido subido non concorda coa extensión do arquivo %s.';
+$lang['uploadspam']            = 'A subida foi bloqueada pola lista negra de correo-lixo.';
+$lang['uploadxss']             = 'A subida foi bloqueada por un posíbel contido malicioso.';
+$lang['uploadsize']            = 'O arquivo subido é grande de máis. (máx. %s)';
+$lang['deletesucc']            = 'O arquivo "%s" foi eliminado.';
+$lang['deletefail']            = '"%s" non puido ser eliminado - comproba os permisos.';
+$lang['mediainuse']            = 'O arquivo "%s" non foi eliminado - aínda está en uso.';
+$lang['namespaces']            = 'Nomes de espazos';
+$lang['mediafiles']            = 'Arquivos dispoñíbeis en';
+$lang['accessdenied']          = 'Non tes permitido ver esta páxina.';
 $lang['mediausage']            = 'Emprega a seguinte sintaxe para inserires unha referencia a este arquivo:';
 $lang['mediaview']             = 'Ver arquivo orixinal';
 $lang['mediaroot']             = 'raigaña';
@@ -152,6 +166,10 @@ $lang['current']               = 'actual';
 $lang['yours']                 = 'A túa Versión';
 $lang['diff']                  = 'Amosar diferenzas coa versión actual';
 $lang['diff2']                 = 'Amosar diferenzas entre as revisións seleccionadas';
+$lang['difflink']              = 'Enlazar a esta vista de comparación';
+$lang['diff_type']             = 'Ver diferenzas:';
+$lang['diff_inline']           = 'Por liña';
+$lang['diff_side']             = 'Cara a Cara';
 $lang['line']                  = 'Liña';
 $lang['breadcrumb']            = 'Trazado';
 $lang['youarehere']            = 'Estás aquí';
@@ -169,6 +187,10 @@ $lang['mail_changed']          = 'páxina mudada:';
 $lang['mail_subscribe_list']   = 'páxinas mudadas en nome de espazo:';
 $lang['mail_new_user']         = 'Novo usuario:';
 $lang['mail_upload']           = 'arquivo subido:';
+$lang['changes_type']          = 'Ver cambios';
+$lang['pages_changes']         = 'Páxinas';
+$lang['media_changes']         = 'Arquivos-Media';
+$lang['both_changes']          = 'Ambos, páxinas e arquivos-media';
 $lang['qb_bold']               = 'Texto Resaltado';
 $lang['qb_italic']             = 'Texto en Cursiva';
 $lang['qb_underl']             = 'Texto Subliñado';
@@ -209,6 +231,9 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Formato';
 $lang['img_camera']            = 'Cámara';
 $lang['img_keywords']          = 'Verbas chave';
+$lang['img_width']             = 'Ancho';
+$lang['img_height']            = 'Alto';
+$lang['img_manager']           = 'Ver no xestor de arquivos-media';
 $lang['subscr_subscribe_success'] = 'Engadido %s á lista de subscrición para %s';
 $lang['subscr_subscribe_error'] = 'Erro ao tentar engadir %s á lista de subscrición para %s';
 $lang['subscr_subscribe_noaddress'] = 'Non hai enderezos asociados co teu inicio de sesión, non é posíbel engadirte á lista de subscrición';
@@ -252,21 +277,7 @@ $lang['i_pol0']                = 'Wiki Aberto (lectura, escritura, subida de arq
 $lang['i_pol1']                = 'Wiki Público (lectura para todas as persoas, escritura e subida de arquivos para usuarios rexistrados)';
 $lang['i_pol2']                = 'Wiki Fechado (lectura, escritura, subida de arquivos só para usuarios rexistrados)';
 $lang['i_retry']               = 'Tentar de novo';
-$lang['mu_intro']              = 'Aquí podes subir varios arquivos de vez. Preme o botón Navegar para engadilos á cola. Preme en Subir cando remates.';
-$lang['mu_gridname']           = 'Nome de Arquivo';
-$lang['mu_gridsize']           = 'Tamaño';
-$lang['mu_gridstat']           = 'Estado';
-$lang['mu_namespace']          = 'Nome de Espazo';
-$lang['mu_browse']             = 'Navegar';
-$lang['mu_toobig']             = 'grande de máis';
-$lang['mu_ready']              = 'disposto para subir';
-$lang['mu_done']               = 'feito';
-$lang['mu_fail']               = 'fallou';
-$lang['mu_authfail']           = 'sesión expirada';
-$lang['mu_progress']           = '@PCT@% subido';
-$lang['mu_filetypes']          = 'Tipos de arquivo Permitidos';
-$lang['mu_info']               = 'arquivos subidos.';
-$lang['mu_lasterr']            = 'Último erro:';
+$lang['i_license']             = 'Por favor escolla a licenza para o contido:';
 $lang['recent_global']         = 'Agora mesmo estás a ver os trocos no nome de espazo <b>%s</b>. Tamén podes <a href="%s">ver os trocos recentes no Wiki enteiro</a>.';
 $lang['years']                 = 'hai %d anos';
 $lang['months']                = 'hai %d meses';
@@ -275,3 +286,28 @@ $lang['days']                  = 'hai %d días';
 $lang['hours']                 = 'hai %d horas';
 $lang['minutes']               = 'hai %d minutos';
 $lang['seconds']               = 'hai %d segundos';
+$lang['wordblock']             = 'Non se gardaron os cambios porque conteñen texto bloqueado (spam).';
+$lang['media_uploadtab']       = 'Subir';
+$lang['media_searchtab']       = 'Buscar';
+$lang['media_file']            = 'Arquivo';
+$lang['media_viewtab']         = 'Ver';
+$lang['media_edittab']         = 'Editar';
+$lang['media_historytab']      = 'Histórico';
+$lang['media_list_thumbs']     = 'Miniaturas';
+$lang['media_list_rows']       = 'Filas';
+$lang['media_sort_name']       = 'Nome';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Escolla espazo';
+$lang['media_files']           = 'Arquivos en %s';
+$lang['media_upload']          = 'Subir a %s';
+$lang['media_search']          = 'Buscar en %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s en %s';
+$lang['media_edit']            = 'Editar %s';
+$lang['media_history']         = 'Historia de %s';
+$lang['media_meta_edited']     = 'datos meta editados';
+$lang['media_perm_read']       = 'Sentímolo, non tes permisos suficientes para ler arquivos.';
+$lang['media_perm_upload']     = 'Sentímolo, non tes permisos suficientes para subir arquivos.';
+$lang['media_update']          = 'Subir nova versión';
+$lang['media_restore']         = 'Restaurar esta versión';
+$lang['plugin_install_err']    = 'Extensión instalada correctamente. Re-nomea o directorio da extensión de \'%s\' a \'%s\'.';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index f295e44a9..00eb4549b 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -45,7 +45,6 @@ $lang['btn_backtomedia']       = 'חזרה לבחירת קובץ מדיה';
 $lang['btn_subscribe']         = 'מעקב אחרי שינוים';
 $lang['btn_profile']           = 'עדכון הפרופיל';
 $lang['btn_reset']             = 'איפוס';
-$lang['btn_resendpwd']         = 'שליחת ססמה חדשה';
 $lang['btn_draft']             = 'עריכת טיוטה';
 $lang['btn_recover']           = 'שחזור טיוטה';
 $lang['btn_draftdel']          = 'מחיקת טיוטה';
@@ -80,7 +79,6 @@ $lang['profnoempty']           = 'השם וכתובת הדוא״ל לא יכול
 $lang['profchanged']           = 'הפרופיל עודכן בהצלחה';
 $lang['pwdforget']             = 'שכחת את הססמה שלך? ניתן לקבל חדשה';
 $lang['resendna']              = 'הוויקי הזה אינו תומך בחידוש ססמה';
-$lang['resendpwd']             = 'שליחת ססמה חדשה עבור';
 $lang['resendpwdmissing']      = 'עליך למלא את כל השדות, עמך הסליחה.';
 $lang['resendpwdnouser']       = 'משתמש בשם זה לא נמצא במסד הנתונים, עמך הסליחה.';
 $lang['resendpwdbadauth']      = 'קוד אימות זה אינו תקף. יש לוודא כי נעשה שימוש בקישור האימות המלא, עמך הסליחה.';
@@ -259,21 +257,6 @@ $lang['i_pol1']                = ' ויקי ציבורי (קריאה לכולם,
 $lang['i_pol2']                = 'ויקי סגור (קריאה, כתיבה והעלאה למשתמשים רשומים בלבד)';
 $lang['i_retry']               = 'ניסיון נוסף';
 $lang['i_license']             = 'נא לבחור את הרישיון שיחול על התוכן שבוויקי שלך:';
-$lang['mu_intro']              = 'דרך כאן ניתן להעלות מספר קבצים בבת אחת. יש ללחוץ על לחצן החיפוש להוסיף אותם למחסנית. ניתן ללחוץ על העלאה לסיום.';
-$lang['mu_gridname']           = 'שם הקובץ';
-$lang['mu_gridsize']           = 'גודל';
-$lang['mu_gridstat']           = 'מצב';
-$lang['mu_namespace']          = 'מרחב שם';
-$lang['mu_browse']             = 'חיפוש';
-$lang['mu_toobig']             = 'גדול מדי';
-$lang['mu_ready']              = 'בהמתנה להעלאה';
-$lang['mu_done']               = 'הסתיים';
-$lang['mu_fail']               = 'נכשל';
-$lang['mu_authfail']           = 'תוקף ההפעלה פג';
-$lang['mu_progress']           = '@PCT@% הועלה';
-$lang['mu_filetypes']          = 'סוגי קבצים מורשים';
-$lang['mu_info']               = 'הקבצים הועלו';
-$lang['mu_lasterr']            = 'שגיאה אחרונה:';
 $lang['recent_global']         = 'נכון לעכשיו מתנהל על ידיך מעקב אחר מרחב השם <b>%s</b>. כמו כן, באפשרותך <a href="%s">לצפות בשינויים האחרונים בוויקי כולו</a>.';
 $lang['years']                 = 'לפני %d שנים';
 $lang['months']                = 'לפני %d חודשים';
diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php
index 00e5589d8..893457066 100644
--- a/inc/lang/hi/lang.php
+++ b/inc/lang/hi/lang.php
@@ -59,7 +59,6 @@ $lang['regpwmail']             = 'आपकी डोकुविकी का �
 $lang['reghere']               = 'आपके पास अभी तक कोई खाता नहीं है? बस एक लें |';
 $lang['profna']                = 'यह विकी प्रोफ़ाइल संशोधन का समर्थन नहीं करता |';
 $lang['profnochange']          = 'कोई परिवर्तन नहीं, कुछ नहीं करना |';
-$lang['resendpwd']             = 'नवगुप्तशब्द भेजें';
 $lang['resendpwdmissing']      = 'छमा करें, आपको सारे रिक्त स्थान भरने पड़ेंगे |';
 $lang['resendpwdsuccess']      = 'आपका नवगुप्तशब्द ईमेल द्वारा सम्प्रेषित कर दिया गया है |';
 $lang['txt_upload']            = 'अपलोड करने के लिए फ़ाइल चुनें';
@@ -116,10 +115,3 @@ $lang['i_installer']           = 'डोकुविकी इंस्टॉल
 $lang['i_wikiname']            = 'विकी का नाम';
 $lang['i_superuser']           = 'महाउपयोगकर्ता';
 $lang['i_retry']               = 'पुनःप्रयास';
-$lang['mu_gridsize']           = 'आकार';
-$lang['mu_gridstat']           = 'स्थिति';
-$lang['mu_browse']             = 'ब्राउज़';
-$lang['mu_toobig']             = 'बहुत बड़ा';
-$lang['mu_ready']              = 'अपलोड करने के लिए तैयार';
-$lang['mu_done']               = 'पूर्ण';
-$lang['mu_fail']               = 'असफल';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index ef10d7720..a0438d915 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -42,7 +42,6 @@ $lang['btn_backtomedia']       = 'Povratak na Mediafile izbornik';
 $lang['btn_subscribe']         = 'Pretplati se na promjene dokumenta';
 $lang['btn_profile']           = 'Ažuriraj profil';
 $lang['btn_reset']             = 'Poništi promjene';
-$lang['btn_resendpwd']         = 'Pošalji novu lozinku';
 $lang['btn_draft']             = 'Uredi nacrt dokumenta';
 $lang['btn_recover']           = 'Vrati prijašnji nacrt dokumenta';
 $lang['btn_draftdel']          = 'Obriši nacrt dokumenta';
@@ -77,7 +76,6 @@ $lang['profnoempty']           = 'Prazno korisničko ime ili email nisu dopušte
 $lang['profchanged']           = 'Korisnički profil je uspješno izmijenjen.';
 $lang['pwdforget']             = 'Izgubili ste lozinku? Zatražite novu';
 $lang['resendna']              = 'Ovaj wiki ne podržava ponovno slanje lozinke emailom.';
-$lang['resendpwd']             = 'Poslati novu lozinku za';
 $lang['resendpwdmissing']      = 'Ispunite sva polja.';
 $lang['resendpwdnouser']       = 'Nije moguće pronaći korisnika.';
 $lang['resendpwdbadauth']      = 'Neispravan autorizacijski kod. Provjerite da li ste koristili potpun potvrdni link.';
@@ -257,21 +255,6 @@ $lang['i_pol1']                = 'Javni Wiki (čitanje za sve, pisanje i učitav
 $lang['i_pol2']                = 'Zatvoreni Wiki (čitanje, pisanje, učitavanje samo za registrirane korisnike)';
 $lang['i_retry']               = 'Pokušaj ponovo';
 $lang['i_license']             = 'Molim odaberite licencu pod kojom želite postavljati vaš sadržaj:';
-$lang['mu_intro']              = 'Ovdje možeš učitati više datoteka odjednom. Klikni gumb pregled te ih dodajte u red. Pritisnite učitaj kad ste gotovi.';
-$lang['mu_gridname']           = 'Naziv datoteke';
-$lang['mu_gridsize']           = 'Veličina';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Imenski prostor';
-$lang['mu_browse']             = 'Pregled';
-$lang['mu_toobig']             = 'prevelik';
-$lang['mu_ready']              = 'spremno za učitavanje';
-$lang['mu_done']               = 'gotovo';
-$lang['mu_fail']               = 'nije uspio';
-$lang['mu_authfail']           = 'sjednica istekla';
-$lang['mu_progress']           = '@PCT@% učitan';
-$lang['mu_filetypes']          = 'Dozvoljeni tipovi datoteka';
-$lang['mu_info']               = 'datoteke učitane.';
-$lang['mu_lasterr']            = 'Posljednja greška:';
 $lang['recent_global']         = 'Trenutno gledate promjene unutar <b>%s</b> imenskog prostora. Također možete <a href="%s">vidjeti zadnje promjene cijelog wiki-a</a>';
 $lang['years']                 = '%d godina prije';
 $lang['months']                = '%d mjeseci prije';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 23419a2bd..671b225f2 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -45,7 +45,6 @@ $lang['btn_backtomedia']       = 'Vissza a médiafájlok kezeléséhez';
 $lang['btn_subscribe']         = 'Oldalváltozások-hírlevél feliratkozás';
 $lang['btn_profile']           = 'Személyes beállítások';
 $lang['btn_reset']             = 'Alaphelyzet';
-$lang['btn_resendpwd']         = 'Új jelszó küldése';
 $lang['btn_draft']             = 'Piszkozat szerkesztése';
 $lang['btn_recover']           = 'Piszkozat folytatása';
 $lang['btn_draftdel']          = 'Piszkozat törlése';
@@ -80,7 +79,6 @@ $lang['profnoempty']           = 'A név és e-mail mező nem maradhat üresen!'
 $lang['profchanged']           = 'A személyes beállítások változtatása megtörtént.';
 $lang['pwdforget']             = 'Elfelejtetted a jelszavad? Itt kérhetsz újat';
 $lang['resendna']              = 'Ez a wiki nem támogatja a jelszó újraküldést.';
-$lang['resendpwd']             = 'Új jelszó kiküldése ennek a felhasználónak';
 $lang['resendpwdmissing']      = 'Sajnáljuk, az összes mezőt ki kell töltened.';
 $lang['resendpwdnouser']       = 'Sajnáljuk, ilyen azonosítójú felhasználónk nem létezik.';
 $lang['resendpwdbadauth']      = 'Sajnáljuk, ez a megerősítő kód nem helyes. Biztos, hogy a teljes megerősítés linket beírtad pontosan?';
@@ -262,21 +260,6 @@ $lang['i_pol1']                = 'Publikus Wiki (mindenki olvashatja, de csak re
 $lang['i_pol2']                = 'Zárt Wiki (csak regisztrált felhasználók olvashatják, írhatják és tölthetnek fel fájlokat)';
 $lang['i_retry']               = 'Újra';
 $lang['i_license']             = 'Kérlek válassz licenszt a feltöltött tartalomhoz:';
-$lang['mu_intro']              = 'Itt több fájlt is fel tudsz tölteni egyszerre. Kattints a "Kiválaszt" gombra és add hozzá a listához. Nyomd meg a Feltöltés gombot, amikor elkészültél.';
-$lang['mu_gridname']           = 'Fájlnév';
-$lang['mu_gridsize']           = 'Méret';
-$lang['mu_gridstat']           = 'Állapot';
-$lang['mu_namespace']          = 'Névtér';
-$lang['mu_browse']             = 'Kiválaszt';
-$lang['mu_toobig']             = 'túl nagy';
-$lang['mu_ready']              = 'feltöltésre kész';
-$lang['mu_done']               = 'kész';
-$lang['mu_fail']               = 'hibás';
-$lang['mu_authfail']           = 'session lejárt';
-$lang['mu_progress']           = '@PCT@% feltöltve';
-$lang['mu_filetypes']          = 'Megengedett fájltípusok';
-$lang['mu_info']               = 'Fájlok feltöltve.';
-$lang['mu_lasterr']            = 'Utolsó hiba:';
 $lang['recent_global']         = 'Jelenleg csak a <b>%s</b> névtér friss változásai látszanak. Megtekinthetők <a href="%s">a teljes wiki friss változásai</a> is.';
 $lang['years']                 = '%d évvel ezelőtt';
 $lang['months']                = '%d hónappal ezelőtt';
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index 8398f29f0..d7be1eff3 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -45,7 +45,6 @@ $lang['btn_backtomedia']       = 'Retornar al selection de files multimedia';
 $lang['btn_subscribe']         = 'Gerer subscriptiones';
 $lang['btn_profile']           = 'Actualisar profilo';
 $lang['btn_reset']             = 'Reinitialisar';
-$lang['btn_resendpwd']         = 'Inviar nove contrasigno';
 $lang['btn_draft']             = 'Modificar version provisori';
 $lang['btn_recover']           = 'Recuperar version provisori';
 $lang['btn_draftdel']          = 'Deler version provisori';
@@ -80,7 +79,6 @@ $lang['profnoempty']           = 'Un nomine o adresse de e-mail vacue non es per
 $lang['profchanged']           = 'Actualisation del profilo de usator succedite.';
 $lang['pwdforget']             = 'Contrasigno oblidate? Obtene un altere';
 $lang['resendna']              = 'Iste wiki non supporta le invio de un nove contrasigno.';
-$lang['resendpwd']             = 'Inviar nove contrasigno pro';
 $lang['resendpwdmissing']      = 'Es necessari completar tote le campos.';
 $lang['resendpwdnouser']       = 'Iste usator non ha essite trovate in le base de datos.';
 $lang['resendpwdbadauth']      = 'Iste codice de authentication non es valide. Assecura te que tu ha usate le ligamine de confirmation complete.';
@@ -257,21 +255,6 @@ $lang['i_pol0']                = 'Wiki aperte (lectura, scriptura, incargamento
 $lang['i_pol1']                = 'Wiki public (lectura pro omnes, scriptura e incargamento pro usatores registrate)';
 $lang['i_pol2']                = 'Wiki claudite (lectura, scriptura e incargamento solmente pro usatores registrate)';
 $lang['i_retry']               = 'Reprobar';
-$lang['mu_intro']              = 'Hic tu pote incargar plure files insimul. Clicca super le button Navigar pro adder los al cauda. Preme Incargar quando tu ha finite.';
-$lang['mu_gridname']           = 'Nomine de file';
-$lang['mu_gridsize']           = 'Dimension';
-$lang['mu_gridstat']           = 'Stato';
-$lang['mu_namespace']          = 'Spatio de nomines';
-$lang['mu_browse']             = 'Navigar';
-$lang['mu_toobig']             = 'troppo grande';
-$lang['mu_ready']              = 'preste pro incargamento';
-$lang['mu_done']               = 'complete';
-$lang['mu_fail']               = 'fallite';
-$lang['mu_authfail']           = 'session expirate';
-$lang['mu_progress']           = '@PCT@% incargate';
-$lang['mu_filetypes']          = 'Typos de file permittite';
-$lang['mu_info']               = 'files incargate.';
-$lang['mu_lasterr']            = 'Ultime error:';
 $lang['recent_global']         = 'Tu observa actualmente le modificationes intra le spatio de nomines <b>%s</b>. Tu pote etiam <a href="%s">vider le modificationes recente de tote le wiki</a>.';
 $lang['years']                 = '%d annos retro';
 $lang['months']                = '%d menses retro';
diff --git a/inc/lang/id-ni/lang.php b/inc/lang/id-ni/lang.php
index 9c04f0259..1a4d03498 100644
--- a/inc/lang/id-ni/lang.php
+++ b/inc/lang/id-ni/lang.php
@@ -38,7 +38,6 @@ $lang['btn_backlink']          = 'Link fangawuli';
 $lang['btn_backtomedia']       = 'Angawuli ba filianö Mediafile';
 $lang['btn_profile']           = 'Famohouni pörofile';
 $lang['btn_reset']             = 'Fawu\'a';
-$lang['btn_resendpwd']         = 'Fa\'ohe\'ö kode sibohou';
 $lang['btn_draft']             = 'Fawu\'a wanura';
 $lang['btn_draftdel']          = 'Heta zura';
 $lang['btn_register']          = 'Fasura\'ö';
@@ -69,7 +68,6 @@ $lang['profnoempty']           = 'Lö tetehegö na lö hadöi töi ma imele.';
 $lang['profchanged']           = 'Pörofile zangoguna\'ö no tebohouni.';
 $lang['pwdforget']             = 'Hadia olifu\'ö kode? Fuli halö kode';
 $lang['resendna']              = 'Lö tetehegi ba wiki da\'a wama\'ohe\'ö kode dua kali.';
-$lang['resendpwd']             = 'Tefa\'ohe\'ö kode sibahou khö';
 $lang['resendpwdmissing']      = 'Bologö dödöu, si lö tola lö\'ö öfo\'ösi fefu nahia si tohöna.';
 $lang['resendpwdnouser']       = 'Bologö dödöu, lö masöndra zangoguna da\'a ba database.';
 $lang['resendpwdconfirm']      = 'No tefaohe\'ö link famaduhu\'ö ba imele.';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index e8026acee..2302d4f6f 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -42,7 +42,6 @@ $lang['btn_subscribe']         = 'Ikuti Perubahan';
 $lang['btn_unsubscribe']       = 'Berhenti Ikuti Perubahan';
 $lang['btn_profile']           = 'Ubah Profil';
 $lang['btn_reset']             = 'Reset';
-$lang['btn_resendpwd']         = 'Kirim password baru';
 $lang['btn_draft']             = 'Edit draft';
 $lang['btn_draftdel']          = 'Hapus draft';
 $lang['btn_register']          = 'Daftar';
@@ -74,7 +73,6 @@ $lang['profnoempty']           = 'Mohon mengisikan nama atau alamat email.';
 $lang['profchanged']           = 'Profil User berhasil diubah.';
 $lang['pwdforget']             = 'Lupa Password? Dapatkan yang baru';
 $lang['resendna']              = 'Wiki ini tidak mendukung pengiriman ulang password.';
-$lang['resendpwd']             = 'Kirim password baru untuk';
 $lang['resendpwdmissing']      = 'Maaf, Anda harus mengisikan semua field.';
 $lang['resendpwdnouser']       = 'Maaf, user ini tidak ditemukan.';
 $lang['resendpwdbadauth']      = 'Maaf, kode autentikasi tidak valid. Pastikan Anda menggunakan keseluruhan link konfirmasi.';
@@ -197,14 +195,3 @@ $lang['i_pol0']                = 'Wiki Terbuka (baca, tulis, upload untuk semua
 $lang['i_pol1']                = 'Wiki Publik (baca untuk semua orang, tulis dan upload untuk pengguna terdaftar)';
 $lang['i_pol2']                = 'Wiki Privat (baca, tulis dan upload hanya untuk pengguna terdaftar)';
 $lang['i_retry']               = 'Coba Lagi';
-$lang['mu_gridname']           = 'Nama file';
-$lang['mu_gridsize']           = 'Ukuran';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namaspace';
-$lang['mu_browse']             = 'Jelajah';
-$lang['mu_ready']              = 'Siap untuk uplod';
-$lang['mu_done']               = 'Selesai';
-$lang['mu_fail']               = 'Gagal';
-$lang['mu_authfail']           = 'sesi habis';
-$lang['mu_progress']           = '@PCT@% uploaded';
-$lang['mu_filetypes']          = 'Izinkan tipe file';
diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php
index 0e281e58d..be20da6b3 100644
--- a/inc/lang/is/lang.php
+++ b/inc/lang/is/lang.php
@@ -47,7 +47,6 @@ $lang['btn_subscribe']         = 'Vakta';
 $lang['btn_unsubscribe']       = 'Afvakta';
 $lang['btn_profile']           = 'Uppfæra notanda';
 $lang['btn_reset']             = 'Endurstilla';
-$lang['btn_resendpwd']         = 'Senda nýtt aðgangsorð með tölvupósti';
 $lang['btn_draft']             = 'Breyta uppkasti';
 $lang['btn_recover']           = 'Endurheimta uppkast';
 $lang['btn_draftdel']          = 'Eyða uppkasti';
@@ -82,7 +81,6 @@ $lang['profnoempty']           = 'Það er ekki leyfilegt að skilja nafn og pó
 $lang['profchanged']           = 'Notendaupplýsingum breytt';
 $lang['pwdforget']             = 'Gleymt aðgangsorð? Fáðu nýtt';
 $lang['resendna']              = 'Þessi wiki styður ekki endursendingar aðgangsorðs';
-$lang['resendpwd']             = 'Senda nýtt aðgangsorð fyrir';
 $lang['resendpwdmissing']      = 'Afsakið, þú verður að út eyðublaðið allt';
 $lang['resendpwdnouser']       = 'Afsakið, notandi finnst ekki.';
 $lang['resendpwdbadauth']      = 'Afsakið, þessi sannvottunorð er ekki gild. Gakktu úr skugga um að þú notaðir að ljúka staðfesting hlekkur.';
@@ -185,10 +183,3 @@ $lang['img_format']            = 'Forsnið';
 $lang['img_camera']            = 'Myndavél';
 $lang['img_keywords']          = 'Lykilorðir';
 $lang['i_retry']               = 'Reyna aftur';
-$lang['mu_gridsize']           = 'Stærð';
-$lang['mu_toobig']             = 'of stór';
-$lang['mu_ready']              = 'tilbúin til upphleðslu';
-$lang['mu_done']               = 'lokið';
-$lang['mu_fail']               = 'mistókst';
-$lang['mu_info']               = 'Skrár innhlaðnar.';
-$lang['mu_lasterr']            = 'Síðasta villa:';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index ebbe983de..eda33898b 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -48,7 +48,6 @@ $lang['btn_backtomedia']       = 'Torna alla selezione file';
 $lang['btn_subscribe']         = 'Sottoscrivi modifiche';
 $lang['btn_profile']           = 'Aggiorna profilo';
 $lang['btn_reset']             = 'Annulla';
-$lang['btn_resendpwd']         = 'Invia nuova password';
 $lang['btn_draft']             = 'Modifica bozza';
 $lang['btn_recover']           = 'Ripristina bozza';
 $lang['btn_draftdel']          = 'Elimina bozza';
@@ -83,7 +82,6 @@ $lang['profnoempty']           = 'Nome o indirizzo email vuoti non sono consenti
 $lang['profchanged']           = 'Aggiornamento del profilo utente riuscito.';
 $lang['pwdforget']             = 'Hai dimenticato la password? Richiedine una nuova';
 $lang['resendna']              = 'Questo wiki non supporta l\'invio di nuove password.';
-$lang['resendpwd']             = 'Invia nuova password per';
 $lang['resendpwdmissing']      = 'Devi riempire tutti i campi.';
 $lang['resendpwdnouser']       = 'Impossibile trovare questo utente nel database.';
 $lang['resendpwdbadauth']      = 'Spiacenti, questo codice di autorizzazione non è valido. Assicurati di aver usato il link completo di conferma.';
@@ -262,21 +260,6 @@ $lang['i_pol1']                = 'Wiki Pubblico (lettura per tutti, scrittura e
 $lang['i_pol2']                = 'Wiki Chiuso (lettura, scrittura, caricamento file solamente per gli utenti registrati)';
 $lang['i_retry']               = 'Riprova';
 $lang['i_license']             = 'Per favore scegli la licenza sotto cui vuoi rilasciare il contenuto:';
-$lang['mu_intro']              = 'Qui si possono caricare più di un file alla volta. Scegliere "Sfoglia..." per aggiungere file alla coda. Alla fine, fai click su "Invia file".';
-$lang['mu_gridname']           = 'Nome file';
-$lang['mu_gridsize']           = 'Dimensione';
-$lang['mu_gridstat']           = 'Stato';
-$lang['mu_namespace']          = 'Categoria';
-$lang['mu_browse']             = 'Sfoglia';
-$lang['mu_toobig']             = 'troppo grande';
-$lang['mu_ready']              = 'pronto per caricare';
-$lang['mu_done']               = 'completo';
-$lang['mu_fail']               = 'fallito';
-$lang['mu_authfail']           = 'sessione scaduta';
-$lang['mu_progress']           = '@PCT@% caricato';
-$lang['mu_filetypes']          = 'Tipi di file permessi';
-$lang['mu_info']               = 'file caricati.';
-$lang['mu_lasterr']            = 'Ultimo errore:';
 $lang['recent_global']         = 'Stai attualmente vedendo le modifiche effettuate nell\'area <b>%s</b>. Puoi anche <a href="%s">vedere le modifiche recenti dell\'intero wiki</a>.';
 $lang['years']                 = '%d anni fa';
 $lang['months']                = '%d mesi fa';
diff --git a/inc/lang/ja/index.txt b/inc/lang/ja/index.txt
index b5fbac97d..b0447899d 100644
--- a/inc/lang/ja/index.txt
+++ b/inc/lang/ja/index.txt
@@ -1,4 +1,4 @@
-====== 索引 ======
+====== サイトマップ ======
 
 [[doku>namespaces|名前空間]] に基づく、全ての文書の索引です。
 
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 1eeb6bb73..94fa71f1b 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -29,7 +29,7 @@ $lang['btn_revs']              = '以前のリビジョン';
 $lang['btn_recent']            = '最近の変更';
 $lang['btn_upload']            = 'アップロード';
 $lang['btn_cancel']            = 'キャンセル';
-$lang['btn_index']             = '索引';
+$lang['btn_index']             = 'サイトマップ';
 $lang['btn_secedit']           = '編集';
 $lang['btn_login']             = 'ログイン';
 $lang['btn_logout']            = 'ログアウト';
@@ -42,12 +42,13 @@ $lang['btn_backtomedia']       = 'メディアファイル選択に戻る';
 $lang['btn_subscribe']         = '変更履歴配信の登録';
 $lang['btn_profile']           = 'ユーザー情報の更新';
 $lang['btn_reset']             = 'リセット';
-$lang['btn_resendpwd']         = 'パスワード再発行';
 $lang['btn_draft']             = 'ドラフトを編集';
 $lang['btn_recover']           = 'ドラフトを復元';
 $lang['btn_draftdel']          = 'ドラフトを削除';
 $lang['btn_revert']            = '元に戻す';
 $lang['btn_register']          = 'ユーザー登録';
+$lang['btn_apply']             = '適用';
+$lang['btn_media']             = 'メディアマネージャー';
 $lang['loggedinas']            = 'ようこそ';
 $lang['user']                  = 'ユーザー名';
 $lang['pass']                  = 'パスワード';
@@ -77,7 +78,6 @@ $lang['profnoempty']           = 'ユーザー名とメールアドレスを入�
 $lang['profchanged']           = 'ユーザー情報は更新されました。';
 $lang['pwdforget']             = 'パスワードをお忘れですか？パスワード再発行';
 $lang['resendna']              = 'パスワードの再発行は出来ません。';
-$lang['resendpwd']             = '新しいパスワードを送信します：';
 $lang['resendpwdmissing']      = '全ての項目を入力して下さい。';
 $lang['resendpwdnouser']       = '入力されたユーザーが見つかりませんでした。';
 $lang['resendpwdbadauth']      = '申し訳ありません。この確認コードは有効ではありません。メール内に記載されたリンクを確認してください。';
@@ -92,7 +92,7 @@ $lang['txt_filename']          = '名前を変更してアップロード（オ�
 $lang['txt_overwrt']           = '既存のファイルを上書き';
 $lang['lockedby']              = 'この文書は次のユーザによってロックされています';
 $lang['lockexpire']            = 'ロック期限：';
-$lang['js']['willexpire']            = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
+$lang['js']['willexpire']      = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
 $lang['js']['notsavedyet']     = '変更は保存されません。このまま処理を続けてよろしいですか？';
 $lang['js']['searchmedia']     = 'ファイル検索';
 $lang['js']['keepopen']        = '選択中はウィンドウを閉じない';
@@ -123,9 +123,20 @@ $lang['js']['nosmblinks']      = 'ウィンドウズの共有フォルダへリ�
 $lang['js']['linkwiz']         = 'リンクウィザード';
 $lang['js']['linkto']          = 'リンク先：';
 $lang['js']['del_confirm']     = '選択した項目を本当に削除しますか？';
+$lang['js']['restore_confirm'] = '本当にこのバージョンを復元しますか?';
+$lang['js']['media_diff']      = '差分の表示方法:';
+$lang['js']['media_diff_both'] = '並べて表示';
+$lang['js']['media_diff_opacity'] = '重ねて透過表示';
+$lang['js']['media_diff_portions'] = '重ねて切替表示';
+$lang['js']['media_select']    = 'ファイルを選択...';
+$lang['js']['media_upload_btn'] = 'アップロード';
+$lang['js']['media_done_btn']  = '完了';
+$lang['js']['media_drop']      = 'ここにファイルをドロップするとアップロードします';
+$lang['js']['media_cancel']    = '削除';
+$lang['js']['media_overwrt']   = '既存のファイルを上書きする';
 $lang['rssfailed']             = 'RSSの取得に失敗しました：';
 $lang['nothingfound']          = '該当文書はありませんでした。';
-$lang['mediaselect']           = 'メディアファイルを選択';
+$lang['mediaselect']           = 'メディアファイル';
 $lang['fileupload']            = 'メディアファイルをアップロード';
 $lang['uploadsucc']            = 'アップロード完了';
 $lang['uploadfail']            = 'アップロードに失敗しました。権限がありません。';
@@ -177,6 +188,10 @@ $lang['mail_changed']          = '文書の変更：';
 $lang['mail_subscribe_list']   = '名前空間内でページが変更：';
 $lang['mail_new_user']         = '新規ユーザー：';
 $lang['mail_upload']           = 'ファイルのアップロード：';
+$lang['changes_type']          = '表示する変更のタイプ:';
+$lang['pages_changes']         = 'ページの変更';
+$lang['media_changes']         = 'メディアファイルの変更';
+$lang['both_changes']          = 'ページとメディアファイルの変更';
 $lang['qb_bold']               = '太字';
 $lang['qb_italic']             = '斜体';
 $lang['qb_underl']             = '下線';
@@ -217,6 +232,9 @@ $lang['img_copyr']             = '著作権';
 $lang['img_format']            = 'フォーマット';
 $lang['img_camera']            = '使用カメラ';
 $lang['img_keywords']          = 'キーワード';
+$lang['img_width']             = '幅';
+$lang['img_height']            = '高さ';
+$lang['img_manager']           = 'メディアマネージャーで閲覧';
 $lang['subscr_subscribe_success'] = '%sが%sの購読リストに登録されました。';
 $lang['subscr_subscribe_error'] = '%sを%sの購読リストへの追加に失敗しました。';
 $lang['subscr_subscribe_noaddress'] = 'あなたのログインに対応するアドレスがないため、購読リストへ追加することができません。';
@@ -259,21 +277,6 @@ $lang['i_pol1']                = 'パブリック Wiki（閲覧は全ての人�
 $lang['i_pol2']                = 'クローズド Wiki (登録ユーザーにのみ使用を許可)';
 $lang['i_retry']               = '再試行';
 $lang['i_license']             = 'あなたが作成したコンテンツが属するライセンスを選択してください：';
-$lang['mu_intro']              = '複数のファイルを一度にアップロードできます。ブラウズボタンをクリックしてファイルを追加してください。追加したら、アップロードボタンをクリックしてください。';
-$lang['mu_gridname']           = 'ファイル名';
-$lang['mu_gridsize']           = 'サイズ';
-$lang['mu_gridstat']           = 'ステータス';
-$lang['mu_namespace']          = '名前空間';
-$lang['mu_browse']             = 'ブラウズ';
-$lang['mu_toobig']             = '大きすぎます';
-$lang['mu_ready']              = 'アップロードできます';
-$lang['mu_done']               = '完了';
-$lang['mu_fail']               = '失敗';
-$lang['mu_authfail']           = 'セッション期限切れ';
-$lang['mu_progress']           = '@PCT@% アップロード完了';
-$lang['mu_filetypes']          = '使用できるファイル形式';
-$lang['mu_info']               = 'ファイルアップロード完了';
-$lang['mu_lasterr']            = '直近のエラー：';
 $lang['recent_global']         = '現在、<b>%s</b> 名前空間内の変更点を閲覧中です。<a href="%s">Wiki全体の最近の変更点を確認する</a>ことも可能です。';
 $lang['years']                 = '%d年前';
 $lang['months']                = '%dカ月前';
@@ -283,3 +286,27 @@ $lang['hours']                 = '%d時間前';
 $lang['minutes']               = '%d分前';
 $lang['seconds']               = '%d秒前';
 $lang['wordblock']             = 'スパムと認識されるテキストが含まれているため、変更は保存されませんでした。';
+$lang['media_uploadtab']       = 'アップロード';
+$lang['media_searchtab']       = '検索';
+$lang['media_file']            = 'ファイル';
+$lang['media_viewtab']         = '詳細';
+$lang['media_edittab']         = '編集';
+$lang['media_historytab']      = '履歴';
+$lang['media_list_thumbs']     = 'サムネイル';
+$lang['media_list_rows']       = '行';
+$lang['media_sort_name']       = '名前';
+$lang['media_sort_date']       = '日付';
+$lang['media_namespaces']      = '名前空間を選択';
+$lang['media_files']           = '%s 内のファイル';
+$lang['media_upload']          = '%s にアップロード';
+$lang['media_search']          = '%s 内で検索';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s at %s';
+$lang['media_edit']            = '%s を編集';
+$lang['media_history']         = '%s の履歴';
+$lang['media_meta_edited']     = 'メタデータが編集されました';
+$lang['media_perm_read']       = 'ファイルを閲覧する権限がありません。';
+$lang['media_perm_upload']     = 'ファイルをアップロードする権限がありません。';
+$lang['media_update']          = '新しいバージョンをアップロード';
+$lang['media_restore']         = 'このバージョンを復元';
+$lang['plugin_install_err']    = 'プラグインが正しくインストールされませんでした。プラグインのディレクトリ名を \'%s\' から \'%s\' に変更してください。';
diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php
index 9738ae51c..3ff5ae455 100644
--- a/inc/lang/kk/lang.php
+++ b/inc/lang/kk/lang.php
@@ -38,7 +38,6 @@ $lang['btn_backtomedia']       = 'Медиафайлды таңдауға қай
 $lang['btn_subscribe']         = 'Жазылуларды басқару';
 $lang['btn_profile']           = 'Профильді жаңарту';
 $lang['btn_reset']             = 'Түсіру';
-$lang['btn_resendpwd']         = 'Жаңа құпиясөзді жіберу';
 $lang['btn_draft']             = 'Шимайды өңдеу';
 $lang['btn_recover']           = 'Шимайды қайтару';
 $lang['btn_draftdel']          = 'Шимайды өшіру';
@@ -73,7 +72,6 @@ $lang['profnoempty']           = 'Бос есім не email рұқсат еті
 $lang['profchanged']           = 'Пайдаланушы профилі сәтті жаңартылған.';
 $lang['pwdforget']             = 'Құпиясөзіңізді ұмыттыңызба? Жаңадан біреуін алыңыз';
 $lang['resendna']              = 'Бұл wiki құпиясөзді қайта жіберуді қолдамайды.';
-$lang['resendpwd']             = 'Келесіге жаңа құпиясөзді жіберу ';
 $lang['resendpwdmissing']      = 'Кешіріңіз, барлық тармақтары толтыруыңыз керек.';
 $lang['resendpwdnouser']       = 'Кешіріңіз, бұл пайдаланушыны дерекқорымызда тапқан жоқпыз.';
 $lang['resendpwdbadauth']      = 'Кешіріңіз, бұл түпнұсқалық коды бұрыс. Толық растау сілтемені пайдалануыңызды тексеріңіз.';
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 68587e90f..6a5fa223f 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -39,7 +39,6 @@ $lang['btn_subscribe']   = 'ដាក់ដំណឹងផ្លស់ប្ត�
 $lang['btn_unsubscribe'] = 'ដកដំណឹងផ្លស់ប្តូរ';
 $lang['btn_profile']     = 'កែប្រវត្តិរូប';
 $lang['btn_reset']       = 'កមណត់ឡើងរិញ';
-$lang['btn_resendpwd']   = 'ផ្ញើពាក្សសម្ងាត់';
 $lang['btn_draft']    = 'កែគំរោង';
 $lang['btn_recover']  = 'ស្រោះគំរោងឡើង';
 $lang['btn_draftdel'] = 'លុបគំរោង';
@@ -76,7 +75,6 @@ $lang['profchanged']  = 'ប្រវត្តិរូបអ្នកប្រ�
 
 $lang['pwdforget'] = 'ភ្លិចពាក្សសម្ងាត់ យកមួយទាត។';
 $lang['resendna']  = 'វីគីនេះមិនឧបរំផ្ញើពាក្សសម្ងាតម្ដងទៀតទេ។';
-$lang['resendpwd'] = 'ផ្ញើពាក្សសម្ងាតឲ្យ';
 $lang['resendpwdmissing'] = 'សុំអាទោស អ្នកត្រវបំពេញវាល។';
 $lang['resendpwdnouser']  = 'សុំអាទោស យាងរកអ្នកប្រើមិនឃើងទេ។';
 $lang['resendpwdbadauth'] = 'សុំអាទោស រហស្សលេខអនុញ្ញាតពំអាចប្រើបានទេ។ ខ្សែបន្ត';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 91825c797..9be5df4b7 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -8,6 +8,7 @@
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -43,13 +44,14 @@ $lang['btn_backtomedia']       = '미디어 파일 선택으로 돌아가기';
 $lang['btn_subscribe']         = '구독 신청';
 $lang['btn_profile']           = '개인정보 변경';
 $lang['btn_reset']             = '초기화';
-$lang['btn_resendpwd']         = '새 패스워드 보내기';
 $lang['btn_draft']             = '문서초안 편집';
 $lang['btn_recover']           = '문서초안 복구';
 $lang['btn_draftdel']          = '문서초안 삭제';
 $lang['btn_revert']            = '복원';
 $lang['btn_register']          = '등록';
-$lang['loggedinas']            = '다음 사용자로 로그인';
+$lang['btn_apply']             = '적용';
+$lang['btn_media']             = '미디어 관리';
+$lang['loggedinas']            = '다른 사용자로 로그인';
 $lang['user']                  = '사용자';
 $lang['pass']                  = '패스워드';
 $lang['newpass']               = '새로운 패스워드';
@@ -78,7 +80,6 @@ $lang['profnoempty']           = '이름이나 이메일 주소가 비었습니�
 $lang['profchanged']           = '개인정보 변경이 성공했습니다.';
 $lang['pwdforget']             = '패스워드를 잊어버린 경우 새로 발급받을 수 있습니다.';
 $lang['resendna']              = '이 위키는 패스워드 재발급을 지원하지 않습니다.';
-$lang['resendpwd']             = '새로운 패스워드를 보냅니다.';
 $lang['resendpwdmissing']      = '새로운 패스워드를 입력해야햡니다.';
 $lang['resendpwdnouser']       = '등록된 사용자가 아닙니다. 다시 확인 바랍니다.';
 $lang['resendpwdbadauth']      = '인증 코드가 틀립니다. 잘못된 링크인지 확인 바랍니다.';
@@ -93,7 +94,7 @@ $lang['txt_filename']          = '업로드 파일 이름을 입력합니다.(�
 $lang['txt_overwrt']           = '새로운 파일로 이전 파일을 교체합니다.';
 $lang['lockedby']              = '현재 잠금 사용자';
 $lang['lockexpire']            = '잠금 해제 시간';
-$lang['js']['willexpire']            = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.';
+$lang['js']['willexpire']      = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.';
 $lang['js']['notsavedyet']     = '저장하지 않은 변경은 지워집니다.
 계속하시겠습니까?';
 $lang['js']['searchmedia']     = '파일 찾기';
@@ -125,6 +126,17 @@ $lang['js']['nosmblinks']      = '윈도우 공유 파일과의 연결은 MS 인
 $lang['js']['linkwiz']         = '링크 마법사';
 $lang['js']['linkto']          = '다음으로 연결:';
 $lang['js']['del_confirm']     = '정말로 선택된 항목(들)을 삭제하시겠습니까?';
+$lang['js']['restore_confirm'] = '정말 이 버전으로 되돌리시겠습니까?';
+$lang['js']['media_diff']      = '차이점 보기 :';
+$lang['js']['media_diff_both'] = '나란히 보기';
+$lang['js']['media_diff_opacity'] = '겹쳐 보기';
+$lang['js']['media_diff_portions'] = '쪼개 보기';
+$lang['js']['media_select']    = '파일 선택';
+$lang['js']['media_upload_btn'] = '업로드';
+$lang['js']['media_done_btn']  = '완료';
+$lang['js']['media_drop']      = '업로드할 파일을 끌어넣으세요';
+$lang['js']['media_cancel']    = '삭제';
+$lang['js']['media_overwrt']   = '이미있는 파일 덮어쓰기';
 $lang['rssfailed']             = 'feed 가져오기 실패: ';
 $lang['nothingfound']          = '아무 것도 없습니다.';
 $lang['mediaselect']           = '미디어 파일 선택';
@@ -174,11 +186,20 @@ $lang['external_edit']         = '외부 편집기';
 $lang['summary']               = '편집 요약';
 $lang['noflash']               = '이 컨텐츠를 표시하기 위해서 <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>이 필요합니다.';
 $lang['download']              = '조각 다운로드';
+$lang['tools']                 = '도구';
+$lang['user_tools']            = '사용자 도구';
+$lang['site_tools']            = '사이트 도구';
+$lang['page_tools']            = '페이지 도구';
+$lang['skip_to_content']       = '컨텐츠 넘기기';
 $lang['mail_newpage']          = '페이지 추가:';
 $lang['mail_changed']          = '페이지 변경:';
 $lang['mail_subscribe_list']   = '네임스페이스에서 변경된 페이지:';
 $lang['mail_new_user']         = '새로운 사용자:';
 $lang['mail_upload']           = '파일 첨부:';
+$lang['changes_type']          = '차이점 보기';
+$lang['pages_changes']         = '페이지';
+$lang['media_changes']         = '미디어 파일';
+$lang['both_changes']          = '미디어 파일과 페이지 양쪽';
 $lang['qb_bold']               = '굵은 글';
 $lang['qb_italic']             = '이탤릭체 글';
 $lang['qb_underl']             = '밑줄 그어진 글';
@@ -219,6 +240,9 @@ $lang['img_copyr']             = '저작권';
 $lang['img_format']            = '포맷';
 $lang['img_camera']            = '카메라';
 $lang['img_keywords']          = '키워드';
+$lang['img_width']             = '너비';
+$lang['img_height']            = '높이';
+$lang['img_manager']           = '미디어 관리자에서 보기';
 $lang['subscr_subscribe_success'] = '%s을(를) 구독목록 %s에 추가하였습니다';
 $lang['subscr_subscribe_error'] = '%s을(를) 구독목록 %s에 추가하는데 실패했습니다';
 $lang['subscr_subscribe_noaddress'] = '등록된 주소가 없기 때문에 구독목록에 등록되지 않았습니다';
@@ -262,21 +286,6 @@ $lang['i_pol1']                = '공개형 위키 (누구나 읽을 수 있지�
 $lang['i_pol2']                = '폐쇄형 위키 (등록된 사용자만 읽기/쓰기/업로드가 가능합니다.)';
 $lang['i_retry']               = '다시 시도';
 $lang['i_license']             = '내용의 배포를 위한 라이센스를 선택하세요.';
-$lang['mu_intro']              = '여러 파일을 한번에 업로드할 수 있습니다. 파일 목록에 추가하려면 "찾기" 버튼을 클릭합니다. 파일 목록 추가 작업이 끝나면 "업로드" 버튼을 클릭하기 바랍니다. ';
-$lang['mu_gridname']           = '파일명';
-$lang['mu_gridsize']           = '크기';
-$lang['mu_gridstat']           = '상태';
-$lang['mu_namespace']          = '네임스페이스';
-$lang['mu_browse']             = '찾기';
-$lang['mu_toobig']             = '업로드 가능 크기를 초과했습니다.';
-$lang['mu_ready']              = '업로드가 가능합니다.';
-$lang['mu_done']               = '업로드가 완료되었습니다.';
-$lang['mu_fail']               = '업로드가 실패했습니다.';
-$lang['mu_authfail']           = '세션 기간이 종료되었습니다.';
-$lang['mu_progress']           = '@PCT@% 업로드되었습니다.';
-$lang['mu_filetypes']          = '허용된 파일타입';
-$lang['mu_info']               = '업로드 되었습니다.';
-$lang['mu_lasterr']            = '마지막 에러:';
 $lang['recent_global']         = '<b>%s</b> 네임스페이스를 구독중입니다. <a href="%s">전체위키 변경사항 </a>도 보실수 있습니다.';
 $lang['years']                 = '%d 년 전';
 $lang['months']                = '%d 개월 전';
@@ -286,3 +295,27 @@ $lang['hours']                 = '%d 시간 전';
 $lang['minutes']               = '%d 분 전';
 $lang['seconds']               = '%d 초 전';
 $lang['wordblock']             = '스팸 문구를 포함하고 있어서 저장되지 않았습니다.';
+$lang['media_uploadtab']       = '업로드';
+$lang['media_searchtab']       = '검색';
+$lang['media_file']            = '파일';
+$lang['media_viewtab']         = '보기';
+$lang['media_edittab']         = '수정';
+$lang['media_historytab']      = '변경사항';
+$lang['media_list_thumbs']     = '썸네일';
+$lang['media_list_rows']       = '목록';
+$lang['media_sort_name']       = '이름';
+$lang['media_sort_date']       = '날짜';
+$lang['media_namespaces']      = '네임스페이스 선택';
+$lang['media_files']           = '%s 의 파일';
+$lang['media_upload']          = '%s 에 업로드';
+$lang['media_search']          = '%s 를 검색';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s 의 %s';
+$lang['media_edit']            = '%s 수정';
+$lang['media_history']         = '%s 변경사항';
+$lang['media_meta_edited']     = '메타데이터 수정됨';
+$lang['media_perm_read']       = '죄송합니다, 이 파일을 읽을 권한이 없습니다.';
+$lang['media_perm_upload']     = '죄송합니다. 파일을 업로드할 권한이 없습니다.';
+$lang['media_update']          = '새 버전 올리기';
+$lang['media_restore']         = '이 버전으로 되돌리기';
+$lang['plugin_install_err']    = '플러그인 설치가 비정상적으로 이뤄졌습니다. 플러그인 디렉토리 \'%s\'를 \'%s\'로 변경하십시오.';
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index e8d79a997..3970f453a 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -44,7 +44,6 @@ $lang['btn_backtomedia']       = 'Ad media redire';
 $lang['btn_subscribe']         = 'Custodire';
 $lang['btn_profile']           = 'Tabellam nouare';
 $lang['btn_reset']             = 'Abrogare';
-$lang['btn_resendpwd']         = 'Tesseram nouam cursu interretiali petere';
 $lang['btn_draft']             = 'Propositum recensere';
 $lang['btn_recover']           = 'Propositum reficere';
 $lang['btn_draftdel']          = 'Propositum delere';
@@ -79,7 +78,6 @@ $lang['profnoempty']           = 'Omnes campi complendi sunt.';
 $lang['profchanged']           = 'Tabella Sodalis feliciter nouatur';
 $lang['pwdforget']             = 'Tesseram amisistine? Nouam petere';
 $lang['resendna']              = 'Tesseram non mutare potest.';
-$lang['resendpwd']             = 'Tesseram mitte';
 $lang['resendpwdmissing']      = 'Omnes campi complendi sunt.';
 $lang['resendpwdnouser']       = 'In tabellis Sodalium nomen non inuentum est.';
 $lang['resendpwdbadauth']      = 'Tesseram non legitima est.';
@@ -256,21 +254,6 @@ $lang['i_pol1']                = 'Publicus uicis (omnes legere, Sodales scribere
 $lang['i_pol2']                = 'Clausus uicis (Soli Sodales legere scribere et onerare poccunt)';
 $lang['i_retry']               = 'Rursum temptas';
 $lang['i_license']             = 'Elige facultatem sub qua tuus uicis est:';
-$lang['mu_intro']              = 'Plura documenta uno tempore onerare potes.';
-$lang['mu_gridname']           = 'Documenti nomen';
-$lang['mu_gridsize']           = 'Pondus';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Genus';
-$lang['mu_browse']             = 'Euoluere';
-$lang['mu_toobig']             = 'Ponderosius';
-$lang['mu_ready']              = 'Aptus ad onerandum';
-$lang['mu_done']               = 'Perfectum';
-$lang['mu_fail']               = 'Error';
-$lang['mu_authfail']           = 'Sessio exit';
-$lang['mu_progress']           = '@PCT@% oneratum';
-$lang['mu_filetypes']          = 'Genera documenti apta facere';
-$lang['mu_info']               = 'Documenta onerare';
-$lang['mu_lasterr']            = 'Extremus error:';
 $lang['recent_global']         = 'Mutatione in hoc genere uides. Recentiores mutationes quoque uidere <a href="%s">potes</a>';
 $lang['years']                 = 'ab annis %d';
 $lang['months']                = 'a mensibus %d';
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index 00692f48e..e6409b7ff 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -37,7 +37,6 @@ $lang['btn_backlink']          = 'Linker zeréck';
 $lang['btn_backtomedia']       = 'Zeréck bei d\'Auswiel vun de Mediadateien';
 $lang['btn_profile']           = 'Profil aktualiséieren';
 $lang['btn_reset']             = 'Zerécksetzen';
-$lang['btn_resendpwd']         = 'Nei Passwuert schécken';
 $lang['btn_draft']             = 'Entworf änneren';
 $lang['btn_recover']           = 'Entworf zeréckhuelen';
 $lang['btn_draftdel']          = 'Entworf läschen';
@@ -71,7 +70,6 @@ $lang['profnoempty']           = 'En eidele Numm oder Emailadress ass net erlaab
 $lang['profchanged']           = 'Benotzerprofil erfollegräicht aktualiséiert.';
 $lang['pwdforget']             = 'Passwuert vergiess? Fro der e Neit';
 $lang['resendna']              = 'Dëse Wiki ënnerstëtzt net d\'Neiverschécke vu Passwieder.';
-$lang['resendpwd']             = 'Nei Passwuert schécke fir';
 $lang['resendpwdmissing']      = 'Du muss all Felder ausfëllen.';
 $lang['resendpwdnouser']       = 'Kann dëse Benotzer net an der Datebank fannen.';
 $lang['resendpwdbadauth']      = 'Den "Auth"-Code ass ongëlteg. Kuck no obs de dee ganze Konfirmationslink benotzt hues.';
@@ -189,21 +187,6 @@ $lang['i_pol0']                = 'Oppene Wiki (liese, schreiwen an eroplueden fi
 $lang['i_pol1']                = 'Ëffentleche Wiki (liesen fir jidfereen, schreiwen an eroplueden fir registréiert Benotzer)';
 $lang['i_pol2']                = 'Zouene Wiki (liesen, schreiwen, eroplueden nëmme fir registréiert Benotzer)';
 $lang['i_retry']               = 'Nach eng Kéier probéieren';
-$lang['mu_intro']              = 'Hei kanns de méi Dateie mateneen eroplueden. Klick op den Duerchsiche-Knäppchen fir se an d\'Schlaang ze setzen. Dréck op Eroplueden wanns de fäerdeg bass.';
-$lang['mu_gridname']           = 'Dateinumm';
-$lang['mu_gridsize']           = 'Gréisst';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namespace';
-$lang['mu_browse']             = 'Duerchsichen';
-$lang['mu_toobig']             = 'ze grouss';
-$lang['mu_ready']              = 'prett fir eropzelueden';
-$lang['mu_done']               = 'fäerdeg';
-$lang['mu_fail']               = 'feelgeschloen';
-$lang['mu_authfail']           = 'Sessioun ofgelaf';
-$lang['mu_progress']           = '@PCT@% eropgelueden';
-$lang['mu_filetypes']          = 'Erlaabten Dateitypen';
-$lang['mu_info']               = 'Dateien eropgelueden.';
-$lang['mu_lasterr']            = 'Leschte Feeler:';
 $lang['recent_global']         = 'Du kucks am Moment d\'Ännerungen innerhalb vum <b>%s</b> Namespace. Du kanns och <a href="%s">d\'Kierzilech Ännerungen vum ganze Wiki kucken</a>.';
 $lang['years']                 = 'virun %d Joer';
 $lang['months']                = 'virun %d Méint';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index d14a0695a..13ff8c305 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -43,7 +43,6 @@ $lang['btn_subscribe']         = 'Užsisakyti keitimų prenumeratą';
 $lang['btn_unsubscribe']       = 'Atsisakyti keitimų prenumeratos';
 $lang['btn_profile']           = 'Atnaujinti profilį';
 $lang['btn_reset']             = 'Atstata';
-$lang['btn_resendpwd']         = 'Išsiųsti naują slaptažodį';
 $lang['btn_draft']             = 'Redaguoti juodraštį';
 $lang['btn_recover']           = 'Atkurti juodraštį';
 $lang['btn_draftdel']          = 'Šalinti juodraštį';
@@ -77,7 +76,6 @@ $lang['profnoempty']           = 'Tuščias vardo arba el. pašto adreso laukas
 $lang['profchanged']           = 'Vartotojo profilis sėkmingai atnaujintas.';
 $lang['pwdforget']             = 'Pamiršote slaptažodį? Gaukite naują';
 $lang['resendna']              = 'Ši vikisvetainė neleidžia persiųsti slaptažodžių.';
-$lang['resendpwd']             = 'Atsiųsti naują slaptažodį';
 $lang['resendpwdmissing']      = 'Jūs turite užpildyti visus laukus.';
 $lang['resendpwdnouser']       = 'Tokio vartotojo nėra duomenų bazėje.';
 $lang['resendpwdbadauth']      = 'Atsiprašome, bet šis tapatybės nustatymo kodas netinkamas. Įsitikinkite, kad panaudojote pilną patvirtinimo nuorodą.';
@@ -190,14 +188,3 @@ $lang['i_wikiname']            = 'Wiki vardas';
 $lang['i_enableacl']           = 'Įjungti ACL (rekomenduojama)';
 $lang['i_superuser']           = 'Supervartotojas';
 $lang['i_problems']            = 'Instaliavimo metu buvo klaidų, kurios pateiktos žemiau. Tęsti negalima, kol nebus pašalintos priežastys.';
-$lang['mu_gridname']           = 'Failo vardas';
-$lang['mu_gridsize']           = 'Dydis';
-$lang['mu_gridstat']           = 'Statusas';
-$lang['mu_namespace']          = 'Vardų sritis';
-$lang['mu_browse']             = 'Browse';
-$lang['mu_toobig']             = 'perdidelis';
-$lang['mu_ready']              = 'paruošta įkrovimui';
-$lang['mu_done']               = 'užbaigta';
-$lang['mu_fail']               = 'nepavyko';
-$lang['mu_authfail']           = 'sesija nutraukta';
-$lang['mu_filetypes']          = 'Leidžiami failų tipai';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index 926341393..b02e7f471 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -39,7 +39,6 @@ $lang['btn_backtomedia']       = 'Atpakaļ uz mēdiju failu izvēli';
 $lang['btn_subscribe']         = 'Abonēt izmaiņu paziņojumus';
 $lang['btn_profile']           = 'Labot savu profilu';
 $lang['btn_reset']             = 'Atsaukt izmaiņas';
-$lang['btn_resendpwd']         = 'Nosūtīt jaunu paroli';
 $lang['btn_draft']             = 'Labot melnrakstu';
 $lang['btn_recover']           = 'Atjaunot melnrakstu';
 $lang['btn_draftdel']          = 'Dzēst melnrakstu';
@@ -76,7 +75,6 @@ $lang['profnoempty']           = 'Bez vārda vai e-pasta adreses nevar.';
 $lang['profchanged']           = 'Profils veiksmīgi izlabots.';
 $lang['pwdforget']             = 'Aizmirsi paroli? Saņem jaunu';
 $lang['resendna']              = 'Paroļu izsūtīšanu nepiedāvāju.';
-$lang['resendpwd']             = 'Nosūtīt jaunu paroli lietotājam';
 $lang['resendpwdmissing']      = 'Atvaino, jāizpilda visas ailes.';
 $lang['resendpwdnouser']       = 'Atvaino, tāda lietotāja nav.';
 $lang['resendpwdbadauth']      = 'Atvaino, šis autorizācijas kods nav derīgs. Pārliecinies, ka lietoji pilnu apstiprināšanas adresi.';
@@ -123,7 +121,6 @@ Protams, ka vari saiti kopēt un iespraust citā programmā.';
 $lang['js']['linkwiz']         = 'Saišu vednis';
 $lang['js']['linkto']          = 'Saite uz: ';
 $lang['js']['del_confirm']     = 'Dzēst šo šķirkli?';
-$lang['js']['mu_btn']          = 'Augšuplādēt uzreiz vairākus failus.';
 $lang['js']['restore_confirm'] = 'Tiešām atjaunot šo versiju';
 $lang['js']['media_diff']      = 'Skatīt atšķirību';
 $lang['js']['media_diff_both'] = 'Blakus';
@@ -248,9 +245,9 @@ $lang['subscr_m_unsubscribe']  = 'Atteikties no abonēšanas';
 $lang['subscr_m_subscribe']    = 'Abonēt';
 $lang['subscr_m_receive']      = 'Saņemt';
 $lang['subscr_style_every']    = 'vēstuli par katru izmaiņu';
-$lang['subscr_style_digest']   = 'kopsavilkumu par katru lapu';
-$lang['subscr_style_list']     = 'kopš pēdējās vēstules notikušo labojumu sarakstu';
-$lang['authmodfailed']         = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzo ziņo Wiki administratoram.';
+$lang['subscr_style_digest']   = 'kopsavilkumu par katru lapu (reizi %.2f dienās)';
+$lang['subscr_style_list']     = 'kopš pēdējās vēstules notikušo labojumu sarakstu (reizi %.2f dienās)';
+$lang['authmodfailed']         = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzu ziņo Wiki administratoram.';
 $lang['authtempfail']          = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.';
 $lang['i_chooselang']          = 'Izvēlies valodu';
 $lang['i_installer']           = 'DokuWiki instalētājs';
@@ -275,26 +272,11 @@ $lang['i_pol1']                = 'Publisks Wiki (lasa ikviens, raksta un augšup
 $lang['i_pol2']                = 'Slēgts Wiki (raksta, lasa un augšupielādē tikai reģistrēti lietotāji)';
 $lang['i_retry']               = 'Atkārtot';
 $lang['i_license']             = 'Ar kādu licenci saturs tiks publicēts:';
-$lang['mu_intro']              = 'Šeit var augšupielādēt uzreiz vairāku failus. Uzklikšķini Pārlūkot pogai, lai tos ieliktu rindā. Nospied Augšupielādēt, kad rinda sastādīta.';
-$lang['mu_gridname']           = 'Faila vārds';
-$lang['mu_gridsize']           = 'Izmērs';
-$lang['mu_gridstat']           = 'Statuss';
-$lang['mu_namespace']          = 'Nodaļa';
-$lang['mu_browse']             = 'Pārlūkot';
-$lang['mu_toobig']             = 'par lielu';
-$lang['mu_ready']              = 'gatavs augšupielādei';
-$lang['mu_done']               = 'pabeigts';
-$lang['mu_fail']               = 'neizdevās';
-$lang['mu_authfail']           = 'sesijas laiks iztecējis';
-$lang['mu_progress']           = '@PCT@% augšupielādēts';
-$lang['mu_filetypes']          = 'Atļautie failu tipi';
-$lang['mu_info']               = 'faili ir augšupielādēti.';
-$lang['mu_lasterr']            = 'Pēdējā ķļūda.';
 $lang['recent_global']         = 'Tu skati izmaiņas nodaļā <b>%s</b>. Ir iespējams <a href="%s">skatīt jaunākos grozījums visā viki</a>. ';
 $lang['years']                 = 'pirms %d gadiem';
 $lang['months']                = 'pirms %d mēnešiem';
 $lang['weeks']                 = 'pirms %d nedēļām';
-$lang['days']                  = 'pirms %d dienām';
+$lang['days']                  = 'pirms %d  dienām';
 $lang['hours']                 = 'pirms %d stundām';
 $lang['minutes']               = 'pirms %d minūtēm';
 $lang['seconds']               = 'pirms %d sekundēm';
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
index ca4a746cd..62400063c 100644
--- a/inc/lang/mk/lang.php
+++ b/inc/lang/mk/lang.php
@@ -42,7 +42,6 @@ $lang['btn_backtomedia']       = 'Назад до изборот за медиа
 $lang['btn_subscribe']         = 'Менаџирај претплати';
 $lang['btn_profile']           = 'Ажурирај профил';
 $lang['btn_reset']             = 'Ресет';
-$lang['btn_resendpwd']         = 'Испрати нов пасворд';
 $lang['btn_draft']             = 'Уреди скица';
 $lang['btn_recover']           = 'Поврати скица';
 $lang['btn_draftdel']          = 'Избриши скица';
@@ -77,7 +76,6 @@ $lang['profnoempty']           = 'Празно име или адреса за �
 $lang['profchanged']           = 'Корисничкиот профил е успешно ажуриран.';
 $lang['pwdforget']             = 'Ја заборавивте лозинката? Добијте нова';
 $lang['resendna']              = 'Ова вики не поддржува повторно испраќање на лозинка.';
-$lang['resendpwd']             = 'Испрати нова лозинка за';
 $lang['resendpwdmissing']      = 'Жалам, морате да ги пополните сите полиња.';
 $lang['resendpwdnouser']       = 'Жалам, таков корисник не постои во нашата база со податоци.';
 $lang['resendpwdbadauth']      = 'Жалам, овај код за валидација не е валиден. Проверете повторно дали ја искористивте целосната врска за потврда.';
@@ -223,20 +221,6 @@ $lang['i_pol0']                = 'Отвори вики (читај, запиш�
 $lang['i_pol1']                = 'Јавно вики (читај за сите, запиши и качи за регистрирани корисници)';
 $lang['i_pol2']                = 'Затворено вики (читај, запиши, качи само за регистрирани корисници)';
 $lang['i_retry']               = 'Пробај повторно';
-$lang['mu_intro']              = 'Овде можете да прикачите повеќе датотеки од еднаш. Кликнете на копчето за пребарување за да ги додадете во редица. Притиснете на качи кога е готово.';
-$lang['mu_gridname']           = 'Име на датотека';
-$lang['mu_gridsize']           = 'Големина';
-$lang['mu_gridstat']           = 'Состојба';
-$lang['mu_browse']             = 'Пребарај';
-$lang['mu_toobig']             = 'премногу голема';
-$lang['mu_ready']              = 'спремна за качување';
-$lang['mu_done']               = 'комплетно';
-$lang['mu_fail']               = 'неуспешно';
-$lang['mu_authfail']           = 'сесијата истече';
-$lang['mu_progress']           = '@PCT@% качено';
-$lang['mu_filetypes']          = 'Дозволено типови на датотеки';
-$lang['mu_info']               = 'качени датотеки.';
-$lang['mu_lasterr']            = 'Последна грешка: ';
 $lang['years']                 = 'пред %d години';
 $lang['months']                = 'пред %d месеци';
 $lang['weeks']                 = 'пред %d недели';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index 63fda3e5a..96323394d 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -47,7 +47,6 @@ $lang['btn_subscribe']         = 'पृष्ठाच्या बदलां
 $lang['btn_unsubscribe']       = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा';
 $lang['btn_profile']           = 'प्रोफाइल अद्ययावत करा';
 $lang['btn_reset']             = 'रिसेट';
-$lang['btn_resendpwd']         = 'कृपया परवलीचा नवीन शब्द माझ्या इमेल पत्त्यावर पाठविणे.';
 $lang['btn_draft']             = 'प्रत संपादन';
 $lang['btn_recover']           = 'प्रत परत मिळवा';
 $lang['btn_draftdel']          = 'प्रत रद्द';
@@ -82,7 +81,6 @@ $lang['profchanged']           = 'सदस्याची प्रोफाइ
 $lang['pwdforget']             = 'परवलीचा शब्द विसरला आहे का? नविन मागवा.';
 $lang['resendna']              = 'ह्या विकी मधे परवलीचा शब्द परत पाथाव्न्याची सुविधा नाही.';
 $lang['resendpwd']             = 'नविन परवली इच्छुक';
-$lang['resendpwdmissing']      = 'कृपया सर्व रकाने भरा.';
 $lang['resendpwdnouser']       = 'माफ़ करा, हा सदस्य आमच्या माहितिसंग्रहात सापडला नाही.';
 $lang['resendpwdbadauth']      = 'माफ़ करा, हा अधिकार कोड बरोबर नाही. कृपया आपण पूर्ण शिकामोर्तबाची लिंक वापरल्याची खात्री करा.';
 $lang['resendpwdconfirm']      = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.';
@@ -209,17 +207,4 @@ $lang['i_pol0']                = 'मुक्त विकी ( सर्वा
 $lang['i_pol1']                = 'सार्वजनिक विकी ( सर्वांना वाचण्याची मुभा , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना )';
 $lang['i_pol2']                = 'बंदिस्त विकी ( वाचन , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना ) ';
 $lang['i_retry']               = 'पुन्हा प्रयत्न';
-$lang['mu_intro']              = 'इथे तुम्ही एकापेक्षा अधिक फाइल अपलोड करू शकता. ब्राउझ च्या बटणावर क्लिक करून त्याना लिस्ट मधे टाका. सगळ्या टाकुन झाल्यावर अपलोड च्या बटणावर क्लिक करा.';
-$lang['mu_gridname']           = 'फाइल नाम';
-$lang['mu_gridsize']           = 'साइज';
-$lang['mu_gridstat']           = 'स्थिति';
-$lang['mu_namespace']          = 'नेमस्पेस';
-$lang['mu_browse']             = 'ब्राउझ';
-$lang['mu_toobig']             = 'अति मोठे';
-$lang['mu_ready']              = 'अपलोडसाठी तयार';
-$lang['mu_done']               = 'पूर्ण';
-$lang['mu_fail']               = 'अयशस्वी';
-$lang['mu_authfail']           = 'सेशन संपला';
-$lang['mu_progress']           = '@PCT@% अपलोड झाले';
-$lang['mu_filetypes']          = 'मान्य फाइल टाइप';
 $lang['recent_global']         = 'तुम्ही सध्या <b>%s</b> या नेमस्पेस मधील बदल पाहात आहात.तुम्ही <a href="%s">पूर्ण विकी मधले बदल </a> सुद्धा पाहू शकता.';
diff --git a/inc/lang/ms/lang.php b/inc/lang/ms/lang.php
new file mode 100644
index 000000000..92dc86b5a
--- /dev/null
+++ b/inc/lang/ms/lang.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * ms language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesMs.php?view=co
+ * @author Markos
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Sunting halaman ini';
+$lang['btn_source']            = 'Lihat sumber';
+$lang['btn_show']              = 'Baca';
+$lang['btn_create']            = 'Cipta halaman';
+$lang['btn_search']            = 'Cari';
+$lang['btn_save']              = 'Simpan';
+$lang['btn_preview']           = 'Pratonton';
+$lang['btn_top']               = 'Balik ke mula';
+$lang['btn_newer']             = '<< lebih kini';
+$lang['btn_older']             = 'lebih awal >>';
+$lang['btn_revs']              = 'Sejarah';
+$lang['btn_recent']            = 'Perubahan Terkini';
+$lang['btn_upload']            = 'Unggah (upload)';
+$lang['btn_cancel']            = 'Batal';
+$lang['btn_secedit']           = 'Sunting';
+$lang['btn_login']             = 'Masuk';
+$lang['btn_logout']            = 'Keluar';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Kemaskini';
+$lang['btn_delete']            = 'Hapus';
+$lang['btn_back']              = 'Balik';
+$lang['btn_backlink']          = 'Pautan ke halaman ini';
+$lang['btn_backtomedia']       = 'Balik ke rangkaian pilihan fail media';
+$lang['btn_subscribe']         = 'Pantau';
+$lang['btn_profile']           = 'Kemaskinikan profil';
+$lang['btn_reset']             = 'Batalkan suntingan';
+$lang['btn_resendpwd']         = 'Emel kata laluan baru';
+$lang['btn_draft']             = 'Sunting draf';
+$lang['btn_recover']           = 'Pulihkan draf';
+$lang['btn_draftdel']          = 'Hapuskan draf';
+$lang['btn_revert']            = 'Pulihkan';
+$lang['btn_register']          = 'Daftaran';
+$lang['btn_apply']             = 'Simpan';
+$lang['btn_media']             = 'Manager media';
+$lang['loggedinas']            = 'Log masuk sebagai';
+$lang['user']                  = 'Nama pengguna';
+$lang['pass']                  = 'Kata laluan';
+$lang['newpass']               = 'Kata laluan baru';
+$lang['oldpass']               = 'Kata laluan lama';
+$lang['passchk']               = 'sekali lagi';
+$lang['remember']              = 'Sentiasa ingati kata laluan saya.';
+$lang['fullname']              = 'Nama sebenar';
+$lang['email']                 = 'E-mel';
+$lang['profile']               = 'Profil pengguna';
+$lang['badlogin']              = 'Maaf, ralat log masuk. Nama pengguna atau kata laluan salah.';
+$lang['minoredit']             = 'Suntingan Kecil';
+$lang['draftdate']             = 'Draf automatik disimpan pada';
+$lang['nosecedit']             = 'Halaman ini telah bertukar pada waktu sementara dan info bahagian ini telah luput. Seluruh halaman telah disarat.';
+$lang['regmissing']            = 'Maaf, semua medan mesti diisi';
+$lang['reguexists']            = 'Maaf, nama pengguna yang dimasukkan telah diguna. Sila pilih nama yang lain.';
+$lang['regsuccess']            = 'Akaun pengguna telah dicipta dan kata laluan telah dikirim kepada e-mel anda.';
+$lang['regsuccess2']           = 'Akaun pegguna telah dicipta.';
+$lang['regbadmail']            = 'Format alamat e-mel tidak sah. Sila masukkan semula ataupun kosongkan sahaja medan tersebut.';
+$lang['regbadpass']            = 'Kedua-dua kata laluan tidak sama. Sila masukkan semula.';
+$lang['regpwmail']             = 'Kata laluan Dokuwiki anda';
+$lang['reghere']               = 'Belum mendaftar akaun? Dapat akaun baru';
+$lang['profna']                = 'Wiki ini tidak menyokong modifikasi profil';
+$lang['profnoempty']           = 'Medan nama pengguna atau e-mel yang kosong tidak dibenarkan.';
+$lang['profchanged']           = 'Profil pengguna telah dikemaskini.';
+$lang['pwdforget']             = 'Terlupa kata laluan? Dapatkan yang baru';
+$lang['resendpwd']             = 'Kirimkan kata laluan baru untuk';
+$lang['resendpwdmissing']      = 'Maaf, semua medan perlu diisi.';
+$lang['resendpwdnouser']       = 'Maaf, nama pengguna ini tidak dapat dicari dalam database kami.';
+$lang['resendpwdbadauth']      = 'Maaf, kod authorasi ini tidak sah. Semak bahawa anda telah menggunakan seluruh pautan pengesahan yang dikirim.';
+$lang['resendpwdconfirm']      = 'Pautan pengesahan telah dikirimkan ke e-mel anda.';
+$lang['resendpwdsuccess']      = 'Kata laluan baru telah dikirimkan ke e-mel anda.';
+$lang['license']               = 'Selain daripada yang dinyata, isi wiki ini disediakan dengan lesen berikut:';
+$lang['licenseok']             = 'Perhatian: Dengan menyunting halaman ini, anda setuju untuk isi-isi anda dilesen menggunakan lesen berikut:';
+$lang['searchmedia']           = 'Cari nama fail:';
+$lang['searchmedia_in']        = 'Cari di %s';
+$lang['txt_upload']            = 'Pilih fail untuk diunggah';
+$lang['txt_filename']          = 'Unggah fail dengan nama (tidak wajib)';
+$lang['txt_overwrt']           = 'Timpa fail sekarang';
+$lang['lockedby']              = 'Halaman ini telah di';
+$lang['fileupload']            = 'Muat naik fail';
+$lang['uploadsucc']            = 'Pemuatan naik berjaya';
+$lang['uploadfail']            = 'Ralat muat naik';
+$lang['uploadxss']             = 'Fail ini mengandungi kod HTML atau kod skrip yang mungkin boleh disalah tafsir oleh pelayar web.';
+$lang['toc']                   = 'Jadual Kandungan';
+$lang['current']               = 'kini';
+$lang['restored']              = 'Telah dikembalikan ke semakan sebelumnya';
+$lang['summary']               = 'Paparan';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 97e2dde5c..82ca389f7 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -40,7 +40,6 @@ $lang['btn_subscribe']         = 'पृष्ठ परिवर्तन ग�
 $lang['btn_unsubscribe']       = 'पृष्ठ परिवर्तन अग्राह्य गर्नुहोस्';
 $lang['btn_profile']           = 'प्रोफाइल अध्यावधिक गर्नुहोस् ';
 $lang['btn_reset']             = 'पूर्वरुपमा फर्काउनुहोस';
-$lang['btn_resendpwd']         = 'नयाँ प्रवेश शव्द(पासवर्ड) पठाउनुहोस् ';
 $lang['btn_draft']             = ' ड्राफ्ट सम्पादन गर्नुहोस् ';
 $lang['btn_recover']           = 'पहिलेको ड्राफ्ट हासिल गर्नुहोस ';
 $lang['btn_draftdel']          = ' ड्राफ्ट मेटाउनुहोस् ';
@@ -75,7 +74,6 @@ $lang['profchanged']           = 'प्रयोगकर्ताको प्
 $lang['pwdforget']             = 'आफ्नो पासवर्ड भुल्नु भयो ? नयाँ हासिल गर्नुहोस् ';
 $lang['resendna']              = 'यो विकिबाट प्रवेशशव्द पठाउन समर्थित छैन ।';
 $lang['resendpwd']             = 'नयाँ  प्रवेशशव्द पठाउनुहोस् ';
-$lang['resendpwdmissing']      = 'माफ गर्नुहोस् , तपाईले सबै ठाउ भर्नुपर्छ। ';
 $lang['resendpwdnouser']       = 'माफ गर्नुहोस्,  हाम्रो डेटावेसमा यो प्रयोगकर्ता भेटिएन ।';
 $lang['resendpwdbadauth']      = 'माफ गर्नुहोस् , यो अनुमति चिन्ह गलत छ। तपाईले पूरै जानकारी लिङ्क प्रयोग गर्नु पर्नेछ। ';
 $lang['resendpwdconfirm']      = 'तपाईको इमेलमा कन्फरमेशन लिङ्क पठाइएको छ। ';
@@ -200,17 +198,4 @@ $lang['i_pol0']                = 'खुल्ला विकि (पठन, �
 $lang['i_pol1']                = 'Public विकि (पठन सवैका लागि,लेखन र अपलोड दर्ता गरिएका प्रयपगकर्ताका लागि ) ';
 $lang['i_pol2']                = 'बन्द विकि (पठन , लेखन, अपलोड ) दर्ता भएका प्रयोगकर्ताका लागि मात्र ।';
 $lang['i_retry']               = 'पुन: प्रयास गर्नुहोस् ';
-$lang['mu_intro']              = 'तपाईले धेरै वटा फाइलहरु एकै पटक अपलोड गर्न सक्नुहुन्छ । browse थिच्नुहोस् अनि सुचीमा थप्नुहोस् । सकिएपछि अपलोड थिछ्चुहोस् ।';
-$lang['mu_gridname']           = 'फाइलनाम ';
-$lang['mu_gridsize']           = 'आकार';
-$lang['mu_gridstat']           = 'स्थिति';
-$lang['mu_namespace']          = 'नेमस्पेस';
-$lang['mu_browse']             = 'Browse';
-$lang['mu_toobig']             = 'धेरै ठूलो';
-$lang['mu_ready']              = 'अपलोडको लागि तयार';
-$lang['mu_done']               = 'पूरा';
-$lang['mu_fail']               = 'असफल';
-$lang['mu_authfail']           = 'सत्र सकियो ';
-$lang['mu_progress']           = '@PCT@% अपलोड भयो ';
-$lang['mu_filetypes']          = 'समर्थित फाइल प्रकार';
 $lang['recent_global']         = 'तपाई अहिले <b>%s</b> नेमस्पेस भित्र भएका परिवर्तन हेर्दैहुनुहुन्छ। तपाई <a href="%s">पुरै विकिमा भएको परिवर्तन हेर्न सक्नुहुन्छ</a>.';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 62d23b0d2..4644f5e5d 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -15,6 +15,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -50,7 +51,6 @@ $lang['btn_backtomedia']       = 'Terug naar Bestandsselectie';
 $lang['btn_subscribe']         = 'Inschrijven wijzigingen';
 $lang['btn_profile']           = 'Profiel aanpassen';
 $lang['btn_reset']             = 'Wissen';
-$lang['btn_resendpwd']         = 'Stuur een nieuw wachtwoord';
 $lang['btn_draft']             = 'Bewerk concept';
 $lang['btn_recover']           = 'Herstel concept';
 $lang['btn_draftdel']          = 'Verwijder concept';
@@ -87,7 +87,6 @@ $lang['profnoempty']           = 'Een lege gebruikersnaam of e-mailadres is niet
 $lang['profchanged']           = 'Gebruikersprofiel succesvol aangepast';
 $lang['pwdforget']             = 'Je wachtwoord vergeten? Vraag een nieuw wachtwoord aan';
 $lang['resendna']              = 'Deze wiki ondersteunt het verzenden van wachtwoorden niet';
-$lang['resendpwd']             = 'Stuur een nieuw wachtwoord voor';
 $lang['resendpwdmissing']      = 'Sorry, je moet alle velden invullen.';
 $lang['resendpwdnouser']       = 'Sorry, we kunnen deze gebruikersnaam niet vinden in onze database.';
 $lang['resendpwdbadauth']      = 'Sorry, deze authentiecatiecode is niet geldig. Controleer of je de volledige bevestigings-link hebt gebruikt.';
@@ -138,8 +137,11 @@ $lang['js']['restore_confirm'] = 'Werkelijk deze versie terugzetten?';
 $lang['js']['media_diff']      = 'Verschillen bekijken:';
 $lang['js']['media_diff_both'] = 'Naast elkaar';
 $lang['js']['media_diff_opacity'] = 'Doorschijnend';
+$lang['js']['media_diff_portions'] = 'Swipe';
 $lang['js']['media_select']    = 'Selecteer bestanden';
+$lang['js']['media_upload_btn'] = 'Uploaden';
 $lang['js']['media_done_btn']  = 'Klaar';
+$lang['js']['media_drop']      = 'Sleep bestanden hierheen om ze te uploaden';
 $lang['js']['media_cancel']    = 'Verwijderen';
 $lang['js']['media_overwrt']   = 'Bestaande bestanden overschrijven';
 $lang['rssfailed']             = 'Er is een fout opgetreden bij het ophalen van de feed: ';
@@ -196,6 +198,7 @@ $lang['mail_changed']          = 'pagina aangepast:';
 $lang['mail_subscribe_list']   = 'Pagina\'s veranderd in namespace:';
 $lang['mail_new_user']         = 'nieuwe gebruiker:';
 $lang['mail_upload']           = 'bestand geüpload:';
+$lang['changes_type']          = 'Bekijk wijzigingen van';
 $lang['pages_changes']         = 'Pagina\'s';
 $lang['media_changes']         = 'Media bestanden';
 $lang['both_changes']          = 'Zowel pagina\'s als media bestanden';
@@ -282,21 +285,6 @@ $lang['i_pol1']                = 'Publieke wiki (lezen voor iedereen, schrijven
 $lang['i_pol2']                = 'Besloten wiki (lezen, schrijven en uploaden alleen voor geregistreerde gebruikers)';
 $lang['i_retry']               = 'Opnieuw';
 $lang['i_license']             = 'Kies a.u.b. een licentie die u voor uw inhoud wilt gebruiken:';
-$lang['mu_intro']              = 'Hiier kun je meerdere bestanden tegelijk uploaden. Klik de blader-knop om ze aan de lijst toe te voegen. Klik Upload als je klaar bent.';
-$lang['mu_gridname']           = 'Bestandsnaam';
-$lang['mu_gridsize']           = 'Grootte';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namespace';
-$lang['mu_browse']             = 'Blader';
-$lang['mu_toobig']             = 'te groot';
-$lang['mu_ready']              = 'Klaar om te uploaden';
-$lang['mu_done']               = 'klaar';
-$lang['mu_fail']               = 'mislukt';
-$lang['mu_authfail']           = 'sessie beëindigd';
-$lang['mu_progress']           = '@PCT@% geüpload';
-$lang['mu_filetypes']          = 'Toegestane bestandstypes';
-$lang['mu_info']               = 'bestanden geüpload.';
-$lang['mu_lasterr']            = 'Laatste foutmelding:';
 $lang['recent_global']         = 'Je bekijkt momenteel de wijzigingen binnen de <b>%s</b> namespace. Je kunt ook de <a href="%s">recente wijzigingen van de hele wiki</a> bekijken.';
 $lang['years']                 = '%d jaar geleden';
 $lang['months']                = '%d maand geleden';
@@ -306,22 +294,27 @@ $lang['hours']                 = '%d uren geleden';
 $lang['minutes']               = '%d minuten geleden';
 $lang['seconds']               = '%d seconden geleden';
 $lang['wordblock']             = 'Uw wijziging is niet opgeslagen omdat deze niet-toegestane tekst bevat (spam).';
+$lang['media_uploadtab']       = 'Uploaden';
 $lang['media_searchtab']       = 'Zoeken';
 $lang['media_file']            = 'Bestand';
 $lang['media_viewtab']         = 'Beeld';
 $lang['media_edittab']         = 'Bewerken';
 $lang['media_historytab']      = 'Geschiedenis';
+$lang['media_list_thumbs']     = 'Miniatuurweergaven';
 $lang['media_list_rows']       = 'Regels';
 $lang['media_sort_name']       = 'Naam';
 $lang['media_sort_date']       = 'Datum';
 $lang['media_namespaces']      = 'Kies naamruimte';
 $lang['media_files']           = 'Bestanden in %s';
+$lang['media_upload']          = 'Upload naar %s';
 $lang['media_search']          = 'Zoeken in %s';
 $lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s bij %s';
 $lang['media_edit']            = '%s bewerken';
 $lang['media_history']         = 'Geschiedenis van %s';
 $lang['media_meta_edited']     = 'Metagegevens bewerkt';
 $lang['media_perm_read']       = 'Sorry, u heeft niet voldoende rechten om bestanden te lezen.';
 $lang['media_perm_upload']     = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.';
+$lang['media_update']          = 'Upload nieuwe versie';
 $lang['media_restore']         = 'Deze versie terugzetten';
 $lang['plugin_install_err']    = 'Plugin is juist geinstalleerd. Hernoem plugin map \'%s\' naar \'%s\'.';
diff --git a/inc/lang/no/admin.txt b/inc/lang/no/admin.txt
index 99289a18b..765177fb3 100644
--- a/inc/lang/no/admin.txt
+++ b/inc/lang/no/admin.txt
@@ -1,3 +1,3 @@
 ====== Administrasjon ======
 
-Nedenfor finner du en liste over administrative oppgaver tilgjengelig i DokuWiki.
+Nedenfor finner du en liste over administrative oppgaver i DokuWiki.
diff --git a/inc/lang/no/adminplugins.txt b/inc/lang/no/adminplugins.txt
index 091ae4d7e..df78672d7 100644
--- a/inc/lang/no/adminplugins.txt
+++ b/inc/lang/no/adminplugins.txt
@@ -1 +1 @@
-====== Ekstra tillegg ======
-\ No newline at end of file
+====== Ekstra programtillegg ======
+\ No newline at end of file
diff --git a/inc/lang/no/conflict.txt b/inc/lang/no/conflict.txt
index 855034685..49961d0df 100644
--- a/inc/lang/no/conflict.txt
+++ b/inc/lang/no/conflict.txt
@@ -1,6 +1,6 @@
 ====== Det finnes en nyere versjon ======
 
-Det fins en nyere versjon av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg.
+Det fins en nyere utgave av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg.
 
 Legg nøye merke til forskjellene som vises under, og velg deretter hvilken versjon du vil beholde. Om du velger ''**Lagre**'', så kommer din versjon til å lagres. Velg ''**Avbryt**'' for å beholde den nyeste versjonen (ikke din).
 
diff --git a/inc/lang/no/denied.txt b/inc/lang/no/denied.txt
index 4f8c9a188..6e7f1f28b 100644
--- a/inc/lang/no/denied.txt
+++ b/inc/lang/no/denied.txt
@@ -1,3 +1,3 @@
 ====== Adgang forbudt ======
 
-Adgang forbudt. Kanskje du har glemt å logge deg inn?
+Beklager, men du har ikke rettigheter til dette. Kanskje du har glemt å logge inn?
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 88d21b536..97ef741ef 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -17,6 +17,7 @@
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -26,7 +27,7 @@ $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '\'';
 $lang['btn_edit']              = 'Rediger denne siden';
-$lang['btn_source']            = 'Vis kildetekst';
+$lang['btn_source']            = 'Vis kildekode';
 $lang['btn_show']              = 'Vis siden';
 $lang['btn_create']            = 'Lag denne siden';
 $lang['btn_search']            = 'Søk';
@@ -49,10 +50,9 @@ $lang['btn_delete']            = 'Slett';
 $lang['btn_back']              = 'Tilbake';
 $lang['btn_backlink']          = 'Tilbakelenker';
 $lang['btn_backtomedia']       = 'Tilbake til valg av mediafil';
-$lang['btn_subscribe']         = 'Abonner på endringer';
+$lang['btn_subscribe']         = 'Abonnér på endringer';
 $lang['btn_profile']           = 'Oppdater profil';
 $lang['btn_reset']             = 'Tilbakestill';
-$lang['btn_resendpwd']         = 'Send nytt passord';
 $lang['btn_draft']             = 'Rediger kladd';
 $lang['btn_recover']           = 'Gjennvinn kladd';
 $lang['btn_draftdel']          = 'Slett kladd';
@@ -86,28 +86,27 @@ $lang['reghere']               = 'Har du ikke en konto ennå? Lag deg en';
 $lang['profna']                = 'Denne wikien støtter ikke profilendringer';
 $lang['profnochange']          = 'Ingen endringer, ingenting å gjøre.';
 $lang['profnoempty']           = 'Tomt navn- eller e-postfelt er ikke tillatt.';
-$lang['profchanged']           = 'Brukerprofil ble vellykket oppdatert.';
-$lang['pwdforget']             = 'Glemt ditt passord? Få deg et nytt';
-$lang['resendna']              = 'Denne wikien støtter ikke nyutsending.';
-$lang['resendpwd']             = 'Send nytt passord for';
+$lang['profchanged']           = 'Brukerprofilen ble vellykket oppdatert.';
+$lang['pwdforget']             = 'Glemt passordet ditt? Få deg et nytt';
+$lang['resendna']              = 'Denne wikien støtter ikke nyutsending av passord.';
 $lang['resendpwdmissing']      = 'Beklager, du må fylle inn alle felt.';
 $lang['resendpwdnouser']       = 'Beklager, vi kan ikke finne denne brukeren i vår database.';
 $lang['resendpwdbadauth']      = 'Beklager, denne autorisasjonskoden er ikke gyldig. Sjekk at du brukte hele bekreftelseslenken.';
 $lang['resendpwdconfirm']      = 'En bekreftelseslenke er blitt sendt på e-post.';
 $lang['resendpwdsuccess']      = 'Ditt nye passord er blitt sendt på e-post.';
-$lang['license']               = 'Der annet ikke er særskilt beskrevet, er innholdet på denne wiki regulert av følgende lisens:';
-$lang['licenseok']             = 'Merk: Ved å endre på denne siden godtar du at ditt innhold blir regulert av følgende lisens:';
+$lang['license']               = 'Der annet ikke er angitt, er innholdet på denne wiki utgitt under følgende lisens:';
+$lang['licenseok']             = 'Merk: Ved å endre på denne siden godtar du at ditt innhold utgis under følgende lisens:';
 $lang['searchmedia']           = 'Søk filnavn';
 $lang['searchmedia_in']        = 'Søk i %s';
 $lang['txt_upload']            = 'Velg fil som skal lastes opp';
 $lang['txt_filename']          = 'Skriv inn wikinavn (alternativt)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
-$lang['lockedby']              = 'Stengt av';
-$lang['lockexpire']            = 'Avstengningen opphører';
-$lang['js']['willexpire']      = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
-$lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt.
+$lang['lockedby']              = 'Låst av';
+$lang['lockexpire']            = 'Låsingen utløper';
+$lang['js']['willexpire']      = 'Din redigeringslås for dette dokumentet kommer snart til å utløpe.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
+$lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt!
 Vil du fortsette?';
-$lang['js']['searchmedia']     = 'Søk for filer';
+$lang['js']['searchmedia']     = 'Søk etter filer';
 $lang['js']['keepopen']        = 'Hold vindu åpent ved valg';
 $lang['js']['hidedetails']     = 'Skjul detaljer';
 $lang['js']['mediatitle']      = 'Lenkeinnstillinger';
@@ -117,16 +116,16 @@ $lang['js']['mediasize']       = 'Bildestørrelse';
 $lang['js']['mediatarget']     = 'Lenkemål';
 $lang['js']['mediaclose']      = 'Lukk';
 $lang['js']['mediainsert']     = 'Sett inn';
-$lang['js']['mediadisplayimg'] = 'Vis bilde';
-$lang['js']['mediadisplaylnk'] = 'Vis bare lenken';
+$lang['js']['mediadisplayimg'] = 'Vis bilde.';
+$lang['js']['mediadisplaylnk'] = 'Vis bare lenken.';
 $lang['js']['mediasmall']      = 'Liten versjon';
 $lang['js']['mediamedium']     = 'Medium versjon';
 $lang['js']['medialarge']      = 'Stor versjon';
 $lang['js']['mediaoriginal']   = 'Original versjon';
-$lang['js']['medialnk']        = 'Lenke til detaljeside';
+$lang['js']['medialnk']        = 'Lenke til detaljside';
 $lang['js']['mediadirect']     = 'Direktelenke til original';
 $lang['js']['medianolnk']      = 'Ingen lenke';
-$lang['js']['medianolink']     = 'Ikke lenk bilde';
+$lang['js']['medianolink']     = 'Ikke lenk bildet';
 $lang['js']['medialeft']       = 'Venstrejuster bilde';
 $lang['js']['mediaright']      = 'Høyrejuster bilde';
 $lang['js']['mediacenter']     = 'Midtstill bilde';
@@ -165,13 +164,13 @@ $lang['mediainuse']            = 'Filen "%s" har ikke biltt slettet - den er for
 $lang['namespaces']            = 'Navnerom';
 $lang['mediafiles']            = 'Tilgjengelige filer i';
 $lang['accessdenied']          = 'Du har ikke tilgang til å se denne siden';
-$lang['mediausage']            = 'Bruk følgende syntaks til å refferer til denne filen:';
+$lang['mediausage']            = 'Bruk følgende syntaks til å referere til denne filen:';
 $lang['mediaview']             = 'Vis original fil';
 $lang['mediaroot']             = 'rot';
 $lang['mediaupload']           = 'Last opp en fil til gjeldende navnerom her. For å opprette undernavnerom, før dem opp før filnavn i "Last opp som" adskilt med kolon.';
 $lang['mediaextchange']        = 'Filendelse endret fra .%s til .%s!';
 $lang['reference']             = 'Referanser for';
-$lang['ref_inuse']             = 'Denne filen kan ikke slettes fordi den er fortsatt i bruk av følgende sider:';
+$lang['ref_inuse']             = 'Denne filen kan ikke slettes fordi den er fortsatt i bruk på følgende sider:';
 $lang['ref_hidden']            = 'Noen referanser er på sider du ikke har tilgang til å lese';
 $lang['hits']                  = 'Treff';
 $lang['quickhits']             = 'Matchende wikinavn';
@@ -187,7 +186,7 @@ $lang['diff_side']             = 'Side ved side';
 $lang['line']                  = 'Linje';
 $lang['breadcrumb']            = 'Spor';
 $lang['youarehere']            = 'Du er her';
-$lang['lastmod']               = 'Sist modifisert';
+$lang['lastmod']               = 'Sist endret';
 $lang['by']                    = 'av';
 $lang['deleted']               = 'fjernet';
 $lang['created']               = 'opprettet';
@@ -258,15 +257,15 @@ $lang['subscr_not_subscribed'] = '%s abonnerer ikke på %s';
 $lang['subscr_m_not_subscribed'] = 'Du abonnerer ikke på denne sida eller dette navnerommet';
 $lang['subscr_m_new_header']   = 'Legg til abonnement';
 $lang['subscr_m_current_header'] = 'Gjeldende abonnementer';
-$lang['subscr_m_unsubscribe']  = 'Avmeld';
-$lang['subscr_m_subscribe']    = 'Påmeld';
+$lang['subscr_m_unsubscribe']  = 'Stoppe abonnement';
+$lang['subscr_m_subscribe']    = 'Abonnere på';
 $lang['subscr_m_receive']      = 'Motta';
 $lang['subscr_style_every']    = 'e-post for alle endringer';
 $lang['subscr_style_digest']   = 'e-post med sammendrag av endringer for hver side (%.2f dager mellom hver)';
 $lang['subscr_style_list']     = 'liste med sider som er endra siden forrige e-post (%.2f dager mellom hver)';
 $lang['authmodfailed']         = 'Feilkonfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.';
 $lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
-$lang['i_chooselang']          = 'Velg ditt språk';
+$lang['i_chooselang']          = 'Velg språk';
 $lang['i_installer']           = 'DokuWiki-installasjon';
 $lang['i_wikiname']            = 'Wikinavn';
 $lang['i_enableacl']           = 'Aktiver ACL (anbefalt)';
@@ -276,7 +275,7 @@ $lang['i_modified']            = 'For sikkerhets skyld vil dette skriptet bare v
                          Du bør enten pakke ut filene på nytt fra den nedlastede pakken, eller konsultere den komplette
                          <a href="http://dokuwiki.org/install">Dokuwiki-installasjonsinstruksen</a>';
 $lang['i_funcna']              = 'PHP-funksjonen <code>%s</code> er ikke tilgjengelig. Kanskje din leverandør har deaktivert den av noen grunn?';
-$lang['i_phpver']              = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
+$lang['i_phpver']              = 'Din PHP versjon <code>%s</code> er lavere enn kravet <code>%s</code>. Du må oppgradere PHP installasjonen. ';
 $lang['i_permfail']            = '<code>%s</code> er ikke skrivbar for DokuWiki. Du må fikse rettighetene for denne mappen!';
 $lang['i_confexists']          = '<code>%s</code> eksisterer allerede';
 $lang['i_writeerr']            = 'Kunne ikke opprette <code>%s</code>. Du må sjekke mappe-/filrettigheter og opprette filen manuelt.';
@@ -292,21 +291,6 @@ $lang['i_pol1']                = 'Offentlig Wiki (les for alle, skriving og oppl
 $lang['i_pol2']                = 'Lukket Wiki (les, skriv og opplasting bare for registrerte brukere)';
 $lang['i_retry']               = 'Prøv igjen';
 $lang['i_license']             = 'Velg lisens som du vil legge ut innholdet under:';
-$lang['mu_intro']              = 'Her kan du laste opp flere filer samtidig. Klikk på utforsk-knappen for å legge dem til i køen. Klikk på "last opp" når du er ferdig med å velge filene. ';
-$lang['mu_gridname']           = 'Filnavn';
-$lang['mu_gridsize']           = 'Størrelse';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Navnerom (Namespace)';
-$lang['mu_browse']             = 'Utforsk';
-$lang['mu_toobig']             = 'for stor';
-$lang['mu_ready']              = 'klar for opplasting';
-$lang['mu_done']               = 'komplett';
-$lang['mu_fail']               = 'feilet';
-$lang['mu_authfail']           = 'sesjonen har utløpt';
-$lang['mu_progress']           = '@PCT@% lastet opp';
-$lang['mu_filetypes']          = 'Tillatte filtyper';
-$lang['mu_info']               = 'filer lastet opp.';
-$lang['mu_lasterr']            = 'Siste feilen:';
 $lang['recent_global']         = 'Du ser nå på endringene i navnerommet <b>%s</b>. Du kan også<a href="%s">se på nylig foretatte endringer for hele wikien</a>.';
 $lang['years']                 = '%d år siden';
 $lang['months']                = '%d måneder siden';
@@ -333,10 +317,10 @@ $lang['media_search']          = 'Søk i navnerommet <strong>%s</strong>.';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s på %s';
 $lang['media_edit']            = 'Rediger';
-$lang['media_history']         = 'Dette er de tidligere versjonene av fila.';
+$lang['media_history']         = 'Dette er de tidligere versjonene av filen.';
 $lang['media_meta_edited']     = 'metadata er endra';
 $lang['media_perm_read']       = 'Beklager, du har ikke tilgang til å lese filer.';
 $lang['media_perm_upload']     = 'Beklager, du har ikke tilgang til å laste opp filer.';
 $lang['media_update']          = 'Last opp ny versjon';
 $lang['media_restore']         = 'Gjenopprett denne versjonen';
-$lang['plugin_install_err']    = 'Tillegget ble feil installert. Skift navn på mappa \'%s\' til \'%s\'.';
+$lang['plugin_install_err']    = 'Tillegget ble feil installert. Skift navn på mappen \'%s\' til \'%s\'.';
diff --git a/inc/lang/no/newpage.txt b/inc/lang/no/newpage.txt
index f712998d2..86cad00ed 100644
--- a/inc/lang/no/newpage.txt
+++ b/inc/lang/no/newpage.txt
@@ -1,3 +1,3 @@
 ====== Dette emnet har ikke noe innhold ======
 
-Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan skape det gjennom å klikke på ''**Lag denne siden**''.
+Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan opprette det ved å klikke på ''**Lag denne siden**''.
diff --git a/inc/lang/no/pwconfirm.txt b/inc/lang/no/pwconfirm.txt
index 9b8a0ab3e..36163c6e7 100644
--- a/inc/lang/no/pwconfirm.txt
+++ b/inc/lang/no/pwconfirm.txt
@@ -3,7 +3,7 @@ Hei @FULLNAME@!
 Noen har bedt om nytt passord for din @TITLE@ innlogging
 på @DOKUWIKIURL@
 
-Om du ikke bad om nytt passord kan du bare overse denne e-posten.
+Om du ikke ba om nytt passord kan du bare overse denne e-posten.
 
 For å bekrefte at forespørselen virkelig kom fra deg kan du bruke
 følgende lenke:
diff --git a/inc/lang/no/recent.txt b/inc/lang/no/recent.txt
index d9357b1a4..857013c32 100644
--- a/inc/lang/no/recent.txt
+++ b/inc/lang/no/recent.txt
@@ -1,5 +1,5 @@
 ====== Siste nytt ======
 
-Følgende sider/dokumenter har nylig blitt oppdatert.
+Følgende sider har nylig blitt oppdatert.
 
 
diff --git a/inc/lang/no/register.txt b/inc/lang/no/register.txt
index 1ce95c44d..160e47364 100644
--- a/inc/lang/no/register.txt
+++ b/inc/lang/no/register.txt
@@ -1,4 +1,4 @@
 ====== Registrer deg som bruker ======
 
-Angi all informasjon som det blir spurt om nedenfor for å skape en ny brukerkonto for denne wiki. Vær spesielt nøye med å angi en **gyldig e-postadresse** - ditt passord vil bli sendt til den e-postadressen du angir. Brukernavnet må være et gyldig [[doku>pagename|sidenavn]].
+Angi all informasjon som det blir spurt om nedenfor for å lage en ny brukerkonto for denne wikien. Vær spesielt nøye med å angi en **gyldig e-postadresse** - ditt passord vil bli sendt til den e-postadressen du angir. Brukernavnet må være et gyldig [[doku>pagename|sidenavn]].
 
diff --git a/inc/lang/no/showrev.txt b/inc/lang/no/showrev.txt
index 556896437..06514f2bd 100644
--- a/inc/lang/no/showrev.txt
+++ b/inc/lang/no/showrev.txt
@@ -1,2 +1,2 @@
-**Dette er en gammel revisjon av dokumentet!**
+**Dette er en gammel utgave av dokumentet!**
 ----
diff --git a/inc/lang/no/subscr_form.txt b/inc/lang/no/subscr_form.txt
index c3df69e02..f62b25bec 100644
--- a/inc/lang/no/subscr_form.txt
+++ b/inc/lang/no/subscr_form.txt
@@ -1,3 +1,3 @@
 ====== Administrere abonnement ======
 
-Denne sida lar deg administrere abonnementene dine for denne sida og dette navnerommet.
-\ No newline at end of file
+Denne siden lar deg administrere abonnementene dine for denne siden og dette navnerommet.
+\ No newline at end of file
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index a6fc3d52e..3bde240d9 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -12,6 +12,7 @@
  * @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>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -47,12 +48,13 @@ $lang['btn_backtomedia']       = 'Powrót do wyboru pliku';
 $lang['btn_subscribe']         = 'Subskrybuj zmiany';
 $lang['btn_profile']           = 'Aktualizuj profil';
 $lang['btn_reset']             = 'Resetuj';
-$lang['btn_resendpwd']         = 'Prześlij nowe hasło';
 $lang['btn_draft']             = 'Edytuj szkic';
 $lang['btn_recover']           = 'Przywróć szkic';
 $lang['btn_draftdel']          = 'Usuń szkic';
 $lang['btn_revert']            = 'Przywróć';
 $lang['btn_register']          = 'Zarejestruj się!';
+$lang['btn_apply']             = 'Zastosuj';
+$lang['btn_media']             = 'Menadżer multimediów';
 $lang['loggedinas']            = 'Zalogowany jako';
 $lang['user']                  = 'Użytkownik';
 $lang['pass']                  = 'Hasło';
@@ -82,7 +84,6 @@ $lang['profnoempty']           = 'Pusta nazwa lub adres e-mail nie dozwolone.';
 $lang['profchanged']           = 'Zaktualizowano profil użytkownika.';
 $lang['pwdforget']             = 'Nie pamiętasz hasła? Zdobądź nowe!';
 $lang['resendna']              = 'To wiki nie pozwala na powtórne przesyłanie hasła.';
-$lang['resendpwd']             = 'Prześlij nowe hasło dla';
 $lang['resendpwdmissing']      = 'Wypełnij wszystkie pola.';
 $lang['resendpwdnouser']       = 'Nie można znaleźć tego użytkownika w bazie danych.';
 $lang['resendpwdbadauth']      = 'Błędny kod autoryzacji! Upewnij się, że użyłeś(aś) właściwego odnośnika.';
@@ -97,7 +98,7 @@ $lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
 $lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
 $lang['lockedby']              = 'Aktualnie zablokowane przez';
 $lang['lockexpire']            = 'Blokada wygasa';
-$lang['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
+$lang['js']['willexpire']      = 'Twoja blokada edycji tej strony wygaśnie w ciągu minuty. \nW celu uniknięcia konfliktów użyj przycisku podglądu aby odnowić blokadę.';
 $lang['js']['notsavedyet']     = 'Nie zapisane zmiany zostaną utracone.
 Czy na pewno kontynuować?';
 $lang['js']['searchmedia']     = 'Szukaj plików';
@@ -129,6 +130,17 @@ Możesz skopiować odnośnik.';
 $lang['js']['linkwiz']         = 'Tworzenie odnośników';
 $lang['js']['linkto']          = 'Link do';
 $lang['js']['del_confirm']     = 'Czy na pewno usunąć?';
+$lang['js']['restore_confirm'] = 'Naprawdę przywrócić tą wersję?';
+$lang['js']['media_diff']      = 'Pokaż różnice:';
+$lang['js']['media_diff_both'] = 'Obok siebie';
+$lang['js']['media_diff_opacity'] = 'Przezroczystość';
+$lang['js']['media_diff_portions'] = 'Przesunięcie';
+$lang['js']['media_select']    = 'Wybierz pliki...';
+$lang['js']['media_upload_btn'] = 'Przesłanie plików';
+$lang['js']['media_done_btn']  = 'Zrobione';
+$lang['js']['media_drop']      = 'Upuść tutaj pliki do przesłania';
+$lang['js']['media_cancel']    = 'usuń';
+$lang['js']['media_overwrt']   = 'Nadpisz istniejące pliki';
 $lang['rssfailed']             = 'Wystąpił błąd przy pobieraniu tych danych: ';
 $lang['nothingfound']          = 'Nic nie znaleziono.';
 $lang['mediaselect']           = 'Wysyłanie pliku';
@@ -178,11 +190,20 @@ $lang['external_edit']         = 'edycja zewnętrzna';
 $lang['summary']               = 'Opis zmian';
 $lang['noflash']               = 'Plugin <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> jest niezbędny do obejrzenia tej zawartości.';
 $lang['download']              = 'Pobierz zrzut';
+$lang['tools']                 = 'Narzędzia';
+$lang['user_tools']            = 'Narzędzia użytkownika';
+$lang['site_tools']            = 'Narzędzia witryny';
+$lang['page_tools']            = 'Narzędzia strony';
+$lang['skip_to_content']       = 'przejście do zawartości';
 $lang['mail_newpage']          = 'Strona dodana:';
 $lang['mail_changed']          = 'Strona zmieniona:';
 $lang['mail_subscribe_list']   = 'Zmienione strony w katalogu:';
 $lang['mail_new_user']         = 'Nowy użytkownik:';
 $lang['mail_upload']           = 'Umieszczono plik:';
+$lang['changes_type']          = 'Zobacz zmiany';
+$lang['pages_changes']         = 'Strony';
+$lang['media_changes']         = 'Pliki multimediów';
+$lang['both_changes']          = 'Zarówno strony jak i pliki multimediów';
 $lang['qb_bold']               = 'Pogrubienie';
 $lang['qb_italic']             = 'Pochylenie';
 $lang['qb_underl']             = 'Podkreślenie';
@@ -223,6 +244,9 @@ $lang['img_copyr']             = 'Prawa autorskie';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Aparat';
 $lang['img_keywords']          = 'Słowa kluczowe';
+$lang['img_width']             = 'Szerokość';
+$lang['img_height']            = 'Wysokość';
+$lang['img_manager']           = 'Zobacz w menadżerze multimediów';
 $lang['subscr_subscribe_success'] = 'Dodano %s do listy subskrypcji %s';
 $lang['subscr_subscribe_error'] = 'Błąd podczas dodawania %s do listy subskrypcji %s';
 $lang['subscr_subscribe_noaddress'] = 'Brak adresu skojarzonego z twoim loginem, nie możesz zostać dodany(a) do listy subskrypcji';
@@ -264,21 +288,6 @@ $lang['i_pol1']                = 'Publiczne Wiki (odczyt dla wszystkich, zapis i
 $lang['i_pol2']                = 'Zamknięte Wiki (odczyt, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)';
 $lang['i_retry']               = 'Spróbuj ponownie';
 $lang['i_license']             = 'Wybierz licencję, na warunkach której chcesz udostępniać treści:';
-$lang['mu_intro']              = 'Możesz tutaj wysłać wiele plików na raz. Kliknij przycisk "Przeglądaj" aby dodać je do kolejki. Kliknij "Wyślij" gdy skończysz.';
-$lang['mu_gridname']           = 'Nazwa pliku';
-$lang['mu_gridsize']           = 'Rozmiar';
-$lang['mu_gridstat']           = 'Stan';
-$lang['mu_namespace']          = 'Katalog';
-$lang['mu_browse']             = 'Przeglądaj';
-$lang['mu_toobig']             = 'za duży';
-$lang['mu_ready']              = 'gotowy do wysłania';
-$lang['mu_done']               = 'zakończono';
-$lang['mu_fail']               = 'nie powiodło się';
-$lang['mu_authfail']           = 'sesja wygasła';
-$lang['mu_progress']           = '@PCT@% wysłano';
-$lang['mu_filetypes']          = 'Dozwolone typy plików';
-$lang['mu_info']               = 'wysłanych plików.';
-$lang['mu_lasterr']            = 'Ostatni błąd:';
 $lang['recent_global']         = 'W tej chwili przeglądasz zmiany w katalogu <b>%s</b>. Możesz przejrzeć także <a href="%s">zmiany w całym wiki</a>.';
 $lang['years']                 = '%d lat temu';
 $lang['months']                = '%d miesięcy temu';
@@ -288,3 +297,27 @@ $lang['hours']                 = '%d godzin temu';
 $lang['minutes']               = '%d minut temu';
 $lang['seconds']               = '%d sekund temu';
 $lang['wordblock']             = 'Twoje ustawienia nie zostały zapisane ponieważ zawierają niedozwoloną treść (spam).';
+$lang['media_uploadtab']       = 'Przesyłanie plików';
+$lang['media_searchtab']       = 'Szukaj';
+$lang['media_file']            = 'Plik';
+$lang['media_viewtab']         = 'Widok';
+$lang['media_edittab']         = 'Zmiana';
+$lang['media_historytab']      = 'Historia';
+$lang['media_list_thumbs']     = 'Miniatury';
+$lang['media_list_rows']       = 'Wiersze';
+$lang['media_sort_name']       = 'Nazwa';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Wybierz przestrzeń nazw';
+$lang['media_files']           = 'Pliki w %s';
+$lang['media_upload']          = 'Przesyłanie plików na %s';
+$lang['media_search']          = 'Znajdź w %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s na %s';
+$lang['media_edit']            = 'Zmień %s';
+$lang['media_history']         = 'Historia dla %s';
+$lang['media_meta_edited']     = 'zmienione metadane';
+$lang['media_perm_read']       = 'Przepraszamy, nie masz wystarczających uprawnień do odczytu plików.';
+$lang['media_perm_upload']     = 'Przepraszamy, nie masz wystarczających uprawnień do przesyłania plików.';
+$lang['media_update']          = 'Prześlij nową wersję';
+$lang['media_restore']         = 'Odtwórz tą wersję';
+$lang['plugin_install_err']    = 'Wtyczka zainstalowana nieprawidłowo. Zmień nazwę katalogu wtyczki \'%s\' na \'%s\'.';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 373590b76..d6dc8f96b 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -54,7 +54,6 @@ $lang['btn_backtomedia']       = 'Voltar à seleção do arquivo de mídia';
 $lang['btn_subscribe']         = 'Monitorar alterações';
 $lang['btn_profile']           = 'Atualizar o perfil';
 $lang['btn_reset']             = 'Limpar';
-$lang['btn_resendpwd']         = 'Envie-me uma nova senha';
 $lang['btn_draft']             = 'Editar o rascunho';
 $lang['btn_recover']           = 'Recuperar o rascunho';
 $lang['btn_draftdel']          = 'Excluir o rascunho';
@@ -89,7 +88,6 @@ $lang['profnoempty']           = 'Não são permitidos nomes ou endereços de e-
 $lang['profchanged']           = 'O perfil do usuário foi atualizado com sucesso.';
 $lang['pwdforget']             = 'Esqueceu sua senha? Solicite outra';
 $lang['resendna']              = 'Esse wiki não tem suporte para o reenvio de senhas.';
-$lang['resendpwd']             = 'Enviar a nova senha para';
 $lang['resendpwdmissing']      = 'Desculpe, você deve preencher todos os campos.';
 $lang['resendpwdnouser']       = 'Desculpe, não foi possível encontrar esse usuário no nosso banco de dados.';
 $lang['resendpwdbadauth']      = 'Desculpe, esse código de autorização é inválido. Certifique-se de que você usou o link de confirmação inteiro.';
@@ -271,21 +269,6 @@ $lang['i_pol1']                = 'Wiki público (leitura por todos, escrita e en
 $lang['i_pol2']                = 'Wiki fechado (leitura, escrita e envio de arquivos somente por usuários registrados)';
 $lang['i_retry']               = 'Tentar novamente';
 $lang['i_license']             = 'Por favor escolha a licença que voce deseja utilizar para seu conteúdo:';
-$lang['mu_intro']              = 'Aqui você pode enviar vários arquivos de uma só vez. Clique no botão de navegação e adicione-os à fila. Pressione Enviar quando estiver pronto.';
-$lang['mu_gridname']           = 'Nome do arquivo';
-$lang['mu_gridsize']           = 'Tamanho';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Espaço de nomes';
-$lang['mu_browse']             = 'Navegar';
-$lang['mu_toobig']             = 'muito grande';
-$lang['mu_ready']              = 'pronto para enviar';
-$lang['mu_done']               = 'completo';
-$lang['mu_fail']               = 'falhou';
-$lang['mu_authfail']           = 'a sessão expirou';
-$lang['mu_progress']           = '@PCT@% enviado';
-$lang['mu_filetypes']          = 'Tipos de arquivo permitidos';
-$lang['mu_info']               = 'arquivos enviados.';
-$lang['mu_lasterr']            = 'Erro mais recente:';
 $lang['recent_global']         = 'Você está observando as alterações dentro do espaço de nomes <b>%s</b>. Também é possível ver as <a href="%s">modificações recentes no wiki inteiro</a>.';
 $lang['years']                 = '%d anos atrás';
 $lang['months']                = '%d meses atrás';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 2fa8a1ab4..a0b0f57e8 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -45,7 +45,6 @@ $lang['btn_backtomedia']       = 'Voltar à Selecção de Media';
 $lang['btn_subscribe']         = 'Subscrever Alterações';
 $lang['btn_profile']           = 'Actualizar Perfil';
 $lang['btn_reset']             = 'Limpar';
-$lang['btn_resendpwd']         = 'Enviar nova senha';
 $lang['btn_draft']             = 'Editar rascunho';
 $lang['btn_recover']           = 'Recuperar rascunho';
 $lang['btn_draftdel']          = 'Apagar rascunho';
@@ -86,7 +85,6 @@ $lang['profchanged']           = 'Perfil do utilizador actualizado com sucesso.'
 
 $lang['pwdforget']             = 'Esqueceu a sua senha? Pedir nova senha';
 $lang['resendna']              = 'Este wiki não suporta reenvio de senhas.';
-$lang['resendpwd']             = 'Enviar nova senha para';
 $lang['resendpwdmissing']      = 'É preciso preencher todos os campos.';
 $lang['resendpwdnouser']       = 'Não foi possível encontrar este utilizador.';
 $lang['resendpwdbadauth']      = 'O código de autenticação não é válido. Por favor, assegure-se de que o link de confirmação está completo.';
@@ -278,21 +276,6 @@ $lang['i_pol1']                = 'Wiki Público (ler para todos, escrever e carr
 $lang['i_pol2']                = 'Wiki Fechado (ler, escrever e carregar somente para utilizadores inscritos)';
 $lang['i_retry']               = 'Repetir';
 $lang['i_license']             = 'Por favor escolha a licença sob a qual quer colocar o seu conteúdo:';
-$lang['mu_intro']              = 'Aqui podes enviar múltiplos ficheiros de uma vez. Clique no botão de navegação para adicioná-los na fila. Premir upload quando pronto.';
-$lang['mu_gridname']           = 'Nome do ficheiro';
-$lang['mu_gridsize']           = 'Tamanho';
-$lang['mu_gridstat']           = 'Estado';
-$lang['mu_namespace']          = 'Espaço de Nomes';
-$lang['mu_browse']             = 'Navegar';
-$lang['mu_toobig']             = 'demasiado grande';
-$lang['mu_ready']              = 'pronto para upload';
-$lang['mu_done']               = 'completo';
-$lang['mu_fail']               = 'falhou';
-$lang['mu_authfail']           = 'sessão expirada';
-$lang['mu_progress']           = '@PCT@% transferido';
-$lang['mu_filetypes']          = 'Tipos de Ficheiros Permitidos';
-$lang['mu_info']               = 'Ficheiros carregados.';
-$lang['mu_lasterr']            = 'Último erro:';
 $lang['recent_global']         = 'Você está a observar as alterações dentro do espaço de nomes <b>%s</b>. Também é possível ver as <a href="%s">modificações recentes no wiki inteiro</a>.';
 $lang['years']                 = '%d anos atrás';
 $lang['months']                = '%d meses atrás';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 91f8ebb97..21a6ecef4 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -8,6 +8,7 @@
  * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -43,7 +44,6 @@ $lang['btn_backtomedia']       = 'Înapoi la Selecţia Mediafile';
 $lang['btn_subscribe']         = 'Subscrie Modificarea Paginii';
 $lang['btn_profile']           = 'Actualizează Profil';
 $lang['btn_reset']             = 'Resetează';
-$lang['btn_resendpwd']         = 'Trimite parola nouă';
 $lang['btn_draft']             = 'Editează schiţă';
 $lang['btn_recover']           = 'Recuperează schiţă';
 $lang['btn_draftdel']          = 'Şterge schiţă';
@@ -80,7 +80,6 @@ $lang['profnoempty']           = 'Nu sunt admise numele sau adresa de email neco
 $lang['profchanged']           = 'Profilul de utilizator a fost actualizat succes.';
 $lang['pwdforget']             = 'Parola uitată? Luaţi una nouă';
 $lang['resendna']              = 'Această wiki nu suportă retrimiterea parolei.';
-$lang['resendpwd']             = 'Trimite parola nouă pentru';
 $lang['resendpwdmissing']      = 'Ne pare rău, trebuie completate toate câmpurile.';
 $lang['resendpwdnouser']       = 'Ne pare rău, acest utilizator nu poate fi găsit în baza de date.';
 $lang['resendpwdbadauth']      = 'Ne pare rău, acest cod de autorizare nu este corect. Verificaţi dacă aţi folosit tot link-ul de confirmare.';
@@ -280,21 +279,6 @@ $lang['i_pol1']                = 'Wiki Deschisă (citeste oricine, scrie şi în
 $lang['i_pol2']                = 'Wiki Închisă (citeşte, scrie şi încarcă doar utilizatorul înregistrat)';
 $lang['i_retry']               = 'Încearcă din nou';
 $lang['i_license']             = 'Vă rugăm alegeţi licenţa sub care doriţi să vă licenţiaţi materialul:';
-$lang['mu_intro']              = 'Aici poţi încărca mai multe fişiere simultan. Apasă butonul Răsfoieşte pentru a le adăuga. Apasă Încarcă când ai terminat.';
-$lang['mu_gridname']           = 'Numele fişierului';
-$lang['mu_gridsize']           = 'Mărime';
-$lang['mu_gridstat']           = 'Stare';
-$lang['mu_namespace']          = 'Spaţiu de nume';
-$lang['mu_browse']             = 'Răsfoieşte';
-$lang['mu_toobig']             = 'prea mare';
-$lang['mu_ready']              = 'pregătit pentru încărcare';
-$lang['mu_done']               = 'complet';
-$lang['mu_fail']               = 'eşuat';
-$lang['mu_authfail']           = 'sesiunea a expirat';
-$lang['mu_progress']           = '@PCT@% încărcat';
-$lang['mu_filetypes']          = 'Tipuri de fişiere permise';
-$lang['mu_info']               = 'fişiere încărcate';
-$lang['mu_lasterr']            = 'Ultima eroare:';
 $lang['recent_global']         = 'Acum vizualizaţi modificările în interiorul numelui de spaţiu <b>%s</b>. De asemenea puteţi <a href="%s">vizualiza modificările recente ale întregului wiki</a>.';
 $lang['years']                 = 'acum %d ani';
 $lang['months']                = 'acum %d luni';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index eda838451..94af441b7 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -19,15 +19,15 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '«'; //&ldquo;
-$lang['doublequoteclosing']    = '»'; //&rdquo;
-$lang['singlequoteopening']    = '„'; //&lsquo;
-$lang['singlequoteclosing']    = '“'; //&rsquo;
-$lang['apostrophe']            = '’'; //&rsquo;
-
+$lang['doublequoteopening']    = '«';
+$lang['doublequoteclosing']    = '»';
+$lang['singlequoteopening']    = '„';
+$lang['singlequoteclosing']    = '“';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Править страницу';
 $lang['btn_source']            = 'Показать исходный текст';
 $lang['btn_show']              = 'Показать страницу';
@@ -55,7 +55,6 @@ $lang['btn_backtomedia']       = 'Вернуться к выбору медиа�
 $lang['btn_subscribe']         = 'Подписаться (все правки)';
 $lang['btn_profile']           = 'Профиль';
 $lang['btn_reset']             = 'Сброс';
-$lang['btn_resendpwd']         = 'Выслать новый пароль';
 $lang['btn_draft']             = 'Править черновик';
 $lang['btn_recover']           = 'Восстановить черновик';
 $lang['btn_draftdel']          = 'Удалить черновик';
@@ -63,7 +62,6 @@ $lang['btn_revert']            = 'Восстановить';
 $lang['btn_register']          = 'Зарегистрироваться';
 $lang['btn_apply']             = 'Применить';
 $lang['btn_media']             = 'Media Manager';
-
 $lang['loggedinas']            = 'Зашли как';
 $lang['user']                  = 'Логин';
 $lang['pass']                  = 'Пароль';
@@ -78,7 +76,6 @@ $lang['badlogin']              = 'Извините, неверное имя по
 $lang['minoredit']             = 'Небольшие изменения';
 $lang['draftdate']             = 'Черновик сохранён';
 $lang['nosecedit']             = 'За это время страница была изменена и информация о секции устарела. Загружена полная версия страницы.';
-
 $lang['regmissing']            = 'Извините, вам следует заполнить все поля.';
 $lang['reguexists']            = 'Извините, пользователь с таким логином уже существует.';
 $lang['regsuccess']            = 'Пользователь создан, пароль выслан на адрес электронной почты.';
@@ -88,24 +85,19 @@ $lang['regbadmail']            = 'Данный вами адрес электр�
 $lang['regbadpass']            = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.';
 $lang['regpwmail']             = 'Ваш пароль для системы «ДокуВики»';
 $lang['reghere']               = 'У вас ещё нет аккаунта? Зарегистрируйтесь';
-
 $lang['profna']                = 'Данная вики не поддерживает изменение профиля';
 $lang['profnochange']          = 'Изменений не было внесено, профиль не обновлён.';
 $lang['profnoempty']           = 'Логин и адрес электронной почты не могут быть пустыми.';
 $lang['profchanged']           = 'Профиль пользователя успешно обновлён.';
-
 $lang['pwdforget']             = 'Забыли пароль? Получите новый';
 $lang['resendna']              = 'Данная вики не поддерживает повторную отправку пароля.';
-$lang['resendpwd']             = 'Выслать пароль для';
 $lang['resendpwdmissing']      = 'Вы должны заполнить все поля формы.';
 $lang['resendpwdnouser']       = 'Пользователь с таким логином не обнаружен в нашей базе данных.';
 $lang['resendpwdbadauth']      = 'Извините, неверный код авторизации. Убедитесь, что вы полностью скопировали ссылку. ';
 $lang['resendpwdconfirm']      = 'Ссылка для подтверждения пароля была выслана по электронной почте. ';
 $lang['resendpwdsuccess']      = 'Ваш новый пароль был выслан по электронной почте.';
-
 $lang['license']               = 'За исключением случаев, когда указано иное, содержимое этой вики предоставляется на условиях следующей лицензии:';
 $lang['licenseok']             = 'Примечание: редактируя эту страницу, вы соглашаетесь на использование своего вклада на условиях следующей лицензии:';
-
 $lang['searchmedia']           = 'Поиск по имени файла:';
 $lang['searchmedia_in']        = 'Поиск в %s';
 $lang['txt_upload']            = 'Выберите файл для загрузки';
@@ -113,7 +105,7 @@ $lang['txt_filename']          = 'Введите имя файла в вики (
 $lang['txt_overwrt']           = 'Перезаписать существующий файл';
 $lang['lockedby']              = 'В данный момент заблокирован';
 $lang['lockexpire']            = 'Блокировка истекает в';
-$lang['js']['willexpire']      = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
+$lang['js']['willexpire']      = 'Ваша блокировка этой страницы на редактирование истекает в течении минуты.\nЧтобы предотвратить конфликты используйте кнопку "Просмотр" для сброса таймера блокировки.';
 $lang['js']['notsavedyet']     = 'Несохранённые изменения будут потеряны. Вы действительно хотите продолжить?';
 $lang['js']['searchmedia']     = 'Поиск файлов';
 $lang['js']['keepopen']        = 'Не закрывать окно после выбора';
@@ -143,22 +135,19 @@ $lang['js']['nosmblinks']      = 'Ссылка на сетевые катало�
 $lang['js']['linkwiz']         = 'Мастер ссылок';
 $lang['js']['linkto']          = 'Ссылка на:';
 $lang['js']['del_confirm']     = 'Вы на самом деле желаете удалить выбранное?';
-$lang['js']['willexpire']      = 'Ваша блокировка этой страницы на редактирование истекает в течении минуты.\nЧтобы предотвратить конфликты используйте кнопку "Просмотр" для сброса таймера блокировки.';
-$lang['js']['restore_confirm']     = 'Действительно восстановить эту версию?';
-$lang['js']['media_diff']          = 'Просмотр отличий:';
-$lang['js']['media_diff_both']     = 'Рядом';
-$lang['js']['media_diff_opacity']  = 'Наложением';
+$lang['js']['restore_confirm'] = 'Действительно восстановить эту версию?';
+$lang['js']['media_diff']      = 'Просмотр отличий:';
+$lang['js']['media_diff_both'] = 'Рядом';
+$lang['js']['media_diff_opacity'] = 'Наложением';
 $lang['js']['media_diff_portions'] = 'Частями';
-$lang['js']['media_select']        = 'Выбрать файлы…';
-$lang['js']['media_upload_btn']    = 'Загрузить';
-$lang['js']['media_done_btn']      = 'Готово';
-$lang['js']['media_drop']          = 'Переместите файлы сюда для загрузки';
-$lang['js']['media_cancel']        = 'отменить';
-$lang['js']['media_overwrt']       = 'Перезаписать существующие файлы';
-
+$lang['js']['media_select']    = 'Выбрать файлы…';
+$lang['js']['media_upload_btn'] = 'Загрузить';
+$lang['js']['media_done_btn']  = 'Готово';
+$lang['js']['media_drop']      = 'Переместите файлы сюда для загрузки';
+$lang['js']['media_cancel']    = 'отменить';
+$lang['js']['media_overwrt']   = 'Перезаписать существующие файлы';
 $lang['rssfailed']             = 'Произошла ошибка при получении следующей новостной ленты: ';
 $lang['nothingfound']          = 'Ничего не найдено.';
-
 $lang['mediaselect']           = 'Выбор медиафайла';
 $lang['fileupload']            = 'Загрузка медиафайла';
 $lang['uploadsucc']            = 'Загрузка произведена успешно';
@@ -183,7 +172,6 @@ $lang['mediaextchange']        = 'Расширение изменилось: с
 $lang['reference']             = 'Ссылки для';
 $lang['ref_inuse']             = 'Этот файл не может быть удалён, так как он используется на следующих страницах:';
 $lang['ref_hidden']            = 'Некоторые ссылки находятся на страницах, на чтение которых у вас нет прав доступа';
-
 $lang['hits']                  = 'соответствий';
 $lang['quickhits']             = 'Соответствия в названиях страниц';
 $lang['toc']                   = 'Содержание';
@@ -207,18 +195,20 @@ $lang['external_edit']         = 'внешнее изменение';
 $lang['summary']               = 'Сводка изменений';
 $lang['noflash']               = 'Для просмотра этого содержимого требуется <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
 $lang['download']              = 'Скачать код';
-
+$lang['tools']                 = 'Инструменты';
+$lang['user_tools']            = 'Инструменты пользователя';
+$lang['site_tools']            = 'Инструменты сайта';
+$lang['page_tools']            = 'Инструменты страницы';
+$lang['skip_to_content']       = 'Перейти к содержанию';
 $lang['mail_newpage']          = 'страница добавлена:';
 $lang['mail_changed']          = 'страница изменена:';
 $lang['mail_subscribe_list']   = 'изменились страницы в пространстве имён:';
 $lang['mail_new_user']         = 'новый пользователь:';
 $lang['mail_upload']           = 'файл закачан:';
-
 $lang['changes_type']          = 'Посмотреть изменения';
 $lang['pages_changes']         = 'Страниц';
 $lang['media_changes']         = 'Медиа файлов';
 $lang['both_changes']          = 'И страниц и медиа файлов';
-
 $lang['qb_bold']               = 'Полужирный';
 $lang['qb_italic']             = 'Курсив';
 $lang['qb_underl']             = 'Подчёркнутый';
@@ -243,11 +233,8 @@ $lang['qb_media']              = 'Добавить изображения или
 $lang['qb_sig']                = 'Вставить подпись';
 $lang['qb_smileys']            = 'Смайлики';
 $lang['qb_chars']              = 'Специальные символы';
-
 $lang['upperns']               = 'Перейти в родительское пространство имён';
-
 $lang['admin_register']        = 'Добавить пользователя';
-
 $lang['metaedit']              = 'Править метаданные';
 $lang['metasaveerr']           = 'Ошибка записи метаданных';
 $lang['metasaveok']            = 'Метаданные сохранены';
@@ -265,30 +252,24 @@ $lang['img_keywords']          = 'Ключевые слова';
 $lang['img_width']             = 'Ширина';
 $lang['img_height']            = 'Высота';
 $lang['img_manager']           = 'Просмотр в media manager';
-
-$lang['subscr_subscribe_success']   = 'Добавлен %s в подписку на %s';
-$lang['subscr_subscribe_error']     = 'Невозможно добавить %s в подписку на %s';
+$lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s';
+$lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s';
 $lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку';
 $lang['subscr_unsubscribe_success'] = 'Удалён %s из подписки на %s';
-$lang['subscr_unsubscribe_error']   = 'Ошибка удаления %s из подписки на %s';
-$lang['subscr_already_subscribed']  = '%s уже подписан на %s';
-$lang['subscr_not_subscribed']      = '%s не подписан на %s';
-// Manage page for subscriptions
-$lang['subscr_m_not_subscribed']    = 'Вы не подписаны на текущую страницу или пространство имён.';
-$lang['subscr_m_new_header']        = 'Добавить подписку';
-$lang['subscr_m_current_header']    = 'Текущие подписки';
-$lang['subscr_m_unsubscribe']       = 'Отменить подписку';
-$lang['subscr_m_subscribe']         = 'Подписаться';
-$lang['subscr_m_receive']           = 'Получить';
-$lang['subscr_style_every']         = 'уведомлять о каждом изменении';
-$lang['subscr_style_digest']        = 'сводка изменений по каждой странице';
-$lang['subscr_style_list']          = 'перечислять изменившиеся страницы с прошлого уведомления';
-
-/* auth.class language support */
+$lang['subscr_unsubscribe_error'] = 'Ошибка удаления %s из подписки на %s';
+$lang['subscr_already_subscribed'] = '%s уже подписан на %s';
+$lang['subscr_not_subscribed'] = '%s не подписан на %s';
+$lang['subscr_m_not_subscribed'] = 'Вы не подписаны на текущую страницу или пространство имён.';
+$lang['subscr_m_new_header']   = 'Добавить подписку';
+$lang['subscr_m_current_header'] = 'Текущие подписки';
+$lang['subscr_m_unsubscribe']  = 'Отменить подписку';
+$lang['subscr_m_subscribe']    = 'Подписаться';
+$lang['subscr_m_receive']      = 'Получить';
+$lang['subscr_style_every']    = 'уведомлять о каждом изменении';
+$lang['subscr_style_digest']   = 'сводка изменений по каждой странице';
+$lang['subscr_style_list']     = 'перечислять изменившиеся страницы с прошлого уведомления';
 $lang['authmodfailed']         = 'Неправильная конфигурация аутентификации пользователя. Пожалуйста, сообщите об этом своему администратору вики.';
 $lang['authtempfail']          = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.';
-
-/* installer strings */
 $lang['i_chooselang']          = 'Выберите свой язык/Choose your language';
 $lang['i_installer']           = 'Установка «ДокуВики»';
 $lang['i_wikiname']            = 'Название вики';
@@ -314,23 +295,6 @@ $lang['i_pol1']                = 'Общедоступная вики (чтен�
 $lang['i_pol2']                = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)';
 $lang['i_retry']               = 'Повторить попытку';
 $lang['i_license']             = 'Пожалуйста, выберите тип лицензии для своей вики:';
-
-$lang['mu_intro']              = 'Здесь вы можете загрузить несколько файлов сразу. Кликните на «обзор», чтобы добавить их в список. Нажмите «загрузить», когда будете готовы.';
-$lang['mu_gridname']           = 'Имя файла';
-$lang['mu_gridsize']           = 'Размер';
-$lang['mu_gridstat']           = 'Статус';
-$lang['mu_namespace']          = 'Пространство имён';
-$lang['mu_browse']             = 'Обзор';
-$lang['mu_toobig']             = 'слишком большой';
-$lang['mu_ready']              = 'готово к загрузке';
-$lang['mu_done']               = 'завершено';
-$lang['mu_fail']               = 'провалено';
-$lang['mu_authfail']           = 'истекло время сессии';
-$lang['mu_progress']           = '@PCT@% загружено';
-$lang['mu_filetypes']          = 'Допустимые типы файлов';
-$lang['mu_info']               = 'файлов загружено.';
-$lang['mu_lasterr']            = 'Последняя ошибка:';
-
 $lang['recent_global']         = 'Вы просматриваете изменения в пространстве имён <b>%s</b>. Вы можете также <a href="%s">просмотреть недавние изменения во всей вики</a>.';
 $lang['years']                 = '%d лет назад';
 $lang['months']                = '%d месяц(ев) назад';
@@ -339,24 +303,29 @@ $lang['days']                  = '%d дней назад';
 $lang['hours']                 = '%d час(ов) назад';
 $lang['minutes']               = '%d минут назад';
 $lang['seconds']               = '%d секунд назад';
-
 $lang['wordblock']             = 'Ваши изменения не сохранены, поскольку они содержат блокируемые слова (спам).';
-
 $lang['media_uploadtab']       = 'Загрузка';
 $lang['media_searchtab']       = 'Поиск';
+$lang['media_file']            = 'Файл';
 $lang['media_viewtab']         = 'Просмотр';
 $lang['media_edittab']         = 'Правка';
 $lang['media_historytab']      = 'История';
+$lang['media_list_thumbs']     = 'Миниатюры';
+$lang['media_list_rows']       = 'Строки';
 $lang['media_sort_name']       = 'Сортировка по имени';
 $lang['media_sort_date']       = 'Сортировка по дате';
+$lang['media_namespaces']      = 'Выберите каталог';
+$lang['media_files']           = 'Файлы в %s';
 $lang['media_upload']          = 'Загрузка в пространство имён <strong>%s</strong>.';
 $lang['media_search']          = 'Поиск в пространстве имён <strong>%s</strong>.';
 $lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s в %s
+';
 $lang['media_edit']            = 'Правка %s';
+$lang['media_history']         = 'История %s';
 $lang['media_meta_edited']     = 'метаданные изменены';
 $lang['media_perm_read']       = 'Извините, у Вас недостаточно прав для чтения файлов.';
 $lang['media_perm_upload']     = 'Извините, у Вас недостаточно прав для загрузки файлов.';
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
-
-$lang['plugin_install_err']    = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'.";
+$lang['plugin_install_err']    = 'Плагин установлен некорректно. Переименуйте папку плагина из \'%s\' в \'%s\'.';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index c0d45da58..85e899b06 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -38,11 +38,10 @@ $lang['btn_update']            = 'Aktualizovať';
 $lang['btn_delete']            = 'Zmazať';
 $lang['btn_back']              = 'Späť';
 $lang['btn_backlink']          = 'Spätné odkazy';
-$lang['btn_backtomedia']       = 'Späť na výber média';
+$lang['btn_backtomedia']       = 'Späť na výber súboru';
 $lang['btn_subscribe']         = 'Sledovať zmeny';
 $lang['btn_profile']           = 'Aktualizovať profil';
 $lang['btn_reset']             = 'Zrušiť';
-$lang['btn_resendpwd']         = 'Poslať nové heslo';
 $lang['btn_draft']             = 'Upraviť koncept';
 $lang['btn_recover']           = 'Obnoviť koncept';
 $lang['btn_draftdel']          = 'Zmazať koncept';
@@ -79,7 +78,6 @@ $lang['profnoempty']           = 'Prázdne meno alebo mailová adresa nie sú po
 $lang['profchanged']           = 'Užívateľský účet úspešne zmenený.';
 $lang['pwdforget']             = 'Zabudli ste heslo? Získajte nové!';
 $lang['resendna']              = 'Táto wiki nepodporuje opätovné zasielanie hesla.';
-$lang['resendpwd']             = 'Pošli nové heslo pre';
 $lang['resendpwdmissing']      = 'Prepáčte, musíte vyplniť všetky polia.';
 $lang['resendpwdnouser']       = 'Prepáčte, nemôžeme nájsť zadaného užívateľa v databáze.';
 $lang['resendpwdbadauth']      = 'Prepáčte, tento autorizačný kód nie je platný. Uistite sa, či ste použili celý autorizačný odkaz.';
@@ -139,8 +137,8 @@ $lang['js']['media_cancel']    = 'odstrániť';
 $lang['js']['media_overwrt']   = 'Prepísať existujúce súbory';
 $lang['rssfailed']             = 'Nastala chyba pri vytváraní tohto RSS: ';
 $lang['nothingfound']          = 'Nič nenájdené.';
-$lang['mediaselect']           = 'Výber dokumentu';
-$lang['fileupload']            = 'Nahrávanie dokumentu';
+$lang['mediaselect']           = 'Výber súboru';
+$lang['fileupload']            = 'Nahrávanie súboru';
 $lang['uploadsucc']            = 'Prenos prebehol v poriadku';
 $lang['uploadfail']            = 'Chyba pri nahrávaní. Možno kvôli zle nastaveným právam?';
 $lang['uploadwrong']           = 'Prenos súboru s takouto príponou nie je dovolený.';
@@ -193,7 +191,7 @@ $lang['mail_new_user']         = 'nový užívateľ:';
 $lang['mail_upload']           = 'nahraný súbor:';
 $lang['changes_type']          = 'Prehľad zmien';
 $lang['pages_changes']         = 'Stránok';
-$lang['media_changes']         = 'Média súborov';
+$lang['media_changes']         = 'Súbory';
 $lang['both_changes']          = 'Stránok spolu s média súbormi';
 $lang['qb_bold']               = 'Tučné';
 $lang['qb_italic']             = 'Kurzíva';
@@ -278,21 +276,6 @@ $lang['i_pol1']                = 'Verejná Wiki (čítanie pre každého, zápis
 $lang['i_pol2']                = 'Uzatvorená Wiki (čítanie, zápis a nahrávanie len pre registrovaných užívateľov)';
 $lang['i_retry']               = 'Skúsiť znovu';
 $lang['i_license']             = 'Vyberte licenciu, pod ktorou chcete uložiť váš obsah:';
-$lang['mu_intro']              = 'Na tomto mieste môžete nahrávať viac súborov súčasne. Tlačidlom Prehľadávať pridáte súbory do zoznamu. Tlačidlom Nahrať vykonáte prenos súborov.';
-$lang['mu_gridname']           = 'Názov súboru';
-$lang['mu_gridsize']           = 'Veľkosť';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Menný priestor';
-$lang['mu_browse']             = 'Prehľadávať';
-$lang['mu_toobig']             = 'príliš veľký';
-$lang['mu_ready']              = 'pripravený na nahratie';
-$lang['mu_done']               = 'dokončený';
-$lang['mu_fail']               = 'neúspešný';
-$lang['mu_authfail']           = 'spojenie stratilo platnosť';
-$lang['mu_progress']           = '@PCT@% nahraných';
-$lang['mu_filetypes']          = 'Povolené typy súborov';
-$lang['mu_info']               = 'nahraných súborov.';
-$lang['mu_lasterr']            = 'Posledná chyba:';
 $lang['recent_global']         = 'Práve prehliadate zmeny v mennom priestore <b>%s</b>. Môžete si tiež pozrieť <a href="%s">aktuálne zmeny celej wiki</a>.';
 $lang['years']                 = 'pred %d rokmi';
 $lang['months']                = 'pred %d mesiacmi';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index 9acf13504..b34ab67e4 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -43,11 +43,13 @@ $lang['btn_backtomedia']       = 'Nazaj na izbiro predstavnih datotek';
 $lang['btn_subscribe']         = 'Urejanje naročnin';
 $lang['btn_profile']           = 'Posodobi profil';
 $lang['btn_reset']             = 'Ponastavi';
-$lang['btn_resendpwd']         = 'Pošlji novo geslo';
 $lang['btn_draft']             = 'Uredi osnutek';
 $lang['btn_recover']           = 'Obnovi osnutek';
 $lang['btn_draftdel']          = 'Izbriši osnutek';
 $lang['btn_revert']            = 'Povrni';
+$lang['btn_register']          = 'Prijava';
+$lang['btn_apply']             = 'Uveljavi';
+$lang['btn_media']             = 'Urejevalnik predstavnih vsebin';
 $lang['loggedinas']            = 'Prijava kot';
 $lang['user']                  = 'Uporabniško ime';
 $lang['pass']                  = 'Geslo';
@@ -57,7 +59,6 @@ $lang['passchk']               = 'Ponovi novo geslo';
 $lang['remember']              = 'Zapomni si me';
 $lang['fullname']              = 'Pravo ime';
 $lang['email']                 = 'Elektronski naslov';
-$lang['register']              = 'Vpis računa';
 $lang['profile']               = 'Uporabniški profil';
 $lang['badlogin']              = 'Uporabniško ime ali geslo je napačno.';
 $lang['minoredit']             = 'Manjše spremembe';
@@ -72,13 +73,12 @@ $lang['regbadmail']            = 'Videti je, da je naveden elektronski naslov ne
 $lang['regbadpass']            = 'Gesli nista enaki. Poskusite znova.';
 $lang['regpwmail']             = 'Geslo za DokuWiki';
 $lang['reghere']               = 'Nimate še računa? Vpišite se za nov račun.';
-$lang['profna']                = 'Wiki ne podpira spreminjanja profila.';
+$lang['profna']                = 'DokuWiki ne podpira spreminjanja profila.';
 $lang['profnochange']          = 'Brez sprememb.';
 $lang['profnoempty']           = 'Prazno polje elektronskega naslova ali imena ni dovoljeno.';
 $lang['profchanged']           = 'Uporabniški profil je uspešno posodobljen.';
 $lang['pwdforget']             = 'Ali ste pozabili geslo? Pridobite si novo geslo.';
-$lang['resendna']              = 'Wiki ne podpira možnosti ponovnega pošiljanja gesel.';
-$lang['resendpwd']             = 'Pošlji novo geslo za';
+$lang['resendna']              = 'DokuWiki ne podpira možnosti ponovnega pošiljanja gesel.';
 $lang['resendpwdmissing']      = 'Izpolniti je treba vsa polja.';
 $lang['resendpwdnouser']       = 'Podanega uporabniškega imena v podatkovni zbirki ni mogoče najti.';
 $lang['resendpwdbadauth']      = 'Koda za overitev ni prava. Prepričajte se, da ste uporabili celotno povezavo za potrditev.';
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Pošlji z imenom (izborno)';
 $lang['txt_overwrt']           = 'Prepiši obstoječo datoteko';
 $lang['lockedby']              = 'Trenutno je zaklenjeno s strani';
 $lang['lockexpire']            = 'Zaklep preteče ob';
-$lang['js']['willexpire']            = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
+$lang['js']['willexpire']      = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
 $lang['js']['notsavedyet']     = 'Neshranjene spremembe bodo izgubljene.';
 $lang['js']['searchmedia']     = 'Poišči datoteke';
 $lang['js']['keepopen']        = 'Od izbiri ohrani okno odprto';
@@ -123,6 +123,16 @@ $lang['js']['nosmblinks']      = 'Povezovanje do souporabnih datotek sistema Win
 $lang['js']['linkwiz']         = 'Čarovnik za povezave';
 $lang['js']['linkto']          = 'Poveži na:';
 $lang['js']['del_confirm']     = 'Ali naj se res izbrišejo izbrani predmeti?';
+$lang['js']['restore_confirm'] = 'Ali naj se koda obnovi na to različico?';
+$lang['js']['media_diff']      = 'Razlike:';
+$lang['js']['media_diff_both'] = 'Eno ob drugem';
+$lang['js']['media_diff_opacity'] = 'Prosojno';
+$lang['js']['media_select']    = 'Izbor datotek ...';
+$lang['js']['media_upload_btn'] = 'Naloži';
+$lang['js']['media_done_btn']  = 'Končano';
+$lang['js']['media_drop']      = 'Spusti datoteke za nalaganje.';
+$lang['js']['media_cancel']    = 'odstrani';
+$lang['js']['media_overwrt']   = 'Prepiši obstoječe datoteke';
 $lang['rssfailed']             = 'Prišlo je do napake med pridobivanjem vira: ';
 $lang['nothingfound']          = 'Ni najdenih predmetov.';
 $lang['mediaselect']           = 'Predstavne datoteke';
@@ -157,6 +167,9 @@ $lang['yours']                 = 'Vaša različica';
 $lang['diff']                  = 'Pokaži razlike s trenutno različico';
 $lang['diff2']                 = 'Pokaži razlike med izbranimi različicami.';
 $lang['difflink']              = 'Poveži s tem pogledom primerjave.';
+$lang['diff_type']             = 'Razlike:';
+$lang['diff_inline']           = 'V besedilu';
+$lang['diff_side']             = 'Eno ob drugem';
 $lang['line']                  = 'Vrstica';
 $lang['breadcrumb']            = 'Sled';
 $lang['youarehere']            = 'Trenutno dejavna stran';
@@ -169,11 +182,20 @@ $lang['external_edit']         = 'urejanje v zunanjem urejevalniku';
 $lang['summary']               = 'Povzetek urejanja';
 $lang['noflash']               = 'Za prikaz vsebine je treba namestiti <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>';
 $lang['download']              = 'Naloži izrezek';
+$lang['tools']                 = 'Orodja';
+$lang['user_tools']            = 'Uporabniška orodja';
+$lang['site_tools']            = 'Orodja spletišča';
+$lang['page_tools']            = 'Orodja strani';
+$lang['skip_to_content']       = 'preskoči na vsebino';
 $lang['mail_newpage']          = '[DokuWiki] stran dodana:';
 $lang['mail_changed']          = '[DokuWiki] stran spremenjena:';
 $lang['mail_subscribe_list']   = 'strani s spremenjenim imenom:';
 $lang['mail_new_user']         = 'nov uporabnik:';
 $lang['mail_upload']           = 'naložena datoteka:';
+$lang['changes_type']          = 'Poglej spremembe';
+$lang['pages_changes']         = 'Strani';
+$lang['media_changes']         = 'Predstavne datoteke';
+$lang['both_changes']          = 'Strani in predstavne datoteke';
 $lang['qb_bold']               = 'Krepko besedilo';
 $lang['qb_italic']             = 'Ležeče besedilo';
 $lang['qb_underl']             = 'Podčrtano besedilo';
@@ -214,6 +236,9 @@ $lang['img_copyr']             = 'Avtorska pravica';
 $lang['img_format']            = 'Zapis';
 $lang['img_camera']            = 'Fotoaparat';
 $lang['img_keywords']          = 'Ključne besede';
+$lang['img_width']             = 'Širina';
+$lang['img_height']            = 'Višina';
+$lang['img_manager']           = 'Poglej v urejevalniku predstavnih vsebin';
 $lang['subscr_subscribe_success'] = 'Uporabniški račun %s je dodan na seznam naročnin na %s';
 $lang['subscr_subscribe_error'] = 'Napaka med dodajanjem %s na seznam naročnin na %s';
 $lang['subscr_subscribe_noaddress'] = 'S trenutnimi prijavnimi podatki ni povezanega elektronskega naslova, zato uporabniškega računa ni mogoče dodati na seznam naročnikov.';
@@ -254,21 +279,6 @@ $lang['i_pol1']                = 'Javni Wiki (branje za vse, zapis in nalaganje
 $lang['i_pol2']                = 'Zaprt Wiki (berejo in urejajo lahko le prijavljeni uporabniki)';
 $lang['i_retry']               = 'Ponovni poskus';
 $lang['i_license']             = 'Izbor dovoljenja objave vsebine:';
-$lang['mu_intro']              = 'Naložiti je mogoče več datotek hkrati. S klikom na gumb "Prebrskaj", jih je mogoče dodati v vrsto. S klikom na povezavo "naloži" bodo datoteke poslane na strežnik.';
-$lang['mu_gridname']           = 'Ime datoteke';
-$lang['mu_gridsize']           = 'Velikost';
-$lang['mu_gridstat']           = 'Stanje';
-$lang['mu_namespace']          = 'Imenski prostor';
-$lang['mu_browse']             = 'Prebrskaj';
-$lang['mu_toobig']             = 'prevelika datoteka';
-$lang['mu_ready']              = 'pripravljena na pošiljanje';
-$lang['mu_done']               = 'končano';
-$lang['mu_fail']               = 'ni uspelo';
-$lang['mu_authfail']           = 'seja je potekla';
-$lang['mu_progress']           = '@PCT@% je poslano';
-$lang['mu_filetypes']          = 'Dovoljene vrste datotek';
-$lang['mu_info']               = 'poslanih datotek.';
-$lang['mu_lasterr']            = 'Zadnja napaka:';
 $lang['recent_global']         = 'Trenutno so prikazane spremembe znotraj imenskega prostora <b>%s</b>. Mogoče si je ogledati tudi spremembe <a href="%s">celotnega sistema Wiki</a>.';
 $lang['years']                 = '%d let nazaj';
 $lang['months']                = '%d mesecev nazaj';
@@ -278,3 +288,27 @@ $lang['hours']                 = '%d ur nazaj';
 $lang['minutes']               = '%d minut nazaj';
 $lang['seconds']               = '%d sekund nazaj';
 $lang['wordblock']             = 'Spremembe niso shranjene, ker je v vsebini navedeno neželeno besedilo (spam).';
+$lang['media_uploadtab']       = 'Naloži';
+$lang['media_searchtab']       = 'Poišči';
+$lang['media_file']            = 'Datoteka';
+$lang['media_viewtab']         = 'Pogled';
+$lang['media_edittab']         = 'Uredi';
+$lang['media_historytab']      = 'Zgodovina';
+$lang['media_list_thumbs']     = 'Sličice';
+$lang['media_list_rows']       = 'Vrstice';
+$lang['media_sort_name']       = 'Ime';
+$lang['media_sort_date']       = 'Datum';
+$lang['media_namespaces']      = 'Izbor imenskega prostora';
+$lang['media_files']           = 'Datoteke v %s';
+$lang['media_upload']          = 'Naloži v %s';
+$lang['media_search']          = 'Poišči v %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s pri %s';
+$lang['media_edit']            = 'Uredi %s';
+$lang['media_history']         = 'Zgodovina %s';
+$lang['media_meta_edited']     = 'metapodatki so urejeni';
+$lang['media_perm_read']       = 'Ni ustreznih dovoljenj za branje datotek.';
+$lang['media_perm_upload']     = 'Ni ustreznih dovoljenj za nalaganje datotek.';
+$lang['media_update']          = 'Naloži novo različico';
+$lang['media_restore']         = 'Obnovi to različico';
+$lang['plugin_install_err']    = 'Vstavek ni pravilno nameščen. Preimenujte mapo vstavka\'%s\' v \'%s\'.';
diff --git a/inc/lang/sl/locked.txt b/inc/lang/sl/locked.txt
index d51e940b7..cc693d3fa 100644
--- a/inc/lang/sl/locked.txt
+++ b/inc/lang/sl/locked.txt
@@ -1,3 +1,3 @@
 ====== Stran je zaklenjena ======
 
-Stran je zaklenjenjena za urejanje. Počakati je treba, da zaklep strani poteče.
+Stran je zaklenjena za urejanje. Počakati je treba, da zaklep strani poteče.
diff --git a/inc/lang/sl/stopwords.txt b/inc/lang/sl/stopwords.txt
index 5d61539e7..8eed2daa6 100644
--- a/inc/lang/sl/stopwords.txt
+++ b/inc/lang/sl/stopwords.txt
@@ -1,7 +1,7 @@
 # To je seznam besed, ki jih ustvarjalnik kazala prezre. Seznam je sestavljen iz
-# besede, ki so zapisane vsaka v svoji vrstici. Datoteka mora biti zapisana s kon�nim
-# UNIX znakom vrstice. Besede kraj�e od treh znakov so iz kazala izlo�ene samodejno
-# zaradi preglednosti. Seznam se s bo s �asom spreminjal in dopolnjeval.
+# besede, ki so zapisane vsaka v svoji vrstici. Datoteka mora biti zapisana s končnim
+# UNIX znakom vrstice. Besede krajše od treh znakov so iz kazala izločene samodejno
+# zaradi preglednosti. Seznam se s bo s časom spreminjal in dopolnjeval.
 moja
 moje
 moji
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 87d0f30b5..0e56b89d9 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -44,7 +44,6 @@ $lang['btn_backtomedia']       = 'Mbrapa tek Përzgjedhja e Media-ve';
 $lang['btn_subscribe']         = 'Menaxho Abonimet';
 $lang['btn_profile']           = 'Përditëso Profilin';
 $lang['btn_reset']             = 'Rivendos';
-$lang['btn_resendpwd']         = 'Dërgo fjalëkalim të ri';
 $lang['btn_draft']             = 'Redakto skicën';
 $lang['btn_recover']           = 'Rekupero skicën';
 $lang['btn_draftdel']          = 'Fshi skicën';
@@ -79,7 +78,6 @@ $lang['profnoempty']           = 'Një emër bosh ose adresë email-i bosh nuk l
 $lang['profchanged']           = 'Profili i përdoruesit u përditësua me sukses.';
 $lang['pwdforget']             = 'E harruat fjalëkalimin? Merni një të ri';
 $lang['resendna']              = 'Ky wiki nuk e lejon ridërgimin e fjalëkalimeve.';
-$lang['resendpwd']             = 'Dërgo një fjalëkalim të ri për';
 $lang['resendpwdmissing']      = 'Na vjen keq, duhet t\'i plotësoni të gjitha fushat.';
 $lang['resendpwdnouser']       = 'Na vjen keq, nuk mund ta gjejmë këtë përdorues në bazën tonë të të dhënave.';
 $lang['resendpwdbadauth']      = 'Na vjen keq, ky kod autorizimi nuk është i vlefshëm. Sigurohuni që përdoret linkun e plotë të konfirmimit.';
@@ -232,21 +230,6 @@ $lang['i_pol0']                = 'Wiki i Hapur (lexim, shkrim, ngarkim për këd
 $lang['i_pol1']                = 'Wiki Publike (lexim për këdo, shkrim dhe ngarkim për përdoruesit e regjistruar)';
 $lang['i_pol2']                = 'Wiki e Mbyllur (lexim, shkrim, ngarkim vetëm për përdoruesit e regjistruar)';
 $lang['i_retry']               = 'Provo Përsëri';
-$lang['mu_intro']              = 'Këtu mund të ngarkoni disa skedarë njëkohësisht. Klikoni butonin e shfletuesit për t\'i shtuar ata në radhë. Klikoni Ngarko kur të keni mbaruar.';
-$lang['mu_gridname']           = 'Emri Skedari';
-$lang['mu_gridsize']           = 'Madhësia';
-$lang['mu_gridstat']           = 'Statusi';
-$lang['mu_namespace']          = 'Hapësira Emrit';
-$lang['mu_browse']             = 'Shfleto';
-$lang['mu_toobig']             = 'shumë i/e madhe';
-$lang['mu_ready']              = 'gati për ngarkim';
-$lang['mu_done']               = 'përfundoi';
-$lang['mu_fail']               = 'dështoi';
-$lang['mu_authfail']           = 'sesioni skadoi';
-$lang['mu_progress']           = '@PCT@% u ngarkua';
-$lang['mu_filetypes']          = 'Tipet e Skedarëve të Lejuar';
-$lang['mu_info']               = 'skedarët e ngarkuar';
-$lang['mu_lasterr']            = 'Gabimi i fundit:';
 $lang['recent_global']         = 'Momentalisht jeni duke parë ndryshimet brenda hapësirës së emrit <b>%s</b>. Gjithashtu mund <a href="%s">të shihni ndryshimet më të fundit në të gjithë wiki-n</a>.';
 $lang['years']                 = '%d vite më parë';
 $lang['months']                = '%d muaj më parë';
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index 22bcf4e33..a53f14ac9 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -41,7 +41,6 @@ $lang['btn_backtomedia']       = 'Врати се на избор медијск
 $lang['btn_subscribe']         = 'Пријави се на измене';
 $lang['btn_profile']           = 'Ажурирај профил';
 $lang['btn_reset']             = 'Поништи';
-$lang['btn_resendpwd']         = 'Пошаљи нову лозинку';
 $lang['btn_draft']             = 'Измени нацрт';
 $lang['btn_recover']           = 'Опорави нацрт';
 $lang['btn_draftdel']          = 'Обриши нацрт';
@@ -76,7 +75,6 @@ $lang['profnoempty']           = 'Није дозвољено оставити �
 $lang['profchanged']           = 'Кориснички профил је ажуриран.';
 $lang['pwdforget']             = 'Заборавили сте лозинку? Направите нову';
 $lang['resendna']              = 'Овај вики не дозвољава слање лозинки.';
-$lang['resendpwd']             = 'Пошаљи нову лозинку за';
 $lang['resendpwdmissing']      = 'Жао ми је, сва поља морају бити попуњена.';
 $lang['resendpwdnouser']       = 'Жао ми је, овај корисник не постоји у нашој бази.';
 $lang['resendpwdbadauth']      = 'Жао ми је, потврдни код није исправан. Проверите да ли сте користили комплетан потврдни линк.';
@@ -254,21 +252,6 @@ $lang['i_pol1']                = 'Јавни вики (читање за све,
 $lang['i_pol2']                = 'Затворени вики (читање, писање и слање датотека само за регистроване кориснике)';
 $lang['i_retry']               = 'Понови';
 $lang['i_license']             = 'Молимо вас, одаберите лиценцу под коју желите да ставите свој садржај:';
-$lang['mu_intro']              = 'Одавде можете послати више датотека одједном. Кликните на дугме Тражи да бисте додали датотеке на листу. Када завршите са одабирањем кликните на Пошаљи.';
-$lang['mu_gridname']           = 'Назив датотеке';
-$lang['mu_gridsize']           = 'Величина';
-$lang['mu_gridstat']           = 'Статус';
-$lang['mu_namespace']          = 'Именски простор';
-$lang['mu_browse']             = 'Тражи';
-$lang['mu_toobig']             = 'превелико';
-$lang['mu_ready']              = 'спремно за слање';
-$lang['mu_done']               = 'завршено';
-$lang['mu_fail']               = 'није успело';
-$lang['mu_authfail']           = 'сесија је истекла';
-$lang['mu_progress']           = '@PCT@% послато';
-$lang['mu_filetypes']          = 'Дозвољени типови датотека';
-$lang['mu_info']               = 'Фајлови послати';
-$lang['mu_lasterr']            = 'Последња грешка:';
 $lang['recent_global']         = 'Тренутно пратите промене у именском простору <b>%s</b>. Такође, можете пратити <a href="%s">прмене на целом викију</a>.';
 $lang['years']                 = 'Пре %d година';
 $lang['months']                = 'Пре %d месеци';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 943509fed..0c8f3276d 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -52,7 +52,6 @@ $lang['btn_backtomedia']       = 'Tillbaka till val av Mediafil';
 $lang['btn_subscribe']         = 'Prenumerera på ändringar';
 $lang['btn_profile']           = 'Uppdatera profil';
 $lang['btn_reset']             = 'Återställ';
-$lang['btn_resendpwd']         = 'Skicka nytt lösenord';
 $lang['btn_draft']             = 'Redigera utkast';
 $lang['btn_recover']           = 'Återskapa utkast';
 $lang['btn_draftdel']          = 'Radera utkast';
@@ -87,7 +86,6 @@ $lang['profnoempty']           = 'Namn och e-postadress måste fyllas i.';
 $lang['profchanged']           = 'Användarprofilen uppdaterad.';
 $lang['pwdforget']             = 'Glömt ditt lösenord? Ordna ett nytt';
 $lang['resendna']              = 'Den här wikin stödjer inte utskick av lösenord.';
-$lang['resendpwd']             = 'Skicka nytt lösenord för';
 $lang['resendpwdmissing']      = 'Du måste fylla i alla fält.';
 $lang['resendpwdnouser']       = 'Den här användaren hittas inte i databasen.';
 $lang['resendpwdbadauth']      = 'Den här verifieringskoden är inte giltig. Kontrollera att du använde hela verifieringslänken.';
@@ -256,21 +254,6 @@ $lang['i_pol0']                = 'Öppen wiki (alla får läsa, skriva och ladda
 $lang['i_pol1']                = 'Publik wiki (alla får läsa, registrerade användare för skriva och ladda upp filer)';
 $lang['i_pol2']                = 'Sluten wiki (endast registrerade användare får läsa, skriva och ladda upp filer)';
 $lang['i_retry']               = 'Försök igen';
-$lang['mu_intro']              = 'Här kan du ladda upp flera filer på en gång. Klicka på bläddra-knappen för att lägga till dem i kön. Tryck på ladda upp när du är klar.';
-$lang['mu_gridname']           = 'Filnamn';
-$lang['mu_gridsize']           = 'Storlek';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namnrymd';
-$lang['mu_browse']             = 'Bläddra';
-$lang['mu_toobig']             = 'för stor';
-$lang['mu_ready']              = 'redo att ladda upp';
-$lang['mu_done']               = 'komplett';
-$lang['mu_fail']               = 'misslyckades';
-$lang['mu_authfail']           = 'sessionen över tid';
-$lang['mu_progress']           = '@PCT@% uppladdade';
-$lang['mu_filetypes']          = 'Tillåtna filtyper';
-$lang['mu_info']               = 'filerna uppladdade.';
-$lang['mu_lasterr']            = 'Senaste fel:';
 $lang['recent_global']         = 'Du bevakar ändringar i namnrymden <b>%s</b>. Du kan också titta på <a href="%s">senaste ändringar för hela wikin</a>.';
 $lang['years']                 = '%d år sedan';
 $lang['months']                = '%d månader sedan';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index 0d0613961..c9d526436 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -48,7 +48,6 @@ $lang['btn_subscribe']         = 'เฝ้าดู';
 $lang['btn_unsubscribe']       = 'เลิกเฝ้าดู';
 $lang['btn_profile']           = 'แก้ข้อมูลผู้ใช้';
 $lang['btn_reset']             = 'เริ่มใหม่';
-$lang['btn_resendpwd']         = 'ลืมรหัส ส่งให้ใหม่ทางอีเมล';
 $lang['btn_draft']             = 'แก้ไขเอกสารฉบับร่าง';
 $lang['btn_recover']           = 'กู้คืนเอกสารฉบับร่าง';
 $lang['btn_draftdel']          = 'ลบเอกสารฉบับร่าง';
@@ -83,7 +82,6 @@ $lang['profnoempty']           = 'ไม่อนุญาติให้เว�
 $lang['profchanged']           = 'ปรับปรุงข้อมูลส่วนตัวผู้ใช้สำเร็จ';
 $lang['pwdforget']             = 'ลืมรหัสผ่านหรือ? เอาอันใหม่สิ';
 $lang['resendna']              = 'วิกินี้ไม่รองรับการส่งรหัสผ่านซ้ำ';
-$lang['resendpwd']             = 'ส่งรหัสผ่านใหม่ให้กับ';
 $lang['resendpwdmissing']      = 'ขออภัย, คุณต้องกรอกทุกช่อง';
 $lang['resendpwdnouser']       = 'ขออภัย, เราไม่พบผู้ใช้คนนี้ในฐานข้อมูลของเรา';
 $lang['resendpwdbadauth']      = 'ขออภัย, รหัสนี้ยังใช้ไม่ได้ กรุณาตรวจสอบว่าคุณกดลิ้งค์ยืนยันแล้ว';
@@ -221,21 +219,6 @@ $lang['i_pol0']                = 'วิกิเปิดกว้าง (ใ�
 $lang['i_pol1']                = 'วิกิสาธารณะ (ทุกคนอ่านได้, เขียน และ อัพโหลดเฉพาะผู้ใช้ที่ลงทะเบียนแล้ว)';
 $lang['i_pol2']                = 'วิกิภายใน (อ่าน, เขียน, อัพโหลด สำหรับผู้ใช้ที่ลงทะเบียนแล้วเท่านั้น)';
 $lang['i_retry']               = 'ลองใหม่';
-$lang['mu_intro']              = 'ที่นี่คุณสามารถอัพโหลดหลายๆไฟล์ได้พร้อมๆกัน คลิ๊กปุ่มบราวซ์เพื่อเพิ่มมันเข้าไปในคิว กดปุ่มอัพโหลดเมื่อเสร็จแล้ว';
-$lang['mu_gridname']           = 'ชื่อไฟล์';
-$lang['mu_gridsize']           = 'ขนาด';
-$lang['mu_gridstat']           = 'สถานะ';
-$lang['mu_namespace']          = 'เนมสเปซ';
-$lang['mu_browse']             = 'เรียกดู';
-$lang['mu_toobig']             = 'ใหญ่ไป';
-$lang['mu_ready']              = 'พร้อมอัปโหลด';
-$lang['mu_done']               = 'เสร็จสิ้น';
-$lang['mu_fail']               = 'ล้มเหลว';
-$lang['mu_authfail']           = 'วาระหมดอายุ';
-$lang['mu_progress']           = '@PCT@% อัปโหลดแล้ว';
-$lang['mu_filetypes']          = 'ชนิดแฟ้มที่อนุญาต';
-$lang['mu_info']               = 'แฟ้มอัปโหลดแล้ว';
-$lang['mu_lasterr']            = 'ผิดพลาดล่าสุด:';
 $lang['years']                 = '%d ปีก่อน';
 $lang['months']                = '%d เดือนก่อน';
 $lang['weeks']                 = '%d สัปดาห์ก่อน';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 94b1c951a..77518ac36 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -43,7 +43,6 @@ $lang['btn_backtomedia']       = 'Çokluortam dosyası seçimine dön';
 $lang['btn_subscribe']         = 'Sayfa Değişikliklerini Bildir';
 $lang['btn_profile']           = 'Kullanıcı Bilgilerini Güncelle';
 $lang['btn_reset']             = 'Sıfırla';
-$lang['btn_resendpwd']         = 'Yeni parola gönder';
 $lang['btn_draft']             = 'Taslağı düzenle';
 $lang['btn_recover']           = 'Taslağı geri yükle';
 $lang['btn_draftdel']          = 'Taslağı sil';
@@ -78,7 +77,6 @@ $lang['profnoempty']           = 'Boş isim veya e-posta adresine izin verilmiyo
 $lang['profchanged']           = 'Kullanıcı bilgileri başarıyla değiştirildi.';
 $lang['pwdforget']             = 'Parolanızı mı unuttunuz? Yeni bir parola alın';
 $lang['resendna']              = 'Bu wiki parolayı tekrar göndermeyi desteklememektedir.';
-$lang['resendpwd']             = 'Yeni parolayı gönder:';
 $lang['resendpwdmissing']      = 'Üzgünüz, tüm alanları doldurmalısınız.';
 $lang['resendpwdnouser']       = 'Üzgünüz,  veritabanımızda bu kullanıcıyı bulamadık.';
 $lang['resendpwdbadauth']      = 'Üzgünüz, bu doğrulama kodu doğru değil. Doğrulama linkini tam olarak kullandığınıza emin olun.';
@@ -234,17 +232,4 @@ $lang['i_pol0']                = 'Tamamen Açık Wiki (herkes okuyabilir, yazabi
 $lang['i_pol1']                = 'Açık Wiki (herkes okuyabilir, ancak  sadece üye olanlar yazabilir ve dosya yükleyebilir)';
 $lang['i_pol2']                = 'Kapalı Wiki (sadece üye olanlar okuyabilir, yazabilir ve dosya yükleyebilir)';
 $lang['i_retry']               = 'Tekrar Dene';
-$lang['mu_intro']              = 'Burada birden fazla dosyayı bir seferde yükleyebilirsiniz. Sıraya eklemek için Gözat butonuna tıklayın. Bitince yükleye tıklayın';
-$lang['mu_gridname']           = 'Dosya Adı';
-$lang['mu_gridsize']           = 'Boyutu';
-$lang['mu_gridstat']           = 'Durumu';
-$lang['mu_namespace']          = 'Namespace';
-$lang['mu_browse']             = 'Gözat';
-$lang['mu_toobig']             = 'çok büyük';
-$lang['mu_ready']              = 'yüklenmeye hazır';
-$lang['mu_done']               = 'tamamlandı';
-$lang['mu_fail']               = 'başarısız';
-$lang['mu_authfail']           = 'oturum zaman aşımına uğradı';
-$lang['mu_progress']           = '@PCT@% yüklendi';
-$lang['mu_filetypes']          = 'İzin verilen Dosya Türleri';
 $lang['recent_global']         = '<b>%s</b> namespace\'i içerisinde yapılan değişiklikleri görüntülemektesiniz. Wiki\'deki tüm değişiklikleri de <a href="%s">bu adresten</a> görebilirsiniz. ';
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index 22d61c9bf..28756e2a1 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -44,7 +44,6 @@ $lang['btn_backtomedia']       = 'Назад до вибору медіа-фай
 $lang['btn_subscribe']         = 'Підписатися';
 $lang['btn_profile']           = 'Оновити профіль';
 $lang['btn_reset']             = 'Очистити';
-$lang['btn_resendpwd']         = 'Надіслати новий пароль';
 $lang['btn_draft']             = 'Редагувати чернетку';
 $lang['btn_recover']           = 'Відновити чернетку';
 $lang['btn_draftdel']          = 'Знищити чернетку';
@@ -79,7 +78,6 @@ $lang['profnoempty']           = 'Ім’я або e-mail не можуть бу
 $lang['profchanged']           = 'Профіль успішно змінено.';
 $lang['pwdforget']             = 'Забули пароль? Отримайте новий';
 $lang['resendna']              = 'Ця Вікі не підтримує повторне відправлення пароля.';
-$lang['resendpwd']             = 'Надіслати пароль для';
 $lang['resendpwdmissing']      = 'Необхідно заповнити усі поля.';
 $lang['resendpwdnouser']       = 'Такий користувач не існує.';
 $lang['resendpwdbadauth']      = 'Код автентифікації невірний. Перевірте, чи ви використали повне посилання для підтвердження.';
@@ -263,21 +261,6 @@ $lang['i_pol1']                = 'Публічна Вікі (читання дл
 $lang['i_pol2']                = 'Закрита Вікі (читання, запис та завантаження тільки для зареєстрованих користувачів)';
 $lang['i_retry']               = 'Повторити';
 $lang['i_license']             = 'Будь ласка, виберіть тип ліцензії, під якою Ві бажаєте опублікувати матеріал:';
-$lang['mu_intro']              = 'Тут ви можете завантажити одночасно кілька файлів. Натисніть кнопку "Вибрати", щоб додати файли в чергу. Після закінчення натисніть кнопку "Завантажити"';
-$lang['mu_gridname']           = 'Ім’я файлу';
-$lang['mu_gridsize']           = 'Розмір';
-$lang['mu_gridstat']           = 'Статус';
-$lang['mu_namespace']          = 'Простір імен';
-$lang['mu_browse']             = 'Вибрати';
-$lang['mu_toobig']             = 'надто великий';
-$lang['mu_ready']              = 'готовий до завантаження';
-$lang['mu_done']               = 'закінчено';
-$lang['mu_fail']               = 'невдале';
-$lang['mu_authfail']           = 'закінчено термін дії сесії';
-$lang['mu_progress']           = 'Завантаження @PCT@%';
-$lang['mu_filetypes']          = 'Дозволені типи файлів';
-$lang['mu_info']               = 'Файли завантажено';
-$lang['mu_lasterr']            = 'Остання помилка:';
 $lang['recent_global']         = 'Ви переглядаєте зміни в межах простору імен <b>%s</b>. Також можна <a href="%s">переглянути зміни в межах усієї Вікі</a>.';
 $lang['years']                 = '%d років тому';
 $lang['months']                = '%d місяців тому';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index a46869d6c..bbbbb71a6 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -45,12 +45,13 @@ $lang['btn_backtomedia']       = '重新選擇圖檔';
 $lang['btn_subscribe']         = '訂閱更動通知';
 $lang['btn_profile']           = '更新個人資料';
 $lang['btn_reset']             = '資料重設';
-$lang['btn_resendpwd']         = '寄新密碼';
 $lang['btn_draft']             = '編輯草稿';
 $lang['btn_recover']           = '復原草稿';
 $lang['btn_draftdel']          = '捨棄草稿';
 $lang['btn_revert']            = '復原';
 $lang['btn_register']          = '註冊';
+$lang['btn_apply']             = '套用';
+$lang['btn_media']             = '多媒體管理器';
 $lang['loggedinas']            = '登入為';
 $lang['user']                  = '帳號';
 $lang['pass']                  = '密碼';
@@ -80,7 +81,6 @@ $lang['profnoempty']           = '帳號或 email 地址不可空白！';
 $lang['profchanged']           = '個人資料已成功更新囉。';
 $lang['pwdforget']             = '忘記密碼了？索取新密碼！';
 $lang['resendna']              = '本維基不開放重寄密碼';
-$lang['resendpwd']             = '寄新密碼給';
 $lang['resendpwdmissing']      = '抱歉，您必須填寫所有欄位。';
 $lang['resendpwdnouser']       = '抱歉，資料庫內找不到這個使用者';
 $lang['resendpwdbadauth']      = '抱歉，認證碼無效。請確認您使用了完整的確認連結。';
@@ -95,7 +95,7 @@ $lang['txt_filename']          = '請輸入要存在維基內的檔案名稱 (�
 $lang['txt_overwrt']           = '是否要覆蓋原有檔案';
 $lang['lockedby']              = '目前已被下列人員鎖定';
 $lang['lockexpire']            = '預計解除鎖定於';
-$lang['js']['willexpire']            = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
+$lang['js']['willexpire']      = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
 $lang['js']['notsavedyet']     = '未儲存的變更將會遺失，繼續嗎？';
 $lang['js']['searchmedia']     = '搜尋檔案';
 $lang['js']['keepopen']        = '選擇時保持視窗開啟';
@@ -126,6 +126,17 @@ $lang['js']['nosmblinks']      = '只有在 Microsoft IE 下才能執行「連�
 $lang['js']['linkwiz']         = '建立連結精靈';
 $lang['js']['linkto']          = '連結至：';
 $lang['js']['del_confirm']     = '確定刪除選取的項目？';
+$lang['js']['restore_confirm'] = '確定還原到這個版本？';
+$lang['js']['media_diff']      = '檢視差異:';
+$lang['js']['media_diff_both'] = '並排';
+$lang['js']['media_diff_opacity'] = '重疊';
+$lang['js']['media_diff_portions'] = '滑動';
+$lang['js']['media_select']    = '選擇檔案…';
+$lang['js']['media_upload_btn'] = '上傳';
+$lang['js']['media_done_btn']  = '完成';
+$lang['js']['media_drop']      = '拖拉檔案到此上傳';
+$lang['js']['media_cancel']    = '刪除';
+$lang['js']['media_overwrt']   = '覆蓋已存在的檔案';
 $lang['rssfailed']             = '擷取 RSS 饋送檔時發生錯誤：';
 $lang['nothingfound']          = '沒找到任何結果。';
 $lang['mediaselect']           = '媒體檔案';
@@ -180,6 +191,10 @@ $lang['mail_changed']          = '變更的頁面:';
 $lang['mail_subscribe_list']   = '命名空間中更動的頁面:';
 $lang['mail_new_user']         = '新使用者:';
 $lang['mail_upload']           = '已上傳檔案:';
+$lang['changes_type']          = '檢視最近更新類型';
+$lang['pages_changes']         = '頁面';
+$lang['media_changes']         = '多媒體檔案';
+$lang['both_changes']          = '頁面和多媒體檔案';
 $lang['qb_bold']               = '粗體';
 $lang['qb_italic']             = '斜體';
 $lang['qb_underl']             = '底線';
@@ -220,6 +235,9 @@ $lang['img_copyr']             = '版權';
 $lang['img_format']            = '格式';
 $lang['img_camera']            = '相機';
 $lang['img_keywords']          = '關鍵字';
+$lang['img_width']             = '寬度';
+$lang['img_height']            = '高度';
+$lang['img_manager']           = '在多媒體管理器中檢視';
 $lang['subscr_subscribe_success'] = '已將 %s 加入至 %s 的訂閱列表';
 $lang['subscr_subscribe_error'] = '將 %s 加入至 %s 的訂閱列表時發生錯誤';
 $lang['subscr_subscribe_noaddress'] = '沒有與您登入相關的地址，無法將您加入訂閱列表';
@@ -262,21 +280,6 @@ $lang['i_pol1']                = '公開的維基 (任何人可讀取，註冊�
 $lang['i_pol2']                = '封閉的維基 (只有註冊使用者可讀取、寫入、上傳)';
 $lang['i_retry']               = '重試';
 $lang['i_license']             = '請選擇您想要的內容發布許可協議：';
-$lang['mu_intro']              = '您可以在這裡一次上傳多個檔案。按下瀏覽按鈕加入檔案，然後按上傳按鈕開始上傳。';
-$lang['mu_gridname']           = '檔案名稱';
-$lang['mu_gridsize']           = '檔案大小';
-$lang['mu_gridstat']           = '狀態';
-$lang['mu_namespace']          = '命名空間';
-$lang['mu_browse']             = '瀏覽';
-$lang['mu_toobig']             = '太大';
-$lang['mu_ready']              = '準備上傳';
-$lang['mu_done']               = '完成';
-$lang['mu_fail']               = '失敗';
-$lang['mu_authfail']           = '作業階段逾時';
-$lang['mu_progress']           = '@PCT@% 已上傳';
-$lang['mu_filetypes']          = '接受的檔案類型';
-$lang['mu_info']               = '檔案已上傳。';
-$lang['mu_lasterr']            = '最新一筆錯誤紀錄：';
 $lang['recent_global']         = '您正在閱讀命名空間： <b>%s</b> 中的變更。您亦可觀看整個維基的<a href="%s">最近更新</a>。';
 $lang['years']                 = '%d 年前';
 $lang['months']                = '%d 個月前';
@@ -286,3 +289,27 @@ $lang['hours']                 = '%d 個小時前';
 $lang['minutes']               = '%d 分鐘前';
 $lang['seconds']               = '%s 秒鐘前';
 $lang['wordblock']             = '您的更改沒有被儲存，因为它包含被阻擋的文字 (垃圾訊息)。';
+$lang['media_uploadtab']       = '上傳';
+$lang['media_searchtab']       = '搜尋';
+$lang['media_file']            = '檔案';
+$lang['media_viewtab']         = '檢視';
+$lang['media_edittab']         = '編輯';
+$lang['media_historytab']      = '歷史紀錄';
+$lang['media_list_thumbs']     = '縮圖';
+$lang['media_list_rows']       = '列表';
+$lang['media_sort_name']       = '名稱';
+$lang['media_sort_date']       = '日期';
+$lang['media_namespaces']      = '選擇命名空間';
+$lang['media_files']           = '在 %s 中的檔案';
+$lang['media_upload']          = '上傳至 %s';
+$lang['media_search']          = '在 %s 中搜尋';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s 在 %s';
+$lang['media_edit']            = '編輯 %s';
+$lang['media_history']         = '%s 的歷史紀錄';
+$lang['media_meta_edited']     = '元資料已編輯';
+$lang['media_perm_read']       = '抱歉，您沒有足夠權限讀取檔案';
+$lang['media_perm_upload']     = '抱歉，您沒有足夠權限上傳檔案。';
+$lang['media_update']          = '上傳新的版本';
+$lang['media_restore']         = '還原這個版本';
+$lang['plugin_install_err']    = '插件安裝錯誤。將插件目錄 "%s" 重新命名為 "%s"';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 6e6dff6f4..9d125ce44 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -14,6 +14,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -49,7 +50,6 @@ $lang['btn_backtomedia']       = '返回到媒体文件选择工具';
 $lang['btn_subscribe']         = '订阅本页更改';
 $lang['btn_profile']           = '更新个人信息';
 $lang['btn_reset']             = '重设';
-$lang['btn_resendpwd']         = '发送新密码';
 $lang['btn_draft']             = '编辑草稿';
 $lang['btn_recover']           = '恢复草稿';
 $lang['btn_draftdel']          = '删除草稿';
@@ -86,7 +86,6 @@ $lang['profnoempty']           = '不允许使用空的用户名或邮件地址�
 $lang['profchanged']           = '用户信息更新成功。';
 $lang['pwdforget']             = '忘记密码？立即获取新密码';
 $lang['resendna']              = '本维基不支持二次发送密码。';
-$lang['resendpwd']             = '发送新密码给';
 $lang['resendpwdmissing']      = '对不起，您必须填写所有的区域。';
 $lang['resendpwdnouser']       = '对不起，在我们的用户数据中找不到该用户。';
 $lang['resendpwdbadauth']      = '对不起，该认证码错误。请使用完整的确认链接。';
@@ -289,21 +288,7 @@ $lang['i_pol1']                = '公共的维基（任何人都有读的权限�
 $lang['i_pol2']                = '关闭的维基（只有注册用户才有读、写、上传的权限）';
 $lang['i_retry']               = '重试';
 $lang['i_license']             = '请选择您希望的内容发布许可协议：';
-$lang['mu_intro']              = '您可以在此一次上传多个文件。点按浏览按钮添加文件到上传队列中，先好后按上传钮。';
-$lang['mu_gridname']           = '文件名';
-$lang['mu_gridsize']           = '大小';
-$lang['mu_gridstat']           = '状态';
-$lang['mu_namespace']          = '名称空间';
-$lang['mu_browse']             = '浏览';
-$lang['mu_toobig']             = '过大';
-$lang['mu_ready']              = '准备好上传';
-$lang['mu_done']               = '完成';
-$lang['mu_fail']               = '失败';
-$lang['mu_authfail']           = '会话过期';
-$lang['mu_progress']           = '@PCT@% 上传完成';
-$lang['mu_filetypes']          = '允许的文件类型';
-$lang['mu_info']               = '文件已上传。';
-$lang['mu_lasterr']            = '最后一个错误：';
+
 $lang['recent_global']         = '您当前看到的是<b>%s</b> 名称空间的变动。你还可以在<a href="%s">查看整个维基的近期变动</a>。';
 $lang['years']                 = '%d年前';
 $lang['months']                = '%d月前';
@@ -315,18 +300,22 @@ $lang['seconds']               = '%d秒前';
 $lang['wordblock']             = '您的更改没有被保存，因为它包含被屏蔽的文字（垃圾信息）。';
 $lang['media_uploadtab']       = '上传';
 $lang['media_searchtab']       = '搜索';
+$lang['media_file']            = '文件';
 $lang['media_viewtab']         = '查看';
 $lang['media_edittab']         = '编辑';
 $lang['media_historytab']      = '历史';
-$lang['media_thumbsview']      = '缩略图';
-$lang['media_listview']        = '列表';
-$lang['media_sort']            = '排序';
+$lang['media_list_thumbs']     = '缩图';
+$lang['media_list_rows']       = '列表';
 $lang['media_sort_name']       = '按名称';
 $lang['media_sort_date']       = '按日期';
+$lang['media_namespaces']      = '选择命名空间';
+$lang['media_files']           = '在 %s 中的文件';
 $lang['media_upload']          = '上传到 <strong>%s</strong> 命名空间。';
 $lang['media_search']          = '在 <strong>%s</strong> 命名空间中搜索。';
-$lang['media_edit']            = '编辑';
-$lang['media_history']         = '这些是文件的旧版本。';
+$lang['media_view']            = '%s 在 %s';
+$lang['media_viewold']         = '%s ';
+$lang['media_edit']            = '编辑 %s';
+$lang['media_history']         = '%s 的历史纪录';
 $lang['media_meta_edited']     = '元数据已编辑';
 $lang['media_perm_read']       = '抱歉，您没有足够权限读取这些文件。';
 $lang['media_perm_upload']     = '抱歉，您没有足够权限来上传文件。';
diff --git a/inc/media.php b/inc/media.php
index 9d3e90a54..66c531452 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -108,7 +108,7 @@ function media_metaform($id,$auth){
     $src = mediaFN($id);
 
     // output
-    $form = new Doku_Form(array('action' => media_managerURL(array('tab_details' => 'view')),
+    $form = new Doku_Form(array('action' => media_managerURL(array('tab_details' => 'view'), '&'),
                                 'class' => 'meta'));
     $form->addHidden('img', $id);
     $form->addHidden('mediado', 'save');
@@ -230,16 +230,18 @@ function media_upload_xhr($ns,$auth){
     $id = $_GET['qqfile'];
     list($ext,$mime,$dl) = mimetype($id);
     $input = fopen("php://input", "r");
-    $temp = tmpfile();
-    $realSize = stream_copy_to_stream($input, $temp);
-    fclose($input);
-    if ($realSize != (int)$_SERVER["CONTENT_LENGTH"]) return false;
     if (!($tmp = io_mktmpdir())) return false;
     $path = $tmp.'/'.md5($id);
     $target = fopen($path, "w");
-    fseek($temp, 0, SEEK_SET);
-    stream_copy_to_stream($temp, $target);
+    $realSize = stream_copy_to_stream($input, $target);
     fclose($target);
+    fclose($input);
+    if ($realSize != (int)$_SERVER["CONTENT_LENGTH"]){
+        unlink($target);
+        unlink($path);
+        return false;
+    }
+
     $res = media_save(
         array('name' => $path,
             'mime' => $mime,
@@ -332,7 +334,7 @@ function media_save($file, $id, $ow, $auth, $move) {
     global $lang, $conf;
 
     // get filename
-    $id   = cleanID($id,false,true);
+    $id   = cleanID($id);
     $fn   = mediaFN($id);
 
     // get filetype regexp
@@ -757,7 +759,7 @@ function media_tab_search($ns,$auth=null) {
     echo '<div class="search">'.NL;
 
     media_searchform($ns, $query, true);
-    if ($do == 'searchlist') {
+    if ($do == 'searchlist' || $query) {
         media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
     }
     echo '</div>'.NL;
@@ -830,6 +832,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
     $size = media_image_preview_size($image, $rev, $meta);
 
     if ($size) {
+        global $lang;
         echo '<div class="image">';
 
         $more = array();
@@ -843,7 +846,10 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         $more['w'] = $size[0];
         $more['h'] = $size[1];
         $src = ml($image, $more);
+
+        echo '<a href="'.$src.'" target="_blank" title="'.$lang['mediaview'].'">';
         echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />';
+        echo '</a>';
 
         echo '</div>'.NL;
     }
@@ -1110,6 +1116,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     list($l_head, $r_head) = html_diff_head($l_rev, $r_rev, $image, true);
 
     ?>
+    <div class="table">
     <table>
       <tr>
         <th><?php echo $l_head; ?></th>
@@ -1177,6 +1184,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     echo '</tr>'.NL;
 
     echo '</table>'.NL;
+    echo '</div>'.NL;
 
     if ($is_img && !$fromajax) echo '</div>';
 }
@@ -1350,7 +1358,7 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
     $info .= filesize_h($item['size']);
 
     // output
-    echo '<div class="'.$zebra.'"'.$jump.'>'.NL;
+    echo '<div class="'.$zebra.'"'.$jump.' title="'.hsc($item['id']).'">'.NL;
     if (!$display_namespace) {
         echo '<a name="h_:'.$item['id'].'" class="'.$class.'">'.hsc($file).'</a> ';
     } else {
@@ -1364,7 +1372,7 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
         'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
 
     // mediamanager button
-    $link = wl('',array('do'=>'media','image'=>$item['id']));
+    $link = wl('',array('do'=>'media','image'=>$item['id'],'ns'=>getNS($item['id'])));
     echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/mediamanager.png" '.
         'alt="'.$lang['btn_media'].'" title="'.$lang['btn_media'].'" class="btn" /></a>';
 
@@ -1411,7 +1419,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
     $file = utf8_decodeFN($item['file']);
 
     // output
-    echo '<li><dl>'.NL;
+    echo '<li><dl title="'.hsc($item['id']).'">'.NL;
 
         echo '<dt>';
     if($item['isimg']) {
@@ -1674,7 +1682,7 @@ function media_nstree_item($item){
     $ret  = '';
     if (!($_REQUEST['do'] == 'media'))
     $ret .= '<a href="'.DOKU_BASE.'lib/exe/mediamanager.php?ns='.idfilter($item['id']).'" class="idx_dir">';
-    else $ret .= '<a href="'.media_managerURL(array('ns' => idfilter($item['id']), 'tab_files' => 'files'))
+    else $ret .= '<a href="'.media_managerURL(array('ns' => idfilter($item['id'], false), 'tab_files' => 'files'))
         .'" class="idx_dir">';
     $ret .= $item['label'];
     $ret .= '</a>';
@@ -1778,7 +1786,7 @@ function media_crop_image($file, $ext, $w, $h=0){
     $local = getCacheName($file,'.media.'.$cw.'x'.$ch.'.crop.'.$ext);
     $mtime = @filemtime($local); // 0 if not exists
 
-    if( $mtime > filemtime($file) ||
+    if( $mtime > @filemtime($file) ||
             media_crop_imageIM($ext,$file,$info[0],$info[1],$local,$cw,$ch,$cx,$cy) ||
             media_resize_imageGD($ext,$file,$cw,$ch,$local,$cw,$ch,$cx,$cy) ){
         if($conf['fperm']) chmod($local, $conf['fperm']);
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 31b5f9ff9..151fa5987 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -92,7 +92,7 @@ function getID($param='id',$clean=true){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @param  string  $raw_id    The pageid to clean
  * @param  boolean $ascii     Force ASCII
- * @param  boolean $media     Allow leading or trailing _ for media files
+ * @param  boolean $media     DEPRECATED
  */
 function cleanID($raw_id,$ascii=false,$media=false){
     global $conf;
@@ -132,7 +132,7 @@ function cleanID($raw_id,$ascii=false,$media=false){
     //clean up
     $id = preg_replace($sepcharpat,$sepchar,$id);
     $id = preg_replace('#:+#',':',$id);
-    $id = ($media ? trim($id,':.-') : trim($id,':._-'));
+    $id = trim($id,':._-');
     $id = preg_replace('#:[:\._\-]+#',':',$id);
     $id = preg_replace('#[:\._\-]+:#',':',$id);
 
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 136c37531..8bfdc3b9c 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -455,16 +455,16 @@ class Doku_Renderer_metadata extends Doku_Renderer {
     global $conf;
 
     $isImage = false;
-    if (is_null($title)){
+    if (is_array($title)){
+      if($title['title']) return '['.$title['title'].']';
+    } else if (is_null($title) || trim($title)==''){
       if (useHeading('content') && $id){
         $heading = p_get_first_heading($id,METADATA_DONT_RENDER);
         if ($heading) return $heading;
       }
       return $default;
-    } else if (is_string($title)){
+    } else {
       return $title;
-    } else if (is_array($title)){
-      if($title['title']) return '['.$title['title'].']';
     }
   }
 
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 68d4e4569..cf132ce97 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -929,7 +929,7 @@ class Doku_Parser_Mode_windowssharelink extends Doku_Parser_Mode {
     var $pattern;
 
     function preConnect() {
-        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w$]+)+";
+        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w-$]+)+";
     }
 
     function connectTo($mode) {
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index ea1756803..4345b494f 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -29,7 +29,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     var $doc = '';        // will contain the whole document
     var $toc = array();   // will contain the Table of Contents
 
-    private $sectionedits = array(); // A stack of section edit data
+    var $sectionedits = array(); // A stack of section edit data
 
     var $headers = array();
     var $footnotes = array();
@@ -566,6 +566,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     function internallink($id, $name = NULL, $search=NULL,$returnonly=false,$linktype='content') {
         global $conf;
         global $ID;
+        global $INFO;
 
         $params = '';
         $parts = explode('?', $id, 2);
@@ -610,7 +611,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['pre']    = '';
         $link['suf']    = '';
         // highlight link to current page
-        if ($id == $ID) {
+        if ($id == $INFO['id']) {
             $link['pre']    = '<span class="curid">';
             $link['suf']    = '</span>';
         }
@@ -807,7 +808,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         //markup non existing files
         if (!$exists) {
             $link['class'] .= ' wikilink2';
-            $link['url'] = media_managerURL(array('tab_details' => 'view', 'image' => $src, 'ns' => getNS($src)), '&');
         }
 
         //output formatted
diff --git a/inc/remote.php b/inc/remote.php
index 105969f8b..c8af76420 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -92,7 +92,7 @@ class RemoteAPI {
         $plugin = plugin_load('remote', $pluginName);
         $methods = $this->getPluginMethods();
         if (!$plugin) {
-            throw new RemoteException('Method dose not exists');
+            throw new RemoteException('Method dose not exists', -32603);
         }
         $this->checkAccess($methods[$method]);
         $name = $this->getMethodName($methods, $method);
@@ -103,7 +103,7 @@ class RemoteAPI {
         $coreMethods = $this->getCoreMethods();
         $this->checkAccess($coreMethods[$method]);
         if (!isset($coreMethods[$method])) {
-            throw new RemoteException('Method dose not exists');
+            throw new RemoteException('Method dose not exists', -32603);
         }
         $this->checkArgumentLength($coreMethods[$method], $args);
         return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args);
@@ -121,7 +121,7 @@ class RemoteAPI {
 
     private function checkArgumentLength($method, $args) {
         if (count($method['args']) < count($args)) {
-            throw new RemoteException('Method dose not exists - wrong parameter count.');
+            throw new RemoteException('Method dose not exists - wrong parameter count.', -32603);
         }
     }
 
@@ -158,7 +158,7 @@ class RemoteAPI {
      */
     public function forceAccess() {
         if (!$this->hasAccess()) {
-            throw new RemoteAccessDeniedException();
+            throw new RemoteAccessDeniedException('server error. not authorized to call method', -32603);
         }
     }
 
@@ -220,4 +220,4 @@ class RemoteAPI {
     public function setFileTransformation($fileTransformation) {
         $this->fileTransformation = $fileTransformation;
     }
-}
-\ No newline at end of file
+}
diff --git a/inc/template.php b/inc/template.php
index c70e407d6..d9a2042ad 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -23,6 +23,31 @@ function template($tpl){
     return DOKU_INC.'lib/tpl/default/'.$tpl;
 }
 
+
+/**
+ * Convenience function to access template dir from local FS
+ *
+ * This replaces the deprecated DOKU_TPLINC constant
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_incdir(){
+    global $conf;
+    return DOKU_INC.'lib/tpl/'.$conf['template'].'/';
+}
+
+/**
+ * Convenience function to access template dir from web
+ *
+ * This replaces the deprecated DOKU_TPL constant
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_basedir(){
+    global $conf;
+    return DOKU_BASE.'lib/tpl/'.$conf['template'].'/';
+}
+
 /**
  * Print the content
  *
@@ -970,9 +995,10 @@ function tpl_img($maxwidth=0,$maxheight=0,$link=true,$params=null){
  * Default action for TPL_IMG_DISPLAY
  */
 function _tpl_img_action($data, $param=NULL) {
+    global $lang;
     $p = buildAttributes($data['params']);
 
-    if($data['url']) print '<a href="'.hsc($data['url']).'">';
+    if($data['url']) print '<a href="'.hsc($data['url']).'" title="'.$lang['mediaview'].'">';
     print '<img '.$p.'/>';
     if($data['url']) print '</a>';
     return true;
@@ -1033,7 +1059,7 @@ function tpl_getConf($id){
  */
 function tpl_loadConfig(){
 
-    $file = DOKU_TPLINC.'/conf/default.php';
+    $file = tpl_incdir().'/conf/default.php';
     $conf = array();
 
     if (!@file_exists($file)) return false;
@@ -1054,7 +1080,7 @@ function tpl_getLang($id){
     static $lang = array();
 
     if (count($lang) === 0){
-        $path = DOKU_TPLINC.'lang/';
+        $path = tpl_incdir().'lang/';
 
         $lang = array();
 
@@ -1206,12 +1232,13 @@ function tpl_mediaFileDetails($image, $rev){
     list($ext,$mime,$dl) = mimetype($image,false);
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
-    $tabTitle = '<strong class="'.$class.'">'.$image.'</strong>';
+    $tabTitle = '<strong class="'.$class.'"><a href="'.ml($image).'" title="'.$lang['mediaview'].'">'.$image.'</a>'.'</strong>';
     if ($opened_tab === 'view' && $rev) {
         printf($lang['media_viewold'], $tabTitle, dformat($rev));
     } else {
         printf($lang['media_' . $opened_tab], $tabTitle);
     }
+
     echo '</h3></div>'.NL;
 
     echo '<div class="panelContent">'.NL;
@@ -1261,6 +1288,7 @@ function tpl_actiondropdown($empty='',$button='&gt;'){
     global $auth;
 
     echo '<form action="' . DOKU_SCRIPT . '" method="post" accept-charset="utf-8">';
+    echo '<div class="no">';
     echo '<input type="hidden" name="id" value="'.$ID.'" />';
     if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />';
     echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />';
@@ -1268,36 +1296,42 @@ function tpl_actiondropdown($empty='',$button='&gt;'){
     echo '<select name="do" class="edit quickselect">';
     echo '<option value="">'.$empty.'</option>';
 
-    echo '<optgroup label=" &mdash; ">';
+    echo '<optgroup label="'.$lang['page_tools'].'">';
         $act = tpl_get_action('edit');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('revisions');
+        $act = tpl_get_action('revert');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('revert');
+        $act = tpl_get_action('revisions');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
         $act = tpl_get_action('backlink');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-    echo '</optgroup>';
 
-    echo '<optgroup label=" &mdash; ">';
+        $act = tpl_get_action('subscribe');
+        if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
+        echo '</optgroup>';
+
+    echo '<optgroup label="'.$lang['site_tools'].'">';
         $act = tpl_get_action('recent');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
+        $act = tpl_get_action('media');
+        if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
+
         $act = tpl_get_action('index');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
     echo '</optgroup>';
 
-    echo '<optgroup label=" &mdash; ">';
+    echo '<optgroup label="'.$lang['user_tools'].'">';
         $act = tpl_get_action('login');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('profile');
+        $act = tpl_get_action('register');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('subscribe');
+        $act = tpl_get_action('profile');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
         $act = tpl_get_action('admin');
@@ -1306,6 +1340,7 @@ function tpl_actiondropdown($empty='',$button='&gt;'){
 
     echo '</select>';
     echo '<input type="submit" value="'.$button.'" />';
+    echo '</div>';
     echo '</form>';
 }
 
@@ -1354,9 +1389,12 @@ function tpl_license($img='badge',$imgonly=false,$return=false){
  */
 function tpl_include_page($pageid,$print=true){
     global $ID;
-    $oldid = $ID;
+    global $TOC;
+    $oldid  = $ID;
+    $oldtoc = $TOC;
     $html = p_wiki_xhtml($pageid,'',false);
-    $ID = $oldid;
+    $ID  = $oldid;
+    $TOC = $oldtoc;
 
     if(!$print) return $html;
     echo $html;
@@ -1445,24 +1483,57 @@ function tpl_flush(){
     flush();
 }
 
+/**
+ * Tries to find a ressource file in the given locations.
+ *
+ * If a given location starts with a colon it is assumed to be a media
+ * file, otherwise it is assumed to be relative to the current template
+ *
+ * @param  array $search       locations to look at
+ * @param  bool $abs           if to use absolute URL
+ * @param  arrayref $imginfo   filled with getimagesize()
+ * @author Andreas  Gohr <andi@splitbrain.org>
+ */
+function tpl_getMediaFile($search, $abs=false, &$imginfo=null){
+    // loop through candidates until a match was found:
+    foreach($search as $img){
+        if(substr($img,0,1) == ':'){
+            $file    = mediaFN($img);
+            $ismedia = true;
+        }else{
+            $file = tpl_incdir().$img;
+            $ismedia = false;
+        }
+
+        if(file_exists($file)) break;
+    }
+
+    // fetch image data if requested
+    if(!is_null($imginfo)){
+        $imginfo = getimagesize($file);
+    }
+
+    // build URL
+    if($ismedia){
+        $url = ml($img, '', true, '', $abs);
+    }else{
+        $url = tpl_basedir().$img;
+        if($abs) $url = DOKU_URL.substr($url, strlen(DOKU_REL));
+    }
+
+    return $url;
+}
 
 /**
  * Returns icon from data/media root directory if it exists, otherwise
  * the one in the template's image directory.
  *
- * @param  bool $abs        - if to use absolute URL
- * @param  string $fileName - file name of icon
+ * @deprecated Use tpl_getMediaFile() instead
  * @author Anika Henke <anika@selfthinker.org>
  */
 function tpl_getFavicon($abs=false, $fileName='favicon.ico') {
-    if (file_exists(mediaFN($fileName))) {
-        return ml($fileName, '', true, '', $abs);
-    }
-
-    if($abs) {
-        return DOKU_URL.substr(DOKU_TPL.'images/'.$fileName, strlen(DOKU_REL));
-    }
-    return DOKU_TPL.'images/'.$fileName;
+    $look = array(":wiki:$fileName", ":$fileName", "images/$fileName");
+    return tpl_getMediaFile($look, $abs);
 }
 
 /**
@@ -1478,14 +1549,17 @@ function tpl_favicon($types=array('favicon')) {
     foreach ($types as $type) {
         switch($type) {
             case 'favicon':
-                $return .= '<link rel="shortcut icon" href="'.tpl_getFavicon().'" />'.NL;
+                $look = array(':wiki:favicon.ico', ':favicon.ico', 'images/favicon.ico');
+                $return .= '<link rel="shortcut icon" href="'.tpl_getMediaFile($look).'" />'.NL;
                 break;
             case 'mobile':
-                $return .= '<link rel="apple-touch-icon" href="'.tpl_getFavicon(false, 'apple-touch-icon.png').'" />'.NL;
+                $look = array(':wiki:apple-touch-icon.png', ':apple-touch-icon.png', 'images/apple-touch-icon.ico');
+                $return .= '<link rel="apple-touch-icon" href="'.tpl_getMediaFile($look).'" />'.NL;
                 break;
             case 'generic':
                 // ideal world solution, which doesn't work in any browser yet
-                $return .= '<link rel="icon" href="'.tpl_getFavicon(false, 'icon.svg').'" type="image/svg+xml" />'.NL;
+                $look = array(':wiki:favicon.svg', ':favicon.svg', 'images/favicon.svg');
+                $return .= '<link rel="icon" href="'.tpl_getMediaFile($look).'" type="image/svg+xml" />'.NL;
                 break;
         }
     }
diff --git a/install.php b/install.php
index 2f600c925..61db2be9f 100644
--- a/install.php
+++ b/install.php
@@ -49,6 +49,7 @@ $dokuwiki_hash = array(
     '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8',
     '2011-05-25'   => '4241865472edb6fa14a1227721008072',
     '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
+    '2012-01-25'   => '72c083c73608fc43c586901fd5dabb74',
 );
 
 
@@ -419,16 +420,18 @@ function check_permissions(){
     global $lang;
 
     $dirs = array(
-        'conf'      => DOKU_LOCAL,
-        'data'      => DOKU_INC.'data',
-        'pages'     => DOKU_INC.'data/pages',
-        'attic'     => DOKU_INC.'data/attic',
-        'media'     => DOKU_INC.'data/media',
-        'meta'      => DOKU_INC.'data/meta',
-        'cache'     => DOKU_INC.'data/cache',
-        'locks'     => DOKU_INC.'data/locks',
-        'index'     => DOKU_INC.'data/index',
-        'tmp'       => DOKU_INC.'data/tmp'
+        'conf'        => DOKU_LOCAL,
+        'data'        => DOKU_INC.'data',
+        'pages'       => DOKU_INC.'data/pages',
+        'attic'       => DOKU_INC.'data/attic',
+        'media'       => DOKU_INC.'data/media',
+        'media_attic' => DOKU_INC.'data/media_attic',
+        'media_meta'  => DOKU_INC.'data/media_meta',
+        'meta'        => DOKU_INC.'data/meta',
+        'cache'       => DOKU_INC.'data/cache',
+        'locks'       => DOKU_INC.'data/locks',
+        'index'       => DOKU_INC.'data/index',
+        'tmp'         => DOKU_INC.'data/tmp'
     );
 
     $ok = true;
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index f8d62cb57..3d1584244 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -6,11 +6,6 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-//fix for Opera XMLHttpRequests
-if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){
-    parse_str($HTTP_RAW_POST_DATA, $_POST);
-}
-
 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
 require_once(DOKU_INC.'inc/init.php');
 //close session
@@ -54,6 +49,8 @@ function ajax_qsearch(){
     if(empty($query)) $query = $_GET['q'];
     if(empty($query)) return;
 
+    $query = urldecode($query);
+
     $data = ft_pageLookup($query, true, useHeading('navigation'));
 
     if(!count($data)) return;
@@ -257,7 +254,7 @@ function ajax_mediaupload(){
         $id = $_GET['qqfile'];
     }
 
-    $id = cleanID($id, false, true);
+    $id = cleanID($id);
 
     $NS = $_REQUEST['ns'];
     $ns = $NS.':'.getNS($id);
diff --git a/lib/exe/css.php b/lib/exe/css.php
index d54e2e46c..69b512205 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -41,8 +41,8 @@ function css_out(){
         $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/';
         $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/';
     }else{
-        $tplinc = DOKU_TPLINC;
-        $tpldir = DOKU_TPL;
+        $tplinc = tpl_incdir();
+        $tpldir = tpl_basedir();
     }
 
     // The generated script depends on some dynamic options
diff --git a/lib/exe/js.php b/lib/exe/js.php
index b7f2fd222..4b72014b2 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -32,8 +32,8 @@ function js_out(){
     global $config_cascade;
 
     // The generated script depends on some dynamic options
-    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],
-                       '.js');
+    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js');
+    $cache->_event = 'JS_CACHE_USE';
 
     // load minified version for some files
     $min = $conf['compress'] ? '.min' : '';
@@ -65,7 +65,7 @@ function js_out(){
 # disabled for FS#1958                DOKU_INC.'lib/scripts/hotkeys.js',
                 DOKU_INC.'lib/scripts/behaviour.js',
                 DOKU_INC.'lib/scripts/page.js',
-                DOKU_TPLINC.'script.js',
+                tpl_incdir().'script.js',
             );
 
     // add possible plugin scripts and userscript
@@ -79,15 +79,15 @@ function js_out(){
 
     // check cache age & handle conditional request
     // This may exit if a cache can be used
-    http_cached($cache->cache,
-                $cache->useCache(array('files' => $cache_files)));
+    $cache_ok = $cache->useCache(array('files' => $cache_files));
+    http_cached($cache->cache, $cache_ok);
 
     // start output buffering and build the script
     ob_start();
 
     // add some global variables
     print "var DOKU_BASE   = '".DOKU_BASE."';";
-    print "var DOKU_TPL    = '".DOKU_TPL."';";
+    print "var DOKU_TPL    = '".tpl_basedir()."';";
     // FIXME: Move those to JSINFO
     print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
     print "var DOKU_UHC    = ".((int) useHeading('content')).";";
diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php
index 03a1632c4..73939c347 100644
--- a/lib/exe/opensearch.php
+++ b/lib/exe/opensearch.php
@@ -16,9 +16,9 @@ require_once(DOKU_INC.'inc/init.php');
 // try to be clever about the favicon location
 if(file_exists(DOKU_INC.'favicon.ico')){
     $ico = DOKU_URL.'favicon.ico';
-}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){
+}elseif(file_exists(tpl_incdir().'images/favicon.ico')){
     $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico';
-}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){
+}elseif(file_exists(tpl_incdir().'favicon.ico')){
     $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico';
 }else{
     $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico';
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index a48ac41b0..93086e891 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -4,11 +4,6 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
 // fix when '< ?xml' isn't on the very first line
 if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
 
-/**
- * Increased whenever the API is changed
- */
-define('DOKU_XMLRPC_API_VERSION', 6);
-
 require_once(DOKU_INC.'inc/init.php');
 require_once(DOKU_INC.'inc/remote.php');
 session_write_close();  //close session
@@ -42,7 +37,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server {
             } else {
                 header('HTTP/1.1 403 Forbidden');
             }
-            return new IXR_Error(-32603, 'server error. not authorized to call method');
+            return new IXR_Error(-32603, "server error. not authorized to call method $methodname");
         } catch (RemoteException $e) {
             return new IXR_Error($e->getCode(), $e->getMessage());
         }
@@ -55,7 +50,6 @@ class dokuwiki_xmlrpc_server extends IXR_Server {
     function toFile($data) {
         return new IXR_Base64($data);
     }
-
 }
 
 $server = new dokuwiki_xmlrpc_server();
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a6b0624bc..c3461b78b 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -597,6 +597,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '<input type="hidden" name="do" value="admin" />'.NL;
         echo '<input type="hidden" name="page" value="acl" />'.NL;
         echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL;
+        echo '<div class="table">';
         echo '<table class="inline">';
         echo '<tr>';
         echo '<th>'.$this->getLang('where').'</th>';
@@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '</th>';
         echo '</tr>';
         echo '</table>';
+        echo '</div>';
         echo '</div></form>'.NL;
     }
 
diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index d704fa8c9..71a2eb03a 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -7,7 +7,7 @@
  */
 
 //fix for Opera XMLHttpRequests
-if(!count($_POST) && $HTTP_RAW_POST_DATA){
+if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){
   parse_str($HTTP_RAW_POST_DATA, $_POST);
 }
 
diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index cc1d97023..a1dce0369 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -10,6 +10,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['admin_acl']             = 'Správa přístupových práv';
 $lang['acl_group']             = 'Skupina';
diff --git a/lib/plugins/acl/lang/fr/help.txt b/lib/plugins/acl/lang/fr/help.txt
index f748f6b23..158ec92ed 100644
--- a/lib/plugins/acl/lang/fr/help.txt
+++ b/lib/plugins/acl/lang/fr/help.txt
@@ -2,8 +2,8 @@
 
 Cette page vous permet d'ajouter ou de supprimer des permissions pour les catégories et les pages de votre wiki. Le panneau de gauche liste toutes les catégories et les pages disponibles.
 
-Le formulaire au-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
+Le formulaire ci-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
 
 Dans le tableau ci-dessous, toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACL.
 
-La lecture de [[doku>acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki.
+La lecture de [[doku>fr:acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki.
diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index 86f493b52..a33a52bf0 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -21,6 +21,7 @@
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
  */
 $lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
 $lang['acl_group']             = 'Groupe';
diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php
index 774bf207a..db57598e6 100644
--- a/lib/plugins/acl/lang/gl/lang.php
+++ b/lib/plugins/acl/lang/gl/lang.php
@@ -3,6 +3,7 @@
  * Galicianlanguage file
  *
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['admin_acl']             = 'Xestión da Lista de Control de Acceso (ACL)';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 6f4e991cb..6b1e77cf8 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -11,6 +11,7 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['admin_acl']             = '접근 제어 목록 관리';
 $lang['acl_group']             = '그룹';
diff --git a/lib/plugins/acl/lang/ms/lang.php b/lib/plugins/acl/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/acl/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index 686909644..cb0765505 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -17,6 +17,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
diff --git a/lib/plugins/acl/lang/no/help.txt b/lib/plugins/acl/lang/no/help.txt
index f02b6bdbd..c3d3688a9 100644
--- a/lib/plugins/acl/lang/no/help.txt
+++ b/lib/plugins/acl/lang/no/help.txt
@@ -1,4 +1,4 @@
-===Lynhjelp===
+=== Hurtighjelp: ===
 
 På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki.
 
diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php
index 587f9c2fc..09d71937a 100644
--- a/lib/plugins/acl/lang/no/lang.php
+++ b/lib/plugins/acl/lang/no/lang.php
@@ -17,6 +17,7 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
 $lang['admin_acl']             = 'Administrasjon av lister for adgangskontroll (ACL)';
 $lang['acl_group']             = 'Gruppe';
@@ -34,10 +35,10 @@ $lang['p_choose_ns']           = '<b>Før inn en bruker eller gruppe</b> i skjem
 $lang['p_inherited']           = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.';
 $lang['p_isadmin']             = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.';
 $lang['p_include']             = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for å opprette, laste opp og slette gjelder bare  for navnerom, ikke enkeltsider.';
-$lang['current']               = 'Någjeldende ACL-regler';
+$lang['current']               = 'Gjeldende ACL-regler';
 $lang['where']                 = 'Side/Navnerom';
 $lang['who']                   = 'Bruker/Gruppe';
-$lang['perm']                  = 'Tillatelser';
+$lang['perm']                  = 'Rettigheter';
 $lang['acl_perm0']             = 'Ingen';
 $lang['acl_perm1']             = 'Lese';
 $lang['acl_perm2']             = 'Redigere';
@@ -45,4 +46,4 @@ $lang['acl_perm4']             = 'Opprette';
 $lang['acl_perm8']             = 'Laste opp';
 $lang['acl_perm16']            = 'Slette';
 $lang['acl_new']               = 'Legg til ny oppføring';
-$lang['acl_mod']               = 'Modifiser oppføring';
+$lang['acl_mod']               = 'Endre oppføring';
diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index a72b6af11..1b10b5232 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -12,6 +12,7 @@
  * @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>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index 0c13d7223..c278c918e 100644
--- a/lib/plugins/acl/lang/ro/lang.php
+++ b/lib/plugins/acl/lang/ro/lang.php
@@ -9,6 +9,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
 $lang['acl_group']             = 'Grup';
diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index 6d04dde21..15ba78ef6 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -15,6 +15,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['admin_acl']             = 'Управление списками контроля доступа';
 $lang['acl_group']             = 'Группа';
diff --git a/lib/plugins/acl/lang/sl/help.txt b/lib/plugins/acl/lang/sl/help.txt
index eada41c29..ff096ae0e 100644
--- a/lib/plugins/acl/lang/sl/help.txt
+++ b/lib/plugins/acl/lang/sl/help.txt
@@ -1,11 +1,11 @@
-=== Hitra pomo� ===
+=== Hitra pomoč ===
 
-Na tej strani je mogo�e dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori.
+Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori.
 
 Na veli strani so izpisani vsi imenski prostori in strani.
 
-Na obrazcu zgoraj je mogo�e pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino.
+Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino.
 
-V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogo�e hitro spreminjati ali brisati.
+V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati.
 
-Ve� podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogo�e najti v [[doku>acl|uradni dokumentaciji ACL]].
+Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]].
diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php
index 3fb391570..44e45e491 100644
--- a/lib/plugins/acl/lang/sl/lang.php
+++ b/lib/plugins/acl/lang/sl/lang.php
@@ -5,7 +5,7 @@
  * @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)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
  */
 $lang['admin_acl']             = 'Upravljanje dostopa';
 $lang['acl_group']             = 'Skupina';
diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php
index 986fa769a..983882eaf 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/lang/zh/lang.php
@@ -14,6 +14,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['admin_acl']             = '访问控制列表（ACL）管理器';
 $lang['acl_group']             = '组';
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index d912a2407..0ba91cdc9 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -60,10 +60,12 @@ var dw_acl = {
      * Load the current permission info and edit form
      */
     loadinfo: function () {
-        jQuery('#acl__info').load(
-            DOKU_BASE + 'lib/plugins/acl/ajax.php',
-            jQuery('#acl__detail form').serialize() + '&ajax=info'
-        );
+        jQuery('#acl__info')
+            .html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="..." />')
+            .load(
+                DOKU_BASE + 'lib/plugins/acl/ajax.php',
+                jQuery('#acl__detail form').serialize() + '&ajax=info'
+            );
         return false;
     },
 
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 64906171d..9a9bb5329 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -131,6 +131,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
           }
           ptln('  <fieldset id="'.$setting->_key.'">');
           ptln('  <legend>'.$setting->prompt($this).'</legend>');
+          ptln('  <div class="table">');
           ptln('  <table class="inline">');
         } else {
           // config settings
@@ -151,6 +152,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       }
 
       ptln('  </table>');
+      ptln('  </div>');
       if ($in_fieldset) {
         ptln('  </fieldset>');
       }
@@ -161,6 +163,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         usort($undefined_settings, '_setting_natural_comparison');
         $this->_print_h1('undefined_settings', $this->getLang('_header_undefined'));
         ptln('<fieldset>');
+        ptln('<div class="table">');
         ptln('<table class="inline">');
         $undefined_setting_match = array();
         foreach($undefined_settings as $setting) {
@@ -175,6 +178,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
           ptln('  </tr>');
         }
         ptln('</table>');
+        ptln('</div>');
         ptln('</fieldset>');
       }
 
@@ -270,10 +274,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       // the same for the active template
       $tpl = $conf['template'];
 
-      if (@file_exists(DOKU_TPLINC.$enlangfile)){
+      if (@file_exists(tpl_incdir().$enlangfile)){
         $lang = array();
-        @include(DOKU_TPLINC.$enlangfile);
-        if ($conf['lang'] != 'en') @include(DOKU_TPLINC.$langfile);
+        @include(tpl_incdir().$enlangfile);
+        if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile);
         foreach ($lang as $key => $value){
           $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
         }
diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php
index 8f61e96c0..25f1da91a 100644
--- a/lib/plugins/config/lang/bg/lang.php
+++ b/lib/plugins/config/lang/bg/lang.php
@@ -65,6 +65,7 @@ $lang['useheading']            = 'Ползване на първото загл�
 $lang['refcheck']              = 'Проверка за препратка към медия, преди да бъде изтрита';
 $lang['refshow']               = 'Брой на показваните медийни препратки';
 $lang['allowdebug']            = 'Включване на режи debug - <b>изключете, ако не е нужен!</b>';
+$lang['mediarevisions']        = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?';
 $lang['usewordblock']          = 'Блокиране на SPAM въз основа на на списък от думи';
 $lang['indexdelay']            = 'Забавяне преди индексиране (сек)';
 $lang['relnofollow']           = 'Ползване на rel="nofollow" за външни препратки';
diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php
index b9e6049a5..091604aea 100644
--- a/lib/plugins/config/lang/cs/lang.php
+++ b/lib/plugins/config/lang/cs/lang.php
@@ -10,6 +10,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['menu']                  = 'Správa nastavení';
 $lang['error']                 = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce,
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 505d71a40..52c705b4f 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -66,6 +66,7 @@ $lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
 $lang['refshow']               = 'Wie viele Verwendungsorte der Media-Datei zeigen';
 $lang['allowdebug']            = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>';
+$lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['usewordblock']          = 'Blockiere Spam basierend auf der Wortliste';
 $lang['indexdelay']            = 'Zeit bevor Suchmaschinenindexierung erlaubt ist';
 $lang['relnofollow']           = 'rel="nofollow" verwenden';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index 79c6554e3..1cc4e0a8a 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -77,6 +77,7 @@ $lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
 $lang['refshow']               = 'Wiev iele Verwendungsorte der Media-Datei zeigen';
 $lang['allowdebug']            = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>';
+$lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['usewordblock']          = 'Spam-Blocking benutzen';
 $lang['indexdelay']            = 'Zeit bevor Suchmaschinenindexierung erlaubt ist';
 $lang['relnofollow']           = 'rel="nofollow" verwenden';
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 27f754c2c..fe9e5458b 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -62,6 +62,8 @@ $lang['cookiedir']   = 'Cookie path. Leave blank for using baseurl.';
 $lang['start']       = 'Start page name';
 $lang['title']       = 'Wiki title';
 $lang['template']    = 'Template';
+$lang['tagline']     = 'Tagline (if template supports it)';
+$lang['sidebar']     = 'Sidebar page name (if template supports it), empty field disables the sidebar';
 $lang['license']     = 'Under which license should your content be released?';
 $lang['fullpath']    = 'Reveal full path of pages in the footer';
 $lang['recent']      = 'Recent changes';
@@ -82,6 +84,7 @@ $lang['useheading']  = 'Use first heading for pagenames';
 $lang['refcheck']    = 'Media reference check';
 $lang['refshow']     = 'Number of media references to show';
 $lang['allowdebug']  = 'Allow debug <b>disable if not needed!</b>';
+$lang['mediarevisions'] = 'Enable Mediarevisions?';
 
 $lang['usewordblock']= 'Block spam based on wordlist';
 $lang['indexdelay']  = 'Time delay before indexing (sec)';
@@ -151,6 +154,7 @@ $lang['rss_content'] = 'What to display in the XML feed items?';
 $lang['rss_update']  = 'XML feed update interval (sec)';
 $lang['recent_days'] = 'How many recent changes to keep (days)';
 $lang['rss_show_summary'] = 'XML feed show summary in title';
+$lang['rss_media']   = 'What kind of changes should be listed in the XML feed?';
 
 /* Target options */
 $lang['target____wiki']      = 'Target window for internal links';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index fd911433c..66d075d6b 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -80,6 +80,7 @@ $lang['useheading']            = 'Usar el primer encabezado para nombres de pág
 $lang['refcheck']              = 'Control de referencia a medios';
 $lang['refshow']               = 'Número de referencias a medios a mostrar';
 $lang['allowdebug']            = 'Permitir debug <b>deshabilítelo si no lo necesita!</b>';
+$lang['mediarevisions']        = '¿Habilitar Mediarevisions?';
 $lang['usewordblock']          = 'Bloquear spam usando una lista de palabras';
 $lang['indexdelay']            = 'Intervalo de tiempo antes de indexar (segundos)';
 $lang['relnofollow']           = 'Usar rel="nofollow" en enlaces externos';
@@ -130,14 +131,14 @@ $lang['hidepages']             = 'Ocultar páginas con coincidencias (expresione
 $lang['send404']               = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes';
 $lang['sitemap']               = 'Generar sitemap de Google (días)';
 $lang['broken_iua']            = '¿Se ha roto (broken) la función ignore_user_abort en su sistema? Esto puede causar que no funcione el index de búsqueda. Se sabe que IIS+PHP/CGI está roto. Vea <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a>para más información.';
-$lang['xsendfile']             = 'Utilice el X-Sendfile header para permitirle sl servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.';
+$lang['xsendfile']             = '¿Utilizar la cabecera X-Sendfile para permitirle al servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.';
 $lang['renderer_xhtml']        = 'Visualizador a usar para salida (xhtml) principal del wiki';
 $lang['renderer__core']        = '%s (núcleo dokuwiki)';
 $lang['renderer__plugin']      = '%s (plugin)';
 $lang['rememberme']            = 'Permitir cookies para acceso permanente (recordarme)';
 $lang['rss_type']              = 'Tipo de resumen (feed) XML';
 $lang['rss_linkto']            = 'Feed XML enlaza a';
-$lang['rss_content']           = 'Que mostrar en los itemes del archivo XML?';
+$lang['rss_content']           = '¿Qué mostrar en los items del archivo XML?';
 $lang['rss_update']            = 'Intervalo de actualización de feed XML (segundos)';
 $lang['recent_days']           = 'Cuántos cambios recientes mantener (días)';
 $lang['rss_show_summary']      = 'Feed XML muestra el resumen en el título';
diff --git a/lib/plugins/config/lang/fr/intro.txt b/lib/plugins/config/lang/fr/intro.txt
index de8a965d8..2a59b34d1 100644
--- a/lib/plugins/config/lang/fr/intro.txt
+++ b/lib/plugins/config/lang/fr/intro.txt
@@ -1,6 +1,6 @@
 ====== Gestionnaire de configuration ======
 
-Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>plugin:config]].
+Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>fr:config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>fr:plugin:config]].
 
 Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec ce module. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs affectées à votre installation sont affichées sur un fond blanc. Les paramètres bleus et blancs peuvent être modifiés.
 
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 42a7f8d07..4a67a0fc8 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -16,6 +16,7 @@
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
  */
 $lang['menu']                  = 'Paramètres de configuration';
 $lang['error']                 = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.';
@@ -62,7 +63,7 @@ $lang['youarehere']            = 'Traces hiérarchiques';
 $lang['typography']            = 'Effectuer des améliorations typographiques';
 $lang['htmlok']                = 'Permettre HTML dans les pages';
 $lang['phpok']                 = 'Permettre PHP dans les pages';
-$lang['dformat']               = 'Format de date (cf. fonction <a href="http://www.php.net/strftime">strftime</a> de PHP)';
+$lang['dformat']               = 'Format de date (cf. fonction <a href="http://fr.php.net/strftime">strftime</a> de PHP)';
 $lang['signature']             = 'Signature';
 $lang['toptoclevel']           = 'Niveau le plus haut à afficher dans la table des matières';
 $lang['tocminheads']           = 'Nombre minimum de titres pour qu\'une table des matières soit construite';
@@ -74,6 +75,7 @@ $lang['useheading']            = 'Utiliser le titre de premier niveau';
 $lang['refcheck']              = 'Vérifier les références de média';
 $lang['refshow']               = 'Nombre de références de média à montrer';
 $lang['allowdebug']            = 'Debug (<strong>Ne l\'activez que si vous en avez besoin !</strong>)';
+$lang['mediarevisions']        = 'Activer les révisions (gestion de versions) des médias';
 $lang['usewordblock']          = 'Bloquer le spam selon les mots utilisés';
 $lang['indexdelay']            = 'Délai avant l\'indexation (en secondes)';
 $lang['relnofollow']           = 'Utiliser rel="nofollow" sur les liens extérieurs';
diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php
index 861336371..97b7ecdc8 100644
--- a/lib/plugins/config/lang/gl/lang.php
+++ b/lib/plugins/config/lang/gl/lang.php
@@ -3,6 +3,7 @@
  * Galicianlanguage file
  *
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['menu']                  = 'Opcións de Configuración';
 $lang['error']                 = 'Configuración non actualizada debido a un valor inválido, por favor revisa os teus trocos e volta envialos de novo.
@@ -39,6 +40,7 @@ $lang['lang']                  = 'Idioma';
 $lang['basedir']               = 'Directorio base';
 $lang['baseurl']               = 'URL base';
 $lang['savedir']               = 'Directorio no que se gardarán os datos';
+$lang['cookiedir']             = 'Ruta das cookies. Deixar en blanco para usar a url de base.';
 $lang['start']                 = 'Nome da páxina inicial';
 $lang['title']                 = 'Título do Wiki';
 $lang['template']              = 'Sobreplanta';
@@ -62,6 +64,7 @@ $lang['useheading']            = 'Utilizar a primeira cabeceira para os nomes de
 $lang['refcheck']              = 'Comprobar a referencia media';
 $lang['refshow']               = 'Número de referencias media a amosar';
 $lang['allowdebug']            = 'Permitir o depurado <b>desactívao se non o precisas!</b>';
+$lang['mediarevisions']        = 'Habilitar revisións dos arquivos-media?';
 $lang['usewordblock']          = 'Bloquear correo-lixo segundo unha lista de verbas';
 $lang['indexdelay']            = 'Retardo denantes de indexar (seg)';
 $lang['relnofollow']           = 'Utilizar rel="nofollow" nas ligazóns externas';
@@ -90,6 +93,7 @@ $lang['useslash']              = 'Utilizar a barra inclinada (/) como separador
 $lang['usedraft']              = 'Gardar un borrador automaticamente no tempo da edición';
 $lang['sepchar']               = 'Verba separadora do nome de páxina';
 $lang['canonical']             = 'Utilizar URLs completamente canónicos';
+$lang['fnencode']              = 'Método para codificar os nomes de arquivo non-ASCII.';
 $lang['autoplural']            = 'Comprobar formas plurais nas ligazóns';
 $lang['compression']           = 'Método de compresión para arquivos attic';
 $lang['cachetime']             = 'Tempo máximo para a caché (seg.)';
@@ -98,6 +102,7 @@ $lang['fetchsize']             = 'Tamaño máximo (en bytes) que pode descargar
 $lang['notify']                = 'Enviar notificacións de trocos a este enderezo de correo-e';
 $lang['registernotify']        = 'Enviar información de novos usuarios rexistrados a este enderezo de correo-e';
 $lang['mailfrom']              = 'Enderezo de correo-e a usar para as mensaxes automáticas';
+$lang['mailprefix']            = 'Prefixo de asunto de correo-e para as mensaxes automáticas';
 $lang['gzip_output']           = 'Utilizar Contido-Codificación gzip para o xhtml';
 $lang['gdlib']                 = 'Versión da Libraría GD';
 $lang['im_convert']            = 'Ruta deica a ferramenta de conversión ImageMagick';
@@ -130,6 +135,7 @@ $lang['proxy____port']         = 'Porto do Proxy';
 $lang['proxy____user']         = 'Nome de usuario do Proxy';
 $lang['proxy____pass']         = 'Contrasinal do Proxy';
 $lang['proxy____ssl']          = 'Utilizar ssl para conectar ao Proxy';
+$lang['proxy____except']       = 'Expresión regular para atopar URLs que deban ser omitidas polo Proxy.';
 $lang['safemodehack']          = 'Activar hack de modo seguro (safemode)';
 $lang['ftp____host']           = 'Servidor FTP para o hack de modo seguro (safemode)';
 $lang['ftp____port']           = 'Porto FTP para o hack de modo seguro(safemode)';
@@ -177,3 +183,4 @@ $lang['useheading_o_0']        = 'Endexamais';
 $lang['useheading_o_navigation'] = 'Só Navegación';
 $lang['useheading_o_content']  = 'Só Contido do Wiki';
 $lang['useheading_o_1']        = 'Sempre';
+$lang['readdircache']          = 'Edad máxima para o directorio de caché (seg)';
diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index 61161290d..f1d2e3e8f 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -41,9 +41,10 @@ $lang['_msg_setting_no_default'] = '初期値が設定されていません。';
 $lang['fmode']                 = 'ファイル作成マスク';
 $lang['dmode']                 = 'フォルダ作成マスク';
 $lang['lang']                  = '使用言語';
-$lang['basedir']               = 'ベースディレクトリ';
-$lang['baseurl']               = 'ベースURL';
+$lang['basedir']               = 'サーバのパス (例: <code>/dokuwiki/</code>)。空欄にすると自動的に検出します。';
+$lang['baseurl']               = 'サーバの URL (例: <code>http://www.yourserver.com</code>)。空欄にすると自動的に検出します。';
 $lang['savedir']               = '保存ディレクトリ';
+$lang['cookiedir']             = 'Cookie のパス。空欄にすると baseurl を使用します。';
 $lang['start']                 = 'スタートページ名';
 $lang['title']                 = 'WIKIタイトル';
 $lang['template']              = 'テンプレート';
@@ -67,6 +68,7 @@ $lang['useheading']            = '最初の見出しをページ名とする';
 $lang['refcheck']              = 'メディア参照元チェック';
 $lang['refshow']               = 'メディア参照元表示数';
 $lang['allowdebug']            = 'デバッグモード（<b>必要で無いときは無効にしてください</b>）';
+$lang['mediarevisions']        = 'メディアファイルの履歴を有効にしますか?';
 $lang['usewordblock']          = '単語リストに基づくスパムブロック';
 $lang['indexdelay']            = 'インデックスを許可（何秒後）';
 $lang['relnofollow']           = 'rel="nofollow"を付加';
@@ -112,6 +114,7 @@ $lang['jpg_quality']           = 'JPG圧縮品質（0-100）';
 $lang['subscribers']           = '更新通知機能';
 $lang['subscribe_time']        = '購読リストと概要を送信する期間（秒）。「最近の変更とする期間」で指定した期間より小さくしてください。';
 $lang['compress']              = 'CSSとJavaScriptを圧縮';
+$lang['cssdatauri']            = 'HTTP リクエスト数によるオーバーヘッドを減らすため、CSS ファイルから参照される画像ファイルのサイズがここで指定するバイト数以内の場合は CSS ファイル内に Data URI として埋め込みます。このテクニックは IE7 以下では動作しません! <code>400</code> から <code>600</code> バイトがちょうどよい値です。<code>0</code> を指定すると埋め込み処理は行われません。';
 $lang['hidepages']             = '非公開ページ（Regex）';
 $lang['send404']               = '文書が存在しないページに"HTTP404/Page Not Found"を使用';
 $lang['sitemap']               = 'Googleサイトマップ作成頻度（日数）';
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 1c929c25c..55207a37a 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -8,6 +8,7 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['menu']                  = '환경 설정';
 $lang['error']                 = '잘못된 값때문에 설정들을 변경할 수 없습니다. 수정한 값들을 검사하고 확인을 누르기 바랍니다.
@@ -43,9 +44,12 @@ $lang['lang']                  = '언어';
 $lang['basedir']               = '기본 디렉토리';
 $lang['baseurl']               = '기본 URL';
 $lang['savedir']               = '데이타 저장 디렉토리';
+$lang['cookiedir']             = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.';
 $lang['start']                 = '시작 페이지 이름';
 $lang['title']                 = '위키 제목';
 $lang['template']              = '템플릿';
+$lang['tagline']               = '태그 라인 (템플릿이 지원할 때에 한해)';
+$lang['sidebar']               = '사이드바 페이지 이름(템플릿이 지원할 때에 한해). 비워두면 사이드바를 비활성화함';
 $lang['license']               = '컨텐트에 어떤 라이센스 정책을 적용하시겠습니까?';
 $lang['fullpath']              = '페이지 하단에 전체 경로 보여주기';
 $lang['recent']                = '최근에 바뀐 것';
@@ -66,6 +70,7 @@ $lang['useheading']            = '페이지 이름으로 첫 헤드라인 사용
 $lang['refcheck']              = '미디어 참조 검사';
 $lang['refshow']               = '보여줄 미디어 참조 수';
 $lang['allowdebug']            = '디버그 허용 <b>필요하지 않으면 금지!</b>';
+$lang['mediarevisions']        = '미디어 버전 관리를 사용하시겠습니까?';
 $lang['usewordblock']          = '금지단어를 사용해 스팸 막기';
 $lang['indexdelay']            = '색인 연기 시간(초)';
 $lang['relnofollow']           = '외부 링크에 rel="nofollow" 사용';
@@ -113,6 +118,7 @@ $lang['jpg_quality']           = 'JPG 압축 품질 (0-100)';
 $lang['subscribers']           = '페이지 갱신 알람 기능';
 $lang['subscribe_time']        = ' 구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.';
 $lang['compress']              = '최적화된 CSS, javascript 출력';
+$lang['cssdatauri']            = '이미지가 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP request 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code> 에서 <code>600></code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.';
 $lang['hidepages']             = '매칭된 페이지 숨기기(정규표현식)';
 $lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답';
 $lang['sitemap']               = '구글 사이트맵 생성(날짜)';
diff --git a/lib/plugins/config/lang/ms/lang.php b/lib/plugins/config/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/config/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index 6bde9eb4e..77b8d6a1a 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -14,6 +14,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['menu']                  = 'Configuratie-instellingen';
 $lang['error']                 = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.<br />Je kunt de incorrecte waarde(s) herkennen aan de rode rand.';
@@ -72,6 +73,7 @@ $lang['useheading']            = 'Eerste kopje voor paginanaam gebruiken';
 $lang['refcheck']              = 'Controleer verwijzingen naar media';
 $lang['refshow']               = 'Aantal te tonen mediaverwijzingen';
 $lang['allowdebug']            = 'Debug toestaan <b>uitzetten indien niet noodzakelijk!</b>';
+$lang['mediarevisions']        = 'Media revisies activeren?';
 $lang['usewordblock']          = 'Blokkeer spam op basis van woordenlijst';
 $lang['indexdelay']            = 'Uitstel voor indexeren (sec)';
 $lang['relnofollow']           = 'Gebruik rel="nofollow" voor externe links';
@@ -117,6 +119,7 @@ $lang['jpg_quality']           = 'JPG compressiekwaliteit (0-100)';
 $lang['subscribers']           = 'Ondersteuning pagina-inschrijving aanzetten';
 $lang['subscribe_time']        = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"';
 $lang['compress']              = 'Compacte CSS en javascript output';
+$lang['cssdatauri']            = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! <code>400</code> tot <code>600</code> is een geschikte omvang. Stel de omvang in op <code>0</code> om deze functionaliteit uit te schakelen.';
 $lang['hidepages']             = 'Verberg deze pagina\'s (regular expressions)';
 $lang['send404']               = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s';
 $lang['sitemap']               = 'Genereer Google sitemap (dagen)';
diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php
index 2245a8813..ec97fe966 100644
--- a/lib/plugins/config/lang/no/lang.php
+++ b/lib/plugins/config/lang/no/lang.php
@@ -14,6 +14,7 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
 $lang['menu']                  = 'Konfigurasjonsinnstillinger';
 $lang['error']                 = 'Innstillingene ble ikke oppdatert på grunn av en eller flere ugyldig verdier. Vennligst se gjennom endringene og prøv på nytt.
@@ -24,10 +25,10 @@ $lang['locked']                = 'Innstillingene kan ikke oppdateres. Hvis dette
 forsikre deg om at fila med de lokale innstillingene har korrekt filnavn<br/>
 og tillatelser.';
 $lang['danger']                = 'Advarsel: Endrig av dette valget kan føre til at wiki og konfigurasjon menyen ikke blir tilgjengelig.';
-$lang['warning']               = 'Advarsel: Endring av dette valget kan føre til utilsiktede atferd.
+$lang['warning']               = 'Advarsel: Endring av dette valget kan føre til utilsiktet atferd.
 
 ';
-$lang['security']              = 'Sikkerhets Advarsel: Endring av dette valget kan føre til sikkerhetsrisiko.';
+$lang['security']              = 'Sikkerhetsadvarsel: Endring av dette valget kan innebære en sikkerhetsrisiko.';
 $lang['_configuration_manager'] = 'Konfigurasjonsinnstillinger';
 $lang['_header_dokuwiki']      = 'Innstillinger for DokuWiki';
 $lang['_header_plugin']        = 'Innstillinger for tillegg';
@@ -36,10 +37,10 @@ $lang['_header_undefined']     = 'Udefinerte innstillinger';
 $lang['_basic']                = 'Grunnleggende innstillinger';
 $lang['_display']              = 'Innstillinger for visning av sider';
 $lang['_authentication']       = 'Innstillinger for autentisering';
-$lang['_anti_spam']            = 'Motsøppel-innstillinger';
+$lang['_anti_spam']            = 'Anti-Spam innstillinger';
 $lang['_editing']              = 'Innstillinger for redigering';
 $lang['_links']                = 'Innstillinger for lenker';
-$lang['_media']                = 'Innstillinger for media-filer';
+$lang['_media']                = 'Innstillinger for mediafiler';
 $lang['_advanced']             = 'Avanserte innstillinger';
 $lang['_network']              = 'Nettverksinnstillinger';
 $lang['_plugin_sufix']         = '&ndash; innstillinger for tillegg';
@@ -77,6 +78,7 @@ $lang['useheading']            = 'Bruk første overskrift som tittel';
 $lang['refcheck']              = 'Sjekk referanser før mediafiler slettes';
 $lang['refshow']               = 'Antall viste referanser til mediafiler';
 $lang['allowdebug']            = 'Tillat feilsøking <b>skru av om det ikke behøves!</b>';
+$lang['mediarevisions']        = 'Slå på mediaversjonering?';
 $lang['usewordblock']          = 'Blokker søppel basert på ordliste';
 $lang['indexdelay']            = 'Forsinkelse før indeksering (sekunder)';
 $lang['relnofollow']           = 'Bruk rel="nofollow" på eksterne lenker';
@@ -190,10 +192,10 @@ $lang['xsendfile_o_2']         = 'Standard X-Sendfile header';
 $lang['xsendfile_o_3']         = 'Priprietær Nginx X-Accel-Redirect header';
 $lang['showuseras_o_loginname'] = 'Brukernavn';
 $lang['showuseras_o_username'] = 'Brukerens fulle navn';
-$lang['showuseras_o_email']    = 'Brukerens epostadresse (tilpasset i henhold til mailguar-instilling)';
+$lang['showuseras_o_email']    = 'Brukerens e-postadresse (tilpasset i henhold til mailguar-instilling)';
 $lang['showuseras_o_email_link'] = 'Brukerens epost-addresse som "mailto:"-lenke';
 $lang['useheading_o_0']        = 'Aldri';
 $lang['useheading_o_navigation'] = 'Kun navigering';
 $lang['useheading_o_content']  = 'Kun wiki-innhold';
 $lang['useheading_o_1']        = 'Alltid';
-$lang['readdircache']          = 'Maksimal alder for mellomlagring av mappa med søkeindekser (sekunder)';
+$lang['readdircache']          = 'Maksimal alder for mellomlagring av mappen med søkeindekser (sekunder)';
diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php
index 0e69cc8f1..7ebe5ba92 100644
--- a/lib/plugins/config/lang/pl/lang.php
+++ b/lib/plugins/config/lang/pl/lang.php
@@ -13,6 +13,7 @@
  * @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>
  */
 $lang['menu']                  = 'Ustawienia';
 $lang['error']                 = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu. <br/> Niepoprawne wartości są wyróżnione kolorem czerwonym.';
@@ -47,9 +48,12 @@ $lang['lang']                  = 'Język';
 $lang['basedir']               = 'Katalog główny';
 $lang['baseurl']               = 'Główny URL';
 $lang['savedir']               = 'Katalog z danymi';
+$lang['cookiedir']             = 'Ścieżka plików ciasteczek. Zostaw puste by użyć baseurl.';
 $lang['start']                 = 'Tytuł strony początkowej';
 $lang['title']                 = 'Tytuł wiki';
 $lang['template']              = 'Motyw';
+$lang['tagline']               = 'Motto (jeśli szablon daje taką możliwość)';
+$lang['sidebar']               = 'Nazwa strony paska bocznego (jeśli szablon je obsługuje), puste pole wyłącza pasek boczny';
 $lang['license']               = 'Pod jaką licencją publikować treści wiki?';
 $lang['fullpath']              = 'Wyświetlanie pełnych ścieżek';
 $lang['recent']                = 'Ilość ostatnich zmian';
@@ -70,6 +74,7 @@ $lang['useheading']            = 'Pierwszy nagłówek jako tytuł';
 $lang['refcheck']              = 'Sprawdzanie odwołań przed usunięciem pliku';
 $lang['refshow']               = 'Ilość pokazywanych odwołań do pliku';
 $lang['allowdebug']            = 'Debugowanie (niebezpieczne!)';
+$lang['mediarevisions']        = 'Włączyć wersjonowanie multimediów?';
 $lang['usewordblock']          = 'Blokowanie spamu na podstawie słów';
 $lang['indexdelay']            = 'Okres indeksowania w sekundach';
 $lang['relnofollow']           = 'Nagłówek rel="nofollow" dla odnośników zewnętrznych';
@@ -107,13 +112,15 @@ $lang['fetchsize']             = 'Maksymalny rozmiar pliku (w bajtach) jaki moż
 $lang['notify']                = 'Wysyłanie powiadomień na adres e-mail';
 $lang['registernotify']        = 'Prześlij informacje o nowych użytkownikach na adres e-mail';
 $lang['mailfrom']              = 'Adres e-mail tego wiki';
-$lang['gzip_output']           = 'Używaj GZIP dla XHTML';
+$lang['mailprefix']            = 'Prefiks tematu e-mail do automatycznych wiadomości';
+$lang['gzip_output']           = 'Używaj kodowania GZIP dla zawartości XHTML';
 $lang['gdlib']                 = 'Wersja biblioteki GDLib';
 $lang['im_convert']            = 'Ścieżka do programu imagemagick';
 $lang['jpg_quality']           = 'Jakość kompresji JPG (0-100)';
 $lang['subscribers']           = 'Subskrypcja';
 $lang['subscribe_time']        = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.';
 $lang['compress']              = 'Kompresja arkuszy CSS i plików JavaScript';
+$lang['cssdatauri']            = 'Rozmiar w bajtach, poniżej którego odwołania do obrazów w plikach CSS powinny być osadzone bezpośrednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. Technika ta nie działa w IE 7 i poniżej! <code>400</code> do <code>600</code> bajtów jest dobrą wartością. Ustaw <code>0</code> aby wyłączyć.';
 $lang['hidepages']             = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)';
 $lang['send404']               = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron';
 $lang['sitemap']               = 'Okres generowania Google Sitemap (w dniach)';
diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php
index 5b15ec3dc..d638e1eec 100644
--- a/lib/plugins/config/lang/ro/lang.php
+++ b/lib/plugins/config/lang/ro/lang.php
@@ -9,6 +9,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['menu']                  = 'Setări de Configurare';
 $lang['error']                 = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou. <br /> Valorile incorecte vor apărea într-un chenar roşu.';
@@ -67,6 +68,7 @@ $lang['useheading']            = 'Foloseşte primul titlu pentru numele paginii'
 $lang['refcheck']              = 'Verificare referinţă media';
 $lang['refshow']               = 'Numărul de referinţe media de arătat';
 $lang['allowdebug']            = 'Permite depanarea <b>dezactivaţi dacă cu e necesar!</b>';
+$lang['mediarevisions']        = 'Activare Revizii Media?';
 $lang['usewordblock']          = 'Blochează spam-ul pe baza listei de cuvinte';
 $lang['indexdelay']            = 'Timpul de întârziere înainte de indexare (sec)';
 $lang['relnofollow']           = 'Folosiţi rel="nofollow" pentru legăturile externe';
diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php
index cd93526e0..098cff534 100644
--- a/lib/plugins/config/lang/ru/lang.php
+++ b/lib/plugins/config/lang/ru/lang.php
@@ -16,6 +16,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['menu']                  = 'Настройки вики';
 $lang['error']                 = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте свои изменения и попробуйте ещё раз.<br />Неправильные значения будут обведены красной рамкой.';
@@ -50,9 +51,12 @@ $lang['lang']                  = 'Язык';
 $lang['basedir']               = 'Корневая директория (например, <code>/dokuwiki/</code>). Оставьте пустым для автоопределения.';
 $lang['baseurl']               = 'Корневой адрес (URL) (например, <code>http://www.yourserver.ru</code>). Оставьте пустым для автоопределения.';
 $lang['savedir']               = 'Директория для данных';
+$lang['cookiedir']             = 'Cookie директория. Оставьте пустым для автоопределения.';
 $lang['start']                 = 'Имя стартовой страницы';
 $lang['title']                 = 'Название вики';
 $lang['template']              = 'Шаблон';
+$lang['tagline']               = 'Слоган (если поддерживается шаблоном)';
+$lang['sidebar']               = 'Боковая панель, пустое поле отключает боковую панель.';
 $lang['license']               = 'На условиях какой лицензии будет предоставляться содержимое вики?';
 $lang['fullpath']              = 'Полный путь к документу';
 $lang['recent']                = 'Недавние изменения (кол-во)';
@@ -73,6 +77,7 @@ $lang['useheading']            = 'Первый заголовок вместо �
 $lang['refcheck']              = 'Проверять ссылки на медиафайлы';
 $lang['refshow']               = 'Показывать ссылок на медиафайлы';
 $lang['allowdebug']            = 'Включить отладку (отключите!)';
+$lang['mediarevisions']        = 'Включение версий медиафайлов';
 $lang['usewordblock']          = 'Блокировать спам по ключевым словам';
 $lang['indexdelay']            = 'Задержка перед индексированием';
 $lang['relnofollow']           = 'rel="nofollow" для внешних ссылок';
@@ -118,6 +123,7 @@ $lang['jpg_quality']           = 'Качество сжатия JPG (0–100). �
 $lang['subscribers']           = 'Разрешить подписку на изменения';
 $lang['subscribe_time']        = 'Интервал рассылки подписок и сводок (сек.). Должен быть меньше, чем значение, указанное в recent_days.';
 $lang['compress']              = 'Сжимать файлы CSS и javascript';
+$lang['cssdatauri']            = 'Размер в байтах до которого изображения, указанные в CSS-файлах, должны быть встроены прямо в таблицу стилей, для уменьшения избычтоных HTTP-запросов. Этот метод не будет работать в IE версии 7 и ниже! Установка от <code>400</code> до <code>600</code> байт является хорошим показателем. Установите <code>0</code>, чтобы отключить.';
 $lang['hidepages']             = 'Скрыть страницы (рег. выражение)';
 $lang['send404']               = 'Посылать «HTTP404/Page Not Found»';
 $lang['sitemap']               = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Гугл, Яндекс и др.)';
diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php
index d583c5d15..cbd69eb9e 100644
--- a/lib/plugins/config/lang/sk/lang.php
+++ b/lib/plugins/config/lang/sk/lang.php
@@ -64,6 +64,7 @@ $lang['useheading']            = 'Použiť nadpis pre názov stránky';
 $lang['refcheck']              = 'Kontrolovať odkazy na médiá (pred vymazaním)';
 $lang['refshow']               = 'Počet zobrazených odkazov na médiá';
 $lang['allowdebug']            = 'Povoliť ladenie chýb <b>deaktivujte, ak nie je potrebné!</b>';
+$lang['mediarevisions']        = 'Povoliť verzie súborov?';
 $lang['usewordblock']          = 'Blokovať spam na základe zoznamu známych slov';
 $lang['indexdelay']            = 'Časové oneskorenie pred indexovaním (sek)';
 $lang['relnofollow']           = 'Používať rel="nofollow" pre externé odkazy';
diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php
index 03bae8e37..364e0fd7f 100644
--- a/lib/plugins/config/lang/sl/lang.php
+++ b/lib/plugins/config/lang/sl/lang.php
@@ -7,7 +7,6 @@
  * @author Gregor Skumavc (grega.skumavc@gmail.com)
  * @author Matej Urbančič (mateju@svn.gnome.org)
  */
-
 $lang['menu']                  = 'Splošne nastavitve';
 $lang['error']                 = 'Nastavitve niso shranjene zaradi neveljavne vrednosti.<br />Neveljavna vrednost je označena z rdečim robom vnosnega polja.';
 $lang['updated']               = 'Nastavitve so uspešno posodobljene.';
@@ -27,7 +26,7 @@ $lang['_authentication']       = 'Nastavitve overjanja';
 $lang['_anti_spam']            = 'Nastavitve neželenih sporočil (Anti-Spam)';
 $lang['_editing']              = 'Nastavitve urejanja';
 $lang['_links']                = 'Nastavitve povezav';
-$lang['_media']                = 'Predstavnostne nastavitve';
+$lang['_media']                = 'Predstavne nastavitve';
 $lang['_advanced']             = 'Napredne nastavitve';
 $lang['_network']              = 'Omrežne nastavitve';
 $lang['_plugin_sufix']         = 'nastavitve';
@@ -41,9 +40,12 @@ $lang['lang']                  = 'Jezik vmesnika';
 $lang['basedir']               = 'Pot do strežnika (npr. /dokuwiki/). Prazno polje določa samodejno zaznavanje';
 $lang['baseurl']               = 'Naslov URL strežnika (npr. http://www.streznik.si). Prazno polje določa samodejno zaznavanje';
 $lang['savedir']               = 'Mapa za shranjevanje podatkov';
+$lang['cookiedir']             = 'Pot do piškotka. Prazno polje določa uporabo osnovnega naslova (baseurl)';
 $lang['start']                 = 'Ime začetne strani wiki';
 $lang['title']                 = 'Naslov Wiki spletišča';
 $lang['template']              = 'Predloga';
+$lang['tagline']               = 'Označna vrstica (ob podpori predloge)';
+$lang['sidebar']               = 'Ime strani stranske vrstice (ob podpori predloge); prazno polje onemogoči stransko vrstico.';
 $lang['license']               = 'Pod pogoji katerega dovoljenja je objavljena vsebina?';
 $lang['fullpath']              = 'Pokaži polno pot strani v nogi strani';
 $lang['recent']                = 'Nedavne spremembe';
@@ -62,8 +64,9 @@ $lang['camelcase']             = 'Uporabi EnoBesedni zapisa za povezave';
 $lang['deaccent']              = 'Počisti imena strani';
 $lang['useheading']            = 'Uporabi prvi naslov za ime strani';
 $lang['refcheck']              = 'Preverjanje sklica predstavnih datotek';
-$lang['refshow']               = 'Število predstavnostnih sklicev za prikaz';
+$lang['refshow']               = 'Število predstavih sklicev za prikaz';
 $lang['allowdebug']            = 'Dovoli razhroščevanje (po potrebi!)';
+$lang['mediarevisions']        = 'Ali naj se omogočijo objave predstavnih vsebin?';
 $lang['usewordblock']          = 'Zaustavi neželeno besedilo glede na seznam besed';
 $lang['indexdelay']            = 'Časovni zamik pred ustvarjanjem kazala (v sekundah)';
 $lang['relnofollow']           = 'Uporabni možnost rel="nofollow" pri zunanjih povezavah';
@@ -101,6 +104,7 @@ $lang['fetchsize']             = 'največja dovoljena velikost zunanjega prejema
 $lang['notify']                = 'Pošlji obvestila o spremembah na določen elektronski naslov';
 $lang['registernotify']        = 'Pošlji obvestila o novih vpisanih uporabnikih na določen elektronski naslov';
 $lang['mailfrom']              = 'Elektronski naslov za samodejno poslana sporočila';
+$lang['mailprefix']            = 'Predpona zadeve elektronskega sporočila za samodejna sporočila.';
 $lang['gzip_output']           = 'Uporabi stiskanje gzip vsebine za xhtml';
 $lang['gdlib']                 = 'Različica GD Lib';
 $lang['im_convert']            = 'Pot do orodja za pretvarjanje slik ImageMagick';
@@ -108,6 +112,7 @@ $lang['jpg_quality']           = 'Kakovost stiskanja datotek JPG (0-100)';
 $lang['subscribers']           = 'Omogoči podporo naročanju na strani';
 $lang['subscribe_time']        = 'Čas po katerem so poslani povzetki sprememb (v sekundah); Vrednost mora biti krajša od časa, ki je določen z nedavno_dni.';
 $lang['compress']              = 'Združi odvod CSS in JavaScript v brskalniku';
+$lang['cssdatauri']            = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjšanje zahtev osveževanja strežnika HTTP. Ta možnost ni podprta v brskalniku MS IE 7 in nižjih različicah! Ustrezne vrednosti so <code>400</code> do <code>600</code> bajtov. Vrednost <code>0</code> onemogoči možnost.';
 $lang['hidepages']             = 'Skrij skladne strani (logični izraz)';
 $lang['send404']               = 'Pošlji "HTTP 404/Strani ni mogoče najti" pri dostopu do neobstoječih strani';
 $lang['sitemap']               = 'Ustvari Google kazalo strani (v dnevih)';
@@ -170,9 +175,9 @@ $lang['compression_o_0']       = 'brez';
 $lang['compression_o_gz']      = 'gzip';
 $lang['compression_o_bz2']     = 'bz2';
 $lang['xsendfile_o_0']         = 'ne uporabi';
-$lang['xsendfile_o_1']         = 'plačniška glava lighttpd (pred različico 1.5)';
+$lang['xsendfile_o_1']         = 'lastniška glava lighttpd (pred različico 1.5)';
 $lang['xsendfile_o_2']         = 'običajna glava X-Sendfile';
-$lang['xsendfile_o_3']         = 'plačniška glava Nginx X-Accel-Redirect';
+$lang['xsendfile_o_3']         = 'lastniška glava Nginx X-Accel-Redirect';
 $lang['showuseras_o_loginname'] = 'Prijavno ime';
 $lang['showuseras_o_username'] = 'Polno ime uporabnika';
 $lang['showuseras_o_email']    = 'Elektronski naslov uporabnika (šifriran po določilih varovanja)';
diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php
index 2919ec113..dd5f287b9 100644
--- a/lib/plugins/config/lang/zh-tw/lang.php
+++ b/lib/plugins/config/lang/zh-tw/lang.php
@@ -44,6 +44,7 @@ $lang['lang']                  = '語系';
 $lang['basedir']               = '根目錄';
 $lang['baseurl']               = '根路徑 (URL)';
 $lang['savedir']               = '儲存資料的目錄';
+$lang['cookiedir']             = 'Cookie 路徑。設定空白則使用 baseurl。';
 $lang['start']                 = '開始頁面的名稱';
 $lang['title']                 = '維基標題';
 $lang['template']              = '樣板';
@@ -112,6 +113,7 @@ $lang['jpg_quality']           = 'JPG 壓縮品質(0-100)';
 $lang['subscribers']           = '啟用頁面訂閱';
 $lang['subscribe_time']        = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。';
 $lang['compress']              = '壓縮 CSS 與 JavaScript 的輸出';
+$lang['cssdatauri']            = 'CSS 中所引用的圖片假如小於該數字大小(bytes)，將會被直接嵌入 CSS 中來減少 HTTP Request 的發送。此功能在 IE 7 及之下版本不支援。推薦使用 <code>400</code> 到 <code>600</code> 之間。設定為<code>0</code> 則停用。';
 $lang['hidepages']             = '隱藏匹配的界面 (正規式)';
 $lang['send404']               = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"';
 $lang['sitemap']               = '產生 Google 站台地圖 (天)';
diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index fa51cb1ef..5b7229c62 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/lang/zh/lang.php
@@ -14,6 +14,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['menu']                  = '配置设置';
 $lang['error']                 = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index adf7d217a..1cdab607f 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -279,10 +279,10 @@ if (!class_exists('configuration')) {
       }
 
       // the same for the active template
-      if (@file_exists(DOKU_TPLINC.$file)){
+      if (@file_exists(tpl_incdir().$file)){
         $meta = array();
-        @include(DOKU_TPLINC.$file);
-        @include(DOKU_TPLINC.$class);
+        @include(tpl_incdir().$file);
+        @include(tpl_incdir().$class);
         if (!empty($meta)) {
           $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset');
         }
@@ -314,9 +314,9 @@ if (!class_exists('configuration')) {
       }
 
       // the same for the active template
-      if (@file_exists(DOKU_TPLINC.$file)){
+      if (@file_exists(tpl_incdir().$file)){
         $conf = array();
-        @include(DOKU_TPLINC.$file);
+        @include(tpl_incdir().$file);
         foreach ($conf as $key => $value){
           $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
         }
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index b95c8d75c..a472a954b 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -91,6 +91,8 @@ $meta['title']    = array('string');
 $meta['start']    = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces
 $meta['lang']     = array('dirchoice','_dir' => DOKU_INC.'inc/lang/');
 $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/');
+$meta['tagline']  = array('string');
+$meta['sidebar']  = array('string');
 $meta['license']  = array('license');
 $meta['savedir']  = array('savedir');
 $meta['basedir']  = array('string');
@@ -123,7 +125,7 @@ $meta['_authentication'] = array('fieldset');
 $meta['useacl']      = array('onoff');
 $meta['autopasswd']  = array('onoff');
 $meta['authtype']    = array('authtype');
-$meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5'));
+$meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt'));
 $meta['defaultgroup']= array('string');
 $meta['superuser']   = array('string');
 $meta['manager']     = array('string');
@@ -164,6 +166,7 @@ $meta['target____media']     = array('string');
 $meta['target____windows']   = array('string');
 
 $meta['_media']      = array('fieldset');
+$meta['mediarevisions']  = array('onoff');
 $meta['gdlib']       = array('multichoice','_choices' => array(0,1,2));
 $meta['im_convert']  = array('im_convert');
 $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/');  //(0-100)
@@ -189,9 +192,10 @@ $meta['sitemap']     = array('numeric');
 $meta['rss_type']    = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1'));
 $meta['rss_linkto']  = array('multichoice','_choices' => array('diff','page','rev','current'));
 $meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html'));
+$meta['rss_media']   = array('multichoice','_choices' => array('both','pages','media'));
 $meta['rss_update']  = array('numeric');
-$meta['recent_days'] = array('numeric');
 $meta['rss_show_summary'] = array('onoff');
+$meta['recent_days'] = array('numeric');
 $meta['broken_iua']  = array('onoff');
 $meta['xsendfile']   = array('multichoice','_choices' => array(0,1,2,3));
 $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml'));
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 026a438bb..9aedbf0aa 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -174,7 +174,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
                 $hid = $this->_addToTOC($title, 3, $renderer);
                 $doc .= '<h3><a name="'.$hid.'" id="'.$hid.'">'.hsc($title).'</a></h3>';
                 $doc .= '<div class="level3">';
-                $doc .= '<table class="inline"><tbody>';
+                $doc .= '<div class="table"><table class="inline"><tbody>';
                 $doc .= '<tr><th>Description</th><td colspan="2">'.$method['desc'].
                     '</td></tr>';
                 if ($method['params']){
@@ -190,7 +190,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
                     $doc .= '<tr><th>Return value</th><td>'.hsc(key($method['return'])).
                         '</td><td>'.hsc(current($method['return'])).'</td></tr>';
                 }
-                $doc .= '</tbody></table>';
+                $doc .= '</tbody></table></div>';
                 $doc .= '</div>';
             }
             unset($po);
@@ -206,7 +206,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
         global $PARSER_MODES;
         $doc  = '';
 
-        $doc .= '<table class="inline"><tbody>';
+        $doc .= '<div class="table"><table class="inline"><tbody>';
         foreach($PARSER_MODES as $mode => $modes){
             $doc .= '<tr>';
             $doc .= '<td class="leftalign">';
@@ -217,7 +217,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
             $doc .= '</td>';
             $doc .= '</tr>';
         }
-        $doc .= '</tbody></table>';
+        $doc .= '</tbody></table></div>';
         return $doc;
     }
 
diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php
index 6aab4ba3c..b2571f632 100644
--- a/lib/plugins/plugin/classes/ap_download.class.php
+++ b/lib/plugins/plugin/classes/ap_download.class.php
@@ -59,7 +59,7 @@ class ap_download extends ap_manage {
             return false;
         }
 
-        if (!$file = io_download($url, "$tmp/", true, $file)) {
+        if (!$file = io_download($url, "$tmp/", true, $file, 0)) {
             $this->manager->error = sprintf($this->lang['error_download'],$url)."\n";
         }
 
diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index fb148f263..12480e922 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -90,8 +90,8 @@ class ap_manage {
 
             ptln('    <fieldset'.$class.'>');
             ptln('      <legend>'.$plugin.'</legend>');
-            ptln('      <input type="checkbox" class="enable" name="enabled[]" value="'.$plugin.'"'.$checked.$check_disabled.' />');
-            ptln('      <h3 class="legend">'.$plugin.'</h3>');
+            ptln('      <input type="checkbox" class="enable" name="enabled[]" id="dw__p_'.$plugin.'" value="'.$plugin.'"'.$checked.$check_disabled.' />');
+            ptln('      <h3 class="legend"><label for="dw__p_'.$plugin.'">'.$plugin.'</label></h3>');
 
             $this->html_button($plugin, 'info', false, 6);
             if (in_array('settings', $this->manager->functions)) {
diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php
index 0ccabf344..1fd360dca 100644
--- a/lib/plugins/plugin/lang/cs/lang.php
+++ b/lib/plugins/plugin/lang/cs/lang.php
@@ -11,6 +11,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['menu']                  = 'Správa pluginů';
 $lang['download']              = 'Stáhnout a instalovat plugin';
diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt
index c43e44684..f90b627f3 100644
--- a/lib/plugins/plugin/lang/fr/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/fr/admin_plugin.txt
@@ -1,4 +1,4 @@
 ====== Gestion des modules externes ======
 
-Cette page vous permet de gérer tout ce qui a trait aux [[doku>plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web.
+Cette page vous permet de gérer tout ce qui a trait aux [[doku>fr:plugins|modules externes]] de DokuWiki. Pour 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
index b86c57b53..bb0b49872 100644
--- a/lib/plugins/plugin/lang/fr/lang.php
+++ b/lib/plugins/plugin/lang/fr/lang.php
@@ -16,6 +16,7 @@
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
  */
 $lang['menu']                  = 'Gestion des modules externes';
 $lang['download']              = 'Télécharger et installer un nouveau module';
diff --git a/lib/plugins/plugin/lang/gl/lang.php b/lib/plugins/plugin/lang/gl/lang.php
index 157911a62..a314b71b9 100644
--- a/lib/plugins/plugin/lang/gl/lang.php
+++ b/lib/plugins/plugin/lang/gl/lang.php
@@ -3,6 +3,7 @@
  * Galicianlanguage file
  *
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['menu']                  = 'Xestionar Extensións';
 $lang['download']              = 'Descargar e instalar unha nova extensión';
@@ -48,3 +49,4 @@ $lang['enabled']               = 'Extensión %s activado.';
 $lang['notenabled']            = 'A extensión %s non puido ser activada, comproba os permisos de arquivo.';
 $lang['disabled']              = 'Extensión %s desactivada.';
 $lang['notdisabled']           = 'A extensión %s non puido ser desactivada, comproba os permisos de arquivo.';
+$lang['packageinstalled']      = 'Paquete de extensión (%d plugin(s): %s) instalado axeitadamente.';
diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index c77c3259d..b15b377a6 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -8,6 +8,7 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['menu']                  = '플러그인 관리자';
 $lang['download']              = '새로운 플러그인 다운로드 및 설치';
diff --git a/lib/plugins/plugin/lang/ms/lang.php b/lib/plugins/plugin/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/plugin/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php
index 18662e15b..0599c3184 100644
--- a/lib/plugins/plugin/lang/nl/lang.php
+++ b/lib/plugins/plugin/lang/nl/lang.php
@@ -12,6 +12,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['menu']                  = 'Plugins beheren';
 $lang['download']              = 'Download en installeer een nieuwe plugin';
@@ -57,4 +58,4 @@ $lang['enabled']               = 'Plugin %s ingeschakeld.';
 $lang['notenabled']            = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.';
 $lang['disabled']              = 'Plugin %s uitgeschakeld.';
 $lang['notdisabled']           = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.';
-$lang['packageinstalled']      = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.';
+$lang['packageinstalled']      = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.';
diff --git a/lib/plugins/plugin/lang/no/admin_plugin.txt b/lib/plugins/plugin/lang/no/admin_plugin.txt
index f1b63b992..1765b671d 100644
--- a/lib/plugins/plugin/lang/no/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/no/admin_plugin.txt
@@ -1,3 +1,3 @@
-====== Behandle tillegg ======
+====== Behandle programtillegg ======
 
 På denne siden kan du behandle alt som har å gjøre med DokuWikis [[doku>plugins|tillegg]]. For å kunne laste ned og installere et tillegg må webserveren ha skrivetilgang til mappen for tillegg.
diff --git a/lib/plugins/plugin/lang/no/lang.php b/lib/plugins/plugin/lang/no/lang.php
index 41f6d1153..829d29387 100644
--- a/lib/plugins/plugin/lang/no/lang.php
+++ b/lib/plugins/plugin/lang/no/lang.php
@@ -14,10 +14,11 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
-$lang['menu']                  = 'Behandle tillegg';
-$lang['download']              = 'Last ned og installer et tillegg';
-$lang['manage']                = 'Installerte tillegg';
+$lang['menu']                  = 'Behandle programtillegg';
+$lang['download']              = 'Last ned og installer et programtillegg';
+$lang['manage']                = 'Installerte programtillegg';
 $lang['btn_info']              = 'informasjon';
 $lang['btn_update']            = 'oppdater';
 $lang['btn_delete']            = 'slett';
@@ -31,7 +32,7 @@ $lang['source']                = 'Kilde:';
 $lang['unknown']               = 'ukjent';
 $lang['updating']              = 'Oppdaterer ...';
 $lang['updated']               = 'Tillegget %s er oppdatert';
-$lang['updates']               = 'De følgende tilleggene har blitt oppdatert';
+$lang['updates']               = 'Følgende programtillegg har blitt oppdatert';
 $lang['update_none']           = 'Ingen oppdateringer funnet.';
 $lang['deleting']              = 'Sletter ...';
 $lang['deleted']               = 'Tillegget %s ble slettet.';
diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php
index a84c55190..02459f1de 100644
--- a/lib/plugins/plugin/lang/pl/lang.php
+++ b/lib/plugins/plugin/lang/pl/lang.php
@@ -13,6 +13,7 @@
  * @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>
  */
 $lang['menu']                  = 'Menadżer wtyczek';
 $lang['download']              = 'Ściągnij i zainstaluj nową wtyczkę';
@@ -58,3 +59,4 @@ $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/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php
index 9c90f77a3..50f6ca6f6 100644
--- a/lib/plugins/plugin/lang/ro/lang.php
+++ b/lib/plugins/plugin/lang/ro/lang.php
@@ -9,6 +9,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['menu']                  = 'Administrează plugin-uri';
 $lang['download']              = 'Descarcă şi instalează un nou plugin';
diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php
index 757b607f5..f011c9954 100644
--- a/lib/plugins/plugin/lang/ru/lang.php
+++ b/lib/plugins/plugin/lang/ru/lang.php
@@ -16,6 +16,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['menu']                  = 'Управление плагинами';
 $lang['download']              = 'Скачать и установить новый плагин';
@@ -61,3 +62,4 @@ $lang['enabled']               = 'Плагин %s включён.';
 $lang['notenabled']            = 'Не удалось включить плагин %s. Проверьте системные права доступа к файлам.';
 $lang['disabled']              = 'Плагин %s отключён.';
 $lang['notdisabled']           = 'Не удалось отключить плагин %s. Проверьте системные права доступа к файлам.';
+$lang['packageinstalled']      = 'Пакет (%d плагин(а): %s) успешно установлен.';
diff --git a/lib/plugins/plugin/lang/sl/admin_plugin.txt b/lib/plugins/plugin/lang/sl/admin_plugin.txt
index 2e99c6297..5fd02e1ba 100644
--- a/lib/plugins/plugin/lang/sl/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/sl/admin_plugin.txt
@@ -1,3 +1,3 @@
 ====== 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.
+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
index 39ba20139..3e5f8c8af 100644
--- a/lib/plugins/plugin/lang/sl/lang.php
+++ b/lib/plugins/plugin/lang/sl/lang.php
@@ -7,7 +7,6 @@
  * @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';
@@ -52,3 +51,4 @@ $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/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php
index 3c4827000..54234212d 100644
--- a/lib/plugins/plugin/lang/zh-tw/lang.php
+++ b/lib/plugins/plugin/lang/zh-tw/lang.php
@@ -54,4 +54,4 @@ $lang['enabled']               = '插件 %s 已啟用。';
 $lang['notenabled']            = '插件 %s 無法啟用，請檢查檔案權限。';
 $lang['disabled']              = '插件 %s 已停用。';
 $lang['notdisabled']           = '插件 %s 無法停用，請檢查檔案權限。';
-$lang['packageinstalled']      = '插件 (%d 插件: %s) 已成功地安裝。';
+$lang['packageinstalled']      = '插件 (%d 插件%s: %s) 已成功地安裝。';
diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php
index 1263029e0..58f05fbd9 100644
--- a/lib/plugins/plugin/lang/zh/lang.php
+++ b/lib/plugins/plugin/lang/zh/lang.php
@@ -14,6 +14,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['menu']                  = '插件管理器';
 $lang['download']              = '下载并安装新的插件';
@@ -59,4 +60,4 @@ $lang['enabled']               = '%s 插件启用';
 $lang['notenabled']            = '%s插件启用失败，请检查文件权限。';
 $lang['disabled']              = '%s 插件禁用';
 $lang['notdisabled']           = '%s插件禁用失败，请检查文件权限。';
-$lang['packageinstalled']      = '插件  (%d plugin(s): %s) 已成功安装。';
+$lang['packageinstalled']      = '插件  (%d plugin%s: %s) 已成功安装。';
diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php
index 287bcf3b0..d7c58af2e 100644
--- a/lib/plugins/popularity/lang/cs/lang.php
+++ b/lib/plugins/popularity/lang/cs/lang.php
@@ -8,6 +8,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['name']                  = 'Průzkum používání (může chviličku trvat, než se natáhne)';
 $lang['submit']                = 'Odeslat data';
diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php
index ae12c6683..9ff7a7e8b 100644
--- a/lib/plugins/popularity/lang/fr/lang.php
+++ b/lib/plugins/popularity/lang/fr/lang.php
@@ -13,11 +13,12 @@
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
  */
 $lang['name']                  = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)';
 $lang['submit']                = 'Envoyer les données';
 $lang['autosubmit']            = 'Envoyer les données automatiquement chaque mois';
 $lang['submissionFailed']      = 'Les données ne peuvent pas être envoyées à cause des erreurs suivantes :';
-$lang['submitDirectly']        = 'Vous pouvez envoyer le données manuellement  en soumettant ce formulaire.';
+$lang['submitDirectly']        = 'Vous pouvez envoyer le données manuellement en soumettant ce formulaire.';
 $lang['autosubmitError']       = 'La dernière soumission automatique a échoué pour les raisons suivantes :';
-$lang['lastSent']              = 'Les données ont été envoyées';
+$lang['lastSent']              = 'Les données ont été envoyées ';
diff --git a/lib/plugins/popularity/lang/gl/lang.php b/lib/plugins/popularity/lang/gl/lang.php
index 3e7d9275b..34bd3935f 100644
--- a/lib/plugins/popularity/lang/gl/lang.php
+++ b/lib/plugins/popularity/lang/gl/lang.php
@@ -3,6 +3,12 @@
  * Galician language file
  *
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['name']                  = 'Resposta de Popularidade (pode demorar un tempo a cargar)';
 $lang['submit']                = 'Enviar Datos';
+$lang['autosubmit']            = 'Enviar datos automáticamente unha vez por mes';
+$lang['submissionFailed']      = 'Os datos non se poden enviar debido ao seguinte erro:';
+$lang['submitDirectly']        = 'Podes enviar os datos de forma manual co seguinte formulario.';
+$lang['autosubmitError']       = 'O último envío automático fallou debido ao seguinte erro:';
+$lang['lastSent']              = 'Os datos foron enviados';
diff --git a/lib/plugins/popularity/lang/gl/submitted.txt b/lib/plugins/popularity/lang/gl/submitted.txt
new file mode 100644
index 000000000..0dec55eef
--- /dev/null
+++ b/lib/plugins/popularity/lang/gl/submitted.txt
@@ -0,0 +1,3 @@
+====== Resposta de Popularidade ======
+
+Os datos foron enviados satisfactoriamente.
+\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php
index 0f1442d53..01bc51044 100644
--- a/lib/plugins/popularity/lang/ko/lang.php
+++ b/lib/plugins/popularity/lang/ko/lang.php
@@ -7,6 +7,7 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['name']                  = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)';
 $lang['submit']                = '자료 보내기';
diff --git a/lib/plugins/popularity/lang/ms/lang.php b/lib/plugins/popularity/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/popularity/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php
index 75c13013b..e5e94aab4 100644
--- a/lib/plugins/popularity/lang/nl/lang.php
+++ b/lib/plugins/popularity/lang/nl/lang.php
@@ -11,6 +11,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['name']                  = 'Populariteitsfeedback (kan even duren om in te laden)';
 $lang['submit']                = 'Verstuur';
diff --git a/lib/plugins/popularity/lang/no/intro.txt b/lib/plugins/popularity/lang/no/intro.txt
index 3e67d793c..a0f360157 100644
--- a/lib/plugins/popularity/lang/no/intro.txt
+++ b/lib/plugins/popularity/lang/no/intro.txt
@@ -1,9 +1,9 @@
 ====== Popularitetsfeedback ======
 
-Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av dets brukere, og gjør at fremtidig beslutninger om videre utvikling kan tuftes på statistikk fra virkelig bruk.
+Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av brukerne, og gjør at fremtidig beslutninger om videre utvikling kan baseres på statistikk fra virkelig bruk.
 
 Du oppfordres herved til å gjenta dette skrittet fra tid til annen for å holde utviklerne informert når din wiki vokser. Ditt gjentatte datasett blir identifisert vha en anonym ID.
 
 De data som samles inn inneholder informasjon som din DokuWiki-versjon, antallet og størrelsen på sider og filer, installerte plugins og informasjon om din installerte PHP.
 
-Rådata som blir sendt vises nedenfor. Vennligst bruk knappen "Send data" for å overføre informasjonen.
-\ No newline at end of file
+Rådata som blir sendt vises nedenfor. Bruk knappen "Send data" for å overføre informasjonen.
+\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/no/lang.php b/lib/plugins/popularity/lang/no/lang.php
index e283fc371..df38f6e0e 100644
--- a/lib/plugins/popularity/lang/no/lang.php
+++ b/lib/plugins/popularity/lang/no/lang.php
@@ -12,11 +12,12 @@
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Thomas Nygreen <nygreen@gmail.com>
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
 $lang['name']                  = 'Popularitetsfeedback (kan ta litt tid å laste)';
 $lang['submit']                = 'Send data';
 $lang['autosubmit']            = 'Send data automatisk en gang i måneden';
 $lang['submissionFailed']      = 'Kunne ikke sende dataene på grunn av følgende feil:';
 $lang['submitDirectly']        = 'Du kan sende dataene manuelt ved å sende inn dette skjemaet.';
-$lang['autosubmitError']       = 'Den siste automatiske innsendinga feilet på grunn av følgende feil:';
+$lang['autosubmitError']       = 'Den siste automatiske innsendingen feilet på grunn av følgende feil:';
 $lang['lastSent']              = 'Dataene er sendt';
diff --git a/lib/plugins/popularity/lang/no/submitted.txt b/lib/plugins/popularity/lang/no/submitted.txt
index 239676a9d..ccec7674e 100644
--- a/lib/plugins/popularity/lang/no/submitted.txt
+++ b/lib/plugins/popularity/lang/no/submitted.txt
@@ -1,3 +1,3 @@
 ====== Tilbakemelding om popularitet ======
 
-Innsending av dataene var vellykka.
-\ No newline at end of file
+Innsending av dataene var vellykket.
+\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php
index d96254fd8..64d772d54 100644
--- a/lib/plugins/popularity/lang/pl/lang.php
+++ b/lib/plugins/popularity/lang/pl/lang.php
@@ -11,6 +11,7 @@
  * @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>
  */
 $lang['name']                  = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)';
 $lang['submit']                = 'Wyślij dane';
diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php
index 7f3508362..9e9086b0d 100644
--- a/lib/plugins/popularity/lang/ro/lang.php
+++ b/lib/plugins/popularity/lang/ro/lang.php
@@ -7,6 +7,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['name']                  = 'Feedback de popularitate (încărcarea poate dura mai mult)';
 $lang['submit']                = 'Trimite datele';
diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php
index 79b3e224d..0e29c795d 100644
--- a/lib/plugins/popularity/lang/ru/lang.php
+++ b/lib/plugins/popularity/lang/ru/lang.php
@@ -13,6 +13,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['name']                  = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)';
 $lang['submit']                = 'Отправить данные';
diff --git a/lib/plugins/popularity/lang/sl/intro.txt b/lib/plugins/popularity/lang/sl/intro.txt
index ceb0e61e6..2c029db63 100644
--- a/lib/plugins/popularity/lang/sl/intro.txt
+++ b/lib/plugins/popularity/lang/sl/intro.txt
@@ -1,9 +1,9 @@
-====== Poro�ilo o uporabi ======
+====== Poročilo o uporabi ======
 
-To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni Dokuwiki strani in omogo�a po�iljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo na�ine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statisti�nimi podatki vpliva tudi na nadaljnji razvoj sistema.
+To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni DokuWiki strani in omogoča pošiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo načine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statističnimi podatki vpliva tudi na nadaljnji razvoj sistema.
 
-Priporo�eno je, da poro�ilo o uporabi po�ljete vsake toliko �asa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spleti��a in pogostosti uporabe. Vsi podatki so poslani ozna�eni s posebno vpisno �tevilko, ki omogo�a brezimno sledenje.
+Priporočeno je, da poročilo o uporabi pošljete vsake toliko časa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletišča in pogostosti uporabe. Vsi podatki so poslani označeni s posebno vpisno številko, ki omogoča brezimno sledenje.
 
-Zbrani podatki vsebujejo podrobnosti o razli�ici uporabljenega sistema DokuWiki, �tevilo in velikost wiki strani, datotekah, ki so nalo�ene na sistem in podatke o vstavkih ter PHP namestitvi in razli�ici.
+Zbrani podatki vsebujejo podrobnosti o različici uporabljenega sistema DokuWiki, število in velikost wiki strani, datotekah, ki so naložene na sistem in podatke o vstavkih ter PHP namestitvi in različici.
 
-Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Po�lji podatke", bodo ti poslani na stre�nik razvijalcev.
+Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Pošlji podatke", bodo ti poslani na strežnik razvijalcev.
diff --git a/lib/plugins/popularity/lang/sl/submitted.txt b/lib/plugins/popularity/lang/sl/submitted.txt
index 988afd837..11ae052f7 100644
--- a/lib/plugins/popularity/lang/sl/submitted.txt
+++ b/lib/plugins/popularity/lang/sl/submitted.txt
@@ -1,3 +1,3 @@
-====== Poro�ilo o uporabi ======
+====== Poročilo o uporabi ======
 
-Podatki so bili uspe�no poslani.
+Podatki so bili uspešno poslani.
diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php
index f45aaf4ff..9c916c2a5 100644
--- a/lib/plugins/popularity/lang/zh/lang.php
+++ b/lib/plugins/popularity/lang/zh/lang.php
@@ -13,6 +13,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['name']                  = '人气反馈（载入可能需要一些时间）';
 $lang['submit']                = '发送数据';
diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php
index cf19381c8..5414ea1e5 100644
--- a/lib/plugins/revert/lang/cs/lang.php
+++ b/lib/plugins/revert/lang/cs/lang.php
@@ -11,6 +11,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['menu']                  = 'Obnova zaspamovaných stránek';
 $lang['filter']                = 'Hledat zaspamované stránky';
diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php
index 15d4d39c3..9c5194b31 100644
--- a/lib/plugins/revert/lang/fr/lang.php
+++ b/lib/plugins/revert/lang/fr/lang.php
@@ -14,6 +14,7 @@
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
  */
 $lang['menu']                  = 'Gestionnaire de réversions';
 $lang['filter']                = 'Trouver les pages spammées ';
diff --git a/lib/plugins/revert/lang/gl/lang.php b/lib/plugins/revert/lang/gl/lang.php
index 87bce32ba..a0c5a9785 100644
--- a/lib/plugins/revert/lang/gl/lang.php
+++ b/lib/plugins/revert/lang/gl/lang.php
@@ -3,6 +3,7 @@
  * Galicianlanguage file
  *
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['menu']                  = 'Xestor de Reversión';
 $lang['filter']                = 'Procurar páxinas con correo-lixo';
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index 0163d2754..da689c788 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -7,6 +7,7 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['menu']                  = '복구 관리자';
 $lang['filter']                = '스팸 페이지 검색 ';
diff --git a/lib/plugins/revert/lang/ms/lang.php b/lib/plugins/revert/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/revert/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php
index 954bf1068..32e14c2c4 100644
--- a/lib/plugins/revert/lang/nl/lang.php
+++ b/lib/plugins/revert/lang/nl/lang.php
@@ -12,6 +12,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['menu']                  = 'Herstelmanager';
 $lang['filter']                = 'Zoek naar bekladde pagina\'s';
diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php
index 2a6a2abd3..299b12ea7 100644
--- a/lib/plugins/revert/lang/no/lang.php
+++ b/lib/plugins/revert/lang/no/lang.php
@@ -14,6 +14,7 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
 $lang['menu']                  = 'Tilbakestillingsbehandler';
 $lang['filter']                = 'Søk etter søppelmeldinger';
diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php
index f36dc591a..30ab60fda 100644
--- a/lib/plugins/revert/lang/pl/lang.php
+++ b/lib/plugins/revert/lang/pl/lang.php
@@ -10,6 +10,7 @@
  * @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>
  */
 $lang['menu']                  = 'Menadżer przywracania';
 $lang['filter']                = 'Wyszukaj uszkodzone strony';
diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php
index 7397a1d74..f1fcf727c 100644
--- a/lib/plugins/revert/lang/ro/lang.php
+++ b/lib/plugins/revert/lang/ro/lang.php
@@ -9,6 +9,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['menu']                  = 'Manager Reveniri';
 $lang['filter']                = 'Caută pagini cu posibil spam';
diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php
index 9624d8fd6..4abe37e6a 100644
--- a/lib/plugins/revert/lang/ru/lang.php
+++ b/lib/plugins/revert/lang/ru/lang.php
@@ -14,6 +14,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['menu']                  = 'Менеджер откаток';
 $lang['filter']                = 'Поиск спам-страниц';
diff --git a/lib/plugins/revert/lang/sl/intro.txt b/lib/plugins/revert/lang/sl/intro.txt
index c63f281ed..4e2cabf96 100644
--- a/lib/plugins/revert/lang/sl/intro.txt
+++ b/lib/plugins/revert/lang/sl/intro.txt
@@ -1,3 +1,3 @@
 ====== Povrnitev okvarjene vsebine ======
 
-Na tej strani je mogo�e povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu ne�elenih vsebin. Za iskanje strani z ne�eleno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z ne�eleno vsebino in nato povrnite stanje na zadnjo pravo razli�ico.
+Na tej strani je mogoče povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neželenih vsebin. Za iskanje strani z neželeno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neželeno vsebino in nato povrnite stanje na zadnjo pravo različico.
diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php
index c3d1639ff..d4d010f29 100644
--- a/lib/plugins/revert/lang/zh/lang.php
+++ b/lib/plugins/revert/lang/zh/lang.php
@@ -14,6 +14,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['menu']                  = '还原管理器';
 $lang['filter']                = '搜索包含垃圾信息的页面';
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 8e90be093..8b646b426 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -149,6 +149,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
         ptln("<form action=\"".wl($ID)."\" method=\"post\">");
         formSecurityToken();
+        ptln("  <div class=\"table\">");
         ptln("  <table class=\"inline\">");
         ptln("    <thead>");
         ptln("      <tr>");
@@ -206,6 +207,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("      </td></tr>");
         ptln("    </tbody>");
         ptln("  </table>");
+        ptln("  </div>");
 
         ptln("</form>");
         ptln("</div>");
@@ -256,6 +258,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         ptln("<form action=\"".wl($ID)."\" method=\"post\">",$indent);
         formSecurityToken();
+        ptln("  <div class=\"table\">",$indent);
         ptln("  <table class=\"inline\">",$indent);
         ptln("    <thead>",$indent);
         ptln("      <tr><th>".$this->lang["field"]."</th><th>".$this->lang["value"]."</th></tr>",$indent);
@@ -295,6 +298,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("      </tr>",$indent);
         ptln("    </tbody>",$indent);
         ptln("  </table>",$indent);
+        ptln("  </div>",$indent);
 
         foreach ($notes as $note)
           ptln("<div class=\"fn\">".$note."</div>",$indent);
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index fe54d4cce..8351c190b 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -10,6 +10,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['menu']                  = 'Správa uživatelů';
 $lang['noauth']                = '(autentizace uživatelů není k dispozici)';
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 875b6d1a6..948262a8f 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -15,6 +15,7 @@
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
  */
 $lang['menu']                  = 'Gestion des utilisateurs';
 $lang['noauth']                = '(authentification utilisateur non disponible)';
diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php
index 0a01ef750..c9c633b39 100644
--- a/lib/plugins/usermanager/lang/gl/lang.php
+++ b/lib/plugins/usermanager/lang/gl/lang.php
@@ -3,6 +3,7 @@
  * Galicianlanguage file
  *
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['menu']                  = 'Xestor de Usuarios';
 $lang['noauth']                = '(autenticación de usuarios non dispoñible)';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index f2322414a..111267e5f 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -7,6 +7,7 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['menu']                  = '사용자 관리자';
 $lang['noauth']                = '(사용자 인증이 불가능합니다.)';
diff --git a/lib/plugins/usermanager/lang/ms/lang.php b/lib/plugins/usermanager/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index cac793386..b00ab22e0 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -12,6 +12,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['menu']                  = 'Gebruikersmanager';
 $lang['noauth']                = '(gebruikersauthenticatie niet beschikbaar)';
diff --git a/lib/plugins/usermanager/lang/no/lang.php b/lib/plugins/usermanager/lang/no/lang.php
index 668863ec2..7124e4811 100644
--- a/lib/plugins/usermanager/lang/no/lang.php
+++ b/lib/plugins/usermanager/lang/no/lang.php
@@ -14,6 +14,7 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
 $lang['menu']                  = 'Behandle brukere';
 $lang['noauth']                = '(autentisering av brukere ikke tilgjengelig)';
@@ -28,7 +29,7 @@ $lang['field']                 = 'Felt';
 $lang['value']                 = 'Verdi';
 $lang['add']                   = 'Legg til';
 $lang['delete']                = 'Slett';
-$lang['delete_selected']       = 'Slett utvalgte';
+$lang['delete_selected']       = 'Slett valgte';
 $lang['edit']                  = 'Rediger';
 $lang['edit_prompt']           = 'Rediger denne brukeren';
 $lang['modify']                = 'Lagre endringer';
diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php
index 7c79c5d1f..5bbf84370 100644
--- a/lib/plugins/usermanager/lang/pl/lang.php
+++ b/lib/plugins/usermanager/lang/pl/lang.php
@@ -11,6 +11,7 @@
  * @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>
  */
 $lang['menu']                  = 'Menadżer użytkowników';
 $lang['noauth']                = '(uwierzytelnienie użytkownika niemożliwe)';
diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php
index 4c0afc896..7aac6cfb0 100644
--- a/lib/plugins/usermanager/lang/ro/lang.php
+++ b/lib/plugins/usermanager/lang/ro/lang.php
@@ -9,6 +9,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['menu']                  = 'Manager Utilizatori';
 $lang['noauth']                = '(autentificarea utilizatorilor nu este disponibilă)';
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 456ba5b29..eb9f26be6 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -16,6 +16,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
diff --git a/lib/plugins/usermanager/lang/sl/delete.txt b/lib/plugins/usermanager/lang/sl/delete.txt
index 7d9de54e6..1fd4fffe1 100644
--- a/lib/plugins/usermanager/lang/sl/delete.txt
+++ b/lib/plugins/usermanager/lang/sl/delete.txt
@@ -1 +1 @@
-===== Izbrisanje uporabnika =====
-\ No newline at end of file
+===== Izbris uporabnika =====
+\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index c1cb0c91a..e7a228229 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -13,6 +13,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['menu']                  = '用户管理器';
 $lang['noauth']                = '（用户认证不可用）';
diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index 20b408322..cffdde042 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -16,7 +16,7 @@ var dw_behaviour = {
         dw_behaviour.subscription();
 
         dw_behaviour.revisionBoxHandler();
-        jQuery('#page__revisions input[type=checkbox]').click(
+        jQuery('#page__revisions input[type=checkbox]').live('click',
             dw_behaviour.revisionBoxHandler
         );
     },
diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js
index ea52153c5..385e45854 100644
--- a/lib/scripts/compatibility.js
+++ b/lib/scripts/compatibility.js
@@ -49,7 +49,7 @@ function DEPRECATED_WRAP(func, context) {
  * @link http://prototype.conio.net/
  */
 function $() {
-    DEPRECATED('Please use the JQuery() function instead.');
+    DEPRECATED('Please use the jQuery() function instead.');
 
     var elements = new Array();
 
diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js
index 2009ce6af..042e34608 100644
--- a/lib/scripts/editor.js
+++ b/lib/scripts/editor.js
@@ -61,9 +61,9 @@ var dw_editor = {
         jQuery.each([
             ['larger', function(){dw_editor.sizeCtl(editor,100);}],
             ['smaller', function(){dw_editor.sizeCtl(editor,-100);}],
-            ['wrap', function(){dw_editor.toggleWrap(editor);}],
+            ['wrap', function(){dw_editor.toggleWrap(editor);}]
         ], function (_, img) {
-            jQuery(document.createElement('img'))
+            jQuery(document.createElement('IMG'))
                 .attr('src', DOKU_BASE+'lib/images/' + img[0] + '.gif')
                 .click(img[1])
                 .appendTo($ctl);
@@ -130,7 +130,7 @@ var dw_editor = {
      * @param event e - the key press event object
      */
     keyHandler: function(e){
-        if([8, 13, 32].indexOf(e.keyCode) === -1) {
+        if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) {
             return;
         }
         var selection = getSelection(this);
diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index f92bdbc49..4abd63bef 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -55,9 +55,11 @@ qq.extend(qq.FileUploader.prototype, {
         qq.setText(fileElement, fileName);
         this._find(item, 'size').style.display = 'none';
 
+        // name suggestion (simplified cleanID)
         var nameElement = this._find(item, 'nameInput');
         fileName = fileName.toLowerCase();
-        fileName = fileName.replace(/([^a-z0-9_\.\-]+)/g, '_');
+        fileName = fileName.replace(/([ !"#$%&\'()+,\/;<=>?@[\]^`{|}~:]+)/g, '_');
+        fileName = fileName.replace(/^_+/,'');
         nameElement.value = fileName;
         nameElement.id = 'mediamanager__upload_item'+id;
 
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index cc4c19e0d..5075a0ab8 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -35,14 +35,13 @@ var dw_linkwiz = {
                     )
                .parent()
                .attr('id','link__wiz')
-               .addClass('a11y')
                .css({
                     'position':    'absolute',
                     'top':         (pos.top+20)+'px',
                     'left':        (pos.left+80)+'px'
                    })
-               .show()
-               .appendTo('div.dokuwiki');
+               .hide()
+               .appendTo('.dokuwiki:first');
 
         dw_linkwiz.textArea = $editor[0];
         dw_linkwiz.result = jQuery('#link__wiz_result')[0];
@@ -186,7 +185,7 @@ var dw_linkwiz = {
      */
     resultClick: function(a){
         dw_linkwiz.$entry.val(a.title);
-        if(a.title == '' || a.title.substr(-1) == ':'){
+        if(a.title == '' || a.title.substr(a.title.length-1) == ':'){
             dw_linkwiz.autocomplete_exec();
         }else{
             if (jQuery(a.nextSibling).is('span')) {
@@ -283,7 +282,7 @@ var dw_linkwiz = {
      */
     show: function(){
         dw_linkwiz.selection  = getSelection(dw_linkwiz.textArea);
-        dw_linkwiz.$wiz.removeClass('a11y');
+        dw_linkwiz.$wiz.show();
         dw_linkwiz.$entry.focus();
         dw_linkwiz.autocomplete();
     },
@@ -292,7 +291,7 @@ var dw_linkwiz = {
      * Hide the link wizard
      */
     hide: function(){
-        dw_linkwiz.$wiz.addClass('a11y');
+        dw_linkwiz.$wiz.hide();
         dw_linkwiz.textArea.focus();
     },
 
@@ -300,7 +299,7 @@ var dw_linkwiz = {
      * Toggle the link wizard
      */
     toggle: function(){
-        if(dw_linkwiz.$wiz.hasClass('a11y')){
+        if(dw_linkwiz.$wiz.css('display') == 'none'){
             dw_linkwiz.show();
         }else{
             dw_linkwiz.hide();
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 7f5514f56..841baa93f 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -135,7 +135,7 @@ var dw_mediamanager = {
         });
         $sortBy.children('input').change(function (event) {
             dw_mediamanager.set_fileview_sort();
-            dw_mediamanager.list.call(this, event);
+            dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event);
         });
     },
 
@@ -253,8 +253,10 @@ var dw_mediamanager = {
                         }
                     }
                 }
-                alignleft = dw_mediamanager.align === '2' ? '' : ' ';
-                alignright = dw_mediamanager.align === '4' ? '' : ' ';
+                if (dw_mediamanager.align !== '1') {
+                    alignleft = dw_mediamanager.align === '2' ? '' : ' ';
+                    alignright = dw_mediamanager.align === '4' ? '' : ' ';
+                }
             }
         }
         edid = String.prototype.match.call(document.location, /&edid=([^&]+)/);
@@ -371,6 +373,10 @@ var dw_mediamanager = {
         if (typeof new_val === 'undefined') {
             new_val = jQuery('form.options li.' + opt[1] + ' input')
                         .filter(':checked').val();
+            // if new_val is still undefined (because form.options is not in active tab), set to most spacious option
+            if (typeof new_val === 'undefined') {
+                new_val = 'thumbs';
+            }
         }
 
         if (new_val !== dw_mediamanager.view_opts[opt[0]]) {
diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index e4033b76d..5da4a9cc0 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -43,7 +43,7 @@ dw_page = {
      *
      * @param target - the DOM element at which the popup should be aligned at
      * @param popup_id - the ID of the (new) DOM popup
-     * @return the Popup JQuery object
+     * @return the Popup jQuery object
      */
     insituPopup: function(target, popup_id) {
         // get or create the popup div
@@ -55,7 +55,7 @@ dw_page = {
                 .attr('id', popup_id)
                 .addClass('insitu-footnote JSpopup')
                 .mouseleave(function () {jQuery(this).hide();});
-            jQuery('div.dokuwiki:first').append($fndiv);
+            jQuery('.dokuwiki:first').append($fndiv);
         }
 
         // position() does not support hidden elements
diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js
index c7128b9e3..a309f9e29 100644
--- a/lib/scripts/qsearch.js
+++ b/lib/scripts/qsearch.js
@@ -18,8 +18,8 @@ var dw_qsearch = {
      *
      * Attaches the event handlers
      *
-     * @param input element (JQuery selector/DOM obj)
-     * @param output element (JQuery selector/DOM obj)
+     * @param input element (jQuery selector/DOM obj)
+     * @param output element (jQuery selector/DOM obj)
      */
     init: function (input, output) {
         var do_qsearch;
diff --git a/lib/tpl/default/_linkwiz.css b/lib/tpl/default/_linkwiz.css
index fd40a0019..ca8812867 100644
--- a/lib/tpl/default/_linkwiz.css
+++ b/lib/tpl/default/_linkwiz.css
@@ -1,27 +1,4 @@
 #link__wiz {
-    position: absolute;
-    display: block;
-    z-index: 99;
-    width:   300px;
-    height:  250px;
-    padding: 0;
-    margin:  0;
-    overflow: hidden;
-    border: 1px solid __border__;
-    background-color: __background_neu__;
-    text-align: center;
-}
-
-#link__wiz_header {
-    background-color: __background_alt__;
-    height: 16px;
-    margin-bottom: 5px;
-    cursor: move;
-}
-
-#link__wiz_close {
-    cursor: pointer;
-    margin: 0;
 }
 
 #link__wiz_result {
@@ -61,9 +38,3 @@
     display: block;
     color: __text_neu__;
 }
-
-/*FIXME maybe move to a more general style sheet*/
-.ondrag {
-    cursor: move;
-    opacity: 0.8;
-}
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
index 383a1597c..68fa2e97f 100644
--- a/lib/tpl/default/_mediamanager.css
+++ b/lib/tpl/default/_mediamanager.css
@@ -59,6 +59,7 @@
     background-color: __background_alt__;
 }
 
+
 /*____________ Namespaces tree ____________*/
 
 #mediamanager__page .namespaces h2 {
@@ -406,10 +407,12 @@
 }
 #mediamanager__diff .imageDiff .image1,
 #mediamanager__diff .imageDiff .image2 {
+    width: 97%;
+}
+#mediamanager__diff .imageDiff .image2 {
     position: absolute;
     top: 0;
     left: 0;
-    width: 97%;
 }
 
 #mediamanager__diff .imageDiff.opacity .image2 {
author	Dominik Eckelmann <deckelmann@gmail.com>	2012-03-14 12:52:36 +0100
committer	Dominik Eckelmann <deckelmann@gmail.com>	2012-03-14 12:52:36 +0100
commit	3a6d76070be7220b8e5f7c04443aa923bc8cddf2 (patch)
tree	dfd00b5d0c5f58ee313eb376a8cb1ee99512bf83
parent	03d7247e047c21d2733f837148a1499f56784ae3 (diff)
parent	d0caa5642f6e322a026bd5bdac4585ff1b2f40da (diff)
download	rpg-3a6d76070be7220b8e5f7c04443aa923bc8cddf2.tar.gz rpg-3a6d76070be7220b8e5f7c04443aa923bc8cddf2.tar.bz2