Merge remote-tracking branch 'splitbrain/master'

235 files changed, 7500 insertions, 2899 deletions

diff --git a/inc/EmailAddressValidator.php b/inc/EmailAddressValidator.php
index bb4ef0ca9..fd6f3275b 100644
--- a/inc/EmailAddressValidator.php
+++ b/inc/EmailAddressValidator.php
@@ -15,8 +15,8 @@ class EmailAddressValidator {
 
     /**
      * Check email address validity
-     * @param   strEmailAddress     Email address to be checked
-     * @return  True if email is valid, false if not
+     * @param  string $strEmailAddress     Email address to be checked
+     * @return bool True if email is valid, false if not
      */
     public function check_email_address($strEmailAddress) {
 
@@ -82,8 +82,8 @@ class EmailAddressValidator {
 
     /**
      * Checks email section before "@" symbol for validity
-     * @param   strLocalPortion     Text to be checked
-     * @return  True if local portion is valid, false if not
+     * @param string  $strLocalPortion     Text to be checked
+     * @return bool True if local portion is valid, false if not
      */
     protected function check_local_portion($strLocalPortion) {
         // Local portion can only be from 1 to 64 characters, inclusive.
@@ -113,8 +113,8 @@ class EmailAddressValidator {
 
     /**
      * Checks email section after "@" symbol for validity
-     * @param   strDomainPortion     Text to be checked
-     * @return  True if domain portion is valid, false if not
+     * @param  string $strDomainPortion     Text to be checked
+     * @return bool True if domain portion is valid, false if not
      */
     protected function check_domain_portion($strDomainPortion) {
         // Total domain can only be from 1 to 255 characters, inclusive
@@ -172,10 +172,10 @@ class EmailAddressValidator {
 
     /**
      * Check given text length is between defined bounds
-     * @param   strText     Text to be checked
-     * @param   intMinimum  Minimum acceptable length
-     * @param   intMaximum  Maximum acceptable length
-     * @return  True if string is within bounds (inclusive), false if not
+     * @param   string $strText     Text to be checked
+     * @param   int $intMinimum  Minimum acceptable length
+     * @param   int $intMaximum  Maximum acceptable length
+     * @return bool True if string is within bounds (inclusive), false if not
      */
     protected function check_text_length($strText, $intMinimum, $intMaximum) {
         // Minimum and maximum are both inclusive
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 96954fb47..6ac67f159 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -35,6 +35,19 @@ class DokuHTTPClient extends HTTPClient {
         $this->proxy_pass   = conf_decodeString($conf['proxy']['pass']);
         $this->proxy_ssl    = $conf['proxy']['ssl'];
         $this->proxy_except = $conf['proxy']['except'];
+
+        // allow enabling debugging via URL parameter (if debugging allowed)
+        if($conf['allowdebug']) {
+            if(
+                isset($_REQUEST['httpdebug']) ||
+                (
+                    isset($_SERVER['HTTP_REFERER']) &&
+                    strpos($_SERVER['HTTP_REFERER'], 'httpdebug') !== false
+                )
+            ) {
+                $this->debug = true;
+            }
+        }
     }
 
 
@@ -61,6 +74,9 @@ class DokuHTTPClient extends HTTPClient {
 
 }
 
+/**
+ * Class HTTPClientException
+ */
 class HTTPClientException extends Exception { }
 
 /**
@@ -249,12 +265,17 @@ class HTTPClient {
             if (empty($port)) $port = 8080;
         }else{
             $request_url = $path;
-            $server      = $server;
             if (!isset($port)) $port = ($uri['scheme'] == 'https') ? 443 : 80;
         }
 
         // add SSL stream prefix if needed - needs SSL support in PHP
-        if($port == 443 || $this->proxy_ssl) $server = 'ssl://'.$server;
+        if($port == 443 || $this->proxy_ssl) {
+            if(!in_array('ssl', stream_get_transports())) {
+                $this->status = -200;
+                $this->error = 'This PHP version does not support SSL - cannot connect to server';
+            }
+            $server = 'ssl://'.$server;
+        }
 
         // prepare headers
         $headers               = $this->headers;
@@ -274,7 +295,6 @@ class HTTPClient {
                 }
             }
             $headers['Content-Length'] = strlen($data);
-            $rmethod = 'POST';
         }elseif($method == 'GET'){
             $data = ''; //no data allowed on GET requests
         }
@@ -304,11 +324,18 @@ class HTTPClient {
             }
 
             // try establish a CONNECT tunnel for SSL
-            if($this->_ssltunnel($socket, $request_url)){
-                // no keep alive for tunnels
-                $this->keep_alive = false;
-                // tunnel is authed already
-                if(isset($headers['Proxy-Authentication'])) unset($headers['Proxy-Authentication']);
+            try {
+                if($this->_ssltunnel($socket, $request_url)){
+                    // no keep alive for tunnels
+                    $this->keep_alive = false;
+                    // tunnel is authed already
+                    if(isset($headers['Proxy-Authentication'])) unset($headers['Proxy-Authentication']);
+                }
+            } catch (HTTPClientException $e) {
+                $this->status = $e->getCode();
+                $this->error = $e->getMessage();
+                fclose($socket);
+                return false;
             }
 
             // keep alive?
@@ -330,7 +357,7 @@ class HTTPClient {
 
         try {
             //set non-blocking
-            stream_set_blocking($socket, false);
+            stream_set_blocking($socket, 0);
 
             // build request
             $request  = "$method $request_url HTTP/".$this->http.HTTP_NL;
@@ -363,7 +390,7 @@ class HTTPClient {
 
             // get Status
             if (!preg_match('/^HTTP\/(\d\.\d)\s*(\d+).*?\n/', $r_headers, $m))
-                throw new HTTPClientException('Server returned bad answer');
+                throw new HTTPClientException('Server returned bad answer '.$r_headers);
 
             $this->status = $m[2];
 
@@ -445,7 +472,7 @@ class HTTPClient {
 
                     if ($chunk_size > 0) {
                         $r_body .= $this->_readData($socket, $chunk_size, 'chunk');
-                        $byte = $this->_readData($socket, 2, 'chunk'); // read trailing \r\n
+                        $this->_readData($socket, 2, 'chunk'); // read trailing \r\n
                     }
                 } while ($chunk_size && !$abort);
             }elseif(isset($this->resp_headers['content-length']) && !isset($this->resp_headers['transfer-encoding'])){
@@ -467,7 +494,6 @@ class HTTPClient {
                 $r_body = $this->_readData($socket, $this->max_bodysize, 'response (content-length limited)', true);
             }else{
                 // read entire socket
-                $r_size = 0;
                 while (!feof($socket)) {
                     $r_body .= $this->_readData($socket, 4096, 'response (unlimited)', true);
                 }
@@ -496,7 +522,6 @@ class HTTPClient {
         if (!$this->keep_alive ||
                 (isset($this->resp_headers['connection']) && $this->resp_headers['connection'] == 'Close')) {
             // close socket
-            $status = socket_get_status($socket);
             fclose($socket);
             unset(self::$connections[$connectionId]);
         }
@@ -526,6 +551,7 @@ class HTTPClient {
      *
      * @param resource &$socket
      * @param string   &$requesturl
+     * @throws HTTPClientException when a tunnel is needed but could not be established
      * @return bool true if a tunnel was established
      */
     function _ssltunnel(&$socket, &$requesturl){
@@ -538,7 +564,7 @@ class HTTPClient {
         $request  = "CONNECT {$requestinfo['host']}:{$requestinfo['port']} HTTP/1.0".HTTP_NL;
         $request .= "Host: {$requestinfo['host']}".HTTP_NL;
         if($this->proxy_user) {
-                'Proxy-Authorization Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass).HTTP_NL;
+            $request .= 'Proxy-Authorization: Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass).HTTP_NL;
         }
         $request .= HTTP_NL;
 
@@ -559,7 +585,8 @@ class HTTPClient {
                 return true;
             }
         }
-        return false;
+
+        throw new HTTPClientException('Failed to establish secure proxy connection', -150);
     }
 
     /**
diff --git a/inc/Input.class.php b/inc/Input.class.php
index 7434d2b2c..e7eef1c29 100644
--- a/inc/Input.class.php
+++ b/inc/Input.class.php
@@ -15,6 +15,8 @@ class Input {
     public $post;
     /** @var GetInput Access $_GET parameters */
     public $get;
+    /** @var ServerInput Access $_SERVER parameters */
+    public $server;
 
     protected $access;
 
@@ -25,6 +27,7 @@ class Input {
         $this->access = &$_REQUEST;
         $this->post   = new PostInput();
         $this->get    = new GetInput();
+        $this->server = new ServerInput();
     }
 
     /**
@@ -141,6 +144,26 @@ class Input {
     }
 
     /**
+     * Access a request parameter and make sure it is has a valid value
+     *
+     * Please note that comparisons to the valid values are not done typesafe (request vars
+     * are always strings) however the function will return the correct type from the $valids
+     * array when an match was found.
+     *
+     * @param string $name    Parameter name
+     * @param array  $valids  Array of valid values
+     * @param mixed  $default Default to return if parameter isn't set or not valid
+     * @return null|mixed
+     */
+    public function valid($name, $valids, $default = null) {
+        if(!isset($this->access[$name])) return $default;
+        if(is_array($this->access[$name])) return $default; // we don't allow arrays
+        $found = array_search($this->access[$name], $valids);
+        if($found !== false) return $valids[$found]; // return the valid value for type safety
+        return $default;
+    }
+
+    /**
      * Access a request parameter as bool
      *
      * Note: $nonempty is here for interface consistency and makes not much sense for booleans
@@ -260,3 +283,18 @@ class GetInput extends Input {
         $_REQUEST[$name] = $value;
     }
 }
+
+/**
+ * Internal class used for $_SERVER access in Input class
+ */
+class ServerInput extends Input {
+    protected $access;
+
+    /**
+     * Initialize the $access array, remove subclass members
+     */
+    function __construct() {
+        $this->access = &$_SERVER;
+    }
+
+}
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index cb1772736..a35ec3ed0 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -2929,7 +2929,8 @@ class JpegMeta {
             $length = strlen($data) - $pos;
         }
 
-        return substr($data, $pos, $length);
+        $rv = substr($data, $pos, $length);
+        return $rv;
     }
 
     /*************************************************************/
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index 2ac2c1d60..e90b45f99 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -39,6 +39,8 @@ class Mailer {
      */
     public function __construct() {
         global $conf;
+        /* @var Input $INPUT */
+        global $INPUT;
 
         $server = parse_url(DOKU_URL, PHP_URL_HOST);
         if(strpos($server,'.') === false) $server = $server.'.localhost';
@@ -53,7 +55,7 @@ class Mailer {
 
         // add some default headers for mailfiltering FS#2247
         $this->setHeader('X-Mailer', 'DokuWiki');
-        $this->setHeader('X-DokuWiki-User', $_SERVER['REMOTE_USER']);
+        $this->setHeader('X-DokuWiki-User', $INPUT->server->str('REMOTE_USER'));
         $this->setHeader('X-DokuWiki-Title', $conf['title']);
         $this->setHeader('X-DokuWiki-Server', $server);
         $this->setHeader('X-Auto-Response-Suppress', 'OOF');
@@ -181,6 +183,9 @@ class Mailer {
     public function setBody($text, $textrep = null, $htmlrep = null, $html = null, $wrap = true) {
         global $INFO;
         global $conf;
+        /* @var Input $INPUT */
+        global $INPUT;
+
         $htmlrep = (array)$htmlrep;
         $textrep = (array)$textrep;
 
@@ -218,24 +223,24 @@ class Mailer {
         $cip  = gethostsbyaddrs($ip);
         $trep = array(
             'DATE'        => dformat(),
-            'BROWSER'     => $_SERVER['HTTP_USER_AGENT'],
+            'BROWSER'     => $INPUT->server->str('HTTP_USER_AGENT'),
             'IPADDRESS'   => $ip,
             'HOSTNAME'    => $cip,
             'TITLE'       => $conf['title'],
             'DOKUWIKIURL' => DOKU_URL,
-            'USER'        => $_SERVER['REMOTE_USER'],
+            'USER'        => $INPUT->server->str('REMOTE_USER'),
             'NAME'        => $INFO['userinfo']['name'],
             'MAIL'        => $INFO['userinfo']['mail'],
         );
         $trep = array_merge($trep, (array)$textrep);
         $hrep = array(
             'DATE'        => '<i>'.hsc(dformat()).'</i>',
-            'BROWSER'     => hsc($_SERVER['HTTP_USER_AGENT']),
+            'BROWSER'     => hsc($INPUT->server->str('HTTP_USER_AGENT')),
             'IPADDRESS'   => '<code>'.hsc($ip).'</code>',
             'HOSTNAME'    => '<code>'.hsc($cip).'</code>',
             'TITLE'       => hsc($conf['title']),
             'DOKUWIKIURL' => '<a href="'.DOKU_URL.'">'.DOKU_URL.'</a>',
-            'USER'        => hsc($_SERVER['REMOTE_USER']),
+            'USER'        => hsc($INPUT->server->str('REMOTE_USER')),
             'NAME'        => hsc($INFO['userinfo']['name']),
             'MAIL'        => '<a href="mailto:"'.hsc($INFO['userinfo']['mail']).'">'.
                 hsc($INFO['userinfo']['mail']).'</a>',
@@ -277,7 +282,7 @@ class Mailer {
     /**
      * Add the To: recipients
      *
-     * @see setAddress
+     * @see cleanAddress
      * @param string|array  $address Multiple adresses separated by commas or as array
      */
     public function to($address) {
@@ -287,7 +292,7 @@ class Mailer {
     /**
      * Add the Cc: recipients
      *
-     * @see setAddress
+     * @see cleanAddress
      * @param string|array  $address Multiple adresses separated by commas or as array
      */
     public function cc($address) {
@@ -297,7 +302,7 @@ class Mailer {
     /**
      * Add the Bcc: recipients
      *
-     * @see setAddress
+     * @see cleanAddress
      * @param string|array  $address Multiple adresses separated by commas or as array
      */
     public function bcc($address) {
@@ -310,7 +315,7 @@ class Mailer {
      * This is set to $conf['mailfrom'] when not specified so you shouldn't need
      * to call this function
      *
-     * @see setAddress
+     * @see cleanAddress
      * @param string  $address from address
      */
     public function from($address) {
@@ -333,9 +338,9 @@ class Mailer {
      * for headers. Addresses may not contain Non-ASCII data!
      *
      * Example:
-     *   setAddress("föö <foo@bar.com>, me@somewhere.com","TBcc");
+     *   cc("föö <foo@bar.com>, me@somewhere.com","TBcc");
      *
-     * @param string|array  $address Multiple adresses separated by commas or as array
+     * @param string|array  $addresses Multiple adresses separated by commas or as array
      * @return bool|string  the prepared header (can contain multiple lines)
      */
     public function cleanAddress($addresses) {
@@ -522,7 +527,7 @@ class Mailer {
 
         // clean up addresses
         if(empty($this->headers['From'])) $this->from($conf['mailfrom']);
-        $addrs = array('To', 'From', 'Cc', 'Bcc');
+        $addrs = array('To', 'From', 'Cc', 'Bcc', 'Reply-To', 'Sender');
         foreach($addrs as $addr) {
             if(isset($this->headers[$addr])) {
                 $this->headers[$addr] = $this->cleanAddress($this->headers[$addr]);
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index a26c2d0de..ffa03ee93 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -378,7 +378,8 @@ class RemoteAPICore {
             throw new RemoteException('The requested page does not exist', 121);
         }
 
-        $info = getRevisionInfo($id, $time, 1024);
+        $pagelog = new PageChangeLog($id, 1024);
+        $info = $pagelog->getRevisionInfo($time);
 
         $data = array(
             'name'         => $id,
@@ -650,11 +651,12 @@ class RemoteAPICore {
             throw new RemoteException('Empty page ID', 131);
         }
 
-        $revisions = getRevisions($id, $first, $conf['recent']+1);
+        $pagelog = new PageChangeLog($id);
+        $revisions = $pagelog->getRevisions($first, $conf['recent']+1);
 
         if(count($revisions)==0 && $first!=0) {
             $first=0;
-            $revisions = getRevisions($id, $first, $conf['recent']+1);
+            $revisions = $pagelog->getRevisions($first, $conf['recent']+1);
         }
 
         if(count($revisions)>0 && $first==0) {
@@ -676,7 +678,8 @@ class RemoteAPICore {
                 // case this can lead to less pages being returned than
                 // specified via $conf['recent']
                 if($time){
-                    $info = getRevisionInfo($id, $time, 1024);
+                    $pagelog->setChunkSize(1024);
+                    $info = $pagelog->getRevisionInfo($time);
                     if(!empty($info)) {
                         $data['user'] = $info['user'];
                         $data['ip']   = $info['ip'];
diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php
index bf89a311c..6332746a6 100644
--- a/inc/Sitemapper.php
+++ b/inc/Sitemapper.php
@@ -131,9 +131,9 @@ class Sitemapper {
 
         $encoded_sitemap_url = urlencode(wl('', array('do' => 'sitemap'), true, '&'));
         $ping_urls = array(
-            'google' => 'http://www.google.com/webmasters/sitemaps/ping?sitemap='.$encoded_sitemap_url,
-            'yahoo' => 'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=dokuwiki&url='.$encoded_sitemap_url,
+            'google'    => 'http://www.google.com/webmasters/sitemaps/ping?sitemap='.$encoded_sitemap_url,
             'microsoft' => 'http://www.bing.com/webmaster/ping.aspx?siteMap='.$encoded_sitemap_url,
+            'yandex'    => 'http://blogs.yandex.ru/pings/?status=success&url='.$encoded_sitemap_url
         );
 
         $data = array('ping_urls' => $ping_urls,
diff --git a/inc/TarLib.class.php b/inc/TarLib.class.php
index ae08039ec..dd319a79a 100644
--- a/inc/TarLib.class.php
+++ b/inc/TarLib.class.php
@@ -26,6 +26,8 @@ class TarLib {
     public $_result = true;
 
     function __construct($file, $comptype = TarLib::COMPRESS_AUTO, $complevel = 9) {
+        dbg_deprecated('class Tar');
+
         if(!$file) $this->error('__construct', '$file');
 
         $this->file = $file;
diff --git a/inc/actions.php b/inc/actions.php
index 50cbe369f..ef09a0dc7 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -20,6 +20,7 @@ function act_dispatch(){
     global $ID;
     global $INFO;
     global $QUERY;
+    /* @var Input $INPUT */
     global $INPUT;
     global $lang;
     global $conf;
@@ -94,7 +95,7 @@ function act_dispatch(){
 
         // user profile changes
         if (in_array($ACT, array('profile','profile_delete'))) {
-            if(!$_SERVER['REMOTE_USER']) {
+            if(!$INPUT->server->str('REMOTE_USER')) {
                 $ACT = 'login';
             } else {
                 switch ($ACT) {
@@ -190,7 +191,7 @@ function act_dispatch(){
     unset($evt);
 
     // when action 'show', the intial not 'show' and POST, do a redirect
-    if($ACT == 'show' && $preact != 'show' && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){
+    if($ACT == 'show' && $preact != 'show' && strtolower($INPUT->server->str('REQUEST_METHOD')) == 'post'){
         act_redirect($ID,$preact);
     }
 
@@ -414,6 +415,8 @@ function act_revert($act){
     global $ID;
     global $REV;
     global $lang;
+    /* @var Input $INPUT */
+    global $INPUT;
     // FIXME $INFO['writable'] currently refers to the attic version
     // global $INFO;
     // if (!$INFO['writable']) {
@@ -445,7 +448,7 @@ function act_revert($act){
     session_write_close();
 
     // when done, show current page
-    $_SERVER['REQUEST_METHOD'] = 'post'; //should force a redirect
+    $INPUT->server->set('REQUEST_METHOD','post'); //should force a redirect
     $REV = '';
     return 'show';
 }
@@ -493,17 +496,20 @@ function act_redirect_execute($opts){
 function act_auth($act){
     global $ID;
     global $INFO;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     //already logged in?
-    if(isset($_SERVER['REMOTE_USER']) && $act=='login'){
+    if($INPUT->server->has('REMOTE_USER') && $act=='login'){
         return 'show';
     }
 
     //handle logout
     if($act=='logout'){
         $lockedby = checklock($ID); //page still locked?
-        if($lockedby == $_SERVER['REMOTE_USER'])
+        if($lockedby == $INPUT->server->str('REMOTE_USER')){
             unlock($ID); //try to unlock
+        }
 
         // do the logout stuff
         auth_logoff();
@@ -697,7 +703,7 @@ function act_sitemap($act) {
 
         // Send file
         //use x-sendfile header to pass the delivery to compatible webservers
-        if (http_sendfile($sitemap)) exit;
+        http_sendfile($sitemap);
 
         readfile($sitemap);
         exit;
@@ -719,10 +725,11 @@ function act_subscription($act){
     global $lang;
     global $INFO;
     global $ID;
+    /* @var Input $INPUT */
     global $INPUT;
 
     // subcriptions work for logged in users only
-    if(!$_SERVER['REMOTE_USER']) return 'show';
+    if(!$INPUT->server->str('REMOTE_USER')) return 'show';
 
     // get and preprocess data.
     $params = array();
@@ -733,7 +740,7 @@ function act_subscription($act){
     }
 
     // any action given? if not just return and show the subscription page
-    if(!$params['action'] || !checkSecurityToken()) return $act;
+    if(empty($params['action']) || !checkSecurityToken()) return $act;
 
     // Handle POST data, may throw exception.
     trigger_event('ACTION_HANDLE_SUBSCRIBE', $params, 'subscription_handle_post');
@@ -745,9 +752,9 @@ function act_subscription($act){
     // Perform action.
     $sub = new Subscription();
     if($action == 'unsubscribe'){
-        $ok = $sub->remove($target, $_SERVER['REMOTE_USER'], $style);
+        $ok = $sub->remove($target, $INPUT->server->str('REMOTE_USER'), $style);
     }else{
-        $ok = $sub->add($target, $_SERVER['REMOTE_USER'], $style);
+        $ok = $sub->add($target, $INPUT->server->str('REMOTE_USER'), $style);
     }
 
     if($ok) {
@@ -776,6 +783,8 @@ function act_subscription($act){
 function subscription_handle_post(&$params) {
     global $INFO;
     global $lang;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     // Get and validate parameters.
     if (!isset($params['target'])) {
@@ -806,7 +815,7 @@ function subscription_handle_post(&$params) {
         }
         if ($is === false) {
             throw new Exception(sprintf($lang['subscr_not_subscribed'],
-                                        $_SERVER['REMOTE_USER'],
+                                        $INPUT->server->str('REMOTE_USER'),
                                         prettyprint_id($target)));
         }
         // subscription_set deletes a subscription if style = null.
diff --git a/inc/auth.php b/inc/auth.php
index 6000ea6d7..2bdc3eb00 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -131,6 +131,8 @@ function auth_setup() {
 function auth_loadACL() {
     global $config_cascade;
     global $USERINFO;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     if(!is_readable($config_cascade['acl']['default'])) return array();
 
@@ -145,10 +147,10 @@ function auth_loadACL() {
         // substitute user wildcard first (its 1:1)
         if(strstr($line, '%USER%')){
             // if user is not logged in, this ACL line is meaningless - skip it
-            if (!isset($_SERVER['REMOTE_USER'])) continue;
+            if (!$INPUT->server->has('REMOTE_USER')) continue;
 
-            $id   = str_replace('%USER%',cleanID($_SERVER['REMOTE_USER']),$id);
-            $rest = str_replace('%USER%',auth_nameencode($_SERVER['REMOTE_USER']),$rest);
+            $id   = str_replace('%USER%',cleanID($INPUT->server->str('REMOTE_USER')),$id);
+            $rest = str_replace('%USER%',auth_nameencode($INPUT->server->str('REMOTE_USER')),$rest);
         }
 
         // substitute group wildcard (its 1:m)
@@ -217,6 +219,8 @@ function auth_login($user, $pass, $sticky = false, $silent = false) {
     global $lang;
     /* @var DokuWiki_Auth_Plugin $auth */
     global $auth;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     $sticky ? $sticky = true : $sticky = false; //sanity check
 
@@ -226,7 +230,7 @@ function auth_login($user, $pass, $sticky = false, $silent = false) {
         //usual login
         if($auth->checkPass($user, $pass)) {
             // make logininfo globally available
-            $_SERVER['REMOTE_USER'] = $user;
+            $INPUT->server->set('REMOTE_USER', $user);
             $secret                 = auth_cookiesalt(!$sticky, true); //bind non-sticky to session
             auth_setCookie($user, auth_encrypt($pass, $secret), $sticky);
             return true;
@@ -253,7 +257,7 @@ function auth_login($user, $pass, $sticky = false, $silent = false) {
             ) {
 
                 // he has session, cookie and browser right - let him in
-                $_SERVER['REMOTE_USER'] = $user;
+                $INPUT->server->set('REMOTE_USER', $user);
                 $USERINFO               = $session['info']; //FIXME move all references to session
                 return true;
             }
@@ -288,7 +292,10 @@ function auth_validateToken($token) {
     }
     // still here? trust the session data
     global $USERINFO;
-    $_SERVER['REMOTE_USER'] = $_SESSION[DOKU_COOKIE]['auth']['user'];
+    /* @var Input $INPUT */
+    global $INPUT;
+
+    $INPUT->server->set('REMOTE_USER',$_SESSION[DOKU_COOKIE]['auth']['user']);
     $USERINFO               = $_SESSION[DOKU_COOKIE]['auth']['info'];
     return true;
 }
@@ -321,11 +328,14 @@ function auth_createToken() {
  * @return  string  a MD5 sum of various browser headers
  */
 function auth_browseruid() {
+    /* @var Input $INPUT */
+    global $INPUT;
+
     $ip  = clientIP(true);
     $uid = '';
-    $uid .= $_SERVER['HTTP_USER_AGENT'];
-    $uid .= $_SERVER['HTTP_ACCEPT_ENCODING'];
-    $uid .= $_SERVER['HTTP_ACCEPT_CHARSET'];
+    $uid .= $INPUT->server->str('HTTP_USER_AGENT');
+    $uid .= $INPUT->server->str('HTTP_ACCEPT_ENCODING');
+    $uid .= $INPUT->server->str('HTTP_ACCEPT_CHARSET');
     $uid .= substr($ip, 0, strpos($ip, '.'));
     $uid = strtolower($uid);
     return md5($uid);
@@ -511,6 +521,8 @@ function auth_logoff($keepbc = false) {
     global $USERINFO;
     /* @var DokuWiki_Auth_Plugin $auth */
     global $auth;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     // make sure the session is writable (it usually is)
     @session_start();
@@ -523,16 +535,11 @@ function auth_logoff($keepbc = false) {
         unset($_SESSION[DOKU_COOKIE]['auth']['info']);
     if(!$keepbc && isset($_SESSION[DOKU_COOKIE]['bc']))
         unset($_SESSION[DOKU_COOKIE]['bc']);
-    if(isset($_SERVER['REMOTE_USER']))
-        unset($_SERVER['REMOTE_USER']);
+    $INPUT->server->remove('REMOTE_USER');
     $USERINFO = null; //FIXME
 
     $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
-    if(version_compare(PHP_VERSION, '5.2.0', '>')) {
-        setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true);
-    } else {
-        setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl()));
-    }
+    setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true);
 
     if($auth) $auth->logOff();
 }
@@ -557,13 +564,16 @@ function auth_ismanager($user = null, $groups = null, $adminonly = false) {
     global $USERINFO;
     /* @var DokuWiki_Auth_Plugin $auth */
     global $auth;
+    /* @var Input $INPUT */
+    global $INPUT;
+
 
     if(!$auth) return false;
     if(is_null($user)) {
-        if(!isset($_SERVER['REMOTE_USER'])) {
+        if(!$INPUT->server->has('REMOTE_USER')) {
             return false;
         } else {
-            $user = $_SERVER['REMOTE_USER'];
+            $user = $INPUT->server->str('REMOTE_USER');
         }
     }
     if(is_null($groups)) {
@@ -655,9 +665,11 @@ function auth_isMember($memberlist, $user, array $groups) {
 function auth_quickaclcheck($id) {
     global $conf;
     global $USERINFO;
+    /* @var Input $INPUT */
+    global $INPUT;
     # if no ACL is used always return upload rights
     if(!$conf['useacl']) return AUTH_UPLOAD;
-    return auth_aclcheck($id, $_SERVER['REMOTE_USER'], $USERINFO['grps']);
+    return auth_aclcheck($id, $INPUT->server->str('REMOTE_USER'), $USERINFO['grps']);
 }
 
 /**
@@ -845,6 +857,12 @@ function auth_nameencode($name, $skip_group = false) {
     return $cache[$name][$skip_group];
 }
 
+/**
+ * callback encodes the matches
+ *
+ * @param array $matches first complete match, next matching subpatterms
+ * @return string
+ */
 function auth_nameencode_callback($matches) {
     return '%'.dechex(ord(substr($matches[1],-1)));
 }
@@ -1056,18 +1074,18 @@ function updateprofile() {
     }
 
     if($conf['profileconfirm']) {
-        if(!$auth->checkPass($_SERVER['REMOTE_USER'], $INPUT->post->str('oldpass'))) {
+        if(!$auth->checkPass($INPUT->server->str('REMOTE_USER'), $INPUT->post->str('oldpass'))) {
             msg($lang['badpassconfirm'], -1);
             return false;
         }
     }
 
-    if($result = $auth->triggerUserMod('modify', array($_SERVER['REMOTE_USER'], $changes))) {
+    if($result = $auth->triggerUserMod('modify', array($INPUT->server->str('REMOTE_USER'), $changes))) {
         // update cookie and session with the changed data
         if($changes['pass']) {
             list( /*user*/, $sticky, /*pass*/) = auth_getCookie();
             $pass = auth_encrypt($changes['pass'], auth_cookiesalt(!$sticky, true));
-            auth_setCookie($_SERVER['REMOTE_USER'], $pass, (bool) $sticky);
+            auth_setCookie($INPUT->server->str('REMOTE_USER'), $pass, (bool) $sticky);
         }
         return true;
     }
@@ -1075,6 +1093,11 @@ function updateprofile() {
     return false;
 }
 
+/**
+ * Delete the current logged-in user
+ *
+ * @return bool true on success, false on any error
+ */
 function auth_deleteprofile(){
     global $conf;
     global $lang;
@@ -1098,13 +1121,13 @@ function auth_deleteprofile(){
     }
 
     if($conf['profileconfirm']) {
-        if(!$auth->checkPass($_SERVER['REMOTE_USER'], $INPUT->post->str('oldpass'))) {
+        if(!$auth->checkPass($INPUT->server->str('REMOTE_USER'), $INPUT->post->str('oldpass'))) {
             msg($lang['badpassconfirm'], -1);
             return false;
         }
     }
 
-    $deleted[] = $_SERVER['REMOTE_USER'];
+    $deleted[] = $INPUT->server->str('REMOTE_USER');
     if($auth->triggerUserMod('delete', array($deleted))) {
         // force and immediate logout including removing the sticky cookie
         auth_logoff();
@@ -1308,11 +1331,8 @@ function auth_setCookie($user, $pass, $sticky) {
     $cookie    = base64_encode($user).'|'.((int) $sticky).'|'.base64_encode($pass);
     $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
     $time      = $sticky ? (time() + 60 * 60 * 24 * 365) : 0; //one year
-    if(version_compare(PHP_VERSION, '5.2.0', '>')) {
-        setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true);
-    } else {
-        setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl()));
-    }
+    setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true);
+
     // set session
     $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
     $_SESSION[DOKU_COOKIE]['auth']['pass'] = sha1($pass);
diff --git a/inc/cache.php b/inc/cache.php
index 5eac94934..6817e771b 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -8,16 +8,25 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 
+/**
+ * Generic handling of caching
+ */
 class cache {
-    var $key = '';          // primary identifier for this item
-    var $ext = '';          // file ext for cache data, secondary identifier for this item
-    var $cache = '';        // cache file name
-    var $depends = array(); // array containing cache dependency information,
-    //   used by _useCache to determine cache validity
+    public $key = '';          // primary identifier for this item
+    public $ext = '';          // file ext for cache data, secondary identifier for this item
+    public $cache = '';        // cache file name
+    public $depends = array(); // array containing cache dependency information,
+                               //   used by _useCache to determine cache validity
 
     var $_event = '';       // event to be triggered during useCache
+    var $_time;
+    var $_nocache = false;  // if set to true, cache will not be used or stored
 
-    function cache($key,$ext) {
+    /**
+     * @param string $key primary identifier
+     * @param string $ext file extension
+     */
+    public function cache($key,$ext) {
         $this->key = $key;
         $this->ext = $ext;
         $this->cache = getCacheName($key,$ext);
@@ -26,7 +35,7 @@ class cache {
     /**
      * public method to determine whether the cache can be used
      *
-     * to assist in cetralisation of event triggering and calculation of cache statistics,
+     * to assist in centralisation of event triggering and calculation of cache statistics,
      * don't override this function override _useCache()
      *
      * @param  array   $depends   array of cache dependencies, support dependecies:
@@ -36,7 +45,7 @@ class cache {
      *
      * @return bool    true if cache can be used, false otherwise
      */
-    function useCache($depends=array()) {
+    public function useCache($depends=array()) {
         $this->depends = $depends;
         $this->_addDependencies();
 
@@ -55,12 +64,15 @@ class cache {
      *   age   - expire cache if older than age (seconds)
      *   files - expire cache if any file in this array was updated more recently than the cache
      *
+     * Note that this function needs to be public as it is used as callback for the event handler
+     *
      * can be overridden
      *
      * @return bool               see useCache()
      */
-    function _useCache() {
+    public function _useCache() {
 
+        if ($this->_nocache) return false;                              // caching turned off
         if (!empty($this->depends['purge'])) return false;              // purge requested?
         if (!($this->_time = @filemtime($this->cache))) return false;   // cache exists?
 
@@ -83,7 +95,7 @@ class cache {
      * it should not remove any existing dependencies and
      * it should only overwrite a dependency when the new value is more stringent than the old
      */
-    function _addDependencies() {
+    protected function _addDependencies() {
         global $INPUT;
         if ($INPUT->has('purge')) $this->depends['purge'] = true;   // purge requested
     }
@@ -94,7 +106,7 @@ class cache {
      * @param   bool   $clean   true to clean line endings, false to leave line endings alone
      * @return  string          cache contents
      */
-    function retrieveCache($clean=true) {
+    public function retrieveCache($clean=true) {
         return io_readFile($this->cache, $clean);
     }
 
@@ -104,14 +116,16 @@ class cache {
      * @param   string $data   the data to be cached
      * @return  bool           true on success, false otherwise
      */
-    function storeCache($data) {
+    public function storeCache($data) {
+        if ($this->_nocache) return false;
+
         return io_savefile($this->cache, $data);
     }
 
     /**
      * remove any cached data associated with this cache instance
      */
-    function removeCache() {
+    public function removeCache() {
         @unlink($this->cache);
     }
 
@@ -122,7 +136,7 @@ class cache {
      * @param    bool   $success   result of this cache use attempt
      * @return   bool              pass-thru $success value
      */
-    function _stats($success) {
+    protected function _stats($success) {
         global $conf;
         static $stats = null;
         static $file;
@@ -157,14 +171,24 @@ class cache {
     }
 }
 
+/**
+ * Parser caching
+ */
 class cache_parser extends cache {
 
-    var $file = '';       // source file for cache
-    var $mode = '';       // input mode (represents the processing the input file will undergo)
+    public $file = '';       // source file for cache
+    public $mode = '';       // input mode (represents the processing the input file will undergo)
+    public $page = '';
 
     var $_event = 'PARSER_CACHE_USE';
 
-    function cache_parser($id, $file, $mode) {
+    /**
+     *
+     * @param string $id page id
+     * @param string $file source file for cache
+     * @param string $mode input mode
+     */
+    public function cache_parser($id, $file, $mode) {
         if ($id) $this->page = $id;
         $this->file = $file;
         $this->mode = $mode;
@@ -172,24 +196,25 @@ class cache_parser extends cache {
         parent::cache($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.'.$mode);
     }
 
-    function _useCache() {
+    /**
+     * method contains cache use decision logic
+     *
+     * @return bool               see useCache()
+     */
+    public function _useCache() {
 
         if (!@file_exists($this->file)) return false;                   // source exists?
         return parent::_useCache();
     }
 
-    function _addDependencies() {
-        global $conf, $config_cascade;
-
-        $this->depends['age'] = isset($this->depends['age']) ?
-            min($this->depends['age'],$conf['cachetime']) : $conf['cachetime'];
+    protected function _addDependencies() {
 
         // parser cache file dependencies ...
-        $files = array($this->file,                                     // ... source
+        $files = array($this->file,                              // ... source
                 DOKU_INC.'inc/parser/parser.php',                // ... parser
                 DOKU_INC.'inc/parser/handler.php',               // ... handler
                 );
-        $files = array_merge($files, getConfigFiles('main'));           // ... wiki settings
+        $files = array_merge($files, getConfigFiles('main'));    // ... wiki settings
 
         $this->depends['files'] = !empty($this->depends['files']) ? array_merge($files, $this->depends['files']) : $files;
         parent::_addDependencies();
@@ -197,8 +222,17 @@ class cache_parser extends cache {
 
 }
 
+/**
+ * Caching of data of renderer
+ */
 class cache_renderer extends cache_parser {
-    function _useCache() {
+
+    /**
+     * method contains cache use decision logic
+     *
+     * @return bool               see useCache()
+     */
+    public function _useCache() {
         global $conf;
 
         if (!parent::_useCache()) return false;
@@ -231,7 +265,19 @@ class cache_renderer extends cache_parser {
         return true;
     }
 
-    function _addDependencies() {
+    protected function _addDependencies() {
+        global $conf;
+
+        // default renderer cache file 'age' is dependent on 'cachetime' setting, two special values:
+        //    -1 : do not cache (should not be overridden)
+        //    0  : cache never expires (can be overridden) - no need to set depends['age']
+        if ($conf['cachetime'] == -1) {
+            $this->_nocache = true;
+            return;
+        } elseif ($conf['cachetime'] > 0) {
+            $this->depends['age'] = isset($this->depends['age']) ?
+                min($this->depends['age'],$conf['cachetime']) : $conf['cachetime'];
+        }
 
         // renderer cache file dependencies ...
         $files = array(
@@ -253,18 +299,39 @@ class cache_renderer extends cache_parser {
     }
 }
 
+/**
+ * Caching of parser instructions
+ */
 class cache_instructions extends cache_parser {
 
-    function cache_instructions($id, $file) {
+    /**
+     * @param string $id page id
+     * @param string $file source file for cache
+     */
+    public function cache_instructions($id, $file) {
         parent::cache_parser($id, $file, 'i');
     }
 
-    function retrieveCache($clean=true) {
+    /**
+     * retrieve the cached data
+     *
+     * @param   bool   $clean   true to clean line endings, false to leave line endings alone
+     * @return  string          cache contents
+     */
+    public function retrieveCache($clean=true) {
         $contents = io_readFile($this->cache, false);
         return !empty($contents) ? unserialize($contents) : array();
     }
 
-    function storeCache($instructions) {
+    /**
+     * cache $instructions
+     *
+     * @param   string $instructions  the instruction to be cached
+     * @return  bool                  true on success, false otherwise
+     */
+    public function storeCache($instructions) {
+        if ($this->_nocache) return false;
+
         return io_savefile($this->cache,serialize($instructions));
     }
 }
diff --git a/inc/changelog.php b/inc/changelog.php
index 6ff1e0eca..8c14f21b0 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -18,6 +18,9 @@ define('DOKU_CHANGE_TYPE_REVERT',       'R');
  * parses a changelog line into it's components
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param string $line changelog line
+ * @return array|bool parsed line or false
  */
 function parseChangelogLine($line) {
     $tmp = explode("\t", $line);
@@ -43,7 +46,7 @@ function parseChangelogLine($line) {
  * @param String $summary   Summary of the change
  * @param mixed  $extra     In case of a revert the revision (timestmp) of the reverted page
  * @param array  $flags     Additional flags in a key value array.
- *                             Availible flags:
+ *                             Available flags:
  *                             - ExternalEdit - mark as an external edit.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
@@ -52,6 +55,8 @@ function parseChangelogLine($line) {
  */
 function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){
     global $conf, $INFO;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     // check for special flags as keys
     if (!is_array($flags)) { $flags = array(); }
@@ -65,7 +70,7 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr
 
     if(!$date) $date = time(); //use current time if none supplied
     $remote = (!$flagExternalEdit)?clientIP(true):'127.0.0.1';
-    $user   = (!$flagExternalEdit)?$_SERVER['REMOTE_USER']:'';
+    $user   = (!$flagExternalEdit)?$INPUT->server->str('REMOTE_USER'):'';
 
     $strip = array("\t", "\n");
     $logline = array(
@@ -114,15 +119,26 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Esther Brunner <wikidesign@gmail.com>
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param int    $date      Timestamp of the change
+ * @param String $id        Name of the affected page
+ * @param String $type      Type of the change see DOKU_CHANGE_TYPE_*
+ * @param String $summary   Summary of the change
+ * @param mixed  $extra     In case of a revert the revision (timestmp) of the reverted page
+ * @param array  $flags     Additional flags in a key value array.
+ *                             Available flags:
+ *                             - (none, so far)
  */
 function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){
     global $conf;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     $id = cleanid($id);
 
     if(!$date) $date = time(); //use current time if none supplied
     $remote = clientIP(true);
-    $user   = $_SERVER['REMOTE_USER'];
+    $user   = $INPUT->server->str('REMOTE_USER');
 
     $strip = array("\t", "\n");
     $logline = array(
@@ -290,6 +306,12 @@ function getRecentsSince($from,$to=null,$ns='',$flags=0){
  * @see getRecents()
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param string $line   changelog line
+ * @param string $ns     restrict to given namespace
+ * @param int    $flags  flags to control which changes are included
+ * @param array  $seen   listing of seen pages
+ * @return array|bool    false or array with info about a change
  */
 function _handleRecent($line,$ns,$flags,&$seen){
     if(empty($line)) return false;   //skip empty lines
@@ -334,95 +356,685 @@ function _handleRecent($line,$ns,$flags,&$seen){
 }
 
 /**
- * Get the changelog information for a specific page id
- * and revision (timestamp). Adjacent changelog lines
- * are optimistically parsed and cached to speed up
- * consecutive calls to getRevisionInfo. For large
- * changelog files, only the chunk containing the
- * requested changelog line is read.
- *
- * @author Ben Coburn <btcoburn@silicodon.net>
- * @author Kate Arzamastseva <pshns@ukr.net>
+ * Class ChangeLog
+ * methods for handling of changelog of pages or media files
  */
-function getRevisionInfo($id, $rev, $chunk_size=8192, $media=false) {
-    global $cache_revinfo;
-    $cache =& $cache_revinfo;
-    if (!isset($cache[$id])) { $cache[$id] = array(); }
-    $rev = max($rev, 0);
-
-    // check if it's already in the memory cache
-    if (isset($cache[$id]) && isset($cache[$id][$rev])) {
-        return $cache[$id][$rev];
+abstract class ChangeLog {
+
+    /** @var string */
+    protected $id;
+    /** @var int */
+    protected $chunk_size;
+    /** @var array */
+    protected $cache;
+
+    /**
+     * Constructor
+     *
+     * @param string $id         page id
+     * @param int $chunk_size maximum block size read from file
+     */
+    public function __construct($id, $chunk_size = 8192) {
+        global $cache_revinfo;
+
+        $this->cache =& $cache_revinfo;
+        if(!isset($this->cache[$id])) {
+            $this->cache[$id] = array();
+        }
+
+        $this->id = $id;
+        $this->setChunkSize($chunk_size);
+
     }
 
-    if ($media) {
-        $file = mediaMetaFN($id, '.changes');
-    } else {
-        $file = metaFN($id, '.changes');
+    /**
+     * Set chunk size for file reading
+     * Chunk size zero let read whole file at once
+     *
+     * @param int $chunk_size maximum block size read from file
+     */
+    public function setChunkSize($chunk_size) {
+        if(!is_numeric($chunk_size)) $chunk_size = 0;
+
+        $this->chunk_size = (int) max($chunk_size, 0);
     }
-    if (!@file_exists($file)) { return false; }
-    if (filesize($file)<$chunk_size || $chunk_size==0) {
-        // read whole file
-        $lines = file($file);
-        if ($lines===false) { return false; }
-    } else {
-        // read by chunk
-        $fp = fopen($file, 'rb'); // "file pointer"
-        if ($fp===false) { return false; }
-        $head = 0;
-        fseek($fp, 0, SEEK_END);
-        $tail = ftell($fp);
-        $finger = 0;
-        $finger_rev = 0;
-
-        // find chunk
-        while ($tail-$head>$chunk_size) {
-            $finger = $head+floor(($tail-$head)/2.0);
-            fseek($fp, $finger);
-            fgets($fp); // slip the finger forward to a new line
-            $finger = ftell($fp);
-            $tmp = fgets($fp); // then read at that location
-            $tmp = parseChangelogLine($tmp);
-            $finger_rev = $tmp['date'];
-            if ($finger==$head || $finger==$tail) { break; }
-            if ($finger_rev>$rev) {
-                $tail = $finger;
-            } else {
-                $head = $finger;
+
+    /**
+     * Returns path to changelog
+     *
+     * @return string path to file
+     */
+    abstract protected function getChangelogFilename();
+
+    /**
+     * Returns path to current page/media
+     *
+     * @return string path to file
+     */
+    abstract protected function getFilename();
+
+    /**
+     * Get the changelog information for a specific page id and revision (timestamp)
+     *
+     * Adjacent changelog lines are optimistically parsed and cached to speed up
+     * consecutive calls to getRevisionInfo. For large changelog files, only the chunk
+     * containing the requested changelog line is read.
+     *
+     * @param int $rev        revision timestamp
+     * @return bool|array false or array with entries:
+     *      - date:  unix timestamp
+     *      - ip:    IPv4 address (127.0.0.1)
+     *      - type:  log line type
+     *      - id:    page id
+     *      - user:  user name
+     *      - sum:   edit summary (or action reason)
+     *      - extra: extra data (varies by line type)
+     *
+     * @author Ben Coburn <btcoburn@silicodon.net>
+     * @author Kate Arzamastseva <pshns@ukr.net>
+     */
+    public function getRevisionInfo($rev) {
+        $rev = max($rev, 0);
+
+        // check if it's already in the memory cache
+        if(isset($this->cache[$this->id]) && isset($this->cache[$this->id][$rev])) {
+            return $this->cache[$this->id][$rev];
+        }
+
+        //read lines from changelog
+        list($fp, $lines) = $this->readloglines($rev);
+        if($fp) {
+            fclose($fp);
+        }
+        if(empty($lines)) return false;
+
+        // parse and cache changelog lines
+        foreach($lines as $value) {
+            $tmp = parseChangelogLine($value);
+            if($tmp !== false) {
+                $this->cache[$this->id][$tmp['date']] = $tmp;
             }
         }
+        if(!isset($this->cache[$this->id][$rev])) {
+            return false;
+        }
+        return $this->cache[$this->id][$rev];
+    }
+
+    /**
+     * Return a list of page revisions numbers
+     *
+     * Does not guarantee that the revision exists in the attic,
+     * only that a line with the date exists in the changelog.
+     * By default the current revision is skipped.
+     *
+     * The current revision is automatically skipped when the page exists.
+     * See $INFO['meta']['last_change'] for the current revision.
+     * A negative $first let read the current revision too.
+     *
+     * For efficiency, the log lines are parsed and cached for later
+     * calls to getRevisionInfo. Large changelog files are read
+     * backwards in chunks until the requested number of changelog
+     * lines are recieved.
+     *
+     * @param int $first      skip the first n changelog lines
+     * @param int $num        number of revisions to return
+     * @return array with the revision timestamps
+     *
+     * @author Ben Coburn <btcoburn@silicodon.net>
+     * @author Kate Arzamastseva <pshns@ukr.net>
+     */
+    public function getRevisions($first, $num) {
+        $revs = array();
+        $lines = array();
+        $count = 0;
+
+        $num = max($num, 0);
+        if($num == 0) {
+            return $revs;
+        }
 
-        if ($tail-$head<1) {
-            // cound not find chunk, assume requested rev is missing
+        if($first < 0) {
+            $first = 0;
+        } else if(@file_exists($this->getFilename())) {
+            // skip current revision if the page exists
+            $first = max($first + 1, 0);
+        }
+
+        $file = $this->getChangelogFilename();
+
+        if(!@file_exists($file)) {
+            return $revs;
+        }
+        if(filesize($file) < $this->chunk_size || $this->chunk_size == 0) {
+            // read whole file
+            $lines = file($file);
+            if($lines === false) {
+                return $revs;
+            }
+        } else {
+            // read chunks backwards
+            $fp = fopen($file, 'rb'); // "file pointer"
+            if($fp === false) {
+                return $revs;
+            }
+            fseek($fp, 0, SEEK_END);
+            $tail = ftell($fp);
+
+            // chunk backwards
+            $finger = max($tail - $this->chunk_size, 0);
+            while($count < $num + $first) {
+                $nl = $this->getNewlinepointer($fp, $finger);
+
+                // was the chunk big enough? if not, take another bite
+                if($nl > 0 && $tail <= $nl) {
+                    $finger = max($finger - $this->chunk_size, 0);
+                    continue;
+                } else {
+                    $finger = $nl;
+                }
+
+                // read chunk
+                $chunk = '';
+                $read_size = max($tail - $finger, 0); // found chunk size
+                $got = 0;
+                while($got < $read_size && !feof($fp)) {
+                    $tmp = @fread($fp, max(min($this->chunk_size, $read_size - $got), 0));
+                    if($tmp === false) {
+                        break;
+                    } //error state
+                    $got += strlen($tmp);
+                    $chunk .= $tmp;
+                }
+                $tmp = explode("\n", $chunk);
+                array_pop($tmp); // remove trailing newline
+
+                // combine with previous chunk
+                $count += count($tmp);
+                $lines = array_merge($tmp, $lines);
+
+                // next chunk
+                if($finger == 0) {
+                    break;
+                } // already read all the lines
+                else {
+                    $tail = $finger;
+                    $finger = max($tail - $this->chunk_size, 0);
+                }
+            }
+            fclose($fp);
+        }
+
+        // skip parsing extra lines
+        $num = max(min(count($lines) - $first, $num), 0);
+        if     ($first > 0 && $num > 0)  { $lines = array_slice($lines, max(count($lines) - $first - $num, 0), $num); }
+        else if($first > 0 && $num == 0) { $lines = array_slice($lines, 0, max(count($lines) - $first, 0)); }
+        else if($first == 0 && $num > 0) { $lines = array_slice($lines, max(count($lines) - $num, 0)); }
+
+        // handle lines in reverse order
+        for($i = count($lines) - 1; $i >= 0; $i--) {
+            $tmp = parseChangelogLine($lines[$i]);
+            if($tmp !== false) {
+                $this->cache[$this->id][$tmp['date']] = $tmp;
+                $revs[] = $tmp['date'];
+            }
+        }
+
+        return $revs;
+    }
+
+    /**
+     * Get the nth revision left or right handside  for a specific page id and revision (timestamp)
+     *
+     * For large changelog files, only the chunk containing the
+     * reference revision $rev is read and sometimes a next chunck.
+     *
+     * Adjacent changelog lines are optimistically parsed and cached to speed up
+     * consecutive calls to getRevisionInfo.
+     *
+     * @param int $rev        revision timestamp used as startdate (doesn't need to be revisionnumber)
+     * @param int $direction  give position of returned revision with respect to $rev; positive=next, negative=prev
+     * @return bool|int
+     *      timestamp of the requested revision
+     *      otherwise false
+     */
+    public function getRelativeRevision($rev, $direction) {
+        $rev = max($rev, 0);
+        $direction = (int) $direction;
+
+        //no direction given or last rev, so no follow-up
+        if(!$direction || ($direction > 0 && $this->isCurrentRevision($rev))) {
+            return false;
+        }
+
+        //get lines from changelog
+        list($fp, $lines, $head, $tail, $eof) = $this->readloglines($rev);
+        if(empty($lines)) return false;
+
+        // look for revisions later/earlier then $rev, when founded count till the wanted revision is reached
+        // also parse and cache changelog lines for getRevisionInfo().
+        $revcounter = 0;
+        $relativerev = false;
+        $checkotherchunck = true; //always runs once
+        while(!$relativerev && $checkotherchunck) {
+            $tmp = array();
+            //parse in normal or reverse order
+            $count = count($lines);
+            if($direction > 0) {
+                $start = 0;
+                $step = 1;
+            } else {
+                $start = $count - 1;
+                $step = -1;
+            }
+            for($i = $start; $i >= 0 && $i < $count; $i = $i + $step) {
+                $tmp = parseChangelogLine($lines[$i]);
+                if($tmp !== false) {
+                    $this->cache[$this->id][$tmp['date']] = $tmp;
+                    //look for revs older/earlier then reference $rev and select $direction-th one
+                    if(($direction > 0 && $tmp['date'] > $rev) || ($direction < 0 && $tmp['date'] < $rev)) {
+                        $revcounter++;
+                        if($revcounter == abs($direction)) {
+                            $relativerev = $tmp['date'];
+                        }
+                    }
+                }
+            }
+
+            //true when $rev is found, but not the wanted follow-up.
+            $checkotherchunck = $fp
+                && ($tmp['date'] == $rev || ($revcounter > 0 && !$relativerev))
+                && !(($tail == $eof && $direction > 0) || ($head == 0 && $direction < 0));
+
+            if($checkotherchunck) {
+                list($lines, $head, $tail) = $this->readAdjacentChunk($fp, $head, $tail, $direction);
+
+                if(empty($lines)) break;
+            }
+        }
+        if($fp) {
             fclose($fp);
+        }
+
+        return $relativerev;
+    }
+
+    /**
+     * Returns revisions around rev1 and rev2
+     * When available it returns $max entries for each revision
+     *
+     * @param int $rev1 oldest revision timestamp
+     * @param int $rev2 newest revision timestamp (0 looks up last revision)
+     * @param int $max maximum number of revisions returned
+     * @return array with two arrays with revisions surrounding rev1 respectively rev2
+     */
+    public function getRevisionsAround($rev1, $rev2, $max = 50) {
+        $max = floor(abs($max) / 2)*2 + 1;
+        $rev1 = max($rev1, 0);
+        $rev2 = max($rev2, 0);
+
+        if($rev2) {
+            if($rev2 < $rev1) {
+                $rev = $rev2;
+                $rev2 = $rev1;
+                $rev1 = $rev;
+            }
+        } else {
+            //empty right side means a removed page. Look up last revision.
+            $revs = $this->getRevisions(-1, 1);
+            $rev2 = $revs[0];
+        }
+        //collect revisions around rev2
+        list($revs2, $allrevs, $fp, $lines, $head, $tail) = $this->retrieveRevisionsAround($rev2, $max);
+
+        if(empty($revs2)) return array(array(), array());
+
+        //collect revisions around rev1
+        $index = array_search($rev1, $allrevs);
+        if($index === false) {
+            //no overlapping revisions
+            list($revs1,,,,,) = $this->retrieveRevisionsAround($rev1, $max);
+            if(empty($revs1)) $revs1 = array();
+        } else {
+            //revisions overlaps, reuse revisions around rev2
+            $revs1 = $allrevs;
+            while($head > 0) {
+                for($i = count($lines) - 1; $i >= 0; $i--) {
+                    $tmp = parseChangelogLine($lines[$i]);
+                    if($tmp !== false) {
+                        $this->cache[$this->id][$tmp['date']] = $tmp;
+                        $revs1[] = $tmp['date'];
+                        $index++;
+
+                        if($index > floor($max / 2)) break 2;
+                    }
+                }
+
+                list($lines, $head, $tail) = $this->readAdjacentChunk($fp, $head, $tail, -1);
+            }
+            sort($revs1);
+            //return wanted selection
+            $revs1 = array_slice($revs1, max($index - floor($max/2), 0), $max);
+        }
+
+        return array(array_reverse($revs1), array_reverse($revs2));
+    }
+
+    /**
+     * Returns lines from changelog.
+     * If file larger than $chuncksize, only chunck is read that could contain $rev.
+     *
+     * @param int $rev   revision timestamp
+     * @return array(fp, array(changeloglines), $head, $tail, $eof)|bool
+     *     returns false when not succeed. fp only defined for chuck reading, needs closing.
+     */
+    protected function readloglines($rev) {
+        $file = $this->getChangelogFilename();
+
+        if(!@file_exists($file)) {
             return false;
         }
 
-        // read chunk
+        $fp = null;
+        $head = 0;
+        $tail = 0;
+        $eof = 0;
+
+        if(filesize($file) < $this->chunk_size || $this->chunk_size == 0) {
+            // read whole file
+            $lines = file($file);
+            if($lines === false) {
+                return false;
+            }
+        } else {
+            // read by chunk
+            $fp = fopen($file, 'rb'); // "file pointer"
+            if($fp === false) {
+                return false;
+            }
+            $head = 0;
+            fseek($fp, 0, SEEK_END);
+            $eof = ftell($fp);
+            $tail = $eof;
+
+            // find chunk
+            while($tail - $head > $this->chunk_size) {
+                $finger = $head + floor(($tail - $head) / 2.0);
+                $finger = $this->getNewlinepointer($fp, $finger);
+                $tmp = fgets($fp);
+                if($finger == $head || $finger == $tail) {
+                    break;
+                }
+                $tmp = parseChangelogLine($tmp);
+                $finger_rev = $tmp['date'];
+
+                if($finger_rev > $rev) {
+                    $tail = $finger;
+                } else {
+                    $head = $finger;
+                }
+            }
+
+            if($tail - $head < 1) {
+                // cound not find chunk, assume requested rev is missing
+                fclose($fp);
+                return false;
+            }
+
+            $lines = $this->readChunk($fp, $head, $tail);
+        }
+        return array(
+            $fp,
+            $lines,
+            $head,
+            $tail,
+            $eof
+        );
+    }
+
+    /**
+     * Read chunk and return array with lines of given chunck.
+     * Has no check if $head and $tail are really at a new line
+     *
+     * @param resource $fp    resource filepointer
+     * @param int      $head  start point chunck
+     * @param int      $tail  end point chunck
+     * @return array lines read from chunck
+     */
+    protected function readChunk($fp, $head, $tail) {
         $chunk = '';
-        $chunk_size = max($tail-$head, 0); // found chunk size
+        $chunk_size = max($tail - $head, 0); // found chunk size
         $got = 0;
         fseek($fp, $head);
-        while ($got<$chunk_size && !feof($fp)) {
-            $tmp = @fread($fp, max($chunk_size-$got, 0));
-            if ($tmp===false) { break; } //error state
+        while($got < $chunk_size && !feof($fp)) {
+            $tmp = @fread($fp, max(min($this->chunk_size, $chunk_size - $got), 0));
+            if($tmp === false) { //error state
+                break;
+            }
             $got += strlen($tmp);
             $chunk .= $tmp;
         }
         $lines = explode("\n", $chunk);
         array_pop($lines); // remove trailing newline
-        fclose($fp);
+        return $lines;
     }
 
-    // parse and cache changelog lines
-    foreach ($lines as $value) {
-        $tmp = parseChangelogLine($value);
-        if ($tmp!==false) {
-            $cache[$id][$tmp['date']] = $tmp;
+    /**
+     * Set pointer to first new line after $finger and return its position
+     *
+     * @param resource $fp      filepointer
+     * @param int      $finger  a pointer
+     * @return int pointer
+     */
+    protected function getNewlinepointer($fp, $finger) {
+        fseek($fp, $finger);
+        $nl = $finger;
+        if($finger > 0) {
+            fgets($fp); // slip the finger forward to a new line
+            $nl = ftell($fp);
         }
+        return $nl;
+    }
+
+    /**
+     * Check whether given revision is the current page
+     *
+     * @param int $rev   timestamp of current page
+     * @return bool true if $rev is current revision, otherwise false
+     */
+    public function isCurrentRevision($rev) {
+        return $rev == @filemtime($this->getFilename());
+    }
+
+    /**
+     * Returns the next lines of the changelog  of the chunck before head or after tail
+     *
+     * @param resource $fp filepointer
+     * @param int $head position head of last chunk
+     * @param int $tail position tail of last chunk
+     * @param int $direction positive forward, negative backward
+     * @return array with entries:
+     *    - $lines: changelog lines of readed chunk
+     *    - $head: head of chunk
+     *    - $tail: tail of chunk
+     */
+    protected function readAdjacentChunk($fp, $head, $tail, $direction) {
+        if(!$fp) return array(array(), $head, $tail);
+
+        if($direction > 0) {
+            //read forward
+            $head = $tail;
+            $tail = $head + floor($this->chunk_size * (2 / 3));
+            $tail = $this->getNewlinepointer($fp, $tail);
+        } else {
+            //read backward
+            $tail = $head;
+            $head = max($tail - $this->chunk_size, 0);
+            while(true) {
+                $nl = $this->getNewlinepointer($fp, $head);
+                // was the chunk big enough? if not, take another bite
+                if($nl > 0 && $tail <= $nl) {
+                    $head = max($head - $this->chunk_size, 0);
+                } else {
+                    $head = $nl;
+                    break;
+                }
+            }
+        }
+
+        //load next chunck
+        $lines = $this->readChunk($fp, $head, $tail);
+        return array($lines, $head, $tail);
+    }
+
+    /**
+     * Collect the $max revisions near to the timestamp $rev
+     *
+     * @param int $rev revision timestamp
+     * @param int $max maximum number of revisions to be returned
+     * @return bool|array
+     *     return array with entries:
+     *       - $requestedrevs: array of with $max revision timestamps
+     *       - $revs: all parsed revision timestamps
+     *       - $fp: filepointer only defined for chuck reading, needs closing.
+     *       - $lines: non-parsed changelog lines before the parsed revisions
+     *       - $head: position of first readed changelogline
+     *       - $lasttail: position of end of last readed changelogline
+     *     otherwise false
+     */
+    protected function retrieveRevisionsAround($rev, $max) {
+        //get lines from changelog
+        list($fp, $lines, $starthead, $starttail, /* $eof */) = $this->readloglines($rev);
+        if(empty($lines)) return false;
+
+        //parse chunk containing $rev, and read forward more chunks until $max/2 is reached
+        $head = $starthead;
+        $tail = $starttail;
+        $revs = array();
+        $aftercount = $beforecount = 0;
+        while(count($lines) > 0) {
+            foreach($lines as $line) {
+                $tmp = parseChangelogLine($line);
+                if($tmp !== false) {
+                    $this->cache[$this->id][$tmp['date']] = $tmp;
+                    $revs[] = $tmp['date'];
+                    if($tmp['date'] >= $rev) {
+                        //count revs after reference $rev
+                        $aftercount++;
+                        if($aftercount == 1) $beforecount = count($revs);
+                    }
+                    //enough revs after reference $rev?
+                    if($aftercount > floor($max / 2)) break 2;
+                }
+            }
+            //retrieve next chunk
+            list($lines, $head, $tail) = $this->readAdjacentChunk($fp, $head, $tail, 1);
+        }
+        if($aftercount == 0) return false;
+
+        $lasttail = $tail;
+
+        //read additional chuncks backward until $max/2 is reached and total number of revs is equal to $max
+        $lines = array();
+        $i = 0;
+        if($aftercount > 0) {
+            $head = $starthead;
+            $tail = $starttail;
+            while($head > 0) {
+                list($lines, $head, $tail) = $this->readAdjacentChunk($fp, $head, $tail, -1);
+
+                for($i = count($lines) - 1; $i >= 0; $i--) {
+                    $tmp = parseChangelogLine($lines[$i]);
+                    if($tmp !== false) {
+                        $this->cache[$this->id][$tmp['date']] = $tmp;
+                        $revs[] = $tmp['date'];
+                        $beforecount++;
+                        //enough revs before reference $rev?
+                        if($beforecount > max(floor($max / 2), $max - $aftercount)) break 2;
+                    }
+                }
+            }
+        }
+        sort($revs);
+
+        //keep only non-parsed lines
+        $lines = array_slice($lines, 0, $i);
+        //trunk desired selection
+        $requestedrevs = array_slice($revs, -$max, $max);
+
+        return array($requestedrevs, $revs, $fp, $lines, $head, $lasttail);
     }
-    if (!isset($cache[$id][$rev])) { return false; }
-    return $cache[$id][$rev];
+}
+
+/**
+ * Class PageChangelog handles changelog of a wiki page
+ */
+class PageChangelog extends ChangeLog {
+
+    /**
+     * Returns path to changelog
+     *
+     * @return string path to file
+     */
+    protected function getChangelogFilename() {
+        return metaFN($this->id, '.changes');
+    }
+
+    /**
+     * Returns path to current page/media
+     *
+     * @return string path to file
+     */
+    protected function getFilename() {
+        return wikiFN($this->id);
+    }
+}
+
+/**
+ * Class MediaChangelog handles changelog of a media file
+ */
+class MediaChangelog extends ChangeLog {
+
+    /**
+     * Returns path to changelog
+     *
+     * @return string path to file
+     */
+    protected function getChangelogFilename() {
+        return mediaMetaFN($this->id, '.changes');
+    }
+
+    /**
+     * Returns path to current page/media
+     *
+     * @return string path to file
+     */
+    protected function getFilename() {
+        return mediaFN($this->id);
+    }
+}
+
+/**
+ * Get the changelog information for a specific page id
+ * and revision (timestamp). Adjacent changelog lines
+ * are optimistically parsed and cached to speed up
+ * consecutive calls to getRevisionInfo. For large
+ * changelog files, only the chunk containing the
+ * requested changelog line is read.
+ *
+ * @deprecated 2013-11-20
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function getRevisionInfo($id, $rev, $chunk_size = 8192, $media = false) {
+    dbg_deprecated('class PageChangeLog or class MediaChangelog');
+    if($media) {
+        $changelog = new MediaChangeLog($id, $chunk_size);
+    } else {
+        $changelog = new PageChangeLog($id, $chunk_size);
+    }
+    return $changelog->getRevisionInfo($rev);
 }
 
 /**
@@ -431,10 +1043,6 @@ function getRevisionInfo($id, $rev, $chunk_size=8192, $media=false) {
  * only that a line with the date exists in the changelog.
  * By default the current revision is skipped.
  *
- * id:    the page of interest
- * first: skip the first n changelog lines
- * num:   number of revisions to return
- *
  * The current revision is automatically skipped when the page exists.
  * See $INFO['meta']['last_change'] for the current revision.
  *
@@ -443,106 +1051,24 @@ function getRevisionInfo($id, $rev, $chunk_size=8192, $media=false) {
  * backwards in chunks until the requested number of changelog
  * lines are recieved.
  *
+ * @deprecated 2013-11-20
+ *
  * @author Ben Coburn <btcoburn@silicodon.net>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $id          the page of interest
+ * @param int    $first       skip the first n changelog lines
+ * @param int    $num         number of revisions to return
+ * @param int    $chunk_size
+ * @param bool   $media
+ * @return array
  */
-function getRevisions($id, $first, $num, $chunk_size=8192, $media=false) {
-    global $cache_revinfo;
-    $cache =& $cache_revinfo;
-    if (!isset($cache[$id])) { $cache[$id] = array(); }
-
-    $revs = array();
-    $lines = array();
-    $count  = 0;
-    if ($media) {
-        $file = mediaMetaFN($id, '.changes');
+function getRevisions($id, $first, $num, $chunk_size = 8192, $media = false) {
+    dbg_deprecated('class PageChangeLog or class MediaChangelog');
+    if($media) {
+        $changelog = new MediaChangeLog($id, $chunk_size);
     } else {
-        $file = metaFN($id, '.changes');
+        $changelog = new PageChangeLog($id, $chunk_size);
     }
-    $num = max($num, 0);
-    if ($num == 0) { return $revs; }
-
-    $chunk_size = max($chunk_size, 0);
-    if ($first<0) {
-        $first = 0;
-    } else if (!$media && @file_exists(wikiFN($id)) || $media && @file_exists(mediaFN($id))) {
-        // skip current revision if the page exists
-        $first = max($first+1, 0);
-    }
-
-    if (!@file_exists($file)) { return $revs; }
-    if (filesize($file)<$chunk_size || $chunk_size==0) {
-        // read whole file
-        $lines = file($file);
-        if ($lines===false) { return $revs; }
-    } else {
-        // read chunks backwards
-        $fp = fopen($file, 'rb'); // "file pointer"
-        if ($fp===false) { return $revs; }
-        fseek($fp, 0, SEEK_END);
-        $tail = ftell($fp);
-
-        // chunk backwards
-        $finger = max($tail-$chunk_size, 0);
-        while ($count<$num+$first) {
-            fseek($fp, $finger);
-            $nl = $finger;
-            if ($finger>0) {
-                fgets($fp); // slip the finger forward to a new line
-                $nl = ftell($fp);
-            }
-
-            // was the chunk big enough? if not, take another bite
-            if($nl > 0 && $tail <= $nl){
-                $finger = max($finger-$chunk_size, 0);
-                continue;
-            }else{
-                $finger = $nl;
-            }
-
-            // read chunk
-            $chunk = '';
-            $read_size = max($tail-$finger, 0); // found chunk size
-            $got = 0;
-            while ($got<$read_size && !feof($fp)) {
-                $tmp = @fread($fp, max($read_size-$got, 0));
-                if ($tmp===false) { break; } //error state
-                $got += strlen($tmp);
-                $chunk .= $tmp;
-            }
-            $tmp = explode("\n", $chunk);
-            array_pop($tmp); // remove trailing newline
-
-            // combine with previous chunk
-            $count += count($tmp);
-            $lines = array_merge($tmp, $lines);
-
-            // next chunk
-            if ($finger==0) { break; } // already read all the lines
-            else {
-                $tail = $finger;
-                $finger = max($tail-$chunk_size, 0);
-            }
-        }
-        fclose($fp);
-    }
-
-    // skip parsing extra lines
-    $num = max(min(count($lines)-$first, $num), 0);
-    if      ($first>0 && $num>0)  { $lines = array_slice($lines, max(count($lines)-$first-$num, 0), $num); }
-    else if ($first>0 && $num==0) { $lines = array_slice($lines, 0, max(count($lines)-$first, 0)); }
-    else if ($first==0 && $num>0) { $lines = array_slice($lines, max(count($lines)-$num, 0)); }
-
-    // handle lines in reverse order
-    for ($i = count($lines)-1; $i >= 0; $i--) {
-        $tmp = parseChangelogLine($lines[$i]);
-        if ($tmp!==false) {
-            $cache[$id][$tmp['date']] = $tmp;
-            $revs[] = $tmp['date'];
-        }
-    }
-
-    return $revs;
+    return $changelog->getRevisions($first, $num);
 }
-
-
diff --git a/inc/cli.php b/inc/cli.php
new file mode 100644
index 000000000..25bfddf7d
--- /dev/null
+++ b/inc/cli.php
@@ -0,0 +1,647 @@
+<?php
+
+/**
+ * Class DokuCLI
+ *
+ * All DokuWiki commandline scripts should inherit from this class and implement the abstract methods.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+abstract class DokuCLI {
+    /** @var string the executed script itself */
+    protected $bin;
+    /** @var  DokuCLI_Options the option parser */
+    protected $options;
+    /** @var  DokuCLI_Colors */
+    public $colors;
+
+    /**
+     * constructor
+     *
+     * Initialize the arguments, set up helper classes and set up the CLI environment
+     */
+    public function __construct() {
+        set_exception_handler(array($this, 'fatal'));
+
+        $this->options = new DokuCLI_Options();
+        $this->colors  = new DokuCLI_Colors();
+    }
+
+    /**
+     * Register options and arguments on the given $options object
+     *
+     * @param DokuCLI_Options $options
+     * @return void
+     */
+    abstract protected function setup(DokuCLI_Options $options);
+
+    /**
+     * Your main program
+     *
+     * Arguments and options have been parsed when this is run
+     *
+     * @param DokuCLI_Options $options
+     * @return void
+     */
+    abstract protected function main(DokuCLI_Options $options);
+
+    /**
+     * Execute the CLI program
+     *
+     * Executes the setup() routine, adds default options, initiate the options parsing and argument checking
+     * and finally executes main()
+     */
+    public function run() {
+        if('cli' != php_sapi_name()) throw new DokuCLI_Exception('This has to be run from the command line');
+
+        // setup
+        $this->setup($this->options);
+        $this->options->registerOption(
+            'no-colors',
+            'Do not use any colors in output. Useful when piping output to other tools or files.'
+        );
+        $this->options->registerOption(
+            'help',
+            'Display this help screen and exit immeadiately.',
+            'h'
+        );
+
+        // parse
+        $this->options->parseOptions();
+
+        // handle defaults
+        if($this->options->getOpt('no-colors')) {
+            $this->colors->disable();
+        }
+        if($this->options->getOpt('help')) {
+            echo $this->options->help();
+            exit(0);
+        }
+
+        // check arguments
+        $this->options->checkArguments();
+
+        // execute
+        $this->main($this->options);
+
+        exit(0);
+    }
+
+    /**
+     * Exits the program on a fatal error
+     *
+     * @param Exception|string $error either an exception or an error message
+     */
+    public function fatal($error) {
+        $code = 0;
+        if(is_object($error) && is_a($error, 'Exception')) {
+            /** @var Exception $error */
+            $code  = $error->getCode();
+            $error = $error->getMessage();
+        }
+        if(!$code) $code = DokuCLI_Exception::E_ANY;
+
+        $this->error($error);
+        exit($code);
+    }
+
+    /**
+     * Print an error message
+     *
+     * @param $string
+     */
+    public function error($string) {
+        $this->colors->ptln("E: $string", 'red', STDERR);
+    }
+
+    /**
+     * Print a success message
+     *
+     * @param $string
+     */
+    public function success($string) {
+        $this->colors->ptln("S: $string", 'green', STDERR);
+    }
+
+    /**
+     * Print an info message
+     *
+     * @param $string
+     */
+    public function info($string) {
+        $this->colors->ptln("I: $string", 'cyan', STDERR);
+    }
+
+}
+
+/**
+ * Class DokuCLI_Colors
+ *
+ * Handles color output on (Linux) terminals
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+class DokuCLI_Colors {
+    /** @var array known color names */
+    protected $colors = array(
+        'reset'       => "\33[0m",
+        'black'       => "\33[0;30m",
+        'darkgray'    => "\33[1;30m",
+        'blue'        => "\33[0;34m",
+        'lightblue'   => "\33[1;34m",
+        'green'       => "\33[0;32m",
+        'lightgreen'  => "\33[1;32m",
+        'cyan'        => "\33[0;36m",
+        'lightcyan'   => "\33[1;36m",
+        'red'         => "\33[0;31m",
+        'lightred'    => "\33[1;31m",
+        'purple'      => "\33[0;35m",
+        'lightpurple' => "\33[1;35m",
+        'brown'       => "\33[0;33m",
+        'yellow'      => "\33[1;33m",
+        'lightgray'   => "\33[0;37m",
+        'white'       => "\33[1;37m",
+    );
+
+    /** @var bool should colors be used? */
+    protected $enabled = true;
+
+    /**
+     * Constructor
+     *
+     * Tries to disable colors for non-terminals
+     */
+    public function __construct() {
+        if(function_exists('posix_isatty') && !posix_isatty(STDOUT)) {
+            $this->enabled = false;
+            return;
+        }
+        if(!getenv('TERM')) {
+            $this->enabled = false;
+            return;
+        }
+    }
+
+    /**
+     * enable color output
+     */
+    public function enable() {
+        $this->enabled = true;
+    }
+
+    /**
+     * disable color output
+     */
+    public function disable() {
+        $this->enabled = false;
+    }
+
+    /**
+     * Convenience function to print a line in a given color
+     *
+     * @param          $line
+     * @param          $color
+     * @param resource $channel
+     */
+    public function ptln($line, $color, $channel = STDOUT) {
+        $this->set($color);
+        fwrite($channel, rtrim($line)."\n");
+        $this->reset();
+    }
+
+    /**
+     * Set the given color for consecutive output
+     *
+     * @param string $color one of the supported color names
+     * @throws DokuCLI_Exception
+     */
+    public function set($color) {
+        if(!$this->enabled) return;
+        if(!isset($this->colors[$color])) throw new DokuCLI_Exception("No such color $color");
+        echo $this->colors[$color];
+    }
+
+    /**
+     * reset the terminal color
+     */
+    public function reset() {
+        $this->set('reset');
+    }
+}
+
+/**
+ * Class DokuCLI_Options
+ *
+ * Parses command line options passed to the CLI script. Allows CLI scripts to easily register all accepted options and
+ * commands and even generates a help text from this setup.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+class DokuCLI_Options {
+    /** @var  array keeps the list of options to parse */
+    protected $setup;
+
+    /** @var  array store parsed options */
+    protected $options = array();
+
+    /** @var string current parsed command if any */
+    protected $command = '';
+
+    /** @var  array passed non-option arguments */
+    public $args = array();
+
+    /** @var  string the executed script */
+    protected $bin;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->setup = array(
+            '' => array(
+                'opts' => array(),
+                'args' => array(),
+                'help' => ''
+            )
+        ); // default command
+
+        $this->args = $this->readPHPArgv();
+        $this->bin  = basename(array_shift($this->args));
+
+        $this->options = array();
+    }
+
+    /**
+     * Sets the help text for the tool itself
+     *
+     * @param string $help
+     */
+    public function setHelp($help) {
+        $this->setup['']['help'] = $help;
+    }
+
+    /**
+     * Register the names of arguments for help generation and number checking
+     *
+     * This has to be called in the order arguments are expected
+     *
+     * @param string $arg      argument name (just for help)
+     * @param string $help     help text
+     * @param bool   $required is this a required argument
+     * @param string $command  if theses apply to a sub command only
+     * @throws DokuCLI_Exception
+     */
+    public function registerArgument($arg, $help, $required = true, $command = '') {
+        if(!isset($this->setup[$command])) throw new DokuCLI_Exception("Command $command not registered");
+
+        $this->setup[$command]['args'][] = array(
+            'name'     => $arg,
+            'help'     => $help,
+            'required' => $required
+        );
+    }
+
+    /**
+     * This registers a sub command
+     *
+     * Sub commands have their own options and use their own function (not main()).
+     *
+     * @param string $command
+     * @param string $help
+     * @throws DokuCLI_Exception
+     */
+    public function registerCommand($command, $help) {
+        if(isset($this->setup[$command])) throw new DokuCLI_Exception("Command $command already registered");
+
+        $this->setup[$command] = array(
+            'opts' => array(),
+            'args' => array(),
+            'help' => $help
+        );
+
+    }
+
+    /**
+     * Register an option for option parsing and help generation
+     *
+     * @param string      $long     multi character option (specified with --)
+     * @param string      $help     help text for this option
+     * @param string|null $short    one character option (specified with -)
+     * @param bool|string $needsarg does this option require an argument? give it a name here
+     * @param string      $command  what command does this option apply to
+     * @throws DokuCLI_Exception
+     */
+    public function registerOption($long, $help, $short = null, $needsarg = false, $command = '') {
+        if(!isset($this->setup[$command])) throw new DokuCLI_Exception("Command $command not registered");
+
+        $this->setup[$command]['opts'][$long] = array(
+            'needsarg' => $needsarg,
+            'help'     => $help,
+            'short'    => $short
+        );
+
+        if($short) {
+            if(strlen($short) > 1) throw new DokuCLI_Exception("Short options should be exactly one ASCII character");
+
+            $this->setup[$command]['short'][$short] = $long;
+        }
+    }
+
+    /**
+     * Checks the actual number of arguments against the required number
+     *
+     * Throws an exception if arguments are missing. Called from parseOptions()
+     *
+     * @throws DokuCLI_Exception
+     */
+    public function checkArguments() {
+        $argc = count($this->args);
+
+        $req = 0;
+        foreach($this->setup[$this->command]['args'] as $arg) {
+            if(!$arg['required']) break; // last required arguments seen
+            $req++;
+        }
+
+        if($req > $argc) throw new DokuCLI_Exception("Not enough arguments", DokuCLI_Exception::E_OPT_ARG_REQUIRED);
+    }
+
+    /**
+     * Parses the given arguments for known options and command
+     *
+     * The given $args array should NOT contain the executed file as first item anymore! The $args
+     * array is stripped from any options and possible command. All found otions can be accessed via the
+     * getOpt() function
+     *
+     * Note that command options will overwrite any global options with the same name
+     *
+     * @throws DokuCLI_Exception
+     */
+    public function parseOptions() {
+        $non_opts = array();
+
+        $argc = count($this->args);
+        for($i = 0; $i < $argc; $i++) {
+            $arg = $this->args[$i];
+
+            // The special element '--' means explicit end of options. Treat the rest of the arguments as non-options
+            // and end the loop.
+            if($arg == '--') {
+                $non_opts = array_merge($non_opts, array_slice($this->args, $i + 1));
+                break;
+            }
+
+            // '-' is stdin - a normal argument
+            if($arg == '-') {
+                $non_opts = array_merge($non_opts, array_slice($this->args, $i));
+                break;
+            }
+
+            // first non-option
+            if($arg{0} != '-') {
+                $non_opts = array_merge($non_opts, array_slice($this->args, $i));
+                break;
+            }
+
+            // long option
+            if(strlen($arg) > 1 && $arg{1} == '-') {
+                list($opt, $val) = explode('=', substr($arg, 2), 2);
+
+                if(!isset($this->setup[$this->command]['opts'][$opt])) {
+                    throw new DokuCLI_Exception("No such option $arg", DokuCLI_Exception::E_UNKNOWN_OPT);
+                }
+
+                // argument required?
+                if($this->setup[$this->command]['opts'][$opt]['needsarg']) {
+                    if(is_null($val) && $i + 1 < $argc && !preg_match('/^--?[\w]/', $this->args[$i + 1])) {
+                        $val = $this->args[++$i];
+                    }
+                    if(is_null($val)) {
+                        throw new DokuCLI_Exception("Option $arg requires an argument", DokuCLI_Exception::E_OPT_ARG_REQUIRED);
+                    }
+                    $this->options[$opt] = $val;
+                } else {
+                    $this->options[$opt] = true;
+                }
+
+                continue;
+            }
+
+            // short option
+            $opt = substr($arg, 1);
+            if(!isset($this->setup[$this->command]['short'][$opt])) {
+                throw new DokuCLI_Exception("No such option $arg", DokuCLI_Exception::E_UNKNOWN_OPT);
+            } else {
+                $opt = $this->setup[$this->command]['short'][$opt]; // store it under long name
+            }
+
+            // argument required?
+            if($this->setup[$this->command]['opts'][$opt]['needsarg']) {
+                $val = null;
+                if($i + 1 < $argc && !preg_match('/^--?[\w]/', $this->args[$i + 1])) {
+                    $val = $this->args[++$i];
+                }
+                if(is_null($val)) {
+                    throw new DokuCLI_Exception("Option $arg requires an argument", DokuCLI_Exception::E_OPT_ARG_REQUIRED);
+                }
+                $this->options[$opt] = $val;
+            } else {
+                $this->options[$opt] = true;
+            }
+        }
+
+        // parsing is now done, update args array
+        $this->args = $non_opts;
+
+        // if not done yet, check if first argument is a command and reexecute argument parsing if it is
+        if(!$this->command && $this->args && isset($this->setup[$this->args[0]])) {
+            // it is a command!
+            $this->command = array_shift($this->args);
+            $this->parseOptions(); // second pass
+        }
+    }
+
+    /**
+     * Get the value of the given option
+     *
+     * Please note that all options are accessed by their long option names regardless of how they were
+     * specified on commandline.
+     *
+     * Can only be used after parseOptions() has been run
+     *
+     * @param string $option
+     * @param mixed  $default what to return if the option was not set
+     * @return mixed
+     */
+    public function getOpt($option, $default = false) {
+        if(isset($this->options[$option])) return $this->options[$option];
+        return $default;
+    }
+
+    /**
+     * Return the found command if any
+     *
+     * @return string
+     */
+    public function getCmd() {
+        return $this->command;
+    }
+
+    /**
+     * Builds a help screen from the available options. You may want to call it from -h or on error
+     *
+     * @return string
+     */
+    public function help() {
+        $text = '';
+
+        $hascommands = (count($this->setup) > 1);
+        foreach($this->setup as $command => $config) {
+            $hasopts = (bool) $this->setup[$command]['opts'];
+            $hasargs = (bool) $this->setup[$command]['args'];
+
+            if(!$command) {
+                $text .= 'USAGE: '.$this->bin;
+            } else {
+                $text .= "\n$command";
+            }
+
+            if($hasopts) $text .= ' <OPTIONS>';
+
+            foreach($this->setup[$command]['args'] as $arg) {
+                if($arg['required']) {
+                    $text .= ' <'.$arg['name'].'>';
+                } else {
+                    $text .= ' [<'.$arg['name'].'>]';
+                }
+            }
+            $text .= "\n";
+
+            if($this->setup[$command]['help']) {
+                $text .= "\n";
+                $text .= $this->tableFormat(
+                    array(2, 72),
+                    array('', $this->setup[$command]['help']."\n")
+                );
+            }
+
+            if($hasopts) {
+                $text .= "\n  OPTIONS\n\n";
+                foreach($this->setup[$command]['opts'] as $long => $opt) {
+
+                    $name = '';
+                    if($opt['short']) {
+                        $name .= '-'.$opt['short'];
+                        if($opt['needsarg']) $name .= ' <'.$opt['needsarg'].'>';
+                        $name .= ', ';
+                    }
+                    $name .= "--$long";
+                    if($opt['needsarg']) $name .= ' <'.$opt['needsarg'].'>';
+
+                    $text .= $this->tableFormat(
+                        array(2, 20, 52),
+                        array('', $name, $opt['help'])
+                    );
+                    $text .= "\n";
+                }
+            }
+
+            if($hasargs) {
+                $text .= "\n";
+                foreach($this->setup[$command]['args'] as $arg) {
+                    $name = '<'.$arg['name'].'>';
+
+                    $text .= $this->tableFormat(
+                        array(2, 20, 52),
+                        array('', $name, $arg['help'])
+                    );
+                }
+            }
+
+            if($command == '' && $hascommands) {
+                $text .= "\nThis tool accepts a command as first parameter as outlined below:\n";
+            }
+        }
+
+        return $text;
+    }
+
+    /**
+     * Safely read the $argv PHP array across different PHP configurations.
+     * Will take care on register_globals and register_argc_argv ini directives
+     *
+     * @throws DokuCLI_Exception
+     * @return array the $argv PHP array or PEAR error if not registered
+     */
+    private function readPHPArgv() {
+        global $argv;
+        if(!is_array($argv)) {
+            if(!@is_array($_SERVER['argv'])) {
+                if(!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) {
+                    throw new DokuCLI_Exception(
+                        "Could not read cmd args (register_argc_argv=Off?)",
+                        DOKU_CLI_OPTS_ARG_READ
+                    );
+                }
+                return $GLOBALS['HTTP_SERVER_VARS']['argv'];
+            }
+            return $_SERVER['argv'];
+        }
+        return $argv;
+    }
+
+    /**
+     * Displays text in multiple word wrapped columns
+     *
+     * @param array $widths list of column widths (in characters)
+     * @param array $texts  list of texts for each column
+     * @return string
+     */
+    private function tableFormat($widths, $texts) {
+        $wrapped = array();
+        $maxlen  = 0;
+
+        foreach($widths as $col => $width) {
+            $wrapped[$col] = explode("\n", wordwrap($texts[$col], $width - 1, "\n", true)); // -1 char border
+            $len           = count($wrapped[$col]);
+            if($len > $maxlen) $maxlen = $len;
+
+        }
+
+        $out = '';
+        for($i = 0; $i < $maxlen; $i++) {
+            foreach($widths as $col => $width) {
+                if(isset($wrapped[$col][$i])) {
+                    $val = $wrapped[$col][$i];
+                } else {
+                    $val = '';
+                }
+                $out .= sprintf('%-'.$width.'s', $val);
+            }
+            $out .= "\n";
+        }
+        return $out;
+    }
+}
+
+/**
+ * Class DokuCLI_Exception
+ *
+ * The code is used as exit code for the CLI tool. This should probably be extended. Many cases just fall back to the
+ * E_ANY code.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+class DokuCLI_Exception extends Exception {
+    const E_ANY = -1; // no error code specified
+    const E_UNKNOWN_OPT = 1; //Unrecognized option
+    const E_OPT_ARG_REQUIRED = 2; //Option requires argument
+    const E_OPT_ARG_DENIED = 3; //Option not allowed argument
+    const E_OPT_ABIGUOUS = 4; //Option abiguous
+    const E_ARG_READ = 5; //Could not read argv
+
+    public function __construct($message = "", $code = 0, Exception $previous = null) {
+        if(!$code) $code = DokuCLI_Exception::E_ANY;
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/inc/cliopts.php b/inc/cliopts.php
index 9cea686a2..c75a5a93b 100644
--- a/inc/cliopts.php
+++ b/inc/cliopts.php
@@ -68,15 +68,16 @@ define('DOKU_CLI_OPTS_ARG_READ',5);//Could not read argv
  *
  * @author Andrei Zmievski <andrei@php.net>
  *
+ * @deprecated 2014-05-16
  */
 class Doku_Cli_Opts {
 
     /**
      * <?php ?>
      * @see http://www.sitepoint.com/article/php-command-line-1/3
-     * @param string executing file name - this MUST be passed the __FILE__ constant
-     * @param string short options
-     * @param array (optional) long options
+     * @param string $bin_file      executing file name - this MUST be passed the __FILE__ constant
+     * @param string $short_options short options
+     * @param array  $long_options  (optional) long options
      * @return Doku_Cli_Opts_Container or Doku_Cli_Opts_Error
      */
     function & getOptions($bin_file, $short_options, $long_options = null) {
@@ -233,12 +234,12 @@ class Doku_Cli_Opts {
      * Parse short option
      *
      * @param string     $arg           Argument
-     * @param string[]   $short_options Available short options
+     * @param string     $short_options Available short options
      * @param string[][] &$opts
      * @param string[]   &$args
      *
      * @access private
-     * @return void
+     * @return void|Doku_Cli_Opts_Error
      */
     function _parseShortOption($arg, $short_options, &$opts, &$args) {
         $len = strlen($arg);
@@ -324,7 +325,7 @@ class Doku_Cli_Opts {
      * @param string[]   &$args
      *
      * @access private
-     * @return void|PEAR_Error
+     * @return void|Doku_Cli_Opts_Error
      */
     function _parseLongOption($arg, $long_options, &$opts, &$args) {
         @list($opt, $opt_arg) = explode('=', $arg, 2);
@@ -402,7 +403,7 @@ class Doku_Cli_Opts {
      * Will take care on register_globals and register_argc_argv ini directives
      *
      * @access public
-     * @return mixed the $argv PHP array or PEAR error if not registered
+     * @return array|Doku_Cli_Opts_Error the $argv PHP array or PEAR error if not registered
      */
     function readPHPArgv() {
         global $argv;
@@ -421,10 +422,19 @@ class Doku_Cli_Opts {
         return $argv;
     }
 
+    /**
+     * @param $code
+     * @param $msg
+     * @return Doku_Cli_Opts_Error
+     */
     function raiseError($code, $msg) {
         return new Doku_Cli_Opts_Error($code, $msg);
     }
 
+    /**
+     * @param $obj
+     * @return bool
+     */
     function isError($obj) {
         return is_a($obj, 'Doku_Cli_Opts_Error');
     }
diff --git a/inc/common.php b/inc/common.php
index 32771285b..0fe33c5b1 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -22,6 +22,9 @@ define('RECENTS_MEDIA_PAGES_MIXED', 32);
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @see    htmlspecialchars()
+ *
+ * @param string $string the string being converted
+ * @return string converted string
  */
 function hsc($string) {
     return htmlspecialchars($string, ENT_QUOTES, 'UTF-8');
@@ -33,6 +36,9 @@ function hsc($string) {
  * You can give an indention as optional parameter
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $string  line of text
+ * @param int    $indent  number of spaces indention
  */
 function ptln($string, $indent = 0) {
     echo str_repeat(' ', $indent)."$string\n";
@@ -42,6 +48,9 @@ function ptln($string, $indent = 0) {
  * strips control characters (<32) from the given string
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param $string string being stripped
+ * @return string
  */
 function stripctl($string) {
     return preg_replace('/[\x00-\x1F]+/s', '', $string);
@@ -56,15 +65,21 @@ function stripctl($string) {
  * @return  string
  */
 function getSecurityToken() {
-    return PassHash::hmac('md5', session_id().$_SERVER['REMOTE_USER'], auth_cookiesalt());
+    /** @var Input $INPUT */
+    global $INPUT;
+    return PassHash::hmac('md5', session_id().$INPUT->server->str('REMOTE_USER'), auth_cookiesalt());
 }
 
 /**
  * Check the secret CSRF token
+ *
+ * @param null|string $token security token or null to read it from request variable
+ * @return bool success if the token matched
  */
 function checkSecurityToken($token = null) {
+    /** @var Input $INPUT */
     global $INPUT;
-    if(empty($_SERVER['REMOTE_USER'])) return true; // no logged in user, no need for a check
+    if(!$INPUT->server->str('REMOTE_USER')) return true; // no logged in user, no need for a check
 
     if(is_null($token)) $token = $INPUT->str('sectok');
     if(getSecurityToken() != $token) {
@@ -78,6 +93,9 @@ function checkSecurityToken($token = null) {
  * Print a hidden form field with a secret CSRF token
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param bool $print  if true print the field, otherwise html of the field is returned
+ * @return void|string html of hidden form field
  */
 function formSecurityToken($print = true) {
     $ret = '<div class="no"><input type="hidden" name="sectok" value="'.getSecurityToken().'" /></div>'."\n";
@@ -90,17 +108,24 @@ function formSecurityToken($print = true) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param string $id         pageid
+ * @param bool   $htmlClient add info about whether is mobile browser
+ * @return array with info for a request of $id
+ *
  */
 function basicinfo($id, $htmlClient=true){
     global $USERINFO;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     // set info about manager/admin status.
     $info['isadmin']   = false;
     $info['ismanager'] = false;
-    if(isset($_SERVER['REMOTE_USER'])) {
+    if($INPUT->server->has('REMOTE_USER')) {
         $info['userinfo']   = $USERINFO;
         $info['perm']       = auth_quickaclcheck($id);
-        $info['client']     = $_SERVER['REMOTE_USER'];
+        $info['client']     = $INPUT->server->str('REMOTE_USER');
 
         if($info['perm'] == AUTH_ADMIN) {
             $info['isadmin']   = true;
@@ -111,7 +136,7 @@ function basicinfo($id, $htmlClient=true){
 
         // if some outside auth were used only REMOTE_USER is set
         if(!$info['userinfo']['name']) {
-            $info['userinfo']['name'] = $_SERVER['REMOTE_USER'];
+            $info['userinfo']['name'] = $INPUT->server->str('REMOTE_USER');
         }
 
     } else {
@@ -134,12 +159,16 @@ function basicinfo($id, $htmlClient=true){
  * array.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return array with info about current document
  */
 function pageinfo() {
     global $ID;
     global $REV;
     global $RANGE;
     global $lang;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     $info = basicinfo($ID);
 
@@ -148,19 +177,20 @@ function pageinfo() {
     $info['id']  = $ID;
     $info['rev'] = $REV;
 
-    if(isset($_SERVER['REMOTE_USER'])) {
+    if($INPUT->server->has('REMOTE_USER')) {
         $sub = new Subscription();
         $info['subscribed'] = $sub->user_subscription();
     } else {
         $info['subscribed'] = false;
     }
 
-    $info['locked']    = checklock($ID);
-    $info['filepath']  = fullpath(wikiFN($ID));
-    $info['exists']    = @file_exists($info['filepath']);
+    $info['locked']     = checklock($ID);
+    $info['filepath']   = fullpath(wikiFN($ID));
+    $info['exists']     = @file_exists($info['filepath']);
+    $info['currentrev'] = @filemtime($info['filepath']);
     if($REV) {
         //check if current revision was meant
-        if($info['exists'] && (@filemtime($info['filepath']) == $REV)) {
+        if($info['exists'] && ($info['currentrev'] == $REV)) {
             $REV = '';
         } elseif($RANGE) {
             //section editing does not work with old revisions!
@@ -187,13 +217,14 @@ function pageinfo() {
     $info['meta'] = p_get_metadata($ID);
 
     //who's the editor
+    $pagelog = new PageChangeLog($ID, 1024);
     if($REV) {
-        $revinfo = getRevisionInfo($ID, $REV, 1024);
+        $revinfo = $pagelog->getRevisionInfo($REV);
     } else {
-        if(is_array($info['meta']['last_change'])) {
+        if(!empty($info['meta']['last_change']) && is_array($info['meta']['last_change'])) {
             $revinfo = $info['meta']['last_change'];
         } else {
-            $revinfo = getRevisionInfo($ID, $info['lastmod'], 1024);
+            $revinfo = $pagelog->getRevisionInfo($info['lastmod']);
             // cache most recent changelog line in metadata if missing and still valid
             if($revinfo !== false) {
                 $info['meta']['last_change'] = $revinfo;
@@ -237,6 +268,8 @@ function pageinfo() {
 
 /**
  * Return information about the current media item as an associative array.
+ *
+ * @return array with info about current media item
  */
 function mediainfo(){
     global $NS;
@@ -252,6 +285,10 @@ function mediainfo(){
  * Build an string of URL parameters
  *
  * @author Andreas Gohr
+ *
+ * @param array  $params    array with key-value pairs
+ * @param string $sep       series of pairs are separated by this character
+ * @return string query string
  */
 function buildURLparams($params, $sep = '&amp;') {
     $url = '';
@@ -272,6 +309,10 @@ function buildURLparams($params, $sep = '&amp;') {
  * Skips keys starting with '_', values get HTML encoded
  *
  * @author Andreas Gohr
+ *
+ * @param array $params    array with (attribute name-attribute value) pairs
+ * @param bool  $skipempty skip empty string values?
+ * @return string
  */
 function buildAttributes($params, $skipempty = false) {
     $url   = '';
@@ -293,6 +334,8 @@ function buildAttributes($params, $skipempty = false) {
  * This builds the breadcrumb trail and returns it as array
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return array(pageid=>name, ... )
  */
 function breadcrumbs() {
     // we prepare the breadcrumbs early for quick session closing
@@ -352,14 +395,21 @@ function breadcrumbs() {
  * Urlencoding is ommitted when the second parameter is false
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id pageid being filtered
+ * @param bool   $ue apply urlencoding?
+ * @return string
  */
 function idfilter($id, $ue = true) {
     global $conf;
+    /* @var Input $INPUT */
+    global $INPUT;
+
     if($conf['useslash'] && $conf['userewrite']) {
         $id = strtr($id, ':', '/');
     } elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' &&
         $conf['userewrite'] &&
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === false
+        strpos($INPUT->server->str('SERVER_SOFTWARE'), 'Microsoft-IIS') === false
     ) {
         $id = strtr($id, ':', ';');
     }
@@ -374,10 +424,15 @@ function idfilter($id, $ue = true) {
 /**
  * This builds a link to a wikipage
  *
- * It handles URL rewriting and adds additional parameter if
- * given in $more
+ * It handles URL rewriting and adds additional parameters
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string       $id             page id, defaults to start page
+ * @param string|array $urlParameters  URL parameters, associative array recommended
+ * @param bool         $absolute       request an absolute URL instead of relative
+ * @param string       $separator      parameter separator
+ * @return string
  */
 function wl($id = '', $urlParameters = '', $absolute = false, $separator = '&amp;') {
     global $conf;
@@ -419,13 +474,19 @@ function wl($id = '', $urlParameters = '', $absolute = false, $separator = '&amp
  * Handles URL rewriting if enabled. Follows the style of wl().
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ * @param string       $id             page id, defaults to start page
+ * @param string       $format         the export renderer to use
+ * @param string|array $urlParameters  URL parameters, associative array recommended
+ * @param bool         $abs            request an absolute URL instead of relative
+ * @param string       $sep            parameter separator
+ * @return string
  */
-function exportlink($id = '', $format = 'raw', $more = '', $abs = false, $sep = '&amp;') {
+function exportlink($id = '', $format = 'raw', $urlParameters = '', $abs = false, $sep = '&amp;') {
     global $conf;
-    if(is_array($more)) {
-        $more = buildURLparams($more, $sep);
+    if(is_array($urlParameters)) {
+        $urlParameters = buildURLparams($urlParameters, $sep);
     } else {
-        $more = str_replace(',', $sep, $more);
+        $urlParameters = str_replace(',', $sep, $urlParameters);
     }
 
     $format = rawurlencode($format);
@@ -438,13 +499,13 @@ function exportlink($id = '', $format = 'raw', $more = '', $abs = false, $sep =
 
     if($conf['userewrite'] == 2) {
         $xlink .= DOKU_SCRIPT.'/'.$id.'?do=export_'.$format;
-        if($more) $xlink .= $sep.$more;
+        if($urlParameters) $xlink .= $sep.$urlParameters;
     } elseif($conf['userewrite'] == 1) {
         $xlink .= '_export/'.$format.'/'.$id;
-        if($more) $xlink .= '?'.$more;
+        if($urlParameters) $xlink .= '?'.$urlParameters;
     } else {
         $xlink .= DOKU_SCRIPT.'?do=export_'.$format.$sep.'id='.$id;
-        if($more) $xlink .= $sep.$more;
+        if($urlParameters) $xlink .= $sep.$urlParameters;
     }
 
     return $xlink;
@@ -551,6 +612,8 @@ function ml($id = '', $more = '', $direct = true, $sep = '&amp;', $abs = false)
  * Consider using wl() instead, unless you absoutely need the doku.php endpoint
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return string
  */
 function script() {
     return DOKU_BASE.DOKU_SCRIPT;
@@ -577,6 +640,7 @@ function script() {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
+ *
  * @param  string $text - optional text to check, if not given the globals are used
  * @return bool         - true if a spam word was found
  */
@@ -587,6 +651,8 @@ function checkwordblock($text = '') {
     global $SUM;
     global $conf;
     global $INFO;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     if(!$conf['usewordblock']) return false;
 
@@ -619,9 +685,9 @@ function checkwordblock($text = '') {
         if(count($re) && preg_match('#('.join('|', $re).')#si', $text, $matches)) {
             // prepare event data
             $data['matches']        = $matches;
-            $data['userinfo']['ip'] = $_SERVER['REMOTE_ADDR'];
-            if($_SERVER['REMOTE_USER']) {
-                $data['userinfo']['user'] = $_SERVER['REMOTE_USER'];
+            $data['userinfo']['ip'] = $INPUT->server->str('REMOTE_ADDR');
+            if($INPUT->server->str('REMOTE_USER')) {
+                $data['userinfo']['user'] = $INPUT->server->str('REMOTE_USER');
                 $data['userinfo']['name'] = $INFO['userinfo']['name'];
                 $data['userinfo']['mail'] = $INFO['userinfo']['mail'];
             }
@@ -643,16 +709,22 @@ function checkwordblock($text = '') {
  * headers
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param  boolean $single If set only a single IP is returned
  * @return string
  */
 function clientIP($single = false) {
+    /* @var Input $INPUT */
+    global $INPUT;
+
     $ip   = array();
-    $ip[] = $_SERVER['REMOTE_ADDR'];
-    if(!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
-        $ip = array_merge($ip, explode(',', str_replace(' ', '', $_SERVER['HTTP_X_FORWARDED_FOR'])));
-    if(!empty($_SERVER['HTTP_X_REAL_IP']))
-        $ip = array_merge($ip, explode(',', str_replace(' ', '', $_SERVER['HTTP_X_REAL_IP'])));
+    $ip[] = $INPUT->server->str('REMOTE_ADDR');
+    if($INPUT->server->str('HTTP_X_FORWARDED_FOR')) {
+        $ip = array_merge($ip, explode(',', str_replace(' ', '', $INPUT->server->str('HTTP_X_FORWARDED_FOR'))));
+    }
+    if($INPUT->server->str('HTTP_X_REAL_IP')) {
+        $ip = array_merge($ip, explode(',', str_replace(' ', '', $INPUT->server->str('HTTP_X_REAL_IP'))));
+    }
 
     // some IPv4/v6 regexps borrowed from Feyd
     // see: http://forums.devnetwork.net/viewtopic.php?f=38&t=53479
@@ -709,18 +781,22 @@ function clientIP($single = false) {
  * Adapted from the example code at url below
  *
  * @link http://www.brainhandles.com/2007/10/15/detecting-mobile-browsers/#code
+ *
+ * @return bool if true, client is mobile browser; otherwise false
  */
 function clientismobile() {
+    /* @var Input $INPUT */
+    global $INPUT;
 
-    if(isset($_SERVER['HTTP_X_WAP_PROFILE'])) return true;
+    if($INPUT->server->has('HTTP_X_WAP_PROFILE')) return true;
 
-    if(preg_match('/wap\.|\.wap/i', $_SERVER['HTTP_ACCEPT'])) return true;
+    if(preg_match('/wap\.|\.wap/i', $INPUT->server->str('HTTP_ACCEPT'))) return true;
 
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+    if(!$INPUT->server->has('HTTP_USER_AGENT')) return false;
 
     $uamatches = 'midp|j2me|avantg|docomo|novarra|palmos|palmsource|240x320|opwv|chtml|pda|windows ce|mmp\/|blackberry|mib\/|symbian|wireless|nokia|hand|mobi|phone|cdm|up\.b|audio|SIE\-|SEC\-|samsung|HTC|mot\-|mitsu|sagem|sony|alcatel|lg|erics|vx|NEC|philips|mmm|xx|panasonic|sharp|wap|sch|rover|pocket|benq|java|pt|pg|vox|amoi|bird|compal|kg|voda|sany|kdd|dbt|sendo|sgh|gradi|jb|\d\d\di|moto';
 
-    if(preg_match("/$uamatches/i", $_SERVER['HTTP_USER_AGENT'])) return true;
+    if(preg_match("/$uamatches/i", $INPUT->server->str('HTTP_USER_AGENT'))) return true;
 
     return false;
 }
@@ -731,6 +807,7 @@ function clientismobile() {
  * If $conf['dnslookups'] is disabled it simply returns the input string
  *
  * @author Glen Harris <astfgl@iamnota.org>
+ *
  * @param  string $ips comma separated list of IP addresses
  * @return string a comma separated list of hostnames
  */
@@ -757,9 +834,15 @@ function gethostsbyaddrs($ips) {
  * removes stale lockfiles
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id page id
+ * @return bool page is locked?
  */
 function checklock($id) {
     global $conf;
+    /* @var Input $INPUT */
+    global $INPUT;
+
     $lock = wikiLockFN($id);
 
     //no lockfile
@@ -772,8 +855,8 @@ function checklock($id) {
     }
 
     //my own lock
-    list($ip, $session) = explode("\n", io_readFile($lock));
-    if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) {
+    @list($ip, $session) = explode("\n", io_readFile($lock));
+    if($ip == $INPUT->server->str('REMOTE_USER') || $ip == clientIP() || (session_id() && $session == session_id())) {
         return false;
     }
 
@@ -784,17 +867,21 @@ function checklock($id) {
  * Lock a page for editing
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id page id to lock
  */
 function lock($id) {
     global $conf;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     if($conf['locktime'] == 0) {
         return;
     }
 
     $lock = wikiLockFN($id);
-    if($_SERVER['REMOTE_USER']) {
-        io_saveFile($lock, $_SERVER['REMOTE_USER']);
+    if($INPUT->server->str('REMOTE_USER')) {
+        io_saveFile($lock, $INPUT->server->str('REMOTE_USER'));
     } else {
         io_saveFile($lock, clientIP()."\n".session_id());
     }
@@ -804,14 +891,18 @@ function lock($id) {
  * Unlock a page if it was locked by the user
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $id page id to unlock
  * @return bool true if a lock was removed
  */
 function unlock($id) {
+    /* @var Input $INPUT */
+    global $INPUT;
+
     $lock = wikiLockFN($id);
     if(@file_exists($lock)) {
-        list($ip, $session) = explode("\n", io_readFile($lock));
-        if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) {
+        @list($ip, $session) = explode("\n", io_readFile($lock));
+        if($ip == $INPUT->server->str('REMOTE_USER') || $ip == clientIP() || $session == session_id()) {
             @unlink($lock);
             return true;
         }
@@ -826,6 +917,9 @@ function unlock($id) {
  *
  * @see    formText() for 2crlf conversion
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $text
+ * @return string
  */
 function cleanText($text) {
     $text = preg_replace("/(\015\012)|(\015)/", "\012", $text);
@@ -845,6 +939,9 @@ function cleanText($text) {
  *
  * @see    cleanText() for 2unix conversion
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $text
+ * @return string
  */
 function formText($text) {
     $text = str_replace("\012", "\015\012", $text);
@@ -855,6 +952,10 @@ function formText($text) {
  * Returns the specified local text in raw format
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id   page id
+ * @param string $ext  extension of file being read, default 'txt'
+ * @return string
  */
 function rawLocale($id, $ext = 'txt') {
     return io_readFile(localeFN($id, $ext));
@@ -864,6 +965,10 @@ function rawLocale($id, $ext = 'txt') {
  * Returns the raw WikiText
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id   page id
+ * @param string $rev  timestamp when a revision of wikitext is desired
+ * @return string
  */
 function rawWiki($id, $rev = '') {
     return io_readWikiPage(wikiFN($id, $rev), $id, $rev);
@@ -874,6 +979,9 @@ function rawWiki($id, $rev = '') {
  *
  * @triggers COMMON_PAGETPL_LOAD
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id the id of the page to be created
+ * @return string parsed pagetemplate content
  */
 function pageTemplate($id) {
     global $conf;
@@ -925,6 +1033,9 @@ function pageTemplate($id) {
  * This works on data from COMMON_PAGETPL_LOAD
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $data array with event data
+ * @return string
  */
 function parsePageTemplate(&$data) {
     /**
@@ -937,6 +1048,8 @@ function parsePageTemplate(&$data) {
 
     global $USERINFO;
     global $conf;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     // replace placeholders
     $file = noNS($id);
@@ -968,7 +1081,7 @@ function parsePageTemplate(&$data) {
              utf8_ucfirst($page),
              utf8_ucwords($page),
              utf8_strtoupper($page),
-             $_SERVER['REMOTE_USER'],
+             $INPUT->server->str('REMOTE_USER'),
              $USERINFO['name'],
              $USERINFO['mail'],
              $conf['dformat'],
@@ -990,6 +1103,11 @@ function parsePageTemplate(&$data) {
  * The returned order is prefix, section and suffix.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $range in form "from-to"
+ * @param string $id    page id
+ * @param string $rev   optional, the revision timestamp
+ * @return array with three slices
  */
 function rawWikiSlices($range, $id, $rev = '') {
     $text = io_readWikiPage(wikiFN($id, $rev), $id, $rev);
@@ -1014,6 +1132,12 @@ function rawWikiSlices($range, $id, $rev = '') {
  * lines between sections if needed (used on saving).
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $pre   prefix
+ * @param string $text  text in the middle
+ * @param string $suf   suffix
+ * @param bool $pretty add additional empty lines between sections
+ * @return string
  */
 function con($pre, $text, $suf, $pretty = false) {
     if($pretty) {
@@ -1038,6 +1162,11 @@ function con($pre, $text, $suf, $pretty = false) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param string $id       page id
+ * @param string $text     wikitext being saved
+ * @param string $summary  summary of text update
+ * @param bool   $minor    mark this saved version as minor update
  */
 function saveWikiText($id, $text, $summary, $minor = false) {
     /* Note to developers:
@@ -1049,6 +1178,9 @@ function saveWikiText($id, $text, $summary, $minor = false) {
     global $conf;
     global $lang;
     global $REV;
+    /* @var Input $INPUT */
+    global $INPUT;
+
     // ignore if no changes were made
     if($text == rawWiki($id, '')) {
         return;
@@ -1059,8 +1191,9 @@ function saveWikiText($id, $text, $summary, $minor = false) {
     $wasRemoved  = (trim($text) == ''); // check for empty or whitespace only
     $wasCreated  = !@file_exists($file);
     $wasReverted = ($REV == true);
+    $pagelog     = new PageChangeLog($id, 1024);
     $newRev      = false;
-    $oldRev      = getRevisions($id, -1, 1, 1024); // from changelog
+    $oldRev      = $pagelog->getRevisions(-1, 1); // from changelog
     $oldRev      = (int) (empty($oldRev) ? 0 : $oldRev[0]);
     if(!@file_exists(wikiFN($id, $old)) && @file_exists($file) && $old >= $oldRev) {
         // add old revision to the attic if missing
@@ -1111,7 +1244,7 @@ function saveWikiText($id, $text, $summary, $minor = false) {
         $type = DOKU_CHANGE_TYPE_CREATE;
     } else if($wasRemoved) {
         $type = DOKU_CHANGE_TYPE_DELETE;
-    } else if($minor && $conf['useacl'] && $_SERVER['REMOTE_USER']) {
+    } else if($minor && $conf['useacl'] && $INPUT->server->str('REMOTE_USER')) {
         $type = DOKU_CHANGE_TYPE_MINOR_EDIT;
     } //minor edits only for logged in users
 
@@ -1138,9 +1271,11 @@ function saveWikiText($id, $text, $summary, $minor = false) {
  * revision date
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id page id
+ * @return int|string revision timestamp
  */
 function saveOldRevision($id) {
-    global $conf;
     $oldf = wikiFN($id);
     if(!@file_exists($oldf)) return '';
     $date = filemtime($oldf);
@@ -1158,12 +1293,14 @@ function saveOldRevision($id) {
  * @param string     $summary  What changed
  * @param boolean    $minor    Is this a minor edit?
  * @param array      $replace  Additional string substitutions, @KEY@ to be replaced by value
- *
  * @return bool
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace = array()) {
     global $conf;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     // decide if there is something to do, eg. whom to mail
     if($who == 'admin') {
@@ -1172,8 +1309,8 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace =
         $to  = $conf['notify'];
     } elseif($who == 'subscribers') {
         if(!actionOK('subscribe')) return false; //subscribers enabled?
-        if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return false; //skip minors
-        $data = array('id' => $id, 'addresslist' => '', 'self' => false);
+        if($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
+        $data = array('id' => $id, 'addresslist' => '', 'self' => false, 'replacements' => $replace);
         trigger_event(
             'COMMON_NOTIFY_ADDRESSLIST', $data,
             array(new Subscription(), 'notifyaddresses')
@@ -1195,12 +1332,17 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace =
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Todd Augsburger <todd@rollerorgans.com>
+ *
+ * @return array|string
  */
 function getGoogleQuery() {
-    if(!isset($_SERVER['HTTP_REFERER'])) {
+    /* @var Input $INPUT */
+    global $INPUT;
+
+    if(!$INPUT->server->has('HTTP_REFERER')) {
         return '';
     }
-    $url = parse_url($_SERVER['HTTP_REFERER']);
+    $url = parse_url($INPUT->server->str('HTTP_REFERER'));
 
     // only handle common SEs
     if(!preg_match('/(google|bing|yahoo|ask|duckduckgo|babylon|aol|yandex)/',$url['host'])) return '';
@@ -1230,8 +1372,10 @@ function getGoogleQuery() {
 /**
  * Return the human readable size of a file
  *
- * @param       int    $size   A file size
- * @param       int    $dec    A number of decimal places
+ * @param       int $size A file size
+ * @param       int $dec A number of decimal places
+ * @return string human readable size
+ *
  * @author      Martin Benjamin <b.martin@cybernet.ch>
  * @author      Aidan Lister <aidan@php.net>
  * @version     1.0.0
@@ -1253,6 +1397,9 @@ function filesize_h($size, $dec = 1) {
  * Return the given timestamp as human readable, fuzzy age
  *
  * @author Andreas Gohr <gohr@cosmocode.de>
+ *
+ * @param int $dt timestamp
+ * @return string
  */
 function datetime_h($dt) {
     global $lang;
@@ -1287,6 +1434,10 @@ function datetime_h($dt) {
  *
  * @see datetime_h
  * @author Andreas Gohr <gohr@cosmocode.de>
+ *
+ * @param int|null $dt      timestamp when given, null will take current timestamp
+ * @param string   $format  empty default to $conf['dformat'], or provide format as recognized by strftime()
+ * @return string
  */
 function dformat($dt = null, $format = '') {
     global $conf;
@@ -1304,6 +1455,7 @@ function dformat($dt = null, $format = '') {
  *
  * @author <ungu at terong dot com>
  * @link http://www.php.net/manual/en/function.date.php#54072
+ *
  * @param int $int_date: current date in UNIX timestamp
  * @return string
  */
@@ -1320,6 +1472,9 @@ function date_iso8601($int_date) {
  *
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Christopher Smith <chris@jalakai.co.uk>
+ *
+ * @param string $email email address
+ * @return string
  */
 function obfuscate($email) {
     global $conf;
@@ -1347,6 +1502,10 @@ function obfuscate($email) {
  * Removes quoting backslashes
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $string
+ * @param string $char backslashed character
+ * @return string
  */
 function unslash($string, $char = "'") {
     return str_replace('\\'.$char, $char, $string);
@@ -1357,19 +1516,27 @@ function unslash($string, $char = "'") {
  *
  * @author <gilthans dot NO dot SPAM at gmail dot com>
  * @link   http://de3.php.net/manual/en/ini.core.php#79564
+ *
+ * @param string $v shorthands
+ * @return int|string
  */
 function php_to_byte($v) {
     $l   = substr($v, -1);
     $ret = substr($v, 0, -1);
     switch(strtoupper($l)) {
+        /** @noinspection PhpMissingBreakStatementInspection */
         case 'P':
             $ret *= 1024;
+        /** @noinspection PhpMissingBreakStatementInspection */
         case 'T':
             $ret *= 1024;
+        /** @noinspection PhpMissingBreakStatementInspection */
         case 'G':
             $ret *= 1024;
+        /** @noinspection PhpMissingBreakStatementInspection */
         case 'M':
             $ret *= 1024;
+        /** @noinspection PhpMissingBreakStatementInspection */
         case 'K':
             $ret *= 1024;
             break;
@@ -1382,6 +1549,9 @@ function php_to_byte($v) {
 
 /**
  * Wrapper around preg_quote adding the default delimiter
+ *
+ * @param string $string
+ * @return string
  */
 function preg_quote_cb($string) {
     return preg_quote($string, '/');
@@ -1415,37 +1585,135 @@ function shorten($keep, $short, $max, $min = 9, $char = '…') {
  * Return the users realname or e-mail address for use
  * in page footer and recent changes pages
  *
+ * @param string|null $username or null when currently logged-in user should be used
+ * @param bool $textonly true returns only plain text, true allows returning html
+ * @return string html or plain text(not escaped) of formatted user name
+ *
  * @author Andy Webber <dokuwiki AT andywebber DOT com>
  */
-function editorinfo($username) {
-    global $conf;
+function editorinfo($username, $textonly = false) {
+    return userlink($username, $textonly);
+}
+
+/**
+ * Returns users realname w/o link
+ *
+ * @param string|null $username or null when currently logged-in user should be used
+ * @param bool $textonly true returns only plain text, true allows returning html
+ * @return string html or plain text(not escaped) of formatted user name
+ *
+ * @triggers COMMON_USER_LINK
+ */
+function userlink($username = null, $textonly = false) {
+    global $conf, $INFO;
+    /** @var DokuWiki_Auth_Plugin $auth */
     global $auth;
+    /** @var Input $INPUT */
+    global $INPUT;
 
-    switch($conf['showuseras']) {
-        case 'username':
-        case 'email':
-        case 'email_link':
-            if($auth) $info = $auth->getUserData($username);
-            break;
-        default:
-            return hsc($username);
-    }
-
-    if(isset($info) && $info) {
-        switch($conf['showuseras']) {
-            case 'username':
-                return hsc($info['name']);
-            case 'email':
-                return obfuscate($info['mail']);
-            case 'email_link':
-                $mail = obfuscate($info['mail']);
-                return '<a href="mailto:'.$mail.'">'.$mail.'</a>';
-            default:
-                return hsc($username);
+    // prepare initial event data
+    $data = array(
+        'username' => $username, // the unique user name
+        'name' => '',
+        'link' => array( //setting 'link' to false disables linking
+                         'target' => '',
+                         'pre' => '',
+                         'suf' => '',
+                         'style' => '',
+                         'more' => '',
+                         'url' => '',
+                         'title' => '',
+                         'class' => ''
+        ),
+        'userlink' => '', // formatted user name as will be returned
+        'textonly' => $textonly
+    );
+    if($username === null) {
+        $data['username'] = $username = $INPUT->server->str('REMOTE_USER');
+        if($textonly){
+            $data['name'] = $INFO['userinfo']['name']. ' (' . $INPUT->server->str('REMOTE_USER') . ')';
+        }else {
+            $data['name'] = '<bdi>' . hsc($INFO['userinfo']['name']) . '</bdi> (<bdi>' . hsc($INPUT->server->str('REMOTE_USER')) . '</bdi>)';
+        }
+    }
+
+    $evt = new Doku_Event('COMMON_USER_LINK', $data);
+    if($evt->advise_before(true)) {
+        if(empty($data['name'])) {
+            if($conf['showuseras'] == 'loginname') {
+                $data['name'] = $textonly ? $data['username'] : hsc($data['username']);
+            } else {
+                if($auth) $info = $auth->getUserData($username);
+                if(isset($info) && $info) {
+                    switch($conf['showuseras']) {
+                        case 'username':
+                        case 'username_link':
+                            $data['name'] = $textonly ? $info['name'] : hsc($info['name']);
+                            break;
+                        case 'email':
+                        case 'email_link':
+                            $data['name'] = obfuscate($info['mail']);
+                            break;
+                    }
+                }
+            }
+        }
+
+        /** @var Doku_Renderer_xhtml $xhtml_renderer */
+        static $xhtml_renderer = null;
+
+        if(!$data['textonly'] && empty($data['link']['url'])) {
+
+            if(in_array($conf['showuseras'], array('email_link', 'username_link'))) {
+                if(!isset($info)) {
+                    if($auth) $info = $auth->getUserData($username);
+                }
+                if(isset($info) && $info) {
+                    if($conf['showuseras'] == 'email_link') {
+                        $data['link']['url'] = 'mailto:' . obfuscate($info['mail']);
+                    } else {
+                        if(is_null($xhtml_renderer)) {
+                            $xhtml_renderer = p_get_renderer('xhtml');
+                        }
+                        if(empty($xhtml_renderer->interwiki)) {
+                            $xhtml_renderer->interwiki = getInterwiki();
+                        }
+                        $shortcut = 'user';
+                        $exists = null;
+                        $data['link']['url'] = $xhtml_renderer->_resolveInterWiki($shortcut, $username, $exists);
+                        $data['link']['class'] .= ' interwiki iw_user';
+                        if($exists !== null) {
+                            if($exists) {
+                                $data['link']['class'] .= ' wikilink1';
+                            } else {
+                                $data['link']['class'] .= ' wikilink2';
+                                $data['link']['rel'] = 'nofollow';
+                            }
+                        }
+                    }
+                } else {
+                    $data['textonly'] = true;
+                }
+
+            } else {
+                $data['textonly'] = true;
+            }
+        }
+
+        if($data['textonly']) {
+            $data['userlink'] = $data['name'];
+        } else {
+            $data['link']['name'] = $data['name'];
+            if(is_null($xhtml_renderer)) {
+                $xhtml_renderer = p_get_renderer('xhtml');
+            }
+            $data['userlink'] = $xhtml_renderer->_formatLink($data['link']);
         }
-    } else {
-        return hsc($username);
     }
+    $evt->advise_after();
+    unset($evt);
+
+    return $data['userlink'];
 }
 
 /**
@@ -1453,6 +1721,7 @@ function editorinfo($username) {
  * When no image exists, returns an empty string
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param  string $type - type of image 'badge' or 'button'
  * @return string
  */
@@ -1461,7 +1730,6 @@ function license_img($type) {
     global $conf;
     if(!$conf['license']) return '';
     if(!is_array($license[$conf['license']])) return '';
-    $lic   = $license[$conf['license']];
     $try   = array();
     $try[] = 'lib/images/license/'.$type.'/'.$conf['license'].'.png';
     $try[] = 'lib/images/license/'.$type.'/'.$conf['license'].'.gif';
@@ -1483,9 +1751,8 @@ function license_img($type) {
  * @author Filip Oscadal <webmaster@illusionsoftworks.cz>
  * @author Andreas Gohr <andi@splitbrain.org>
  *
- * @param  int $mem  Size of memory you want to allocate in bytes
- * @param int  $bytes
- * @internal param int $used already allocated memory (see above)
+ * @param int  $mem    Size of memory you want to allocate in bytes
+ * @param int  $bytes  already allocated memory (see above)
  * @return bool
  */
 function is_mem_available($mem, $bytes = 1048576) {
@@ -1516,8 +1783,13 @@ function is_mem_available($mem, $bytes = 1048576) {
  *
  * @link   http://support.microsoft.com/kb/q176113/
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $url url being directed to
  */
 function send_redirect($url) {
+    /* @var Input $INPUT */
+    global $INPUT;
+
     //are there any undisplayed messages? keep them in session for display
     global $MSG;
     if(isset($MSG) && count($MSG) && !defined('NOSESSION')) {
@@ -1531,7 +1803,7 @@ function send_redirect($url) {
 
     // work around IE bug
     // http://www.ianhoar.com/2008/11/16/internet-explorer-6-and-redirected-anchor-links/
-    list($url, $hash) = explode('#', $url);
+    @list($url, $hash) = explode('#', $url);
     if($hash) {
         if(strpos($url, '?')) {
             $url = $url.'&#'.$hash;
@@ -1541,9 +1813,9 @@ function send_redirect($url) {
     }
 
     // check if running on IIS < 6 with CGI-PHP
-    if(isset($_SERVER['SERVER_SOFTWARE']) && isset($_SERVER['GATEWAY_INTERFACE']) &&
-        (strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') !== false) &&
-        (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($_SERVER['SERVER_SOFTWARE']), $matches)) &&
+    if($INPUT->server->has('SERVER_SOFTWARE') && $INPUT->server->has('GATEWAY_INTERFACE') &&
+        (strpos($INPUT->server->str('GATEWAY_INTERFACE'), 'CGI') !== false) &&
+        (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($INPUT->server->str('SERVER_SOFTWARE')), $matches)) &&
         $matches[1] < 6
     ) {
         header('Refresh: 0;url='.$url);
@@ -1584,6 +1856,10 @@ function valid_input_set($param, $valid_values, $array, $exc = '') {
 /**
  * Read a preference from the DokuWiki cookie
  * (remembering both keys & values are urlencoded)
+ *
+ * @param string $pref     preference key
+ * @param mixed  $default  value returned when preference not found
+ * @return string preference value
  */
 function get_doku_pref($pref, $default) {
     $enc_pref = urlencode($pref);
@@ -1602,6 +1878,9 @@ function get_doku_pref($pref, $default) {
 /**
  * Add a preference to the DokuWiki cookie
  * (remembering $_COOKIE['DOKU_PREFS'] is urlencoded)
+ *
+ * @param string $pref  preference key
+ * @param string $val   preference value
  */
 function set_doku_pref($pref, $val) {
     global $conf;
@@ -1630,4 +1909,13 @@ function set_doku_pref($pref, $val) {
     }
 }
 
+/**
+ * Strips source mapping declarations from given text #601
+ *
+ * @param &string $text reference to the CSS or JavaScript code to clean
+ */
+function stripsourcemaps(&$text){
+    $text = preg_replace('/^(\/\/|\/\*)[@#]\s+sourceMappingURL=.*?(\*\/)?$/im', '\\1\\2', $text);
+}
+
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/confutils.php b/inc/confutils.php
index 0ac003b72..31371d41f 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -237,13 +237,14 @@ function getConfigFiles($type) {
  * check if the given action was disabled in config
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @param string $action
  * @returns boolean true if enabled, false if disabled
  */
 function actionOK($action){
     static $disabled = null;
     if(is_null($disabled) || defined('SIMPLE_TEST')){
         global $conf;
-        /** @var auth_basic $auth */
+        /** @var DokuWiki_Auth_Plugin $auth */
         global $auth;
 
         // prepare disabled actions array and handle legacy options
diff --git a/inc/events.php b/inc/events.php
index f7b1a7a16..318a7617e 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -8,15 +8,18 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 
+/**
+ * The event
+ */
 class Doku_Event {
 
     // public properties
-    var $name = '';                // READONLY  event name, objects must register against this name to see the event
-    var $data = null;              // READWRITE data relevant to the event, no standardised format (YET!)
-    var $result = null;            // READWRITE the results of the event action, only relevant in "_AFTER" advise
+    public $name = '';                // READONLY  event name, objects must register against this name to see the event
+    public $data = null;              // READWRITE data relevant to the event, no standardised format (YET!)
+    public $result = null;            // READWRITE the results of the event action, only relevant in "_AFTER" advise
     //    event handlers may modify this if they are preventing the default action
     //    to provide the after event handlers with event results
-    var $canPreventDefault = true; // READONLY  if true, event handlers can prevent the events default action
+    public $canPreventDefault = true; // READONLY  if true, event handlers can prevent the events default action
 
     // private properties, event handlers can effect these through the provided methods
     var $_default = true;     // whether or not to carry out the default action associated with the event
@@ -33,6 +36,13 @@ class Doku_Event {
     }
 
     /**
+     * @return string
+     */
+    function __toString() {
+        return $this->name;
+    }
+
+    /**
      * advise functions
      *
      * advise all registered handlers of this event
@@ -47,7 +57,8 @@ class Doku_Event {
      *    $evt->advise_after();
      *    unset($evt);
      *
-     * @return  results of processing the event, usually $this->_default
+     * @param bool $enablePreventDefault
+     * @return bool results of processing the event, usually $this->_default
      */
     function advise_before($enablePreventDefault=true) {
         global $EVENT_HANDLER;
@@ -73,14 +84,21 @@ class Doku_Event {
      *   $this->_default, all of which may have been modified by the event handlers.
      * - advise all registered (<event>_AFTER) handlers that the event has taken place
      *
-     * @return  $event->results
+     * @param null|callable $action
+     * @param bool $enablePrevent
+     * @return  mixed $event->results
      *          the value set by any <event>_before or <event> handlers if the default action is prevented
      *          or the results of the default action (as modified by <event>_after handlers)
      *          or NULL no action took place and no handler modified the value
      */
     function trigger($action=null, $enablePrevent=true) {
 
-        if (!is_callable($action)) $enablePrevent = false;
+        if (!is_callable($action)) {
+            $enablePrevent = false;
+            if (!is_null($action)) {
+                trigger_error('The default action of '.$this.' is not null but also not callable. Maybe the method is not public?', E_USER_WARNING);
+            }
+        }
 
         if ($this->advise_before($enablePrevent) && is_callable($action)) {
             if (is_array($action)) {
@@ -112,12 +130,15 @@ class Doku_Event {
     function preventDefault() { $this->_default = false;  }
 }
 
+/**
+ * Controls the registration and execution of all events,
+ */
 class Doku_Event_Handler {
 
     // public properties:  none
 
     // private properties
-    var $_hooks = array();          // array of events and their registered handlers
+    protected $_hooks = array();          // array of events and their registered handlers
 
     /**
      * event_handler
@@ -128,6 +149,7 @@ class Doku_Event_Handler {
     function Doku_Event_Handler() {
 
         // load action plugins
+        /** @var DokuWiki_Action_Plugin $plugin */
         $plugin = null;
         $pluginlist = plugin_list('action');
 
@@ -143,34 +165,47 @@ class Doku_Event_Handler {
      *
      * register a hook for an event
      *
-     * @param  $event   (string)   name used by the event, (incl '_before' or '_after' for triggers)
-     * @param  $obj     (obj)      object in whose scope method is to be executed,
+     * @param  $event   string   name used by the event, (incl '_before' or '_after' for triggers)
+     * @param  $advise  string
+     * @param  $obj     object   object in whose scope method is to be executed,
      *                             if NULL, method is assumed to be a globally available function
-     * @param  $method  (function) event handler function
-     * @param  $param   (mixed)    data passed to the event handler
+     * @param  $method  string   event handler function
+     * @param  $param   mixed    data passed to the event handler
+     * @param  $seq     int      sequence number for ordering hook execution (ascending)
      */
-    function register_hook($event, $advise, $obj, $method, $param=null) {
-        $this->_hooks[$event.'_'.$advise][] = array($obj, $method, $param);
+    function register_hook($event, $advise, $obj, $method, $param=null, $seq=0) {
+        $seq = (int)$seq;
+        $doSort = !isset($this->_hooks[$event.'_'.$advise][$seq]);
+        $this->_hooks[$event.'_'.$advise][$seq][] = array($obj, $method, $param);
+
+        if ($doSort) {
+            ksort($this->_hooks[$event.'_'.$advise]);
+        }
     }
 
-    function process_event(&$event,$advise='') {
+    /**
+     * process the before/after event
+     *
+     * @param Doku_Event $event
+     * @param string     $advise BEFORE or AFTER
+     */
+    function process_event($event,$advise='') {
 
         $evt_name = $event->name . ($advise ? '_'.$advise : '_BEFORE');
 
         if (!empty($this->_hooks[$evt_name])) {
-            foreach ($this->_hooks[$evt_name] as $hook) {
-                //        list($obj, $method, $param) = $hook;
-                $obj =& $hook[0];
-                $method = $hook[1];
-                $param = $hook[2];
-
-                if (is_null($obj)) {
-                    $method($event, $param);
-                } else {
-                    $obj->$method($event, $param);
-                }
+            foreach ($this->_hooks[$evt_name] as $sequenced_hooks) {
+                foreach ($sequenced_hooks as $hook) {
+                    list($obj, $method, $param) = $hook;
 
-                if (!$event->_continue) break;
+                    if (is_null($obj)) {
+                        $method($event, $param);
+                    } else {
+                        $obj->$method($event, $param);
+                    }
+
+                    if (!$event->_continue) return;
+                }
             }
         }
     }
@@ -181,12 +216,12 @@ class Doku_Event_Handler {
  *
  * function wrapper to process (create, trigger and destroy) an event
  *
- * @param  $name               (string)   name for the event
- * @param  $data               (mixed)    event data
- * @param  $action             (callback) (optional, default=NULL) default action, a php callback function
- * @param  $canPreventDefault  (bool)     (optional, default=true) can hooks prevent the default action
+ * @param  $name               string   name for the event
+ * @param  $data               mixed    event data
+ * @param  $action             callback (optional, default=NULL) default action, a php callback function
+ * @param  $canPreventDefault  bool     (optional, default=true) can hooks prevent the default action
  *
- * @return (mixed)                        the event results value after all event processing is complete
+ * @return mixed                        the event results value after all event processing is complete
  *                                         by default this is the return value of the default action however
  *                                         it can be set or modified by event handler hooks
  */
diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php
index 670a1bc29..b90da5724 100644
--- a/inc/feedcreator.class.php
+++ b/inc/feedcreator.class.php
@@ -185,6 +185,8 @@ class HtmlDescribable {
      */
     var $descriptionTruncSize;
 
+    var $description;
+
     /**
      * Returns a formatted description field, depending on descriptionHtmlSyndicated and
      * $descriptionTruncSize properties
@@ -222,7 +224,7 @@ class FeedHtmlField {
 
     /**
      * Creates a new instance of FeedHtmlField.
-     * @param  $string: if given, sets the rawFieldContent property
+     * @param string $parFieldContent: if given, sets the rawFieldContent property
      */
     function FeedHtmlField($parFieldContent) {
         if ($parFieldContent) {
@@ -267,8 +269,14 @@ class FeedHtmlField {
  * @author Kai Blankenhorn <kaib@bitfolge.de>
  */
 class UniversalFeedCreator extends FeedCreator {
+    /** @var FeedCreator */
     var $_feed;
 
+    /**
+     * Sets format
+     *
+     * @param string $format
+     */
     function _setFormat($format) {
         switch (strtoupper($format)) {
 
@@ -344,7 +352,7 @@ class UniversalFeedCreator extends FeedCreator {
      * Creates a syndication feed based on the items previously added.
      *
      * @see        FeedCreator::addItem()
-     * @param    string    format    format the feed should comply to. Valid values are:
+     * @param    string    $format    format the feed should comply to. Valid values are:
      *          "PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
      * @return    string    the contents of the feed.
      */
@@ -358,10 +366,10 @@ class UniversalFeedCreator extends FeedCreator {
      * header may be sent to redirect the use to the newly created file.
      * @since 1.4
      *
-     * @param   string  format  format the feed should comply to. Valid values are:
+     * @param   string  $format  format the feed should comply to. Valid values are:
      *          "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
-     * @param   string  filename    optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     * @param   boolean displayContents optional    send the content of the file or not. If true, the file will be sent in the body of the response.
+     * @param   string  $filename    optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+     * @param   boolean $displayContents optional    send the content of the file or not. If true, the file will be sent in the body of the response.
      */
     function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
         $this->_setFormat($format);
@@ -376,10 +384,10 @@ class UniversalFeedCreator extends FeedCreator {
      * before anything else, especially before you do the time consuming task to build the feed
      * (web fetching, for example).
      *
-     * @param   string   format   format the feed should comply to. Valid values are:
+     * @param string   $format   format the feed should comply to. Valid values are:
      *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
-     * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+     * @param string   $filename   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+     * @param int      $timeout optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
      */
     function useCached($format="RSS0.91", $filename="", $timeout=3600) {
         $this->_setFormat($format);
@@ -390,7 +398,7 @@ class UniversalFeedCreator extends FeedCreator {
     /**
      * Outputs feed to the browser - needed for on-the-fly feed generation (like it is done in WordPress, etc.)
      *
-     * @param    format  string  format the feed should comply to. Valid values are:
+     * @param    $format  string  format the feed should comply to. Valid values are:
      *                           "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
      */
     function outputFeed($format='RSS0.91') {
@@ -422,7 +430,13 @@ class FeedCreator extends HtmlDescribable {
     /**
      * Optional attributes of a feed.
      */
-    var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
+    var $syndicationURL, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
+    /**
+     * Optional attribute of a feed
+     *
+     * @var FeedImage
+     */
+    var $image = null;
 
     /**
     * The url of the external xsl stylesheet used to format the naked rss feed.
@@ -430,13 +444,18 @@ class FeedCreator extends HtmlDescribable {
     */
     var $xslStyleSheet = "";
 
+    /**
+     * Style sheet for rss feed
+     */
+    var $cssStyleSheet = "";
+
 
     /**
      * @access private
+     * @var FeedItem[]
      */
     var $items = Array();
 
-
     /**
      * This feed's MIME content type.
      * @since 1.4
@@ -466,7 +485,7 @@ class FeedCreator extends HtmlDescribable {
     /**
      * Adds an FeedItem to the feed.
      *
-     * @param object FeedItem $item The FeedItem to add to the feed.
+     * @param FeedItem $item The FeedItem to add to the feed.
      * @access public
      */
     function addItem($item) {
@@ -482,8 +501,8 @@ class FeedCreator extends HtmlDescribable {
      * If the string is already shorter than $length, it is returned unchanged.
      *
      * @static
-     * @param string    string A string to be truncated.
-     * @param int        length the maximum length the string should be truncated to
+     * @param string  $string A string to be truncated.
+     * @param int     $length the maximum length the string should be truncated to
      * @return string    the truncated string
      */
     function iTrunc($string, $length) {
@@ -527,8 +546,8 @@ class FeedCreator extends HtmlDescribable {
     /**
      * Creates a string containing all additional elements specified in
      * $additionalElements.
-     * @param   elements    array   an associative array containing key => value pairs
-     * @param indentString  string  a string that will be inserted before every generated line
+     * @param $elements      array   an associative array containing key => value pairs
+     * @param $indentString  string  a string that will be inserted before every generated line
      * @return    string    the XML tags corresponding to $additionalElements
      */
     function _createAdditionalElements($elements, $indentString="") {
@@ -541,6 +560,9 @@ class FeedCreator extends HtmlDescribable {
         return $ae;
     }
 
+    /**
+     * Create elements for stylesheets
+     */
     function _createStylesheetReferences() {
         $xml = "";
         if ($this->cssStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n";
@@ -610,8 +632,8 @@ class FeedCreator extends HtmlDescribable {
      * before anything else, especially before you do the time consuming task to build the feed
      * (web fetching, for example).
      * @since 1.4
-     * @param filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     * @param timeout   int     optional    the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+     * @param $filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+     * @param $timeout   int     optional    the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
      */
     function useCached($filename="", $timeout=3600) {
         $this->_timeout = $timeout;
@@ -629,8 +651,8 @@ class FeedCreator extends HtmlDescribable {
      * header may be sent to redirect the user to the newly created file.
      * @since 1.4
      *
-     * @param filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     * @param redirect  boolean optional    send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
+     * @param $filename         string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+     * @param $displayContents  boolean optional    send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
      */
     function saveFeed($filename="", $displayContents=true) {
         if ($filename=="") {
@@ -667,6 +689,7 @@ class FeedCreator extends HtmlDescribable {
  * Usually, you won't need to use this.
  */
 class FeedDate {
+    /** @var int */
     var $unix;
 
     /**
@@ -726,7 +749,7 @@ class FeedDate {
     /**
      * Gets the date stored in this FeedDate as an RFC 822 date.
      *
-     * @return a date in RFC 822 format
+     * @return string a date in RFC 822 format
      */
     function rfc822() {
         //return gmdate("r",$this->unix);
@@ -738,7 +761,7 @@ class FeedDate {
     /**
      * Gets the date stored in this FeedDate as an ISO 8601 date.
      *
-     * @return a date in ISO 8601 (RFC 3339) format
+     * @return string a date in ISO 8601 (RFC 3339) format
      */
     function iso8601() {
         $date = gmdate("Y-m-d\TH:i:sO",$this->unix);
@@ -751,7 +774,7 @@ class FeedDate {
     /**
      * Gets the date stored in this FeedDate as unix time stamp.
      *
-     * @return a date as a unix time stamp
+     * @return int a date as a unix time stamp
      */
     function unix() {
         return $this->unix;
@@ -777,7 +800,7 @@ class RSSCreator10 extends FeedCreator {
         $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
         $feed.= $this->_createGeneratorComment();
         if ($this->cssStyleSheet=="") {
-            $cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css";
+            $this->cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css";
         }
         $feed.= $this->_createStylesheetReferences();
         $feed.= "<rdf:RDF\n";
@@ -1032,12 +1055,16 @@ class PIECreator01 extends FeedCreator {
         $this->encoding = "utf-8";
     }
 
+    /**
+     * Build content
+     * @return string
+     */
     function createFeed() {
         $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
         $feed.= $this->_createStylesheetReferences();
         $feed.= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n";
         $feed.= "    <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
-        $this->truncSize = 500;
+        $this->descriptionTruncSize = 500;
         $feed.= "    <subtitle>".$this->getDescription()."</subtitle>\n";
         $feed.= "    <link>".$this->link."</link>\n";
         $icnt = count($this->items);
@@ -1091,6 +1118,10 @@ class AtomCreator10 extends FeedCreator {
         $this->encoding = "utf-8";
     }
 
+    /**
+     * Build content
+     * @return string
+     */
     function createFeed() {
         $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
         $feed.= $this->_createGeneratorComment();
@@ -1174,6 +1205,10 @@ class AtomCreator03 extends FeedCreator {
         $this->encoding = "utf-8";
     }
 
+    /**
+     * Build content
+     * @return string
+     */
     function createFeed() {
         $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
         $feed.= $this->_createGeneratorComment();
@@ -1281,6 +1316,7 @@ class MBOXCreator extends FeedCreator {
      */
     function createFeed() {
         $icnt = count($this->items);
+        $feed = "";
         for ($i=0; $i<$icnt; $i++) {
             if ($this->items[$i]->author!="") {
                 $from = $this->items[$i]->author;
@@ -1331,6 +1367,10 @@ class OPMLCreator extends FeedCreator {
         $this->encoding = "utf-8";
     }
 
+    /**
+     * Build content
+     * @return string
+     */
     function createFeed() {
         $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
         $feed.= $this->_createGeneratorComment();
@@ -1441,6 +1481,7 @@ class HTMLCreator extends FeedCreator {
         }
 
         //set an openInNewWindow_token_to be inserted or not
+        $targetInsert = "";
         if ($this->openInNewWindow) {
             $targetInsert = " target='_blank'";
         }
@@ -1568,6 +1609,14 @@ class JSCreator extends HTMLCreator {
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 class DokuWikiFeedCreator extends UniversalFeedCreator{
+
+    /**
+     * Build content
+     *
+     * @param string $format
+     * @param string $encoding
+     * @return string
+     */
     function createFeed($format = "RSS0.91",$encoding='iso-8859-15') {
         $this->_setFormat($format);
         $this->_feed->encoding = $encoding;
diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index 3eacaa2fe..c61c54503 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -77,7 +77,7 @@ function sendFile($file, $mime, $dl, $cache, $public = false, $orig = null) {
     }
 
     //use x-sendfile header to pass the delivery to compatible webservers
-    if(http_sendfile($file)) exit;
+    http_sendfile($file);
 
     // send file contents
     $fp = @fopen($file, "rb");
diff --git a/inc/form.php b/inc/form.php
index a4cd2e682..fadc71d3e 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -47,15 +47,11 @@ class Doku_Form {
      * with up to four parameters is deprecated, instead the first parameter
      * should be an array with parameters.
      *
-     * @param   mixed   $params  Parameters for the HTML form element; Using the
-     *                           deprecated calling convention this is the ID
-     *                           attribute of the form
-     * @param   string  $action  (optional, deprecated) submit URL, defaults to
-     *                                                  current page
-     * @param   string  $method  (optional, deprecated) 'POST' or 'GET', default
-     *                                                  is POST
-     * @param   string  $enctype (optional, deprecated) Encoding type of the
-     *                                                  data
+     * @param mixed       $params  Parameters for the HTML form element; Using the deprecated
+     *                             calling convention this is the ID attribute of the form
+     * @param bool|string $action  (optional, deprecated) submit URL, defaults to current page
+     * @param bool|string $method  (optional, deprecated) 'POST' or 'GET', default is POST
+     * @param bool|string $enctype (optional, deprecated) Encoding type of the data
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function Doku_Form($params, $action=false, $method=false, $enctype=false) {
@@ -135,7 +131,7 @@ class Doku_Form {
      * The element can be either a pseudo-tag or string.
      * If string, it is printed without escaping special chars.   *
      *
-     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @param   string|array  $elem   Pseudo-tag or string to add to the form.
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function addElement($elem) {
@@ -147,8 +143,8 @@ class Doku_Form {
      *
      * Inserts a content element at a position.
      *
-     * @param   string  $pos    0-based index where the element will be inserted.
-     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @param   string       $pos  0-based index where the element will be inserted.
+     * @param   string|array $elem Pseudo-tag or string to add to the form.
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function insertElement($pos, $elem) {
@@ -160,8 +156,8 @@ class Doku_Form {
      *
      * Replace with NULL to remove an element.
      *
-     * @param   int     $pos    0-based index the element will be placed at.
-     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @param   int          $pos  0-based index the element will be placed at.
+     * @param   string|array $elem Pseudo-tag or string to add to the form.
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function replaceElement($pos, $elem) {
@@ -176,7 +172,7 @@ class Doku_Form {
      * Gets the position of the first of a type of element.
      *
      * @param   string  $type   Element type to look for.
-     * @return  array   pseudo-element if found, false otherwise
+     * @return  int     position of element if found, otherwise false
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function findElementByType($type) {
@@ -193,7 +189,7 @@ class Doku_Form {
      * Gets the position of the element with an ID attribute.
      *
      * @param   string  $id     ID of the element to find.
-     * @return  array   pseudo-element if found, false otherwise
+     * @return  int     position of element if found, otherwise false
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function findElementById($id) {
@@ -211,7 +207,7 @@ class Doku_Form {
      *
      * @param   string  $name   Attribute name.
      * @param   string  $value  Attribute value.
-     * @return  array   pseudo-element if found, false otherwise
+     * @return  int     position of element if found, otherwise false
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function findElementByAttribute($name, $value) {
@@ -230,7 +226,7 @@ class Doku_Form {
      * first (underflow) or last (overflow) element.
      *
      * @param   int     $pos    0-based index
-     * @return  arrayreference  pseudo-element
+     * @return  array reference  pseudo-element
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function &getElementAt($pos) {
@@ -565,10 +561,11 @@ function form_makeListboxField($name, $values, $selected='', $label=null, $id=''
     if (is_null($label)) $label = $name;
     $options = array();
     reset($values);
-    if (is_null($selected) || $selected == '')
+    if (is_null($selected) || $selected == '') {
         $selected = array();
-    elseif (!is_array($selected))
+    } elseif (!is_array($selected)) {
         $selected = array($selected);
+    }
     // FIXME: php doesn't know the difference between a string and an integer
     if (is_string(key($values))) {
         foreach ($values as $val=>$text) {
@@ -576,11 +573,13 @@ function form_makeListboxField($name, $values, $selected='', $label=null, $id=''
         }
     } else {
         foreach ($values as $val) {
-            if (is_array($val))
-                @list($val,$text) = $val;
-            else
+            $disabled = false;
+            if (is_array($val)) {
+                @list($val,$text,$disabled) = $val;
+            } else {
                 $text = null;
-            $options[] = array($val,$text,in_array($val,$selected));
+            }
+            $options[] = array($val,$text,in_array($val,$selected),$disabled);
         }
     }
     $elem = array('_elem'=>'listboxfield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
@@ -934,11 +933,12 @@ function form_listboxfield($attrs) {
     $s .= '<select '.buildAttributes($attrs,true).'>'.DOKU_LF;
     if (!empty($attrs['_options'])) {
         foreach ($attrs['_options'] as $opt) {
-            @list($value,$text,$select) = $opt;
+            @list($value,$text,$select,$disabled) = $opt;
             $p = '';
             if(is_null($text)) $text = $value;
             $p .= ' value="'.formText($value).'"';
             if (!empty($select)) $p .= ' selected="selected"';
+            if ($disabled) $p .= ' disabled="disabled"';
             $s .= '<option'.$p.'>'.formText($text).'</option>';
         }
     } else {
diff --git a/inc/fulltext.php b/inc/fulltext.php
index bd8e6b866..dd918f214 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -72,8 +72,20 @@ function _ft_pageSearch(&$data) {
                 $pages  = end($stack);
                 $pages_matched = array();
                 foreach(array_keys($pages) as $id){
-                    $text = utf8_strtolower(rawWiki($id));
-                    if (strpos($text, $phrase) !== false) {
+                    $evdata = array(
+                        'id' => $id,
+                        'phrase' => $phrase,
+                        'text' => rawWiki($id)
+                    );
+                    $evt = new Doku_Event('FULLTEXT_PHRASE_MATCH',$evdata);
+                    if ($evt->advise_before() && $evt->result !== true) {
+                        $text = utf8_strtolower($evdata['text']);
+                        if (strpos($text, $phrase) !== false) {
+                            $evt->result = true;
+                        }
+                    }
+                    $evt->advise_after();
+                    if ($evt->result === true) {
                         $pages_matched[$id] = 0; // phrase: always 0 hit
                     }
                 }
@@ -333,7 +345,7 @@ function ft_snippet($id,$highlight){
                 $pre = min($pre,100-$post);
             } else if ($post>50) {
                 $post = min($post, 100-$pre);
-            } else {
+            } else if ($offset == 0) {
                 // both are less than 50, means the context is the whole string
                 // make it so and break out of this loop - there is no need for the
                 // complex snippet calculations
@@ -354,12 +366,12 @@ function ft_snippet($id,$highlight){
             }
 
             // set $offset for next match attempt
-            //   substract strlen to avoid splitting a potential search success,
-            //   this is an approximation as the search pattern may match strings
-            //   of varying length and it will fail if the context snippet
-            //   boundary breaks a matching string longer than the current match
-            $utf8_offset = $utf8_idx + $post;
-            $offset = $idx + strlen(utf8_substr($text,$utf8_idx,$post));
+            // continue matching after the current match
+            // if the current match is not the longest possible match starting at the current offset
+            // this prevents further matching of this snippet but for possible matches of length
+            // smaller than match length + context (at least 50 characters) this match is part of the context
+            $utf8_offset = $utf8_idx + $utf8_len;
+            $offset = $idx + strlen(utf8_substr($text,$utf8_idx,$utf8_len));
             $offset = utf8_correctIdx($text,$offset);
         }
 
diff --git a/inc/html.php b/inc/html.php
index 5941a9af2..bda6fb398 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -19,6 +19,7 @@ if(!defined('NL')) define('NL',"\n");
  * @return string the HTML code of the link
  */
 function html_wikilink($id,$name=null,$search=''){
+    /** @var Doku_Renderer_xhtml $xhtml_renderer */
     static $xhtml_renderer = null;
     if(is_null($xhtml_renderer)){
         $xhtml_renderer = p_get_renderer('xhtml');
@@ -64,6 +65,20 @@ function html_login(){
     print '</div>'.NL;
 }
 
+
+/**
+ * Denied page content
+ *
+ * @return string html
+ */
+function html_denied() {
+    print p_locale_xhtml('denied');
+
+    if(!$_SERVER['REMOTE_USER']){
+        html_login();
+    }
+}
+
 /**
  * inserts section edit buttons if wanted or removes the markers
  *
@@ -396,8 +411,8 @@ function html_locked(){
 
     print p_locale_xhtml('locked');
     print '<ul>';
-    print '<li><div class="li"><strong>'.$lang['lockedby'].':</strong> '.editorinfo($INFO['locked']).'</div></li>';
-    print '<li><div class="li"><strong>'.$lang['lockexpire'].':</strong> '.$expire.' ('.$min.' min)</div></li>';
+    print '<li><div class="li"><strong>'.$lang['lockedby'].'</strong> '.editorinfo($INFO['locked']).'</div></li>';
+    print '<li><div class="li"><strong>'.$lang['lockexpire'].'</strong> '.$expire.' ('.$min.' min)</div></li>';
     print '</ul>';
 }
 
@@ -414,20 +429,23 @@ function html_revisions($first=0, $media_id = false){
     global $conf;
     global $lang;
     $id = $ID;
+    if ($media_id) {
+        $id = $media_id;
+        $changelog = new MediaChangeLog($id);
+    } else {
+        $changelog = new PageChangeLog($id);
+    }
+
     /* we need to get one additional log entry to be able to
      * decide if this is the last page or is there another one.
      * see html_recent()
      */
-    if (!$media_id) $revisions = getRevisions($ID, $first, $conf['recent']+1);
-    else {
-        $revisions = getRevisions($media_id, $first, $conf['recent']+1, 8192, true);
-        $id = $media_id;
-    }
+
+    $revisions = $changelog->getRevisions($first, $conf['recent']+1);
 
     if(count($revisions)==0 && $first!=0){
         $first=0;
-        if (!$media_id) $revisions = getRevisions($ID, $first, $conf['recent']+1);
-        else $revisions = getRevisions($media_id, $first, $conf['recent']+1, 8192, true);
+        $revisions = $changelog->getRevisions($first, $conf['recent']+1);
     }
     $hasNext = false;
     if (count($revisions)>$conf['recent']) {
@@ -486,15 +504,18 @@ function html_revisions($first=0, $media_id = false){
             $form->addElement(form_makeCloseTag('span'));
         }
 
+        $changelog->setChunkSize(1024);
+
         $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
-        if (!$media_id) $editor = $INFO['editor'];
-        else {
-            $revinfo = getRevisionInfo($id, @filemtime(fullpath(mediaFN($id))), 1024, true);
-            if($revinfo['user']){
+        if($media_id) {
+            $revinfo = $changelog->getRevisionInfo(@filemtime(fullpath(mediaFN($id))));
+            if($revinfo['user']) {
                 $editor = $revinfo['user'];
-            }else{
+            } else {
                 $editor = $revinfo['ip'];
             }
+        } else {
+            $editor = $INFO['editor'];
         }
         $form->addElement((empty($editor))?('('.$lang['external_edit'].')'):editorinfo($editor));
         $form->addElement(form_makeCloseTag('span'));
@@ -509,12 +530,11 @@ function html_revisions($first=0, $media_id = false){
 
     foreach($revisions as $rev){
         $date = dformat($rev);
-        if (!$media_id) {
-            $info = getRevisionInfo($id,$rev,true);
-            $exists = page_exists($id,$rev);
-        }  else {
-            $info = getRevisionInfo($id,$rev,true,true);
-            $exists = @file_exists(mediaFN($id,$rev));
+        $info = $changelog->getRevisionInfo($rev);
+        if($media_id) {
+            $exists = @file_exists(mediaFN($id, $rev));
+        } else {
+            $exists = page_exists($id, $rev);
         }
 
         if ($info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
@@ -691,7 +711,7 @@ function html_recent($first=0, $show_changes='both'){
 
         $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
 
-        if ($recent['media']) {
+        if (!empty($recent['media'])) {
             $form->addElement(media_printicon($recent['id']));
         } else {
             $icon = DOKU_BASE.'lib/images/fileicons/file.png';
@@ -705,7 +725,7 @@ function html_recent($first=0, $show_changes='both'){
         $diff = false;
         $href = '';
 
-        if ($recent['media']) {
+        if (!empty($recent['media'])) {
             $diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && @file_exists(mediaFN($recent['id'])));
             if ($diff) {
                 $href = media_managerURL(array('tab_details' => 'history',
@@ -715,7 +735,7 @@ function html_recent($first=0, $show_changes='both'){
             $href = wl($recent['id'],"do=diff", false, '&');
         }
 
-        if ($recent['media'] && !$diff) {
+        if (!empty($recent['media']) && !$diff) {
             $form->addElement('<img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" />');
         } else {
             $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => $href)));
@@ -729,7 +749,7 @@ function html_recent($first=0, $show_changes='both'){
             $form->addElement(form_makeCloseTag('a'));
         }
 
-        if ($recent['media']) {
+        if (!empty($recent['media'])) {
             $href = media_managerURL(array('tab_details' => 'history',
                 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
         } else {
@@ -745,7 +765,7 @@ function html_recent($first=0, $show_changes='both'){
                         )));
         $form->addElement(form_makeCloseTag('a'));
 
-        if ($recent['media']) {
+        if (!empty($recent['media'])) {
             $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
             $class = (file_exists(mediaFN($recent['id']))) ? 'wikilink1' : $class = 'wikilink2';
             $form->addElement(form_makeOpenTag('a', array('class' => $class, 'href' => $href)));
@@ -902,6 +922,14 @@ function html_li_default($item){
  * a member of an object.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array    $data  array with item arrays
+ * @param string   $class class of ul wrapper
+ * @param callable $func  callback to print an list item
+ * @param string   $lifunc callback to the opening li tag
+ * @param bool     $forcewrapper Trigger building a wrapper ul if the first level is
+                                 0 (we have a root object) or 1 (just the root content)
+ * @return string html of an unordered list
  */
 function html_buildlist($data,$class,$func,$lifunc='html_li_default',$forcewrapper=false){
     if (count($data) === 0) {
@@ -1008,10 +1036,15 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false, $inline = fa
     $ml_or_wl = $media ? 'ml' : 'wl';
     $l_minor = $r_minor = '';
 
+    if($media) {
+        $changelog = new MediaChangeLog($id);
+    } else {
+        $changelog = new PageChangeLog($id);
+    }
     if(!$l_rev){
         $l_head = '&mdash;';
     }else{
-        $l_info   = getRevisionInfo($id,$l_rev,true, $media);
+        $l_info   = $changelog->getRevisionInfo($l_rev);
         if($l_info['user']){
             $l_user = '<bdi>'.editorinfo($l_info['user']).'</bdi>';
             if(auth_ismanager()) $l_user .= ' <bdo dir="ltr">('.$l_info['ip'].')</bdo>';
@@ -1029,7 +1062,7 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false, $inline = fa
     }
 
     if($r_rev){
-        $r_info   = getRevisionInfo($id,$r_rev,true, $media);
+        $r_info   = $changelog->getRevisionInfo($r_rev);
         if($r_info['user']){
             $r_user = '<bdi>'.editorinfo($r_info['user']).'</bdi>';
             if(auth_ismanager()) $r_user .= ' <bdo dir="ltr">('.$r_info['ip'].')</bdo>';
@@ -1045,7 +1078,7 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false, $inline = fa
         $r_head_title.'</a></bdi>'.
         $head_separator.$r_user.' '.$r_sum;
     }elseif($_rev = @filemtime($media_or_wikiFN($id))){
-        $_info   = getRevisionInfo($id,$_rev,true, $media);
+        $_info   = $changelog->getRevisionInfo($_rev);
         if($_info['user']){
             $_user = '<bdi>'.editorinfo($_info['user']).'</bdi>';
             if(auth_ismanager()) $_user .= ' <bdo dir="ltr">('.$_info['ip'].')</bdo>';
@@ -1069,162 +1102,386 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false, $inline = fa
 }
 
 /**
- * show diff
+ * Show diff
+ * between current page version and provided $text
+ * or between the revisions provided via GET or POST
  *
  * @author Andreas Gohr <andi@splitbrain.org>
- * @param  string $text - compare with this text with most current version
- * @param  bool   $intro - display the intro text
- * @param  string $type type of the diff (inline or sidebyside)
+ * @param  string $text  when non-empty: compare with this text with most current version
+ * @param  bool   $intro display the intro text
+ * @param  string $type  type of the diff (inline or sidebyside)
  */
-function html_diff($text='',$intro=true,$type=null){
+function html_diff($text = '', $intro = true, $type = null) {
     global $ID;
     global $REV;
     global $lang;
     global $INPUT;
     global $INFO;
+    $pagelog = new PageChangeLog($ID);
 
+    /*
+     * Determine diff type
+     */
     if(!$type) {
         $type = $INPUT->str('difftype');
-        if (empty($type)) {
+        if(empty($type)) {
             $type = get_doku_pref('difftype', $type);
-            if (empty($type) && $INFO['ismobile']) {
+            if(empty($type) && $INFO['ismobile']) {
                 $type = 'inline';
             }
         }
     }
     if($type != 'inline') $type = 'sidebyside';
 
+    /*
+     * Determine requested revision(s)
+     */
     // we're trying to be clever here, revisions to compare can be either
     // given as rev and rev2 parameters, with rev2 being optional. Or in an
     // array in rev2.
     $rev1 = $REV;
 
     $rev2 = $INPUT->ref('rev2');
-    if(is_array($rev2)){
+    if(is_array($rev2)) {
         $rev1 = (int) $rev2[0];
         $rev2 = (int) $rev2[1];
 
-        if(!$rev1){
+        if(!$rev1) {
             $rev1 = $rev2;
             unset($rev2);
         }
-    }else{
+    } else {
         $rev2 = $INPUT->int('rev2');
     }
 
+    /*
+     * Determine left and right revision, its texts and the header
+     */
     $r_minor = '';
     $l_minor = '';
 
-    if($text){                      // compare text to the most current revision
-        $l_rev   = '';
-        $l_text  = rawWiki($ID,'');
-        $l_head  = '<a class="wikilink1" href="'.wl($ID).'">'.
-            $ID.' '.dformat((int) @filemtime(wikiFN($ID))).'</a> '.
+    if($text) { // compare text to the most current revision
+        $l_rev = '';
+        $l_text = rawWiki($ID, '');
+        $l_head = '<a class="wikilink1" href="' . wl($ID) . '">' .
+            $ID . ' ' . dformat((int) @filemtime(wikiFN($ID))) . '</a> ' .
             $lang['current'];
 
-        $r_rev   = '';
-        $r_text  = cleanText($text);
-        $r_head  = $lang['yours'];
-    }else{
-        if($rev1 && isset($rev2) && $rev2){            // two specific revisions wanted
+        $r_rev = '';
+        $r_text = cleanText($text);
+        $r_head = $lang['yours'];
+    } else {
+        if($rev1 && isset($rev2) && $rev2) { // two specific revisions wanted
             // make sure order is correct (older on the left)
-            if($rev1 < $rev2){
+            if($rev1 < $rev2) {
                 $l_rev = $rev1;
                 $r_rev = $rev2;
-            }else{
+            } else {
                 $l_rev = $rev2;
                 $r_rev = $rev1;
             }
-        }elseif($rev1){                // single revision given, compare to current
+        } elseif($rev1) { // single revision given, compare to current
             $r_rev = '';
             $l_rev = $rev1;
-        }else{                        // no revision was given, compare previous to current
+        } else { // no revision was given, compare previous to current
             $r_rev = '';
-            $revs = getRevisions($ID, 0, 1);
+            $revs = $pagelog->getRevisions(0, 1);
             $l_rev = $revs[0];
             $REV = $l_rev; // store revision back in $REV
         }
 
         // when both revisions are empty then the page was created just now
-        if(!$l_rev && !$r_rev){
+        if(!$l_rev && !$r_rev) {
             $l_text = '';
-        }else{
-            $l_text = rawWiki($ID,$l_rev);
+        } else {
+            $l_text = rawWiki($ID, $l_rev);
         }
-        $r_text = rawWiki($ID,$r_rev);
+        $r_text = rawWiki($ID, $r_rev);
 
         list($l_head, $r_head, $l_minor, $r_minor) = html_diff_head($l_rev, $r_rev, null, false, $type == 'inline');
     }
 
-    $df = new Diff(explode("\n",$l_text),explode("\n",$r_text));
+    /*
+     * Build navigation
+     */
+    $l_nav = '';
+    $r_nav = '';
+    if(!$text) {
+        list($l_nav, $r_nav) = html_diff_navigation($pagelog, $type, $l_rev, $r_rev);
+    }
+    /*
+     * Create diff object and the formatter
+     */
+    $diff = new Diff(explode("\n", $l_text), explode("\n", $r_text));
 
-    if($type == 'inline'){
-        $tdf = new InlineDiffFormatter();
+    if($type == 'inline') {
+        $diffformatter = new InlineDiffFormatter();
     } else {
-        $tdf = new TableDiffFormatter();
+        $diffformatter = new TableDiffFormatter();
     }
-
+    /*
+     * Display intro
+     */
     if($intro) print p_locale_xhtml('diff');
 
-    if (!$text) {
-        ptln('<div class="diffoptions">');
-
-        $form = new Doku_Form(array('action'=>wl()));
-        $form->addHidden('id',$ID);
-        $form->addHidden('rev2[0]',$l_rev);
-        $form->addHidden('rev2[1]',$r_rev);
-        $form->addHidden('do','diff');
-        $form->addElement(form_makeListboxField(
-                            'difftype',
-                            array(
-                                'sidebyside' => $lang['diff_side'],
-                                'inline'     => $lang['diff_inline']),
-                            $type,
-                            $lang['diff_type'],
-                            '','',
-                            array('class'=>'quickselect')));
-        $form->addElement(form_makeButton('submit', 'diff','Go'));
+    /*
+     * Display type and exact reference
+     */
+    if(!$text) {
+        ptln('<div class="diffoptions group">');
+
+
+        $form = new Doku_Form(array('action' => wl()));
+        $form->addHidden('id', $ID);
+        $form->addHidden('rev2[0]', $l_rev);
+        $form->addHidden('rev2[1]', $r_rev);
+        $form->addHidden('do', 'diff');
+        $form->addElement(
+             form_makeListboxField(
+                 'difftype',
+                 array(
+                     'sidebyside' => $lang['diff_side'],
+                     'inline' => $lang['diff_inline']
+                 ),
+                 $type,
+                 $lang['diff_type'],
+                 '', '',
+                 array('class' => 'quickselect')
+             )
+        );
+        $form->addElement(form_makeButton('submit', 'diff', 'Go'));
         $form->printForm();
 
-        $diffurl = wl($ID, array(
-                        'do'       => 'diff',
-                        'rev2[0]'  => $l_rev,
-                        'rev2[1]'  => $r_rev,
-                        'difftype' => $type,
-                      ));
-        ptln('<p><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a></p>');
-        ptln('</div>');
+        ptln('<p>');
+        // link to exactly this view FS#2835
+        echo html_diff_navigationlink($type, 'difflink', $l_rev, $r_rev ? $r_rev : $INFO['currentrev']);
+        ptln('</p>');
+
+        ptln('</div>'); // .diffoptions
     }
+
+    /*
+     * Display diff view table
+     */
     ?>
     <div class="table">
-    <table class="diff diff_<?php echo $type?>">
-    <?php if ($type == 'inline') { ?>
-    <tr>
-    <th class="diff-lineheader">-</th><th <?php echo $l_minor?>>
-    <?php echo $l_head?>
-    </th>
-    </tr>
-    <tr>
-    <th class="diff-lineheader">+</th><th <?php echo $r_minor?>>
-    <?php echo $r_head?>
-    </th>
-    </tr>
-    <?php } else { ?>
-    <tr>
-    <th colspan="2" <?php echo $l_minor?>>
-    <?php echo $l_head?>
-    </th>
-    <th colspan="2" <?php echo $r_minor?>>
-    <?php echo $r_head?>
-    </th>
-    </tr>
-    <?php }
-    echo html_insert_softbreaks($tdf->format($df)); ?>
+    <table class="diff diff_<?php echo $type ?>">
+
+        <?php
+        //navigation and header
+        if($type == 'inline') {
+            if(!$text) { ?>
+                <tr>
+                    <td class="diff-lineheader">-</td>
+                    <td class="diffnav"><?php echo $l_nav ?></td>
+                </tr>
+                <tr>
+                    <th class="diff-lineheader">-</th>
+                    <th <?php echo $l_minor ?>>
+                        <?php echo $l_head ?>
+                    </th>
+                </tr>
+            <?php } ?>
+            <tr>
+                <td class="diff-lineheader">+</td>
+                <td class="diffnav"><?php echo $r_nav ?></td>
+            </tr>
+            <tr>
+                <th class="diff-lineheader">+</th>
+                <th <?php echo $r_minor ?>>
+                    <?php echo $r_head ?>
+                </th>
+            </tr>
+        <?php } else {
+            if(!$text) { ?>
+                <tr>
+                    <td colspan="2" class="diffnav"><?php echo $l_nav ?></td>
+                    <td colspan="2" class="diffnav"><?php echo $r_nav ?></td>
+                </tr>
+            <?php } ?>
+            <tr>
+                <th colspan="2" <?php echo $l_minor ?>>
+                    <?php echo $l_head ?>
+                </th>
+                <th colspan="2" <?php echo $r_minor ?>>
+                    <?php echo $r_head ?>
+                </th>
+            </tr>
+        <?php }
+
+        //diff view
+        echo html_insert_softbreaks($diffformatter->format($diff)); ?>
+
     </table>
     </div>
-    <?php
+<?php
+}
+
+/**
+ * Create html for revision navigation
+ *
+ * @param PageChangeLog $pagelog changelog object of current page
+ * @param string        $type    inline vs sidebyside
+ * @param int           $l_rev   left revision timestamp
+ * @param int           $r_rev   right revision timestamp
+ * @return string[] html of left and right navigation elements
+ */
+function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) {
+    global $INFO, $ID;
+
+    // last timestamp is not in changelog, retrieve timestamp from metadata
+    // note: when page is removed, the metadata timestamp is zero
+    $r_rev = $r_rev ? $r_rev : $INFO['meta']['last_change']['date'];
+
+    //retrieve revisions with additional info
+    list($l_revs, $r_revs) = $pagelog->getRevisionsAround($l_rev, $r_rev);
+    $l_revisions = array();
+    if(!$l_rev) {
+        $l_revisions[0] = array(0, "", false); //no left revision given, add dummy
+    }
+    foreach($l_revs as $rev) {
+        $info = $pagelog->getRevisionInfo($rev);
+        $l_revisions[$rev] = array(
+            $rev,
+            dformat($info['date']) . ' ' . editorinfo($info['user'], true) . ' ' . $info['sum'],
+            $r_rev ? $rev >= $r_rev : false //disable?
+        );
+    }
+    $r_revisions = array();
+    if(!$r_rev) {
+        $r_revisions[0] = array(0, "", false); //no right revision given, add dummy
+    }
+    foreach($r_revs as $rev) {
+        $info = $pagelog->getRevisionInfo($rev);
+        $r_revisions[$rev] = array(
+            $rev,
+            dformat($info['date']) . ' ' . editorinfo($info['user'], true) . ' ' . $info['sum'],
+            $rev <= $l_rev //disable?
+        );
+    }
+
+    //determine previous/next revisions
+    $l_index = array_search($l_rev, $l_revs);
+    $l_prev = $l_revs[$l_index + 1];
+    $l_next = $l_revs[$l_index - 1];
+    if($r_rev) {
+        $r_index = array_search($r_rev, $r_revs);
+        $r_prev = $r_revs[$r_index + 1];
+        $r_next = $r_revs[$r_index - 1];
+    } else {
+        //removed page
+        if($l_next) {
+            $r_prev = $r_revs[0];
+        } else {
+            $r_prev = null;
+        }
+        $r_next = null;
+    }
+
+    /*
+     * Left side:
+     */
+    $l_nav = '';
+    //move back
+    if($l_prev) {
+        $l_nav .= html_diff_navigationlink($type, 'diffbothprevrev', $l_prev, $r_prev);
+        $l_nav .= html_diff_navigationlink($type, 'diffprevrev', $l_prev, $r_rev);
+    }
+    //dropdown
+    $form = new Doku_Form(array('action' => wl()));
+    $form->addHidden('id', $ID);
+    $form->addHidden('difftype', $type);
+    $form->addHidden('rev2[1]', $r_rev);
+    $form->addHidden('do', 'diff');
+    $form->addElement(
+         form_makeListboxField(
+             'rev2[0]',
+             $l_revisions,
+             $l_rev,
+             '', '', '',
+             array('class' => 'quickselect')
+         )
+    );
+    $form->addElement(form_makeButton('submit', 'diff', 'Go'));
+    $l_nav .= $form->getForm();
+    //move forward
+    if($l_next && ($l_next < $r_rev || !$r_rev)) {
+        $l_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_next, $r_rev);
+    }
+
+    /*
+     * Right side:
+     */
+    $r_nav = '';
+    //move back
+    if($l_rev < $r_prev) {
+        $r_nav .= html_diff_navigationlink($type, 'diffprevrev', $l_rev, $r_prev);
+    }
+    //dropdown
+    $form = new Doku_Form(array('action' => wl()));
+    $form->addHidden('id', $ID);
+    $form->addHidden('rev2[0]', $l_rev);
+    $form->addHidden('difftype', $type);
+    $form->addHidden('do', 'diff');
+    $form->addElement(
+         form_makeListboxField(
+             'rev2[1]',
+             $r_revisions,
+             $r_rev,
+             '', '', '',
+             array('class' => 'quickselect')
+         )
+    );
+    $form->addElement(form_makeButton('submit', 'diff', 'Go'));
+    $r_nav .= $form->getForm();
+    //move forward
+    if($r_next) {
+        if($pagelog->isCurrentRevision($r_next)) {
+            $r_nav .= html_diff_navigationlink($type, 'difflastrev', $l_rev); //last revision is diff with current page
+        } else {
+            $r_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_rev, $r_next);
+        }
+        $r_nav .= html_diff_navigationlink($type, 'diffbothnextrev', $l_next, $r_next);
+    }
+    return array($l_nav, $r_nav);
 }
 
+/**
+ * Create html link to a diff defined by two revisions
+ *
+ * @param string $difftype display type
+ * @param string $linktype
+ * @param int $lrev oldest revision
+ * @param int $rrev newest revision or null for diff with current revision
+ * @return string html of link to a diff
+ */
+function html_diff_navigationlink($difftype, $linktype, $lrev, $rrev = null) {
+    global $ID, $lang;
+    if(!$rrev) {
+        $urlparam = array(
+            'do' => 'diff',
+            'rev' => $lrev,
+            'difftype' => $difftype,
+        );
+    } else {
+        $urlparam = array(
+            'do' => 'diff',
+            'rev2[0]' => $lrev,
+            'rev2[1]' => $rrev,
+            'difftype' => $difftype,
+        );
+    }
+    return  '<a class="' . $linktype . '" href="' . wl($ID, $urlparam) . '" title="' . $lang[$linktype] . '">' .
+                '<span>' . $lang[$linktype] . '</span>' .
+            '</a>' . "\n";
+}
+
+/**
+ * Insert soft breaks in diff html
+ *
+ * @param $diffhtml
+ * @return string
+ */
 function html_insert_softbreaks($diffhtml) {
     // search the diff html string for both:
     // - html tags, so these can be ignored
@@ -1232,6 +1489,12 @@ function html_insert_softbreaks($diffhtml) {
     return preg_replace_callback('/<[^>]*>|[^<> ]{12,}/','html_softbreak_callback',$diffhtml);
 }
 
+/**
+ * callback which adds softbreaks
+ *
+ * @param array $match array with first the complete match
+ * @return string the replacement
+ */
 function html_softbreak_callback($match){
     // if match is an html tag, return it intact
     if ($match[0]{0} == '<') return $match[0];
@@ -1343,7 +1606,7 @@ function html_updateprofile(){
     global $conf;
     global $INPUT;
     global $INFO;
-    /** @var auth_basic $auth */
+    /** @var DokuWiki_Auth_Plugin $auth */
     global $auth;
 
     print p_locale_xhtml('updateprofile');
@@ -1517,6 +1780,7 @@ function html_edit(){
  * Display the default edit form
  *
  * Is the default action for HTML_EDIT_FORMSELECTION.
+ * @param mixed[] $param
  */
 function html_edit_form($param) {
     global $TEXT;
@@ -1559,7 +1823,7 @@ function html_minoredit(){
 function html_debug(){
     global $conf;
     global $lang;
-    /** @var auth_basic $auth */
+    /** @var DokuWiki_Auth_Plugin $auth */
     global $auth;
     global $INFO;
 
@@ -1634,6 +1898,17 @@ function html_debug(){
     print_r($inis);
     print '</pre>';
 
+    if (function_exists('apache_get_version')) {
+        $apache['version'] = apache_get_version();
+
+        if (function_exists('apache_get_modules')) {
+            $apache['modules'] = apache_get_modules();
+        }
+        print '<b>Apache</b><pre>';
+        print_r($apache);
+        print '</pre>';
+    }
+
     print '</body></html>';
 }
 
diff --git a/inc/httputils.php b/inc/httputils.php
index ca60ed509..efeb2a56c 100644
--- a/inc/httputils.php
+++ b/inc/httputils.php
@@ -64,12 +64,13 @@ function http_conditionalRequest($timestamp){
  * Let the webserver send the given file via x-sendfile method
  *
  * @author Chris Smith <chris@jalakai.co.uk>
- * @returns  void or exits with previously header() commands executed
+ * @param string $file absolute path of file to send
+ * @returns  void or exits with previous header() commands executed
  */
 function http_sendfile($file) {
     global $conf;
 
-    //use x-sendfile header to pass the delivery to compatible webservers
+    //use x-sendfile header to pass the delivery to compatible web servers
     if($conf['xsendfile'] == 1){
         header("X-LIGHTTPD-send-file: $file");
         ob_end_clean();
@@ -79,12 +80,12 @@ function http_sendfile($file) {
         ob_end_clean();
         exit;
     }elseif($conf['xsendfile'] == 3){
+        // FS#2388 nginx just needs the relative path.
+        $file = DOKU_REL.substr($file, strlen(fullpath(DOKU_INC)) + 1);
         header("X-Accel-Redirect: $file");
         ob_end_clean();
         exit;
     }
-
-    return false;
 }
 
 /**
@@ -92,7 +93,7 @@ function http_sendfile($file) {
  *
  * This function exits the running script
  *
- * @param ressource $fh - file handle for an already open file
+ * @param resource $fh - file handle for an already open file
  * @param int $size     - size of the whole file
  * @param int $mime     - MIME type of the file
  *
@@ -204,7 +205,7 @@ function http_gzip_valid($uncompressed_file) {
  *
  * This function handles output of cacheable resource files. It ses the needed
  * HTTP headers. If a useable cache is present, it is passed to the web server
- * and the scrpt is terminated.
+ * and the script is terminated.
  */
 function http_cached($cache, $cache_ok) {
     global $conf;
@@ -223,7 +224,8 @@ function http_cached($cache, $cache_ok) {
             header('Content-Encoding: gzip');
             readfile($cache.".gz");
         } else {
-            if (!http_sendfile($cache)) readfile($cache);
+            http_sendfile($cache);
+            readfile($cache);
         }
         exit;
     }
diff --git a/inc/indexer.php b/inc/indexer.php
index 07f29b542..5ca2f0bb1 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -270,8 +270,9 @@ class Doku_Indexer {
         // Special handling for titles so the index file is simpler
         if (array_key_exists('title', $key)) {
             $value = $key['title'];
-            if (is_array($value))
+            if (is_array($value)) {
                 $value = $value[0];
+            }
             $this->saveIndexKey('title', '', $pid, $value);
             unset($key['title']);
         }
@@ -299,20 +300,24 @@ class Doku_Indexer {
                 if ($val !== "") {
                     $id = array_search($val, $metawords, true);
                     if ($id === false) {
+                        // didn't find $val, so we'll add it to the end of metawords and create a placeholder in metaidx
                         $id = count($metawords);
                         $metawords[$id] = $val;
+                        $metaidx[$id] = '';
                         $addwords = true;
                     }
                     // test if value is already in the index
-                    if (isset($val_idx[$id]) && $val_idx[$id] <= 0)
+                    if (isset($val_idx[$id]) && $val_idx[$id] <= 0){
                         $val_idx[$id] = 0;
-                    else // else add it
+                    } else { // else add it
                         $val_idx[$id] = 1;
+                    }
                 }
             }
 
-            if ($addwords)
+            if ($addwords) {
                 $this->saveIndex($metaname.'_w', '', $metawords);
+            }
             $vals_changed = false;
             foreach ($val_idx as $id => $action) {
                 if ($action == -1) {
@@ -1213,17 +1218,18 @@ class Doku_Indexer {
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function updateTuple($line, $id, $count) {
-        $newLine = $line;
-        if ($newLine !== '')
-            $newLine = preg_replace('/(^|:)'.preg_quote($id,'/').'\*\d*/', '', $newLine);
-        $newLine = trim($newLine, ':');
+        if ($line != ''){
+            $line = preg_replace('/(^|:)'.preg_quote($id,'/').'\*\d*/', '', $line);
+        }
+        $line = trim($line, ':');
         if ($count) {
-            if (strlen($newLine) > 0)
-                return "$id*$count:".$newLine;
-            else
-                return "$id*$count".$newLine;
+            if ($line) {
+                return "$id*$count:".$line;
+            } else {
+                return "$id*$count";
+            }
         }
-        return $newLine;
+        return $line;
     }
 
     /**
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 7358955a0..db856141f 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -102,15 +102,21 @@ function getVersion(){
 function check(){
     global $conf;
     global $INFO;
+    /* @var Input $INPUT */
+    global $INPUT;
 
     if ($INFO['isadmin'] || $INFO['ismanager']){
         msg('DokuWiki version: '.getVersion(),1);
-    }
 
-    if(version_compare(phpversion(),'5.2.0','<')){
-        msg('Your PHP version is too old ('.phpversion().' vs. 5.2.0+ needed)',-1);
-    }else{
-        msg('PHP version '.phpversion(),1);
+        if(version_compare(phpversion(),'5.2.0','<')){
+            msg('Your PHP version is too old ('.phpversion().' vs. 5.2.0+ needed)',-1);
+        }else{
+            msg('PHP version '.phpversion(),1);
+        }
+    } else {
+        if(version_compare(phpversion(),'5.2.0','<')){
+            msg('Your PHP version is too old',-1);
+        }
     }
 
     $mem = (int) php_to_byte(ini_get('memory_limit'));
@@ -200,7 +206,7 @@ function check(){
     }
 
     if($INFO['userinfo']['name']){
-        msg('You are currently logged in as '.$_SERVER['REMOTE_USER'].' ('.$INFO['userinfo']['name'].')',0);
+        msg('You are currently logged in as '.$INPUT->server->str('REMOTE_USER').' ('.$INFO['userinfo']['name'].')',0);
         msg('You are part of the groups '.join($INFO['userinfo']['grps'],', '),0);
     }else{
         msg('You are currently not logged in',0);
@@ -274,6 +280,15 @@ define('MSG_USERS_ONLY', 1);
 define('MSG_MANAGERS_ONLY',2);
 define('MSG_ADMINS_ONLY',4);
 
+/**
+ * Display a message to the user
+ *
+ * @param string $message
+ * @param int    $lvl   -1 = error, 0 = info, 1 = success, 2 = notify
+ * @param string $line  line number
+ * @param string $file  file number
+ * @param int    $allow who's allowed to see the message, see MSG_* constants
+ */
 function msg($message,$lvl=0,$line='',$file='',$allow=MSG_PUBLIC){
     global $MSG, $MSG_shown;
     $errors[-1] = 'error';
@@ -303,6 +318,7 @@ function msg($message,$lvl=0,$line='',$file='',$allow=MSG_PUBLIC){
  *                         lvl   => int, level of the message (see msg() function)
  *                         allow => int, flag used to determine who is allowed to see the message
  *                                       see MSG_* constants
+ * @return bool
  */
 function info_msg_allowed($msg){
     global $INFO, $auth;
@@ -357,6 +373,9 @@ function dbg($msg,$hidden=false){
  */
 function dbglog($msg,$header=''){
     global $conf;
+    /* @var Input $INPUT */
+    global $INPUT;
+
     // The debug log isn't automatically cleaned thus only write it when
     // debugging has been enabled by the user.
     if($conf['allowdebug'] !== 1) return;
@@ -369,12 +388,38 @@ function dbglog($msg,$header=''){
     $file = $conf['cachedir'].'/debug.log';
     $fh = fopen($file,'a');
     if($fh){
-        fwrite($fh,date('H:i:s ').$_SERVER['REMOTE_ADDR'].': '.$msg."\n");
+        fwrite($fh,date('H:i:s ').$INPUT->server->str('REMOTE_ADDR').': '.$msg."\n");
         fclose($fh);
     }
 }
 
 /**
+ * Log accesses to deprecated fucntions to the debug log
+ *
+ * @param string $alternative The function or method that should be used instead
+ */
+function dbg_deprecated($alternative = '') {
+    global $conf;
+    if(!$conf['allowdebug']) return;
+
+    $backtrace = debug_backtrace();
+    array_shift($backtrace);
+    $self = array_shift($backtrace);
+    $call = array_shift($backtrace);
+
+    $called = trim($self['class'].'::'.$self['function'].'()', ':');
+    $caller = trim($call['class'].'::'.$call['function'].'()', ':');
+
+    $msg = $called.' is deprecated. It was called from ';
+    $msg .= $caller.' in '.$call['file'].':'.$call['line'];
+    if($alternative) {
+        $msg .= ' '.$alternative.' should be used instead!';
+    }
+
+    dbglog($msg);
+}
+
+/**
  * Print a reversed, prettyprinted backtrace
  *
  * @author Gary Owen <gary_owen@bigfoot.com>
diff --git a/inc/init.php b/inc/init.php
index 7340f4191..df38326c0 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -140,18 +140,21 @@ if ($conf['gzip_output'] &&
 }
 
 // init session
-if (!headers_sent() && !defined('NOSESSION')){
-    session_name("DokuWiki");
-    $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
-    if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-        session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true);
-    }else{
-        session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()));
+if(!headers_sent() && !defined('NOSESSION')) {
+    if(!defined('DOKU_SESSION_NAME'))     define ('DOKU_SESSION_NAME', "DokuWiki");
+    if(!defined('DOKU_SESSION_LIFETIME')) define ('DOKU_SESSION_LIFETIME', 0);
+    if(!defined('DOKU_SESSION_PATH')) {
+        $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
+        define ('DOKU_SESSION_PATH', $cookieDir);
     }
+    if(!defined('DOKU_SESSION_DOMAIN'))   define ('DOKU_SESSION_DOMAIN', '');
+
+    session_name(DOKU_SESSION_NAME);
+    session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl()), true);
     session_start();
 
     // load left over messages
-    if(isset($_SESSION[DOKU_COOKIE]['msg'])){
+    if(isset($_SESSION[DOKU_COOKIE]['msg'])) {
         $MSG = $_SESSION[DOKU_COOKIE]['msg'];
         unset($_SESSION[DOKU_COOKIE]['msg']);
     }
@@ -173,7 +176,7 @@ if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0);
 $_REQUEST = array_merge($_GET,$_POST);
 
 // we don't want a purge URL to be digged
-if(isset($_REQUEST['purge']) && $_SERVER['HTTP_REFERER']) unset($_REQUEST['purge']);
+if(isset($_REQUEST['purge']) && !empty($_SERVER['HTTP_REFERER'])) unset($_REQUEST['purge']);
 
 // disable gzip if not available
 if($conf['compression'] == 'bz2' && !function_exists('bzopen')){
@@ -183,11 +186,6 @@ if($conf['compression'] == 'gz' && !function_exists('gzopen')){
     $conf['compression'] = 0;
 }
 
-// fix dateformat for upgraders
-if(strpos($conf['dformat'],'%') === false){
-    $conf['dformat'] = '%Y/%m/%d %H:%M';
-}
-
 // precalculate file creation modes
 init_creationmodes();
 
@@ -404,6 +402,10 @@ function remove_magic_quotes(&$array) {
  * Returns the full absolute URL to the directory where
  * DokuWiki is installed in (includes a trailing slash)
  *
+ * !! Can not access $_SERVER values through $INPUT
+ * !! here as this function is called before $INPUT is
+ * !! initialized.
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function getBaseURL($abs=null){
@@ -443,12 +445,12 @@ function getBaseURL($abs=null){
     //split hostheader into host and port
     if(isset($_SERVER['HTTP_HOST'])){
         $parsed_host = parse_url('http://'.$_SERVER['HTTP_HOST']);
-        $host = $parsed_host['host'];
-        $port = $parsed_host['port'];
+        $host = isset($parsed_host['host']) ? $parsed_host['host'] : null;
+        $port = isset($parsed_host['port']) ? $parsed_host['port'] : null;
     }elseif(isset($_SERVER['SERVER_NAME'])){
         $parsed_host = parse_url('http://'.$_SERVER['SERVER_NAME']);
-        $host = $parsed_host['host'];
-        $port = $parsed_host['port'];
+        $host = isset($parsed_host['host']) ? $parsed_host['host'] : null;
+        $port = isset($parsed_host['port']) ? $parsed_host['port'] : null;
     }else{
         $host = php_uname('n');
         $port = '';
diff --git a/inc/io.php b/inc/io.php
index c5225a2e0..27a34b045 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -367,8 +367,6 @@ function io_createNamespace($id, $ns_type='pages') {
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
 function io_makeFileDir($file){
-    global $conf;
-
     $dir = dirname($file);
     if(!@is_dir($dir)){
         io_mkdir_p($dir) || msg("Creating directory $dir failed",-1);
diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php
index 826fda6e8..70672fbdd 100644
--- a/inc/lang/af/lang.php
+++ b/inc/lang/af/lang.php
@@ -25,7 +25,7 @@ $lang['btn_back']              = 'Terug';
 $lang['btn_backlink']          = 'Wat skakel hierheen';
 $lang['btn_subscribe']         = 'Hou bladsy dop';
 $lang['btn_register']          = 'Skep gerus \'n rekening';
-$lang['loggedinas']            = 'Ingeteken as';
+$lang['loggedinas']            = 'Ingeteken as:';
 $lang['user']                  = 'Gebruikernaam';
 $lang['pass']                  = 'Wagwoord';
 $lang['newpass']               = 'Nuive wagwoord';
@@ -52,7 +52,7 @@ $lang['mediaroot']             = 'root';
 $lang['toc']                   = 'Inhoud';
 $lang['current']               = 'huidige';
 $lang['line']                  = 'Streak';
-$lang['youarehere']            = 'Jy is hier';
+$lang['youarehere']            = 'Jy is hier:';
 $lang['by']                    = 'by';
 $lang['restored']              = 'Het terug gegaan na vroeëre weergawe (%s)';
 $lang['summary']               = 'Voorskou';
@@ -63,8 +63,8 @@ $lang['qb_extlink']            = 'Eksterne skakel';
 $lang['qb_hr']                 = 'Horisontale streep';
 $lang['qb_sig']                = 'Handtekening met datum';
 $lang['admin_register']        = 'Skep gerus \'n rekening';
-$lang['img_backto']            = 'Terug na';
-$lang['img_date']              = 'Datem';
-$lang['img_camera']            = 'Camera';
+$lang['btn_img_backto']        = 'Terug na %s';
+$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.';
diff --git a/inc/lang/ar/denied.txt b/inc/lang/ar/denied.txt
index 11405233c..b369f7f23 100644
--- a/inc/lang/ar/denied.txt
+++ b/inc/lang/ar/denied.txt
@@ -1,3 +1,3 @@
 ====== لا صلاحيات ======
 
-عذرا، ليس مصرح لك الاستمرار، لعلك نسيت تسجيل الدخول؟
\ No newline at end of file
+عذرا، ليس مصرح لك الاستمرار
\ No newline at end of file
diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 157513429..a63e1ed44 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -53,7 +53,7 @@ $lang['btn_register']          = 'سجّل';
 $lang['btn_apply']             = 'طبق';
 $lang['btn_media']             = 'مدير الوسائط';
 $lang['btn_deleteuser']        = 'احذف حسابي الخاص';
-$lang['loggedinas']            = 'داخل باسم';
+$lang['loggedinas']            = 'داخل باسم:';
 $lang['user']                  = 'اسم المستخدم';
 $lang['pass']                  = 'كلمة السر';
 $lang['newpass']               = 'كلمة سر جديدة';
@@ -98,12 +98,12 @@ $lang['license']               = 'مالم يشر لخلاف ذلك، فإن ا�
 $lang['licenseok']             = 'لاحظ: بتحرير هذه الصفحة أنت توافق على ترخيص محتواها تحت الرخصة التالية:';
 $lang['searchmedia']           = 'ابحث في أسماء الملفات:';
 $lang['searchmedia_in']        = 'ابحث في %s';
-$lang['txt_upload']            = 'اختر ملفاً للرفع';
-$lang['txt_filename']          = 'رفع كـ (اختياري)';
+$lang['txt_upload']            = 'اختر ملفاً للرفع:';
+$lang['txt_filename']          = 'رفع كـ (اختياري):';
 $lang['txt_overwrt']           = 'اكتب على ملف موجود';
 $lang['maxuploadsize']         = 'الحجم الاقصى %s للملف';
-$lang['lockedby']              = 'مقفلة حاليا لـ';
-$lang['lockexpire']            = 'ينتهي القفل في';
+$lang['lockedby']              = 'مقفلة حاليا لـ:';
+$lang['lockexpire']            = 'ينتهي القفل في:';
 $lang['js']['willexpire']      = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
 $lang['js']['notsavedyet']     = 'التعديلات غير المحفوظة ستفقد.';
 $lang['js']['searchmedia']     = 'ابحث عن ملفات';
@@ -184,9 +184,9 @@ $lang['diff_type']             = 'أظهر الفروق:';
 $lang['diff_inline']           = 'ضمنا';
 $lang['diff_side']             = 'جنبا إلى جنب';
 $lang['line']                  = 'سطر';
-$lang['breadcrumb']            = 'أثر';
-$lang['youarehere']            = 'أنت هنا';
-$lang['lastmod']               = 'آخر تعديل';
+$lang['breadcrumb']            = 'أثر:';
+$lang['youarehere']            = 'أنت هنا:';
+$lang['lastmod']               = 'آخر تعديل:';
 $lang['by']                    = 'بواسطة';
 $lang['deleted']               = 'حذفت';
 $lang['created']               = 'اُنشئت';
@@ -239,20 +239,20 @@ $lang['admin_register']        = 'أضف مستخدما جديدا';
 $lang['metaedit']              = 'تحرير البيانات الشمولية ';
 $lang['metasaveerr']           = 'فشلت كتابة البيانات الشمولية';
 $lang['metasaveok']            = 'حُفظت البيانات الشمولية';
-$lang['img_backto']            = 'عودة إلى';
-$lang['img_title']             = 'العنوان';
-$lang['img_caption']           = 'وصف';
-$lang['img_date']              = 'التاريخ';
-$lang['img_fname']             = 'اسم الملف';
-$lang['img_fsize']             = 'الحجم';
-$lang['img_artist']            = 'المصور';
-$lang['img_copyr']             = 'حقوق النسخ';
-$lang['img_format']            = 'الهيئة';
-$lang['img_camera']            = 'الكمرا';
-$lang['img_keywords']          = 'كلمات مفتاحية';
-$lang['img_width']             = 'العرض';
-$lang['img_height']            = 'الإرتفاع';
-$lang['img_manager']           = 'اعرض في مدير الوسائط';
+$lang['btn_img_backto']        = 'عودة إلى %s';
+$lang['img_title']             = 'العنوان:';
+$lang['img_caption']           = 'وصف:';
+$lang['img_date']              = 'التاريخ:';
+$lang['img_fname']             = 'اسم الملف:';
+$lang['img_fsize']             = 'الحجم:';
+$lang['img_artist']            = 'المصور:';
+$lang['img_copyr']             = 'حقوق النسخ:';
+$lang['img_format']            = 'الهيئة:';
+$lang['img_camera']            = 'الكمرا:';
+$lang['img_keywords']          = 'كلمات مفتاحية:';
+$lang['img_width']             = 'العرض:';
+$lang['img_height']            = 'الإرتفاع:';
+$lang['btn_mediaManager']           = 'اعرض في مدير الوسائط';
 $lang['subscr_subscribe_success'] = 'اضيف %s لقائمة اشتراك %s';
 $lang['subscr_subscribe_error'] = 'خطأ في إضافة %s لقائمة اشتراك %s';
 $lang['subscr_subscribe_noaddress'] = 'ليس هناك عنوان مرتبط بولوجك، لا يمكن اضافتك لقائمة الاشتراك';
diff --git a/inc/lang/az/denied.txt b/inc/lang/az/denied.txt
index a68b08c8c..c6fddb63a 100644
--- a/inc/lang/az/denied.txt
+++ b/inc/lang/az/denied.txt
@@ -1,3 +1,3 @@
 ====== Müraciət qadağan edilmişdir ======
 
-Sizin bu əməliyyat üçün kifayət qədər haqqınız yoxdur. Bəlkə, Siz sistemə oz istifadəçi adınız ilə girməyi unutmusunuz?
+Sizin bu əməliyyat üçün kifayət qədər haqqınız yoxdur.
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index df54b4f10..5edcfbe58 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -44,7 +44,7 @@ $lang['btn_recover']           = 'Qaralamanı qaytar';
 $lang['btn_draftdel']          = 'Qaralamanı sil';
 $lang['btn_revert']            = 'Qaytar';
 $lang['btn_register']          = 'Qeydiyyatdan keç';
-$lang['loggedinas']            = 'İstifadəcinin adı';
+$lang['loggedinas']            = 'İstifadəcinin adı:';
 $lang['user']                  = 'istifadəci adı';
 $lang['pass']                  = 'Şifrə';
 $lang['newpass']               = 'Yeni şifrə';
@@ -82,10 +82,10 @@ $lang['license']               = 'Fərqli şey göstərilmiş hallardan başqa,
 $lang['licenseok']             = 'Qeyd: bu səhifəni düzəliş edərək, Siz elədiyiniz düzəlişi aşağıda göstərilmiş lisenziyanın şərtlərinə uyğun istifadəsinə razılıq verirsiniz:';
 $lang['searchmedia']           = 'Faylın adına görə axtarış:';
 $lang['searchmedia_in']        = '%s-ın içində axtarış';
-$lang['txt_upload']            = 'Serverə yükləmək üçün fayl seçin';
-$lang['txt_filename']          = 'Faylın wiki-də olan adını daxil edin (mütləq deyil)';
+$lang['txt_upload']            = 'Serverə yükləmək üçün fayl seçin:';
+$lang['txt_filename']          = 'Faylın wiki-də olan adını daxil edin (mütləq deyil):';
 $lang['txt_overwrt']           = 'Mövcud olan faylın üstündən yaz';
-$lang['lockedby']              = 'В данный момент заблокирован Bu an blokdadır';
+$lang['lockedby']              = 'В данный момент заблокирован Bu an blokdadır:';
 $lang['lockexpire']            = 'Blok bitir:';
 $lang['js']['willexpire']            = 'Sizin bu səhifədə dəyişik etmək üçün blokunuz bir dəqiqə ərzində bitəcək.\nMünaqişələrdən yayınmaq və blokun taymerini sıfırlamaq üçün, baxış düyməsini sıxın.';
 $lang['rssfailed']             = 'Aşağıda göstərilmiş xəbər lentini əldə edən zaman xəta baş verdi: ';
@@ -128,9 +128,9 @@ $lang['yours']                 = 'Sizin versiyanız';
 $lang['diff']                  = 'hazırki versiyadan fərqləri göstər';
 $lang['diff2']                 = 'Versiyaların arasındaki fərqləri göstər  ';
 $lang['line']                  = 'Sətr';
-$lang['breadcrumb']            = 'Siz ziyarət etdiniz';
-$lang['youarehere']            = 'Siz burdasınız';
-$lang['lastmod']               = 'Son dəyişiklər';
+$lang['breadcrumb']            = 'Siz ziyarət etdiniz:';
+$lang['youarehere']            = 'Siz burdasınız:';
+$lang['lastmod']               = 'Son dəyişiklər:';
 $lang['by']                    = ' Kimdən';
 $lang['deleted']               = 'silinib';
 $lang['created']               = 'yaranıb';
@@ -172,17 +172,17 @@ $lang['admin_register']        = 'İstifadəçi əlavə et';
 $lang['metaedit']              = 'Meta-məlumatlarda düzəliş et';
 $lang['metasaveerr']           = 'Meta-məlumatları yazan zamanı xəta';
 $lang['metasaveok']            = 'Meta-məlumatlar yadda saxlandı';
-$lang['img_backto']            = 'Qayıd';
-$lang['img_title']             = 'Başlıq';
-$lang['img_caption']           = 'İmza';
-$lang['img_date']              = 'Tarix';
-$lang['img_fname']             = 'Faylın adı';
-$lang['img_fsize']             = 'Boy';
-$lang['img_artist']            = 'Şkilin müəllifi';
-$lang['img_copyr']             = 'Müəllif hüquqları';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Model';
-$lang['img_keywords']          = 'Açar sözlər';
+$lang['btn_img_backto']        = 'Qayıd %s';
+$lang['img_title']             = 'Başlıq:';
+$lang['img_caption']           = 'İmza:';
+$lang['img_date']              = 'Tarix:';
+$lang['img_fname']             = 'Faylın adı:';
+$lang['img_fsize']             = 'Boy:';
+$lang['img_artist']            = 'Şkilin müəllifi:';
+$lang['img_copyr']             = 'Müəllif hüquqları:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Model:';
+$lang['img_keywords']          = 'Açar sözlər:';
 $lang['authtempfail']          = 'İstifadəçilərin autentifikasiyası müvəqqəti dayandırılıb. Əgər bu problem uzun müddət davam edir sə, administrator ilə əlaqə saxlayın.';
 $lang['i_chooselang']          = 'Dili seçin/Language';
 $lang['i_installer']           = 'DokuWiki quraşdırılır';
diff --git a/inc/lang/bg/denied.txt b/inc/lang/bg/denied.txt
index 45ce63769..bd695d46d 100644
--- a/inc/lang/bg/denied.txt
+++ b/inc/lang/bg/denied.txt
@@ -1,4 +1,4 @@
 ====== Отказан достъп ======
 
-Нямате достатъчно права, за да продължите. Може би сте забравили да се впишете?
+Нямате достатъчно права, за да продължите.
 
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index bb74ff1ca..bfa8b2ad7 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -50,8 +50,8 @@ $lang['btn_revert']            = 'Възстановяване';
 $lang['btn_register']          = 'Регистриране';
 $lang['btn_apply']             = 'Прилагане';
 $lang['btn_media']             = 'Диспечер на файлове';
-$lang['btn_deleteuser']        = 'Изтрий профила ми';
-$lang['loggedinas']            = 'Вписани сте като';
+$lang['btn_deleteuser']        = 'Изтриване на профила';
+$lang['loggedinas']            = 'Вписани сте като:';
 $lang['user']                  = 'Потребител';
 $lang['pass']                  = 'Парола';
 $lang['newpass']               = 'Нова парола';
@@ -62,7 +62,7 @@ $lang['fullname']              = 'Истинско име';
 $lang['email']                 = 'Електронна поща';
 $lang['profile']               = 'Потребителски профил';
 $lang['badlogin']              = 'Грешно потребителско име или парола.';
-$lang['badpassconfirm']        = 'Съжаляваме, паролата е грешна';
+$lang['badpassconfirm']        = 'За съжаление паролата е грешна';
 $lang['minoredit']             = 'Промените са незначителни';
 $lang['draftdate']             = 'Черновата е автоматично записана на';
 $lang['nosecedit']             = 'Страницата бе междувременно променена, презареждане на страницата поради неактуална информация.';
@@ -77,13 +77,13 @@ $lang['regpwmail']             = 'Паролата ви за DokuWiki';
 $lang['reghere']               = 'Все още нямате профил? Направете си';
 $lang['profna']                = 'Wiki-то не поддържа промяна на профила';
 $lang['profnochange']          = 'Няма промени.';
-$lang['profnoempty']           = 'Въвеждането на име и ел. поща е задължително';
+$lang['profnoempty']           = 'Въвеждането на име и имейл е задължително';
 $lang['profchanged']           = 'Потребителският профил е обновен успешно.';
-$lang['profnodelete']          = 'Не е възможно изтриване на потребители в това wiki ';
-$lang['profdeleteuser']        = 'Изтрий профила ми';
+$lang['profnodelete']          = 'Изтриването на потребители в това wiki не е възможно';
+$lang['profdeleteuser']        = 'Изтриване на профила';
 $lang['profdeleted']           = 'Вашият профил е премахнат от това wiki ';
-$lang['profconfdelete']        = 'Искам да изтрия профила си от това wiki. <br/>  Веднъж изтрит, профила не може да бъде възстановен!';
-$lang['profconfdeletemissing'] = 'Не и маркирана опцията за потвърждение';
+$lang['profconfdelete']        = 'Искам да изтрия профила си от това wiki. <br/>  Веднъж изтрит, профилът не може да бъде възстановен!';
+$lang['profconfdeletemissing'] = 'Не сте поставили отметка в кутията потвърждение';
 $lang['pwdforget']             = 'Забравили сте паролата си? Получете нова';
 $lang['resendna']              = 'Wiki-то не поддържа повторно пращане на паролата.';
 $lang['resendpwd']             = 'Задаване на нова парола за';
@@ -96,12 +96,12 @@ $lang['license']               = 'Ако не е посочено друго, с
 $lang['licenseok']             = 'Бележка: Редактирайки страницата, Вие се съгласявате да лицензирате промените (които сте направили) под следния лиценз:';
 $lang['searchmedia']           = 'Търсене на файл: ';
 $lang['searchmedia_in']        = 'Търсене в %s';
-$lang['txt_upload']            = 'Изберете файл за качване';
-$lang['txt_filename']          = 'Качи като (незадължително)';
+$lang['txt_upload']            = 'Изберете файл за качване:';
+$lang['txt_filename']          = 'Качи като (незадължително):';
 $lang['txt_overwrt']           = 'Презапиши съществуващите файлове';
 $lang['maxuploadsize']         = 'Макс. размер за отделните файлове е %s.';
-$lang['lockedby']              = 'В момента е заключена от';
-$lang['lockexpire']            = 'Ще бъде отключена на';
+$lang['lockedby']              = 'В момента е заключена от:';
+$lang['lockexpire']            = 'Ще бъде отключена на:';
 $lang['js']['willexpire']      = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
 $lang['js']['notsavedyet']     = 'Незаписаните промени ще бъдат загубени. Желаете ли да продължите?';
 $lang['js']['searchmedia']     = 'Търсене на файлове';
@@ -140,7 +140,7 @@ $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_drop']      = 'Влачете и пуснете файлове тук, за да бъдат качени';
 $lang['js']['media_cancel']    = 'премахване';
 $lang['js']['media_overwrt']   = 'Презапиши съществуващите файлове';
 $lang['rssfailed']             = 'Възникна грешка при получаването на емисията: ';
@@ -164,7 +164,7 @@ $lang['accessdenied']          = 'Нямате необходимите прав
 $lang['mediausage']            = 'Ползвайте следния синтаксис, за да упоменете файла:';
 $lang['mediaview']             = 'Преглед на оригиналния файл';
 $lang['mediaroot']             = 'root';
-$lang['mediaupload']           = 'Качете файл в текущото именно пространство. За създаване на подимено пространство, добавете име преди това на файла като ги разделите с двоеточие в полето "Качи като"';
+$lang['mediaupload']           = 'Качете файл в текущото именно пространство. За създаване на подименно пространство, добавете име преди това на файла като ги разделите с двоеточие в полето "Качи като"';
 $lang['mediaextchange']        = 'Разширението на файла е сменено от .%s на .%s!';
 $lang['reference']             = 'Връзки за';
 $lang['ref_inuse']             = 'Файлът не може да бъде изтрит, защото все още се ползва от следните страници:';
@@ -181,9 +181,9 @@ $lang['diff_type']             = 'Преглед на разликите:';
 $lang['diff_inline']           = 'Вграден';
 $lang['diff_side']             = 'Един до друг';
 $lang['line']                  = 'Ред';
-$lang['breadcrumb']            = 'Следа';
-$lang['youarehere']            = 'Намирате се в';
-$lang['lastmod']               = 'Последна промяна';
+$lang['breadcrumb']            = 'Следа:';
+$lang['youarehere']            = 'Намирате се в:';
+$lang['lastmod']               = 'Последна промяна:';
 $lang['by']                    = 'от';
 $lang['deleted']               = 'изтрита';
 $lang['created']               = 'създадена';
@@ -236,23 +236,23 @@ $lang['admin_register']        = 'Добавяне на нов потребит�
 $lang['metaedit']              = 'Редактиране на метаданни';
 $lang['metasaveerr']           = 'Записването на метаданните се провали';
 $lang['metasaveok']            = 'Метаданните са запазени успешно';
-$lang['img_backto']            = 'Назад към';
-$lang['img_title']             = 'Заглавие';
-$lang['img_caption']           = 'Надпис';
-$lang['img_date']              = 'Дата';
-$lang['img_fname']             = 'Име на файла';
-$lang['img_fsize']             = 'Размер';
-$lang['img_artist']            = 'Фотограф';
-$lang['img_copyr']             = 'Авторско право';
-$lang['img_format']            = 'Формат';
-$lang['img_camera']            = 'Фотоапарат';
-$lang['img_keywords']          = 'Ключови думи';
-$lang['img_width']             = 'Ширина';
-$lang['img_height']            = 'Височина';
-$lang['img_manager']           = 'Преглед в диспечера на файлове';
+$lang['btn_img_backto']        = 'Назад към %s';
+$lang['img_title']             = 'Заглавие:';
+$lang['img_caption']           = 'Надпис:';
+$lang['img_date']              = 'Дата:';
+$lang['img_fname']             = 'Име на файла:';
+$lang['img_fsize']             = 'Размер:';
+$lang['img_artist']            = 'Фотограф:';
+$lang['img_copyr']             = 'Авторско право:';
+$lang['img_format']            = 'Формат:';
+$lang['img_camera']            = 'Фотоапарат:';
+$lang['img_keywords']          = 'Ключови думи:';
+$lang['img_width']             = 'Ширина:';
+$lang['img_height']            = 'Височина:';
+$lang['btn_mediaManager']      = 'Преглед в диспечера на файлове';
 $lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s';
 $lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s';
-$lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (на ел. поща) с профила ви.';
+$lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (имейл) с профила ви.';
 $lang['subscr_unsubscribe_success'] = '%s е премахнат от списъка с абониралите се за %s';
 $lang['subscr_unsubscribe_error'] = 'Грешка при премахването на %s от списъка с абониралите се за %s';
 $lang['subscr_already_subscribed'] = '%s е вече абониран за %s';
@@ -263,12 +263,12 @@ $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']   = 'на ел. писмо с обобщение на промените във всяка страница (всеки %.2f дни)';
-$lang['subscr_style_list']     = 'на списък с променените страници от последното ел. писмо (всеки %.2f дни)';
+$lang['subscr_style_every']    = 'на имейл при всяка промяна';
+$lang['subscr_style_digest']   = 'на имейл с обобщение на промените във всяка страница (всеки %.2f дни)';
+$lang['subscr_style_list']     = 'на списък с променените страници от последния имейл (всеки %.2f дни)';
 $lang['authtempfail']          = 'Удостоверяването на потребители не е възможно за момента. Ако продължи дълго, моля уведомете администратора на Wiki страницата.';
-$lang['authpwdexpire']         = 'Срока на паролата ви ще изтече след %d дни. Препорачително е да я смените по-скоро.';
-$lang['i_chooselang']          = 'Изберете вашия изик';
+$lang['authpwdexpire']         = 'Срока на паролата ви ще изтече след %d дни. Препоръчително е да я смените по-скоро.';
+$lang['i_chooselang']          = 'Изберете вашия език';
 $lang['i_installer']           = 'Инсталатор на DokuWiki';
 $lang['i_wikiname']            = 'Име на Wiki-то';
 $lang['i_enableacl']           = 'Ползване на списък за достъп (ACL) [препоръчително]';
diff --git a/inc/lang/bg/register.txt b/inc/lang/bg/register.txt
index 51fbb83fe..333428005 100644
--- a/inc/lang/bg/register.txt
+++ b/inc/lang/bg/register.txt
@@ -1,4 +1,4 @@
 ====== Регистриране като нов потребител ======
 
-Моля, попълнете всичките полета отдолу, за да бъде създаден нов профил. Уверете се, че въведеният **адрес на ел. поща е правилен**. Ако няма поле за парола, ще ви бъде изпратена такава на въведения адрес. Потребителското име трябва да бъде валидно [[doku>pagename|име на страница]].
+Моля, попълнете всичките полета отдолу, за да бъде създаден нов профил. Уверете се, че въведеният **имейл адрес е правилен**. Ако няма поле за парола, ще ви бъде изпратена такава на въведения адрес. Потребителското име трябва да бъде валидно [[doku>pagename|име на страница]].
 
diff --git a/inc/lang/bg/resendpwd.txt b/inc/lang/bg/resendpwd.txt
index 38e2d1fe4..19dffc070 100644
--- a/inc/lang/bg/resendpwd.txt
+++ b/inc/lang/bg/resendpwd.txt
@@ -1,3 +1,3 @@
 ====== Пращане на нова парола ======
 
-Моля, въведете потребителското си име във формата по-долу, ако желаете да получите нова парола. По ел. поща ще получите линк, с който да потвърдите.
+Моля, въведете потребителското си име във формата по-долу, ако желаете да получите нова парола. Чрез имейл ще получите линк, с който да потвърдите.
diff --git a/inc/lang/bn/denied.txt b/inc/lang/bn/denied.txt
index 711275bad..5ba0fcf4f 100644
--- a/inc/lang/bn/denied.txt
+++ b/inc/lang/bn/denied.txt
@@ -1,3 +1,3 @@
 ====== অনুমতি অস্বীকার =====
 
-দুঃখিত, আপনি কি এগিয়ে যেতে যথেষ্ট অধিকার নেই. সম্ভবত আপনি লগইন ভুলে গেছেন?
\ No newline at end of file
+দুঃখিত, আপনি কি এগিয়ে যেতে যথেষ্ট অধিকার নেই.
\ No newline at end of file
diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php
index 5d9ee59a0..2791bd50d 100644
--- a/inc/lang/bn/lang.php
+++ b/inc/lang/bn/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Foysol <ragebot1125@gmail.com>
  * @author ninetailz <ninetailz1125@gmail.com>
+ * @author Khan M. B. Asad <muhammad2017@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'itr';
@@ -49,7 +50,7 @@ $lang['btn_register']          = 'খাতা';
 $lang['btn_apply']             = 'প্রয়োগ করা';
 $lang['btn_media']             = 'মিডিয়া ম্যানেজার';
 $lang['btn_deleteuser']        = 'আমার অ্যাকাউন্ট অপসারণ করুন';
-$lang['loggedinas']            = 'লগ ইন';
+$lang['loggedinas']            = 'লগ ইন:';
 $lang['user']                  = 'ইউজারনেম';
 $lang['pass']                  = 'পাসওয়ার্ড';
 $lang['newpass']               = 'নতুন পাসওয়ার্ড';
@@ -95,12 +96,12 @@ $lang['license']               = 'অন্যথায় নোট যেখ�
 $lang['licenseok']             = 'দ্রষ্টব্য: আপনি নিম্নলিখিত লাইসেন্সের অধীনে আপনার বিষয়বস্তু লাইসেন্স সম্মত হন এই পৃষ্ঠার সম্পাদনার দ্বারা:';
 $lang['searchmedia']           = 'অনুসন্ধান ফাইলের নাম:';
 $lang['searchmedia_in']        = 'অনুসন্ধান %s -এ';
-$lang['txt_upload']            = 'আপলোড করার জন্য নির্বাচন করুন ফাইল';
-$lang['txt_filename']          = 'হিসাবে আপলোড করুন (ঐচ্ছিক)';
+$lang['txt_upload']            = 'আপলোড করার জন্য নির্বাচন করুন ফাইল:';
+$lang['txt_filename']          = 'হিসাবে আপলোড করুন (ঐচ্ছিক):';
 $lang['txt_overwrt']           = 'বিদ্যমান ফাইল মুছে যাবে';
 $lang['maxuploadsize']         = 'সর্বোচ্চ আপলোড করুন. %s-ফাইলের প্রতি.';
-$lang['lockedby']              = 'বর্তমানে দ্বারা লক';
-$lang['lockexpire']            = 'তালা এ মেয়াদ শেষ';
+$lang['lockedby']              = 'বর্তমানে দ্বারা লক:';
+$lang['lockexpire']            = 'তালা এ মেয়াদ শেষ:';
 $lang['js']['willexpire']      = 'এই পৃষ্ঠার সম্পাদনার জন্য আপনার লক এক মিনিটের মধ্যে মেয়াদ শেষ সম্পর্কে. \ দ্বন্দ্ব লক টাইমার রিসেট প্রিভিউ বাটন ব্যবহার এড়াতে.';
 $lang['js']['notsavedyet']     = 'অসংরক্ষিত পরিবর্তন হারিয়ে যাবে.';
 $lang['js']['searchmedia']     = 'ফাইলের জন্য অনুসন্ধান';
@@ -117,3 +118,43 @@ $lang['js']['mediadisplayimg'] = 'ছবিটি দেখান';
 $lang['js']['mediadisplaylnk'] = 'শুধুমাত্র লিঙ্ক দেখান';
 $lang['js']['mediasmall']      = 'ক্ষুদ্র সংস্করণ';
 $lang['js']['mediamedium']     = 'মাধ্যম সংস্করণ';
+$lang['js']['medialarge']      = 'বড় সংস্করণ';
+$lang['js']['mediaoriginal']   = 'আসল সংস্করণ';
+$lang['js']['medialnk']        = 'বিস্তারিত পৃষ্ঠায় লিংক';
+$lang['js']['mediadirect']     = 'মূল সরাসরি লিঙ্ক';
+$lang['js']['medianolnk']      = 'কোনো লিঙ্ক নাই';
+$lang['js']['medianolink']     = 'ইমেজ লিঙ্ক কোরো না';
+$lang['js']['medialeft']       = 'বাম দিকে ইমেজ সারিবদ্ধ কর';
+$lang['js']['mediaright']      = 'ডান দিকে ইমেজ সারিবদ্ধ কর';
+$lang['js']['mediacenter']     = 'মাঝখানে ইমেজ সারিবদ্ধ কর';
+$lang['js']['medianoalign']    = 'কোনো সারিবদ্ধ করা প্রয়োজন নেই';
+$lang['js']['nosmblinks']      = 'উইন্ডোস শেয়ার এর সাথে সংযোগ সাধন কেবল মাইক্রোসফ্ট ইন্টারনেট এক্সপ্লোরারেই সম্ভব।\nতবে আপনি লিংকটি কপি পেস্ট করতেই পারেন।';
+$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']             = 'ফিডটি জোগাড় করতে গিয়ে একটি ত্রুটি ঘটেছে:';
+$lang['nothingfound']          = 'কিছু পাওয়া যায়নি।';
+$lang['mediaselect']           = 'মিডিয়া ফাইল';
+$lang['fileupload']            = 'মিডিয়া ফাইল আপলোড';
+$lang['uploadsucc']            = 'আপলোড সফল';
+$lang['uploadfail']            = 'আপলোড ব্যর্থ। অনুমতি জনিত ত্রুটি কী?';
+$lang['uploadwrong']           = 'আপলোড প্রত্যাখ্যাত। এই ফাইল এক্সটেনশন অননুমোদিত।';
+$lang['uploadexist']           = 'ফাইল ইতিমধ্যেই বিরাজমান। কিছু করা হয়নি।';
+$lang['uploadbadcontent']      = 'আপলোডকৃত সামগ্রী %s ফাইল এক্সটেনশন এর সাথে মিলেনি।';
+$lang['uploadspam']            = 'স্প্যাম ব্ল্যাকলিস্ট আপলোড আটকে দিয়েছে।';
+$lang['uploadxss']             = 'সামগ্রীটি ক্ষতিকর ভেবে আপলোড আটকে দেয়া হয়েছে।';
+$lang['uploadsize']            = 'আপলোডকৃত ফাইলটি বেশি বড়ো। (সর্বোচ্চ %s)';
+$lang['deletesucc']            = '"%s" ফাইলটি মুছে ফেলা হয়েছে।';
+$lang['deletefail']            = '"%s" ডিলিট করা যায়নি - অনুমতি আছে কি না দেখুন।';
+$lang['mediainuse']            = '"%s" ফাইলটি মোছা হয়নি - এটি এখনো ব্যবহৃত হচ্ছে।';
diff --git a/inc/lang/ca-valencia/denied.txt b/inc/lang/ca-valencia/denied.txt
index 39c45d946..6640e07f5 100644
--- a/inc/lang/ca-valencia/denied.txt
+++ b/inc/lang/ca-valencia/denied.txt
@@ -1,4 +1,4 @@
 ====== Permís denegat ======
 
-Disculpe, pero no té permís per a continuar. ¿Haurà oblidat iniciar sessió?
+Disculpe, pero no té permís per a continuar.
 
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index 9ab423783..98607d322 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -45,7 +45,7 @@ $lang['btn_recover']           = 'Recuperar borrador';
 $lang['btn_draftdel']          = 'Borrar borrador';
 $lang['btn_revert']            = 'Recuperar';
 $lang['btn_register']          = 'Registrar-se';
-$lang['loggedinas']            = 'Sessió de';
+$lang['loggedinas']            = 'Sessió de:';
 $lang['user']                  = 'Nom d\'usuari';
 $lang['pass']                  = 'Contrasenya';
 $lang['newpass']               = 'Contrasenya nova';
@@ -83,11 +83,11 @@ $lang['license']               = 'Excepte quan s\'indique una atra cosa, el cont
 $lang['licenseok']             = 'Nota: a l\'editar esta pàgina accepta llicenciar el seu contingut baix la següent llicència:';
 $lang['searchmedia']           = 'Buscar nom d\'archiu:';
 $lang['searchmedia_in']        = 'Buscar en %s';
-$lang['txt_upload']            = 'Seleccione l\'archiu que vol pujar';
-$lang['txt_filename']          = 'Enviar com (opcional)';
+$lang['txt_upload']            = 'Seleccione l\'archiu que vol pujar:';
+$lang['txt_filename']          = 'Enviar com (opcional):';
 $lang['txt_overwrt']           = 'Sobreescriure archius existents';
-$lang['lockedby']              = 'Actualment bloquejat per';
-$lang['lockexpire']            = 'El bloqueig venç a les';
+$lang['lockedby']              = 'Actualment bloquejat per:';
+$lang['lockexpire']            = 'El bloqueig venç a les:';
 $lang['js']['willexpire']            = 'El seu bloqueig per a editar esta pàgina vencerà en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia i reiniciarà el contador.';
 $lang['js']['notsavedyet']     = 'Els canvis no guardats es perdran.\n¿Segur que vol continuar?';
 $lang['rssfailed']             = 'Ha ocorregut un erro al solicitar este canal: ';
@@ -130,9 +130,9 @@ $lang['yours']                 = 'La seua versió';
 $lang['diff']                  = 'Mostrar diferències en la versió actual';
 $lang['diff2']                 = 'Mostrar diferències entre versions';
 $lang['line']                  = 'Llínea';
-$lang['breadcrumb']            = 'Traça';
-$lang['youarehere']            = 'Vosté està ací';
-$lang['lastmod']               = 'Última modificació el';
+$lang['breadcrumb']            = 'Traça:';
+$lang['youarehere']            = 'Vosté està ací:';
+$lang['lastmod']               = 'Última modificació el:';
 $lang['by']                    = 'per';
 $lang['deleted']               = 'borrat';
 $lang['created']               = 'creat';
@@ -174,17 +174,17 @@ $lang['admin_register']        = 'Afegir nou usuari';
 $lang['metaedit']              = 'Editar meta-senyes';
 $lang['metasaveerr']           = 'Erro escrivint meta-senyes';
 $lang['metasaveok']            = 'Meta-senyes guardades';
-$lang['img_backto']            = 'Tornar a';
-$lang['img_title']             = 'Títul';
-$lang['img_caption']           = 'Subtítul';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nom de l\'archiu';
-$lang['img_fsize']             = 'Tamany';
-$lang['img_artist']            = 'Fotógraf';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Càmara';
-$lang['img_keywords']          = 'Paraules clau';
+$lang['btn_img_backto']        = 'Tornar a %s';
+$lang['img_title']             = 'Títul:';
+$lang['img_caption']           = 'Subtítul:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nom de l\'archiu:';
+$lang['img_fsize']             = 'Tamany:';
+$lang['img_artist']            = 'Fotógraf:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Càmara:';
+$lang['img_keywords']          = 'Paraules clau:';
 $lang['authtempfail']          = 'L\'autenticació d\'usuaris està desactivada temporalment. Si la situació persistix, per favor, informe a l\'administrador del Wiki.';
 $lang['i_chooselang']          = 'Trie l\'idioma';
 $lang['i_installer']           = 'Instalador de DokuWiki';
diff --git a/inc/lang/ca/denied.txt b/inc/lang/ca/denied.txt
index e6125e83b..3f66d6bb6 100644
--- a/inc/lang/ca/denied.txt
+++ b/inc/lang/ca/denied.txt
@@ -1,4 +1,4 @@
 ====== Permís denegat ======
 
-No teniu prou drets per continuar. Potser us heu descuidat d'entrar?
+No teniu prou drets per continuar.
 
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index fd19c6834..00d28083c 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -48,7 +48,7 @@ $lang['btn_draftdel']          = 'Suprimeix esborrany';
 $lang['btn_revert']            = 'Restaura';
 $lang['btn_register']          = 'Registra\'m';
 $lang['btn_apply']             = 'Aplica';
-$lang['loggedinas']            = 'Heu entrat com';
+$lang['loggedinas']            = 'Heu entrat com:';
 $lang['user']                  = 'Nom d\'usuari';
 $lang['pass']                  = 'Contrasenya';
 $lang['newpass']               = 'Nova contrasenya';
@@ -87,8 +87,8 @@ $lang['license']               = 'Excepte on es digui una altra cosa, el conting
 $lang['licenseok']             = 'Nota. En editar aquesta pàgina esteu acceptant que el vostre contingut estigui subjecte a la llicència següent:';
 $lang['searchmedia']           = 'Cerca pel nom de fitxer';
 $lang['searchmedia_in']        = 'Cerca en: %s';
-$lang['txt_upload']            = 'Trieu el fitxer que voleu penjar';
-$lang['txt_filename']          = 'Introduïu el nom wiki (opcional)';
+$lang['txt_upload']            = 'Trieu el fitxer que voleu penjar:';
+$lang['txt_filename']          = 'Introduïu el nom wiki (opcional):';
 $lang['txt_overwrt']           = 'Sobreescriu el fitxer actual';
 $lang['maxuploadsize']         = 'Puja com a màxim %s per arxiu.';
 $lang['lockedby']              = 'Actualment blocat per:';
@@ -174,9 +174,9 @@ $lang['diff_type']             = 'Veieu les diferències:';
 $lang['diff_inline']           = 'En línia';
 $lang['diff_side']             = 'Un al costat de l\'altre';
 $lang['line']                  = 'Línia';
-$lang['breadcrumb']            = 'Camí';
-$lang['youarehere']            = 'Sou aquí';
-$lang['lastmod']               = 'Darrera modificació';
+$lang['breadcrumb']            = 'Camí:';
+$lang['youarehere']            = 'Sou aquí:';
+$lang['lastmod']               = 'Darrera modificació:';
 $lang['by']                    = 'per';
 $lang['deleted']               = 'suprimit';
 $lang['created']               = 'creat';
@@ -228,19 +228,19 @@ $lang['admin_register']        = 'Afegeix nou usuari';
 $lang['metaedit']              = 'Edita metadades';
 $lang['metasaveerr']           = 'No s\'han pogut escriure les metadades';
 $lang['metasaveok']            = 'S\'han desat les metadades';
-$lang['img_backto']            = 'Torna a';
-$lang['img_title']             = 'Títol';
-$lang['img_caption']           = 'Peu d\'imatge';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nom de fitxer';
-$lang['img_fsize']             = 'Mida';
-$lang['img_artist']            = 'Fotògraf';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Càmera';
-$lang['img_keywords']          = 'Paraules clau';
-$lang['img_width']             = 'Ample';
-$lang['img_height']            = 'Alçada';
+$lang['btn_img_backto']        = 'Torna a %s';
+$lang['img_title']             = 'Títol:';
+$lang['img_caption']           = 'Peu d\'imatge:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nom de fitxer:';
+$lang['img_fsize']             = 'Mida:';
+$lang['img_artist']            = 'Fotògraf:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Càmera:';
+$lang['img_keywords']          = 'Paraules clau:';
+$lang['img_width']             = 'Ample:';
+$lang['img_height']            = 'Alçada:';
 $lang['subscr_subscribe_success'] = 'S\'ha afegit %s a la llista de subscripcions per %s';
 $lang['subscr_subscribe_error'] = 'Hi ha hagut un error a l\'afegir %s a la llista per %s';
 $lang['subscr_subscribe_noaddress'] = 'No hi ha cap adreça associada pel vostre nom d\'usuari, no podeu ser afegit a la llista de subscripcions';
diff --git a/inc/lang/cs/denied.txt b/inc/lang/cs/denied.txt
index 00a8811de..29524e5db 100644
--- a/inc/lang/cs/denied.txt
+++ b/inc/lang/cs/denied.txt
@@ -1,3 +1,3 @@
 ====== Nepovolená akce ======
 
-Promiňte, ale nemáte dostatečná oprávnění k této činnosti. Možná jste se zapomněli přihlásit?
+Promiňte, ale nemáte dostatečná oprávnění k této činnosti.
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index a0f69b3dc..fa0a65044 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -15,8 +15,8 @@
  * @author Jakub A. Těšínský (j@kub.cz)
  * @author mkucera66@seznam.cz
  * @author Zbyněk Křivka <krivka@fit.vutbr.cz>
- * @author Gerrit Uitslag <klapinklapin@gmail.com>
  * @author Petr Klíma <qaxi@seznam.cz>
+ * @author Radovan Buroň <radovan@buron.cz>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -61,7 +61,9 @@ $lang['btn_register']          = 'Registrovat';
 $lang['btn_apply']             = 'Použít';
 $lang['btn_media']             = 'Správa médií';
 $lang['btn_deleteuser']        = 'Odstranit můj účet';
-$lang['loggedinas']            = 'Přihlášen(a) jako';
+$lang['btn_img_backto']        = 'Zpět na %s';
+$lang['btn_mediaManager']      = 'Zobrazit ve správě médií';
+$lang['loggedinas']            = 'Přihlášen(a) jako:';
 $lang['user']                  = 'Uživatelské jméno';
 $lang['pass']                  = 'Heslo';
 $lang['newpass']               = 'Nové heslo';
@@ -106,8 +108,8 @@ $lang['license']               = 'Kromě míst, kde je explicitně uvedeno jinak
 $lang['licenseok']             = 'Poznámka: Tím, že editujete tuto stránku, souhlasíte, aby váš obsah byl licencován pod následující licencí:';
 $lang['searchmedia']           = 'Hledat jméno souboru:';
 $lang['searchmedia_in']        = 'Hledat v %s';
-$lang['txt_upload']            = 'Vyberte soubor jako přílohu';
-$lang['txt_filename']          = 'Wiki jméno (volitelné)';
+$lang['txt_upload']            = 'Vyberte soubor jako přílohu:';
+$lang['txt_filename']          = 'Wiki jméno (volitelné):';
 $lang['txt_overwrt']           = 'Přepsat existující soubor';
 $lang['maxuploadsize']         = 'Max. velikost souboru %s';
 $lang['lockedby']              = 'Právě zamknuto:';
@@ -193,9 +195,9 @@ $lang['diff_type']             = 'Zobrazit rozdíly:';
 $lang['diff_inline']           = 'Vložené';
 $lang['diff_side']             = 'Přidané';
 $lang['line']                  = 'Řádek';
-$lang['breadcrumb']            = 'Historie';
-$lang['youarehere']            = 'Umístění';
-$lang['lastmod']               = 'Poslední úprava';
+$lang['breadcrumb']            = 'Historie:';
+$lang['youarehere']            = 'Umístění:';
+$lang['lastmod']               = 'Poslední úprava:';
 $lang['by']                    = 'autor:';
 $lang['deleted']               = 'odstraněno';
 $lang['created']               = 'vytvořeno';
@@ -248,20 +250,18 @@ $lang['admin_register']        = 'Přidat nového uživatele';
 $lang['metaedit']              = 'Upravit Metadata';
 $lang['metasaveerr']           = 'Chyba při zápisu metadat';
 $lang['metasaveok']            = 'Metadata uložena';
-$lang['img_backto']            = 'Zpět na';
-$lang['img_title']             = 'Titulek';
-$lang['img_caption']           = 'Popis';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Jméno souboru';
-$lang['img_fsize']             = 'Velikost';
-$lang['img_artist']            = 'Autor fotografie';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formát';
-$lang['img_camera']            = 'Typ fotoaparátu';
-$lang['img_keywords']          = 'Klíčová slova';
-$lang['img_width']             = 'Šířka';
-$lang['img_height']            = 'Výška';
-$lang['img_manager']           = 'Zobrazit ve správě médií';
+$lang['img_title']             = 'Titulek:';
+$lang['img_caption']           = 'Popis:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Jméno souboru:';
+$lang['img_fsize']             = 'Velikost:';
+$lang['img_artist']            = 'Autor fotografie:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formát:';
+$lang['img_camera']            = 'Typ fotoaparátu:';
+$lang['img_keywords']          = 'Klíčová slova:';
+$lang['img_width']             = 'Šířka:';
+$lang['img_height']            = 'Výška:';
 $lang['subscr_subscribe_success'] = '%s byl přihlášen do seznamu odběratelů %s';
 $lang['subscr_subscribe_error'] = 'Došlo k chybě při přihlašování %s do seznamu odběratelů %s';
 $lang['subscr_subscribe_noaddress'] = 'K Vašemu loginu neexistuje žádná adresa, nemohl jste být přihlášen do seznamu odběratelů.';
diff --git a/inc/lang/da/denied.txt b/inc/lang/da/denied.txt
index a4fa8b88f..7bf3b8b9b 100644
--- a/inc/lang/da/denied.txt
+++ b/inc/lang/da/denied.txt
@@ -1,3 +1,3 @@
 ====== Adgang nægtet! ======
 
-Du har ikke rettigheder til at fortsætte. Måske er du ikke logget ind.
+Du har ikke rettigheder til at fortsætte.
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index eb50bb240..3f06bf758 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -61,7 +61,7 @@ $lang['btn_register']          = 'Registrér';
 $lang['btn_apply']             = 'Anvend';
 $lang['btn_media']             = 'Media Manager';
 $lang['btn_deleteuser']        = 'Fjern Min Konto';
-$lang['loggedinas']            = 'Logget ind som';
+$lang['loggedinas']            = 'Logget ind som:';
 $lang['user']                  = 'Brugernavn';
 $lang['pass']                  = 'Adgangskode';
 $lang['newpass']               = 'Ny adgangskode';
@@ -105,12 +105,12 @@ $lang['license']               = 'Med mindre andet angivet, vil indhold på denn
 $lang['licenseok']             = 'Note: ved at ændre denne side, acceptere du at dit indhold bliver frigivet under følgende licens:';
 $lang['searchmedia']           = 'Søg filnavn';
 $lang['searchmedia_in']        = 'Søg i %s';
-$lang['txt_upload']            = 'Vælg den fil der skal overføres';
-$lang['txt_filename']          = 'Indtast wikinavn (valgfrit)';
+$lang['txt_upload']            = 'Vælg den fil der skal overføres:';
+$lang['txt_filename']          = 'Indtast wikinavn (valgfrit):';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['maxuploadsize']         = 'Upload max. %s pr. fil.';
-$lang['lockedby']              = 'Midlertidig låst af';
-$lang['lockexpire']            = 'Lås udløber kl.';
+$lang['lockedby']              = 'Midlertidig låst af:';
+$lang['lockexpire']            = 'Lås udløber kl:.';
 $lang['js']['willexpire']      = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
 $lang['js']['notsavedyet']     = 'Ugemte ændringer vil blive mistet
 Fortsæt alligevel?';
@@ -191,9 +191,9 @@ $lang['diff_type']             = 'Vis forskelle:';
 $lang['diff_inline']           = 'Indeni';
 $lang['diff_side']             = 'Side ved Side';
 $lang['line']                  = 'Linje';
-$lang['breadcrumb']            = 'Sti';
-$lang['youarehere']            = 'Du er her';
-$lang['lastmod']               = 'Sidst ændret';
+$lang['breadcrumb']            = 'Sti:';
+$lang['youarehere']            = 'Du er her:';
+$lang['lastmod']               = 'Sidst ændret:';
 $lang['by']                    = 'af';
 $lang['deleted']               = 'slettet';
 $lang['created']               = 'oprettet';
@@ -246,20 +246,20 @@ $lang['admin_register']        = 'Tilføj ny bruger';
 $lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Skrivning af metadata fejlede';
 $lang['metasaveok']            = 'Metadata gemt';
-$lang['img_backto']            = 'Tilbage til';
-$lang['img_title']             = 'Titel';
-$lang['img_caption']           = 'Billedtekst';
-$lang['img_date']              = 'Dato';
-$lang['img_fname']             = 'Filnavn';
-$lang['img_fsize']             = 'Størrelse';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Ophavsret';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Emneord';
-$lang['img_width']             = 'Bredde';
-$lang['img_height']            = 'Højde';
-$lang['img_manager']           = 'Vis i Media Manager';
+$lang['btn_img_backto']            = 'Tilbage til %s';
+$lang['img_title']             = 'Titel:';
+$lang['img_caption']           = 'Billedtekst:';
+$lang['img_date']              = 'Dato:';
+$lang['img_fname']             = 'Filnavn:';
+$lang['img_fsize']             = 'Størrelse:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Ophavsret:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Emneord:';
+$lang['img_width']             = 'Bredde:';
+$lang['img_height']            = 'Højde:';
+$lang['btn_mediaManager']           = 'Vis i Media Manager';
 $lang['subscr_subscribe_success'] = 'Tilføjede %s til abonnement listen for %s';
 $lang['subscr_subscribe_error'] = 'Fejl ved tilføjelse af %s til abonnement listen for %s';
 $lang['subscr_subscribe_noaddress'] = 'Der er ikke nogen addresse forbundet til din bruger, så du kan ikke blive tilføjet til abonnement listen';
diff --git a/inc/lang/de-informal/denied.txt b/inc/lang/de-informal/denied.txt
index 0bc0e59a8..99004f6e1 100644
--- a/inc/lang/de-informal/denied.txt
+++ b/inc/lang/de-informal/denied.txt
@@ -1,4 +1,4 @@
 ====== Zugang verweigert ======
 
-Du hast nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. Eventuell bist du nicht am Wiki angemeldet?
+Du hast nicht die erforderliche Berechtigung, um diese Aktion durchzuführen.
 
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index be3f14a18..c81109580 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -66,7 +66,7 @@ $lang['btn_register']          = 'Registrieren';
 $lang['btn_apply']             = 'Übernehmen';
 $lang['btn_media']             = 'Medien-Manager';
 $lang['btn_deleteuser']        = 'Benutzerprofil löschen';
-$lang['loggedinas']            = 'Angemeldet als';
+$lang['loggedinas']            = 'Angemeldet als:';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
 $lang['newpass']               = 'Neues Passwort';
@@ -111,12 +111,12 @@ $lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt
 $lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite gibst du dein Einverständnis, dass dein Inhalt unter der folgenden Lizenz veröffentlicht wird:';
 $lang['searchmedia']           = 'Suche nach Datei:';
 $lang['searchmedia_in']        = 'Suche in %s';
-$lang['txt_upload']            = 'Datei zum Hochladen auswählen';
-$lang['txt_filename']          = 'Hochladen als (optional)';
+$lang['txt_upload']            = 'Datei zum Hochladen auswählen:';
+$lang['txt_filename']          = 'Hochladen als (optional):';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['maxuploadsize']         = 'Max. %s pro Datei-Upload.';
-$lang['lockedby']              = 'Momentan gesperrt von';
-$lang['lockexpire']            = 'Sperre läuft ab am';
+$lang['lockedby']              = 'Momentan gesperrt von:';
+$lang['lockexpire']            = 'Sperre läuft ab am:';
 $lang['js']['willexpire']      = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche nach Dateien';
@@ -196,9 +196,9 @@ $lang['diff_type']             = 'Unterschiede anzeigen:';
 $lang['diff_inline']           = 'Inline';
 $lang['diff_side']             = 'Side by Side';
 $lang['line']                  = 'Zeile';
-$lang['breadcrumb']            = 'Zuletzt angesehen';
-$lang['youarehere']            = 'Du befindest dich hier';
-$lang['lastmod']               = 'Zuletzt geändert';
+$lang['breadcrumb']            = 'Zuletzt angesehen:';
+$lang['youarehere']            = 'Du befindest dich hier:';
+$lang['lastmod']               = 'Zuletzt geändert:';
 $lang['by']                    = 'von';
 $lang['deleted']               = 'gelöscht';
 $lang['created']               = 'angelegt';
@@ -251,20 +251,20 @@ $lang['admin_register']        = 'Neuen Benutzer anmelden';
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
-$lang['img_backto']            = 'Zurück zu';
-$lang['img_title']             = 'Titel';
-$lang['img_caption']           = 'Bildunterschrift';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Dateiname';
-$lang['img_fsize']             = 'Größe';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Schlagwörter';
-$lang['img_width']             = 'Breite';
-$lang['img_height']            = 'Höhe';
-$lang['img_manager']           = 'Im Medien-Manager anzeigen';
+$lang['btn_img_backto']            = 'Zurück zu %s';
+$lang['img_title']             = 'Titel:';
+$lang['img_caption']           = 'Bildunterschrift:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Dateiname:';
+$lang['img_fsize']             = 'Größe:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Schlagwörter:';
+$lang['img_width']             = 'Breite:';
+$lang['img_height']            = 'Höhe:';
+$lang['btn_mediaManager']           = 'Im Medien-Manager anzeigen';
 $lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementliste von %s hinzugefügt';
 $lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementliste von %s';
 $lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden';
diff --git a/inc/lang/de/denied.txt b/inc/lang/de/denied.txt
index 8efa81f1b..db3343876 100644
--- a/inc/lang/de/denied.txt
+++ b/inc/lang/de/denied.txt
@@ -1,4 +1,4 @@
 ====== Zugang verweigert ======
 
-Sie haben nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. Eventuell sind Sie nicht am Wiki angemeldet?
+Sie haben nicht die erforderliche Berechtigung, um diese Aktion durchzuführen.
 
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 9df1035f7..12b7db396 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -23,6 +23,9 @@
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Mateng Schimmerlos <mateng@firemail.de>
  * @author Benedikt Fey <spam@lifeisgoooood.de>
+ * @author Joerg <scooter22@gmx.de>
+ * @author Simon <st103267@stud.uni-stuttgart.de>
+ * @author Hoisl <hoisl@gmx.at>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -67,7 +70,9 @@ $lang['btn_register']          = 'Registrieren';
 $lang['btn_apply']             = 'Übernehmen';
 $lang['btn_media']             = 'Medien-Manager';
 $lang['btn_deleteuser']        = 'Benutzerprofil löschen';
-$lang['loggedinas']            = 'Angemeldet als';
+$lang['btn_img_backto']        = 'Zurück zu %s';
+$lang['btn_mediaManager']      = 'Im Medien-Manager anzeigen';
+$lang['loggedinas']            = 'Angemeldet als:';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
 $lang['newpass']               = 'Neues Passwort';
@@ -112,12 +117,12 @@ $lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt
 $lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite geben Sie Ihr Einverständnis, dass Ihr Inhalt unter der folgenden Lizenz veröffentlicht wird:';
 $lang['searchmedia']           = 'Suche Dateinamen:';
 $lang['searchmedia_in']        = 'Suche in %s';
-$lang['txt_upload']            = 'Datei zum Hochladen auswählen';
-$lang['txt_filename']          = 'Hochladen als (optional)';
+$lang['txt_upload']            = 'Datei zum Hochladen auswählen:';
+$lang['txt_filename']          = 'Hochladen als (optional):';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['maxuploadsize']         = 'Max. %s pro Datei-Upload.';
-$lang['lockedby']              = 'Momentan gesperrt von';
-$lang['lockexpire']            = 'Sperre läuft ab am';
+$lang['lockedby']              = 'Momentan gesperrt von:';
+$lang['lockexpire']            = 'Sperre läuft ab am:';
 $lang['js']['willexpire']      = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche Dateien';
@@ -196,10 +201,13 @@ $lang['difflink']              = 'Link zu dieser Vergleichsansicht';
 $lang['diff_type']             = 'Unterschiede anzeigen:';
 $lang['diff_inline']           = 'Inline';
 $lang['diff_side']             = 'Side by Side';
+$lang['diffprevrev']           = 'Vorhergehende Überarbeitung';
+$lang['diffnextrev']           = 'Nächste  Überarbeitung';
+$lang['difflastrev']           = 'Letzte  Überarbeitung';
 $lang['line']                  = 'Zeile';
-$lang['breadcrumb']            = 'Zuletzt angesehen';
-$lang['youarehere']            = 'Sie befinden sich hier';
-$lang['lastmod']               = 'Zuletzt geändert';
+$lang['breadcrumb']            = 'Zuletzt angesehen:';
+$lang['youarehere']            = 'Sie befinden sich hier:';
+$lang['lastmod']               = 'Zuletzt geändert:';
 $lang['by']                    = 'von';
 $lang['deleted']               = 'gelöscht';
 $lang['created']               = 'angelegt';
@@ -252,20 +260,18 @@ $lang['admin_register']        = 'Neuen Benutzer anmelden';
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
-$lang['img_backto']            = 'Zurück zu';
-$lang['img_title']             = 'Titel';
-$lang['img_caption']           = 'Bildunterschrift';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Dateiname';
-$lang['img_fsize']             = 'Größe';
-$lang['img_artist']            = 'FotografIn';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Schlagwörter';
-$lang['img_width']             = 'Breite';
-$lang['img_height']            = 'Höhe';
-$lang['img_manager']           = 'Im Medien-Manager anzeigen';
+$lang['img_title']             = 'Titel:';
+$lang['img_caption']           = 'Bildunterschrift:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Dateiname:';
+$lang['img_fsize']             = 'Größe:';
+$lang['img_artist']            = 'FotografIn:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Schlagwörter:';
+$lang['img_width']             = 'Breite:';
+$lang['img_height']            = 'Höhe:';
 $lang['subscr_subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert';
 $lang['subscr_subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren';
 $lang['subscr_subscribe_noaddress'] = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren';
@@ -345,3 +351,4 @@ $lang['media_restore']         = 'Diese Version wiederherstellen';
 $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnisse';
 $lang['plainhtml']             = 'HTML Klartext';
+$lang['wikimarkup']            = 'Wiki Markup';
diff --git a/inc/lang/el/denied.txt b/inc/lang/el/denied.txt
index 36d7ae103..25fcbe8ca 100644
--- a/inc/lang/el/denied.txt
+++ b/inc/lang/el/denied.txt
@@ -2,4 +2,3 @@
 
 Συγγνώμη, αλλά δεν έχετε επαρκή δικαιώματα για την συγκεκριμένη ενέργεια.
 
-Μήπως παραλείψατε να συνδεθείτε;
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 170e101a5..e5371c9f3 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -56,7 +56,7 @@ $lang['btn_register']          = 'Εγγραφή';
 $lang['btn_apply']             = 'Εφαρμογή';
 $lang['btn_media']             = 'Διαχειριστής πολυμέσων';
 $lang['btn_deleteuser']        = 'Αφαίρεσε τον λογαριασμό μου';
-$lang['loggedinas']            = 'Συνδεδεμένος ως';
+$lang['loggedinas']            = 'Συνδεδεμένος ως:';
 $lang['user']                  = 'Όνομα χρήστη';
 $lang['pass']                  = 'Κωδικός';
 $lang['newpass']               = 'Νέος κωδικός';
@@ -100,12 +100,12 @@ $lang['license']               = 'Εκτός εάν αναφέρεται δια�
 $lang['licenseok']             = 'Σημείωση: Τροποποιώντας αυτή την σελίδα αποδέχεστε την διάθεση του υλικού σας σύμφωνα με την ακόλουθη άδεια:';
 $lang['searchmedia']           = 'Αναζήτηση αρχείου:';
 $lang['searchmedia_in']        = 'Αναζήτηση σε %s';
-$lang['txt_upload']            = 'Επιλέξτε αρχείο για φόρτωση';
-$lang['txt_filename']          = 'Επιλέξτε νέο όνομα αρχείου (προαιρετικό)';
+$lang['txt_upload']            = 'Επιλέξτε αρχείο για φόρτωση:';
+$lang['txt_filename']          = 'Επιλέξτε νέο όνομα αρχείου (προαιρετικό):';
 $lang['txt_overwrt']           = 'Αντικατάσταση υπάρχοντος αρχείου';
 $lang['maxuploadsize']         = 'Μέγιστο μέγεθος αρχείου: %s.';
-$lang['lockedby']              = 'Προσωρινά κλειδωμένο από';
-$lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
+$lang['lockedby']              = 'Προσωρινά κλειδωμένο από:';
+$lang['lockexpire']            = 'Το κλείδωμα λήγει στις:';
 $lang['js']['willexpire']      = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
 $lang['js']['notsavedyet']     = 'Οι μη αποθηκευμένες αλλαγές θα χαθούν.
 Θέλετε να συνεχίσετε;';
@@ -186,9 +186,9 @@ $lang['diff_type']             = 'Προβολή διαφορών:';
 $lang['diff_inline']           = 'Σε σειρά';
 $lang['diff_side']             = 'Δίπλα-δίπλα';
 $lang['line']                  = 'Γραμμή';
-$lang['breadcrumb']            = 'Ιστορικό';
-$lang['youarehere']            = 'Είστε εδώ';
-$lang['lastmod']               = 'Τελευταία τροποποίηση';
+$lang['breadcrumb']            = 'Ιστορικό:';
+$lang['youarehere']            = 'Είστε εδώ:';
+$lang['lastmod']               = 'Τελευταία τροποποίηση:';
 $lang['by']                    = 'από';
 $lang['deleted']               = 'διαγράφηκε';
 $lang['created']               = 'δημιουργήθηκε';
@@ -241,20 +241,20 @@ $lang['admin_register']        = 'Προσθήκη νέου χρήστη';
 $lang['metaedit']              = 'Τροποποίηση metadata';
 $lang['metasaveerr']           = 'Η αποθήκευση των metadata απέτυχε';
 $lang['metasaveok']            = 'Επιτυχής αποθήκευση metadata';
-$lang['img_backto']            = 'Επιστροφή σε';
-$lang['img_title']             = 'Τίτλος';
-$lang['img_caption']           = 'Λεζάντα';
-$lang['img_date']              = 'Ημερομηνία';
-$lang['img_fname']             = 'Όνομα αρχείου';
-$lang['img_fsize']             = 'Μέγεθος';
-$lang['img_artist']            = 'Καλλιτέχνης';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Λέξεις-κλειδιά';
-$lang['img_width']             = 'Πλάτος';
-$lang['img_height']            = 'Ύψος';
-$lang['img_manager']           = 'Εμφάνιση στον διαχειριστή πολυμέσων';
+$lang['btn_img_backto']            = 'Επιστροφή σε %s';
+$lang['img_title']             = 'Τίτλος:';
+$lang['img_caption']           = 'Λεζάντα:';
+$lang['img_date']              = 'Ημερομηνία:';
+$lang['img_fname']             = 'Όνομα αρχείου:';
+$lang['img_fsize']             = 'Μέγεθος:';
+$lang['img_artist']            = 'Καλλιτέχνης:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Λέξεις-κλειδιά:';
+$lang['img_width']             = 'Πλάτος:';
+$lang['img_height']            = 'Ύψος:';
+$lang['btn_mediaManager']           = 'Εμφάνιση στον διαχειριστή πολυμέσων';
 $lang['subscr_subscribe_success'] = 'Ο/η %s προστέθηκε στην λίστα ειδοποιήσεων για το %s';
 $lang['subscr_subscribe_error'] = 'Σφάλμα κατά την προσθήκη του/της %s στην λίστα ειδοποιήσεων για το %s';
 $lang['subscr_subscribe_noaddress'] = 'Δεν υπάρχει διεύθυνση ταχυδρομείου συσχετισμένη με το όνομα χρήστη σας. Κατά συνέπεια δεν μπορείτε να προστεθείτε στην λίστα ειδοποιήσεων';
diff --git a/inc/lang/en/denied.txt b/inc/lang/en/denied.txt
index 3ac72820c..34cb8456a 100644
--- a/inc/lang/en/denied.txt
+++ b/inc/lang/en/denied.txt
@@ -1,4 +1,4 @@
 ====== Permission Denied ======
 
-Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
+Sorry, you don't have enough rights to continue.
 
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index cbdef8661..9c1e5dacd 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -52,8 +52,10 @@ $lang['btn_register']          = 'Register';
 $lang['btn_apply']             = 'Apply';
 $lang['btn_media']             = 'Media Manager';
 $lang['btn_deleteuser']        = 'Remove My Account';
+$lang['btn_img_backto']        = 'Back to %s';
+$lang['btn_mediaManager']      = 'View in media manager';
 
-$lang['loggedinas']            = 'Logged in as';
+$lang['loggedinas']            = 'Logged in as:';
 $lang['user']                  = 'Username';
 $lang['pass']                  = 'Password';
 $lang['newpass']               = 'New password';
@@ -103,12 +105,12 @@ $lang['licenseok']             = 'Note: By editing this page you agree to licens
 
 $lang['searchmedia']           = 'Search file name:';
 $lang['searchmedia_in']        = 'Search in %s';
-$lang['txt_upload']            = 'Select file to upload';
-$lang['txt_filename']          = 'Upload as (optional)';
+$lang['txt_upload']            = 'Select file to upload:';
+$lang['txt_filename']          = 'Upload as (optional):';
 $lang['txt_overwrt']           = 'Overwrite existing file';
 $lang['maxuploadsize']         = 'Upload max. %s per file.';
-$lang['lockedby']              = 'Currently locked by';
-$lang['lockexpire']            = 'Lock expires at';
+$lang['lockedby']              = 'Currently locked by:';
+$lang['lockexpire']            = 'Lock expires at:';
 
 $lang['js']['willexpire']      = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
 $lang['js']['notsavedyet']     = 'Unsaved changes will be lost.';
@@ -191,10 +193,15 @@ $lang['difflink']              = 'Link to this comparison view';
 $lang['diff_type']             = 'View differences:';
 $lang['diff_inline']           = 'Inline';
 $lang['diff_side']             = 'Side by Side';
+$lang['diffprevrev']           = 'Previous revision';
+$lang['diffnextrev']           = 'Next revision';
+$lang['difflastrev']           = 'Last revision';
+$lang['diffbothprevrev']       = 'Both sides previous revision';
+$lang['diffbothnextrev']       = 'Both sides next revision';
 $lang['line']                  = 'Line';
-$lang['breadcrumb']            = 'Trace';
-$lang['youarehere']            = 'You are here';
-$lang['lastmod']               = 'Last modified';
+$lang['breadcrumb']            = 'Trace:';
+$lang['youarehere']            = 'You are here:';
+$lang['lastmod']               = 'Last modified:';
 $lang['by']                    = 'by';
 $lang['deleted']               = 'removed';
 $lang['created']               = 'created';
@@ -253,20 +260,18 @@ $lang['admin_register']        = 'Add new user';
 $lang['metaedit']              = 'Edit Metadata';
 $lang['metasaveerr']           = 'Writing metadata failed';
 $lang['metasaveok']            = 'Metadata saved';
-$lang['img_backto']            = 'Back to';
-$lang['img_title']             = 'Title';
-$lang['img_caption']           = 'Caption';
-$lang['img_date']              = 'Date';
-$lang['img_fname']             = 'Filename';
-$lang['img_fsize']             = 'Size';
-$lang['img_artist']            = 'Photographer';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Keywords';
-$lang['img_width']             = 'Width';
-$lang['img_height']            = 'Height';
-$lang['img_manager']           = 'View in media manager';
+$lang['img_title']             = 'Title:';
+$lang['img_caption']           = 'Caption:';
+$lang['img_date']              = 'Date:';
+$lang['img_fname']             = 'Filename:';
+$lang['img_fsize']             = 'Size:';
+$lang['img_artist']            = 'Photographer:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Keywords:';
+$lang['img_width']             = 'Width:';
+$lang['img_height']            = 'Height:';
 
 $lang['subscr_subscribe_success']   = 'Added %s to subscription list for %s';
 $lang['subscr_subscribe_error']     = 'Error adding %s to subscription list for %s';
@@ -302,6 +307,7 @@ $lang['i_modified']            = 'For security reasons this script will only wor
                                   <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
 $lang['i_funcna']              = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?';
 $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_mbfuncoverload']      = 'mbstring.func_overload must be disabled in php.ini to run DokuWiki.';
 $lang['i_permfail']            = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!';
 $lang['i_confexists']          = '<code>%s</code> already exists';
 $lang['i_writeerr']            = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.';
diff --git a/inc/lang/eo/admin.txt b/inc/lang/eo/admin.txt
index 4b0cf7909..4b3cf0c2a 100644
--- a/inc/lang/eo/admin.txt
+++ b/inc/lang/eo/admin.txt
@@ -1,3 +1,3 @@
 ====== Administrado ======
 
-Sube vi povas trovi liston de administraj taskoj disponeblaj en DokuWiki.
+Sube vi trovas liston de administraj taskoj haveblaj en DokuWiki.
diff --git a/inc/lang/eo/adminplugins.txt b/inc/lang/eo/adminplugins.txt
index 769a8c538..bb7e7829b 100644
--- a/inc/lang/eo/adminplugins.txt
+++ b/inc/lang/eo/adminplugins.txt
@@ -1 +1 @@
-===== Eksteraj kromaĵoj =====
\ No newline at end of file
+===== Aldonaj kromaĵoj =====
\ No newline at end of file
diff --git a/inc/lang/eo/denied.txt b/inc/lang/eo/denied.txt
index 3cd6c76bf..e0abba12c 100644
--- a/inc/lang/eo/denied.txt
+++ b/inc/lang/eo/denied.txt
@@ -1,4 +1,4 @@
 ====== Aliro malpermesita ======
 
-Vi ne havas sufiĉajn rajtojn rigardi ĉi tiujn paĝojn. Eble vi forgesis identiĝi.
+Vi ne havas sufiĉajn rajtojn daŭrigi.
 
diff --git a/inc/lang/eo/diff.txt b/inc/lang/eo/diff.txt
index 5829a7db1..3c9db61c8 100644
--- a/inc/lang/eo/diff.txt
+++ b/inc/lang/eo/diff.txt
@@ -1,4 +1,4 @@
 ====== Diferencoj ======
 
-Ĉi tie vi povas vidi diferencojn inter la aktuala versio kaj la elektita revizio de la paĝo.
+Tio montras diferencojn inter du versioj de la paĝo.
 
diff --git a/inc/lang/eo/draft.txt b/inc/lang/eo/draft.txt
index 32ddc83f6..57526f3b5 100644
--- a/inc/lang/eo/draft.txt
+++ b/inc/lang/eo/draft.txt
@@ -1,5 +1,5 @@
 ====== Skiza dosiero troviĝis ======
 
-Via lasta sekcio de redakto en tiu ĉi paĝo ne korekte kompletiĝis. DokuWiki aŭtomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daŭrigi vian redaktadon. Sube vi povas vidi la datumaron, kiu konserviĝis el via lasta sekcio.
+Via lasta redaktosesio en tiu ĉi paĝo ne ĝuste kompletiĝis. DokuWiki aŭtomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daŭrigi vian redaktadon. Sube vi povas vidi la datumaron, kiu konserviĝis el via lasta sesio.
 
 Bonvolu decidi ĉu vi volas //restarigi// vian perditan redakton, //forigi// la aŭtomate konservitan skizon aŭ //rezigni// pri la redakta procezo.
diff --git a/inc/lang/eo/edit.txt b/inc/lang/eo/edit.txt
index 29b3382c5..ccc8a613d 100644
--- a/inc/lang/eo/edit.txt
+++ b/inc/lang/eo/edit.txt
@@ -1 +1 @@
-Redaktu paĝon kaj poste premu butonon titolitan '"Konservi'". Bonvolu tralegi la [[wiki:syntax|vikian sintakson]] por kompreni kiel vi povas krei paĝojn. Bonvolu redakti nur se vi planas **plibonigi** la enhavon de la paĝo. Se vi volas nur testi ion, bonvolu uzi specialan paĝon: [[wiki:playground|ludejo]].
+Redaktu paĝon kaj poste premu butonon titolitan '"Konservi'". Bonvolu tralegi la [[wiki:syntax|vikian sintakson]] pri la formatigo. Bonvolu redakti **nur**, se vi povas **plibonigi** la enhavon de la paĝo. Se vi volas nur testi ion, bonvolu uzi specialan paĝon: [[playground:playground|sablokesto]].
diff --git a/inc/lang/eo/editrev.txt b/inc/lang/eo/editrev.txt
index 1640baa91..2e1406b0f 100644
--- a/inc/lang/eo/editrev.txt
+++ b/inc/lang/eo/editrev.txt
@@ -1,2 +1,2 @@
-**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos ĝin, kreiĝos nova kuranta versio kun la sama enhavo.
+**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos ĝin, kreiĝos nova kuranta versio kun tiu enhavo.
 ----
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index a543b2571..f81de7fa1 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -37,13 +37,13 @@ $lang['btn_secedit']           = 'Redakti';
 $lang['btn_login']             = 'Ensaluti';
 $lang['btn_logout']            = 'Elsaluti';
 $lang['btn_admin']             = 'Administri';
-$lang['btn_update']            = 'Ĝisdatigi';
+$lang['btn_update']            = 'Aktualigi';
 $lang['btn_delete']            = 'Forigi';
 $lang['btn_back']              = 'Retroiri';
 $lang['btn_backlink']          = 'Retroligoj';
 $lang['btn_backtomedia']       = 'Retroiri al elekto de dosiero';
 $lang['btn_subscribe']         = 'Aliĝi al paĝaj modifoj';
-$lang['btn_profile']           = 'Ĝisdatigi profilon';
+$lang['btn_profile']           = 'Aktualigi profilon';
 $lang['btn_reset']             = 'Rekomenci';
 $lang['btn_resendpwd']         = 'Sendi novan pasvorton';
 $lang['btn_draft']             = 'Redakti skizon';
@@ -53,8 +53,10 @@ $lang['btn_revert']            = 'Restarigi';
 $lang['btn_register']          = 'Registriĝi';
 $lang['btn_apply']             = 'Apliki';
 $lang['btn_media']             = 'Medio-administrilo';
-$lang['btn_deleteuser']        = 'Forigi mian aliĝon';
-$lang['loggedinas']            = 'Ensalutinta kiel';
+$lang['btn_deleteuser']        = 'Forigi mian konton';
+$lang['btn_img_backto']        = 'Iri reen al %s';
+$lang['btn_mediaManager']      = 'Rigardi en aŭdvidaĵ-administrilo';
+$lang['loggedinas']            = 'Ensalutinta kiel:';
 $lang['user']                  = 'Uzant-nomo';
 $lang['pass']                  = 'Pasvorto';
 $lang['newpass']               = 'Nova pasvorto';
@@ -81,7 +83,7 @@ $lang['reghere']               = 'Se vi ne havas konton, vi povas akiri ĝin';
 $lang['profna']                = 'Tiu ĉi vikio ne ebligas modifon en la profiloj.';
 $lang['profnochange']          = 'Neniu ŝanĝo, nenio farinda.';
 $lang['profnoempty']           = 'Malplena nomo aŭ retadreso ne estas permesata.';
-$lang['profchanged']           = 'La profilo de la uzanto sukcese ĝisdatiĝis.';
+$lang['profchanged']           = 'La profilo de la uzanto sukcese aktualiĝis.';
 $lang['profnodelete']          = 'Tiu ĉi vikio ne subtenas forigo de uzantoj';
 $lang['profdeleteuser']        = 'Forigi aliĝon';
 $lang['profdeleted']           = 'Via uzant-aliĝo estis forigata de tiu ĉi vikio';
@@ -99,12 +101,12 @@ $lang['license']               = 'Krom kie rekte indikite, enhavo de tiu ĉi vik
 $lang['licenseok']             = 'Rimarku: redaktante tiun ĉi paĝon vi konsentas publikigi vian enhavon laŭ la jena permesilo:';
 $lang['searchmedia']           = 'Serĉi dosiernomon:';
 $lang['searchmedia_in']        = 'Serĉi en %s';
-$lang['txt_upload']            = 'Elektu dosieron por alŝuti';
-$lang['txt_filename']          = 'Alŝuti kiel (laŭvole)';
+$lang['txt_upload']            = 'Elektu dosieron por alŝuti:';
+$lang['txt_filename']          = 'Alŝuti kiel (laŭvole):';
 $lang['txt_overwrt']           = 'Anstataŭigi ekzistantan dosieron';
 $lang['maxuploadsize']         = 'Alŝuto maks. %s po dosiero.';
-$lang['lockedby']              = 'Nune ŝlosita de';
-$lang['lockexpire']            = 'Ŝlosado ĉesos en';
+$lang['lockedby']              = 'Nune ŝlosita de:';
+$lang['lockexpire']            = 'Ŝlosado ĉesos je:';
 $lang['js']['willexpire']      = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempokontrolon de la ŝlosado, premu la butonon "Antaŭrigardi".';
 $lang['js']['notsavedyet']     = 'Ne konservitaj modifoj perdiĝos.
 Ĉu vi certe volas daŭrigi la procezon?';
@@ -184,10 +186,15 @@ $lang['difflink']              = 'Ligilo al kompara rigardo';
 $lang['diff_type']             = 'Rigardi malsamojn:';
 $lang['diff_inline']           = 'Samlinie';
 $lang['diff_side']             = 'Apude';
+$lang['diffprevrev']           = 'Antaŭa revizio';
+$lang['diffnextrev']           = 'Sekva revizio';
+$lang['difflastrev']           = 'Lasta revizio';
+$lang['diffbothprevrev']       = 'Sur ambaŭ flankoj antaŭa revizio';
+$lang['diffbothnextrev']       = 'Sur ambaŭ flankoj sekva revizio';
 $lang['line']                  = 'Linio';
-$lang['breadcrumb']            = 'Paŝoj';
-$lang['youarehere']            = 'Vi estas ĉi tie';
-$lang['lastmod']               = 'Lastaj ŝanĝoj';
+$lang['breadcrumb']            = 'Paŝoj:';
+$lang['youarehere']            = 'Vi estas ĉi tie:';
+$lang['lastmod']               = 'Lastaj ŝanĝoj:';
 $lang['by']                    = 'de';
 $lang['deleted']               = 'forigita';
 $lang['created']               = 'kreita';
@@ -240,20 +247,18 @@ $lang['admin_register']        = 'Aldoni novan uzanton';
 $lang['metaedit']              = 'Redakti metadatumaron';
 $lang['metasaveerr']           = 'La konservo de metadatumaro malsukcesis';
 $lang['metasaveok']            = 'La metadatumaro konserviĝis';
-$lang['img_backto']            = 'Iri reen al';
-$lang['img_title']             = 'Titolo';
-$lang['img_caption']           = 'Priskribo';
-$lang['img_date']              = 'Dato';
-$lang['img_fname']             = 'Dosiernomo';
-$lang['img_fsize']             = 'Grandeco';
-$lang['img_artist']            = 'Fotisto';
-$lang['img_copyr']             = 'Kopirajtoj';
-$lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Kamerao';
-$lang['img_keywords']          = 'Ŝlosilvortoj';
-$lang['img_width']             = 'Larĝeco';
-$lang['img_height']            = 'Alteco';
-$lang['img_manager']           = 'Rigardi en aŭdvidaĵ-administrilo';
+$lang['img_title']             = 'Titolo:';
+$lang['img_caption']           = 'Priskribo:';
+$lang['img_date']              = 'Dato:';
+$lang['img_fname']             = 'Dosiernomo:';
+$lang['img_fsize']             = 'Grandeco:';
+$lang['img_artist']            = 'Fotisto:';
+$lang['img_copyr']             = 'Kopirajtoj:';
+$lang['img_format']            = 'Formato:';
+$lang['img_camera']            = 'Kamerao:';
+$lang['img_keywords']          = 'Ŝlosilvortoj:';
+$lang['img_width']             = 'Larĝeco:';
+$lang['img_height']            = 'Alteco:';
 $lang['subscr_subscribe_success'] = 'Aldonis %s al la abonlisto por %s';
 $lang['subscr_subscribe_error'] = 'Eraro dum aldono de %s al la abonlisto por %s';
 $lang['subscr_subscribe_noaddress'] = 'Ne estas adreso ligita al via ensaluto, ne eblas aldoni vin al la abonlisto';
@@ -293,6 +298,7 @@ $lang['i_policy']              = 'Komenca ACL-a agordo';
 $lang['i_pol0']                = 'Malferma Vikio (legi, skribi, alŝuti povas ĉiuj)';
 $lang['i_pol1']                = 'Publika Vikio (legi povas ĉiuj, skribi kaj alŝuti povas registritaj uzantoj)';
 $lang['i_pol2']                = 'Ferma Vikio (legi, skribi, alŝuti nur povas registritaj uzantoj)';
+$lang['i_allowreg']            = 'Permesi al uzantoj registri sin mem';
 $lang['i_retry']               = 'Reprovi';
 $lang['i_license']             = 'Bonvolu elekti la permesilon, sub kiun vi volas meti vian enhavon:';
 $lang['i_license_none']        = 'Ne montri licencinformojn';
diff --git a/inc/lang/es/denied.txt b/inc/lang/es/denied.txt
index d7b37404b..02a76a8cf 100644
--- a/inc/lang/es/denied.txt
+++ b/inc/lang/es/denied.txt
@@ -1,3 +1,4 @@
 ====== Permiso Denegado ======
 
-Lo siento, no tienes suficientes permisos para continuar. ¿Quizás has olvidado identificarte?
\ No newline at end of file
+Lo siento, no tienes suficientes permisos para continuar.
+
diff --git a/inc/lang/es/edit.txt b/inc/lang/es/edit.txt
index 55c3c1dc5..4ed253bb3 100644
--- a/inc/lang/es/edit.txt
+++ b/inc/lang/es/edit.txt
@@ -1,2 +1,2 @@
-Edita la página y pulsa ''Guardar''. Mira [[wiki:syntax]] para sintaxis Wiki. Por favor edita la página solo si puedes **mejorarla**. Si quieres testear algunas cosas aprende a dar tus primeros pasos en el [[playground:playground]].
+Edita la página y pulsa ''Guardar''. Vaya a [[wiki:syntax]] para ver la sintaxis del Wiki. Por favor edite la página solo si puedes **mejorarla**. Si quieres probar algo relacionado a la sintaxis, aprende a dar tus primeros pasos en el [[playground:playground]].
 
diff --git a/inc/lang/es/jquery.ui.datepicker.js b/inc/lang/es/jquery.ui.datepicker.js
index ae32124e7..763d4cedd 100644
--- a/inc/lang/es/jquery.ui.datepicker.js
+++ b/inc/lang/es/jquery.ui.datepicker.js
@@ -9,9 +9,9 @@ jQuery(function($){
 		monthNames: ['enero','febrero','marzo','abril','mayo','junio',
 		'julio','agosto','septiembre','octubre','noviembre','diciembre'],
 		monthNamesShort: ['ene','feb','mar','abr','may','jun',
-		'jul','ago','sep','oct','nov','dic'],
+		'jul','ogo','sep','oct','nov','dic'],
 		dayNames: ['domingo','lunes','martes','miércoles','jueves','viernes','sábado'],
-		dayNamesShort: ['dom','lun','mar','mié','jue','vie','sáb'],
+		dayNamesShort: ['dom','lun','mar','mié','juv','vie','sáb'],
 		dayNamesMin: ['D','L','M','X','J','V','S'],
 		weekHeader: 'Sm',
 		dateFormat: 'dd/mm/yy',
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 216093f6c..03cbd51d2 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -31,6 +31,11 @@
  * @author r0sk <r0sk10@gmail.com>
  * @author monica <may.dorado@gmail.com>
  * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Juan De La Cruz <juann.dlc@gmail.com>
+ * @author Fernando <fdiezala@gmail.com>
+ * @author Eloy <ej.perezgomez@gmail.com>
+ * @author Antonio Castilla <antoniocastilla@trazoide.com>
+ * @author Jonathan Hernández <me@jhalicea.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -40,13 +45,13 @@ $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Editar esta página';
-$lang['btn_source']            = 'Ver fuente';
+$lang['btn_source']            = 'Ver la fuente de esta página';
 $lang['btn_show']              = 'Ver página';
 $lang['btn_create']            = 'Crear esta página';
 $lang['btn_search']            = 'Buscar';
 $lang['btn_save']              = 'Guardar';
 $lang['btn_preview']           = 'Previsualización';
-$lang['btn_top']               = 'Ir hasta arriba';
+$lang['btn_top']               = 'Volver arriba';
 $lang['btn_newer']             = '<< más reciente';
 $lang['btn_older']             = 'menos reciente >>';
 $lang['btn_revs']              = 'Revisiones antiguas';
@@ -73,9 +78,11 @@ $lang['btn_draftdel']          = 'Eliminar borrador';
 $lang['btn_revert']            = 'Restaurar';
 $lang['btn_register']          = 'Registrarse';
 $lang['btn_apply']             = 'Aplicar';
-$lang['btn_media']             = 'Gestor de ficheros';
+$lang['btn_media']             = 'Administrador de Ficheros';
 $lang['btn_deleteuser']        = 'Elimina Mi Cuenta';
-$lang['loggedinas']            = 'Conectado como ';
+$lang['btn_img_backto']        = 'Volver a %s';
+$lang['btn_mediaManager']      = 'Ver en el administrador de ficheros';
+$lang['loggedinas']            = 'Conectado como:';
 $lang['user']                  = 'Usuario';
 $lang['pass']                  = 'Contraseña';
 $lang['newpass']               = 'Nueva contraseña';
@@ -116,16 +123,16 @@ $lang['resendpwdnouser']       = 'Lo siento, no se encuentra este usuario en nue
 $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.';
 $lang['resendpwdconfirm']      = 'Un enlace para confirmación ha sido enviado por correo electrónico.';
 $lang['resendpwdsuccess']      = 'Tu nueva contraseña ha sido enviada por correo electrónico.';
-$lang['license']               = 'Excepto donde se indique lo contrario, el contenido de esta wiki se autoriza bajo la siguiente licencia:';
+$lang['license']               = 'Excepto donde se indique lo contrario, el contenido de este wiki esta bajo la siguiente licencia:';
 $lang['licenseok']             = 'Nota: Al editar esta página, estás de acuerdo en autorizar su contenido bajo la siguiente licencia:';
 $lang['searchmedia']           = 'Buscar archivo:';
 $lang['searchmedia_in']        = 'Buscar en %s';
-$lang['txt_upload']            = 'Selecciona el archivo a subir';
-$lang['txt_filename']          = 'Subir como (opcional)';
+$lang['txt_upload']            = 'Selecciona el archivo a subir:';
+$lang['txt_filename']          = 'Subir como (opcional):';
 $lang['txt_overwrt']           = 'Sobreescribir archivo existente';
 $lang['maxuploadsize']         = 'Peso máximo de %s por archivo';
-$lang['lockedby']              = 'Actualmente bloqueado por';
-$lang['lockexpire']            = 'El bloqueo expira en';
+$lang['lockedby']              = 'Actualmente bloqueado por:';
+$lang['lockexpire']            = 'El bloqueo expira en:';
 $lang['js']['willexpire']      = 'El bloqueo para la edición de esta página expira en un minuto.\nPAra prevenir conflictos uso el botón Previsualizar para restaurar el contador de bloqueo.';
 $lang['js']['notsavedyet']     = 'Los cambios que no se han guardado se perderán.
 ¿Realmente quieres continuar?';
@@ -206,10 +213,15 @@ $lang['difflink']              = 'Enlace a la vista de comparación';
 $lang['diff_type']             = 'Ver diferencias';
 $lang['diff_inline']           = 'En línea';
 $lang['diff_side']             = 'Lado a lado';
+$lang['diffprevrev']           = 'Revisión previa';
+$lang['diffnextrev']           = 'Próxima revisión';
+$lang['difflastrev']           = 'Última revisión';
+$lang['diffbothprevrev']       = 'Ambos lados, revisión anterior';
+$lang['diffbothnextrev']       = 'Ambos lados, revisión siguiente';
 $lang['line']                  = 'Línea';
-$lang['breadcrumb']            = 'Traza';
-$lang['youarehere']            = 'Estás aquí';
-$lang['lastmod']               = 'Última modificación';
+$lang['breadcrumb']            = 'Traza:';
+$lang['youarehere']            = 'Estás aquí:';
+$lang['lastmod']               = 'Última modificación:';
 $lang['by']                    = 'por';
 $lang['deleted']               = 'borrado';
 $lang['created']               = 'creado';
@@ -262,20 +274,18 @@ $lang['admin_register']        = 'Añadir nuevo usuario';
 $lang['metaedit']              = 'Editar metadatos';
 $lang['metasaveerr']           = 'La escritura de los metadatos ha fallado';
 $lang['metasaveok']            = 'Los metadatos han sido guardados';
-$lang['img_backto']            = 'Volver a';
-$lang['img_title']             = 'Título';
-$lang['img_caption']           = 'Epígrafe';
-$lang['img_date']              = 'Fecha';
-$lang['img_fname']             = 'Nombre de fichero';
-$lang['img_fsize']             = 'Tamaño';
-$lang['img_artist']            = 'Fotógrafo';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Cámara';
-$lang['img_keywords']          = 'Palabras claves';
-$lang['img_width']             = 'Ancho';
-$lang['img_height']            = 'Alto';
-$lang['img_manager']           = 'Ver en el Administrador de medios';
+$lang['img_title']             = 'Título:';
+$lang['img_caption']           = 'Información: ';
+$lang['img_date']              = 'Fecha:';
+$lang['img_fname']             = 'Nombre del archivo:';
+$lang['img_fsize']             = 'Tamaño:';
+$lang['img_artist']            = 'Fotógrafo:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formato:';
+$lang['img_camera']            = 'Cámara:';
+$lang['img_keywords']          = 'Palabras claves:';
+$lang['img_width']             = 'Ancho:';
+$lang['img_height']            = 'Alto:';
 $lang['subscr_subscribe_success'] = 'Se agregó %s a las listas de suscripción para %s';
 $lang['subscr_subscribe_error'] = 'Error al agregar %s a las listas de suscripción para %s';
 $lang['subscr_subscribe_noaddress'] = 'No hay dirección asociada con tu registro, no se puede agregarte a la lista de suscripción';
@@ -303,6 +313,7 @@ $lang['i_problems']            = 'El instalador encontró algunos problemas, se
 $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_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_mbfuncoverload']      = 'mbstring.func_overload se debe deshabilitar en php.ini para que funcione DokuWiki.';
 $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.';
@@ -321,13 +332,13 @@ $lang['i_license_none']        = 'No mostrar ninguna información sobre licencia
 $lang['i_pop_field']           = 'Por favor, ayúdanos a mejorar la experiencia de DokuWiki:';
 $lang['i_pop_label']           = 'Una vez al mes, enviar información anónima de uso de datos a los desarrolladores de DokuWiki';
 $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';
-$lang['weeks']                 = '%d semanas atrás';
-$lang['days']                  = '%d días atrás';
-$lang['hours']                 = '%d horas atrás';
-$lang['minutes']               = '%d minutos atrás';
-$lang['seconds']               = '%d segundos atrás';
+$lang['years']                 = 'hace %d años';
+$lang['months']                = 'hace %d meses';
+$lang['weeks']                 = 'hace %d semanas';
+$lang['days']                  = 'hace %d días';
+$lang['hours']                 = 'hace %d horas';
+$lang['minutes']               = 'hace %d minutos';
+$lang['seconds']               = 'hace %d segundos';
 $lang['wordblock']             = 'Sus cambios no se han guardado porque contienen textos bloqueados (spam).';
 $lang['media_uploadtab']       = 'Cargar';
 $lang['media_searchtab']       = 'Buscar';
diff --git a/inc/lang/es/uploadmail.txt b/inc/lang/es/uploadmail.txt
index 9d2f980d3..cf70d00d4 100644
--- a/inc/lang/es/uploadmail.txt
+++ b/inc/lang/es/uploadmail.txt
@@ -1,6 +1,7 @@
-Se ha subido un fichero a tu DokuWuki. Estos son los detalles:
+Se ha subido un fichero a tu DokuWiki. Estos son los detalles:
 
 Archivo : @MEDIA@
+Ultima revisión: @OLD@
 Fecha : @DATE@
 Navegador : @BROWSER@
 Dirección IP : @IPADDRESS@
diff --git a/inc/lang/et/adminplugins.txt b/inc/lang/et/adminplugins.txt
new file mode 100644
index 000000000..ee3ffb0a7
--- /dev/null
+++ b/inc/lang/et/adminplugins.txt
@@ -0,0 +1 @@
+===== Täiendavad laiendused =====
\ No newline at end of file
diff --git a/inc/lang/et/denied.txt b/inc/lang/et/denied.txt
index bb564ac57..093ccf4a8 100644
--- a/inc/lang/et/denied.txt
+++ b/inc/lang/et/denied.txt
@@ -1,3 +1,4 @@
 ====== Sul pole ligipääsuluba ======
 
-Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda, selleks on vastavaid õigusi vaja.
+Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda.
+
diff --git a/inc/lang/et/index.txt b/inc/lang/et/index.txt
index 8d2e25a68..fec211d9b 100644
--- a/inc/lang/et/index.txt
+++ b/inc/lang/et/index.txt
@@ -1,3 +1,3 @@
 ====== Sisukord ======
 
-See siin on nimekiri kõigist saadaval olevatest lehtedest järjestatud [[doku>namespaces|alajaotuste]] järgi.
+Alloleavs on loetletud kõik saada olevaist leheküljed, mis on järjestatud [[doku>namespaces|nimeruumi]]de alusel.
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index cc736db4d..9ae06d7d2 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -1,13 +1,15 @@
 <?php
+
 /**
- * Estonian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Oliver S6ro <seem.iges@mail.ee>
  * @author Aari Juhanson <aari@vmg.vil.ee>
  * @author Kaiko Kaur <kaiko@kultuur.edu.ee>
  * @author kristian.kankainen@kuu.la
  * @author Rivo Zängov <eraser@eraser.ee>
+ * @author Janar Leas <janarleas@gmail.com>
+ * @author Janar Leas <janar.leas@eesti.ee>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -43,12 +45,16 @@ $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']         = 'Sea uus salasõna';
 $lang['btn_draft']             = 'Toimeta mustandit';
 $lang['btn_recover']           = 'Taata mustand';
 $lang['btn_draftdel']          = 'Kustuta mustand';
 $lang['btn_revert']            = 'Taasta';
 $lang['btn_register']          = 'Registreeri uus kasutaja';
-$lang['loggedinas']            = 'Logis sisse kui';
+$lang['btn_apply']             = 'Kinnita';
+$lang['btn_media']             = 'Meedia haldur';
+$lang['btn_deleteuser']        = 'Eemalda minu konto';
+$lang['loggedinas']            = 'Logis sisse kui:';
 $lang['user']                  = 'Kasutaja';
 $lang['pass']                  = 'Parool';
 $lang['newpass']               = 'Uus parool';
@@ -59,8 +65,10 @@ $lang['fullname']              = 'Täielik nimi';
 $lang['email']                 = 'E-post';
 $lang['profile']               = 'Kasutaja info';
 $lang['badlogin']              = 'Oops, Sinu kasutajanimi või parool oli vale.';
+$lang['badpassconfirm']        = 'Väär salasõna';
 $lang['minoredit']             = 'Ebaolulised muudatused';
 $lang['draftdate']             = 'Mustand automaatselt salvestatud';
+$lang['nosecedit']             = 'Leht on vahepeal muutunud, jaotiste teave osutus aegunuks sestap laeti tervelehekülg.';
 $lang['regmissing']            = 'Kõik väljad tuleb ära täita.';
 $lang['reguexists']            = 'Tegelikult on sellise nimega kasutaja juba olemas.';
 $lang['regsuccess']            = 'Kasutaja sai tehtud. Parool saadeti Sulle e-posti aadressil.';
@@ -76,21 +84,30 @@ $lang['profna']                = 'Viki ei toeta profiili muudatusi';
 $lang['profnochange']          = 'Muutused puuduvad.';
 $lang['profnoempty']           = 'Tühi nimi ega meiliaadress pole lubatud.';
 $lang['profchanged']           = 'Kasutaja info edukalt muudetud';
+$lang['profnodelete']          = 'See wiki ei toeta kasutajate kustutamist';
+$lang['profdeleteuser']        = 'Kustuta konto';
+$lang['profdeleted']           = 'Sinu kasutajakonto on sellest wikist kustutatud';
+$lang['profconfdelete']        = 'Soovin sellest wikist oma konnto eemaldada. <br/> See tegevus on taastamatu.';
+$lang['profconfdeletemissing'] = 'Kinnituse valikkast märkimata.';
 $lang['pwdforget']             = 'Unustasid parooli? Tee uus';
 $lang['resendna']              = 'See wiki ei toeta parooli taassaatmist.';
+$lang['resendpwd']             = 'Sea uus salasõna';
 $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.';
 $lang['resendpwdconfirm']      = 'Kinnituslink saadeti meilile.';
 $lang['resendpwdsuccess']      = 'Uus parool saadeti Sinu meilile.';
+$lang['license']               = 'Kus pole öeldud teisiti, kehtib selle wiki sisule järgmine leping:';
+$lang['licenseok']             = 'Teadmiseks: Toimetades seda lehte, nõustud avaldama oma sisu järgmise lepingu alusel:';
 $lang['searchmedia']           = 'Otsi failinime:';
 $lang['searchmedia_in']        = 'Otsi %s';
-$lang['txt_upload']            = 'Vali fail, mida üles laadida';
-$lang['txt_filename']          = 'Siseta oma Wikinimi (soovituslik)';
+$lang['txt_upload']            = 'Vali fail, mida üles laadida:';
+$lang['txt_filename']          = 'Siseta oma Wikinimi (soovituslik):';
 $lang['txt_overwrt']           = 'Kirjutan olemasoleva faili üle';
-$lang['lockedby']              = 'Praegu on selle lukustanud';
-$lang['lockexpire']            = 'Lukustus aegub';
-$lang['js']['willexpire']            = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
+$lang['maxuploadsize']         = 'Üleslaadimiseks lubatu enim %s faili kohta.';
+$lang['lockedby']              = 'Praegu on selle lukustanud:';
+$lang['lockexpire']            = 'Lukustus aegub:';
+$lang['js']['willexpire']      = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
 $lang['js']['notsavedyet']     = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad.
 Kas Sa ikka tahad edasi liikuda?';
 $lang['js']['searchmedia']     = 'Otsi faile';
@@ -122,6 +139,17 @@ Siiski võid kopeerida ja asetada lingi.';
 $lang['js']['linkwiz']         = 'Lingi nõustaja';
 $lang['js']['linkto']          = 'Lingi:';
 $lang['js']['del_confirm']     = 'Kas kustutame selle kirje?';
+$lang['js']['restore_confirm'] = 'Tõesti taastad selle järgu?';
+$lang['js']['media_diff']      = 'Vaatle erisusi:';
+$lang['js']['media_diff_both'] = 'Kõrvuti';
+$lang['js']['media_diff_opacity'] = 'Kuma läbi';
+$lang['js']['media_diff_portions'] = 'Puhasta';
+$lang['js']['media_select']    = 'Vali failid…';
+$lang['js']['media_upload_btn'] = 'Lae üles';
+$lang['js']['media_done_btn']  = 'Valmis';
+$lang['js']['media_drop']      = 'Üleslaadimiseks viska failid siia';
+$lang['js']['media_cancel']    = 'eemalda';
+$lang['js']['media_overwrt']   = 'Asenda olemasolevad failid';
 $lang['rssfailed']             = 'Sinu soovitud info ammutamisel tekkis viga: ';
 $lang['nothingfound']          = 'Oops, aga mitte muhvigi ei leitud.';
 $lang['mediaselect']           = 'Hunnik faile';
@@ -131,6 +159,8 @@ $lang['uploadfail']            = 'Üleslaadimine läks nässu. Äkki pole Sa sel
 $lang['uploadwrong']           = 'Ei saa Sa midagi üles laadida. Oops, aga seda tüüpi faili sul lihtsalt ei lubata üles laadida';
 $lang['uploadexist']           = 'Fail on juba olemas. Midagi ei muudetud.';
 $lang['uploadbadcontent']      = 'Üles laaditu ei sobinud %s faililaiendiga.';
+$lang['uploadspam']            = 'Üleslaadimine tõrjuti rämpssisu vältija poolt.';
+$lang['uploadxss']             = 'Üleslaadimine tõrjuti kahtlase sisu võimaluse tõttu';
 $lang['uploadsize']            = 'Üles laaditud fail on liiga suur (maksimaalne suurus on %s).';
 $lang['deletesucc']            = 'Fail nimega "%s" sai kustutatud.';
 $lang['deletefail']            = 'Faili nimega "%s" ei kustutatud (kontrolli õigusi).';
@@ -141,7 +171,7 @@ $lang['accessdenied']          = 'Ligipääs keelatud.';
 $lang['mediausage']            = 'Kasuta järgmist kirjapilti sellele failile viitamaks:';
 $lang['mediaview']             = 'Vaata faili algsel kujul.';
 $lang['mediaroot']             = 'juur';
-$lang['mediaupload']           = 'Lae fail sellesse nimeruumi (kataloogi). Et tekitada veel alam nimeruum kasuta koolonit Wiki nimes.';
+$lang['mediaupload']           = 'Lae fail sellesse nimeruumi (kataloogi). Loomaks täiendavaid alam-nimeruume, kasuta wiki-nime ja nimeruumide eraldamiseks koolonit.';
 $lang['mediaextchange']        = 'Faili laiend .%s-st %s-ks!';
 $lang['reference']             = 'Viited';
 $lang['ref_inuse']             = 'Seda faili ei saa kustutada, sest teda kasutavad järgmised lehed:';
@@ -155,20 +185,34 @@ $lang['diff']                  = 'Näita erinevusi hetkel kehtiva versiooniga';
 $lang['diff2']                 = 'Näita valitud versioonide erinevusi';
 $lang['difflink']              = 'Lõlita võrdlemise vaatele';
 $lang['diff_type']             = 'Vaata erinevusi:';
+$lang['diff_inline']           = 'Jooksvalt';
 $lang['diff_side']             = 'Kõrvuti';
 $lang['line']                  = 'Rida';
-$lang['breadcrumb']            = 'Käidud rada';
-$lang['youarehere']            = 'Sa oled siin';
-$lang['lastmod']               = 'Viimati muutnud';
+$lang['breadcrumb']            = 'Käidud rada:';
+$lang['youarehere']            = 'Sa oled siin:';
+$lang['lastmod']               = 'Viimati muutnud:';
 $lang['by']                    = 'persoon';
 $lang['deleted']               = 'eemaldatud';
 $lang['created']               = 'tekitatud';
 $lang['restored']              = 'vana versioon taastatud (%s)';
 $lang['external_edit']         = 'väline muutmine';
 $lang['summary']               = 'kokkuvõte muudatustest';
+$lang['noflash']               = 'Sele sisu vaatamisesks on vajalik <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Laiendus</a>.';
+$lang['tools']                 = 'Tööriistad';
+$lang['user_tools']            = 'Kasutaja tarvikud';
+$lang['site_tools']            = 'Lehe tööriistad';
+$lang['page_tools']            = 'Lehekülje tarvikud';
+$lang['skip_to_content']       = 'mine sisule';
+$lang['sidebar']               = 'Külgriba';
 $lang['mail_newpage']          = 'leht lisatud:';
 $lang['mail_changed']          = 'leht muudetud';
+$lang['mail_subscribe_list']   = 'muutunud leheküljed nimeruumis:';
 $lang['mail_new_user']         = 'Uus kasutaja:';
+$lang['mail_upload']           = 'üles laetud fail:';
+$lang['changes_type']          = 'Näita mmutuseid';
+$lang['pages_changes']         = 'Leheküljed';
+$lang['media_changes']         = 'Meedia failid';
+$lang['both_changes']          = 'Mõlemid, leheküljed ja meedia failid';
 $lang['qb_bold']               = 'Rasvane kiri';
 $lang['qb_italic']             = 'Kaldkiri';
 $lang['qb_underl']             = 'Alajoonega kiri';
@@ -193,22 +237,42 @@ $lang['qb_media']              = 'Lisa pilte ja muid faile';
 $lang['qb_sig']                = 'Lisa allkiri!';
 $lang['qb_smileys']            = 'Emotikonid';
 $lang['qb_chars']              = 'Erisümbolid';
+$lang['upperns']               = 'mine ülemisse nimeruumi';
 $lang['admin_register']        = 'Lisa kasutaja';
 $lang['metaedit']              = 'Muuda lisainfot';
 $lang['metasaveerr']           = 'Lisainfo salvestamine läks untsu.';
 $lang['metasaveok']            = 'Lisainfo salvestatud';
-$lang['img_backto']            = 'Tagasi';
-$lang['img_title']             = 'Tiitel';
-$lang['img_caption']           = 'Kirjeldus';
-$lang['img_date']              = 'Kuupäev';
-$lang['img_fname']             = 'Faili nimi';
-$lang['img_fsize']             = 'Suurus';
-$lang['img_artist']            = 'Autor';
-$lang['img_copyr']             = 'Autoriõigused';
-$lang['img_format']            = 'Formaat';
-$lang['img_camera']            = 'Kaamera';
-$lang['img_keywords']          = 'Võtmesõnad';
+$lang['btn_img_backto']            = 'Tagasi %s';
+$lang['img_title']             = 'Tiitel:';
+$lang['img_caption']           = 'Kirjeldus:';
+$lang['img_date']              = 'Kuupäev:';
+$lang['img_fname']             = 'Faili nimi:';
+$lang['img_fsize']             = 'Suurus:';
+$lang['img_artist']            = 'Autor:';
+$lang['img_copyr']             = 'Autoriõigused:';
+$lang['img_format']            = 'Formaat:';
+$lang['img_camera']            = 'Kaamera:';
+$lang['img_keywords']          = 'Võtmesõnad:';
+$lang['img_width']             = 'Laius:';
+$lang['img_height']            = 'Kõrgus:';
+$lang['btn_mediaManager']           = 'Näita meediahalduris';
+$lang['subscr_subscribe_success'] = '%s lisati %s tellijaks';
+$lang['subscr_subscribe_error'] = 'Viga %s lisamisel %s tellijaks';
+$lang['subscr_subscribe_noaddress'] = 'Sinu kasutajaga pole seotud ühtegi aadressi, seega ei saa sind tellijaks lisada';
+$lang['subscr_unsubscribe_success'] = '%s eemaldati %s tellijatest';
+$lang['subscr_unsubscribe_error'] = 'Viga %s eemaldamisel %s tellijatest';
+$lang['subscr_already_subscribed'] = '%s on juba %s tellija';
+$lang['subscr_not_subscribed'] = '%s pole %s tellija';
+$lang['subscr_m_not_subscribed'] = 'Sina pole hetkel selle lehekülje ega nimeruumi tellija.';
+$lang['subscr_m_new_header']   = 'Lisa tellimus';
+$lang['subscr_m_current_header'] = 'Hetkel tellitud';
+$lang['subscr_m_unsubscribe']  = 'Eemalda tellimus';
+$lang['subscr_m_subscribe']    = 'Telli';
+$lang['subscr_style_every']    = 'igast toimetamisest teavitab ekiri';
+$lang['subscr_style_digest']   = 'kokkuvõte ekirjaga toimetamistest igal leheküljel (iga %.2f päeva järel)';
+$lang['subscr_style_list']     = 'Peale viimast ekirja (iga %.2f päeva järel) toimetaud lehekülgede loend.';
 $lang['authtempfail']          = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.';
+$lang['authpwdexpire']         = 'Sinu salasõna aegub %päeva pärast, võiksid seda peatselt muuta.';
 $lang['i_chooselang']          = 'Vali keel';
 $lang['i_installer']           = 'DokuWiki paigaldaja';
 $lang['i_wikiname']            = 'Wiki nimi';
@@ -218,9 +282,11 @@ $lang['i_problems']            = 'Paigaldaja leidis mõned vead, mis on allpool
 $lang['i_modified']            = 'Õnnetuste vältimiseks läheb see skript käima ainult värskelt paigaldatud ja muutmata Dokuwiki peal.
                        Sa peaksid ilmselt kogu koodi uuesti lahti pakkima. Vaata ka <a href="http://dokuwiki.org/install">Dokuwiki installeerimis juhendit</a>';
 $lang['i_funcna']              = 'PHP funktsiooni <code>%s</code> ei ole olemas.võibolla sinu serveri hooldaja on selle mingil põhjusel keelanud?';
+$lang['i_phpver']              = 'Sinu PHP versioon <code>%s</code> on vanem nõutavast <code>%s</code>. Pead oma paigaldatud PHP-d uuendama.';
 $lang['i_permfail']            = 'Dokuwiki ei saa kirjutada faili <code>%s</code>. Kontrolli serveris failide õigused üle.';
 $lang['i_confexists']          = '<code>%s</code> on juba olemas';
 $lang['i_writeerr']            = 'Faili <code>%s</code> ei lubata tekitada. Kontrolli kataloogi ja faili õigusi.';
+$lang['i_badhash']             = 'Tundmatu või muutunud dokuwiki.php (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - lubamatu või tühi väärtus';
 $lang['i_success']             = 'Seadistamine on õnnelikult lõpule viidud. Sa võid nüüd kustutada faili install.php. Alusta oma <a href="doku.php?id=wiki:welcome">uue DokuWiki</a> täitmist.';
 $lang['i_failure']             = 'Konfiguratsiooni faili kirjutamisel esines vigu. Võimalik, et pead need käsitsi parandama enne <a href="doku.php?id=wiki:welcome">uue DokuWiki</a> täitma asumist.';
@@ -228,4 +294,45 @@ $lang['i_policy']              = 'Wiki õiguste algne poliitika';
 $lang['i_pol0']                = 'Avatud (lugemine, kirjutamine ja üleslaadimine kõigile lubatud)';
 $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_allowreg']            = 'Luba kasutajail endid ise arvele võtta';
 $lang['i_retry']               = 'Proovi uuesti';
+$lang['i_license']             = 'Vali leping, mille alusel wiki sisu avaldatakse:';
+$lang['i_license_none']        = 'Ära näita mingit lepingu teavet';
+$lang['i_pop_field']           = 'Aitake meil täiendada DokuWiki kasutuskogemsut:';
+$lang['i_pop_label']           = 'Kord kuus, saada DokuWiki arendajatele anonüümseid kasutus andmeid.';
+$lang['recent_global']         = 'Uurid hetkel nimeruumi <b>%s</b> muudatusi. Võid uurida ka <a href="%s">kogu selle wiki</a> muudatusi.';
+$lang['years']                 = '%d aasta eest';
+$lang['months']                = '%d kuu eest';
+$lang['weeks']                 = '%d nädala eest';
+$lang['days']                  = '%d päeva eest';
+$lang['hours']                 = '%d tunni eest';
+$lang['minutes']               = '%d minuti eest';
+$lang['seconds']               = '%d sekundi eest';
+$lang['wordblock']             = 'Sinu toimetus jäeti muutmata tõrjutud teksti tõttu (rämpspost?).';
+$lang['media_uploadtab']       = 'Lae-↑ ';
+$lang['media_searchtab']       = 'Otsi';
+$lang['media_file']            = 'Fail';
+$lang['media_viewtab']         = 'Vaata';
+$lang['media_edittab']         = 'Toimeta';
+$lang['media_historytab']      = 'Ajalugu';
+$lang['media_list_thumbs']     = 'Pisipildid';
+$lang['media_list_rows']       = 'Ridu';
+$lang['media_sort_name']       = 'Nimi';
+$lang['media_sort_date']       = 'Kuupäev';
+$lang['media_namespaces']      = 'Vali nimeruum';
+$lang['media_files']           = 'Failid %s-is';
+$lang['media_upload']          = 'Lae %s-ssi';
+$lang['media_search']          = 'Leia %s-st';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s asub %s-s';
+$lang['media_edit']            = 'Muuda %s-i';
+$lang['media_history']         = '%s ajalugu';
+$lang['media_meta_edited']     = 'toimetati päiseteavet';
+$lang['media_perm_read']       = 'Sul pole piisavaid õigusi failide vaatamiseks';
+$lang['media_perm_upload']     = 'Sul pole piisavaid õigusi failide üleslaadimiseks';
+$lang['media_update']          = 'Lea üles uus järk';
+$lang['media_restore']         = 'Ennista sellele järgule';
+$lang['currentns']             = 'Hetke nimeruum';
+$lang['searchresult']          = 'Otsingu tulemus';
+$lang['plainhtml']             = 'Liht-HTML';
+$lang['wikimarkup']            = 'Wiki märgistus';
diff --git a/inc/lang/et/resetpwd.txt b/inc/lang/et/resetpwd.txt
new file mode 100644
index 000000000..3a802986f
--- /dev/null
+++ b/inc/lang/et/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Sea uus salasõna ======
+
+Sisesta oma selle wiki kasutajale uus salasõna
\ No newline at end of file
diff --git a/inc/lang/et/subscr_digest.txt b/inc/lang/et/subscr_digest.txt
new file mode 100644
index 000000000..7446fd9f4
--- /dev/null
+++ b/inc/lang/et/subscr_digest.txt
@@ -0,0 +1,21 @@
+Tere!
+
+Wiki-s @TITLE@ toimetati lehekülge @PAGE@.
+
+Muudatustest lähemalt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Endine: @OLDPAGE@
+Uus: @NEWPAGE@
+
+Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@
+ja mine: 
+@SUBSCRIBE@
+ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest.
+
+--
+Selle e-kirja lõi DokuWiki aadressilt
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/et/subscr_form.txt b/inc/lang/et/subscr_form.txt
new file mode 100644
index 000000000..61a005b47
--- /dev/null
+++ b/inc/lang/et/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Tellimuste haldus ======
+
+See lehekülg lubab sul hallata oma tellimusi antud leheküljele ja nimeruumile.
\ No newline at end of file
diff --git a/inc/lang/et/subscr_list.txt b/inc/lang/et/subscr_list.txt
new file mode 100644
index 000000000..0629651b7
--- /dev/null
+++ b/inc/lang/et/subscr_list.txt
@@ -0,0 +1,19 @@
+Tere!
+
+Wiki-s @TITLE@ toimetati nimeruumi @PAGE@.
+Muudatustest lähemalt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+Endine: @OLDPAGE@
+Uus: @NEWPAGE@
+
+Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@
+ja mine: 
+@SUBSCRIBE@
+ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest.
+
+--
+Selle e-kirja lõi DokuWiki aadressilt
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/et/subscr_single.txt b/inc/lang/et/subscr_single.txt
new file mode 100644
index 000000000..fff069f65
--- /dev/null
+++ b/inc/lang/et/subscr_single.txt
@@ -0,0 +1,23 @@
+Tere! 
+
+Wiki-s @TITLE@ toimetati lehekülge @PAGE@. 
+Muudatustest lähemalt: 
+ 
+-------------------------------------------------------- 
+@DIFF@ 
+-------------------------------------------------------- 
+
+Kuupäev : @DATE@ 
+Kasutaja : @USER@ 
+Kokkuvõte: @SUMMARY@ 
+Endine: @OLDPAGE@ 
+Uus: @NEWPAGE@ 
+
+Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ 
+ja mine: 
+@SUBSCRIBE@ 
+ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest.
+ 
+-- 
+Selle e-kirja lõi DokuWiki aadressilt 
+@DOKUWIKIURL@ 
\ No newline at end of file
diff --git a/inc/lang/et/uploadmail.txt b/inc/lang/et/uploadmail.txt
new file mode 100644
index 000000000..2d3a6aa7e
--- /dev/null
+++ b/inc/lang/et/uploadmail.txt
@@ -0,0 +1,16 @@
+Sinu DokuWiki-sse lisati fail.
+Lähemalt:
+
+  Fail                 : @MEDIA@
+  Endine            : @OLD@
+  Kuupäev         : @DATE@
+  Veebilehitseja : @BROWSER@
+  IP-aadress      : @IPADDRESS@
+  Hostinimi         : @HOSTNAME@
+  Suurus            : @SIZE@
+  MIME liik         : @MIME@
+  Kasutaja          : @ USER@
+
+-- 
+Selle e-kirja lõi DokuWiki aadressilt 
+@DOKUWIKIURL@ 
\ No newline at end of file
diff --git a/inc/lang/eu/denied.txt b/inc/lang/eu/denied.txt
index 257076a3d..869c4c7d8 100644
--- a/inc/lang/eu/denied.txt
+++ b/inc/lang/eu/denied.txt
@@ -1,3 +1,4 @@
 ====== Ez duzu baimenik ======
 
-Barkatu, ez duzu baimenik orri hau ikusteko. Agian sesioa hastea ahaztu zaizu?
\ No newline at end of file
+Barkatu, ez duzu baimenik orri hau ikusteko.
+
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index c7e7ead9a..0c996feaf 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -49,7 +49,7 @@ $lang['btn_revert']            = 'Berrezarri';
 $lang['btn_register']          = 'Erregistratu';
 $lang['btn_apply']             = 'Baieztatu';
 $lang['btn_media']             = 'Media Kudeatzailea';
-$lang['loggedinas']            = 'Erabiltzailea';
+$lang['loggedinas']            = 'Erabiltzailea:';
 $lang['user']                  = 'Erabiltzailea';
 $lang['pass']                  = 'Pasahitza';
 $lang['newpass']               = 'Pasahitz berria';
@@ -88,8 +88,8 @@ $lang['license']               = 'Besterik esan ezean, wiki hontako edukia ondor
 $lang['licenseok']             = 'Oharra: Orri hau editatzean, zure edukia ondorengo lizentziapean argitaratzea onartzen duzu: ';
 $lang['searchmedia']           = 'Bilatu fitxategi izena:';
 $lang['searchmedia_in']        = 'Bilatu %s-n';
-$lang['txt_upload']            = 'Ireki nahi den fitxategia aukeratu';
-$lang['txt_filename']          = 'Idatzi wikiname-a (aukerazkoa)';
+$lang['txt_upload']            = 'Ireki nahi den fitxategia aukeratu:';
+$lang['txt_filename']          = 'Idatzi wikiname-a (aukerazkoa):';
 $lang['txt_overwrt']           = 'Oraingo fitxategiaren gainean idatzi';
 $lang['lockedby']              = 'Momentu honetan blokeatzen:';
 $lang['lockexpire']            = 'Blokeaketa iraungitzen da:';
@@ -172,9 +172,9 @@ $lang['diff_type']             = 'Ikusi diferentziak:';
 $lang['diff_inline']           = 'Lerro tartean';
 $lang['diff_side']             = 'Ondoz ondo';
 $lang['line']                  = 'Marra';
-$lang['breadcrumb']            = 'Traza';
-$lang['youarehere']            = 'Hemen zaude';
-$lang['lastmod']               = 'Azken aldaketa';
+$lang['breadcrumb']            = 'Traza:';
+$lang['youarehere']            = 'Hemen zaude:';
+$lang['lastmod']               = 'Azken aldaketa:';
 $lang['by']                    = 'egilea:';
 $lang['deleted']               = 'ezabatua';
 $lang['created']               = 'sortua';
@@ -227,20 +227,20 @@ $lang['admin_register']        = 'Erabiltzaile berria gehitu';
 $lang['metaedit']              = 'Metadatua Aldatu';
 $lang['metasaveerr']           = 'Metadatuaren idazketak huts egin du';
 $lang['metasaveok']            = 'Metadatua gordea';
-$lang['img_backto']            = 'Atzera hona';
-$lang['img_title']             = 'Izenburua';
-$lang['img_caption']           = 'Epigrafea';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Fitxategi izena';
-$lang['img_fsize']             = 'Tamaina';
-$lang['img_artist']            = 'Artista';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formatua';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Hitz-gakoak';
-$lang['img_width']             = 'Zabalera';
-$lang['img_height']            = 'Altuera';
-$lang['img_manager']           = 'Media kudeatzailean ikusi';
+$lang['btn_img_backto']            = 'Atzera hona %s';
+$lang['img_title']             = 'Izenburua:';
+$lang['img_caption']           = 'Epigrafea:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Fitxategi izena:';
+$lang['img_fsize']             = 'Tamaina:';
+$lang['img_artist']            = 'Artista:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formatua:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Hitz-gakoak:';
+$lang['img_width']             = 'Zabalera:';
+$lang['img_height']            = 'Altuera:';
+$lang['btn_mediaManager']           = 'Media kudeatzailean ikusi';
 $lang['subscr_subscribe_success'] = '%s gehitua %s-ren harpidetza zerrendara';
 $lang['subscr_subscribe_error'] = 'Errorea %s gehitzen %s-ren harpidetza zerrendara';
 $lang['subscr_subscribe_noaddress'] = 'Ez dago helbiderik zure login-arekin lotuta, ezin zara harpidetza zerrendara gehitua izan.';
diff --git a/inc/lang/fa/denied.txt b/inc/lang/fa/denied.txt
index 827f73e2b..4bffa0f3c 100644
--- a/inc/lang/fa/denied.txt
+++ b/inc/lang/fa/denied.txt
@@ -1,3 +1,4 @@
 ====== دسترسی ممکن نیست ======
 
-شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید. ممکن است فراموش کرده باشید که وارد سایت شوید!
\ No newline at end of file
+شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید.
+
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index dbad62890..d3016c0bd 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -98,12 +98,12 @@ $lang['license']               = 'به جز مواردی که ذکر می‌شو
 $lang['licenseok']             = 'توجه: با ویرایش این صفحه، شما مجوز زیر را تایید می‌کنید:';
 $lang['searchmedia']           = 'نام فایل برای جستجو:';
 $lang['searchmedia_in']        = 'جستجو در %s';
-$lang['txt_upload']            = 'فایل را برای ارسال انتخاب کنید';
-$lang['txt_filename']          = 'ارسال به صورت (اختیاری)';
+$lang['txt_upload']            = 'فایل را برای ارسال انتخاب کنید:';
+$lang['txt_filename']          = 'ارسال به صورت (اختیاری):';
 $lang['txt_overwrt']           = 'بر روی فایل موجود بنویس';
 $lang['maxuploadsize']         = 'حداکثر %s برای هر فایل مجاز است.';
-$lang['lockedby']              = 'در حال حاضر قفل شده است';
-$lang['lockexpire']            = 'قفل منقضی شده است';
+$lang['lockedby']              = 'در حال حاضر قفل شده است:';
+$lang['lockexpire']            = 'قفل منقضی شده است:';
 $lang['js']['willexpire']      = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
 $lang['js']['notsavedyet']     = 'تغییرات ذخیره شده از بین خواهد رفت.
  می‌خواهید ادامه دهید؟';
@@ -185,9 +185,9 @@ $lang['diff_type']             = 'مشاهده تغییرات:';
 $lang['diff_inline']           = 'خطی';
 $lang['diff_side']             = 'کلی';
 $lang['line']                  = 'خط';
-$lang['breadcrumb']            = 'ردپا';
-$lang['youarehere']            = 'محل شما';
-$lang['lastmod']               = 'آخرین ویرایش';
+$lang['breadcrumb']            = 'ردپا:';
+$lang['youarehere']            = 'محل شما:';
+$lang['lastmod']               = 'آخرین ویرایش:';
 $lang['by']                    = 'توسط';
 $lang['deleted']               = 'حذف شد';
 $lang['created']               = 'ایجاد شد';
@@ -240,20 +240,20 @@ $lang['admin_register']        = 'یک حساب جدید بسازید';
 $lang['metaedit']              = 'ویرایش داده‌های متا';
 $lang['metasaveerr']           = 'نوشتن داده‌نما با مشکل مواجه شد';
 $lang['metasaveok']            = 'داده‌نما ذخیره شد';
-$lang['img_backto']            = 'بازگشت به ';
-$lang['img_title']             = 'عنوان تصویر';
-$lang['img_caption']           = 'عنوان';
-$lang['img_date']              = 'تاریخ';
-$lang['img_fname']             = 'نام فایل';
-$lang['img_fsize']             = 'اندازه';
-$lang['img_artist']            = 'عکاس/هنرمند';
-$lang['img_copyr']             = 'دارنده‌ی حق تکثیر';
-$lang['img_format']            = 'فرمت';
-$lang['img_camera']            = 'دوربین';
-$lang['img_keywords']          = 'واژه‌های کلیدی';
-$lang['img_width']             = 'عرض';
-$lang['img_height']            = 'ارتفاع';
-$lang['img_manager']           = 'دیدن در مدیریت محتوای چند رسانه ای';
+$lang['btn_img_backto']            = 'بازگشت به  %s';
+$lang['img_title']             = 'عنوان تصویر:';
+$lang['img_caption']           = 'عنوان:';
+$lang['img_date']              = 'تاریخ:';
+$lang['img_fname']             = 'نام فایل:';
+$lang['img_fsize']             = 'اندازه:';
+$lang['img_artist']            = 'عکاس/هنرمند:';
+$lang['img_copyr']             = 'دارنده‌ی حق تکثیر:';
+$lang['img_format']            = 'فرمت:';
+$lang['img_camera']            = 'دوربین:';
+$lang['img_keywords']          = 'واژه‌های کلیدی:';
+$lang['img_width']             = 'عرض:';
+$lang['img_height']            = 'ارتفاع:';
+$lang['btn_mediaManager']           = 'دیدن در مدیریت محتوای چند رسانه ای';
 $lang['subscr_subscribe_success'] = '%s به لیست آبونه %s افزوده شد';
 $lang['subscr_subscribe_error'] = 'اشکال در افزودن %s به لیست آبونه %s';
 $lang['subscr_subscribe_noaddress'] = 'هیچ آدرسی برای این عضویت اضافه نشده است، شما نمی‌توانید به لیست آبونه اضافه شوید';
diff --git a/inc/lang/fi/denied.txt b/inc/lang/fi/denied.txt
index cd31da06b..89ebd4830 100644
--- a/inc/lang/fi/denied.txt
+++ b/inc/lang/fi/denied.txt
@@ -1,3 +1,4 @@
 ====== Lupa evätty ======
 
-Sinulla ei ole tarpeeksi valtuuksia jatkaa. Ehkä unohdit kirjautua sisään?
+Sinulla ei ole tarpeeksi valtuuksia jatkaa.
+
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index feefc3da8..0f82c3b7a 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -53,7 +53,7 @@ $lang['btn_register']          = 'Rekisteröidy';
 $lang['btn_apply']             = 'Toteuta';
 $lang['btn_media']             = 'Media manager';
 $lang['btn_deleteuser']        = 'Poista tilini';
-$lang['loggedinas']            = 'Kirjautunut nimellä';
+$lang['loggedinas']            = 'Kirjautunut nimellä:';
 $lang['user']                  = 'Käyttäjänimi';
 $lang['pass']                  = 'Salasana';
 $lang['newpass']               = 'Uusi salasana';
@@ -98,12 +98,12 @@ $lang['license']               = 'Jollei muuta ole mainittu, niin sisältö täs
 $lang['licenseok']             = 'Huom: Muokkaamalla tätä sivua suostut lisensoimaan sisällön seuraavan lisenssin mukaisesti:';
 $lang['searchmedia']           = 'Etsi tiedostoa nimeltä:';
 $lang['searchmedia_in']        = 'Etsi kohteesta %s';
-$lang['txt_upload']            = 'Valitse tiedosto lähetettäväksi';
-$lang['txt_filename']          = 'Lähetä nimellä (valinnainen)';
+$lang['txt_upload']            = 'Valitse tiedosto lähetettäväksi:';
+$lang['txt_filename']          = 'Lähetä nimellä (valinnainen):';
 $lang['txt_overwrt']           = 'Ylikirjoita olemassa oleva';
 $lang['maxuploadsize']         = 'Palvelimelle siirto max. %s / tiedosto.';
-$lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut';
-$lang['lockexpire']            = 'Lukitus päättyy';
+$lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut:';
+$lang['lockexpire']            = 'Lukitus päättyy:';
 $lang['js']['willexpire']      = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
 $lang['js']['notsavedyet']     = 'Dokumentissa on tallentamattomia muutoksia, jotka häviävät.
  Haluatko varmasti jatkaa?';
@@ -185,9 +185,9 @@ $lang['diff_type']             = 'Näytä eroavaisuudet:';
 $lang['diff_inline']           = 'Sisäkkäin';
 $lang['diff_side']             = 'Vierekkäin';
 $lang['line']                  = 'Rivi';
-$lang['breadcrumb']            = 'Jäljet';
-$lang['youarehere']            = 'Olet täällä';
-$lang['lastmod']               = 'Viimeksi muutettu';
+$lang['breadcrumb']            = 'Jäljet:';
+$lang['youarehere']            = 'Olet täällä:';
+$lang['lastmod']               = 'Viimeksi muutettu:';
 $lang['by']                    = '/';
 $lang['deleted']               = 'poistettu';
 $lang['created']               = 'luotu';
@@ -240,20 +240,20 @@ $lang['admin_register']        = 'Lisää uusi käyttäjä';
 $lang['metaedit']              = 'Muokkaa metadataa';
 $lang['metasaveerr']           = 'Metadatan kirjoittaminen epäonnistui';
 $lang['metasaveok']            = 'Metadata tallennettu';
-$lang['img_backto']            = 'Takaisin';
-$lang['img_title']             = 'Otsikko';
-$lang['img_caption']           = 'Kuvateksti';
-$lang['img_date']              = 'Päivämäärä';
-$lang['img_fname']             = 'Tiedoston nimi';
-$lang['img_fsize']             = 'Koko';
-$lang['img_artist']            = 'Kuvaaja';
-$lang['img_copyr']             = 'Tekijänoikeus';
-$lang['img_format']            = 'Formaatti';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Avainsanat';
-$lang['img_width']             = 'Leveys';
-$lang['img_height']            = 'Korkeus';
-$lang['img_manager']           = 'Näytä mediamanagerissa';
+$lang['btn_img_backto']            = 'Takaisin %s';
+$lang['img_title']             = 'Otsikko:';
+$lang['img_caption']           = 'Kuvateksti:';
+$lang['img_date']              = 'Päivämäärä:';
+$lang['img_fname']             = 'Tiedoston nimi:';
+$lang['img_fsize']             = 'Koko:';
+$lang['img_artist']            = 'Kuvaaja:';
+$lang['img_copyr']             = 'Tekijänoikeus:';
+$lang['img_format']            = 'Formaatti:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Avainsanat:';
+$lang['img_width']             = 'Leveys:';
+$lang['img_height']            = 'Korkeus:';
+$lang['btn_mediaManager']           = 'Näytä mediamanagerissa';
 $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle';
 $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s';
 $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen';
diff --git a/inc/lang/fo/denied.txt b/inc/lang/fo/denied.txt
index 505b249b4..ecebba88c 100644
--- a/inc/lang/fo/denied.txt
+++ b/inc/lang/fo/denied.txt
@@ -1,3 +1,4 @@
 ====== Atgongd nokta! ======
 
-Tú hevur ikki rættindi til at halda áfram. Møguliga hevur tú ikki rita inn.
+Tú hevur ikki rættindi til at halda áfram.
+
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index 161e7321a..b326d27ac 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -45,7 +45,7 @@ $lang['btn_recover']           = 'Endurbygg kladdu';
 $lang['btn_draftdel']          = 'Sletta';
 $lang['btn_revert']            = 'Endurbygg';
 $lang['btn_register']          = 'Melda til';
-$lang['loggedinas']            = 'Ritavur inn sum';
+$lang['loggedinas']            = 'Ritavur inn sum:';
 $lang['user']                  = 'Brúkaranavn';
 $lang['pass']                  = 'Loyniorð';
 $lang['newpass']               = 'Nýtt loyniorð';
@@ -83,11 +83,11 @@ $lang['license']               = 'Um ikki annað er tilskilað, so er tilfar á
 $lang['licenseok']             = 'Legg til merkis: Við at dagføra hesa síðu samtykkir tú at loyva margfalding av tilfarinum undir fylgjandi treytum:';
 $lang['searchmedia']           = 'Leita eftir fíl navn:';
 $lang['searchmedia_in']        = 'Leita í %s';
-$lang['txt_upload']            = 'Vel tí fílu sum skal leggjast upp';
-$lang['txt_filename']          = 'Sláa inn wikinavn (valfrítt)';
+$lang['txt_upload']            = 'Vel tí fílu sum skal leggjast upp:';
+$lang['txt_filename']          = 'Sláa inn wikinavn (valfrítt):';
 $lang['txt_overwrt']           = 'Yvurskriva verandi fílu';
-$lang['lockedby']              = 'Fyribils læst av';
-$lang['lockexpire']            = 'Lásið ferð úr gildi kl.';
+$lang['lockedby']              = 'Fyribils læst av:';
+$lang['lockexpire']            = 'Lásið ferð úr gildi kl.:';
 $lang['js']['willexpire']            = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á Forskoðan-knappin fyri at sleppa undan trupulleikum.';
 $lang['js']['notsavedyet']     = 'Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.
 Ynskir tú at halda fram?';
@@ -124,9 +124,9 @@ $lang['current']               = 'núverandi';
 $lang['yours']                 = 'Tín útgáva';
 $lang['diff']                  = 'vís broytingar í mun til núverandi útgávu';
 $lang['line']                  = 'Linja';
-$lang['breadcrumb']            = 'Leið';
-$lang['youarehere']            = 'Tú ert her';
-$lang['lastmod']               = 'Seinast broytt';
+$lang['breadcrumb']            = 'Leið:';
+$lang['youarehere']            = 'Tú ert her:';
+$lang['lastmod']               = 'Seinast broytt:';
 $lang['by']                    = 'av';
 $lang['deleted']               = 'strika';
 $lang['created']               = 'stovna';
@@ -157,15 +157,15 @@ $lang['admin_register']        = 'Upprætta nýggjan brúkara';
 $lang['metaedit']              = 'Rætta metadáta';
 $lang['metasaveerr']           = 'Brek við skriving av metadáta';
 $lang['metasaveok']            = 'Metadáta goymt';
-$lang['img_backto']            = 'Aftur til';
-$lang['img_title']             = 'Heitið';
-$lang['img_caption']           = 'Myndatekstur';
-$lang['img_date']              = 'Dato';
-$lang['img_fname']             = 'Fílunavn';
-$lang['img_fsize']             = 'Stødd';
-$lang['img_artist']            = 'Myndafólk';
-$lang['img_copyr']             = 'Upphavsrættur';
-$lang['img_format']            = 'Snið';
-$lang['img_camera']            = 'Fototól';
-$lang['img_keywords']          = 'Evnisorð';
+$lang['btn_img_backto']            = 'Aftur til %s';
+$lang['img_title']             = 'Heitið:';
+$lang['img_caption']           = 'Myndatekstur:';
+$lang['img_date']              = 'Dato:';
+$lang['img_fname']             = 'Fílunavn:';
+$lang['img_fsize']             = 'Stødd:';
+$lang['img_artist']            = 'Myndafólk:';
+$lang['img_copyr']             = 'Upphavsrættur:';
+$lang['img_format']            = 'Snið:';
+$lang['img_camera']            = 'Fototól:';
+$lang['img_keywords']          = 'Evnisorð:';
 $lang['authtempfail']          = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.';
diff --git a/inc/lang/fr/denied.txt b/inc/lang/fr/denied.txt
index 20d4d6755..da01a4086 100644
--- a/inc/lang/fr/denied.txt
+++ b/inc/lang/fr/denied.txt
@@ -1,3 +1,4 @@
 ====== Autorisation refusée ======
 
-Désolé, vous n'avez pas les droits pour continuer. Peut-être avez-vous oublié de vous identifier ?
+Désolé, vous n'avez pas suffisement d'autorisations pour poursuivre votre demande.
+
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 49f617323..c5edd4cf7 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -29,6 +29,12 @@
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  * @author Emmanuel <seedfloyd@gmail.com>
  * @author Jérôme Brandt <jeromebrandt@gmail.com>
+ * @author Wild <wild.dagger@free.fr>
+ * @author ggallon <gwenael.gallon@mac.com>
+ * @author David VANTYGHEM <david.vantyghem@free.fr>
+ * @author Caillot <remicaillot5@gmail.com>
+ * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
+ * @author YoBoY <yoboy@ubuntu-fr.org>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -49,19 +55,19 @@ $lang['btn_newer']             = '<< Plus récent';
 $lang['btn_older']             = 'Moins récent >>';
 $lang['btn_revs']              = 'Anciennes révisions';
 $lang['btn_recent']            = 'Derniers changements';
-$lang['btn_upload']            = 'Envoyer';
+$lang['btn_upload']            = 'Téléverser';
 $lang['btn_cancel']            = 'Annuler';
-$lang['btn_index']             = 'Index';
+$lang['btn_index']             = 'Plan du site';
 $lang['btn_secedit']           = 'Modifier';
-$lang['btn_login']             = 'Connexion';
-$lang['btn_logout']            = 'Déconnexion';
+$lang['btn_login']             = 'S\'identifier';
+$lang['btn_logout']            = 'Se déconnecter';
 $lang['btn_admin']             = 'Administrer';
 $lang['btn_update']            = 'Mettre à jour';
 $lang['btn_delete']            = 'Effacer';
 $lang['btn_back']              = 'Retour';
-$lang['btn_backlink']          = 'Liens vers cette page';
+$lang['btn_backlink']          = 'Liens de retour';
 $lang['btn_backtomedia']       = 'Retour à la sélection du fichier média';
-$lang['btn_subscribe']         = 'S\'abonner à la page';
+$lang['btn_subscribe']         = 'Gérer souscriptions';
 $lang['btn_profile']           = 'Mettre à jour le profil';
 $lang['btn_reset']             = 'Réinitialiser';
 $lang['btn_resendpwd']         = 'Définir un nouveau mot de passe';
@@ -69,11 +75,13 @@ $lang['btn_draft']             = 'Modifier le brouillon';
 $lang['btn_recover']           = 'Récupérer le brouillon';
 $lang['btn_draftdel']          = 'Effacer le brouillon';
 $lang['btn_revert']            = 'Restaurer';
-$lang['btn_register']          = 'S\'enregistrer';
+$lang['btn_register']          = 'Créer un compte';
 $lang['btn_apply']             = 'Appliquer';
 $lang['btn_media']             = 'Gestionnaire de médias';
 $lang['btn_deleteuser']        = 'Supprimer mon compte';
-$lang['loggedinas']            = 'Connecté en tant que ';
+$lang['btn_img_backto']        = 'Retour vers %s';
+$lang['btn_mediaManager']      = 'Voir dans le gestionnaire de médias';
+$lang['loggedinas']            = 'Connecté en tant que :';
 $lang['user']                  = 'Utilisateur';
 $lang['pass']                  = 'Mot de passe';
 $lang['newpass']               = 'Nouveau mot de passe';
@@ -83,20 +91,20 @@ $lang['remember']              = 'Mémoriser';
 $lang['fullname']              = 'Nom';
 $lang['email']                 = 'Adresse de courriel';
 $lang['profile']               = 'Profil utilisateur';
-$lang['badlogin']              = 'L\'utilisateur ou le mot de passe est incorrect.';
+$lang['badlogin']              = 'Le nom d\'utilisateur ou le mot de passe est incorrect.';
 $lang['badpassconfirm']        = 'Désolé, le mot de passe est erroné';
 $lang['minoredit']             = 'Modification mineure';
-$lang['draftdate']             = 'Brouillon enregistré de manière automatique le';
+$lang['draftdate']             = 'Brouillon enregistré automatiquement le';
 $lang['nosecedit']             = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.';
 $lang['regmissing']            = 'Désolé, vous devez remplir tous les champs.';
-$lang['reguexists']            = 'Désolé, ce nom d\'utilisateur est déjà utilisé.';
+$lang['reguexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris.';
 $lang['regsuccess']            = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
 $lang['regsuccess2']           = 'L\'utilisateur a été créé.';
-$lang['regmailfail']           = 'Il semble y avoir un problème à l\'envoi du courriel. Contactez l\'administrateur.';
+$lang['regmailfail']           = 'On dirait qu\'il y a eu une erreur lors de l\'envoi du mot de passe de messagerie. Veuillez contacter l\'administrateur !';
 $lang['regbadmail']            = 'L\'adresse de courriel semble incorrecte. Si vous pensez que c\'est une erreur, contactez l\'administrateur.';
 $lang['regbadpass']            = 'Les deux mots de passe fournis sont différents, veuillez recommencez.';
 $lang['regpwmail']             = 'Votre mot de passe DokuWiki';
-$lang['reghere']               = 'Vous n\'avez pas encore de compte ? Enregistrez-vous ici ';
+$lang['reghere']               = 'Vous n\'avez pas encore de compte ? Inscrivez-vous';
 $lang['profna']                = 'Ce wiki ne permet pas de modifier les profils';
 $lang['profnochange']          = 'Pas de modification, rien à faire.';
 $lang['profnoempty']           = 'Un nom ou une adresse de courriel vide n\'est pas permis.';
@@ -118,12 +126,12 @@ $lang['license']               = 'Sauf mention contraire, le contenu de ce wiki
 $lang['licenseok']             = 'Note : En modifiant cette page, vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
 $lang['searchmedia']           = 'Chercher le nom de fichier :';
 $lang['searchmedia_in']        = 'Chercher dans %s';
-$lang['txt_upload']            = 'Sélectionnez un fichier à envoyer ';
-$lang['txt_filename']          = 'Envoyer en tant que (optionnel) ';
+$lang['txt_upload']            = 'Sélectionnez un fichier à envoyer:';
+$lang['txt_filename']          = 'Envoyer en tant que (optionnel):';
 $lang['txt_overwrt']           = 'Écraser le fichier cible (s\'il existe)';
 $lang['maxuploadsize']         = 'Taille d\'envoi maximale : %s par fichier';
-$lang['lockedby']              = 'Actuellement bloqué par';
-$lang['lockexpire']            = 'Le blocage expire à';
+$lang['lockedby']              = 'Actuellement bloqué par:';
+$lang['lockexpire']            = 'Le blocage expire à:';
 $lang['js']['willexpire']      = 'Votre blocage 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';
@@ -202,10 +210,15 @@ $lang['difflink']              = 'Lien vers cette vue comparative';
 $lang['diff_type']             = 'Voir les différences :';
 $lang['diff_inline']           = 'Sur une seule ligne';
 $lang['diff_side']             = 'Côte à côte';
+$lang['diffprevrev']           = 'Révision précédente';
+$lang['diffnextrev']           = 'Prochaine révision';
+$lang['difflastrev']           = 'Dernière révision';
+$lang['diffbothprevrev']       = 'Les deux révisions précédentes';
+$lang['diffbothnextrev']       = 'Les deux révisions suivantes';
 $lang['line']                  = 'Ligne';
-$lang['breadcrumb']            = 'Piste';
-$lang['youarehere']            = 'Vous êtes ici';
-$lang['lastmod']               = 'Dernière modification';
+$lang['breadcrumb']            = 'Piste:';
+$lang['youarehere']            = 'Vous êtes ici:';
+$lang['lastmod']               = 'Dernière modification:';
 $lang['by']                    = 'par';
 $lang['deleted']               = 'supprimée';
 $lang['created']               = 'créée';
@@ -258,20 +271,18 @@ $lang['admin_register']        = 'Ajouter un nouvel utilisateur';
 $lang['metaedit']              = 'Modifier les métadonnées';
 $lang['metasaveerr']           = 'Erreur lors de l\'enregistrement des métadonnées';
 $lang['metasaveok']            = 'Métadonnées enregistrées';
-$lang['img_backto']            = 'Retour à';
-$lang['img_title']             = 'Titre';
-$lang['img_caption']           = 'Légende';
-$lang['img_date']              = 'Date';
-$lang['img_fname']             = 'Nom de fichier';
-$lang['img_fsize']             = 'Taille';
-$lang['img_artist']            = 'Photographe';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Appareil photo';
-$lang['img_keywords']          = 'Mots-clés';
-$lang['img_width']             = 'Largeur';
-$lang['img_height']            = 'Hauteur';
-$lang['img_manager']           = 'Voir dans le gestionnaire de médias';
+$lang['img_title']             = 'Titre:';
+$lang['img_caption']           = 'Légende:';
+$lang['img_date']              = 'Date:';
+$lang['img_fname']             = 'Nom de fichier:';
+$lang['img_fsize']             = 'Taille:';
+$lang['img_artist']            = 'Photographe:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Appareil photo:';
+$lang['img_keywords']          = 'Mots-clés:';
+$lang['img_width']             = 'Largeur:';
+$lang['img_height']            = 'Hauteur:';
 $lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s';
 $lang['subscr_subscribe_error'] = 'Erreur à l\'ajout de %s à la liste de souscription de %s';
 $lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription';
@@ -299,6 +310,7 @@ $lang['i_problems']            = 'L\'installateur a détecté les problèmes ind
 $lang['i_modified']            = 'Pour des raisons de sécurité, ce script ne fonctionne qu\'avec une installation neuve et non modifiée de DokuWiki. Vous devriez ré-extraire les fichiers depuis le paquet téléchargé ou consulter les <a href="http://dokuwiki.org/install">instructions d\'installation de DokuWiki</a>';
 $lang['i_funcna']              = 'La fonction PHP <code>%s</code> n\'est pas disponible. Peut-être que votre hébergeur web l\'a désactivée ?';
 $lang['i_phpver']              = 'Votre version de PHP (%s) est antérieure à la version requise (%s). Vous devez mettre à jour votre installation de PHP.';
+$lang['i_mbfuncoverload']      = 'Il faut désactiver mbstring.func_overload dans php.ini pour DokuWiki';
 $lang['i_permfail']            = '<code>%s</code> n\'est pas accessible en écriture pour DokuWiki. Vous devez corriger les autorisations de ce répertoire !';
 $lang['i_confexists']          = '<code>%s</code> existe déjà';
 $lang['i_writeerr']            = 'Impossible de créer <code>%s</code>. Vous devez vérifier les autorisations des répertoires/fichiers et créer le fichier manuellement.';
diff --git a/inc/lang/fr/subscr_form.txt b/inc/lang/fr/subscr_form.txt
index 49c0cf443..d68c05e6a 100644
--- a/inc/lang/fr/subscr_form.txt
+++ b/inc/lang/fr/subscr_form.txt
@@ -1,3 +1,3 @@
-====== Gestion de l'abonnement ======
+====== Gestion des souscriptions ======
 
-Cette page vous permet de gérer vos abonnements à la page et à la catégorie courantes
\ No newline at end of file
+Cette page vous permet de gérer vos souscriptions pour suivre les modifications sur la page et sur la catégorie courante.
\ No newline at end of file
diff --git a/inc/lang/gl/denied.txt b/inc/lang/gl/denied.txt
index 69408a4f3..ef37a06f0 100644
--- a/inc/lang/gl/denied.txt
+++ b/inc/lang/gl/denied.txt
@@ -1,4 +1,4 @@
 ====== Permiso Denegado ======
 
-Sentímolo, mais non tes permisos de abondo para continuares. Pode que esqueceses iniciar a sesión?
+Sentímolo, mais non tes permisos de abondo para continuares.
 
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 65967a3b5..aed225359 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -49,7 +49,7 @@ $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['loggedinas']            = 'Iniciaches sesión como:';
 $lang['user']                  = 'Nome de Usuario';
 $lang['pass']                  = 'Contrasinal';
 $lang['newpass']               = 'Novo Contrasinal';
@@ -88,12 +88,12 @@ $lang['license']               = 'O contido deste wiki, agás onde se indique o
 $lang['licenseok']             = 'Nota: Ao editares esta páxina estás a aceptar o licenciamento do contido baixo da seguinte licenza:';
 $lang['searchmedia']           = 'Procurar nome de arquivo:';
 $lang['searchmedia_in']        = 'Procurar en %s';
-$lang['txt_upload']            = 'Escolle o arquivo para subir';
-$lang['txt_filename']          = 'Subir como (opcional)';
+$lang['txt_upload']            = 'Escolle o arquivo para subir:';
+$lang['txt_filename']          = 'Subir como (opcional):';
 $lang['txt_overwrt']           = 'Sobrescribir arquivo existente';
 $lang['maxuploadsize']         = 'Subida máxima %s por arquivo.';
-$lang['lockedby']              = 'Bloqueado actualmente por';
-$lang['lockexpire']            = 'O bloqueo remata o';
+$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.
 Está certo de quereres continuar?';
@@ -175,9 +175,9 @@ $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í';
-$lang['lastmod']               = 'Última modificación';
+$lang['breadcrumb']            = 'Trazado:';
+$lang['youarehere']            = 'Estás aquí:';
+$lang['lastmod']               = 'Última modificación:';
 $lang['by']                    = 'por';
 $lang['deleted']               = 'eliminado';
 $lang['created']               = 'creado';
@@ -230,20 +230,20 @@ $lang['admin_register']        = 'Engadir novo usuario';
 $lang['metaedit']              = 'Editar Metadatos';
 $lang['metasaveerr']           = 'Non se puideron escribir os metadatos';
 $lang['metasaveok']            = 'Metadatos gardados';
-$lang['img_backto']            = 'Volver a';
-$lang['img_title']             = 'Título';
-$lang['img_caption']           = 'Lenda';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nome de arquivo';
-$lang['img_fsize']             = 'Tamaño';
-$lang['img_artist']            = 'Fotógrafo';
-$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['btn_img_backto']            = 'Volver a %s';
+$lang['img_title']             = 'Título:';
+$lang['img_caption']           = 'Lenda:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nome de arquivo:';
+$lang['img_fsize']             = 'Tamaño:';
+$lang['img_artist']            = 'Fotógrafo:';
+$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['btn_mediaManager']           = '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';
diff --git a/inc/lang/he/denied.txt b/inc/lang/he/denied.txt
index a366fc198..a2e19f3c5 100644
--- a/inc/lang/he/denied.txt
+++ b/inc/lang/he/denied.txt
@@ -1,3 +1,4 @@
 ====== הרשאה נדחתה ======
 
-אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך. אולי שכחת להיכנס למערכת?
\ No newline at end of file
+אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך.
+
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 8efe0da17..101102b48 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -57,7 +57,7 @@ $lang['btn_register']          = 'הרשמה';
 $lang['btn_apply']             = 'ליישם';
 $lang['btn_media']             = 'מנהל המדיה';
 $lang['btn_deleteuser']        = 'להסיר את החשבון שלי';
-$lang['loggedinas']            = 'נכנסת בשם';
+$lang['loggedinas']            = 'נכנסת בשם:';
 $lang['user']                  = 'שם משתמש';
 $lang['pass']                  = 'ססמה';
 $lang['newpass']               = 'ססמה חדשה';
@@ -102,12 +102,12 @@ $lang['license']               = 'למעט מקרים בהם צוין אחרת,
 $lang['licenseok']             = 'נא לשים לב: עריכת דף זה מהווה הסכמה מצדך להצגת התוכן שהוספת בהתאם הרישיון הבא:';
 $lang['searchmedia']           = 'חיפוש שם קובץ:';
 $lang['searchmedia_in']        = 'חיפוש תחת %s';
-$lang['txt_upload']            = 'בחירת קובץ להעלות';
-$lang['txt_filename']          = 'העלאה בשם (נתון לבחירה)';
+$lang['txt_upload']            = 'בחירת קובץ להעלות:';
+$lang['txt_filename']          = 'העלאה בשם (נתון לבחירה):';
 $lang['txt_overwrt']           = 'שכתוב על קובץ קיים';
 $lang['maxuploadsize']         = 'העלה מקסימום. s% לכל קובץ.';
-$lang['lockedby']              = 'נעול על ידי';
-$lang['lockexpire']            = 'הנעילה פגה';
+$lang['lockedby']              = 'נעול על ידי:';
+$lang['lockexpire']            = 'הנעילה פגה:';
 $lang['js']['willexpire']      = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.';
 $lang['js']['notsavedyet']     = 'שינויים שלא נשמרו ילכו לאיבוד.';
 $lang['js']['searchmedia']     = 'חיפוש אחר קבצים';
@@ -188,9 +188,9 @@ $lang['diff_type']             = 'הצגת הבדלים:';
 $lang['diff_inline']           = 'באותה השורה';
 $lang['diff_side']             = 'זה לצד זה';
 $lang['line']                  = 'שורה';
-$lang['breadcrumb']            = 'ביקורים אחרונים';
-$lang['youarehere']            = 'זהו מיקומך';
-$lang['lastmod']               = 'מועד השינוי האחרון';
+$lang['breadcrumb']            = 'ביקורים אחרונים:';
+$lang['youarehere']            = 'זהו מיקומך:';
+$lang['lastmod']               = 'מועד השינוי האחרון:';
 $lang['by']                    = 'על ידי';
 $lang['deleted']               = 'נמחק';
 $lang['created']               = 'נוצר';
@@ -243,20 +243,20 @@ $lang['admin_register']        = 'הוספת משתמש חדש';
 $lang['metaedit']              = 'עריכת נתוני העל';
 $lang['metasaveerr']           = 'אירע כשל בשמירת נתוני העל';
 $lang['metasaveok']            = 'נתוני העל נשמרו';
-$lang['img_backto']            = 'חזרה אל';
-$lang['img_title']             = 'שם';
-$lang['img_caption']           = 'כותרת';
-$lang['img_date']              = 'תאריך';
-$lang['img_fname']             = 'שם הקובץ';
-$lang['img_fsize']             = 'גודל';
-$lang['img_artist']            = 'צלם';
-$lang['img_copyr']             = 'זכויות יוצרים';
-$lang['img_format']            = 'מבנה';
-$lang['img_camera']            = 'מצלמה';
-$lang['img_keywords']          = 'מילות מפתח';
-$lang['img_width']             = 'רוחב';
-$lang['img_height']            = 'גובה';
-$lang['img_manager']           = 'צפה במנהל מדיה';
+$lang['btn_img_backto']            = 'חזרה אל %s';
+$lang['img_title']             = 'שם:';
+$lang['img_caption']           = 'כותרת:';
+$lang['img_date']              = 'תאריך:';
+$lang['img_fname']             = 'שם הקובץ:';
+$lang['img_fsize']             = 'גודל:';
+$lang['img_artist']            = 'צלם:';
+$lang['img_copyr']             = 'זכויות יוצרים:';
+$lang['img_format']            = 'מבנה:';
+$lang['img_camera']            = 'מצלמה:';
+$lang['img_keywords']          = 'מילות מפתח:';
+$lang['img_width']             = 'רוחב:';
+$lang['img_height']            = 'גובה:';
+$lang['btn_mediaManager']           = 'צפה במנהל מדיה';
 $lang['subscr_subscribe_success'] = '%s נוסף לרשימת המינויים לדף %s';
 $lang['subscr_subscribe_error'] = 'אירעה שגיאה בהוספת %s לרשימת המינויים לדף %s';
 $lang['subscr_subscribe_noaddress'] = 'אין כתובת המשויכת עם הכניסה שלך, נא ניתן להוסיף אותך לרשימת המינויים';
@@ -285,7 +285,7 @@ $lang['i_modified']            = 'משיקולי אבטחה סקריפט זה י
                          עליך לחלץ שנית את הקבצים מהחבילה שהורדה או להיעזר בדף
                          <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
 $lang['i_funcna']              = 'פונקציית ה-PHP&rlm; <code>%s</code> אינה זמינה. יתכן כי מארח האתר חסם אותה מסיבה כלשהי?';
-$lang['i_phpver']              = 'גרסת PHP שלך <code>%s</code> נמוכה מ <code>%s</ code> הצורך. אתה צריך לשדרג PHP שלך להתקין.';
+$lang['i_phpver']              = 'גרסת PHP שלך <code>%s</code> נמוכה מ <code>%s</code> הצורך. אתה צריך לשדרג PHP שלך להתקין.';
 $lang['i_permfail']            = '<code>%s</code> אינה ניתנת לכתיבה על ידי DokuWiki. עליך לשנות הרשאות תיקייה זו!';
 $lang['i_confexists']          = '<code>%s</code> כבר קיים';
 $lang['i_writeerr']            = 'אין אפשרות ליצור את <code>%s</code>. נא לבדוק את הרשאות הקובץ/תיקייה וליצור את הקובץ ידנית.';
diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php
index 184eeedbc..71795191c 100644
--- a/inc/lang/hi/lang.php
+++ b/inc/lang/hi/lang.php
@@ -63,11 +63,11 @@ $lang['profna']                = 'यह विकी प्रोफ़ाइ�
 $lang['profnochange']          = 'कोई परिवर्तन नहीं, कुछ नहीं करना |';
 $lang['resendpwdmissing']      = 'छमा करें, आपको सारे रिक्त स्थान भरने पड़ेंगे |';
 $lang['resendpwdsuccess']      = 'आपका नवगुप्तशब्द ईमेल द्वारा सम्प्रेषित कर दिया गया है |';
-$lang['txt_upload']            = 'अपलोड करने के लिए फ़ाइल चुनें';
-$lang['txt_filename']          = 'के रूप में अपलोड करें (वैकल्पिक)';
+$lang['txt_upload']            = 'अपलोड करने के लिए फ़ाइल चुनें:';
+$lang['txt_filename']          = 'के रूप में अपलोड करें (वैकल्पिक):';
 $lang['txt_overwrt']           = 'अधिलेखित उपस्थित फ़ाइल';
-$lang['lockedby']              = 'इस समय तक बंद';
-$lang['lockexpire']            = 'बंद समाप्त होगा';
+$lang['lockedby']              = 'इस समय तक बंद:';
+$lang['lockexpire']            = 'बंद समाप्त होगा:';
 $lang['js']['hidedetails']     = 'विवरण छिपाएँ';
 $lang['nothingfound']          = 'कुच्छ नहीं मिला |';
 $lang['uploadexist']           = 'फ़ाइल पहले से उपस्थित है. कुछ भी नहीं किया |';
@@ -81,8 +81,8 @@ $lang['yours']                 = 'आपका संस्करणः';
 $lang['diff']                  = 'वर्तमान संशोधन में मतभेद दिखाइये |';
 $lang['diff2']                 = 'चयनित संशोधन के बीच में मतभेद दिखाइये |';
 $lang['line']                  = 'रेखा';
-$lang['youarehere']            = 'आप यहाँ हैं |';
-$lang['lastmod']               = 'अंतिम बार संशोधित';
+$lang['youarehere']            = 'आप यहाँ हैं |:';
+$lang['lastmod']               = 'अंतिम बार संशोधित:';
 $lang['by']                    = 'के द्वारा';
 $lang['deleted']               = 'हटाया';
 $lang['created']               = 'निर्मित';
@@ -103,14 +103,14 @@ $lang['qb_extlink']            = 'बाह्य कड़ी';
 $lang['qb_hr']                 = 'खड़ी रेखा';
 $lang['qb_sig']                = 'हस्ताक्षर डालें';
 $lang['admin_register']        = 'नया उपयोगकर्ता जोड़ें';
-$lang['img_backto']            = 'वापस जाना';
-$lang['img_title']             = 'शीर्षक';
-$lang['img_caption']           = 'सहशीर्षक';
-$lang['img_date']              = 'तिथि';
-$lang['img_fsize']             = 'आकार';
-$lang['img_artist']            = 'फोटोग्राफर';
-$lang['img_format']            = 'प्रारूप';
-$lang['img_camera']            = 'कैमरा';
+$lang['btn_img_backto']            = 'वापस जाना %s';
+$lang['img_title']             = 'शीर्षक:';
+$lang['img_caption']           = 'सहशीर्षक:';
+$lang['img_date']              = 'तिथि:';
+$lang['img_fsize']             = 'आकार:';
+$lang['img_artist']            = 'फोटोग्राफर:';
+$lang['img_format']            = 'प्रारूप:';
+$lang['img_camera']            = 'कैमरा:';
 $lang['i_chooselang']          = 'अपनी भाषा चुनें';
 $lang['i_installer']           = 'डोकुविकी इंस्टॉलर';
 $lang['i_wikiname']            = 'विकी का नाम';
diff --git a/inc/lang/hr/adminplugins.txt b/inc/lang/hr/adminplugins.txt
new file mode 100644
index 000000000..556ffda0b
--- /dev/null
+++ b/inc/lang/hr/adminplugins.txt
@@ -0,0 +1 @@
+===== Dodatni Pluginovi =====
\ No newline at end of file
diff --git a/inc/lang/hr/denied.txt b/inc/lang/hr/denied.txt
index 216eea582..172b0fc92 100644
--- a/inc/lang/hr/denied.txt
+++ b/inc/lang/hr/denied.txt
@@ -2,4 +2,3 @@
 
 Nemate autorizaciju.
 
-Niste li se možda zaboravili prijaviti u aplikaciju?
diff --git a/inc/lang/hr/draft.txt b/inc/lang/hr/draft.txt
new file mode 100644
index 000000000..2e6e08429
--- /dev/null
+++ b/inc/lang/hr/draft.txt
@@ -0,0 +1,4 @@
+====== Nađena neuspjelo uređivanje stranice ======
+
+Vaše zadnje uređivanje ove stranice nije završilo uredno. DokuWiki je automatski snimio kopiju tijekom rada koju sada možete iskoristiti da nastavite uređivanje. Niže možete vidjeti sadržaj koji je snimljen pri vašem zadnjem uređivanju.
+Molimo odlučite da li želite //vratiti// ili //obrisati// snimljeni sadržaj pri vašem zadnjem neuspjelom uređivanju, ili pak želite //odustati// od uređivanja.
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index f19610827..6a3fa20e2 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
- * croatian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Tomo Krajina <aaa@puzz.info>
  * @author Branko Rihtman <theney@gmail.com>
  * @author Dražen Odobašić <dodobasic@gmail.com>
  * @author Dejan Igrec dejan.igrec@gmail.com
+ * @author Davor Turkalj <turki.bsc@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -42,12 +43,18 @@ $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']         = 'Postavi novu lozinku';
 $lang['btn_draft']             = 'Uredi nacrt dokumenta';
 $lang['btn_recover']           = 'Vrati prijašnji nacrt dokumenta';
 $lang['btn_draftdel']          = 'Obriši nacrt dokumenta';
 $lang['btn_revert']            = 'Vrati';
 $lang['btn_register']          = 'Registracija';
-$lang['loggedinas']            = 'Prijavljen kao';
+$lang['btn_apply']             = 'Primjeni';
+$lang['btn_media']             = 'Upravitelj datoteka';
+$lang['btn_deleteuser']        = 'Ukloni mojeg korisnika';
+$lang['btn_img_backto']        = 'Povratak na %s';
+$lang['btn_mediaManager']      = 'Pogledaj u upravitelju datoteka';
+$lang['loggedinas']            = 'Prijavljen kao:';
 $lang['user']                  = 'Korisničko ime';
 $lang['pass']                  = 'Lozinka';
 $lang['newpass']               = 'Nova lozinka';
@@ -58,6 +65,7 @@ $lang['fullname']              = 'Ime i prezime';
 $lang['email']                 = 'Email';
 $lang['profile']               = 'Korisnički profil';
 $lang['badlogin']              = 'Ne ispravno korisničko ime ili lozinka.';
+$lang['badpassconfirm']        = 'Nažalost, lozinka nije ispravna';
 $lang['minoredit']             = 'Manje izmjene';
 $lang['draftdate']             = 'Nacrt dokumenta je automatski spremljen u ';
 $lang['nosecedit']             = 'Stranica se u međuvremenu promijenila. Informacija o odjeljku je ostarila pa je učitana kompletna stranica.';
@@ -74,8 +82,14 @@ $lang['profna']                = 'Ovaj wiki ne dopušta izmjene korisničkog pro
 $lang['profnochange']          = 'Nema izmjena.';
 $lang['profnoempty']           = 'Prazno korisničko ime ili email nisu dopušteni.';
 $lang['profchanged']           = 'Korisnički profil je uspješno izmijenjen.';
+$lang['profnodelete']          = 'Ovaj wiki ne podržava brisanje korisnika';
+$lang['profdeleteuser']        = 'Obriši korisnika';
+$lang['profdeleted']           = 'Vaš korisnik je obrisan s ovog wiki-a';
+$lang['profconfdelete']        = 'Želim ukloniti mojeg korisnika s ovog wiki-a. <br/> Ova akcija se ne može poništiti.';
+$lang['profconfdeletemissing'] = 'Kvačica za potvrdu nije označena';
 $lang['pwdforget']             = 'Izgubili ste lozinku? Zatražite novu';
 $lang['resendna']              = 'Ovaj wiki ne podržava ponovno slanje lozinke emailom.';
+$lang['resendpwd']             = 'Postavi 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.';
@@ -85,12 +99,13 @@ $lang['license']               = 'Osim na mjestima gdje je naznačeno drugačije
 $lang['licenseok']             = 'Pažnja: promjenom ovog dokumenta pristajete licencirati sadržaj sljedećom licencom: ';
 $lang['searchmedia']           = 'Traži naziv datoteke:';
 $lang['searchmedia_in']        = 'Traži u %s';
-$lang['txt_upload']            = 'Odaberite datoteku za postavljanje';
-$lang['txt_filename']          = 'Postaviti kao (nije obavezno)';
+$lang['txt_upload']            = 'Odaberite datoteku za postavljanje:';
+$lang['txt_filename']          = 'Postaviti kao (nije obavezno):';
 $lang['txt_overwrt']           = 'Prepiši postojeću datoteku';
-$lang['lockedby']              = 'Zaključao';
-$lang['lockexpire']            = 'Zaključano do';
-$lang['js']['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
+$lang['maxuploadsize']         = 'Moguće je učitati maks. %s po datoteci.';
+$lang['lockedby']              = 'Zaključao:';
+$lang['lockexpire']            = 'Zaključano do:';
+$lang['js']['willexpire']      = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
 $lang['js']['notsavedyet']     = 'Vaše izmjene će se izgubiti.
 Želite li nastaviti?';
 $lang['js']['searchmedia']     = 'Traži datoteke';
@@ -121,6 +136,17 @@ $lang['js']['nosmblinks']      = 'Linkovi na dijeljene Windows mape rade samo s
 $lang['js']['linkwiz']         = 'Čarobnjak za poveznice';
 $lang['js']['linkto']          = 'Poveznica na:';
 $lang['js']['del_confirm']     = 'Zbilja želite obrisati odabrane stavke?';
+$lang['js']['restore_confirm'] = 'Zaista želite vratiti ovu verziju?';
+$lang['js']['media_diff']      = 'Pogledaj razlike:';
+$lang['js']['media_diff_both'] = 'Usporedni prikaz';
+$lang['js']['media_diff_opacity'] = 'Sjaj kroz';
+$lang['js']['media_diff_portions'] = 'Pomakni';
+$lang['js']['media_select']    = 'Odaberi datoteke ...';
+$lang['js']['media_upload_btn'] = 'Učitavanje';
+$lang['js']['media_done_btn']  = 'Gotovo';
+$lang['js']['media_drop']      = 'Ovdje spusti datoteke za učitavanje';
+$lang['js']['media_cancel']    = 'ukloni';
+$lang['js']['media_overwrt']   = 'Prepiši preko postojeće datoteke';
 $lang['rssfailed']             = 'Došlo je do greške prilikom preuzimanja feed-a: ';
 $lang['nothingfound']          = 'Traženi dokumetni nisu pronađeni.';
 $lang['mediaselect']           = 'Mediafile datoteke';
@@ -158,10 +184,15 @@ $lang['difflink']              = 'Poveznica na ovaj prikaz usporedbe';
 $lang['diff_type']             = 'Razlike u prikazu:';
 $lang['diff_inline']           = 'U istoj razini';
 $lang['diff_side']             = 'Usporedo';
+$lang['diffprevrev']           = 'Prošla verzija';
+$lang['diffnextrev']           = 'Novija verzija';
+$lang['difflastrev']           = 'Zadnja verzija';
+$lang['diffbothprevrev']       = 'Prošle verzije na obje strane';
+$lang['diffbothnextrev']       = 'Novije verzije na obje strane';
 $lang['line']                  = 'Redak';
-$lang['breadcrumb']            = 'Putanja';
-$lang['youarehere']            = 'Vi ste ovdje';
-$lang['lastmod']               = 'Zadnja izmjena';
+$lang['breadcrumb']            = 'Putanja:';
+$lang['youarehere']            = 'Vi ste ovdje:';
+$lang['lastmod']               = 'Zadnja izmjena:';
 $lang['by']                    = 'od';
 $lang['deleted']               = 'obrisano';
 $lang['created']               = 'stvoreno';
@@ -170,11 +201,21 @@ $lang['external_edit']         = 'vanjsko uređivanje';
 $lang['summary']               = 'Sažetak izmjena';
 $lang['noflash']               = 'Za prikazivanje ovog sadržaja potreban je <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>';
 $lang['download']              = 'Preuzmi isječak';
+$lang['tools']                 = 'Alati';
+$lang['user_tools']            = 'Korisnički alati';
+$lang['site_tools']            = 'Site alati';
+$lang['page_tools']            = 'Stranični alati';
+$lang['skip_to_content']       = 'preskoči na sadržaj';
+$lang['sidebar']               = 'Bočna traka';
 $lang['mail_newpage']          = 'stranica dodana:';
 $lang['mail_changed']          = 'stranica izmjenjena:';
 $lang['mail_subscribe_list']   = 'stranice promijenjene u imenskom prostoru:';
 $lang['mail_new_user']         = 'novi korisnik:';
 $lang['mail_upload']           = 'datoteka postavljena:';
+$lang['changes_type']          = 'Vidi promjene od';
+$lang['pages_changes']         = 'Stranice';
+$lang['media_changes']         = 'Medijske datoteke';
+$lang['both_changes']          = 'Zajedno stranice i datoteke';
 $lang['qb_bold']               = 'Podebljani tekst';
 $lang['qb_italic']             = 'Ukošeni tekst';
 $lang['qb_underl']             = 'Podcrtani tekst';
@@ -204,17 +245,18 @@ $lang['admin_register']        = 'Dodaj novog korisnika';
 $lang['metaedit']              = 'Uredi metapodatake';
 $lang['metasaveerr']           = 'Neuspješno zapisivanje metapodataka';
 $lang['metasaveok']            = 'Spremljeni metapdaci';
-$lang['img_backto']            = 'Povratak na';
-$lang['img_title']             = 'Naziv';
-$lang['img_caption']           = 'Naslov';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Ime datoteke';
-$lang['img_fsize']             = 'Veličina';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Autorsko pravo';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Ključne riječi';
+$lang['img_title']             = 'Naziv:';
+$lang['img_caption']           = 'Naslov:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Ime datoteke:';
+$lang['img_fsize']             = 'Veličina:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Autorsko pravo:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Ključne riječi:';
+$lang['img_width']             = 'Širina:';
+$lang['img_height']            = 'Visina:';
 $lang['subscr_subscribe_success'] = 'Dodan %s u listu pretplatnika za %s';
 $lang['subscr_subscribe_error'] = 'Greška kod dodavanja %s u listu pretplatnika za %s';
 $lang['subscr_subscribe_noaddress'] = 'Ne postoji adresa povezana sa vašim podacima za prijavu, stoga ne možete biti dodani u listu pretplatnika';
@@ -232,6 +274,7 @@ $lang['subscr_style_every']    = 'email za svaku promjenu';
 $lang['subscr_style_digest']   = 'email s kratakim prikazom promjena za svaku stranicu (svaka %.2f dana)';
 $lang['subscr_style_list']     = 'listu promijenjenih stranica od zadnjeg primljenog email-a (svaka %.2f dana)';
 $lang['authtempfail']          = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.';
+$lang['authpwdexpire']         = 'Vaša lozinka će isteći za %d dana, trebate ju promijeniti.';
 $lang['i_chooselang']          = 'Izaberite vaš jezik';
 $lang['i_installer']           = 'DokuWiki instalacija';
 $lang['i_wikiname']            = 'Naziv Wikija';
@@ -241,6 +284,7 @@ $lang['i_problems']            = 'Instalacija je pronašla probleme koji su nazn
 $lang['i_modified']            = 'Zbog sigurnosnih razlog, ova skripta ce raditi samo sa novim i nepromijenjenim instalacijama dokuWikija. Preporucujemo da ili re-ekstraktirate fajlove iz downloadovanog paketa ili konsultujete pune a href="http://dokuwiki.org/install">Instrukcije za instalaciju Dokuwikija</a>';
 $lang['i_funcna']              = 'PHP funkcija <code>%s</code> nije dostupna. Možda ju je vaš pružatelj hostinga onemogućio iz nekog razloga?';
 $lang['i_phpver']              = 'Vaša PHP verzija <code>%s</code> je niža od potrebne <code>%s</code>. Trebate nadograditi vašu PHP instalaciju.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload mora biti onemogućena u php.ini da bi ste pokrenuli DokuWiki.';
 $lang['i_permfail']            = '<code>%s</code> nema dozvolu pisanja od strane DokuWiki. Trebate podesiti dozvole pristupa tom direktoriju.';
 $lang['i_confexists']          = '<code>%s</code> već postoji';
 $lang['i_writeerr']            = 'Ne može se kreirati <code>%s</code>. Trebate provjeriti dozvole direktorija/datoteke i kreirati dokument ručno.';
@@ -252,8 +296,12 @@ $lang['i_policy']              = 'Inicijalna ACL politika';
 $lang['i_pol0']                = 'Otvoreni Wiki (čitanje, pisanje, učitavanje za sve)';
 $lang['i_pol1']                = 'Javni Wiki (čitanje za sve, pisanje i učitavanje za registrirane korisnike)';
 $lang['i_pol2']                = 'Zatvoreni Wiki (čitanje, pisanje, učitavanje samo za registrirane korisnike)';
+$lang['i_allowreg']            = 'Dopusti da korisnici sami sebe registriraju';
 $lang['i_retry']               = 'Pokušaj ponovo';
 $lang['i_license']             = 'Molim odaberite licencu pod kojom želite postavljati vaš sadržaj:';
+$lang['i_license_none']        = 'Ne prikazuj nikakve licenčne informacije.';
+$lang['i_pop_field']           = 'Molimo, pomozite na da unaprijedimo DokuWiki:';
+$lang['i_pop_label']           = 'Jednom na mjesec, pošalji anonimne podatke o korištenju DokuWiki razvojnom timu';
 $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';
@@ -263,3 +311,30 @@ $lang['hours']                 = '%d sati prije';
 $lang['minutes']               = '%d minuta prije';
 $lang['seconds']               = '%d sekundi prije';
 $lang['wordblock']             = 'Vaša promjena nije spremljena jer sadrži blokirani tekst (spam).';
+$lang['media_uploadtab']       = 'Učitavanje';
+$lang['media_searchtab']       = 'Traženje';
+$lang['media_file']            = 'Datoteka';
+$lang['media_viewtab']         = 'Pogled';
+$lang['media_edittab']         = 'Uredi';
+$lang['media_historytab']      = 'Povijest';
+$lang['media_list_thumbs']     = 'Ikone';
+$lang['media_list_rows']       = 'Redovi';
+$lang['media_sort_name']       = 'Naziv';
+$lang['media_sort_date']       = 'Datum';
+$lang['media_namespaces']      = 'Odaberi namespace';
+$lang['media_files']           = 'Datoteka u %s';
+$lang['media_upload']          = 'Učitaj u %s';
+$lang['media_search']          = 'Potraži u %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s na %s';
+$lang['media_edit']            = 'Uredi %s';
+$lang['media_history']         = 'Povijest %s';
+$lang['media_meta_edited']     = 'meta podatci uređeni';
+$lang['media_perm_read']       = 'Nažalost, nemate prava za čitanje datoteka.';
+$lang['media_perm_upload']     = 'Nažalost, nemate prava za učitavanje datoteka.';
+$lang['media_update']          = 'Učitaj novu verziju';
+$lang['media_restore']         = 'Vrati ovu verziju';
+$lang['currentns']             = 'Tekući imenički prostor';
+$lang['searchresult']          = 'Rezultati pretraživanja';
+$lang['plainhtml']             = 'Čisti HTML';
+$lang['wikimarkup']            = 'Wiki kod';
diff --git a/inc/lang/hr/pwconfirm.txt b/inc/lang/hr/pwconfirm.txt
new file mode 100644
index 000000000..b2d9fa3ad
--- /dev/null
+++ b/inc/lang/hr/pwconfirm.txt
@@ -0,0 +1,13 @@
+Pozdrav @FULLNAME@!
+
+Netko je zatražio novu lozinku za vašu @TITLE@ prijavu na @DOKUWIKIURL@.
+
+Ako to niste bili Vi, molimo da samo ignorirate ovu poruku.
+
+Da bi ste potvrdili da ste to ipak bili Vi, molimo slijedite link u nastavku:
+
+@CONFIRM@
+
+-- 
+Ova poruka je generirana od strane DokuWiki dostupnog na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/registermail.txt b/inc/lang/hr/registermail.txt
new file mode 100644
index 000000000..ceaf3fb83
--- /dev/null
+++ b/inc/lang/hr/registermail.txt
@@ -0,0 +1,14 @@
+Novi korisnik je registriran. Ovdje su detalji:
+
+Korisničko ime : @NEWUSER@
+Puno ime       : @NEWNAME@
+e-pošta        : @NEWEMAIL@ 
+
+Datum      : @DATE@ 
+Preglednik : @BROWSER@
+IP-Adresa  : @IPADDRESS@ 
+Računalo   : @HOSTNAME@
+
+-- 
+Ova poruka je generirana od strane DokuWiki dostupnog na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/resetpwd.txt b/inc/lang/hr/resetpwd.txt
new file mode 100644
index 000000000..8d92e51d2
--- /dev/null
+++ b/inc/lang/hr/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Postavi novu lozinku ======
+
+Molimo unesite novu lozinku za Vašu korisničku prijavu na ovom wiki-u. 
\ No newline at end of file
diff --git a/inc/lang/hr/subscr_digest.txt b/inc/lang/hr/subscr_digest.txt
new file mode 100644
index 000000000..fad158d76
--- /dev/null
+++ b/inc/lang/hr/subscr_digest.txt
@@ -0,0 +1,19 @@
+Pozdrav !
+
+Stranica @PAGE@ u @TITLE@ wiki-u je promijenjena.
+Ovdje su promjene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Stara verzija: @OLDPAGE@
+Nova verzija: @NEWPAGE@
+
+Da poništite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite
+@SUBSCRIBE@
+i odjavite se s promjena na stranici i/ili imeničkom prostoru.
+
+-- 
+Ova poruka je generirana od strane DokuWiki dostupnog na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/subscr_form.txt b/inc/lang/hr/subscr_form.txt
new file mode 100644
index 000000000..95b2cd03e
--- /dev/null
+++ b/inc/lang/hr/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Uređivanje pretplata ======
+
+Ova stranica omogućuje Vam da uredite svoju pretplatu na promjene za tekuću stranicu ili imenički prostor.
\ No newline at end of file
diff --git a/inc/lang/hr/subscr_list.txt b/inc/lang/hr/subscr_list.txt
new file mode 100644
index 000000000..611c76938
--- /dev/null
+++ b/inc/lang/hr/subscr_list.txt
@@ -0,0 +1,15 @@
+Pozdrav !
+
+Stranice u imeničkom prostoru @PAGE@ na @TITLE@ wiki-u su izmijenjene. Ovo su izmijenjene stranice:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Da poništite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite
+@SUBSCRIBE@
+i odjavite se s promjena na stranici i/ili imeničkom prostoru.
+
+-- 
+Ova poruka je generirana od strane DokuWiki dostupnog na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/subscr_single.txt b/inc/lang/hr/subscr_single.txt
new file mode 100644
index 000000000..18f66901c
--- /dev/null
+++ b/inc/lang/hr/subscr_single.txt
@@ -0,0 +1,22 @@
+Pozdrav !
+
+Stranica @PAGE@ na @TITLE@ wiki-u je izmijenjena.
+Ovo su promjene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum  : @DATE@
+Korisnik: @USER@
+Sažetak izmjena: @SUMMARY@
+Stara verzija: @OLDPAGE@
+Nova verzija : @NEWPAGE@
+
+Da poništite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite
+@SUBSCRIBE@
+i odjavite se s promjena na stranici i/ili imeničkom prostoru.
+
+-- 
+Ova poruka je generirana od strane DokuWiki dostupnog na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/uploadmail.txt b/inc/lang/hr/uploadmail.txt
new file mode 100644
index 000000000..5b18b2ba3
--- /dev/null
+++ b/inc/lang/hr/uploadmail.txt
@@ -0,0 +1,15 @@
+Datoteka je učitana na Vaš DokuWiki. Ovdje su detalji:
+
+Datoteka     : @MEDIA@
+Stara verzija: @OLD@
+Datum        : @DATE@
+Preglednik   : @BROWSER@
+IP-Adresa    : @IPADDRESS@
+Računalo     : @HOSTNAME@
+Veličina     : @SIZE@
+MIME Tip     : @MIME@
+Korisnik     : @USER@
+
+-- 
+Ova poruka je generirana od strane DokuWiki dostupnog na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hu-formal/admin.txt b/inc/lang/hu-formal/admin.txt
new file mode 100644
index 000000000..b661bfb17
--- /dev/null
+++ b/inc/lang/hu-formal/admin.txt
@@ -0,0 +1,3 @@
+===== Beállítások =====
+
+Alább találja a DokuWiki-ben elérhető beállítási lehetőségek listáját.
\ No newline at end of file
diff --git a/inc/lang/hu-formal/adminplugins.txt b/inc/lang/hu-formal/adminplugins.txt
new file mode 100644
index 000000000..b077521fb
--- /dev/null
+++ b/inc/lang/hu-formal/adminplugins.txt
@@ -0,0 +1 @@
+===== További bővítmények =====
\ No newline at end of file
diff --git a/inc/lang/hu-formal/backlinks.txt b/inc/lang/hu-formal/backlinks.txt
new file mode 100644
index 000000000..437eb2e25
--- /dev/null
+++ b/inc/lang/hu-formal/backlinks.txt
@@ -0,0 +1,3 @@
+====== Hivatkozások ======
+
+Mindazon oldalak listája, amelyek az aktuális oldalra hivatkoznak.
\ No newline at end of file
diff --git a/inc/lang/hu-formal/conflict.txt b/inc/lang/hu-formal/conflict.txt
new file mode 100644
index 000000000..6718d67e6
--- /dev/null
+++ b/inc/lang/hu-formal/conflict.txt
@@ -0,0 +1,5 @@
+====== Újabb változat érhető el ======
+
+Az Ön által szerkesztett oldalnak már egy újabb változata érhető el. Ez akkor fordulhat elő, ha egy másik felhasználó módosította a dokumtemot, mialatt Ön is szerkesztette azt.
+
+Vizsgálja meg az alább látható eltéréseket, majd döntse el, melyik változatot tartja meg. Ha a "Mentés" gombot választja, az Ön verziója mentődik el. Kattintson a "Mégsem" gombra a jelenlegi változat megtartásához.
\ No newline at end of file
diff --git a/inc/lang/hu-formal/denied.txt b/inc/lang/hu-formal/denied.txt
new file mode 100644
index 000000000..d56a18117
--- /dev/null
+++ b/inc/lang/hu-formal/denied.txt
@@ -0,0 +1,4 @@
+====== Hozzáférés megtadadva ======
+
+Sajnáljuk, de nincs joga a folytatáshoz.
+
diff --git a/inc/lang/hu-formal/diff.txt b/inc/lang/hu-formal/diff.txt
new file mode 100644
index 000000000..f922a504a
--- /dev/null
+++ b/inc/lang/hu-formal/diff.txt
@@ -0,0 +1,3 @@
+====== Eltérések ======
+
+Az oldal két változata közötti különbségek az alábbiak.
\ No newline at end of file
diff --git a/inc/lang/hu-formal/draft.txt b/inc/lang/hu-formal/draft.txt
new file mode 100644
index 000000000..9233eacad
--- /dev/null
+++ b/inc/lang/hu-formal/draft.txt
@@ -0,0 +1,5 @@
+===== Piszkozatot találtam =====
+
+Az Ön ezen az oldalon végzett utolsó szerkesztési művelete helytelenül fejeződött be. A DokuWiki automatikusan elmentett egy piszkozatot az Ön munkája során. Alább láthatók az utolsó munkafázis mentett adatai.
+
+Kérjük, döntse el, hogy //helyreállítja-e// a befejezetlen módosításokat, vagy //törli// az automatikusan mentett piszkozatot, vagy //megszakítja// a szerkesztési folyamatot.
\ No newline at end of file
diff --git a/inc/lang/hu-formal/edit.txt b/inc/lang/hu-formal/edit.txt
new file mode 100644
index 000000000..08f648ba6
--- /dev/null
+++ b/inc/lang/hu-formal/edit.txt
@@ -0,0 +1 @@
+Módosítsa az oldalt, majd kattintson a "Mentés" gombra. A wiki-szintaxishoz nézze meg a [[wiki:syntax|szintaxis]] oldalt. Kérjük, csak akkor módosítsa az oldalt, ha **tökéletesíteni**, **javítani** tudja. Amennyiben szeretne kipróbálni ezt-azt, a [[playground:playground|játszótéren]] megtanulhatja az első lépéseket.
\ No newline at end of file
diff --git a/inc/lang/hu-formal/editrev.txt b/inc/lang/hu-formal/editrev.txt
new file mode 100644
index 000000000..2eca33c7a
--- /dev/null
+++ b/inc/lang/hu-formal/editrev.txt
@@ -0,0 +1,2 @@
+**A dokumentum egy korábbi változatát töltötte be!** Ha az oldalt elmenti, akkor egy új változat jön létre belőle.
+----
\ No newline at end of file
diff --git a/inc/lang/hu-formal/index.txt b/inc/lang/hu-formal/index.txt
new file mode 100644
index 000000000..0f2b18fd2
--- /dev/null
+++ b/inc/lang/hu-formal/index.txt
@@ -0,0 +1,3 @@
+====== Oldaltérkép (tartalom) ======
+
+Az összes elérhető oldal [[doku>namespaces|névterek]] szerint rendezett oldaltérképe.
\ No newline at end of file
diff --git a/inc/lang/hu-formal/lang.php b/inc/lang/hu-formal/lang.php
new file mode 100644
index 000000000..a98bdc0d3
--- /dev/null
+++ b/inc/lang/hu-formal/lang.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Marina Vladi <deldadam@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Oldal módosítása';
+$lang['btn_source']            = 'Forrás megtekintése';
+$lang['btn_show']              = 'Oldal megtekintése';
+$lang['btn_create']            = 'Oldal létrehozása';
+$lang['btn_search']            = 'Keresés';
+$lang['btn_save']              = 'Mentés';
+$lang['btn_preview']           = 'Előnézet';
+$lang['btn_top']               = 'Oldal tetejére';
+$lang['btn_newer']             = '<< újabb';
+$lang['btn_older']             = 'régebbi >>';
+$lang['btn_revs']              = 'Korábbi változatok';
+$lang['btn_recent']            = 'Legújabb változások';
+$lang['btn_upload']            = 'Feltöltés';
diff --git a/inc/lang/hu/denied.txt b/inc/lang/hu/denied.txt
index 0b06724df..922cbb895 100644
--- a/inc/lang/hu/denied.txt
+++ b/inc/lang/hu/denied.txt
@@ -1,4 +1,4 @@
 ====== Hozzáférés megtagadva ======
 
-Sajnáljuk, nincs jogod a folytatáshoz. Esetleg elfelejtettél bejelentkezni?
+Sajnáljuk, nincs jogod a folytatáshoz.
 
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 5113e1cc8..eb4b4601a 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -13,6 +13,7 @@
  * @author Marton Sebok <sebokmarton@gmail.com>
  * @author Serenity87HUN <anikototh87@gmail.com>
  * @author Marina Vladi <deldadam@gmail.com>
+ * @author Mátyás Jani <jzombi@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -57,7 +58,9 @@ $lang['btn_register']          = 'Regisztráció';
 $lang['btn_apply']             = 'Alkalmaz';
 $lang['btn_media']             = 'Médiakezelő';
 $lang['btn_deleteuser']        = 'Felhasználói fiókom eltávolítása';
-$lang['loggedinas']            = 'Belépett felhasználó: ';
+$lang['btn_img_backto']        = 'Vissza %s';
+$lang['btn_mediaManager']      = 'Megtekintés a médiakezelőben';
+$lang['loggedinas']            = 'Belépett felhasználó';
 $lang['user']                  = 'Azonosító';
 $lang['pass']                  = 'Jelszó';
 $lang['newpass']               = 'Új jelszó';
@@ -102,8 +105,8 @@ $lang['license']               = 'Hacsak máshol nincs egyéb rendelkezés, ezen
 $lang['licenseok']             = 'Megjegyzés: az oldal szerkesztésével elfogadja, hogy a tartalom a következő licenc alatt lesz elérhető:';
 $lang['searchmedia']           = 'Keresett fájl neve:';
 $lang['searchmedia_in']        = 'Keresés a következőben: %s';
-$lang['txt_upload']            = 'Válaszd ki a feltöltendő fájlt';
-$lang['txt_filename']          = 'Feltöltési név (elhagyható)';
+$lang['txt_upload']            = 'Válaszd ki a feltöltendő fájlt:';
+$lang['txt_filename']          = 'Feltöltési név (elhagyható):';
 $lang['txt_overwrt']           = 'Létező fájl felülírása';
 $lang['maxuploadsize']         = 'Maximum %s méretű fájlokat tölthetsz fel.';
 $lang['lockedby']              = 'Jelenleg zárolta:';
@@ -187,10 +190,15 @@ $lang['difflink']              = 'Összehasonlító nézet linkje';
 $lang['diff_type']             = 'Összehasonlítás módja:';
 $lang['diff_inline']           = 'Sorok között';
 $lang['diff_side']             = 'Egymás mellett';
+$lang['diffprevrev']           = 'Előző változat';
+$lang['diffnextrev']           = 'Következő változat';
+$lang['difflastrev']           = 'Utolsó változat';
+$lang['diffbothprevrev']       = 'Előző változat mindkét oldalon';
+$lang['diffbothnextrev']       = 'Következő változat mindkét oldalon';
 $lang['line']                  = 'Sor';
-$lang['breadcrumb']            = 'Nyomvonal';
-$lang['youarehere']            = 'Itt vagy';
-$lang['lastmod']               = 'Utolsó módosítás';
+$lang['breadcrumb']            = 'Nyomvonal:';
+$lang['youarehere']            = 'Itt vagy:';
+$lang['lastmod']               = 'Utolsó módosítás:';
 $lang['by']                    = 'szerkesztette:';
 $lang['deleted']               = 'eltávolítva';
 $lang['created']               = 'létrehozva';
@@ -243,20 +251,18 @@ $lang['admin_register']        = 'Új felhasználó';
 $lang['metaedit']              = 'Metaadatok szerkesztése';
 $lang['metasaveerr']           = 'A metaadatok írása nem sikerült';
 $lang['metasaveok']            = 'Metaadatok elmentve';
-$lang['img_backto']            = 'Vissza';
-$lang['img_title']             = 'Cím';
-$lang['img_caption']           = 'Képaláírás';
-$lang['img_date']              = 'Dátum';
-$lang['img_fname']             = 'Fájlnév';
-$lang['img_fsize']             = 'Méret';
-$lang['img_artist']            = 'Készítette';
-$lang['img_copyr']             = 'Szerzői jogok';
-$lang['img_format']            = 'Formátum';
-$lang['img_camera']            = 'Fényképezőgép típusa';
-$lang['img_keywords']          = 'Kulcsszavak';
-$lang['img_width']             = 'Szélesség';
-$lang['img_height']            = 'Magasság';
-$lang['img_manager']           = 'Megtekintés a médiakezelőben';
+$lang['img_title']             = 'Cím:';
+$lang['img_caption']           = 'Képaláírás:';
+$lang['img_date']              = 'Dátum:';
+$lang['img_fname']             = 'Fájlnév:';
+$lang['img_fsize']             = 'Méret:';
+$lang['img_artist']            = 'Készítette:';
+$lang['img_copyr']             = 'Szerzői jogok:';
+$lang['img_format']            = 'Formátum:';
+$lang['img_camera']            = 'Fényképezőgép típusa:';
+$lang['img_keywords']          = 'Kulcsszavak:';
+$lang['img_width']             = 'Szélesség:';
+$lang['img_height']            = 'Magasság:';
 $lang['subscr_subscribe_success'] = '%s hozzáadva az értesítési listához: %s';
 $lang['subscr_subscribe_error'] = 'Hiba történt %s hozzáadásakor az értesítési listához: %s';
 $lang['subscr_subscribe_noaddress'] = 'Nincs e-mail cím megadva az adataidnál, így a rendszer nem tudott hozzáadni az értesítési listához';
@@ -337,4 +343,4 @@ $lang['media_restore']         = 'Ezen verzió visszaállítása';
 $lang['currentns']             = 'Aktuális névtér';
 $lang['searchresult']          = 'Keresés eredménye';
 $lang['plainhtml']             = 'Sima HTML';
-$lang['wikimarkup']            = 'Wiki-jelölő nyelv';
+$lang['wikimarkup']            = 'Wiki-jelölőnyelv';
diff --git a/inc/lang/ia/denied.txt b/inc/lang/ia/denied.txt
index 044e1532d..82f2fc668 100644
--- a/inc/lang/ia/denied.txt
+++ b/inc/lang/ia/denied.txt
@@ -1,3 +1,4 @@
 ====== Permission refusate ======
 
-Pardono, tu non ha le derectos requisite pro continuar. Pote esser que tu ha oblidate de aperir un session.
\ No newline at end of file
+Pardono, tu non ha le derectos requisite pro continuar.
+
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index 144dfe33b..cabbbab93 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -50,7 +50,7 @@ $lang['btn_recover']           = 'Recuperar version provisori';
 $lang['btn_draftdel']          = 'Deler version provisori';
 $lang['btn_revert']            = 'Restaurar';
 $lang['btn_register']          = 'Crear conto';
-$lang['loggedinas']            = 'Session aperite como';
+$lang['loggedinas']            = 'Session aperite como:';
 $lang['user']                  = 'Nomine de usator';
 $lang['pass']                  = 'Contrasigno';
 $lang['newpass']               = 'Nove contrasigno';
@@ -88,11 +88,11 @@ $lang['license']               = 'Excepte ubi indicate alteremente, le contento
 $lang['licenseok']             = 'Nota ben! Per modificar iste pagina tu accepta que tu contento essera publicate sub le conditiones del licentia sequente:';
 $lang['searchmedia']           = 'Cercar file con nomine:';
 $lang['searchmedia_in']        = 'Cercar in %s';
-$lang['txt_upload']            = 'Selige le file a incargar';
-$lang['txt_filename']          = 'Incargar como (optional)';
+$lang['txt_upload']            = 'Selige le file a incargar:';
+$lang['txt_filename']          = 'Incargar como (optional):';
 $lang['txt_overwrt']           = 'Reimplaciar le file existente';
-$lang['lockedby']              = 'Actualmente serrate per';
-$lang['lockexpire']            = 'Serratura expira le';
+$lang['lockedby']              = 'Actualmente serrate per:';
+$lang['lockexpire']            = 'Serratura expira le:';
 $lang['js']['willexpire']            = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
 $lang['js']['notsavedyet']     = 'Le modificationes non salveguardate essera perdite.\nRealmente continuar?';
 $lang['rssfailed']             = 'Un error occurreva durante le obtention de iste syndication:';
@@ -157,9 +157,9 @@ $lang['yours']                 = 'Tu version';
 $lang['diff']                  = 'Monstrar differentias con versiones actual';
 $lang['diff2']                 = 'Monstrar differentias inter le versiones seligite';
 $lang['line']                  = 'Linea';
-$lang['breadcrumb']            = 'Tracia';
-$lang['youarehere']            = 'Tu es hic';
-$lang['lastmod']               = 'Ultime modification';
+$lang['breadcrumb']            = 'Tracia:';
+$lang['youarehere']            = 'Tu es hic:';
+$lang['lastmod']               = 'Ultime modification:';
 $lang['by']                    = 'per';
 $lang['deleted']               = 'removite';
 $lang['created']               = 'create';
@@ -202,17 +202,17 @@ $lang['admin_register']        = 'Adder nove usator';
 $lang['metaedit']              = 'Modificar metadatos';
 $lang['metasaveerr']           = 'Scriptura de metadatos fallite';
 $lang['metasaveok']            = 'Metadatos salveguardate';
-$lang['img_backto']            = 'Retornar a';
-$lang['img_title']             = 'Titulo';
-$lang['img_caption']           = 'Legenda';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nomine de file';
-$lang['img_fsize']             = 'Dimension';
-$lang['img_artist']            = 'Photographo';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Parolas-clave';
+$lang['btn_img_backto']            = 'Retornar a %s';
+$lang['img_title']             = 'Titulo:';
+$lang['img_caption']           = 'Legenda:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nomine de file:';
+$lang['img_fsize']             = 'Dimension:';
+$lang['img_artist']            = 'Photographo:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formato:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Parolas-clave:';
 $lang['subscr_subscribe_success'] = '%s addite al lista de subscription de %s';
 $lang['subscr_subscribe_error'] = 'Error durante le addition de %s al lista de subscription de %s';
 $lang['subscr_subscribe_noaddress'] = 'Il non ha un adresse associate con tu conto. Tu non pote esser addite al lista de subscription.';
diff --git a/inc/lang/id-ni/lang.php b/inc/lang/id-ni/lang.php
index 7a1179326..1ff714f3e 100644
--- a/inc/lang/id-ni/lang.php
+++ b/inc/lang/id-ni/lang.php
@@ -41,7 +41,7 @@ $lang['btn_reset']             = 'Fawu\'a';
 $lang['btn_draft']             = 'Fawu\'a wanura';
 $lang['btn_draftdel']          = 'Heta zura';
 $lang['btn_register']          = 'Fasura\'ö';
-$lang['loggedinas']            = 'Möi bakha zotöi';
+$lang['loggedinas']            = 'Möi bakha zotöi:';
 $lang['user']                  = 'Töi';
 $lang['pass']                  = 'Kode';
 $lang['newpass']               = 'Kode sibohou';
@@ -72,6 +72,6 @@ $lang['resendpwdmissing']      = 'Bologö dödöu, si lö tola lö\'ö öfo\'ös
 $lang['resendpwdnouser']       = 'Bologö dödöu, lö masöndra zangoguna da\'a ba database.';
 $lang['resendpwdconfirm']      = 'No tefaohe\'ö link famaduhu\'ö ba imele.';
 $lang['resendpwdsuccess']      = 'No tefa\'ohe\'ö kode sibohou ba imele.';
-$lang['txt_upload']            = 'Fili file ni fa\'ohe\'ö';
+$lang['txt_upload']            = 'Fili file ni fa\'ohe\'ö:';
 $lang['js']['notsavedyet']     = 'Famawu\'a si lö mu\'irö\'ö taya. \nSinduhu ötohugö?';
 $lang['mediaselect']           = 'Media file';
diff --git a/inc/lang/id/denied.txt b/inc/lang/id/denied.txt
index bad8f24a6..ff09c13c4 100644
--- a/inc/lang/id/denied.txt
+++ b/inc/lang/id/denied.txt
@@ -1,4 +1,4 @@
 ====== Akses Ditolak ======
 
-Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. Apakah Anda belum login?
+Maaf, Anda tidak mempunyai hak akses untuk melanjutkan.
 
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index 5cb5cb6ea..ff77cf24d 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -8,6 +8,7 @@
  * @author Yustinus Waruwu <juswaruwu@gmail.com>
  * @author zamroni <therons@ymail.com>
  * @author umriya afini <bigdream.power@gmail.com>
+ * @author Arif Budiman <me@kangarif.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -50,8 +51,11 @@ $lang['btn_draftdel']          = 'Hapus draft';
 $lang['btn_revert']            = 'Kembalikan';
 $lang['btn_register']          = 'Daftar';
 $lang['btn_apply']             = 'Terapkan';
+$lang['btn_media']             = 'Pengelola Media';
 $lang['btn_deleteuser']        = 'Hapus Akun Saya';
-$lang['loggedinas']            = 'Login sebagai ';
+$lang['btn_img_backto']        = 'Kembali ke %s';
+$lang['btn_mediaManager']      = 'Tampilkan di pengelola media';
+$lang['loggedinas']            = 'Login sebagai :';
 $lang['user']                  = 'Username';
 $lang['pass']                  = 'Password';
 $lang['newpass']               = 'Password baru';
@@ -78,6 +82,7 @@ $lang['profna']                = 'Wiki ini tidak mengijinkan perubahan profil.';
 $lang['profnochange']          = 'Tidak ada perubahan.';
 $lang['profnoempty']           = 'Mohon mengisikan nama atau alamat email.';
 $lang['profchanged']           = 'Profil User berhasil diubah.';
+$lang['profnodelete']          = 'Wiki ini tidak mendukung penghapusan pengguna';
 $lang['profdeleteuser']        = 'Hapus Akun';
 $lang['profdeleted']           = 'Akun anda telah dihapus dari wiki ini';
 $lang['profconfdelete']        = 'Saya berharap menghapus akun saya dari wiki ini.
@@ -91,30 +96,57 @@ $lang['resendpwdnouser']       = 'Maaf, user ini tidak ditemukan.';
 $lang['resendpwdbadauth']      = 'Maaf, kode autentikasi tidak valid. Pastikan Anda menggunakan keseluruhan link konfirmasi.';
 $lang['resendpwdconfirm']      = 'Link konfirmasi telah dikirim melalui email.';
 $lang['resendpwdsuccess']      = 'Password baru Anda telah dikirim melalui email.';
+$lang['license']               = 'Kecuali jika dinyatakan lain, konten pada wiki ini dilisensikan dibawah lisensi berikut:';
+$lang['licenseok']             = 'Catatan: Dengan menyunting halaman ini, Anda setuju untuk melisensikan konten Anda dibawah lisensi berikut:';
 $lang['searchmedia']           = 'Cari nama file:';
-$lang['txt_upload']            = 'File yang akan diupload';
-$lang['txt_filename']          = 'Masukkan nama wiki (opsional)';
+$lang['searchmedia_in']        = 'Cari di %s';
+$lang['txt_upload']            = 'File yang akan diupload:';
+$lang['txt_filename']          = 'Masukkan nama wiki (opsional):';
 $lang['txt_overwrt']           = 'File yang telah ada akan ditindih';
-$lang['lockedby']              = 'Sedang dikunci oleh';
-$lang['lockexpire']            = 'Penguncian artikel sampai dengan';
+$lang['maxuploadsize']         = 'Unggah maks. %s per berkas';
+$lang['lockedby']              = 'Sedang dikunci oleh:';
+$lang['lockexpire']            = 'Penguncian artikel sampai dengan:';
 $lang['js']['willexpire']      = 'Halaman yang sedang Anda kunci akan berakhir dalam waktu kurang lebih satu menit.\nUntuk menghindari konflik, gunakan tombol Preview untuk me-reset timer pengunci.';
 $lang['js']['notsavedyet']     = 'Perubahan yang belum disimpan akan hilang.\nYakin akan dilanjutkan?';
 $lang['js']['searchmedia']     = 'Cari file';
 $lang['js']['keepopen']        = 'Biarkan window terbuka dalam pemilihan';
 $lang['js']['hidedetails']     = 'Sembunyikan detil';
 $lang['js']['mediatitle']      = 'Pengaturan Link';
+$lang['js']['mediadisplay']    = 'Jenis tautan';
+$lang['js']['mediaalign']      = 'Perataan';
 $lang['js']['mediasize']       = 'Ukuran gambar';
+$lang['js']['mediatarget']     = 'Tautan tujuan';
 $lang['js']['mediaclose']      = 'Tutup';
+$lang['js']['mediainsert']     = 'Sisip';
 $lang['js']['mediadisplayimg'] = 'Lihat gambar';
 $lang['js']['mediadisplaylnk'] = 'Lihat hanya link';
+$lang['js']['mediasmall']      = 'Versi kecil';
+$lang['js']['mediamedium']     = 'Versi sedang';
+$lang['js']['medialarge']      = 'Versi besar';
+$lang['js']['mediaoriginal']   = 'Versi asli';
+$lang['js']['medialnk']        = 'Tautan ke halaman rincian';
+$lang['js']['mediadirect']     = 'Tautan langsung ke aslinya';
+$lang['js']['medianolnk']      = 'Tanpa tautan';
+$lang['js']['medianolink']     = 'Jangan tautkan gambar';
+$lang['js']['medialeft']       = 'Rata gambar sebelah kiri';
+$lang['js']['mediaright']      = 'Rata gambar sebelah kanan';
+$lang['js']['mediacenter']     = 'Rata gambar di tengah';
+$lang['js']['medianoalign']    = 'Jangan gunakan perataan';
 $lang['js']['nosmblinks']      = 'Link ke share Windows hanya bekerja di Microsoft Internet Explorer.
 Anda masih dapat mengcopy and paste linknya.';
+$lang['js']['linkwiz']         = 'Wizard Tautan';
+$lang['js']['linkto']          = 'Tautkan ke:';
 $lang['js']['del_confirm']     = 'Hapus tulisan ini?';
+$lang['js']['restore_confirm'] = 'Benar-benar ingin mengembalikan versi ini?';
+$lang['js']['media_diff']      = 'Lihat perbedaan:';
+$lang['js']['media_diff_both'] = 'Berdampingan';
+$lang['js']['media_diff_opacity'] = 'Mencolok';
 $lang['js']['media_select']    = 'Pilih file...';
 $lang['js']['media_upload_btn'] = 'Unggah';
 $lang['js']['media_done_btn']  = 'Selesai';
 $lang['js']['media_drop']      = 'Tarik file disini untuk mengunggah';
 $lang['js']['media_cancel']    = 'Buang';
+$lang['js']['media_overwrt']   = 'Timpa berkas yang ada';
 $lang['rssfailed']             = 'Error terjadi saat mengambil feed: ';
 $lang['nothingfound']          = 'Tidak menemukan samasekali.';
 $lang['mediaselect']           = 'Pilihan Mediafile';
@@ -148,21 +180,40 @@ $lang['current']               = 'sekarang';
 $lang['yours']                 = 'Versi Anda';
 $lang['diff']                  = 'Tampilkan perbedaan dengan versi sekarang';
 $lang['diff2']                 = 'Tampilkan perbedaan diantara revisi terpilih';
+$lang['difflink']              = 'Tautan ke tampilan pembanding ini';
+$lang['diff_type']             = 'Tampilkan perbedaan:';
+$lang['diff_inline']           = 'Sebaris';
+$lang['diff_side']             = 'Berdampingan';
+$lang['diffprevrev']           = 'Revisi sebelumnya';
+$lang['diffnextrev']           = 'Revisi selanjutnya';
+$lang['difflastrev']           = 'Revisi terakhir';
 $lang['line']                  = 'Baris';
-$lang['breadcrumb']            = 'Jejak';
-$lang['youarehere']            = 'Anda disini';
-$lang['lastmod']               = 'Terakhir diubah';
+$lang['breadcrumb']            = 'Jejak:';
+$lang['youarehere']            = 'Anda disini:';
+$lang['lastmod']               = 'Terakhir diubah:';
 $lang['by']                    = 'oleh';
 $lang['deleted']               = 'terhapus';
 $lang['created']               = 'dibuat';
 $lang['restored']              = 'revisi lama ditampilkan kembali (%s)';
 $lang['external_edit']         = 'Perubahan eksternal';
 $lang['summary']               = 'Edit summary';
+$lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> diperlukan untuk menampilkan konten ini.';
+$lang['download']              = 'Unduh Cuplikan';
+$lang['tools']                 = 'Alat';
+$lang['user_tools']            = 'Alat Pengguna';
+$lang['site_tools']            = 'Alat Situs';
+$lang['page_tools']            = 'Alat Halaman';
+$lang['skip_to_content']       = 'lewati ke konten';
+$lang['sidebar']               = 'Bilah Sisi';
 $lang['mail_newpage']          = 'Halaman ditambahkan:';
 $lang['mail_changed']          = 'Halaman diubah:';
+$lang['mail_subscribe_list']   = 'halaman diubah dalam namespace:';
 $lang['mail_new_user']         = 'User baru:';
 $lang['mail_upload']           = 'Berkas di-upload:';
+$lang['changes_type']          = 'Tampilkan perubahan';
 $lang['pages_changes']         = 'Halaman';
+$lang['media_changes']         = 'Berkas media';
+$lang['both_changes']          = 'Baik halaman dan berkas media';
 $lang['qb_bold']               = 'Tebal';
 $lang['qb_italic']             = 'Miring';
 $lang['qb_underl']             = 'Garis Bawah';
@@ -173,6 +224,10 @@ $lang['qb_h2']                 = 'Level 2 Headline';
 $lang['qb_h3']                 = 'Level 3 Headline';
 $lang['qb_h4']                 = 'Level 4 Headline';
 $lang['qb_h5']                 = 'Level 5 Headline';
+$lang['qb_hs']                 = 'Pilih Judul';
+$lang['qb_hplus']              = 'Judul Lebih Atas';
+$lang['qb_hminus']             = 'Judul Lebih Bawah';
+$lang['qb_hequal']             = 'Tingkat Judul yang Sama';
 $lang['qb_link']               = 'Link Internal';
 $lang['qb_extlink']            = 'Link External';
 $lang['qb_hr']                 = 'Garis Horisontal';
@@ -182,21 +237,37 @@ $lang['qb_media']              = 'Tambahkan gambar atau file lain';
 $lang['qb_sig']                = 'Sisipkan tanda tangan';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Karakter Khusus';
+$lang['upperns']               = 'lompat ke namespace induk';
 $lang['admin_register']        = 'Tambah user baru';
 $lang['metaedit']              = 'Edit Metadata';
 $lang['metasaveerr']           = 'Gagal menulis metadata';
 $lang['metasaveok']            = 'Metadata tersimpan';
-$lang['img_backto']            = 'Kembali ke';
-$lang['img_title']             = 'Judul';
-$lang['img_caption']           = 'Label';
-$lang['img_date']              = 'Tanggal';
-$lang['img_fname']             = 'Nama file';
-$lang['img_fsize']             = 'Ukuran';
-$lang['img_artist']            = 'Tukang foto';
-$lang['img_copyr']             = 'Hakcipta';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Katakunci';
+$lang['img_title']             = 'Judul:';
+$lang['img_caption']           = 'Label:';
+$lang['img_date']              = 'Tanggal:';
+$lang['img_fname']             = 'Nama file:';
+$lang['img_fsize']             = 'Ukuran:';
+$lang['img_artist']            = 'Tukang foto:';
+$lang['img_copyr']             = 'Hakcipta:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Katakunci:';
+$lang['img_width']             = 'Lebar:';
+$lang['img_height']            = 'Tinggi:';
+$lang['subscr_subscribe_success'] = 'Menambah %s ke senarai langganan untuk %s';
+$lang['subscr_subscribe_error'] = 'Kesalahan menambahkan %s ke senarai langganan untuk %s';
+$lang['subscr_subscribe_noaddress'] = 'Tidak ada alamat yang terkait dengan login Anda, Anda tidak dapat ditambahkan ke senarai langganan';
+$lang['subscr_unsubscribe_success'] = 'Menghapus %s dari senarai langganan untuk %s';
+$lang['subscr_unsubscribe_error'] = 'Kesalahan menghapus %s dari senarai langganan untuk %s';
+$lang['subscr_already_subscribed'] = '%s sudah dilanggankan ke %s';
+$lang['subscr_not_subscribed'] = '%s tidak dilanggankan ke %s';
+$lang['subscr_m_not_subscribed'] = 'Saat ini Anda tidak berlangganan halaman dan namespace saat ini.';
+$lang['subscr_m_new_header']   = 'Tambahkan langganan';
+$lang['subscr_m_current_header'] = 'Langganan saat ini';
+$lang['subscr_m_unsubscribe']  = 'Berhenti berlangganan';
+$lang['subscr_m_subscribe']    = 'Berlangganan';
+$lang['subscr_m_receive']      = 'Menerima';
+$lang['subscr_style_every']    = 'email setiap diubah';
 $lang['authtempfail']          = 'Autentikasi user saat ini sedang tidak dapat digunakan. Jika kejadian ini berlanjut, Harap informasikan admin Wiki Anda.';
 $lang['i_chooselang']          = 'Pilih bahasa';
 $lang['i_installer']           = 'Instalasi DokuWiki';
@@ -217,4 +288,41 @@ $lang['i_policy']              = 'Policy ACL awal';
 $lang['i_pol0']                = 'Wiki Terbuka (baca, tulis, upload untuk semua orang)';
 $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_allowreg']            = 'Ijinkan pengguna mendaftar sendiri';
 $lang['i_retry']               = 'Coba Lagi';
+$lang['i_license']             = 'Silakan pilih lisensi untuk konten Anda:';
+$lang['i_license_none']        = 'Jangan tampilkan semua informasi lisensi';
+$lang['i_pop_field']           = 'Tolong, bantu kami meningkatkan pengalaman DokuWiki:';
+$lang['i_pop_label']           = 'Setiap bulan mengirimkan penggunaan data anonim ke pengembang DokuWiki';
+$lang['years']                 = '%d tahun yang lalu';
+$lang['months']                = '%d bulan yang lalu';
+$lang['weeks']                 = '%d minggu yang lalu';
+$lang['days']                  = '%d hari yang lalu';
+$lang['hours']                 = '%d jam yang lalu';
+$lang['minutes']               = '%d menit yang lalu';
+$lang['seconds']               = '%d detik yang lalu';
+$lang['wordblock']             = 'Pengubahan Anda tidak disimpan karena berisi teks yang diblokir (spam).';
+$lang['media_uploadtab']       = 'Unggah';
+$lang['media_searchtab']       = 'Cari';
+$lang['media_file']            = 'Berkas';
+$lang['media_viewtab']         = 'Lihat';
+$lang['media_edittab']         = 'Sunting';
+$lang['media_historytab']      = 'Riwayat';
+$lang['media_list_rows']       = 'Kolom';
+$lang['media_sort_name']       = 'Nama';
+$lang['media_sort_date']       = 'Tanggal';
+$lang['media_namespaces']      = 'Pilih namespace';
+$lang['media_upload']          = 'Unggah ke %s';
+$lang['media_search']          = 'Cari di %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s di %s';
+$lang['media_edit']            = 'Sunting %s';
+$lang['media_history']         = 'Riwayat %s';
+$lang['media_meta_edited']     = 'metadata disunting';
+$lang['media_perm_read']       = 'Maaf, Anda tidak memiliki izin untuk membaca berkas.';
+$lang['media_perm_upload']     = 'Maaf, Anda tidak memiliki izin untuk mengunggah berkas.';
+$lang['media_update']          = 'Unggah versi baru';
+$lang['media_restore']         = 'Kembalikan versi ini';
+$lang['currentns']             = 'Namespace saat ini';
+$lang['searchresult']          = 'Hasil Pencarian';
+$lang['wikimarkup']            = 'Markah Wiki';
diff --git a/inc/lang/id/resetpwd.txt b/inc/lang/id/resetpwd.txt
new file mode 100644
index 000000000..6ab26c866
--- /dev/null
+++ b/inc/lang/id/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Atur sandi baru ====== 
+
+Silakan masukkan sandi baru untuk akun Anda di wiki ini.
\ No newline at end of file
diff --git a/inc/lang/id/subscr_digest.txt b/inc/lang/id/subscr_digest.txt
new file mode 100644
index 000000000..5e1041c04
--- /dev/null
+++ b/inc/lang/id/subscr_digest.txt
@@ -0,0 +1,17 @@
+Hei! 
+
+Halaman @PAGE@ di wiki @TITLE@ telah disunting. 
+Berikut perubahannya:
+
+-------------------------------------------------------- 
+@DIFF@ 
+-------------------------------------------------------- 
+
+Revisi lama: @OLDPAGE@ 
+
+Revisi baru: @NEWPAGE@ 
+
+Untuk menonaktifkan pemberitahuan ini, masuk ke wiki di @DOKUWIKIURL@ kemudian kunjungi @SUBSCRIBE@ dan halaman batal berlangganan dan/atau namespace yang diubah.
+
+-- 
+Email ini dibuat oleh DokuWiki di @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php
index fbc7e9049..de1a01ed5 100644
--- a/inc/lang/is/lang.php
+++ b/inc/lang/is/lang.php
@@ -51,7 +51,7 @@ $lang['btn_recover']           = 'Endurheimta uppkast';
 $lang['btn_draftdel']          = 'Eyða uppkasti';
 $lang['btn_revert']            = 'Endurheimta';
 $lang['btn_register']          = 'Skráning';
-$lang['loggedinas']            = 'Innskráning sem';
+$lang['loggedinas']            = 'Innskráning sem:';
 $lang['user']                  = 'Notendanafn';
 $lang['pass']                  = 'Aðgangsorð';
 $lang['newpass']               = 'Nýtt aðgangsorð';
@@ -89,11 +89,11 @@ $lang['license']               = 'Nema annað sé tekið fram, efni á þessari
 $lang['licenseok']             = 'Athugið: Með því að breyta þessari síðu samþykkir þú að leyfisveitandi efni undir eftirfarandi leyfi:';
 $lang['searchmedia']           = 'Leit skrárheiti:';
 $lang['searchmedia_in']        = 'Leit í %s';
-$lang['txt_upload']            = 'Veldu skrá til innhleðslu';
-$lang['txt_filename']          = 'Innhlaða sem (valfrjálst)';
+$lang['txt_upload']            = 'Veldu skrá til innhleðslu:';
+$lang['txt_filename']          = 'Innhlaða sem (valfrjálst):';
 $lang['txt_overwrt']           = 'Skrifa yfir skrá sem þegar er til';
-$lang['lockedby']              = 'Læstur af';
-$lang['lockexpire']            = 'Læsing rennur út eftir';
+$lang['lockedby']              = 'Læstur af:';
+$lang['lockexpire']            = 'Læsing rennur út eftir:';
 $lang['nothingfound']          = 'Ekkert fannst';
 $lang['mediaselect']           = 'Miðlaskrá';
 $lang['fileupload']            = 'Hlaða inn miðlaskrá';
@@ -127,9 +127,9 @@ $lang['yours']                 = 'Þín útgáfa';
 $lang['diff']                  = 'Sýna ágreiningur til núverandi endurskoðun';
 $lang['diff2']                 = 'Sýna ágreiningur meðal valið endurskoðun';
 $lang['line']                  = 'Lína';
-$lang['breadcrumb']            = 'Snefill';
-$lang['youarehere']            = 'Þú ert hér';
-$lang['lastmod']               = 'Síðast breytt';
+$lang['breadcrumb']            = 'Snefill:';
+$lang['youarehere']            = 'Þú ert hér:';
+$lang['lastmod']               = 'Síðast breytt:';
 $lang['by']                    = 'af';
 $lang['deleted']               = 'eytt';
 $lang['created']               = 'myndað';
@@ -170,15 +170,15 @@ $lang['admin_register']        = 'Setja nýjan notenda inn';
 $lang['metaedit']              = 'Breyta lýsigögnum';
 $lang['metasaveerr']           = 'Vistun lýsigagna mistókst';
 $lang['metasaveok']            = 'Lýsigögn vistuð';
-$lang['img_backto']            = 'Aftur til';
-$lang['img_title']             = 'Heiti';
-$lang['img_caption']           = 'Skýringartexti';
-$lang['img_date']              = 'Dagsetning';
-$lang['img_fname']             = 'Skrárheiti';
-$lang['img_fsize']             = 'Stærð';
-$lang['img_artist']            = 'Myndsmiður';
-$lang['img_copyr']             = 'Útgáfuréttur';
-$lang['img_format']            = 'Forsnið';
-$lang['img_camera']            = 'Myndavél';
-$lang['img_keywords']          = 'Lykilorðir';
+$lang['btn_img_backto']            = 'Aftur til %s';
+$lang['img_title']             = 'Heiti:';
+$lang['img_caption']           = 'Skýringartexti:';
+$lang['img_date']              = 'Dagsetning:';
+$lang['img_fname']             = 'Skrárheiti:';
+$lang['img_fsize']             = 'Stærð:';
+$lang['img_artist']            = 'Myndsmiður:';
+$lang['img_copyr']             = 'Útgáfuréttur:';
+$lang['img_format']            = 'Forsnið:';
+$lang['img_camera']            = 'Myndavél:';
+$lang['img_keywords']          = 'Lykilorðir:';
 $lang['i_retry']               = 'Reyna aftur';
diff --git a/inc/lang/it/denied.txt b/inc/lang/it/denied.txt
index d21956a5b..577d081ce 100644
--- a/inc/lang/it/denied.txt
+++ b/inc/lang/it/denied.txt
@@ -1,5 +1,4 @@
 ====== Accesso negato ======
 
-Non hai i diritti per continuare. Forse hai dimenticato di effettuare l'accesso?
-
+Non hai i diritti per continuare.
 
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index a2bde3b60..a3017a92e 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -17,6 +17,8 @@
  * @author snarchio@gmail.com
  * @author Edmondo Di Tucci <snarchio@gmail.com>
  * @author Claudio Lanconelli <lancos@libero.it>
+ * @author Mirko <malisan.mirko@gmail.com>
+ * @author Francesco <francesco.cavalli@hotmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -61,7 +63,9 @@ $lang['btn_register']          = 'Registrazione';
 $lang['btn_apply']             = 'Applica';
 $lang['btn_media']             = 'Gestore Media';
 $lang['btn_deleteuser']        = 'Rimuovi il mio account';
-$lang['loggedinas']            = 'Collegato come';
+$lang['btn_img_backto']        = 'Torna a %s';
+$lang['btn_mediaManager']      = 'Guarda nel gestore media';
+$lang['loggedinas']            = 'Collegato come:';
 $lang['user']                  = 'Nome utente';
 $lang['pass']                  = 'Password';
 $lang['newpass']               = 'Nuova password';
@@ -106,12 +110,12 @@ $lang['license']               = 'Ad eccezione da dove è diversamente indicato,
 $lang['licenseok']             = 'Nota: modificando questa pagina accetti di rilasciare il contenuto sotto la seguente licenza:';
 $lang['searchmedia']           = 'Cerca file di nome:';
 $lang['searchmedia_in']        = 'Cerca in %s';
-$lang['txt_upload']            = 'Seleziona un file da caricare';
-$lang['txt_filename']          = 'Carica come (opzionale)';
+$lang['txt_upload']            = 'Seleziona un file da caricare:';
+$lang['txt_filename']          = 'Carica come (opzionale):';
 $lang['txt_overwrt']           = 'Sovrascrivi file esistente';
 $lang['maxuploadsize']         = 'Upload max. %s per ogni file.';
-$lang['lockedby']              = 'Attualmente bloccato da';
-$lang['lockexpire']            = 'Il blocco scade alle';
+$lang['lockedby']              = 'Attualmente bloccato da:';
+$lang['lockexpire']            = 'Il blocco scade alle:';
 $lang['js']['willexpire']      = 'Il tuo blocco su questa pagina scadrà tra circa un minuto.\nPer evitare incongruenze usa il pulsante di anteprima per prolungare il periodo di blocco.';
 $lang['js']['notsavedyet']     = 'Le modifiche non salvate andranno perse.';
 $lang['js']['searchmedia']     = 'Cerca file';
@@ -146,6 +150,7 @@ $lang['js']['del_confirm']     = 'Eliminare veramente questa voce?';
 $lang['js']['restore_confirm'] = 'Vuoi davvero ripristinare questa versione?';
 $lang['js']['media_diff']      = 'Guarda le differenze:';
 $lang['js']['media_diff_both'] = 'Fianco a Fianco';
+$lang['js']['media_diff_portions'] = 'rubare';
 $lang['js']['media_select']    = 'Seleziona files..';
 $lang['js']['media_upload_btn'] = 'Upload';
 $lang['js']['media_done_btn']  = 'Fatto';
@@ -189,10 +194,13 @@ $lang['difflink']              = 'Link a questa pagina di confronto';
 $lang['diff_type']             = 'Guarda le differenze:';
 $lang['diff_inline']           = 'In linea';
 $lang['diff_side']             = 'Fianco a Fianco';
+$lang['diffprevrev']           = 'Revisione precedente';
+$lang['diffnextrev']           = 'Prossima revisione';
+$lang['difflastrev']           = 'Ultima revisione';
 $lang['line']                  = 'Linea';
-$lang['breadcrumb']            = 'Traccia';
-$lang['youarehere']            = 'Ti trovi qui';
-$lang['lastmod']               = 'Ultima modifica';
+$lang['breadcrumb']            = 'Traccia:';
+$lang['youarehere']            = 'Ti trovi qui:';
+$lang['lastmod']               = 'Ultima modifica:';
 $lang['by']                    = 'da';
 $lang['deleted']               = 'eliminata';
 $lang['created']               = 'creata';
@@ -245,20 +253,18 @@ $lang['admin_register']        = 'Aggiungi un nuovo utente';
 $lang['metaedit']              = 'Modifica metadati';
 $lang['metasaveerr']           = 'Scrittura metadati fallita';
 $lang['metasaveok']            = 'Metadati salvati';
-$lang['img_backto']            = 'Torna a';
-$lang['img_title']             = 'Titolo';
-$lang['img_caption']           = 'Descrizione';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nome File';
-$lang['img_fsize']             = 'Dimensione';
-$lang['img_artist']            = 'Autore';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Parole chiave';
-$lang['img_width']             = 'Larghezza';
-$lang['img_height']            = 'Altezza';
-$lang['img_manager']           = 'Guarda nel gestore media';
+$lang['img_title']             = 'Titolo:';
+$lang['img_caption']           = 'Descrizione:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nome File:';
+$lang['img_fsize']             = 'Dimensione:';
+$lang['img_artist']            = 'Autore:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formato:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Parole chiave:';
+$lang['img_width']             = 'Larghezza:';
+$lang['img_height']            = 'Altezza:';
 $lang['subscr_subscribe_success'] = 'Aggiunto %s alla lista di sottoscrizioni %s';
 $lang['subscr_subscribe_error'] = 'Impossibile aggiungere %s alla lista di sottoscrizioni %s';
 $lang['subscr_subscribe_noaddress'] = 'Non esiste alcun indirizzo associato al tuo account, non puoi essere aggiunto alla lista di sottoscrizioni';
@@ -337,4 +343,6 @@ $lang['media_perm_read']       = 'Spiacente, non hai abbastanza privilegi per le
 $lang['media_perm_upload']     = 'Spiacente, non hai abbastanza privilegi per caricare files.';
 $lang['media_update']          = 'Carica nuova versione';
 $lang['media_restore']         = 'Ripristina questa versione';
+$lang['currentns']             = 'Namespace corrente';
 $lang['searchresult']          = 'Risultati della ricerca';
+$lang['plainhtml']             = 'HTML';
diff --git a/inc/lang/ja/denied.txt b/inc/lang/ja/denied.txt
index d170aebe4..98ccb2f5a 100644
--- a/inc/lang/ja/denied.txt
+++ b/inc/lang/ja/denied.txt
@@ -1,4 +1,4 @@
 ====== アクセスが拒否されました ======
 
-実行する権限がありません。ログインされているか確認してください。
+実行する権限がありません。
 
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 1f53b0a90..381863eb3 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -11,6 +11,7 @@
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  * @author Hideaki SAWADA <chuno@live.jp>
  * @author Hideaki SAWADA <sawadakun@live.jp>
+ * @author PzF_X <jp_minecraft@yahoo.co.jp>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -55,7 +56,9 @@ $lang['btn_register']          = 'ユーザー登録';
 $lang['btn_apply']             = '適用';
 $lang['btn_media']             = 'メディアマネージャー';
 $lang['btn_deleteuser']        = '自分のアカウントの抹消';
-$lang['loggedinas']            = 'ようこそ';
+$lang['btn_img_backto']        = '戻る %s';
+$lang['btn_mediaManager']      = 'メディアマネージャーで閲覧';
+$lang['loggedinas']            = 'ようこそ:';
 $lang['user']                  = 'ユーザー名';
 $lang['pass']                  = 'パスワード';
 $lang['newpass']               = '新しいパスワード';
@@ -100,12 +103,12 @@ $lang['license']               = '特に明示されていない限り、本Wiki
 $lang['licenseok']             = '注意： 本ページを編集することは、あなたの編集した内容が次のライセンスに従うことに同意したものとみなします：';
 $lang['searchmedia']           = '検索ファイル名：';
 $lang['searchmedia_in']        = '%s 内を検索';
-$lang['txt_upload']            = 'アップロードするファイルを選んでください。';
-$lang['txt_filename']          = '名前を変更してアップロード（オプション）';
+$lang['txt_upload']            = 'アップロードするファイルを選んでください。:';
+$lang['txt_filename']          = '名前を変更してアップロード（オプション）:';
 $lang['txt_overwrt']           = '既存のファイルを上書き';
 $lang['maxuploadsize']         = 'アップロード上限サイズ %s /ファイル';
-$lang['lockedby']              = 'この文書は次のユーザーによってロックされています';
-$lang['lockexpire']            = 'ロック期限：';
+$lang['lockedby']              = 'この文書は次のユーザーによってロックされています:';
+$lang['lockexpire']            = 'ロック期限：:';
 $lang['js']['willexpire']      = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
 $lang['js']['notsavedyet']     = '変更は保存されません。このまま処理を続けてよろしいですか？';
 $lang['js']['searchmedia']     = 'ファイル検索';
@@ -184,10 +187,15 @@ $lang['difflink']              = 'この比較画面にリンクする';
 $lang['diff_type']             = '差分の表示方法：';
 $lang['diff_inline']           = 'インライン';
 $lang['diff_side']             = '横に並べる';
+$lang['diffprevrev']           = '前のリビジョン';
+$lang['diffnextrev']           = '次のリビジョン';
+$lang['difflastrev']           = '最新リビジョン';
+$lang['diffbothprevrev']       = '両方とも前のリビジョン';
+$lang['diffbothnextrev']       = '両方とも次のリビジョン';
 $lang['line']                  = 'ライン';
-$lang['breadcrumb']            = 'トレース';
-$lang['youarehere']            = '現在位置';
-$lang['lastmod']               = '最終更新';
+$lang['breadcrumb']            = 'トレース:';
+$lang['youarehere']            = '現在位置:';
+$lang['lastmod']               = '最終更新:';
 $lang['by']                    = 'by';
 $lang['deleted']               = '削除';
 $lang['created']               = '作成';
@@ -240,20 +248,18 @@ $lang['admin_register']        = '新規ユーザー作成';
 $lang['metaedit']              = 'メタデータ編集';
 $lang['metasaveerr']           = 'メタデータの書き込みに失敗しました';
 $lang['metasaveok']            = 'メタデータは保存されました';
-$lang['img_backto']            = '戻る';
-$lang['img_title']             = 'タイトル';
-$lang['img_caption']           = '見出し';
-$lang['img_date']              = '日付';
-$lang['img_fname']             = 'ファイル名';
-$lang['img_fsize']             = 'サイズ';
-$lang['img_artist']            = '作成者';
-$lang['img_copyr']             = '著作権';
-$lang['img_format']            = 'フォーマット';
-$lang['img_camera']            = '使用カメラ';
-$lang['img_keywords']          = 'キーワード';
-$lang['img_width']             = '幅';
-$lang['img_height']            = '高さ';
-$lang['img_manager']           = 'メディアマネージャーで閲覧';
+$lang['img_title']             = 'タイトル:';
+$lang['img_caption']           = '見出し:';
+$lang['img_date']              = '日付:';
+$lang['img_fname']             = 'ファイル名:';
+$lang['img_fsize']             = 'サイズ:';
+$lang['img_artist']            = '作成者:';
+$lang['img_copyr']             = '著作権:';
+$lang['img_format']            = 'フォーマット:';
+$lang['img_camera']            = '使用カメラ:';
+$lang['img_keywords']          = 'キーワード:';
+$lang['img_width']             = '幅:';
+$lang['img_height']            = '高さ:';
 $lang['subscr_subscribe_success'] = '%sが%sの購読リストに登録されました。';
 $lang['subscr_subscribe_error'] = '%sを%sの購読リストへの追加に失敗しました。';
 $lang['subscr_subscribe_noaddress'] = 'あなたのログインに対応するアドレスがないため、購読リストへ追加することができません。';
@@ -283,6 +289,7 @@ $lang['i_modified']            = 'セキュリティの理由から、新規も�
                          <a href="http://dokuwiki.org/install">Dokuwiki インストールガイド</a>を参考にしてインストールしてください。';
 $lang['i_funcna']              = 'PHPの関数 <code>%s</code> が使用できません。ホスティング会社が何らかの理由で無効にしている可能性があります。';
 $lang['i_phpver']              = 'PHPのバージョン <code>%s</code> が必要なバージョン <code>%s</code> より以前のものです。PHPのアップグレードが必要です。';
+$lang['i_mbfuncoverload']      = 'DokuWiki を実行する php.ini ファイルの mbstring.func_overload は無効にして下さい。';
 $lang['i_permfail']            = '<code>%s</code> に書き込みできません。このディレクトリの権限を確認して下さい。';
 $lang['i_confexists']          = '<code>%s</code> は既に存在します';
 $lang['i_writeerr']            = '<code>%s</code> を作成できません。ディレクトリとファイルの権限を確認し、それらを手動で作成する必要があります。';
diff --git a/inc/lang/ka/admin.txt b/inc/lang/ka/admin.txt
new file mode 100644
index 000000000..97072a449
--- /dev/null
+++ b/inc/lang/ka/admin.txt
@@ -0,0 +1,4 @@
+====== მართვა ======
+
+ქვემოთ თქვენ ხედავთ ადმინისტრაციული ოპერაციების სიას «დოკუვიკიში».
+
diff --git a/inc/lang/ka/adminplugins.txt b/inc/lang/ka/adminplugins.txt
new file mode 100644
index 000000000..011bfeb62
--- /dev/null
+++ b/inc/lang/ka/adminplugins.txt
@@ -0,0 +1 @@
+===== დამატებითი პლაგინები =====
\ No newline at end of file
diff --git a/inc/lang/ka/backlinks.txt b/inc/lang/ka/backlinks.txt
new file mode 100644
index 000000000..7b54797c7
--- /dev/null
+++ b/inc/lang/ka/backlinks.txt
@@ -0,0 +1,4 @@
+====== გადმომისამართება ======
+
+გვერდები რომლებიც ანიშნებენ ამ გვერდზე.
+
diff --git a/inc/lang/ka/conflict.txt b/inc/lang/ka/conflict.txt
new file mode 100644
index 000000000..1b1eb0482
--- /dev/null
+++ b/inc/lang/ka/conflict.txt
@@ -0,0 +1,5 @@
+====== გამოვიდა უფრო ახალი ვერსია ======
+
+არსებობს დოკუმენტის უფრო ახალი ვერსია, რომელიც თქვენ დაარედაქტირეთ. ეს ხდება მაშინ, როდესაც სხვა მომხმარებელი არედაქტირებს დოკუმენტს, სანამ თქვენ აკეთებდით იგივეს. 
+
+ყურადღებით დააკვირდით ქვემოთ მოყვანილ განსხვავებებს, და გადაწყვიტეთ რომელი ვერსია სჯობს. თუ შენახვას დააჭერთ, თქვენი ვერსია შეინახება.
\ No newline at end of file
diff --git a/inc/lang/ka/denied.txt b/inc/lang/ka/denied.txt
new file mode 100644
index 000000000..bb8910472
--- /dev/null
+++ b/inc/lang/ka/denied.txt
@@ -0,0 +1,3 @@
+====== მიუწვდომელია ======
+
+თქვენ არ გაქვთ საკმარისი უფლებები. იქნებ ავტორიზაცია დაგავიწყდათ?
diff --git a/inc/lang/ka/diff.txt b/inc/lang/ka/diff.txt
new file mode 100644
index 000000000..c635e45f4
--- /dev/null
+++ b/inc/lang/ka/diff.txt
@@ -0,0 +1,3 @@
+====== განსხვავებები ======
+ქვემოთ მოყვანილაი განსხვავებები მსგავს გვერდებს შორის.
+
diff --git a/inc/lang/ka/draft.txt b/inc/lang/ka/draft.txt
new file mode 100644
index 000000000..f3356ddb5
--- /dev/null
+++ b/inc/lang/ka/draft.txt
@@ -0,0 +1,3 @@
+====== ნაპოვნია ჩანაწერი ======
+
+გვერდის რედაქტირება არ იყო დამთავრებული. 
\ No newline at end of file
diff --git a/inc/lang/ka/edit.txt b/inc/lang/ka/edit.txt
new file mode 100644
index 000000000..3fffceb0c
--- /dev/null
+++ b/inc/lang/ka/edit.txt
@@ -0,0 +1,2 @@
+დაარედაქტირეთ გვერდი და დააჭირეთ «შენახვას». წაიკითხეთ [[wiki:syntax|FAQ]] ვიკის სინტაქსისთან გასაცნობად. დაარედაქტირეთ გვერდი მხოლოდ იმ შემთხვევაში თუ აპირებთ გვერდის გაუმჯობესებას. თუ თქვენ რამის დატესტვა გინდათ, გამოიყენეთ სპეციალური გვერდი.
+
diff --git a/inc/lang/ka/editrev.txt b/inc/lang/ka/editrev.txt
new file mode 100644
index 000000000..17ccff57f
--- /dev/null
+++ b/inc/lang/ka/editrev.txt
@@ -0,0 +1,2 @@
+**თქვენ ატვირთეთ დოკუმენტის ძველი ვერსია** მისი შენახვით თქვენ შექმნით ახალ ვერსიას იგივე შიგთავსით.
+----
diff --git a/inc/lang/ka/index.txt b/inc/lang/ka/index.txt
new file mode 100644
index 000000000..7daef7fb6
--- /dev/null
+++ b/inc/lang/ka/index.txt
@@ -0,0 +1 @@
+====== სტატიები ====== აქ ნაჩვენებია ყველა სტატია
\ No newline at end of file
diff --git a/inc/lang/ka/lang.php b/inc/lang/ka/lang.php
new file mode 100644
index 000000000..28ca11e45
--- /dev/null
+++ b/inc/lang/ka/lang.php
@@ -0,0 +1,326 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Luka Lejava <luka.lejava@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'დაარედაქტირეთ ეს გვერდი';
+$lang['btn_source']            = 'მაჩვენე გვერდის კოდი';
+$lang['btn_show']              = 'გვერდის ჩვენება';
+$lang['btn_create']            = 'გვერდის შექმნა';
+$lang['btn_search']            = 'ძიება';
+$lang['btn_save']              = 'შენახვა';
+$lang['btn_preview']           = 'ჩვენება';
+$lang['btn_top']               = 'მაღლა';
+$lang['btn_newer']             = '<<  მეტი ';
+$lang['btn_older']             = 'ნაკლები  >>';
+$lang['btn_revs']              = 'ძველი ვერსიები';
+$lang['btn_recent']            = 'ბოლო ცვლილებები';
+$lang['btn_upload']            = 'ატვირთვა';
+$lang['btn_cancel']            = 'შეწყვეტა';
+$lang['btn_index']             = 'სტატიები';
+$lang['btn_secedit']           = 'რედაქტირება';
+$lang['btn_login']             = 'შესვლა';
+$lang['btn_logout']            = 'გამოსვლა';
+$lang['btn_admin']             = 'ადმინი';
+$lang['btn_update']            = 'განახლება';
+$lang['btn_delete']            = 'წაშლა';
+$lang['btn_back']              = 'უკან';
+$lang['btn_backlink']          = 'გადმომისამართებული ბმულები';
+$lang['btn_backtomedia']       = 'მედიაფაილების არჩევა';
+$lang['btn_subscribe']         = 'Manage Subscriptions';
+$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['btn_deleteuser']        = 'ჩემი ექაუნთის წაშლა';
+$lang['btn_img_backto']        = 'უკან %';
+$lang['btn_mediaManager']      = 'მედია ფაილების მმართველში გახსნა';
+$lang['loggedinas']            = 'შესული ხართ როგორც:';
+$lang['user']                  = 'ლოგინი';
+$lang['pass']                  = 'პაროლი';
+$lang['newpass']               = 'ახალი პაროლი';
+$lang['oldpass']               = 'დაადასტურეთ პაროლი';
+$lang['passchk']               = 'კიდევ ერთხელ';
+$lang['remember']              = 'დამიმახსოვრე';
+$lang['fullname']              = 'ნამდვილი სახელი';
+$lang['email']                 = 'ფოსტა';
+$lang['profile']               = 'მომხმარებლის პროფილი';
+$lang['badlogin']              = 'ლოგინი ან პაროლი არასწორია';
+$lang['badpassconfirm']        = 'პაროლი არასწორია';
+$lang['minoredit']             = 'ცვლილებები';
+$lang['draftdate']             = 'ჩანაწერების ავტომატური შენახვა ჩართულია';
+$lang['nosecedit']             = 'გვერდს ვადა გაუვიდა';
+$lang['regmissing']            = 'ყველა ველი შეავსეთ';
+$lang['reguexists']            = 'მსგავსი ლოგინი უკვე არსებობს';
+$lang['regsuccess']            = 'მომხმარებელი შექმნილია, პაროლი გამოგზავნილია';
+$lang['regsuccess2']           = 'მომხმარებელი შექმნილია';
+$lang['regmailfail']           = 'დაფიქსირდა შეცდომა';
+$lang['regbadmail']            = 'ფოსტა არასწორია';
+$lang['regbadpass']            = 'პაროლი განსხვავებულია';
+$lang['regpwmail']             = 'თვენი DokuWiki პაროლი';
+$lang['reghere']               = 'დარეგისტრირდი';
+$lang['profna']                = 'არ შეგიძლიათ პროფილის რედაქტირება';
+$lang['profnochange']          = 'ცვლილებები არ არის';
+$lang['profnoempty']           = 'ცარიელი სახელი ან ფოსტა დაუშვებელია';
+$lang['profchanged']           = 'პროფილი განახლდა';
+$lang['profnodelete']          = 'მომხმარებლის წაშლა შეუძლებელია';
+$lang['profdeleteuser']        = 'პროფილის წაშლა';
+$lang['profdeleted']           = 'პროფილი წაიშალა';
+$lang['profconfdelete']        = 'მე მსურს პროფილის წაშლა. <br/> თქვენ აღარ გექნებათ საშუალება აღადგინოთ პროფილი.';
+$lang['profconfdeletemissing'] = 'დადასტურების ველი ცარიელია';
+$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']        = 'ძებნა %-ში';
+$lang['txt_upload']            = 'აირჩიეთ ასატვირთი ფაილი:';
+$lang['txt_filename']          = 'ატვირთვა როგორც (არჩევითი):';
+$lang['txt_overwrt']           = 'გადაწერა ზემოდან';
+$lang['maxuploadsize']         = 'მაქსიმალური ზომა %';
+$lang['lockedby']              = 'დაბლოკილია:';
+$lang['lockexpire']            = 'განიბლოკება:';
+$lang['js']['willexpire']      = 'გვერდი განიბლოკება 1 წუთში';
+$lang['js']['notsavedyet']     = 'შეუნახავი მონაცემები წაიშლება';
+$lang['js']['searchmedia']     = 'ძებნა';
+$lang['js']['keepopen']        = 'დატოვეთ ღია';
+$lang['js']['hidedetails']     = 'დეტალების დამალვა';
+$lang['js']['mediatitle']      = 'ინსტრუმენტები';
+$lang['js']['mediadisplay']    = 'ბმულის ტიპი';
+$lang['js']['mediaalign']      = 'Alignment';
+$lang['js']['mediasize']       = 'სურათის ზომა';
+$lang['js']['mediatarget']     = 'მიზნის ბმული';
+$lang['js']['mediaclose']      = 'დახურვა';
+$lang['js']['mediainsert']     = 'ჩასმა';
+$lang['js']['mediadisplayimg'] = 'სურათის ნახვა';
+$lang['js']['mediadisplaylnk'] = 'მაჩვენე მხოლოდ ბმული';
+$lang['js']['mediasmall']      = 'მცირე ვერსია';
+$lang['js']['mediamedium']     = 'საშუალო ვერსია';
+$lang['js']['medialarge']      = 'ვრცელი ვერსია';
+$lang['js']['mediaoriginal']   = 'ორიგინალი ვერსია';
+$lang['js']['medialnk']        = 'დაწვრილებით';
+$lang['js']['mediadirect']     = 'ორიგინალი';
+$lang['js']['medianolnk']      = 'ბმული არ არის';
+$lang['js']['medianolink']     = 'არ დალინკოთ სურათი';
+$lang['js']['medialeft']       = 'მარცხვნივ განათავსეთ სურათი';
+$lang['js']['mediaright']      = 'მარჯვნივ განათავსეთ სურათი';
+$lang['js']['mediacenter']     = 'შუაში განათავსეთ სურათი';
+$lang['js']['medianoalign']    = 'Use no align.';
+$lang['js']['nosmblinks']      = 'ეს ფუქნცია მუშაობს მხოლოდ  Internet Explorer-ზე';
+$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'] = 'Shine-through';
+$lang['js']['media_diff_portions'] = 'Swipe
+';
+$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']            = 'ატვირთვა დასრულებულია';
+$lang['uploadfail']            = 'შეფერხება ატვირთვისას';
+$lang['uploadwrong']           = 'ატვირთვა შეუძლებელია';
+$lang['uploadexist']           = 'ფაილი უკვე არსებობს';
+$lang['uploadbadcontent']      = 'ატვირთული ფაილები არ ემთხვევა ';
+$lang['uploadspam']            = 'ატვირთვა დაბლოკილია სპამბლოკერის მიერ';
+$lang['uploadxss']             = 'ატვირთვა დაბლოკილია';
+$lang['uploadsize']            = 'ასატვირთი ფაილი ზედმეტად დიდია';
+$lang['deletesucc']            = '% ფაილები წაიშალა';
+$lang['deletefail']            = '% ვერ მოიძებნა';
+$lang['mediainuse']            = 'ფაილის % ვერ წაიშალა, რადგან გამოყენებაშია';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'არსებული ფაილები';
+$lang['accessdenied']          = 'თქვენ არ შეგიძლიათ გვერდის ნახვა';
+$lang['mediausage']            = 'Use the following syntax to reference this file:';
+$lang['mediaview']             = 'ორიგინალი ფაილის ჩვენება';
+$lang['mediaroot']             = 'root';
+$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']             = 'ფაილი წაშლა შეუძლებელია, გამოიყენება აქ:';
+$lang['ref_hidden']            = 'ზოგიერთი ბლოკის წაკითხვის უფლება არ გაქვთ';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'მსგავსი სახელები';
+$lang['toc']                   = 'Table of Contents';
+$lang['current']               = 'ახლანდელი';
+$lang['yours']                 = 'თვენი ვერსია';
+$lang['diff']                  = 'ვერსიების განსხვავება';
+$lang['diff2']                 = 'განსხვავებები';
+$lang['difflink']              = 'Link to this comparison view';
+$lang['diff_type']             = 'განსხვავებების ჩვენება';
+$lang['diff_inline']           = 'Inline';
+$lang['diff_side']             = 'გვერდიგვერდ';
+$lang['diffprevrev']           = 'წინა ვერსია';
+$lang['diffnextrev']           = 'შემდეგი ვერსია';
+$lang['difflastrev']           = 'ბოლო ვერსია';
+$lang['diffbothprevrev']       = 'Both sides previous revision';
+$lang['diffbothnextrev']       = 'Both sides next revision';
+$lang['line']                  = 'ზოლი';
+$lang['breadcrumb']            = 'Trace:';
+$lang['youarehere']            = 'თვენ ხართ აქ:';
+$lang['lastmod']               = 'ბოლოს მოდიფიცირებული:';
+$lang['deleted']               = 'წაშლილია';
+$lang['created']               = 'შექმნილია';
+$lang['restored']              = 'ძველი ვერსია აღდგენილია %';
+$lang['external_edit']         = 'რედაქტირება';
+$lang['summary']               = 'Edit summary';
+$lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">საჭიროა Adobe Flash Plugin</a>';
+$lang['download']              = 'Snippet-ის გადმოწერა';
+$lang['tools']                 = 'ინსტრუმენტები';
+$lang['user_tools']            = 'მომხმარებლის ინსტრუმენტები';
+$lang['site_tools']            = 'საიტის ინსტრუმენტები';
+$lang['page_tools']            = 'გვერდის ინსტრუმენტები';
+$lang['skip_to_content']       = 'მასალა';
+$lang['sidebar']               = 'გვერდითი პანელი';
+$lang['mail_newpage']          = 'გვერდი დამატებულია:';
+$lang['mail_changed']          = 'გვერდი შეცვლილია:';
+$lang['mail_subscribe_list']   = 'გვერდში შეცვლილია namespace-ები:';
+$lang['mail_new_user']         = 'ახალი მომხმარებელი';
+$lang['mail_upload']           = 'ფაილი ატვირთულია';
+$lang['changes_type']          = 'ცვლილებები';
+$lang['pages_changes']         = 'გვერდები';
+$lang['media_changes']         = 'მედია ფაილები';
+$lang['both_changes']          = 'გვერდები და მედია ფაილები';
+$lang['qb_bold']               = 'Bold Text';
+$lang['qb_italic']             = 'Italic Text';
+$lang['qb_underl']             = 'Underlined Text';
+$lang['qb_code']               = 'Monospaced Text';
+$lang['qb_strike']             = 'Strike-through Text';
+$lang['qb_h1']                 = 'Level 1 სათაური';
+$lang['qb_h2']                 = 'Level 2 სათაური';
+$lang['qb_h3']                 = 'Level 3 სათაური';
+$lang['qb_h4']                 = 'Level 4 სათაური';
+$lang['qb_h5']                 = 'Level 5 სათაური';
+$lang['qb_h']                  = 'სათაური';
+$lang['qb_hs']                 = 'სათაურის არჩევა';
+$lang['qb_hplus']              = 'Higher სათაური';
+$lang['qb_hminus']             = 'Lower სათაური';
+$lang['qb_hequal']             = 'Same Level სათაური';
+$lang['qb_link']               = 'Internal Link';
+$lang['qb_extlink']            = 'External Link';
+$lang['qb_hr']                 = 'Horizontal Rule';
+$lang['qb_ol']                 = 'შეკვეთილი ბოლო მასალა';
+$lang['qb_ul']                 = 'Unordered List Item';
+$lang['qb_media']              = 'ნახატების და სხვა ფაიელბის დამატება';
+$lang['qb_sig']                = 'ხელმოწერა';
+$lang['qb_smileys']            = 'სმაილები';
+$lang['qb_chars']              = 'Special Chars';
+$lang['upperns']               = 'jump to parent namespace';
+$lang['admin_register']        = 'ახალი მომხმარებლის დამატება';
+$lang['metaedit']              = 'Edit Metadata';
+$lang['metasaveerr']           = 'Writing metadata failed';
+$lang['metasaveok']            = 'Metadata saved';
+$lang['img_title']             = 'სათაური:';
+$lang['img_caption']           = 'Caption:';
+$lang['img_date']              = 'თარიღი:';
+$lang['img_fname']             = 'ფაილის სახელი:';
+$lang['img_fsize']             = 'ზომა:';
+$lang['img_artist']            = 'ფოტოგრაფი:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'ფორმატი:';
+$lang['img_camera']            = 'კამერა:';
+$lang['img_keywords']          = 'Keywords:';
+$lang['img_width']             = 'სიგანე:';
+$lang['img_height']            = 'სიმაღლე:';
+$lang['subscr_subscribe_success'] = 'Added %s to subscription list for %s';
+$lang['subscr_subscribe_error'] = 'Error adding %s to subscription list for %s';
+$lang['subscr_subscribe_noaddress'] = 'There is no address associated with your login, you cannot be added to the subscription list';
+$lang['subscr_unsubscribe_success'] = 'Removed %s from subscription list for %s';
+$lang['subscr_unsubscribe_error'] = 'Error removing %s from subscription list for %s';
+$lang['subscr_already_subscribed'] = '%s is already subscribed to %s';
+$lang['subscr_not_subscribed'] = '%s is not subscribed to %s';
+$lang['subscr_m_not_subscribed'] = 'You are currently not subscribed to the current page or namespace.';
+$lang['subscr_m_new_header']   = 'Add subscription';
+$lang['subscr_m_current_header'] = 'Current subscriptions';
+$lang['subscr_m_unsubscribe']  = 'Unsubscribe';
+$lang['subscr_m_subscribe']    = 'Subscribe';
+$lang['subscr_m_receive']      = 'მიღება';
+$lang['subscr_style_every']    = 'ფოსტა ყოველ ცვლილებაზე';
+$lang['subscr_style_digest']   = 'ფოსტა ყოველი გვერდის შეცვლაზე ';
+$lang['subscr_style_list']     = 'ფოსტა ყოველი გვერდის შეცვლაზე ';
+$lang['authtempfail']          = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
+$lang['authpwdexpire']         = 'თქვენს პაროლს ვადა გაუვა %d დღეში, მალე შეცვლა მოგიწევთ.';
+$lang['i_chooselang']          = 'ენსი არჩევა';
+$lang['i_installer']           = 'DokuWiki დამყენებელი';
+$lang['i_wikiname']            = 'Wiki სახელი';
+$lang['i_enableacl']           = 'Enable ACL (recommended)';
+$lang['i_superuser']           = 'ადმინი';
+$lang['i_problems']            = 'შეასწორეთ შეცდომები';
+$lang['i_modified']            = 'For security reasons this script will only work with a new and unmodified Dokuwiki installation. You should either re-extract the files from the downloaded package or consult the complete <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
+$lang['i_funcna']              = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?';
+$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_permfail']            = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!';
+$lang['i_confexists']          = '<code>%s</code> already exists';
+$lang['i_writeerr']            = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.';
+$lang['i_badhash']             = 'unrecognised or modified dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - illegal or empty value';
+$lang['i_failure']             = 'Some errors occurred while writing the configuration files. You may need to fix them manually before you can use <a href="doku.php?id=wiki:welcome">your new DokuWiki</a>.';
+$lang['i_policy']              = 'Initial ACL policy';
+$lang['i_pol0']                = 'ღია ვიკი (წაკითხვა, დაწერა და ატვირთვა შეუძლია ნებისმიერს)';
+$lang['i_pol1']                = 'თავისუფალი ვიკი (წაკითხვა შეუძლია ყველას, დაწერა და ატვირთვა - რეგისტრირებულს)';
+$lang['i_pol2']                = 'დახურული ვიკი (წაკითხვა, დაწერა და ატვირთვა შეუძლიათ მხოლოდ რეგისტრირებულებს)';
+$lang['i_allowreg']            = 'რეგისტრაციის გახსნა';
+$lang['i_retry']               = 'თავიდან ცდა';
+$lang['i_license']             = 'აირჩიეთ ლიცენზია';
+$lang['i_license_none']        = 'არ აჩვენოთ ლიცენზიის ინფორმაცია';
+$lang['i_pop_field']           = 'დაგვეხმარეთ DokuWiki-ს აგუმჯობესებაში';
+$lang['i_pop_label']           = 'თვეში ერთელ ინფორმაციის DokuWiki-ის ადმინისტრაციისთვის გაგზავნა';
+$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 წლის უკან';
+$lang['months']                = '%d თვის უკან';
+$lang['weeks']                 = '%d კვირის უკან';
+$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']     = 'Thumbnails';
+$lang['media_list_rows']       = 'Rows';
+$lang['media_sort_name']       = 'სახელი';
+$lang['media_sort_date']       = 'თარიღი';
+$lang['media_namespaces']      = 'Choose namespace';
+$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']     = 'metadata edited';
+$lang['media_perm_read']       = 'თვენ არ გაქვთ უფლება წაიკითხოთ ეს მასალა';
diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php
index 37b0f462b..74afa24e5 100644
--- a/inc/lang/kk/lang.php
+++ b/inc/lang/kk/lang.php
@@ -45,7 +45,7 @@ $lang['btn_draftdel']          = 'Шимайды өшіру';
 $lang['btn_revert']            = 'Қалпына келтіру';
 $lang['btn_register']          = 'Тіркеу';
 $lang['btn_apply']             = 'Қолдану/Енгізу';
-$lang['loggedinas']            = 'түпнұсқамен кірген';
+$lang['loggedinas']            = 'түпнұсқамен кірген:';
 $lang['user']                  = 'Түпнұсқа';
 $lang['pass']                  = 'Құпиясөз';
 $lang['newpass']               = 'Жаңа құпиясөз';
@@ -83,11 +83,11 @@ $lang['license']               = 'Басқаша көрсетілген болм
 $lang['licenseok']             = 'Ескерту: бұл бетті өңдеуіңізбен мазмұныңыз келесі лицензия бойынша беруге келесесіз:';
 $lang['searchmedia']           = 'Іздеу файлдың атауы:';
 $lang['searchmedia_in']        = '%s-мен іздеу:';
-$lang['txt_upload']            = 'Еңгізетін файлды таңдау';
-$lang['txt_filename']          = 'Келесідей еңгізу (қалауынша)';
+$lang['txt_upload']            = 'Еңгізетін файлды таңдау:';
+$lang['txt_filename']          = 'Келесідей еңгізу (қалауынша):';
 $lang['txt_overwrt']           = 'Бар файлды қайта жазу';
-$lang['lockedby']              = 'Осы уақытта тойтарылған';
-$lang['lockexpire']            = 'Тойтару келесі уақытта бітеді';
+$lang['lockedby']              = 'Осы уақытта тойтарылған:';
+$lang['lockexpire']            = 'Тойтару келесі уақытта бітеді:';
 $lang['js']['willexpire']      = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
 $lang['js']['notsavedyet']     = 'Сақталмаған өзгерістер жоғалатын болады.';
 $lang['js']['searchmedia']     = 'Файлдарды іздеу';
@@ -123,8 +123,8 @@ $lang['yours']                 = 'Сендердің болжамыңыз';
 $lang['created']               = 'ЖасалFан';
 $lang['mail_new_user']         = 'Жаңа пайдаланушы';
 $lang['qb_chars']              = 'Арнайы белгiлер';
-$lang['img_backto']            = 'Қайта оралу';
-$lang['img_format']            = 'Формат';
-$lang['img_camera']            = 'Камера';
+$lang['btn_img_backto']            = 'Қайта оралу %s';
+$lang['img_format']            = 'Формат:';
+$lang['img_camera']            = 'Камера:';
 $lang['i_chooselang']          = 'Тіл таңдау';
 $lang['i_retry']               = 'Қайталау';
diff --git a/inc/lang/km/denied.txt b/inc/lang/km/denied.txt
index 58b10ee86..be0371498 100644
--- a/inc/lang/km/denied.txt
+++ b/inc/lang/km/denied.txt
@@ -1,3 +1,4 @@
 ====== បដិសេធអនុញ្ញាត ======
+
 សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។
 
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 4800b6c23..749fa419c 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -43,7 +43,7 @@ $lang['btn_recover']  = 'ស្រោះគំរោងឡើង';
 $lang['btn_draftdel'] = 'លុបគំរោង';
 $lang['btn_register'] = 'ចុះឈ្មោះ';//'Register';
 
-$lang['loggedinas'] = 'អ្នកប្រើ';
+$lang['loggedinas'] = 'អ្នកប្រើ:';
 $lang['user']       = 'នាមបម្រើ';
 $lang['pass']       = 'ពាក្សសម្ងត់';
 $lang['newpass']    = 'ពាក្សសម្ងាត់ថ្មី';
@@ -80,11 +80,11 @@ $lang['resendpwdbadauth'] = 'សុំអាទោស​ រហស្សលេ�
 $lang['resendpwdconfirm'] ='ខ្សែបន្ត';
 $lang['resendpwdsuccess'] = 'ពាក្សសម្ងាតអ្នកបានផ្ញើហើយ។';
 
-$lang['txt_upload']   = 'ជ្រើសឯកសារដែលរុញ​ឡើង';
-$lang['txt_filename'] = 'រុញឡើងជា (ស្រេច​ចិត្ត)';
+$lang['txt_upload']   = 'ជ្រើសឯកសារដែលរុញ​ឡើង:';
+$lang['txt_filename'] = 'រុញឡើងជា (ស្រេច​ចិត្ត):';
 $lang['txt_overwrt']  = 'កត់ពីលើ';//'Overwrite existing file';
-$lang['lockedby']     = 'ឥឡូវនេះចកជាប់​';
-$lang['lockexpire']   = 'សោជាប់ផុត​កំណត់ម៉ោង';
+$lang['lockedby']     = 'ឥឡូវនេះចកជាប់​:';
+$lang['lockexpire']   = 'សោជាប់ផុត​កំណត់ម៉ោង:';
 $lang['js']['willexpire']   = 'សោអ្នកចំពោះកែតម្រូវទំព័រនេះ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ»​ ទៅកំណត់​ឡើង​វិញ។';
 
 $lang['js']['notsavedyet'] = 'កម្រែមិនទានរុក្សាទកត្រូវបោះបង់។\nបន្តទៅទាឬទេ?';
@@ -125,9 +125,9 @@ $lang['current']    = 'ឥឡៅវ';
 $lang['yours']      = 'តំណែអ្នាក';
 $lang['diff']       = 'បង្ហាងអសទិសភាពជាមួយតំណែឥឡូវ ';
 $lang['line']       = 'ខ្សែ';
-$lang['breadcrumb'] = 'ដាន';
-$lang['youarehere'] = 'ដាន';
-$lang['lastmod']    = 'ពេលកែចុងក្រោយ';
+$lang['breadcrumb'] = 'ដាន:';
+$lang['youarehere'] = 'ដាន:';
+$lang['lastmod']    = 'ពេលកែចុងក្រោយ:';
 $lang['by']         = 'និពន្ឋដោយ';
 $lang['deleted']    = 'យកចេញ';
 $lang['created']    = 'បង្កើត';
@@ -165,17 +165,17 @@ $lang['admin_register']= 'តែមអ្នកប្រើ';//'Add new user';
 $lang['metaedit']    = 'កែទិន្នន័យអរូប';//'Edit Metadata';
 $lang['metasaveerr'] = 'ពំអាចកត់រទិន្នន័យអរូប';//'Writing metadata failed';
 $lang['metasaveok']  = 'ទិន្នន័យអរូប';
-$lang['img_backto']  = 'ថយក្រោយ';
-$lang['img_title']   = 'អភិធេយ្យ';
-$lang['img_caption'] = 'ចំណងជើង';
-$lang['img_date']    = 'ថ្ងៃខែ';//'Date';
-$lang['img_fname']   = 'ឈ្មោះឯកសារ';
-$lang['img_fsize']   = 'ទំហំ';//'Size';
-$lang['img_artist']  = 'អ្នកថតរូប';
-$lang['img_copyr']   = 'រក្សា​សិទ្ធិ';
-$lang['img_format']  = 'ធុនប្រភេទ';
-$lang['img_camera']  = 'គ្រឿងថត';
-$lang['img_keywords']= 'មេពាក្ស';//'Keywords';
+$lang['btn_img_backto']  = 'ថយក្រោយ%s';
+$lang['img_title']   = 'អភិធេយ្យ:';
+$lang['img_caption'] = 'ចំណងជើង:';
+$lang['img_date']    = 'ថ្ងៃខែ:';//'Date';
+$lang['img_fname']   = 'ឈ្មោះឯកសារ:';
+$lang['img_fsize']   = 'ទំហំ:';//'Size';
+$lang['img_artist']  = 'អ្នកថតរូប:';
+$lang['img_copyr']   = 'រក្សា​សិទ្ធិ:';
+$lang['img_format']  = 'ធុនប្រភេទ:';
+$lang['img_camera']  = 'គ្រឿងថត:';
+$lang['img_keywords']= 'មេពាក្ស:';//'Keywords';
 
 /* auth.class language support */
 $lang['authtempfail']    = 'ការផ្ទៀងផ្ទាត់​ភាព​​ត្រឹមត្រូវឥតដំនេ។ ប្រើ ....';
diff --git a/inc/lang/ko/denied.txt b/inc/lang/ko/denied.txt
index cf0b294a4..a4b94be65 100644
--- a/inc/lang/ko/denied.txt
+++ b/inc/lang/ko/denied.txt
@@ -1,3 +1,4 @@
 ====== 권한 거절 ======
 
-죄송하지만 계속할 수 있는 권한이 없습니다. 로그인을 잊으셨나요?
\ No newline at end of file
+죄송하지만 계속할 수 있는 권한이 없습니다.
+
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 266ff01e5..ff5e66d9b 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -12,6 +12,7 @@
  * @author Myeongjin <aranet100@gmail.com>
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
  * @author Garam <rowain8@gmail.com>
+ * @author Young gon Cha <garmede@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -45,7 +46,7 @@ $lang['btn_back']              = '뒤로';
 $lang['btn_backlink']          = '백링크';
 $lang['btn_backtomedia']       = '미디어 파일 선택으로 돌아가기';
 $lang['btn_subscribe']         = '구독 관리';
-$lang['btn_profile']           = '개인 정보 바꾸기';
+$lang['btn_profile']           = '프로필 바꾸기';
 $lang['btn_reset']             = '재설정';
 $lang['btn_resendpwd']         = '새 비밀번호 설정';
 $lang['btn_draft']             = '초안 편집';
@@ -54,18 +55,20 @@ $lang['btn_draftdel']          = '초안 삭제';
 $lang['btn_revert']            = '되돌리기';
 $lang['btn_register']          = '등록';
 $lang['btn_apply']             = '적용';
-$lang['btn_media']             = '미디어 관리';
+$lang['btn_media']             = '미디어 관리자';
 $lang['btn_deleteuser']        = '내 계정 제거';
-$lang['loggedinas']            = '로그인한 사용자';
+$lang['btn_img_backto']        = '%s(으)로 돌아가기';
+$lang['btn_mediaManager']      = '미디어 관리자에서 보기';
+$lang['loggedinas']            = '로그인한 사용자:';
 $lang['user']                  = '사용자 이름';
 $lang['pass']                  = '비밀번호';
 $lang['newpass']               = '새 비밀번호';
 $lang['oldpass']               = '현재 비밀번호 확인';
-$lang['passchk']               = '비밀번호 다시 확인';
+$lang['passchk']               = '다시 확인';
 $lang['remember']              = '기억하기';
 $lang['fullname']              = '실명';
 $lang['email']                 = '이메일';
-$lang['profile']               = '개인 정보';
+$lang['profile']               = '사용자 프로필';
 $lang['badlogin']              = '죄송하지만 사용자 이름이나 비밀번호가 잘못되었습니다.';
 $lang['badpassconfirm']        = '죄송하지만 비밀번호가 잘못되었습니다';
 $lang['minoredit']             = '사소한 바뀜';
@@ -75,21 +78,21 @@ $lang['regmissing']            = '죄송하지만 모든 필드를 채워야 합
 $lang['reguexists']            = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.';
 $lang['regsuccess']            = '사용자를 만들었으며 비밀번호는 이메일로 보냈습니다.';
 $lang['regsuccess2']           = '사용자를 만들었습니다.';
-$lang['regmailfail']           = '비밀번호를 이메일로 보내는 동안 오류가 발생했습니다. 관리자에게 문의하세요!';
-$lang['regbadmail']            = '주어진 이메일 주소가 잘못되었습니다 - 오류라고 생각하면 관리자에게 문의하세요';
-$lang['regbadpass']            = '새 비밀번호가 같지 않습니다. 다시 입력하세요.';
+$lang['regmailfail']           = '비밀번호를 이메일로 보내는 동안 오류가 발생했습니다. 관리자에게 문의해주세요!';
+$lang['regbadmail']            = '주어진 이메일 주소가 잘못되었습니다 - 오류라고 생각하면 관리자에게 문의해주세요';
+$lang['regbadpass']            = '두 주어진 비밀번호가 같지 않습니다. 다시 입력하세요.';
 $lang['regpwmail']             = '도쿠위키 비밀번호';
-$lang['reghere']               = '계정이 없나요? 계정을 등록할 수 있습니다';
-$lang['profna']                = '이 위키는 개인 정보 수정을 할 수 없습니다';
+$lang['reghere']               = '계정이 없나요? 계정을 등록하세요';
+$lang['profna']                = '이 위키는 프로필 수정을 할 수 없습니다';
 $lang['profnochange']          = '바뀐 내용이 없습니다.';
-$lang['profnoempty']           = '이름이나 이메일 주소가 비었습니다.';
-$lang['profchanged']           = '개인 정보가 성공적으로 바뀌었습니다.';
+$lang['profnoempty']           = '빈 이름이나 이메일 주소는 허용하지 않습니다.';
+$lang['profchanged']           = '프로필이 성공적으로 바뀌었습니다.';
 $lang['profnodelete']          = '이 위키는 사용자 삭제를 지원하지 않습니다';
 $lang['profdeleteuser']        = '계정 삭제';
 $lang['profdeleted']           = '당신의 사용자 계정이 이 위키에서 삭제되었습니다';
 $lang['profconfdelete']        = '이 위키에서 내 계정을 제거하고 싶습니다. <br/> 이 행동은 되돌릴 수 없습니다.';
 $lang['profconfdeletemissing'] = '선택하지 않은 확인 상자를 확인';
-$lang['pwdforget']             = '비밀번호를 잊으셨나요? 비밀번호를 재설정할 수 있습니다';
+$lang['pwdforget']             = '비밀번호를 잊으셨나요? 비밀번호를 재설정하세요';
 $lang['resendna']              = '이 위키는 비밀번호 재설정을 지원하지 않습니다.';
 $lang['resendpwd']             = '다음으로 새 비밀번호 보내기';
 $lang['resendpwdmissing']      = '죄송하지만 모든 필드를 채워야 합니다.';
@@ -101,19 +104,19 @@ $lang['license']               = '별도로 명시하지 않을 경우, 이 위�
 $lang['licenseok']             = '참고: 이 문서를 편집하면 내용은 다음 라이선스에 따라 배포하는 데 동의합니다:';
 $lang['searchmedia']           = '파일 이름 검색:';
 $lang['searchmedia_in']        = '%s에서 검색';
-$lang['txt_upload']            = '올릴 파일 선택';
-$lang['txt_filename']          = '올릴 파일 이름 (선택 사항)';
+$lang['txt_upload']            = '올릴 파일 선택:';
+$lang['txt_filename']          = '올릴 파일 이름 (선택 사항):';
 $lang['txt_overwrt']           = '기존 파일에 덮어쓰기';
 $lang['maxuploadsize']         = '최대 올리기 용량. 파일당 %s입니다.';
-$lang['lockedby']              = '현재 잠겨진 사용자';
-$lang['lockexpire']            = '잠금 해제 시간';
+$lang['lockedby']              = '현재 잠겨진 사용자:';
+$lang['lockexpire']            = '잠금 해제 시간:';
 $lang['js']['willexpire']      = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리 보기를 눌러 잠금 시간을 다시 설정하세요.';
 $lang['js']['notsavedyet']     = '저장하지 않은 바뀜이 사라집니다.';
 $lang['js']['searchmedia']     = '파일 검색';
-$lang['js']['keepopen']        = '선택할 때 창을 열어 놓기';
+$lang['js']['keepopen']        = '선택할 때 열어 놓은 창을 유지하기';
 $lang['js']['hidedetails']     = '자세한 정보 숨기기';
 $lang['js']['mediatitle']      = '링크 설정';
-$lang['js']['mediadisplay']    = '링크 형태';
+$lang['js']['mediadisplay']    = '링크 유형';
 $lang['js']['mediaalign']      = '배치';
 $lang['js']['mediasize']       = '그림 크기';
 $lang['js']['mediatarget']     = '링크 목표';
@@ -171,7 +174,7 @@ $lang['mediaview']             = '원본 파일 보기';
 $lang['mediaroot']             = '루트';
 $lang['mediaupload']           = '파일을 현재 이름공간으로 올립니다. 하위 이름공간으로 만들려면 선택한 파일 이름 앞에 쌍점(:)으로 구분되는 이름을 붙이면 됩니다. 파일을 드래그 앤 드롭해 선택할 수 있습니다.';
 $lang['mediaextchange']        = '파일 확장자가 .%s에서 .%s(으)로 바뀌었습니다!';
-$lang['reference']             = '참고';
+$lang['reference']             = '다음을 참조';
 $lang['ref_inuse']             = '다음 문서에서 아직 사용 중이므로 파일을 삭제할 수 없습니다:';
 $lang['ref_hidden']            = '문서의 일부 참고는 읽을 수 있는 권한이 없습니다';
 $lang['hits']                  = '조회 수';
@@ -185,13 +188,18 @@ $lang['difflink']              = '차이 보기로 링크';
 $lang['diff_type']             = '차이 보기:';
 $lang['diff_inline']           = '직렬 방식';
 $lang['diff_side']             = '다중 창 방식';
+$lang['diffprevrev']           = '이전 판';
+$lang['diffnextrev']           = '다음 판';
+$lang['difflastrev']           = '마지막 판';
+$lang['diffbothprevrev']       = '양쪽 이전 판';
+$lang['diffbothnextrev']       = '양쪽 다음 판';
 $lang['line']                  = '줄';
-$lang['breadcrumb']            = '추적';
-$lang['youarehere']            = '현재 위치';
-$lang['lastmod']               = '마지막으로 수정됨';
+$lang['breadcrumb']            = '추적:';
+$lang['youarehere']            = '현재 위치:';
+$lang['lastmod']               = '마지막으로 수정됨:';
 $lang['by']                    = '저자';
 $lang['deleted']               = '제거됨';
-$lang['created']               = '새로 만듦';
+$lang['created']               = '만듦';
 $lang['restored']              = '이전 판으로 되돌림 (%s)';
 $lang['external_edit']         = '바깥 편집';
 $lang['summary']               = '편집 요약';
@@ -232,7 +240,7 @@ $lang['qb_extlink']            = '바깥 링크';
 $lang['qb_hr']                 = '가로줄';
 $lang['qb_ol']                 = '순서 있는 목록';
 $lang['qb_ul']                 = '순서 없는 목록';
-$lang['qb_media']              = '그림과 기타 파일 추가 (새 창에서 열림)';
+$lang['qb_media']              = '그림과 다른 파일 추가 (새 창에서 열림)';
 $lang['qb_sig']                = '서명 넣기';
 $lang['qb_smileys']            = '이모티콘';
 $lang['qb_chars']              = '특수 문자';
@@ -241,20 +249,18 @@ $lang['admin_register']        = '새 사용자 추가';
 $lang['metaedit']              = '메타데이터 편집';
 $lang['metasaveerr']           = '메타데이터 쓰기 실패';
 $lang['metasaveok']            = '메타데이터 저장됨';
-$lang['img_backto']            = '뒤로';
-$lang['img_title']             = '제목';
-$lang['img_caption']           = '설명';
-$lang['img_date']              = '날짜';
-$lang['img_fname']             = '파일 이름';
-$lang['img_fsize']             = '크기';
-$lang['img_artist']            = '촬영자';
-$lang['img_copyr']             = '저작권';
-$lang['img_format']            = '포맷';
-$lang['img_camera']            = '카메라';
-$lang['img_keywords']          = '키워드';
-$lang['img_width']             = '너비';
-$lang['img_height']            = '높이';
-$lang['img_manager']           = '미디어 관리자에서 보기';
+$lang['img_title']             = '제목:';
+$lang['img_caption']           = '설명:';
+$lang['img_date']              = '날짜:';
+$lang['img_fname']             = '파일 이름:';
+$lang['img_fsize']             = '크기:';
+$lang['img_artist']            = '촬영자:';
+$lang['img_copyr']             = '저작권:';
+$lang['img_format']            = '포맷:';
+$lang['img_camera']            = '카메라:';
+$lang['img_keywords']          = '키워드:';
+$lang['img_width']             = '너비:';
+$lang['img_height']            = '높이:';
 $lang['subscr_subscribe_success'] = '%s 사용자가 %s 구독 목록에 추가했습니다';
 $lang['subscr_subscribe_error'] = '%s 사용자가 %s 구독 목록에 추가하는데 실패했습니다';
 $lang['subscr_subscribe_noaddress'] = '로그인으로 연결된 주소가 없기 때문에 구독 목록에 추가할 수 없습니다';
@@ -283,6 +289,7 @@ $lang['i_modified']            = '보안 상의 이유로 이 스크립트는 �
 다운로드한 압축 패키지를 다시 설치하거나 <a href="http://dokuwiki.org/ko:install">도쿠위키 설치 과정</a>을 참고해서 설치하세요.';
 $lang['i_funcna']              = '<code>%s</code> PHP 함수를 사용할 수 없습니다. 호스트 제공자가 어떤 이유에서인지 막아 놓았을지 모릅니다.';
 $lang['i_phpver']              = 'PHP <code>%s</code> 버전은 필요한 <code>%s</code> 버전보다 오래되었습니다. PHP를 업그레이드할 필요가 있습니다.';
+$lang['i_mbfuncoverload']      = '도쿠위키를 실행하려면 mbstring.func_overload를 php.ini에서 비활성화해야 합니다.';
 $lang['i_permfail']            = '<code>%s</code>는 도쿠위키가 쓰기 가능 권한이 없습니다. 먼저 이 디렉터리에 쓰기 권한이 설정되어야 합니다!';
 $lang['i_confexists']          = '<code>%s</code>(은)는 이미 존재합니다';
 $lang['i_writeerr']            = '<code>%s</code>(을)를 만들 수 없습니다. 먼저 디렉터리/파일 권한을 확인하고 파일을 수동으로 만드세요.';
@@ -302,7 +309,7 @@ $lang['i_pop_field']           = '도쿠위키 경험을 개선하는 데 도움
 $lang['i_pop_label']           = '한 달에 한 번씩, 도쿠위키 개발자에게 익명의 사용 데이터를 보냅니다';
 $lang['recent_global']         = '현재 <b>%s</b> 이름공간을 구독 중입니다. <a href="%s">전체 위키의 최근 바뀜도 볼 수</a> 있습니다.';
 $lang['years']                 = '%d년 전';
-$lang['months']                = '%d달 전';
+$lang['months']                = '%d개월 전';
 $lang['weeks']                 = '%d주 전';
 $lang['days']                  = '%d일 전';
 $lang['hours']                 = '%d시간 전';
diff --git a/inc/lang/ko/searchpage.txt b/inc/lang/ko/searchpage.txt
index 2313f0bb0..53faa04c6 100644
--- a/inc/lang/ko/searchpage.txt
+++ b/inc/lang/ko/searchpage.txt
@@ -1,5 +1,5 @@
 ====== 검색 ======
 
-아래에서 검색 결과를 찾을 수 있습니다. 만약 원하는 문서를 찾지 못했다면, "문서 만들기"나 "문서 편집"을 사용해 검색어와 같은 이름의 문서를 만들거나 편집할 수 있습니다.
+아래에서 검색 결과를 찾을 수 있습니다. 만약 원하는 문서를 찾지 못했다면, ''문서 만들기''나 ''문서 편집''을 사용해 검색어와 같은 이름의 문서를 만들거나 편집할 수 있습니다.
 
 ===== 결과 =====
\ No newline at end of file
diff --git a/inc/lang/ko/subscr_digest.txt b/inc/lang/ko/subscr_digest.txt
index 0f03e51a3..d1f2d4b99 100644
--- a/inc/lang/ko/subscr_digest.txt
+++ b/inc/lang/ko/subscr_digest.txt
@@ -11,7 +11,7 @@
 새 판: @NEWPAGE@
 
 
-문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
+문서 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
 @SUBSCRIBE@ 문서를 방문해 문서나 이름공간의 구독을 취소하세요.
 
 -- 
diff --git a/inc/lang/ko/updateprofile.txt b/inc/lang/ko/updateprofile.txt
index 80545e9bf..055272e9d 100644
--- a/inc/lang/ko/updateprofile.txt
+++ b/inc/lang/ko/updateprofile.txt
@@ -1,3 +1,3 @@
-====== 개인 정보 바꾸기 ======
+====== 계정 프로필 바꾸기 ======
 
 바꾸고 싶은 항목을 입력하세요. 사용자 이름은 바꿀 수 없습니다.
\ No newline at end of file
diff --git a/inc/lang/ku/denied.txt b/inc/lang/ku/denied.txt
index 3ac72820c..34cb8456a 100644
--- a/inc/lang/ku/denied.txt
+++ b/inc/lang/ku/denied.txt
@@ -1,4 +1,4 @@
 ====== Permission Denied ======
 
-Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
+Sorry, you don't have enough rights to continue.
 
diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php
index b6287806d..b1b733ec9 100644
--- a/inc/lang/ku/lang.php
+++ b/inc/lang/ku/lang.php
@@ -35,7 +35,7 @@ $lang['btn_backtomedia'] = 'Back to Mediafile Selection';
 $lang['btn_subscribe']   = 'Subscribe Changes';
 $lang['btn_register'] = 'Register';
 
-$lang['loggedinas'] = 'Logged in as';
+$lang['loggedinas'] = 'Logged in as:';
 $lang['user']       = 'Username';
 $lang['pass']       = 'Password';
 $lang['passchk']    = 'once again';
@@ -89,8 +89,8 @@ $lang['current']    = 'current';
 $lang['yours']      = 'Your Version';
 $lang['diff']       = 'show differences to current version';
 $lang['line']       = 'Rêz';
-$lang['breadcrumb'] = 'Şop';
-$lang['lastmod']    = 'Guherandina dawî';
+$lang['breadcrumb'] = 'Şop:';
+$lang['lastmod']    = 'Guherandina dawî:';
 $lang['by']         = 'by';
 $lang['deleted']    = 'hat jê birin';
 $lang['created']    = 'hat afirandin';
@@ -127,16 +127,16 @@ $lang['admin_register']= 'Add new user...';
 $lang['metaedit']    = 'Edit Metadata';
 $lang['metasaveerr'] = 'Writing metadata failed';
 $lang['metasaveok']  = 'Metadata saved';
-$lang['img_backto']  = 'Back to';
-$lang['img_title']   = 'Title';
-$lang['img_caption'] = 'Caption';
-$lang['img_date']    = 'Date';
-$lang['img_fname']   = 'Filename';
-$lang['img_fsize']   = 'Size';
-$lang['img_artist']  = 'Photographer';
-$lang['img_copyr']   = 'Copyright';
-$lang['img_format']  = 'Format';
-$lang['img_camera']  = 'Camera';
-$lang['img_keywords']= 'Keywords';
+$lang['btn_img_backto']  = 'Back to %s';
+$lang['img_title']   = 'Title:';
+$lang['img_caption'] = 'Caption:';
+$lang['img_date']    = 'Date:';
+$lang['img_fname']   = 'Filename:';
+$lang['img_fsize']   = 'Size:';
+$lang['img_artist']  = 'Photographer:';
+$lang['img_copyr']   = 'Copyright:';
+$lang['img_format']  = 'Format:';
+$lang['img_camera']  = 'Camera:';
+$lang['img_keywords']= 'Keywords:';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/la/denied.txt b/inc/lang/la/denied.txt
index fdb62f53e..1cdaf05c9 100644
--- a/inc/lang/la/denied.txt
+++ b/inc/lang/la/denied.txt
@@ -1,3 +1,4 @@
 ====== Ad hanc paginam accedere non potes ======
 
-Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas
\ No newline at end of file
+Ad hanc paginam accedere non potes: antea in conuentum ineas.
+
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index c71a71bdd..66cd13967 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -90,8 +90,8 @@ $lang['searchmedia_in']        = 'Quaere "%s":';
 $lang['txt_upload']            = 'Eligere documenta oneranda:';
 $lang['txt_filename']          = 'Onerare (optio):';
 $lang['txt_overwrt']           = 'Documento ueteri imponere:';
-$lang['lockedby']              = 'Nunc hoc intercludit';
-$lang['lockexpire']            = 'Hoc apertum';
+$lang['lockedby']              = 'Nunc hoc intercludit:';
+$lang['lockexpire']            = 'Hoc apertum:';
 $lang['js']['willexpire']            = 'Interclusio paginae recensendae uno minuto finita est.\nUt errores uites, \'praeuisio\' preme ut interclusionem ripristines.';
 $lang['js']['notsavedyet']     = 'Res non seruatae amissurae sunt.';
 $lang['js']['searchmedia']     = 'Quaere inter documenta';
@@ -202,17 +202,17 @@ $lang['admin_register']        = 'Nouom Sodalem creare';
 $lang['metaedit']              = 'Res codicis mutare';
 $lang['metasaveerr']           = 'Res codicis non scribitur.';
 $lang['metasaveok']            = 'Res codicis seruatae.';
-$lang['img_backto']            = 'Redere ad';
-$lang['img_title']             = 'Titulus';
-$lang['img_caption']           = 'Descriptio';
-$lang['img_date']              = 'Dies';
-$lang['img_fname']             = 'Titulus documenti';
-$lang['img_fsize']             = 'Pondus';
-$lang['img_artist']            = 'Imaginum exprimitor\trix';
-$lang['img_copyr']             = 'Iura exemplarium';
-$lang['img_format']            = 'Forma';
-$lang['img_camera']            = 'Cella';
-$lang['img_keywords']          = 'Verba claues';
+$lang['btn_img_backto']            = 'Redere ad %s';
+$lang['img_title']             = 'Titulus:';
+$lang['img_caption']           = 'Descriptio:';
+$lang['img_date']              = 'Dies:';
+$lang['img_fname']             = 'Titulus documenti:';
+$lang['img_fsize']             = 'Pondus:';
+$lang['img_artist']            = 'Imaginum exprimitor\trix:';
+$lang['img_copyr']             = 'Iura exemplarium:';
+$lang['img_format']            = 'Forma:';
+$lang['img_camera']            = 'Cella:';
+$lang['img_keywords']          = 'Verba claues:';
 $lang['subscr_subscribe_success'] = '%s additur indici subscriptionis quod %s';
 $lang['subscr_subscribe_error'] = '%s non additur indici subscriptionis quod %s';
 $lang['subscr_subscribe_noaddress'] = 'Cursus interretialis tuus deest, sic in indice subscriptionis non scribi potes';
diff --git a/inc/lang/lb/denied.txt b/inc/lang/lb/denied.txt
index 487bf2198..1a7fd8f52 100644
--- a/inc/lang/lb/denied.txt
+++ b/inc/lang/lb/denied.txt
@@ -1,3 +1,4 @@
 ======Erlaabnis verweigert======
 
-Et deet mer leed, du hues net genuch Rechter fir weiderzefueren. Hues de vläicht vergiess dech anzeloggen?
+Et deet mer leed, du hues net genuch Rechter fir weiderzefueren.
+
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index 55113745a..a1b6ccf84 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -41,7 +41,7 @@ $lang['btn_draft']             = 'Entworf änneren';
 $lang['btn_recover']           = 'Entworf zeréckhuelen';
 $lang['btn_draftdel']          = 'Entworf läschen';
 $lang['btn_register']          = 'Registréieren';
-$lang['loggedinas']            = 'Ageloggt als';
+$lang['loggedinas']            = 'Ageloggt als:';
 $lang['user']                  = 'Benotzernumm';
 $lang['pass']                  = 'Passwuert';
 $lang['newpass']               = 'Nei Passwuert';
@@ -77,11 +77,11 @@ $lang['resendpwdconfirm']      = 'De Konfirmatiounslink gouf iwwer Email gesché
 $lang['resendpwdsuccess']      = 'Däi nei Passwuert gouf iwwer Email geschéckt.';
 $lang['license']               = 'Wann näischt anescht do steet, ass den Inhalt vun dësem Wiki ënner folgender Lizenz:';
 $lang['licenseok']             = 'Pass op: Wanns de dës Säit änners, bass de dermat averstan dass den Inhalt ënner folgender Lizenz lizenzéiert gëtt:';
-$lang['txt_upload']            = 'Wiel eng Datei fir eropzelueden';
-$lang['txt_filename']          = 'Eroplueden als (optional)';
+$lang['txt_upload']            = 'Wiel eng Datei fir eropzelueden:';
+$lang['txt_filename']          = 'Eroplueden als (optional):';
 $lang['txt_overwrt']           = 'Bestehend Datei iwwerschreiwen';
-$lang['lockedby']              = 'Am Moment gespaart vun';
-$lang['lockexpire']            = 'D\'Spär leeft of ëm';
+$lang['lockedby']              = 'Am Moment gespaart vun:';
+$lang['lockexpire']            = 'D\'Spär leeft of ëm:';
 $lang['js']['willexpire']            = 'Deng Spär fir d\'Säit ze änneren leeft an enger Minutt of.\nFir Konflikter ze verhënneren, dréck op Kucken ouni ofzespäicheren.';
 $lang['js']['notsavedyet']     = 'Net gespäicher Ännerunge gi verluer.\nWierklech weiderfueren?';
 $lang['rssfailed']             = 'Et ass e Feeler virkomm beim erofluede vun dësem Feed: ';
@@ -118,9 +118,9 @@ $lang['yours']                 = 'Deng Versioun';
 $lang['diff']                  = 'Weis d\'Ënnerscheeder zuer aktueller Versioun';
 $lang['diff2']                 = 'Weis d\'Ënnerscheeder zwescht den ausgewielte Versiounen';
 $lang['line']                  = 'Linn';
-$lang['breadcrumb']            = 'Spuer';
-$lang['youarehere']            = 'Du bass hei';
-$lang['lastmod']               = 'Fir d\'lescht g\'ännert';
+$lang['breadcrumb']            = 'Spuer:';
+$lang['youarehere']            = 'Du bass hei:';
+$lang['lastmod']               = 'Fir d\'lescht g\'ännert:';
 $lang['by']                    = 'vun';
 $lang['deleted']               = 'geläscht';
 $lang['created']               = 'erstallt';
@@ -162,17 +162,17 @@ $lang['admin_register']        = 'Neie Benotzer bäisetzen';
 $lang['metaedit']              = 'Metadaten änneren';
 $lang['metasaveerr']           = 'Feeler beim Schreiwe vun de Metadaten';
 $lang['metasaveok']            = 'Metadate gespäichert';
-$lang['img_backto']            = 'Zeréck op';
-$lang['img_title']             = 'Titel';
-$lang['img_caption']           = 'Beschreiwung';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Dateinumm';
-$lang['img_fsize']             = 'Gréisst';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Schlësselwieder';
+$lang['btn_img_backto']            = 'Zeréck op %s';
+$lang['img_title']             = 'Titel:';
+$lang['img_caption']           = 'Beschreiwung:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Dateinumm:';
+$lang['img_fsize']             = 'Gréisst:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Schlësselwieder:';
 $lang['authtempfail']          = 'D\'Benotzerautentifikatioun ass de Moment net verfügbar. Wann dës Situatioun unhält, dann informéier w.e.g. de Wiki Admin.';
 $lang['i_chooselang']          = 'Wiel deng Sprooch';
 $lang['i_installer']           = 'DokuWiki Installer';
diff --git a/inc/lang/lt/denied.txt b/inc/lang/lt/denied.txt
index c25fb5f0c..9a8544694 100644
--- a/inc/lang/lt/denied.txt
+++ b/inc/lang/lt/denied.txt
@@ -1,4 +1,4 @@
 ====== Priėjimas uždraustas ======
 
-Jūs neturite reikiamų teisių, kad galėtumėte tęsti. Turbūt pamiršote prisijungti :-).
+Jūs neturite reikiamų teisių, kad galėtumėte tęsti.
 
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index c38ea8838..d6552d68c 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -46,7 +46,7 @@ $lang['btn_draft']             = 'Redaguoti juodraštį';
 $lang['btn_recover']           = 'Atkurti juodraštį';
 $lang['btn_draftdel']          = 'Šalinti juodraštį';
 $lang['btn_register']          = 'Registruotis';
-$lang['loggedinas']            = 'Prisijungęs kaip';
+$lang['loggedinas']            = 'Prisijungęs kaip:';
 $lang['user']                  = 'Vartotojo vardas';
 $lang['pass']                  = 'Slaptažodis';
 $lang['newpass']               = 'Naujas slaptažodis';
@@ -82,11 +82,11 @@ $lang['resendpwdconfirm']      = 'Patvirtinimo nuoroda išsiųsta el. paštu.';
 $lang['resendpwdsuccess']      = 'Jūsų naujas slaptažodis buvo išsiųstas el. paštu.';
 $lang['license']               = 'Jei nenurodyta kitaip, šio wiki turinys ginamas tokia licencija:';
 $lang['licenseok']             = 'Pastaba: Redaguodami šį puslapį jūs sutinkate jog jūsų turinys atitinka licencijavima pagal šią licenciją';
-$lang['txt_upload']            = 'Išsirinkite atsiunčiamą bylą';
-$lang['txt_filename']          = 'Įveskite wikivardą (nebūtina)';
+$lang['txt_upload']            = 'Išsirinkite atsiunčiamą bylą:';
+$lang['txt_filename']          = 'Įveskite wikivardą (nebūtina):';
 $lang['txt_overwrt']           = 'Perrašyti egzistuojančią bylą';
-$lang['lockedby']              = 'Užrakintas vartotojo';
-$lang['lockexpire']            = 'Užraktas bus nuimtas';
+$lang['lockedby']              = 'Užrakintas vartotojo:';
+$lang['lockexpire']            = 'Užraktas bus nuimtas:';
 $lang['js']['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
 $lang['js']['notsavedyet']     = 'Pakeitimai nebus išsaugoti.\nTikrai tęsti?';
 $lang['rssfailed']             = 'Siunčiant šį feed\'ą įvyko klaida: ';
@@ -125,9 +125,9 @@ $lang['yours']                 = 'Jūsų versija';
 $lang['diff']                  = 'rodyti skirtumus tarp šios ir esamos versijos';
 $lang['diff2']                 = 'Parodyti skirtumus tarp pasirinktų versijų';
 $lang['line']                  = 'Linija';
-$lang['breadcrumb']            = 'Kelias';
-$lang['youarehere']            = 'Jūs esate čia';
-$lang['lastmod']               = 'Keista';
+$lang['breadcrumb']            = 'Kelias:';
+$lang['youarehere']            = 'Jūs esate čia:';
+$lang['lastmod']               = 'Keista:';
 $lang['by']                    = 'vartotojo';
 $lang['deleted']               = 'ištrintas';
 $lang['created']               = 'sukurtas';
@@ -163,17 +163,17 @@ $lang['admin_register']        = 'Sukurti naują vartotoją';
 $lang['metaedit']              = 'Redaguoti metaduomenis';
 $lang['metasaveerr']           = 'Nepavyko išsaugoti metaduomenų';
 $lang['metasaveok']            = 'Metaduomenys išsaugoti';
-$lang['img_backto']            = 'Atgal į';
-$lang['img_title']             = 'Pavadinimas';
-$lang['img_caption']           = 'Antraštė';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Bylos pavadinimas';
-$lang['img_fsize']             = 'Dydis';
-$lang['img_artist']            = 'Fotografas';
-$lang['img_copyr']             = 'Autorinės teisės';
-$lang['img_format']            = 'Formatas';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Raktiniai žodžiai';
+$lang['btn_img_backto']            = 'Atgal į %s';
+$lang['img_title']             = 'Pavadinimas:';
+$lang['img_caption']           = 'Antraštė:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Bylos pavadinimas:';
+$lang['img_fsize']             = 'Dydis:';
+$lang['img_artist']            = 'Fotografas:';
+$lang['img_copyr']             = 'Autorinės teisės:';
+$lang['img_format']            = 'Formatas:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Raktiniai žodžiai:';
 $lang['authtempfail']          = 'Vartotojo tapatumo nustatymas laikinai nepasiekiamas. Jei ši situacija kartojasi, tai praneškite savo administratoriui.';
 $lang['i_chooselang']          = 'Pasirinkite kalbą';
 $lang['i_installer']           = 'DokuWiki Instaliatorius';
diff --git a/inc/lang/lv/denied.txt b/inc/lang/lv/denied.txt
index c7df462c8..6733fb2e9 100644
--- a/inc/lang/lv/denied.txt
+++ b/inc/lang/lv/denied.txt
@@ -1,6 +1,4 @@
 ====== Piekļuve aizliegta ======
 
-Atvaino, tev nav tiesību turpināt. Varbūt aizmirsi ielogoties?
-
-
+Atvaino, tev nav tiesību turpināt.
 
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index 898125d60..15994afe6 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * latvian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Aivars Miška <allefm@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
@@ -47,7 +47,10 @@ $lang['btn_revert']            = 'Atjaunot';
 $lang['btn_register']          = 'Reģistrēties';
 $lang['btn_apply']             = 'Labi';
 $lang['btn_media']             = 'Mēdiju pārvaldnieks';
-$lang['loggedinas']            = 'Pieteicies kā';
+$lang['btn_deleteuser']        = 'Dzēst manu kontu';
+$lang['btn_img_backto']        = 'Atpakaļ uz %s';
+$lang['btn_mediaManager']      = 'Skatīt mēdiju pārvaldniekā';
+$lang['loggedinas']            = 'Pieteicies kā:';
 $lang['user']                  = 'Lietotājvārds';
 $lang['pass']                  = 'Parole';
 $lang['newpass']               = 'Jaunā parole';
@@ -58,6 +61,7 @@ $lang['fullname']              = 'Pilns vārds';
 $lang['email']                 = 'E-pasts';
 $lang['profile']               = 'Lietotāja vārds';
 $lang['badlogin']              = 'Atvaino, lietotājvārds vai parole aplama.';
+$lang['badpassconfirm']        = 'Atvaino, aplama parole';
 $lang['minoredit']             = 'Sīki labojumi';
 $lang['draftdate']             = 'Melnraksts automātiski saglabāts';
 $lang['nosecedit']             = 'Lapa pa šo laiku ir mainījusies, sekcijas informācija novecojusi. Ielādēta lapas  pilnās versija.';
@@ -74,6 +78,11 @@ $lang['profna']                = 'Labot profilu nav iespējams';
 $lang['profnochange']          = 'Izmaiņu nav. Nav, ko darīt.';
 $lang['profnoempty']           = 'Bez vārda vai e-pasta adreses nevar.';
 $lang['profchanged']           = 'Profils veiksmīgi izlabots.';
+$lang['profnodelete']          = 'Šajā viki lietotājus izdzēst nevar';
+$lang['profdeleteuser']        = 'Dzēst kontu';
+$lang['profdeleted']           = 'Jūsu lietotāja konts ir izdzēsts';
+$lang['profconfdelete']        = 'Es vēlos dzēst savu kontu no viki. <br/> Šo darbību vairs nevarēs atsaukt.';
+$lang['profconfdeletemissing'] = 'Nav atzīmēta apstiprinājuma rūtiņa.';
 $lang['pwdforget']             = 'Aizmirsi paroli? Saņem jaunu';
 $lang['resendna']              = 'Paroļu izsūtīšanu nepiedāvāju.';
 $lang['resendpwd']             = 'Uzstādīt jaunu paroli lietotājam';
@@ -86,12 +95,12 @@ $lang['license']               = 'Ja nav norādīts citādi, viki saturs pieejam
 $lang['licenseok']             = 'Ievēro: Labojot lapu, tu piekrīti šādiem licenzes noteikumiem.';
 $lang['searchmedia']           = 'Meklētais faila vārds: ';
 $lang['searchmedia_in']        = 'Meklēt iekš %s';
-$lang['txt_upload']            = 'Norādi augšupielādējamo failu';
-$lang['txt_filename']          = 'Ievadi vikivārdu (nav obligāts)';
+$lang['txt_upload']            = 'Norādi augšupielādējamo failu:';
+$lang['txt_filename']          = 'Ievadi vikivārdu (nav obligāts):';
 $lang['txt_overwrt']           = 'Aizstāt esošo failu';
 $lang['maxuploadsize']         = 'Augšuplādējamā faila ierobežojums: %s.';
-$lang['lockedby']              = 'Patlaban bloķējis ';
-$lang['lockexpire']            = 'Bloķējums beigsies ';
+$lang['lockedby']              = 'Patlaban bloķējis :';
+$lang['lockexpire']            = 'Bloķējums beigsies :';
 $lang['js']['willexpire']      = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
 $lang['js']['notsavedyet']     = 'Veiktas bet nav saglabātas izmaiņas.
 Vai tiešām tās nevajag?';
@@ -172,10 +181,15 @@ $lang['difflink']              = 'Saite uz salīdzināšanas skatu.';
 $lang['diff_type']             = 'Skatīt atšķirības:';
 $lang['diff_inline']           = 'Iekļauti';
 $lang['diff_side']             = 'Blakus';
+$lang['diffprevrev']           = 'Iepriekšējā versija';
+$lang['diffnextrev']           = 'Nākamā versija';
+$lang['difflastrev']           = 'Jaunākā versija';
+$lang['diffbothprevrev']       = 'Abās pusēs iepriekšējo versiju';
+$lang['diffbothnextrev']       = 'Abās pusēs nākamo versiju';
 $lang['line']                  = 'Rinda';
-$lang['breadcrumb']            = 'Apmeklēts';
-$lang['youarehere']            = 'Tu atrodies šeit';
-$lang['lastmod']               = 'Labota';
+$lang['breadcrumb']            = 'Apmeklēts:';
+$lang['youarehere']            = 'Tu atrodies šeit:';
+$lang['lastmod']               = 'Labota:';
 $lang['by']                    = ', labojis';
 $lang['deleted']               = 'dzēsts';
 $lang['created']               = 'izveidots';
@@ -228,20 +242,18 @@ $lang['admin_register']        = 'Pievienot jaunu lietotāju';
 $lang['metaedit']              = 'Labot metadatus';
 $lang['metasaveerr']           = 'Metadati nav saglabāti';
 $lang['metasaveok']            = 'Metadati saglabāti';
-$lang['img_backto']            = 'Atpakaļ uz';
-$lang['img_title']             = 'Virsraksts';
-$lang['img_caption']           = 'Apraksts';
-$lang['img_date']              = 'Datums';
-$lang['img_fname']             = 'Faila vārds';
-$lang['img_fsize']             = 'Izmērs';
-$lang['img_artist']            = 'Fotogrāfs';
-$lang['img_copyr']             = 'Autortiesības';
-$lang['img_format']            = 'Formāts';
-$lang['img_camera']            = 'Fotoaparāts';
-$lang['img_keywords']          = 'Atslēgvārdi';
-$lang['img_width']             = 'Platums';
-$lang['img_height']            = 'Augstums';
-$lang['img_manager']           = 'Skatīt mēdiju pārvaldniekā';
+$lang['img_title']             = 'Virsraksts:';
+$lang['img_caption']           = 'Apraksts:';
+$lang['img_date']              = 'Datums:';
+$lang['img_fname']             = 'Faila vārds:';
+$lang['img_fsize']             = 'Izmērs:';
+$lang['img_artist']            = 'Fotogrāfs:';
+$lang['img_copyr']             = 'Autortiesības:';
+$lang['img_format']            = 'Formāts:';
+$lang['img_camera']            = 'Fotoaparāts:';
+$lang['img_keywords']          = 'Atslēgvārdi:';
+$lang['img_width']             = 'Platums:';
+$lang['img_height']            = 'Augstums:';
 $lang['subscr_subscribe_success'] = '%s pievienots %s abonēšanas sarakstam';
 $lang['subscr_subscribe_error'] = 'Kļūme pievienojot %s %s abonēšanas sarakstam.';
 $lang['subscr_subscribe_noaddress'] = 'Nav zināma jūsu e-pasta adrese, tāpēc nevarat abonēt.';
@@ -270,6 +282,7 @@ $lang['i_modified']            = 'Drošības nolūkos šis skripts darbosies tik
 Vai nu no jauna jāatarhivē faili no lejupielādētās pakas vai jāraugās pēc padoma pilnā Dokuwiki instalācijas instrukcijā <a href="http://dokuwiki.org/install"></a>';
 $lang['i_funcna']              = 'PHP funkcija <code>%s</code> nav pieejama. Varbūt jūsu servera īpašnieks to kāda iemesla dēļ atslēdzis?';
 $lang['i_phpver']              = 'Jūsu PHP versija <code>%s</code> ir par vecu. Vajag versiju <code>%s</code>. Atjaunojiet savu PHP instalāciju.';
+$lang['i_mbfuncoverload']      = 'Lai darbinātu  DokuWiki,  php.ini failā ir jāatspējo mbstring.func_overload.';
 $lang['i_permfail']            = 'Dokuwiki nevar ierakstīt <code>%s</code>. Jālabo direktorijas tiesības!';
 $lang['i_confexists']          = '<code>%s</code> jau ir';
 $lang['i_writeerr']            = 'Nevar izveidot <code>%s</code>. Jāpārbauda direktorijas/faila tiesības un fails jāizveido pašam.';
@@ -281,6 +294,7 @@ $lang['i_policy']              = 'Sākotnējā ACL politika';
 $lang['i_pol0']                = 'Atvērts Wiki (raksta, lasa un augšupielādē ikviens)';
 $lang['i_pol1']                = 'Publisks Wiki (lasa ikviens, raksta un augšupielādē reģistrēti lietotāji)';
 $lang['i_pol2']                = 'Slēgts Wiki (raksta, lasa un augšupielādē tikai reģistrēti lietotāji)';
+$lang['i_allowreg']            = 'Atļaut lietotājiem reģistrēties.';
 $lang['i_retry']               = 'Atkārtot';
 $lang['i_license']             = 'Ar kādu licenci saturs tiks publicēts:';
 $lang['i_license_none']        = 'Nerādīt nekādu licences informāciju';
@@ -318,3 +332,7 @@ $lang['media_perm_read']       = 'Atvainojiet, jums nav tiesību skatīt failus.
 $lang['media_perm_upload']     = 'Atvainojiet, jums nav tiesību augšupielādēt. ';
 $lang['media_update']          = 'Augšupielādēt jaunu versiju';
 $lang['media_restore']         = 'Atjaunot šo versiju';
+$lang['currentns']             = 'Pašreizējā sadaļa';
+$lang['searchresult']          = 'Meklēšanas rezultāti';
+$lang['plainhtml']             = 'Tīrs HTML';
+$lang['wikimarkup']            = 'Viki iezīmēšana valoda';
diff --git a/inc/lang/mg/denied.txt b/inc/lang/mg/denied.txt
index edf20f1a1..d6d2b814e 100644
--- a/inc/lang/mg/denied.txt
+++ b/inc/lang/mg/denied.txt
@@ -1,4 +1,4 @@
 ====== Tsy tafiditra ======
 
-Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra.
+Miala tsiny fa tsy manana alalana hanohizana mankany ianao.
 
diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php
index c5ed669a9..6239c01fe 100644
--- a/inc/lang/mg/lang.php
+++ b/inc/lang/mg/lang.php
@@ -49,11 +49,11 @@ $lang['regbadpass'] = 'Tsy mitovy ny alahidy roa nomenao, avereno indray.';
 $lang['regpwmail']  = 'Ny alahidy Wiki-nao';
 $lang['reghere']    = 'Mbola tsy manana kaonty ianao? Manaova vaovao';
 
-$lang['txt_upload']   = 'Misafidiana rakitra halefa';
-$lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
+$lang['txt_upload']   = 'Misafidiana rakitra halefa:';
+$lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery):';
 $lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
-$lang['lockedby']     = 'Mbola voahidin\'i';
-$lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
+$lang['lockedby']     = 'Mbola voahidin\'i:';
+$lang['lockexpire']   = 'Afaka ny hidy amin\'ny:';
 $lang['js']['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
 
 $lang['js']['notsavedyet'] = 'Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?';
@@ -83,7 +83,7 @@ $lang['current']    = 'current';
 $lang['yours']      = 'Kinova-nao';
 $lang['diff']       = 'Asehoy ny tsy fitoviana amin\'ny kinova amin\'izao';
 $lang['line']       = 'Andalana';
-$lang['breadcrumb'] = 'Taiza ianao';
+$lang['breadcrumb'] = 'Taiza ianao:';
 $lang['lastmod']    = 'Novaina farany:';
 $lang['by']         = '/';
 $lang['deleted']    = 'voafafa';
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
index 2b2c9fb7f..ddfae15c4 100644
--- a/inc/lang/mk/lang.php
+++ b/inc/lang/mk/lang.php
@@ -47,7 +47,7 @@ $lang['btn_recover']           = 'Поврати скица';
 $lang['btn_draftdel']          = 'Избриши скица';
 $lang['btn_revert']            = 'Обнови';
 $lang['btn_register']          = 'Регистрирај се';
-$lang['loggedinas']            = 'Најавен/а како';
+$lang['loggedinas']            = 'Најавен/а како:';
 $lang['user']                  = 'Корисничко име';
 $lang['pass']                  = 'Лозинка';
 $lang['newpass']               = 'Нова лозинка';
@@ -85,11 +85,11 @@ $lang['license']               = 'Освен каде што е наведено
 $lang['licenseok']             = 'Забелешка: со уредување на оваа страница се согласувате да ја лиценцирате вашата содржина под следнава лиценца:';
 $lang['searchmedia']           = 'Барај име на датотека:';
 $lang['searchmedia_in']        = 'Барај во %s';
-$lang['txt_upload']            = 'Избери датотека за качување';
-$lang['txt_filename']          = 'Качи како (неморално)';
+$lang['txt_upload']            = 'Избери датотека за качување:';
+$lang['txt_filename']          = 'Качи како (неморално):';
 $lang['txt_overwrt']           = 'Пребриши ја веќе постоечката датотека';
-$lang['lockedby']              = 'Моментално заклучена од';
-$lang['lockexpire']            = 'Клучот истекува на';
+$lang['lockedby']              = 'Моментално заклучена од:';
+$lang['lockexpire']            = 'Клучот истекува на:';
 $lang['js']['willexpire']            = 'Вашиот клуч за уредување на оваа страница ќе истече за една минута.\nЗа да избегнете конфликти и да го ресетирате бројачот за време, искористете го копчето за преглед.';
 $lang['js']['notsavedyet']     = 'Незачуваните промени ќе бидат изгубени.\nСакате да продолжите?';
 $lang['rssfailed']             = 'Се појави грешка при повлекувањето на овој канал:';
@@ -130,9 +130,9 @@ $lang['yours']                 = 'Вашата верзија';
 $lang['diff']                  = 'Прикажи разлики со сегашната верзија';
 $lang['diff2']                 = 'Прикажи разлики помеѓу избраните ревизии';
 $lang['line']                  = 'Линија';
-$lang['breadcrumb']            = 'Следи';
-$lang['youarehere']            = 'Вие сте тука';
-$lang['lastmod']               = 'Последно изменета';
+$lang['breadcrumb']            = 'Следи:';
+$lang['youarehere']            = 'Вие сте тука:';
+$lang['lastmod']               = 'Последно изменета:';
 $lang['by']                    = 'од';
 $lang['deleted']               = 'отстранета';
 $lang['created']               = 'креирана';
@@ -171,17 +171,17 @@ $lang['admin_register']        = 'Додај нов корисник';
 $lang['metaedit']              = 'Уреди мета-податоци';
 $lang['metasaveerr']           = 'Запишување на мета-податоците не успеа';
 $lang['metasaveok']            = 'Мета-податоците се зачувани';
-$lang['img_backto']            = 'Назад до';
-$lang['img_title']             = 'Насловна линија';
-$lang['img_caption']           = 'Наслов';
-$lang['img_date']              = 'Датум';
-$lang['img_fname']             = 'Име на датотека';
-$lang['img_fsize']             = 'Големина';
-$lang['img_artist']            = 'Фотограф';
-$lang['img_copyr']             = 'Авторско право';
-$lang['img_format']            = 'Формат';
-$lang['img_camera']            = 'Камера';
-$lang['img_keywords']          = 'Клучни зборови';
+$lang['btn_img_backto']            = 'Назад до %s';
+$lang['img_title']             = 'Насловна линија:';
+$lang['img_caption']           = 'Наслов:';
+$lang['img_date']              = 'Датум:';
+$lang['img_fname']             = 'Име на датотека:';
+$lang['img_fsize']             = 'Големина:';
+$lang['img_artist']            = 'Фотограф:';
+$lang['img_copyr']             = 'Авторско право:';
+$lang['img_format']            = 'Формат:';
+$lang['img_camera']            = 'Камера:';
+$lang['img_keywords']          = 'Клучни зборови:';
 $lang['subscr_subscribe_success'] = 'Додаден/а е %s во претплатничката листа за %s';
 $lang['subscr_subscribe_error'] = 'Грешка при додавањето на %s во претплатничката листа за %s';
 $lang['subscr_subscribe_noaddress'] = 'Нема адреса за е-пошта поврзана со Вашата најава, не може да бидете додадени на претплатничката листа';
diff --git a/inc/lang/mr/denied.txt b/inc/lang/mr/denied.txt
index 1b499f51d..5415fde04 100644
--- a/inc/lang/mr/denied.txt
+++ b/inc/lang/mr/denied.txt
@@ -1,3 +1,4 @@
 ====== परवानगी नाकारली ======
 
-क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत. कदाचित तुम्ही लॉगिन करायला विसरला आहात ? 
\ No newline at end of file
+क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत.
+
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index 54b69974d..72779dd10 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -54,7 +54,7 @@ $lang['btn_revert']            = 'पुनर्स्थापन';
 $lang['btn_register']          = 'नोंदणी';
 $lang['btn_apply']             = 'लागू';
 $lang['btn_media']             = 'मिडिया व्यवस्थापक';
-$lang['loggedinas']            = 'लॉगिन नाव';
+$lang['loggedinas']            = 'लॉगिन नाव:';
 $lang['user']                  = 'वापरकर्ता';
 $lang['pass']                  = 'परवलीचा शब्द';
 $lang['newpass']               = 'नवीन परवलीचा शब्द';
@@ -93,8 +93,8 @@ $lang['license']               = 'विशिष्ठ नोंद केल�
 $lang['licenseok']             = 'नोंद : हे पृष्ठ संपादित केल्यास तुम्ही तुमचे योगदान खालील लायसन्स अंतर्गत येइल : ';
 $lang['searchmedia']           = 'फाईल शोधा:';
 $lang['searchmedia_in']        = '%s मधे शोधा';
-$lang['txt_upload']            = 'अपलोड करण्याची फाइल निवडा';
-$lang['txt_filename']          = 'अपलोड उर्फ़ ( वैकल्पिक )';
+$lang['txt_upload']            = 'अपलोड करण्याची फाइल निवडा:';
+$lang['txt_filename']          = 'अपलोड उर्फ़ ( वैकल्पिक ):';
 $lang['txt_overwrt']           = 'अस्तित्वात असलेल्या फाइलवरच सुरक्षित करा.';
 $lang['lockedby']              = 'सध्या लॉक करणारा :';
 $lang['lockexpire']            = 'सध्या लॉक करणारा :';
@@ -174,9 +174,9 @@ $lang['diff_type']             = 'फरक बघू:';
 $lang['diff_inline']           = 'एका ओळीत';
 $lang['diff_side']             = 'बाजूबाजूला';
 $lang['line']                  = 'ओळ';
-$lang['breadcrumb']            = 'मागमूस';
-$lang['youarehere']            = 'तुम्ही इथे आहात';
-$lang['lastmod']               = 'सर्वात शेवटचा बदल';
+$lang['breadcrumb']            = 'मागमूस:';
+$lang['youarehere']            = 'तुम्ही इथे आहात:';
+$lang['lastmod']               = 'सर्वात शेवटचा बदल:';
 $lang['by']                    = 'द्वारा';
 $lang['deleted']               = 'काढून टाकले';
 $lang['created']               = 'निर्माण केले';
@@ -227,20 +227,20 @@ $lang['admin_register']        = 'नवीन सदस्य';
 $lang['metaedit']              = 'मेटाडेटा बदला';
 $lang['metasaveerr']           = 'मेटाडेटा सुरक्षित झाला नाही';
 $lang['metasaveok']            = 'मेटाडेटा सुरक्षित झाला';
-$lang['img_backto']            = 'परत जा';
-$lang['img_title']             = 'नाव';
-$lang['img_caption']           = 'टीप';
-$lang['img_date']              = 'तारीख';
-$lang['img_fname']             = 'फाइल नाव';
-$lang['img_fsize']             = 'साइझ';
-$lang['img_artist']            = 'फोटोग्राफर';
-$lang['img_copyr']             = 'कॉपीराइट';
-$lang['img_format']            = 'प्रकार';
-$lang['img_camera']            = 'कॅमेरा';
-$lang['img_keywords']          = 'मुख्य शब्द';
-$lang['img_width']             = 'रुंदी';
-$lang['img_height']            = 'उंची';
-$lang['img_manager']           = 'मिडिया व्यवस्थापकात बघू';
+$lang['btn_img_backto']            = 'परत जा %s';
+$lang['img_title']             = 'नाव:';
+$lang['img_caption']           = 'टीप:';
+$lang['img_date']              = 'तारीख:';
+$lang['img_fname']             = 'फाइल नाव:';
+$lang['img_fsize']             = 'साइझ:';
+$lang['img_artist']            = 'फोटोग्राफर:';
+$lang['img_copyr']             = 'कॉपीराइट:';
+$lang['img_format']            = 'प्रकार:';
+$lang['img_camera']            = 'कॅमेरा:';
+$lang['img_keywords']          = 'मुख्य शब्द:';
+$lang['img_width']             = 'रुंदी:';
+$lang['img_height']            = 'उंची:';
+$lang['btn_mediaManager']           = 'मिडिया व्यवस्थापकात बघू';
 $lang['authtempfail']          = 'सदस्य अधिकृत करण्याची सुविधा सध्या चालू नाही. सतत हा मजकूर दिसल्यास कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.';
 $lang['i_chooselang']          = 'तुमची भाषा निवडा';
 $lang['i_installer']           = 'डॉक्युविकि इनस्टॉलर';
diff --git a/inc/lang/ms/lang.php b/inc/lang/ms/lang.php
index 02c0e2c91..303116429 100644
--- a/inc/lang/ms/lang.php
+++ b/inc/lang/ms/lang.php
@@ -47,7 +47,7 @@ $lang['btn_revert']            = 'Pulihkan';
 $lang['btn_register']          = 'Daftaran';
 $lang['btn_apply']             = 'Simpan';
 $lang['btn_media']             = 'Manager media';
-$lang['loggedinas']            = 'Log masuk sebagai';
+$lang['loggedinas']            = 'Log masuk sebagai:';
 $lang['user']                  = 'Nama pengguna';
 $lang['pass']                  = 'Kata laluan';
 $lang['newpass']               = 'Kata laluan baru';
@@ -83,10 +83,10 @@ $lang['license']               = 'Selain daripada yang dinyata, isi wiki ini dis
 $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_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['lockedby']              = 'Halaman ini telah di:';
 $lang['fileupload']            = 'Muat naik fail';
 $lang['uploadsucc']            = 'Pemuatan naik berjaya';
 $lang['uploadfail']            = 'Ralat muat naik';
diff --git a/inc/lang/ne/denied.txt b/inc/lang/ne/denied.txt
index ab4bcf290..5c58cde28 100644
--- a/inc/lang/ne/denied.txt
+++ b/inc/lang/ne/denied.txt
@@ -1,3 +1,4 @@
 ====== अनुमति अमान्य ======
 
-माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन। सम्भवत: तपाईले प्रवेश गर्न भुल्नु भयो।
\ No newline at end of file
+माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन।
+
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 7fd14d2c5..ddf031242 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -44,7 +44,7 @@ $lang['btn_draft']             = ' ड्राफ्ट सम्पादन �
 $lang['btn_recover']           = 'पहिलेको ड्राफ्ट हासिल गर्नुहोस ';
 $lang['btn_draftdel']          = ' ड्राफ्ट मेटाउनुहोस् ';
 $lang['btn_register']          = 'दर्ता  गर्नुहोस्';
-$lang['loggedinas']            = 'प्रवेश गर्नुहोस् ';
+$lang['loggedinas']            = 'प्रवेश गर्नुहोस् :';
 $lang['user']                  = 'प्रयोगकर्ता ';
 $lang['pass']                  = 'प्रवेशशव्द';
 $lang['newpass']               = 'नयाँ प्रवेशशव्द';
@@ -80,10 +80,10 @@ $lang['resendpwdconfirm']      = 'तपाईको इमेलमा कन�
 $lang['resendpwdsuccess']      = 'तपाईको प्रवेशशव्द इमेलबाट पठाइएको छ। ';
 $lang['license']               = 'खुलाइएको बाहेक, यस विकिका विषयवस्तुहरु निम्त प्रमाण द्वारा प्रमाणिक गरिएको छ।';
 $lang['licenseok']             = 'नोट: यस पृष्ठ सम्पादन गरी तपाईले आफ्नो विषयवस्तु तलको प्रमाण पत्र अन्तर्गत प्रमाणिक गर्न राजी हुनु हुनेछ ।';
-$lang['txt_upload']            = 'अपलोड गर्नलाई फाइल छा्न्नुहो्स्';
-$lang['txt_filename']          = 'अर्को रुपमा अपलोड गर्नुहोस् (ऐच्छिक)';
+$lang['txt_upload']            = 'अपलोड गर्नलाई फाइल छा्न्नुहो्स्:';
+$lang['txt_filename']          = 'अर्को रुपमा अपलोड गर्नुहोस् (ऐच्छिक):';
 $lang['txt_overwrt']           = 'रहेको उहि नामको फाइललाई मेटाउने';
-$lang['lockedby']              = 'अहिले ताल्चा लगाइएको';
+$lang['lockedby']              = 'अहिले ताल्चा लगाइएको:';
 $lang['lockexpire']            = 'ताल्चा अवधि सकिने :';
 $lang['js']['willexpire']      = 'तपाईलले यो पृष्ठ सम्पादन गर्न लगाउनु भएको ताल्चाको अवधि एक मिनेट भित्र सकिदै छ। \n द्वन्द हुन नदिन  पूर्वरुप वा ताल्चा समय परिवर्तन गर्नुहोस् ।';
 $lang['js']['notsavedyet']     = 'तपाईले वचन गर्नु नभएको परिवर्रन हराउने छ। \n साच्चै जारी गर्नुहुन्छ ।';
@@ -123,9 +123,9 @@ $lang['yours']                 = 'तपाईको संस्करण';
 $lang['diff']                  = 'हालको संस्करण सँगको भिन्नता';
 $lang['diff2']                 = 'रोजिएका संस्करण वीचका भिन्नताहरु ';
 $lang['line']                  = 'हरफ';
-$lang['breadcrumb']            = 'छुट्ट्याउनुहोस् ';
-$lang['youarehere']            = 'तपाई यहा हुनुहुन्छ';
-$lang['lastmod']               = 'अन्तिम पटक सच्याइएको';
+$lang['breadcrumb']            = 'छुट्ट्याउनुहोस् :';
+$lang['youarehere']            = 'तपाई यहा हुनुहुन्छ:';
+$lang['lastmod']               = 'अन्तिम पटक सच्याइएको:';
 $lang['by']                    = 'द्वारा ';
 $lang['deleted']               = 'हटाइएको';
 $lang['created']               = 'निर्माण गरिएको';
@@ -158,17 +158,17 @@ $lang['admin_register']        = 'नयाँ प्रयोगकर्ता
 $lang['metaedit']              = 'मेटाडेटा सम्पादन गर्नुहोस्';
 $lang['metasaveerr']           = 'मेटाडाटा लेखन असफल';
 $lang['metasaveok']            = 'मेटाडाटा वचत भयो ';
-$lang['img_backto']            = 'फिर्ता';
-$lang['img_title']             = 'शिर्षक';
-$lang['img_caption']           = 'निम्न लेख';
-$lang['img_date']              = 'मिति';
-$lang['img_fname']             = 'फाइलनाम';
-$lang['img_fsize']             = 'आकार';
-$lang['img_artist']            = 'चित्रकार';
-$lang['img_copyr']             = 'सर्वाधिकार';
-$lang['img_format']            = 'ढाचा';
-$lang['img_camera']            = 'क्यामेरा';
-$lang['img_keywords']          = 'खोज शब्द';
+$lang['btn_img_backto']            = 'फिर्ता%s';
+$lang['img_title']             = 'शिर्षक:';
+$lang['img_caption']           = 'निम्न लेख:';
+$lang['img_date']              = 'मिति:';
+$lang['img_fname']             = 'फाइलनाम:';
+$lang['img_fsize']             = 'आकार:';
+$lang['img_artist']            = 'चित्रकार:';
+$lang['img_copyr']             = 'सर्वाधिकार:';
+$lang['img_format']            = 'ढाचा:';
+$lang['img_camera']            = 'क्यामेरा:';
+$lang['img_keywords']          = 'खोज शब्द:';
 $lang['authtempfail']          = 'प्रयोगकर्ता प्रामाणिकरण अस्थाइरुपमा अनुपलब्ध छ। यदि यो समस्या रहि रहेमा तपाईको  विकि एड्मिनलाई खवर गर्नुहोला ।';
 $lang['i_chooselang']          = 'भाषा छान्नुहोस् ';
 $lang['i_installer']           = 'DokuWiki  स्थापक';
diff --git a/inc/lang/nl/denied.txt b/inc/lang/nl/denied.txt
index 6a8bf773f..a172ddab6 100644
--- a/inc/lang/nl/denied.txt
+++ b/inc/lang/nl/denied.txt
@@ -1,3 +1,4 @@
 ====== Toegang geweigerd ======
 
-Sorry: je hebt niet voldoende rechten om verder te gaan. Misschien ben je vergeten in te loggen?
+Sorry: je hebt niet voldoende rechten om verder te gaan.
+
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index e5e3e3c76..a9058720c 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -22,14 +22,16 @@
  * @author Klap-in <klapinklapin@gmail.com>
  * @author Remon <no@email.local>
  * @author gicalle <gicalle@hotmail.com>
+ * @author Rene <wllywlnt@yahoo.com>
+ * @author Johan Vervloet <johan.vervloet@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '„';
+$lang['doublequoteopening']    = '“';
 $lang['doublequoteclosing']    = '”';
-$lang['singlequoteopening']    = '‚';
+$lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '\'';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Pagina aanpassen';
 $lang['btn_source']            = 'Toon broncode';
 $lang['btn_show']              = 'Toon pagina';
@@ -66,7 +68,9 @@ $lang['btn_register']          = 'Registreren';
 $lang['btn_apply']             = 'Toepassen';
 $lang['btn_media']             = 'Mediabeheerder';
 $lang['btn_deleteuser']        = 'Verwijder mijn account';
-$lang['loggedinas']            = 'Ingelogd als';
+$lang['btn_img_backto']        = 'Terug naar %s';
+$lang['btn_mediaManager']      = 'In mediabeheerder bekijken';
+$lang['loggedinas']            = 'Ingelogd als:';
 $lang['user']                  = 'Gebruikersnaam';
 $lang['pass']                  = 'Wachtwoord';
 $lang['newpass']               = 'Nieuw wachtwoord';
@@ -111,12 +115,12 @@ $lang['license']               = 'Tenzij anders vermeld valt de inhoud van deze
 $lang['licenseok']             = 'Let op: Door deze pagina aan te passen geef je de inhoud vrij onder de volgende licentie:';
 $lang['searchmedia']           = 'Bestandsnaam zoeken:';
 $lang['searchmedia_in']        = 'Zoek in %s';
-$lang['txt_upload']            = 'Selecteer een bestand om te uploaden';
-$lang['txt_filename']          = 'Vul nieuwe naam in (optioneel)';
+$lang['txt_upload']            = 'Selecteer een bestand om te uploaden:';
+$lang['txt_filename']          = 'Vul nieuwe naam in (optioneel):';
 $lang['txt_overwrt']           = 'Overschrijf bestaand bestand';
 $lang['maxuploadsize']         = 'Max %s per bestand';
-$lang['lockedby']              = 'Momenteel in gebruik door';
-$lang['lockexpire']            = 'Exclusief gebruiksrecht vervalt op';
+$lang['lockedby']              = 'Momenteel in gebruik door:';
+$lang['lockexpire']            = 'Exclusief gebruiksrecht vervalt op:';
 $lang['js']['willexpire']      = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
 $lang['js']['notsavedyet']     = 'Nog niet bewaarde wijzigingen zullen verloren gaan.
 Weet je zeker dat je wilt doorgaan?';
@@ -197,10 +201,15 @@ $lang['difflink']              = 'Link naar deze vergelijking';
 $lang['diff_type']             = 'Bekijk verschillen:';
 $lang['diff_inline']           = 'Inline';
 $lang['diff_side']             = 'Zij aan zij';
+$lang['diffprevrev']           = 'Vorige revisie';
+$lang['diffnextrev']           = 'Volgende revisie';
+$lang['difflastrev']           = 'Laatste revisie';
+$lang['diffbothprevrev']       = 'Beide kanten vorige revisie';
+$lang['diffbothnextrev']       = 'Beide kanten volgende revisie';
 $lang['line']                  = 'Regel';
-$lang['breadcrumb']            = 'Spoor';
-$lang['youarehere']            = 'Je bent hier';
-$lang['lastmod']               = 'Laatst gewijzigd';
+$lang['breadcrumb']            = 'Spoor:';
+$lang['youarehere']            = 'Je bent hier:';
+$lang['lastmod']               = 'Laatst gewijzigd:';
 $lang['by']                    = 'door';
 $lang['deleted']               = 'verwijderd';
 $lang['created']               = 'aangemaakt';
@@ -253,20 +262,18 @@ $lang['admin_register']        = 'Nieuwe gebruiker toevoegen';
 $lang['metaedit']              = 'Metadata wijzigen';
 $lang['metasaveerr']           = 'Schrijven van metadata mislukt';
 $lang['metasaveok']            = 'Metadata bewaard';
-$lang['img_backto']            = 'Terug naar';
-$lang['img_title']             = 'Titel';
-$lang['img_caption']           = 'Bijschrift';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Bestandsnaam';
-$lang['img_fsize']             = 'Grootte';
-$lang['img_artist']            = 'Fotograaf';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formaat';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Trefwoorden';
-$lang['img_width']             = 'Breedte';
-$lang['img_height']            = 'Hoogte';
-$lang['img_manager']           = 'In mediabeheerder bekijken';
+$lang['img_title']             = 'Titel:';
+$lang['img_caption']           = 'Bijschrift:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Bestandsnaam:';
+$lang['img_fsize']             = 'Grootte:';
+$lang['img_artist']            = 'Fotograaf:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formaat:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Trefwoorden:';
+$lang['img_width']             = 'Breedte:';
+$lang['img_height']            = 'Hoogte:';
 $lang['subscr_subscribe_success'] = '%s is ingeschreven voor %s';
 $lang['subscr_subscribe_error'] = 'Fout bij inschrijven van %s voor %s';
 $lang['subscr_subscribe_noaddress'] = 'Er is geen e-mailadres gekoppeld aan uw account, u kunt daardoor niet worden ingeschreven.';
diff --git a/inc/lang/no/denied.txt b/inc/lang/no/denied.txt
index 6e7f1f28b..f60f48f6b 100644
--- a/inc/lang/no/denied.txt
+++ b/inc/lang/no/denied.txt
@@ -1,3 +1,4 @@
 ====== Adgang forbudt ======
 
-Beklager, men du har ikke rettigheter til dette. Kanskje du har glemt å logge inn?
+Beklager, men du har ikke rettigheter til dette.
+
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 3f31f6c73..6156fa34c 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -20,6 +20,7 @@
  * @author Egil Hansen <egil@rosetta.no>
  * @author Thomas Juberg <Thomas.Juberg@Gmail.com>
  * @author Boris <boris@newton-media.no>
+ * @author Christopher Schive <chschive@frisurf.no>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -64,7 +65,9 @@ $lang['btn_register']          = 'Registrer deg';
 $lang['btn_apply']             = 'Bruk';
 $lang['btn_media']             = 'Mediefiler';
 $lang['btn_deleteuser']        = 'Fjern min konto';
-$lang['loggedinas']            = 'Innlogget som';
+$lang['btn_img_backto']        = 'Tilbake til %s';
+$lang['btn_mediaManager']      = 'Vis i mediefilbehandler';
+$lang['loggedinas']            = 'Innlogget som:';
 $lang['user']                  = 'Brukernavn';
 $lang['pass']                  = 'Passord';
 $lang['newpass']               = 'Nytt passord';
@@ -109,12 +112,12 @@ $lang['license']               = 'Der annet ikke er angitt, er innholdet på den
 $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_upload']            = 'Velg fil som skal lastes opp:';
+$lang['txt_filename']          = 'Skriv inn wikinavn (alternativt):';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['maxuploadsize']         = 'Opplast maks % per fil.';
-$lang['lockedby']              = 'Låst av';
-$lang['lockexpire']            = 'Låsingen utløper';
+$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?';
@@ -195,10 +198,15 @@ $lang['difflink']              = 'Lenk til denne sammenligningen';
 $lang['diff_type']             = 'Vis forskjeller:';
 $lang['diff_inline']           = 'I teksten';
 $lang['diff_side']             = 'Side ved side';
+$lang['diffprevrev']           = 'Forrige revisjon';
+$lang['diffnextrev']           = 'Neste revisjon';
+$lang['difflastrev']           = 'Siste revisjon';
+$lang['diffbothprevrev']       = 'Begge sider forrige revisjon';
+$lang['diffbothnextrev']       = 'Begge sider neste revisjon';
 $lang['line']                  = 'Linje';
-$lang['breadcrumb']            = 'Spor';
-$lang['youarehere']            = 'Du er her';
-$lang['lastmod']               = 'Sist endret';
+$lang['breadcrumb']            = 'Spor:';
+$lang['youarehere']            = 'Du er her:';
+$lang['lastmod']               = 'Sist endret:';
 $lang['by']                    = 'av';
 $lang['deleted']               = 'fjernet';
 $lang['created']               = 'opprettet';
@@ -251,20 +259,18 @@ $lang['admin_register']        = 'Legg til ny bruker';
 $lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Skriving av metadata feilet';
 $lang['metasaveok']            = 'Metadata lagret';
-$lang['img_backto']            = 'Tilbake til';
-$lang['img_title']             = 'Tittel';
-$lang['img_caption']           = 'Bildetekst';
-$lang['img_date']              = 'Dato';
-$lang['img_fname']             = 'Filnavn';
-$lang['img_fsize']             = 'Størrelse';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Opphavsrett';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Nøkkelord';
-$lang['img_width']             = 'Bredde';
-$lang['img_height']            = 'Høyde';
-$lang['img_manager']           = 'Vis i mediefilbehandler';
+$lang['img_title']             = 'Tittel:';
+$lang['img_caption']           = 'Bildetekst:';
+$lang['img_date']              = 'Dato:';
+$lang['img_fname']             = 'Filnavn:';
+$lang['img_fsize']             = 'Størrelse:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Opphavsrett:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Nøkkelord:';
+$lang['img_width']             = 'Bredde:';
+$lang['img_height']            = 'Høyde:';
 $lang['subscr_subscribe_success'] = 'La til %s som abonnent på %s';
 $lang['subscr_subscribe_error'] = 'Klarte ikke å legge til %s som abonnent på %s';
 $lang['subscr_subscribe_noaddress'] = 'Brukeren din er ikke registrert med noen adresse. Du kan derfor ikke legges til som abonnent.';
@@ -348,3 +354,4 @@ $lang['media_restore']         = 'Gjenopprett denne versjonen';
 $lang['currentns']             = 'gjeldende navnemellomrom';
 $lang['searchresult']          = 'Søk i resultat';
 $lang['plainhtml']             = 'Enkel HTML';
+$lang['wikimarkup']            = 'wiki-format';
diff --git a/inc/lang/no/resetpwd.txt b/inc/lang/no/resetpwd.txt
new file mode 100644
index 000000000..2da717021
--- /dev/null
+++ b/inc/lang/no/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Sett nytt passord ======
+
+Vennligst skriv inn et nytt passord for din konto i denne wikien. 
\ No newline at end of file
diff --git a/inc/lang/pl/denied.txt b/inc/lang/pl/denied.txt
index d402463ef..2b268b921 100644
--- a/inc/lang/pl/denied.txt
+++ b/inc/lang/pl/denied.txt
@@ -1,4 +1,4 @@
 ====== Brak dostępu ======
 
-Nie masz wystarczających uprawnień. Zaloguj się!
+Nie masz wystarczających uprawnień.
 
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index e5f2d8d40..c6ff4983e 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -16,6 +16,7 @@
  * @author Aoi Karasu <aoikarasu@gmail.com>
  * @author Tomasz Bosak <bosak.tomasz@gmail.com>
  * @author Paweł Jan Czochański <czochanski@gmail.com>
+ * @author Mati <mackosa@wp.pl>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -60,7 +61,9 @@ $lang['btn_register']          = 'Zarejestruj się!';
 $lang['btn_apply']             = 'Zastosuj';
 $lang['btn_media']             = 'Menadżer multimediów';
 $lang['btn_deleteuser']        = 'Usuń moje konto';
-$lang['loggedinas']            = 'Zalogowany jako';
+$lang['btn_img_backto']        = 'Wróć do %s';
+$lang['btn_mediaManager']      = 'Zobacz w menadżerze multimediów';
+$lang['loggedinas']            = 'Zalogowany jako:';
 $lang['user']                  = 'Użytkownik';
 $lang['pass']                  = 'Hasło';
 $lang['newpass']               = 'Nowe hasło';
@@ -105,12 +108,12 @@ $lang['license']               = 'Wszystkie treści w tym wiki, którym nie przy
 $lang['licenseok']             = 'Uwaga: edytując tę stronę zgadzasz się na publikowanie jej treści pod licencją:';
 $lang['searchmedia']           = 'Szukaj pliku o nazwie:';
 $lang['searchmedia_in']        = 'Szukaj w  %s';
-$lang['txt_upload']            = 'Wybierz plik do wysłania';
-$lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
+$lang['txt_upload']            = 'Wybierz plik do wysłania:';
+$lang['txt_filename']          = 'Nazwa pliku (opcjonalnie):';
 $lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
 $lang['maxuploadsize']         = 'Maksymalny rozmiar wysyłanych danych wynosi %s dla jednego pliku.';
-$lang['lockedby']              = 'Aktualnie zablokowane przez';
-$lang['lockexpire']            = 'Blokada wygasa';
+$lang['lockedby']              = 'Aktualnie zablokowane przez:';
+$lang['lockexpire']            = 'Blokada wygasa:';
 $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ć?';
@@ -191,10 +194,13 @@ $lang['difflink']              = 'Odnośnik do tego porównania';
 $lang['diff_type']             = 'Zobacz różnice:';
 $lang['diff_inline']           = 'W linii';
 $lang['diff_side']             = 'Jeden obok drugiego';
+$lang['diffprevrev']           = 'Poprzednia wersja';
+$lang['diffnextrev']           = 'Nowa wersja';
+$lang['difflastrev']           = 'Ostatnia wersja';
 $lang['line']                  = 'Linia';
-$lang['breadcrumb']            = 'Ślad';
-$lang['youarehere']            = 'Jesteś tutaj';
-$lang['lastmod']               = 'ostatnio zmienione';
+$lang['breadcrumb']            = 'Ślad:';
+$lang['youarehere']            = 'Jesteś tutaj:';
+$lang['lastmod']               = 'ostatnio zmienione:';
 $lang['by']                    = 'przez';
 $lang['deleted']               = 'usunięto';
 $lang['created']               = 'utworzono';
@@ -247,20 +253,18 @@ $lang['admin_register']        = 'Dodawanie użytkownika';
 $lang['metaedit']              = 'Edytuj metadane';
 $lang['metasaveerr']           = 'Zapis metadanych nie powiódł się';
 $lang['metasaveok']            = 'Metadane zapisano';
-$lang['img_backto']            = 'Wróć do';
-$lang['img_title']             = 'Tytuł';
-$lang['img_caption']           = 'Nagłówek';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nazwa pliku';
-$lang['img_fsize']             = 'Rozmiar';
-$lang['img_artist']            = 'Fotograf';
-$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['img_title']             = 'Tytuł:';
+$lang['img_caption']           = 'Nagłówek:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nazwa pliku:';
+$lang['img_fsize']             = 'Rozmiar:';
+$lang['img_artist']            = 'Fotograf:';
+$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['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';
diff --git a/inc/lang/pt-br/denied.txt b/inc/lang/pt-br/denied.txt
index d7e423f42..9a71df619 100644
--- a/inc/lang/pt-br/denied.txt
+++ b/inc/lang/pt-br/denied.txt
@@ -1,3 +1,4 @@
 ====== Permissão Negada ======
 
-Desculpe, você não tem permissões suficientes para continuar. Por acaso esqueceu de autenticar-se?
+Desculpe, você não tem permissões suficientes para continuar.
+
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 6845e792d..4f1baf22c 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -23,6 +23,7 @@
  * @author Leone Lisboa Magevski <leone1983@gmail.com>
  * @author Dário Estevão <darioems@gmail.com>
  * @author Juliano Marconi Lanigra <juliano.marconi@gmail.com>
+ * @author Ednei <leuloch@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -67,7 +68,9 @@ $lang['btn_register']          = 'Cadastre-se';
 $lang['btn_apply']             = 'Aplicar';
 $lang['btn_media']             = 'Gerenciador de mídias';
 $lang['btn_deleteuser']        = 'Remover minha conta';
-$lang['loggedinas']            = 'Identificado(a) como';
+$lang['btn_img_backto']        = 'Voltar para %s';
+$lang['btn_mediaManager']      = 'Ver no gerenciador de mídias';
+$lang['loggedinas']            = 'Identificado(a) como:';
 $lang['user']                  = 'Nome de usuário';
 $lang['pass']                  = 'Senha';
 $lang['newpass']               = 'Nova senha';
@@ -112,12 +115,12 @@ $lang['license']               = 'Exceto onde for informado ao contrário, o con
 $lang['licenseok']             = 'Observe: editando esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
 $lang['searchmedia']           = 'Buscar arquivo:';
 $lang['searchmedia_in']        = 'Buscar em %s';
-$lang['txt_upload']            = 'Selecione o arquivo a ser enviado';
-$lang['txt_filename']          = 'Enviar como (opcional)';
+$lang['txt_upload']            = 'Selecione o arquivo a ser enviado:';
+$lang['txt_filename']          = 'Enviar como (opcional):';
 $lang['txt_overwrt']           = 'Substituir o arquivo existente';
 $lang['maxuploadsize']         = 'Tamanho máximo de %s por arquivo.';
-$lang['lockedby']              = 'Atualmente bloqueada por';
-$lang['lockexpire']            = 'O bloqueio expira em';
+$lang['lockedby']              = 'Atualmente bloqueada por:';
+$lang['lockexpire']            = 'O bloqueio expira em:';
 $lang['js']['willexpire']      = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
 $lang['js']['notsavedyet']     = 'As alterações não salvas serão perdidas.
 Deseja realmente continuar?';
@@ -198,10 +201,13 @@ $lang['difflink']              = 'Link para esta página de comparações';
 $lang['diff_type']             = 'Ver as diferenças:';
 $lang['diff_inline']           = 'Mescladas';
 $lang['diff_side']             = 'Lado a lado';
+$lang['diffprevrev']           = 'Revisão anterior';
+$lang['diffnextrev']           = 'Próxima revisão';
+$lang['difflastrev']           = 'Última revisão';
 $lang['line']                  = 'Linha';
-$lang['breadcrumb']            = 'Visitou';
-$lang['youarehere']            = 'Você está aqui';
-$lang['lastmod']               = 'Última modificação';
+$lang['breadcrumb']            = 'Visitou:';
+$lang['youarehere']            = 'Você está aqui:';
+$lang['lastmod']               = 'Última modificação:';
 $lang['by']                    = 'por';
 $lang['deleted']               = 'removida';
 $lang['created']               = 'criada';
@@ -254,20 +260,18 @@ $lang['admin_register']        = 'Adicionar novo usuário';
 $lang['metaedit']              = 'Editar metadados';
 $lang['metasaveerr']           = 'Não foi possível escrever os metadados';
 $lang['metasaveok']            = 'Os metadados foram salvos';
-$lang['img_backto']            = 'Voltar para';
-$lang['img_title']             = 'Título';
-$lang['img_caption']           = 'Descrição';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nome do arquivo';
-$lang['img_fsize']             = 'Tamanho';
-$lang['img_artist']            = 'Fotógrafo';
-$lang['img_copyr']             = 'Direitos autorais';
-$lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Câmera';
-$lang['img_keywords']          = 'Palavras-chave';
-$lang['img_width']             = 'Largura';
-$lang['img_height']            = 'Altura';
-$lang['img_manager']           = 'Ver no gerenciador de mídias';
+$lang['img_title']             = 'Título:';
+$lang['img_caption']           = 'Descrição:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nome do arquivo:';
+$lang['img_fsize']             = 'Tamanho:';
+$lang['img_artist']            = 'Fotógrafo:';
+$lang['img_copyr']             = 'Direitos autorais:';
+$lang['img_format']            = 'Formato:';
+$lang['img_camera']            = 'Câmera:';
+$lang['img_keywords']          = 'Palavras-chave:';
+$lang['img_width']             = 'Largura:';
+$lang['img_height']            = 'Altura:';
 $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de monitoramentos de %s';
 $lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de monitoramentos de %s';
 $lang['subscr_subscribe_noaddress'] = 'Como não há nenhum endereço associado ao seu usuário, você não pode ser adicionado à lista de monitoramento';
@@ -296,6 +300,7 @@ $lang['i_modified']            = 'Por questões de segurança, esse script funci
 Você pode extrair novamente os arquivos do pacote original ou consultar as <a href="http://dokuwiki.org/install">instruções de instalação do DokuWiki</a>.';
 $lang['i_funcna']              = 'A função PHP <code>%s</code> não está disponível. O seu host a mantém desabilitada por algum motivo?';
 $lang['i_phpver']              = 'A sua versão do PHP (<code>%s</code>) é inferior à necessária (<code>%s</code>). Você precisa atualizar a sua instalação do PHP.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload precisa ser desabilitado no php.ini para executar o DokuWiki';
 $lang['i_permfail']            = 'O DokuWiki não tem permissão de escrita em <code>%s</code>. Você precisa corrigir as configurações de permissão nesse diretório!';
 $lang['i_confexists']          = '<code>%s</code> já existe';
 $lang['i_writeerr']            = 'Não foi possível criar <code>%s</code>. É necessário checar as permissões de arquivos/diretórios e criar o arquivo manualmente.';
diff --git a/inc/lang/pt/denied.txt b/inc/lang/pt/denied.txt
index eb2614387..3af816666 100644
--- a/inc/lang/pt/denied.txt
+++ b/inc/lang/pt/denied.txt
@@ -1,3 +1,4 @@
 ====== Permissão Negada ======
 
-Não possui direitos e permissões suficientes para continuar. Talvez se tenha esquecido de iniciar sessão?
\ No newline at end of file
+Não possui direitos e permissões suficientes para continuar.
+
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 46405c444..ddc9b33ab 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -2,13 +2,15 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Fil <fil@meteopt.com>
  * @author André Neves <drakferion@gmail.com>
  * @author José Campos zecarlosdecampos@gmail.com
+ * @author Murilo <muriloricci@hotmail.com>
+ * @author Paulo Silva <paulotsilva@yahoo.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -44,6 +46,7 @@ $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']         = 'Definir nova senha';
 $lang['btn_draft']             = 'Editar rascunho';
 $lang['btn_recover']           = 'Recuperar rascunho';
 $lang['btn_draftdel']          = 'Apagar rascunho';
@@ -52,7 +55,9 @@ $lang['btn_register']          = 'Registar';
 $lang['btn_apply']             = 'Aplicar';
 $lang['btn_media']             = 'Gestor de Media';
 $lang['btn_deleteuser']        = 'Remover a Minha Conta';
-$lang['loggedinas']            = 'Está em sessão como';
+$lang['btn_img_backto']        = 'De volta a %s';
+$lang['btn_mediaManager']      = 'Ver em gestor de media';
+$lang['loggedinas']            = 'Está em sessão como:';
 $lang['user']                  = 'Utilizador';
 $lang['pass']                  = 'Senha';
 $lang['newpass']               = 'Nova senha';
@@ -63,6 +68,7 @@ $lang['fullname']              = 'Nome completo';
 $lang['email']                 = 'Email';
 $lang['profile']               = 'Perfil do Utilizador';
 $lang['badlogin']              = 'O utilizador inválido ou senha inválida.';
+$lang['badpassconfirm']        = 'Infelizmente a palavra-passe não é a correcta';
 $lang['minoredit']             = 'Alterações Menores';
 $lang['draftdate']             = 'Rascunho automaticamente gravado em';
 $lang['nosecedit']             = 'A página foi modificada entretanto. Como a informação da secção estava desactualizada, foi carregada a página inteira.';
@@ -82,8 +88,11 @@ $lang['profchanged']           = 'Perfil do utilizador actualizado com sucesso.'
 $lang['profnodelete']          = 'Esta wiki não suporta remoção de utilizadores';
 $lang['profdeleteuser']        = 'Apagar Conta';
 $lang['profdeleted']           = 'A sua conta de utilizador foi removida desta wiki';
+$lang['profconfdelete']        = 'Quero remover a minha conta desta wiki. <br/> Esta acção não pode ser anulada.';
+$lang['profconfdeletemissing'] = 'A caixa de confirmação não foi marcada';
 $lang['pwdforget']             = 'Esqueceu a sua senha? Pedir nova senha';
 $lang['resendna']              = 'Este wiki não suporta reenvio de senhas.';
+$lang['resendpwd']             = 'Definir 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.';
@@ -93,11 +102,11 @@ $lang['license']               = 'Excepto menção em contrário, o conteúdo ne
 $lang['licenseok']             = 'Nota: Ao editar esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
 $lang['searchmedia']           = 'Procurar nome de ficheiro:';
 $lang['searchmedia_in']        = 'Procurar em %s';
-$lang['txt_upload']            = 'Escolha ficheiro para carregar';
-$lang['txt_filename']          = 'Carregar como (opcional)';
+$lang['txt_upload']            = 'Escolha ficheiro para carregar:';
+$lang['txt_filename']          = 'Carregar como (opcional):';
 $lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
-$lang['lockedby']              = 'Bloqueado por';
-$lang['lockexpire']            = 'Expira em';
+$lang['lockedby']              = 'Bloqueado por:';
+$lang['lockexpire']            = 'Expira em:';
 $lang['js']['willexpire']      = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos use o botão Prever para re-iniciar o temporizador de bloqueio.';
 $lang['js']['notsavedyet']     = 'Alterações não gravadas serão perdidas.';
 $lang['js']['searchmedia']     = 'Procurar por ficheiros';
@@ -177,10 +186,13 @@ $lang['difflink']              = 'Ligação para esta vista de comparação';
 $lang['diff_type']             = 'Ver diferenças';
 $lang['diff_inline']           = 'Embutido';
 $lang['diff_side']             = 'Lado a lado';
+$lang['diffprevrev']           = 'Revisão anterior';
+$lang['diffnextrev']           = 'Próxima revisão';
+$lang['difflastrev']           = 'Última revisão';
 $lang['line']                  = 'Linha';
-$lang['breadcrumb']            = 'Está em';
-$lang['youarehere']            = 'Está aqui';
-$lang['lastmod']               = 'Esta página foi modificada pela última vez em';
+$lang['breadcrumb']            = 'Está em:';
+$lang['youarehere']            = 'Está aqui:';
+$lang['lastmod']               = 'Esta página foi modificada pela última vez em:';
 $lang['by']                    = 'por';
 $lang['deleted']               = 'Documento automaticamente removido.';
 $lang['created']               = 'Criação deste novo documento.';
@@ -233,20 +245,18 @@ $lang['admin_register']        = 'Registar Novo Utilizador';
 $lang['metaedit']              = 'Editar Metadata';
 $lang['metasaveerr']           = 'Falhou a escrita de Metadata';
 $lang['metasaveok']            = 'Metadata gravada';
-$lang['img_backto']            = 'De volta a';
-$lang['img_title']             = 'Título';
-$lang['img_caption']           = 'Legenda';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Ficheiro';
-$lang['img_fsize']             = 'Tamanho';
-$lang['img_artist']            = 'Fotógrafo';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Câmara';
-$lang['img_keywords']          = 'Palavras-Chave';
-$lang['img_width']             = 'Largura';
-$lang['img_height']            = 'Altura';
-$lang['img_manager']           = 'Ver em gestor de media';
+$lang['img_title']             = 'Título:';
+$lang['img_caption']           = 'Legenda:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Ficheiro:';
+$lang['img_fsize']             = 'Tamanho:';
+$lang['img_artist']            = 'Fotógrafo:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formato:';
+$lang['img_camera']            = 'Câmara:';
+$lang['img_keywords']          = 'Palavras-Chave:';
+$lang['img_width']             = 'Largura:';
+$lang['img_height']            = 'Altura:';
 $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de subscrição para %s';
 $lang['subscr_subscribe_error'] = 'Erro ao adicionar %s à lista de subscrição para %s';
 $lang['subscr_subscribe_noaddress'] = 'Não existe endereço algum associado com o seu nome de utilizador, não pode ser adicionado à lista de subscrição';
@@ -285,6 +295,7 @@ $lang['i_policy']              = 'Politica ACL inicial';
 $lang['i_pol0']                = 'Wiki Aberto (ler, escrever e carregar para todos)';
 $lang['i_pol1']                = 'Wiki Público (ler para todos, escrever e carregar para utilizadores inscritos)';
 $lang['i_pol2']                = 'Wiki Fechado (ler, escrever e carregar somente para utilizadores inscritos)';
+$lang['i_allowreg']            = 'Permitir aos utilizadores registarem-se por si próprios';
 $lang['i_retry']               = 'Repetir';
 $lang['i_license']             = 'Por favor escolha a licença sob a qual quer colocar o seu conteúdo:';
 $lang['i_license_none']        = 'Não mostrar nenhuma informação de licença';
@@ -305,9 +316,11 @@ $lang['media_file']            = 'Ficheiro';
 $lang['media_viewtab']         = 'Ver';
 $lang['media_edittab']         = 'Editar';
 $lang['media_historytab']      = 'Histórico';
+$lang['media_list_thumbs']     = 'Miniaturas';
 $lang['media_list_rows']       = 'Linhas';
 $lang['media_sort_name']       = 'Ordenar por nome';
 $lang['media_sort_date']       = 'Ordenar por data';
+$lang['media_namespaces']      = 'Escolha o namespace';
 $lang['media_files']           = 'Ficheiros em %s';
 $lang['media_upload']          = 'Enviar para o grupo <strong>%s</strong>.';
 $lang['media_search']          = 'Procurar no grupo <strong>%s</strong>.';
@@ -319,3 +332,7 @@ $lang['media_perm_read']       = 'Perdão, não tem permissão para ler ficheiro
 $lang['media_perm_upload']     = 'Perdão, não tem permissão para enviar ficheiros.';
 $lang['media_update']          = 'enviar nova versão';
 $lang['media_restore']         = 'Restaurar esta versão';
+$lang['currentns']             = 'Namespace actual';
+$lang['searchresult']          = 'Resultado da pesquisa';
+$lang['plainhtml']             = 'HTML simples';
+$lang['wikimarkup']            = 'Markup de Wiki';
diff --git a/inc/lang/ro/denied.txt b/inc/lang/ro/denied.txt
index 8e8126a17..490233acf 100644
--- a/inc/lang/ro/denied.txt
+++ b/inc/lang/ro/denied.txt
@@ -1,4 +1,4 @@
 ====== Acces nepermis ======
 
-Din păcate nu ai destule drepturi pentru a continua. Poate ai uitat să te
-autentifici?
+Din păcate nu ai destule drepturi pentru a continua.
+
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 491ab58e7..cd7d4fcc3 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -53,7 +53,7 @@ $lang['btn_revert']            = 'Revenire';
 $lang['btn_register']          = 'Înregistrează';
 $lang['btn_apply']             = 'Aplică';
 $lang['btn_media']             = 'Administrare media';
-$lang['loggedinas']            = 'Autentificat ca';
+$lang['loggedinas']            = 'Autentificat ca:';
 $lang['user']                  = 'Utilizator';
 $lang['pass']                  = 'Parola';
 $lang['newpass']               = 'Parola nouă';
@@ -92,11 +92,11 @@ $lang['license']               = 'Exceptând locurile unde este altfel specifica
 $lang['licenseok']             = 'Notă: Prin editarea acestei pagini ești de acord să publici conțintul sub următoarea licență:';
 $lang['searchmedia']           = 'Caută numele fișierului:';
 $lang['searchmedia_in']        = 'Caută în %s';
-$lang['txt_upload']            = 'Selectează fișierul de încărcat';
-$lang['txt_filename']          = 'Încarcă fișierul ca (opțional)';
+$lang['txt_upload']            = 'Selectează fișierul de încărcat:';
+$lang['txt_filename']          = 'Încarcă fișierul ca (opțional):';
 $lang['txt_overwrt']           = 'Suprascrie fișierul existent';
-$lang['lockedby']              = 'Momentan blocat de';
-$lang['lockexpire']            = 'Blocarea expiră la';
+$lang['lockedby']              = 'Momentan blocat de:';
+$lang['lockexpire']            = 'Blocarea expiră la:';
 $lang['js']['willexpire']      = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele folosește butonul de previzualizare pentru resetarea blocării.';
 $lang['js']['notsavedyet']     = 'Există modificări nesalvate care se vor pierde.
 Dorești să continui?';
@@ -178,9 +178,9 @@ $lang['diff_type']             = 'Vezi diferențe:';
 $lang['diff_inline']           = 'Succesiv';
 $lang['diff_side']             = 'Alăturate';
 $lang['line']                  = 'Linia';
-$lang['breadcrumb']            = 'Traseu';
-$lang['youarehere']            = 'Ești aici';
-$lang['lastmod']               = 'Ultima modificare';
+$lang['breadcrumb']            = 'Traseu:';
+$lang['youarehere']            = 'Ești aici:';
+$lang['lastmod']               = 'Ultima modificare:';
 $lang['by']                    = 'de către';
 $lang['deleted']               = 'șters';
 $lang['created']               = 'creat';
@@ -232,20 +232,20 @@ $lang['admin_register']        = 'Adaugă utilizator nou';
 $lang['metaedit']              = 'Editează metadata';
 $lang['metasaveerr']           = 'Scrierea metadatelor a eșuat';
 $lang['metasaveok']            = 'Metadatele au fost salvate';
-$lang['img_backto']            = 'Înapoi la';
-$lang['img_title']             = 'Titlu';
-$lang['img_caption']           = 'Legendă';
-$lang['img_date']              = 'Dată';
-$lang['img_fname']             = 'Nume fișier';
-$lang['img_fsize']             = 'Dimensiune';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Drept de autor';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Cuvinte cheie';
-$lang['img_width']             = 'Lățime';
-$lang['img_height']            = 'Înălțime';
-$lang['img_manager']           = 'Vizualizează în administratorul media';
+$lang['btn_img_backto']            = 'Înapoi la %s';
+$lang['img_title']             = 'Titlu:';
+$lang['img_caption']           = 'Legendă:';
+$lang['img_date']              = 'Dată:';
+$lang['img_fname']             = 'Nume fișier:';
+$lang['img_fsize']             = 'Dimensiune:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Drept de autor:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Cuvinte cheie:';
+$lang['img_width']             = 'Lățime:';
+$lang['img_height']            = 'Înălțime:';
+$lang['btn_mediaManager']           = 'Vizualizează în administratorul media';
 $lang['subscr_subscribe_success'] = 'Adăugat %s la lista de abonare pentru %s';
 $lang['subscr_subscribe_error'] = 'Eroare la adăugarea %s la lista de abonare pentru %s';
 $lang['subscr_subscribe_noaddress'] = 'Nu există adresă de e-mail asociată autentificării curente, nu poți fi adăugat la lista de abonare';
diff --git a/inc/lang/ru/admin.txt b/inc/lang/ru/admin.txt
index e00daa447..cd609a347 100644
--- a/inc/lang/ru/admin.txt
+++ b/inc/lang/ru/admin.txt
@@ -1,4 +1,4 @@
 ====== Управление ======
 
-Ниже вы сможете найти список административных операций, доступных в «ДокуВики».
+Ниже вы сможете найти список административных операций, доступных в «Докувики».
 
diff --git a/inc/lang/ru/denied.txt b/inc/lang/ru/denied.txt
index f7f53ce88..6b7c82511 100644
--- a/inc/lang/ru/denied.txt
+++ b/inc/lang/ru/denied.txt
@@ -1,3 +1,4 @@
 ====== Доступ запрещён ======
 
-Извините, у вас не хватает прав для этого действия. Может быть вы забыли войти в вики под своим логином?
+Извините, у вас не хватает прав для этого действия.
+
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 208d647a8..c36c611c0 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -24,6 +24,8 @@
  * @author Pavel <ivanovtsk@mail.ru>
  * @author Artur <ncuxxx@gmail.com>
  * @author Erli Moen <evseev.jr@gmail.com>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ * @author Владимир <id37736@yandex.ru>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
@@ -68,7 +70,9 @@ $lang['btn_register']          = 'Зарегистрироваться';
 $lang['btn_apply']             = 'Применить';
 $lang['btn_media']             = 'Управление медиафайлами';
 $lang['btn_deleteuser']        = 'Удалить мой аккаунт';
-$lang['loggedinas']            = 'Зашли как';
+$lang['btn_img_backto']        = 'Вернуться к %s';
+$lang['btn_mediaManager']      = 'Просмотр в «управлении медиафайлами»';
+$lang['loggedinas']            = 'Зашли как:';
 $lang['user']                  = 'Логин';
 $lang['pass']                  = 'Пароль';
 $lang['newpass']               = 'Новый пароль';
@@ -90,7 +94,7 @@ $lang['regsuccess2']           = 'Пользователь создан.';
 $lang['regmailfail']           = 'Похоже есть проблема с отправкой пароля по почте. Пожалуйста, сообщите об этом администратору.';
 $lang['regbadmail']            = 'Данный вами адрес электронной почты выглядит неправильным. Если вы считаете это ошибкой, сообщите администратору.';
 $lang['regbadpass']            = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.';
-$lang['regpwmail']             = 'Ваш пароль для системы «ДокуВики»';
+$lang['regpwmail']             = 'Ваш пароль для системы «Докувики»';
 $lang['reghere']               = 'У вас ещё нет аккаунта? Зарегистрируйтесь';
 $lang['profna']                = 'Данная вики не поддерживает изменение профиля';
 $lang['profnochange']          = 'Изменений не было внесено, профиль не обновлён.';
@@ -113,12 +117,12 @@ $lang['license']               = 'За исключением случаев, к
 $lang['licenseok']             = 'Примечание: редактируя эту страницу, вы соглашаетесь на использование своего вклада на условиях следующей лицензии:';
 $lang['searchmedia']           = 'Поиск по имени файла:';
 $lang['searchmedia_in']        = 'Поиск в %s';
-$lang['txt_upload']            = 'Выберите файл для загрузки';
-$lang['txt_filename']          = 'Введите имя файла в вики (необязательно)';
+$lang['txt_upload']            = 'Выберите файл для загрузки:';
+$lang['txt_filename']          = 'Введите имя файла в вики (необязательно):';
 $lang['txt_overwrt']           = 'Перезаписать существующий файл';
 $lang['maxuploadsize']         = 'Максимальный размер загружаемого файла %s';
-$lang['lockedby']              = 'В данный момент заблокирован';
-$lang['lockexpire']            = 'Блокировка истекает в';
+$lang['lockedby']              = 'В данный момент заблокирован:';
+$lang['lockexpire']            = 'Блокировка истекает в:';
 $lang['js']['willexpire']      = 'Ваша блокировка этой страницы на редактирование истекает в течение минуты.\nЧтобы предотвратить конфликты используйте кнопку «Просмотр» для сброса таймера блокировки.';
 $lang['js']['notsavedyet']     = 'Несохранённые изменения будут потеряны. Вы действительно хотите продолжить?';
 $lang['js']['searchmedia']     = 'Поиск файлов';
@@ -145,7 +149,7 @@ $lang['js']['medialeft']       = 'Выровнять изображение по
 $lang['js']['mediaright']      = 'Выровнять изображение по правому краю.';
 $lang['js']['mediacenter']     = 'Выровнять изображение по центру.';
 $lang['js']['medianoalign']    = 'Не выравнивать.';
-$lang['js']['nosmblinks']      = 'Ссылка на сетевые каталоги Windows работает только из Интернет Эксплорера. Но вы можете скопировать ссылку.';
+$lang['js']['nosmblinks']      = 'Ссылка на сетевые каталоги Windows работает только из MS Internet Explorer, но вы можете скопировать ссылку.';
 $lang['js']['linkwiz']         = 'Мастер ссылок';
 $lang['js']['linkto']          = 'Ссылка на:';
 $lang['js']['del_confirm']     = 'Вы на самом деле желаете удалить выбранное?';
@@ -197,10 +201,13 @@ $lang['difflink']              = 'Ссылка на это сравнение';
 $lang['diff_type']             = 'Посмотреть отличия';
 $lang['diff_inline']           = 'встроенный';
 $lang['diff_side']             = 'бок о бок';
+$lang['diffprevrev']           = 'Предыдущая версия';
+$lang['diffnextrev']           = 'Следущая версия';
+$lang['difflastrev']           = 'Последняя версия';
 $lang['line']                  = 'Строка';
-$lang['breadcrumb']            = 'Вы посетили';
-$lang['youarehere']            = 'Вы находитесь здесь';
-$lang['lastmod']               = 'Последние изменения';
+$lang['breadcrumb']            = 'Вы посетили:';
+$lang['youarehere']            = 'Вы находитесь здесь:';
+$lang['lastmod']               = 'Последние изменения:';
 $lang['by']                    = ' —';
 $lang['deleted']               = 'удалено';
 $lang['created']               = 'создано';
@@ -253,20 +260,18 @@ $lang['admin_register']        = 'Добавить пользователя';
 $lang['metaedit']              = 'Править метаданные';
 $lang['metasaveerr']           = 'Ошибка записи метаданных';
 $lang['metasaveok']            = 'Метаданные сохранены';
-$lang['img_backto']            = 'Вернуться к';
-$lang['img_title']             = 'Название';
-$lang['img_caption']           = 'Подпись';
-$lang['img_date']              = 'Дата';
-$lang['img_fname']             = 'Имя файла';
-$lang['img_fsize']             = 'Размер';
-$lang['img_artist']            = 'Фотограф';
-$lang['img_copyr']             = 'Авторские права';
-$lang['img_format']            = 'Формат';
-$lang['img_camera']            = 'Модель';
-$lang['img_keywords']          = 'Ключевые слова';
-$lang['img_width']             = 'Ширина';
-$lang['img_height']            = 'Высота';
-$lang['img_manager']           = 'Просмотр в «управлении медиафайлами»';
+$lang['img_title']             = 'Название:';
+$lang['img_caption']           = 'Подпись:';
+$lang['img_date']              = 'Дата:';
+$lang['img_fname']             = 'Имя файла:';
+$lang['img_fsize']             = 'Размер:';
+$lang['img_artist']            = 'Фотограф:';
+$lang['img_copyr']             = 'Авторские права:';
+$lang['img_format']            = 'Формат:';
+$lang['img_camera']            = 'Модель:';
+$lang['img_keywords']          = 'Ключевые слова:';
+$lang['img_width']             = 'Ширина:';
+$lang['img_height']            = 'Высота:';
 $lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s';
 $lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s';
 $lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку';
@@ -286,34 +291,34 @@ $lang['subscr_style_list']     = 'список изменённых страни
 $lang['authtempfail']          = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.';
 $lang['authpwdexpire']         = 'Действие вашего пароля истекает через %d дней. Вы должны изменить его как можно скорее';
 $lang['i_chooselang']          = 'Выберите свой язык/Choose your language';
-$lang['i_installer']           = 'Установка «ДокуВики»';
+$lang['i_installer']           = 'Установка «Докувики»';
 $lang['i_wikiname']            = 'Название вики';
 $lang['i_enableacl']           = 'Разрешить ограничение прав доступа (рекомендуется)';
 $lang['i_superuser']           = 'Суперпользователь';
 $lang['i_problems']            = 'Программа установки столкнулась с проблемами, перечисленными ниже. Чтобы продолжить, вам необходимо их устранить. ';
-$lang['i_modified']            = 'Из соображений безопасности эта программа запускается только на новой, неизменённой установке «ДокуВики».
+$lang['i_modified']            = 'Из соображений безопасности эта программа запускается только на новой, неизменённой установке «Докувики».
                                   Вам нужно либо заново распаковать скачанный пакет установки, либо обратиться к полной
-                                  <a href="http://www.dokuwiki.org/install">инструкции по установке «ДокуВики»</a>';
+                                  <a href="http://www.dokuwiki.org/install">инструкции по установке «Докувики»</a>';
 $lang['i_funcna']              = 'Функция PHP <code>%s</code> недоступна. Может быть, она по какой-то причине заблокирована вашим хостером?';
 $lang['i_phpver']              = 'Ваша версия PHP (<code>%s</code>) ниже требуемой (<code>%s</code>). Вам необходимо обновить установленную версию PHP.';
-$lang['i_permfail']            = '<code>%s</code> недоступна для записи «ДокуВики». Вам необходимо исправить системные права доступа для этой директории!';
+$lang['i_permfail']            = '<code>%s</code> недоступна для записи «Докувики». Вам необходимо исправить системные права доступа для этой директории!';
 $lang['i_confexists']          = '<code>%s</code> уже существует';
-$lang['i_writeerr']            = 'Не удалось создать <code>%s</code>. Вам необходимо проверить системные права доступа к файлу/директориям и создать файл вручную. ';
+$lang['i_writeerr']            = 'Не удалось создать <code>%s</code>. Вам необходимо проверить системные права доступа к файлу и директориям, и создать файл вручную. ';
 $lang['i_badhash']             = 'dokuwiki.php не распознан или изменён (хэш=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> — недопустимое или пустое значение';
 $lang['i_success']             = 'Конфигурация прошла успешно. Теперь вы можете удалить файл install.php. Переходите к
-                                 <a href="doku.php?id=wiki:welcome">своей новой «ДокуВики»</a>.';
-$lang['i_failure']             = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придётся исправить их вручную, прежде чем вы сможете использовать <a href="doku.php?id=wiki:welcome">свою новую «ДокуВики»</a>.';
+                                 <a href="doku.php?id=wiki:welcome">своей новой «Докувики»</a>.';
+$lang['i_failure']             = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придётся исправить их вручную, прежде чем вы сможете использовать <a href="doku.php?id=wiki:welcome">свою новую «Докувики»</a>.';
 $lang['i_policy']              = 'Исходная политика прав доступа';
 $lang['i_pol0']                = 'Открытая вики (чтение, запись, закачка файлов для всех)';
 $lang['i_pol1']                = 'Общедоступная вики (чтение для всех, запись и загрузка файлов для зарегистрированных пользователей)';
 $lang['i_pol2']                = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)';
-$lang['i_allowreg']            = 'Позволить пользователям самостоятельно регестрироваться';
+$lang['i_allowreg']            = 'Разрешить пользователям самостоятельно регистрироваться';
 $lang['i_retry']               = 'Повторить попытку';
-$lang['i_license']             = 'Пожалуйста, выберите тип лицензии для своей вики:';
-$lang['i_license_none']        = 'Не отображать информацию о лицензионных операциях';
-$lang['i_pop_field']           = 'Пожалуйста, помогите нам улучшить «ДокуВики»:';
-$lang['i_pop_label']           = 'Отправлять раз в месяц анонимную пользовательскую информацию разработчикам «ДокуВики»';
+$lang['i_license']             = 'Пожалуйста, выберите тип лицензии для своей вики';
+$lang['i_license_none']        = 'Не отображать информацию о лицензии';
+$lang['i_pop_field']           = 'Пожалуйста, помогите нам улучшить «Докувики»:';
+$lang['i_pop_label']           = 'Отправлять раз в месяц анонимную пользовательскую информацию разработчикам «Докувики»';
 $lang['recent_global']         = 'Вы просматриваете изменения в пространстве имён <b>%s</b>. Вы можете также <a href="%s">просмотреть недавние изменения во всей вики</a>.';
 $lang['years']                 = '%d лет назад';
 $lang['months']                = '%d месяц(ев) назад';
@@ -347,6 +352,7 @@ $lang['media_perm_read']       = 'Извините, у вас недостато
 $lang['media_perm_upload']     = 'Извините, у вас недостаточно прав для загрузки файлов.';
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
-$lang['currentns']             = 'Текущее пространство имен';
+$lang['currentns']             = 'Текущее пространство имён';
 $lang['searchresult']          = 'Результаты поиска';
-$lang['plainhtml']             = 'Чистый HTML';
+$lang['plainhtml']             = 'Простой HTML';
+$lang['wikimarkup']            = 'вики-разметка';
diff --git a/inc/lang/ru/mailtext.txt b/inc/lang/ru/mailtext.txt
index 2b3f76bbd..953daddf2 100644
--- a/inc/lang/ru/mailtext.txt
+++ b/inc/lang/ru/mailtext.txt
@@ -13,5 +13,5 @@ IP-адрес: @IPADDRESS@
 
 
 -- 
-Это письмо было сгенерировано «ДокуВики» по адресу
+Это письмо было сгенерировано «Докувики» по адресу
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/norev.txt b/inc/lang/ru/norev.txt
index 388d6149d..c088d0d5a 100644
--- a/inc/lang/ru/norev.txt
+++ b/inc/lang/ru/norev.txt
@@ -1,4 +1,3 @@
 ====== Такой версии не существует ======
 
 Указанная версия страницы не существует. Нажмите на кнопку «История страницы», чтобы получить список доступных предыдущих версий этого документа.
-
diff --git a/inc/lang/ru/password.txt b/inc/lang/ru/password.txt
index eb100f334..fabdf2b68 100644
--- a/inc/lang/ru/password.txt
+++ b/inc/lang/ru/password.txt
@@ -6,5 +6,5 @@
 Пароль: @PASSWORD@
 
 -- 
-Это письмо было сгенерировано «ДокуВики» по адресу
+Это письмо было сгенерировано «Докувики» по адресу
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/pwconfirm.txt b/inc/lang/ru/pwconfirm.txt
index 9c27af752..954c75dfe 100644
--- a/inc/lang/ru/pwconfirm.txt
+++ b/inc/lang/ru/pwconfirm.txt
@@ -9,5 +9,5 @@
 @CONFIRM@
 
 -- 
-Это сообщение было сгенерировано «ДокуВики» по адресу
+Это сообщение было сгенерировано «Докувики» по адресу
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/registermail.txt b/inc/lang/ru/registermail.txt
index fc862b034..86ef11e8c 100644
--- a/inc/lang/ru/registermail.txt
+++ b/inc/lang/ru/registermail.txt
@@ -10,5 +10,5 @@
 Хост: @HOSTNAME@
 
 -- 
-Это сообщение было сгенерировано «ДокуВики» по адресу
+Это сообщение было сгенерировано «Докувики» по адресу
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/subscr_digest.txt b/inc/lang/ru/subscr_digest.txt
index 41774a4e9..ac0fc0528 100644
--- a/inc/lang/ru/subscr_digest.txt
+++ b/inc/lang/ru/subscr_digest.txt
@@ -15,6 +15,6 @@
 @SUBSCRIBE@
 и отмените подписку на страницу и/или пространство имен.
 
---
-Это письмо создано «ДокуВики» с сайта
+-- 
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ru/subscr_list.txt b/inc/lang/ru/subscr_list.txt
index 41e1323bc..984a25eb0 100644
--- a/inc/lang/ru/subscr_list.txt
+++ b/inc/lang/ru/subscr_list.txt
@@ -12,6 +12,6 @@
 @SUBSCRIBE@
 и отмените подписку на страницу и/или пространство имён.
 
---
-Это письмо создано «ДокуВики» с сайта
+-- 
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ru/subscr_single.txt b/inc/lang/ru/subscr_single.txt
index 911a48e96..679ca6fff 100644
--- a/inc/lang/ru/subscr_single.txt
+++ b/inc/lang/ru/subscr_single.txt
@@ -19,6 +19,6 @@
 @SUBSCRIBE@
 и отмените подписку на страницу и/или пространство имён.
 
---
-Это письмо создано «ДокуВики» с сайта
+-- 
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ru/uploadmail.txt b/inc/lang/ru/uploadmail.txt
index f696f2c44..84103b45a 100644
--- a/inc/lang/ru/uploadmail.txt
+++ b/inc/lang/ru/uploadmail.txt
@@ -11,5 +11,5 @@
 Пользователь: @USER@
 
 -- 
-Это письмо было сгенерировано «ДокуВики» по адресу
+Это письмо было сгенерировано «Докувики» по адресу
 @DOKUWIKIURL@
diff --git a/inc/lang/sk/denied.txt b/inc/lang/sk/denied.txt
index 6e9c98496..aa6f7b8fb 100644
--- a/inc/lang/sk/denied.txt
+++ b/inc/lang/sk/denied.txt
@@ -1,3 +1,4 @@
 ====== Nepovolená akcia ======
 
-Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti. Možno ste sa zabudli prihlásiť?
+Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti.
+
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index aa823b074..e501cb7fc 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -51,7 +51,7 @@ $lang['btn_register']          = 'Registrovať';
 $lang['btn_apply']             = 'Použiť';
 $lang['btn_media']             = 'Správa médií';
 $lang['btn_deleteuser']        = 'Zrušiť môj účet';
-$lang['loggedinas']            = 'Prihlásený(á) ako';
+$lang['loggedinas']            = 'Prihlásený(á) ako:';
 $lang['user']                  = 'Užívateľské meno';
 $lang['pass']                  = 'Heslo';
 $lang['newpass']               = 'Nové heslo';
@@ -96,8 +96,8 @@ $lang['license']               = 'Ak nie je uvedené inak, obsah tejto wiki je u
 $lang['licenseok']             = 'Poznámka: Zmenou tejto stránky súhlasíte s uverejnením obsahu pod nasledujúcou licenciou:';
 $lang['searchmedia']           = 'Hľadať meno súboru:';
 $lang['searchmedia_in']        = 'Hľadať v %s';
-$lang['txt_upload']            = 'Vyberte súbor ako prílohu';
-$lang['txt_filename']          = 'Uložiť ako (voliteľné)';
+$lang['txt_upload']            = 'Vyberte súbor ako prílohu:';
+$lang['txt_filename']          = 'Uložiť ako (voliteľné):';
 $lang['txt_overwrt']           = 'Prepísať existujúci súbor';
 $lang['maxuploadsize']         = 'Obmedzenie max. %s na súbor.';
 $lang['lockedby']              = 'Práve zamknuté:';
@@ -183,9 +183,9 @@ $lang['diff_type']             = 'Prehľad zmien:';
 $lang['diff_inline']           = 'Vnorený';
 $lang['diff_side']             = 'Vedľa seba';
 $lang['line']                  = 'Riadok';
-$lang['breadcrumb']            = 'História';
-$lang['youarehere']            = 'Nachádzate sa';
-$lang['lastmod']               = 'Posledná úprava';
+$lang['breadcrumb']            = 'História:';
+$lang['youarehere']            = 'Nachádzate sa:';
+$lang['lastmod']               = 'Posledná úprava:';
 $lang['by']                    = 'od';
 $lang['deleted']               = 'odstránené';
 $lang['created']               = 'vytvorené';
@@ -238,20 +238,20 @@ $lang['admin_register']        = 'Pridaj nového užívateľa';
 $lang['metaedit']              = 'Upraviť metainformácie';
 $lang['metasaveerr']           = 'Zápis metainformácií zlyhal';
 $lang['metasaveok']            = 'Metainformácie uložené';
-$lang['img_backto']            = 'Späť na';
-$lang['img_title']             = 'Titul';
-$lang['img_caption']           = 'Popis';
-$lang['img_date']              = 'Dátum';
-$lang['img_fname']             = 'Názov súboru';
-$lang['img_fsize']             = 'Veľkosť';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Kopírovacie práva';
-$lang['img_format']            = 'Formát';
-$lang['img_camera']            = 'Fotoaparát';
-$lang['img_keywords']          = 'Kľúčové slová';
-$lang['img_width']             = 'Šírka';
-$lang['img_height']            = 'Výška';
-$lang['img_manager']           = 'Prezrieť v správcovi médií';
+$lang['btn_img_backto']            = 'Späť na %s';
+$lang['img_title']             = 'Titul:';
+$lang['img_caption']           = 'Popis:';
+$lang['img_date']              = 'Dátum:';
+$lang['img_fname']             = 'Názov súboru:';
+$lang['img_fsize']             = 'Veľkosť:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Kopírovacie práva:';
+$lang['img_format']            = 'Formát:';
+$lang['img_camera']            = 'Fotoaparát:';
+$lang['img_keywords']          = 'Kľúčové slová:';
+$lang['img_width']             = 'Šírka:';
+$lang['img_height']            = 'Výška:';
+$lang['btn_mediaManager']           = 'Prezrieť v správcovi médií';
 $lang['subscr_subscribe_success'] = 'Používateľ %s bol pridaný do zoznamu hlásení o zmenách %s';
 $lang['subscr_subscribe_error'] = 'Chyba pri pridaní používateľa %s do zoznamu hlásení o zmenách %s';
 $lang['subscr_subscribe_noaddress'] = 'Vaše prihlasovacie meno nemá priradenú žiadnu email adresu, nemôžete byť pridaný do zoznamu hlásení o zmenách';
diff --git a/inc/lang/sl/denied.txt b/inc/lang/sl/denied.txt
index 5b5fd4d3a..206e167bb 100644
--- a/inc/lang/sl/denied.txt
+++ b/inc/lang/sl/denied.txt
@@ -1,3 +1,4 @@
 ====== Ni ustreznih dovoljenj ======
 
-Za nadaljevanje opravila je treba imeti ustrezna dovoljenja. Ali ste se morda pozabili prijaviti?
+Za nadaljevanje opravila je treba imeti ustrezna dovoljenja.
+
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index c9a47927d..f76dbb7d1 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -10,6 +10,7 @@
  * @author Matej Urbančič (mateju@svn.gnome.org)
  * @author Matej Urbančič <mateju@svn.gnome.org>
  * @author matej <mateju@svn.gnome.org>
+ * @author Jernej Vidmar <jernej.vidmar@vidmarboehm.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -54,7 +55,9 @@ $lang['btn_register']          = 'Prijava';
 $lang['btn_apply']             = 'Uveljavi';
 $lang['btn_media']             = 'Urejevalnik predstavnih vsebin';
 $lang['btn_deleteuser']        = 'Odstrani račun';
-$lang['loggedinas']            = 'Prijava kot';
+$lang['btn_img_backto']        = 'Nazaj na %s';
+$lang['btn_mediaManager']      = 'Poglej v urejevalniku predstavnih vsebin';
+$lang['loggedinas']            = 'Prijava kot:';
 $lang['user']                  = 'Uporabniško ime';
 $lang['pass']                  = 'Geslo';
 $lang['newpass']               = 'Novo geslo';
@@ -85,6 +88,7 @@ $lang['profchanged']           = 'Uporabniški profil je uspešno posodobljen.';
 $lang['profnodelete']          = 'Ni omogočena podpora za brisanje uporabnikov.';
 $lang['profdeleteuser']        = 'Izbriši račun';
 $lang['profdeleted']           = 'Uporabniški račun je izbrisan.';
+$lang['profconfdeletemissing'] = 'Potrditveno okno ni označeno';
 $lang['pwdforget']             = 'Ali ste pozabili geslo? Pridobite si novo geslo.';
 $lang['resendna']              = 'DokuWiki ne podpira možnosti ponovnega pošiljanja gesel.';
 $lang['resendpwd']             = 'Nastavi novo geslo za';
@@ -97,11 +101,11 @@ $lang['license']               = 'V kolikor ni posebej določeno, je vsebina Wik
 $lang['licenseok']             = 'Opomba: z urejanjem vsebine strani, se strinjate z objavo pod pogoji dovoljenja:';
 $lang['searchmedia']           = 'Poišči ime datoteke:';
 $lang['searchmedia_in']        = 'Poišči v %s';
-$lang['txt_upload']            = 'Izberite datoteko za pošiljanje';
-$lang['txt_filename']          = 'Pošlji z imenom (izborno)';
+$lang['txt_upload']            = 'Izberite datoteko za pošiljanje:';
+$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['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']['notsavedyet']     = 'Neshranjene spremembe bodo izgubljene.';
 $lang['js']['searchmedia']     = 'Poišči datoteke';
@@ -179,10 +183,13 @@ $lang['difflink']              = 'Poveži s tem pogledom primerjave.';
 $lang['diff_type']             = 'Razlike:';
 $lang['diff_inline']           = 'V besedilu';
 $lang['diff_side']             = 'Eno ob drugem';
+$lang['diffprevrev']           = 'Prejšnja revizija';
+$lang['diffnextrev']           = 'Naslednja revizija';
+$lang['difflastrev']           = 'Zadnja revizija';
 $lang['line']                  = 'Vrstica';
-$lang['breadcrumb']            = 'Sled';
-$lang['youarehere']            = 'Trenutno dejavna stran';
-$lang['lastmod']               = 'Zadnja sprememba';
+$lang['breadcrumb']            = 'Sled:';
+$lang['youarehere']            = 'Trenutno dejavna stran:';
+$lang['lastmod']               = 'Zadnja sprememba:';
 $lang['by']                    = 'uporabnika';
 $lang['deleted']               = 'odstranjena';
 $lang['created']               = 'ustvarjena';
@@ -235,20 +242,18 @@ $lang['admin_register']        = 'Dodaj novega uporabnika';
 $lang['metaedit']              = 'Uredi metapodatke';
 $lang['metasaveerr']           = 'Zapisovanje metapodatkov je spodletelo';
 $lang['metasaveok']            = 'Metapodatki so shranjeni';
-$lang['img_backto']            = 'Nazaj na';
-$lang['img_title']             = 'Naslov';
-$lang['img_caption']           = 'Opis';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Ime datoteke';
-$lang['img_fsize']             = 'Velikost';
-$lang['img_artist']            = 'Fotograf';
-$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['img_title']             = 'Naslov:';
+$lang['img_caption']           = 'Opis:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Ime datoteke:';
+$lang['img_fsize']             = 'Velikost:';
+$lang['img_artist']            = 'Fotograf:';
+$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['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.';
@@ -291,6 +296,8 @@ $lang['i_allowreg']            = 'Dovoli uporabnikom vpis';
 $lang['i_retry']               = 'Ponovni poskus';
 $lang['i_license']             = 'Izbor dovoljenja objave vsebine:';
 $lang['i_license_none']        = 'Ne pokaži podrobnosti dovoljenja.';
+$lang['i_pop_field']           = 'Prosimo pomagajte nam izboljšati DokuWiki izkušnjo:';
+$lang['i_pop_label']           = 'Enkrat na mesec pošlji anonimne uporabniške podatke DokuWiki razvijalcem';
 $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';
diff --git a/inc/lang/sq/denied.txt b/inc/lang/sq/denied.txt
index 03e10527f..60aa05e55 100644
--- a/inc/lang/sq/denied.txt
+++ b/inc/lang/sq/denied.txt
@@ -1,3 +1,4 @@
 ====== Leja Refuzohet ======
 
-Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar. Mbase harruat të hyni?
\ No newline at end of file
+Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar.
+
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 2ed62ed4e..49984097c 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -49,7 +49,7 @@ $lang['btn_recover']           = 'Rekupero skicën';
 $lang['btn_draftdel']          = 'Fshi skicën';
 $lang['btn_revert']            = 'Kthe si më parë';
 $lang['btn_register']          = 'Regjsitrohuni';
-$lang['loggedinas']            = 'Regjistruar si ';
+$lang['loggedinas']            = 'Regjistruar si :';
 $lang['user']                  = 'Nofka e përdoruesit:';
 $lang['pass']                  = 'Fjalëkalimi';
 $lang['newpass']               = 'Fjalëkalim i ri';
@@ -87,11 +87,11 @@ $lang['license']               = 'Përveç rasteve të përcaktuara, përmbajtja
 $lang['licenseok']             = 'Shënim: Duke redaktuar këtë faqe ju bini dakort të liçensoni përmbajtjen tuaj nën liçensën e mëposhtme:';
 $lang['searchmedia']           = 'Kërko emrin e skedarit:';
 $lang['searchmedia_in']        = 'Kërko në %s';
-$lang['txt_upload']            = 'Zgjidh skedarin për ngarkim';
-$lang['txt_filename']          = 'Ngarko si (alternative)';
+$lang['txt_upload']            = 'Zgjidh skedarin për ngarkim:';
+$lang['txt_filename']          = 'Ngarko si (alternative):';
 $lang['txt_overwrt']           = 'Zëvendëso skedarin ekzistues';
-$lang['lockedby']              = 'Kyçur momentalisht nga';
-$lang['lockexpire']            = 'Kyçi skadon në';
+$lang['lockedby']              = 'Kyçur momentalisht nga:';
+$lang['lockexpire']            = 'Kyçi skadon në:';
 $lang['js']['willexpire']            = 'Kyçi juaj për redaktimin e kësaj faqeje është duke skaduar.\nPër të shmangur konflikte përdorni butonin Shiko Paraprakisht për të rivendosur kohën e kyçjes.';
 $lang['js']['notsavedyet']     = 'Ndryshimet e paruajtura do të humbasin.\nVazhdo me të vërtetë?';
 $lang['rssfailed']             = 'Ndoshi një gabim gjatë kapjes së këtij lajmi:';
@@ -134,9 +134,9 @@ $lang['yours']                 = 'Versioni Juaj';
 $lang['diff']                  = 'Trego ndryshimet nga rishikimet aktuale';
 $lang['diff2']                 = 'Trego ndryshimet mes rishikimeve të përzgjedhura';
 $lang['line']                  = 'Vijë';
-$lang['breadcrumb']            = 'Gjurmë';
-$lang['youarehere']            = 'Ju jeni këtu';
-$lang['lastmod']               = 'Redaktuar për herë të fundit';
+$lang['breadcrumb']            = 'Gjurmë:';
+$lang['youarehere']            = 'Ju jeni këtu:';
+$lang['lastmod']               = 'Redaktuar për herë të fundit:';
 $lang['by']                    = 'nga';
 $lang['deleted']               = 'u fshi';
 $lang['created']               = 'u krijua';
@@ -179,17 +179,17 @@ $lang['admin_register']        = 'Shto Përdorues të Ri';
 $lang['metaedit']              = 'Redakto Metadata';
 $lang['metasaveerr']           = 'Shkrimi i metadata-ve dështoi';
 $lang['metasaveok']            = 'Metadata u ruajt';
-$lang['img_backto']            = 'Mbrapa te';
-$lang['img_title']             = 'Titulli ';
-$lang['img_caption']           = 'Titra';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Emri Skedarit';
-$lang['img_fsize']             = 'Madhësia';
-$lang['img_artist']            = 'Autor';
-$lang['img_copyr']             = 'Mbajtësi i të drejtave të autorit';
-$lang['img_format']            = 'Formati';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Fjalë Kyçe';
+$lang['btn_img_backto']            = 'Mbrapa te %s';
+$lang['img_title']             = 'Titulli :';
+$lang['img_caption']           = 'Titra:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Emri Skedarit:';
+$lang['img_fsize']             = 'Madhësia:';
+$lang['img_artist']            = 'Autor:';
+$lang['img_copyr']             = 'Mbajtësi i të drejtave të autorit:';
+$lang['img_format']            = 'Formati:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Fjalë Kyçe:';
 $lang['subscr_subscribe_success'] = 'Iu shtua %s listës së abonimeve për %s';
 $lang['subscr_subscribe_error'] = 'Gabim gjatë shtimit të %s listës së abonimeve për %s';
 $lang['subscr_subscribe_noaddress'] = 'Nuk ekziston asnjë adresë e lidhur me regjistrimin tuaj, ju nuk mund t\'i shtoheni listës së abonimeve.';
diff --git a/inc/lang/sr/denied.txt b/inc/lang/sr/denied.txt
index b74f2b1f8..521c28453 100644
--- a/inc/lang/sr/denied.txt
+++ b/inc/lang/sr/denied.txt
@@ -1,4 +1,4 @@
 ====== Забрањен приступ ======
 
-Извините, али немате довољно права да наставите. Можда сте заборавили да се пријавите?
+Извините, али немате довољно права да наставите.
 
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index 7c434cbc9..22a500e76 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -46,7 +46,7 @@ $lang['btn_recover']           = 'Опорави нацрт';
 $lang['btn_draftdel']          = 'Обриши нацрт';
 $lang['btn_revert']            = 'Врати на пређашњу верзију';
 $lang['btn_register']          = 'Региструј се';
-$lang['loggedinas']            = 'Пријављен као';
+$lang['loggedinas']            = 'Пријављен као:';
 $lang['user']                  = 'Корисничко име';
 $lang['pass']                  = 'Лозинка';
 $lang['newpass']               = 'Нова лозинка';
@@ -84,11 +84,11 @@ $lang['license']               = 'Осим где је другачије наз
 $lang['licenseok']             = 'Напомена: Изменом ове стране слажете се да ће ваше измене бити под следећом лиценцом:';
 $lang['searchmedia']           = 'Претражи по имену фајла';
 $lang['searchmedia_in']        = 'Претражи у %s';
-$lang['txt_upload']            = 'Изаберите датотеку за слање';
-$lang['txt_filename']          = 'Унесите вики-име (опционо)';
+$lang['txt_upload']            = 'Изаберите датотеку за слање:';
+$lang['txt_filename']          = 'Унесите вики-име (опционо):';
 $lang['txt_overwrt']           = 'Препишите тренутни фајл';
-$lang['lockedby']              = 'Тренутно закључано од стране';
-$lang['lockexpire']            = 'Закључавање истиче';
+$lang['lockedby']              = 'Тренутно закључано од стране:';
+$lang['lockexpire']            = 'Закључавање истиче:';
 $lang['js']['willexpire']            = 'Ваше закључавање за измену ове странице ће да истекне за један минут.\nДа би сте избегли конфликте, искористите дугме за преглед како би сте ресетовали тајмер закључавања.';
 $lang['js']['notsavedyet']     = 'Несачуване измене ће бити изгубљене.
 Да ли стварно желите да наставите?';
@@ -156,9 +156,9 @@ $lang['diff']                  = 'прикажи разлике до трену�
 $lang['diff2']                 = 'Прикажи разлике између одабраних ревизија';
 $lang['difflink']              = 'Постави везу ка овом компаративном приказу';
 $lang['line']                  = 'Линија';
-$lang['breadcrumb']            = 'Траг';
-$lang['youarehere']            = 'Сада сте овде';
-$lang['lastmod']               = 'Последњи пут мењано';
+$lang['breadcrumb']            = 'Траг:';
+$lang['youarehere']            = 'Сада сте овде:';
+$lang['lastmod']               = 'Последњи пут мењано:';
 $lang['by']                    = 'од';
 $lang['deleted']               = 'избрисано';
 $lang['created']               = 'направљено';
@@ -201,17 +201,17 @@ $lang['admin_register']        = 'Додај новог корисника';
 $lang['metaedit']              = 'Измени мета-податке';
 $lang['metasaveerr']           = 'Записивање мета-података није било успешно';
 $lang['metasaveok']            = 'Мета-подаци су сачувани';
-$lang['img_backto']            = 'Натраг на';
-$lang['img_title']             = 'Наслов';
-$lang['img_caption']           = 'Назив';
-$lang['img_date']              = 'Датум';
-$lang['img_fname']             = 'Име фајла';
-$lang['img_fsize']             = 'Величина';
-$lang['img_artist']            = 'Фотограф';
-$lang['img_copyr']             = 'Права копирања';
-$lang['img_format']            = 'Формат';
-$lang['img_camera']            = 'Камера';
-$lang['img_keywords']          = 'Кључне речи';
+$lang['btn_img_backto']            = 'Натраг на %s';
+$lang['img_title']             = 'Наслов:';
+$lang['img_caption']           = 'Назив:';
+$lang['img_date']              = 'Датум:';
+$lang['img_fname']             = 'Име фајла:';
+$lang['img_fsize']             = 'Величина:';
+$lang['img_artist']            = 'Фотограф:';
+$lang['img_copyr']             = 'Права копирања:';
+$lang['img_format']            = 'Формат:';
+$lang['img_camera']            = 'Камера:';
+$lang['img_keywords']          = 'Кључне речи:';
 $lang['subscr_subscribe_success'] = '%s је додат на списак претплатника %s';
 $lang['subscr_subscribe_error'] = 'Грешка приликом додавања %s на списак претплатника %s';
 $lang['subscr_subscribe_noaddress'] = 'Не постоји адреса повезана са вашим подацима, стога вас не можемо додати на списак претплатника.';
diff --git a/inc/lang/sv/denied.txt b/inc/lang/sv/denied.txt
index 64d129227..7ae09b85b 100644
--- a/inc/lang/sv/denied.txt
+++ b/inc/lang/sv/denied.txt
@@ -1,4 +1,4 @@
 ====== Åtkomst nekad ======
 
-Tyvärr, du har inte behörighet att fortsätta. Kanske har du glömt att logga in?
+Tyvärr, du har inte behörighet att fortsätta.
 
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 8c8858f61..1f129c621 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -20,6 +20,7 @@
  * @author Henrik <henrik@idealis.se>
  * @author Tor Härnqvist <tor.harnqvist@gmail.com>
  * @author Hans Iwan Bratt <hibratt@gmail.com>
+ * @author Mikael Bergström <krank23@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -62,9 +63,11 @@ $lang['btn_draftdel']          = 'Radera utkast';
 $lang['btn_revert']            = 'Återställ';
 $lang['btn_register']          = 'Registrera';
 $lang['btn_apply']             = 'Verkställ';
-$lang['btn_media']             = 'Media Hanteraren';
+$lang['btn_media']             = 'Mediahanteraren';
 $lang['btn_deleteuser']        = 'Ta bort Mitt Konto';
-$lang['loggedinas']            = 'Inloggad som';
+$lang['btn_img_backto']        = 'Tillbaka till %s';
+$lang['btn_mediaManager']      = 'Se mediahanteraren';
+$lang['loggedinas']            = 'Inloggad som:';
 $lang['user']                  = 'Användarnamn';
 $lang['pass']                  = 'Lösenord';
 $lang['newpass']               = 'Nytt lösenord';
@@ -109,12 +112,12 @@ $lang['license']               = 'Om inte annat angivet, innehållet i denna wik
 $lang['licenseok']             = 'Notera: Genom att ändra i denna sidan så accepterar du att licensiera ditt bidrag under följande licenser:';
 $lang['searchmedia']           = 'Sök efter filnamn:';
 $lang['searchmedia_in']        = 'Sök i %s';
-$lang['txt_upload']            = 'Välj fil att ladda upp';
-$lang['txt_filename']          = 'Ladda upp som (ej obligatoriskt)';
+$lang['txt_upload']            = 'Välj fil att ladda upp:';
+$lang['txt_filename']          = 'Ladda upp som (ej obligatoriskt):';
 $lang['txt_overwrt']           = 'Skriv över befintlig fil';
 $lang['maxuploadsize']         = 'Max %s per uppladdad fil.';
-$lang['lockedby']              = 'Låst av';
-$lang['lockexpire']            = 'Lås upphör att gälla';
+$lang['lockedby']              = 'Låst av:';
+$lang['lockexpire']            = 'Lås upphör att gälla:';
 $lang['js']['willexpire']      = 'Ditt redigeringslås för detta dokument kommer snart att upphöra.\nFör att undvika versionskonflikter bör du förhandsgranska ditt dokument för att förlänga redigeringslåset.';
 $lang['js']['notsavedyet']     = 'Det finns ändringar som inte är sparade.
 Är du säker på att du vill fortsätta?';
@@ -194,9 +197,9 @@ $lang['difflink']              = 'Länk till den här jämförelsesidan';
 $lang['diff_type']             = 'Visa skillnader:';
 $lang['diff_side']             = 'Sida vid sida';
 $lang['line']                  = 'Rad';
-$lang['breadcrumb']            = 'Spår';
-$lang['youarehere']            = 'Här är du';
-$lang['lastmod']               = 'Senast uppdaterad';
+$lang['breadcrumb']            = 'Spår:';
+$lang['youarehere']            = 'Här är du:';
+$lang['lastmod']               = 'Senast uppdaterad:';
 $lang['by']                    = 'av';
 $lang['deleted']               = 'raderad';
 $lang['created']               = 'skapad';
@@ -249,20 +252,18 @@ $lang['admin_register']        = 'Lägg till ny användare';
 $lang['metaedit']              = 'Redigera metadata';
 $lang['metasaveerr']           = 'Skrivning av metadata misslyckades';
 $lang['metasaveok']            = 'Metadata sparad';
-$lang['img_backto']            = 'Tillbaka till';
-$lang['img_title']             = 'Rubrik';
-$lang['img_caption']           = 'Bildtext';
-$lang['img_date']              = 'Datum';
-$lang['img_fname']             = 'Filnamn';
-$lang['img_fsize']             = 'Storlek';
-$lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Format';
-$lang['img_camera']            = 'Kamera';
-$lang['img_keywords']          = 'Nyckelord';
-$lang['img_width']             = 'Bredd';
-$lang['img_height']            = 'Höjd';
-$lang['img_manager']           = 'Se mediahanteraren';
+$lang['img_title']             = 'Rubrik:';
+$lang['img_caption']           = 'Bildtext:';
+$lang['img_date']              = 'Datum:';
+$lang['img_fname']             = 'Filnamn:';
+$lang['img_fsize']             = 'Storlek:';
+$lang['img_artist']            = 'Fotograf:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Format:';
+$lang['img_camera']            = 'Kamera:';
+$lang['img_keywords']          = 'Nyckelord:';
+$lang['img_width']             = 'Bredd:';
+$lang['img_height']            = 'Höjd:';
 $lang['subscr_subscribe_success'] = 'La till %s till prenumerationslista %s';
 $lang['subscr_subscribe_noaddress'] = 'Det finns ingen adress associerad med din inloggning, du kan inte bli tillagd i prenumerationslistan';
 $lang['subscr_unsubscribe_success'] = '%s borttagen från prenumerationslistan för %s';
diff --git a/inc/lang/ta/denied.txt b/inc/lang/ta/denied.txt
new file mode 100644
index 000000000..9dcf1c9ed
--- /dev/null
+++ b/inc/lang/ta/denied.txt
@@ -0,0 +1 @@
+மன்னிக்கவும் ! உங்களுக்கு தொடர அனுமதி இல்லை
\ No newline at end of file
diff --git a/inc/lang/th/denied.txt b/inc/lang/th/denied.txt
index 88b012a67..4cc29d626 100644
--- a/inc/lang/th/denied.txt
+++ b/inc/lang/th/denied.txt
@@ -1,3 +1,4 @@
 ====== ปฏิเสธสิทธิ์ ======
 
-ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ บางทีคุณอาจจะลืมล็อกอิน?
\ No newline at end of file
+ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ
+
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index 5d364166b..0e9f1d3bb 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -1,17 +1,13 @@
 <?php
+
 /**
- * th 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/MessagesTh.php?view=co
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Komgrit Niyomrath <n.komgrit@gmail.com>
  * @author Arthit Suriyawongkul <arthit@gmail.com>
  * @author Kittithat Arnontavilas <mrtomyum@gmail.com>
  * @author Thanasak Sompaisansin <jombthep@gmail.com>
+ * @author Yuthana Tantirungrotechai <yt203y@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -47,12 +43,17 @@ $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_media']             = 'ส่วนจัดการสื่อและไฟล์';
+$lang['btn_deleteuser']        = 'ลบบัญชีผู้ใช้งานของฉัน';
+$lang['btn_img_backto']        = 'กลับไปยัง %s';
+$lang['btn_mediaManager']      = 'ดูในส่วนจัดการสื่อและไฟล์';
+$lang['loggedinas']            = 'ลงชื่อเข้าใช้เป็น:';
 $lang['user']                  = 'ชื่อผู้ใช้:';
 $lang['pass']                  = 'รหัสผ่าน';
 $lang['newpass']               = 'รหัสผ่านใหม่';
@@ -63,6 +64,7 @@ $lang['fullname']              = 'ชื่อจริง:';
 $lang['email']                 = 'อีเมล:';
 $lang['profile']               = 'ข้อมูลส่วนตัวผู้ใช้';
 $lang['badlogin']              = 'ขัดข้อง:';
+$lang['badpassconfirm']        = 'พาสเวิร์ดไม่ถูกต้อง';
 $lang['minoredit']             = 'เป็นการแก้ไขเล็กน้อย';
 $lang['draftdate']             = 'บันทึกฉบับร่างเมื่อ';
 $lang['nosecedit']             = 'ในช่วงเวลาที่ผ่านมานี้เพจถูกแก้ไขไปแล้ว, เนื้อหาในเซคชั่นนี้ไม่ทันสมัย กรุณาโหลดเพจใหม่ทั้งหน้าแทน';
@@ -79,6 +81,10 @@ $lang['profna']                = 'วิกินี้ไม่รองรั�
 $lang['profnochange']          = 'ไม่มีการเปลี่ยนแปลงข้อมูลส่วนตัว';
 $lang['profnoempty']           = 'ไม่อนุญาติให้เว้นว่างชื่อ หรืออีเมล';
 $lang['profchanged']           = 'ปรับปรุงข้อมูลส่วนตัวผู้ใช้สำเร็จ';
+$lang['profnodelete']          = 'วิกินี้ไม่รองรับการลบบัญชีผู้ใช้งาน';
+$lang['profdeleteuser']        = 'ลบบัญชีผู้ใช้งาน';
+$lang['profdeleted']           = 'บัญชีผู้ใช้งานของคุณได้ถูกลบออกจากวิกิแล้ว';
+$lang['profconfdelete']        = 'ฉันอยากลบบัญชีผู้ใช้งานของฉันจากวิกินี้ <br/> การดำเนินการนี้ไม่สามารถแก้ไขคืนได้ ';
 $lang['pwdforget']             = 'ลืมรหัสผ่านหรือ? เอาอันใหม่สิ';
 $lang['resendna']              = 'วิกินี้ไม่รองรับการส่งรหัสผ่านซ้ำ';
 $lang['resendpwdmissing']      = 'ขออภัย, คุณต้องกรอกทุกช่อง';
@@ -90,13 +96,20 @@ $lang['license']               = 'เว้นแต่จะได้แจ้�
 $lang['licenseok']             = 'โปรดทราบ: เมื่อเริ่มแก้ไขหน้านี้ ถือว่าคุณตกลงให้สิทธิ์กับเนื้อหาของคุณอยู่ภายใต้สัญญาอนุญาตินี้';
 $lang['searchmedia']           = 'สืบค้นไฟล์ชื่อ:';
 $lang['searchmedia_in']        = 'สืบค้นใน %s';
-$lang['txt_upload']            = 'เลือกไฟล์ที่จะอัพโหลด';
-$lang['txt_filename']          = 'อัพโหลดเป็น(ตัวเลือก)';
+$lang['txt_upload']            = 'เลือกไฟล์ที่จะอัพโหลด:';
+$lang['txt_filename']          = 'อัพโหลดเป็น(ตัวเลือก):';
 $lang['txt_overwrt']           = 'เขียนทับไฟล์ที่มีอยู่แล้ว';
-$lang['lockedby']              = 'ตอนนี้ถูกล๊อคโดย';
-$lang['lockexpire']            = 'การล๊อคจะหมดอายุเมื่อ';
-$lang['js']['willexpire']            = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
+$lang['lockedby']              = 'ตอนนี้ถูกล๊อคโดย:';
+$lang['lockexpire']            = 'การล๊อคจะหมดอายุเมื่อ:';
+$lang['js']['willexpire']      = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
 $lang['js']['notsavedyet']     = 'การแก้ไขที่ไม่ได้บันทึกจะสูญหาย \n ต้องการทำต่อจริงๆหรือ?';
+$lang['js']['searchmedia']     = 'ค้นหาไฟล์';
+$lang['js']['keepopen']        = 'เปิดหน้าต่างไว้ระหว่างที่เลือก';
+$lang['js']['hidedetails']     = 'ซ่อนรายละเอียด';
+$lang['js']['nosmblinks']      = 'เชื่อมไปยังหน้าต่างแบ่งปัน ทำงานได้กับเฉพาะไมโครซอฟท์อินเตอร์เน็ตเอ็กซโปรเรอร์(IE) คุณยังคงสามารถคัดลอกและแปะลิ้งค์ได้';
+$lang['js']['linkwiz']         = 'ลิงค์วิเศษ';
+$lang['js']['linkto']          = 'ลิงค์ไป:';
+$lang['js']['del_confirm']     = 'ต้องการลบรายการที่เลือกจริงๆหรือ?';
 $lang['rssfailed']             = 'มีข้อผิดพลาดขณะดูดฟีดนี้';
 $lang['nothingfound']          = 'ไม่พบสิ่งใด';
 $lang['mediaselect']           = 'ไฟล์สื่อ';
@@ -114,13 +127,6 @@ $lang['deletefail']            = '"%s" ไม่สามารถลบได�
 $lang['mediainuse']            = 'ไฟล์ "%s" ไม่ได้ถูกลบ - มันถูกใช้อยู่';
 $lang['namespaces']            = 'เนมสเปซ';
 $lang['mediafiles']            = 'มีไฟล์พร้อมใช้อยู่ใน';
-$lang['js']['searchmedia']     = 'ค้นหาไฟล์';
-$lang['js']['keepopen']        = 'เปิดหน้าต่างไว้ระหว่างที่เลือก';
-$lang['js']['hidedetails']     = 'ซ่อนรายละเอียด';
-$lang['js']['nosmblinks']      = 'เชื่อมไปยังหน้าต่างแบ่งปัน ทำงานได้กับเฉพาะไมโครซอฟท์อินเตอร์เน็ตเอ็กซโปรเรอร์(IE) คุณยังคงสามารถคัดลอกและแปะลิ้งค์ได้';
-$lang['js']['linkwiz']         = 'ลิงค์วิเศษ';
-$lang['js']['linkto']          = 'ลิงค์ไป:';
-$lang['js']['del_confirm']     = 'ต้องการลบรายการที่เลือกจริงๆหรือ?';
 $lang['mediausage']            = 'ให้ใช้ไวยกรณ์ต่อไปนี้เพื่ออ้างอิงไฟล์นี้';
 $lang['mediaview']             = 'ดูไฟล์ต้นฉบับ';
 $lang['mediaroot']             = 'ราก(รูท)';
@@ -137,9 +143,9 @@ $lang['yours']                 = 'ฉบับของคุณ';
 $lang['diff']                  = 'แสดงจุดแตกต่างกับฉบับปัจจุบัน';
 $lang['diff2']                 = 'แสดงจุดแตกต่างระหว่างฉบับที่เลือกไว้';
 $lang['line']                  = 'บรรทัด';
-$lang['breadcrumb']            = 'ตามรอย';
-$lang['youarehere']            = 'คุณอยู่ที่นี่';
-$lang['lastmod']               = 'แก้ไขครั้งล่าสุด';
+$lang['breadcrumb']            = 'ตามรอย:';
+$lang['youarehere']            = 'คุณอยู่ที่นี่:';
+$lang['lastmod']               = 'แก้ไขครั้งล่าสุด:';
 $lang['by']                    = 'โดย';
 $lang['deleted']               = 'ถูกถอดออก';
 $lang['created']               = 'ถูกสร้าง';
@@ -181,17 +187,16 @@ $lang['admin_register']        = 'สร้างบัญชีผู้ใช�
 $lang['metaedit']              = 'แก้ไขข้อมูลเมต้า';
 $lang['metasaveerr']           = 'มีข้อผิดพลาดในการเขียนข้อมูลเมต้า';
 $lang['metasaveok']            = 'บันทึกเมต้าดาต้าแล้ว';
-$lang['img_backto']            = 'กลับไปยัง';
-$lang['img_title']             = 'ชื่อภาพ';
-$lang['img_caption']           = 'คำบรรยายภาพ';
-$lang['img_date']              = 'วันที่';
-$lang['img_fname']             = 'ชื่อไฟล์';
-$lang['img_fsize']             = 'ขนาดภาพ';
-$lang['img_artist']            = 'ผู้สร้างสรรค์';
-$lang['img_copyr']             = 'ผู้ถือลิขสิทธิ์';
-$lang['img_format']            = 'รูปแบบ';
-$lang['img_camera']            = 'กล้อง';
-$lang['img_keywords']          = 'คำหลัก';
+$lang['img_title']             = 'ชื่อภาพ:';
+$lang['img_caption']           = 'คำบรรยายภาพ:';
+$lang['img_date']              = 'วันที่:';
+$lang['img_fname']             = 'ชื่อไฟล์:';
+$lang['img_fsize']             = 'ขนาดภาพ:';
+$lang['img_artist']            = 'ผู้สร้างสรรค์:';
+$lang['img_copyr']             = 'ผู้ถือลิขสิทธิ์:';
+$lang['img_format']            = 'รูปแบบ:';
+$lang['img_camera']            = 'กล้อง:';
+$lang['img_keywords']          = 'คำหลัก:';
 $lang['authtempfail']          = 'ระบบตรวจสอบสิทธิ์ผู้ใช้ไม่พร้อมใช้งานชั่วคราว หากสถานการณ์ยังไม่เปลี่ยนแปลง กรุณาแจ้งผู้ดูแลระบวิกิของคุณ';
 $lang['i_chooselang']          = 'เลือกภาษาของคุณ';
 $lang['i_installer']           = 'ตัวติดตั้งโดกุวิกิ';
diff --git a/inc/lang/tr/denied.txt b/inc/lang/tr/denied.txt
index 04e9b8bfb..2acfd7a8f 100644
--- a/inc/lang/tr/denied.txt
+++ b/inc/lang/tr/denied.txt
@@ -1,4 +1,4 @@
 ====== Yetki Reddedildi ======
 
-Üzgünüz, devam etmek için yetkiniz yok. Giriş yapmayı unutmuş olabilir misiniz?
+Üzgünüz, devam etmek için yetkiniz yok.
 
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 210a82530..90a7ea7ba 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -11,6 +11,8 @@
  * @author farukerdemoncel@gmail.com
  * @author Mustafa Aslan <maslan@hotmail.com>
  * @author huseyin can <huseyincan73@gmail.com>
+ * @author ilker rifat kapaç <irifat@gmail.com>
+ * @author İlker R. Kapaç <irifat@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -55,7 +57,9 @@ $lang['btn_register']          = 'Kayıt ol';
 $lang['btn_apply']             = 'Uygula';
 $lang['btn_media']             = 'Çokluortam Yöneticisi';
 $lang['btn_deleteuser']        = 'Hesabımı Sil';
-$lang['loggedinas']            = 'Giriş ismi';
+$lang['btn_img_backto']        = 'Şuna dön: %s';
+$lang['btn_mediaManager']      = 'Ortam oynatıcısında göster';
+$lang['loggedinas']            = 'Giriş ismi:';
 $lang['user']                  = 'Kullanıcı ismi';
 $lang['pass']                  = 'Parola';
 $lang['newpass']               = 'Yeni Parola';
@@ -100,8 +104,8 @@ $lang['license']               = 'Aksi belirtilmediği halde, bu wikinin içeri�
 $lang['licenseok']             = 'Not: Bu sayfayı değiştirerek yazınızın şu lisans ile yayınlanmasını kabul etmiş olacaksınız:';
 $lang['searchmedia']           = 'Dosya Adı Ara:';
 $lang['searchmedia_in']        = '%s içinde ara';
-$lang['txt_upload']            = 'Yüklenecek dosyayı seç';
-$lang['txt_filename']          = 'Dosya adı (zorunlu değil)';
+$lang['txt_upload']            = 'Yüklenecek dosyayı seç:';
+$lang['txt_filename']          = 'Dosya adı (zorunlu değil):';
 $lang['txt_overwrt']           = 'Mevcut dosyanın üstüne yaz';
 $lang['maxuploadsize']         = 'Yükleme dosya başına en fazla %s';
 $lang['lockedby']              = 'Şu an şunun tarafından kilitli:';
@@ -181,10 +185,16 @@ $lang['diff']                  = 'Kullanılan sürüm ile farkları göster';
 $lang['diff2']                 = 'Seçili sürümler arasındaki farkı göster';
 $lang['difflink']              = 'Karşılaştırma görünümüne bağlantı';
 $lang['diff_type']             = 'farklı görünüş';
+$lang['diff_side']             = 'Yan yana';
+$lang['diffprevrev']           = 'Önceki sürüm';
+$lang['diffnextrev']           = 'Sonraki sürüm';
+$lang['difflastrev']           = 'Son sürüm';
+$lang['diffbothprevrev']       = 'İki taraf da önceki sürüm';
+$lang['diffbothnextrev']       = 'İki taraf da sonraki sürüm';
 $lang['line']                  = 'Satır';
-$lang['breadcrumb']            = 'İz';
-$lang['youarehere']            = 'Buradasınız';
-$lang['lastmod']               = 'Son değiştirilme';
+$lang['breadcrumb']            = 'İz:';
+$lang['youarehere']            = 'Buradasınız:';
+$lang['lastmod']               = 'Son değiştirilme:';
 $lang['by']                    = 'Değiştiren:';
 $lang['deleted']               = 'silindi';
 $lang['created']               = 'oluşturuldu';
@@ -201,6 +211,7 @@ $lang['skip_to_content']       = 'Bağlanmak için kaydır';
 $lang['sidebar']               = 'kaydırma çubuğu';
 $lang['mail_newpage']          = 'sayfa eklenme:';
 $lang['mail_changed']          = 'sayfa değiştirilme:';
+$lang['mail_subscribe_list']   = 'isimalanındaki değişmiş sayfalar: ';
 $lang['mail_new_user']         = 'yeni kullanıcı';
 $lang['mail_upload']           = 'dosya yüklendi:';
 $lang['changes_type']          = 'görünüşü değiştir';
@@ -220,6 +231,8 @@ $lang['qb_h5']                 = '5. Seviye Başlık';
 $lang['qb_h']                  = 'Başlık';
 $lang['qb_hs']                 = 'Başlığı seç';
 $lang['qb_hplus']              = 'Daha yüksek başlık';
+$lang['qb_hminus']             = 'Daha Düşük Başlık';
+$lang['qb_hequal']             = 'Aynı Seviye Başlık';
 $lang['qb_link']               = 'İç Bağlantı';
 $lang['qb_extlink']            = 'Dış Bağlantı';
 $lang['qb_hr']                 = 'Yatay Çizgi';
@@ -229,29 +242,29 @@ $lang['qb_media']              = 'Resim ve başka dosyalar ekle';
 $lang['qb_sig']                = 'İmza Ekle';
 $lang['qb_smileys']            = 'Gülen Yüzler';
 $lang['qb_chars']              = 'Özel Karakterler';
+$lang['upperns']               = 'ebeveyn isimalanına atla';
 $lang['admin_register']        = 'Yeni kullanıcı ekle...';
 $lang['metaedit']              = 'Metaverileri Değiştir';
 $lang['metasaveerr']           = 'Metaveri yazma başarısız ';
 $lang['metasaveok']            = 'Metaveri kaydedildi';
-$lang['img_backto']            = 'Şuna dön:';
-$lang['img_title']             = 'Başlık';
-$lang['img_caption']           = 'Serlevha';
-$lang['img_date']              = 'Tarih';
-$lang['img_fname']             = 'Dosya Adı';
-$lang['img_fsize']             = 'Boyut';
-$lang['img_artist']            = 'Fotoğrafçı';
-$lang['img_copyr']             = 'Telif Hakkı';
-$lang['img_format']            = 'Biçim';
-$lang['img_camera']            = 'Fotoğraf Makinası';
-$lang['img_keywords']          = 'Anahtar Sözcükler';
-$lang['img_width']             = 'Genişlik';
-$lang['img_height']            = 'Yükseklik';
-$lang['img_manager']           = 'Ortam oynatıcısında göster';
+$lang['img_title']             = 'Başlık:';
+$lang['img_caption']           = 'Serlevha:';
+$lang['img_date']              = 'Tarih:';
+$lang['img_fname']             = 'Dosya Adı:';
+$lang['img_fsize']             = 'Boyut:';
+$lang['img_artist']            = 'Fotoğrafçı:';
+$lang['img_copyr']             = 'Telif Hakkı:';
+$lang['img_format']            = 'Biçim:';
+$lang['img_camera']            = 'Fotoğraf Makinası:';
+$lang['img_keywords']          = 'Anahtar Sözcükler:';
+$lang['img_width']             = 'Genişlik:';
+$lang['img_height']            = 'Yükseklik:';
 $lang['subscr_m_new_header']   = 'Üyelik ekle';
 $lang['subscr_m_current_header'] = 'Üyeliğini onayla';
 $lang['subscr_m_unsubscribe']  = 'Üyelik iptali';
 $lang['subscr_m_subscribe']    = 'Kayıt ol';
 $lang['subscr_m_receive']      = 'Al';
+$lang['subscr_style_every']    = 'her değişiklikte e-posta gönder';
 $lang['authtempfail']          = 'Kullanıcı doğrulama geçici olarak yapılamıyor. Eğer bu durum devam ederse lütfen Wiki yöneticine haber veriniz.';
 $lang['authpwdexpire']         = 'Şifreniz %d gün sonra geçersiz hale gelecek, yakın bir zamanda değiştirmelisiniz.';
 $lang['i_chooselang']          = 'Dili seçiniz';
@@ -274,8 +287,12 @@ $lang['i_policy']              = 'İlk ACL ayarı';
 $lang['i_pol0']                = 'Tamamen Açık Wiki (herkes okuyabilir, yazabilir ve dosya yükleyebilir)';
 $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_allowreg']            = 'Kullanıcıların kendi kendilerine üye olmalarına için ver';
 $lang['i_retry']               = 'Tekrar Dene';
 $lang['i_license']             = 'Lütfen içeriği hangi lisans altında yayınlamak istediğniizi belirtin:';
+$lang['i_license_none']        = 'Hiç bir lisans bilgisi gösterme';
+$lang['i_pop_field']           = 'Lütfen DokuWiki deneyimini geliştirmemizde, bize yardım edin:';
+$lang['i_pop_label']           = 'DokuWiki geliştiricilerine ayda bir, anonim kullanım bilgisini gönder';
 $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. ';
 $lang['years']                 = '%d yıl önce';
 $lang['months']                = '%d ay önce';
@@ -295,12 +312,19 @@ $lang['media_list_thumbs']     = 'Küçük resimler';
 $lang['media_list_rows']       = 'Satırlar';
 $lang['media_sort_name']       = 'İsim';
 $lang['media_sort_date']       = 'Tarih';
+$lang['media_namespaces']      = 'İsimalanı seçin';
 $lang['media_files']           = '%s deki dosyalar';
 $lang['media_upload']          = '%s dizinine yükle';
 $lang['media_search']          = '%s dizininde ara';
 $lang['media_view']            = '%s';
 $lang['media_edit']            = 'Düzenle %s';
 $lang['media_history']         = 'Geçmiş %s';
+$lang['media_meta_edited']     = 'üstveri düzenlendi';
+$lang['media_perm_read']       = 'Özür dileriz, dosyaları okumak için yeterli haklara sahip değilsiniz.';
 $lang['media_perm_upload']     = 'Üzgünüm, karşıya dosya yükleme yetkiniz yok.';
 $lang['media_update']          = 'Yeni versiyonu yükleyin';
 $lang['media_restore']         = 'Bu sürümü eski haline getir';
+$lang['currentns']             = 'Geçerli isimalanı';
+$lang['searchresult']          = 'Arama Sonucu';
+$lang['plainhtml']             = 'Yalın HTML';
+$lang['wikimarkup']            = 'Wiki Biçimlendirmesi';
diff --git a/inc/lang/tr/subscr_form.txt b/inc/lang/tr/subscr_form.txt
new file mode 100644
index 000000000..21a8fbaeb
--- /dev/null
+++ b/inc/lang/tr/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abonelik Yönetimi ======
+
+Bu sayfa, geçerli isimalanı ve sayfa için aboneliklerinizi düzenlemenize olanak sağlar.
\ No newline at end of file
diff --git a/inc/lang/uk/denied.txt b/inc/lang/uk/denied.txt
index 5db12e1bc..635d31c38 100644
--- a/inc/lang/uk/denied.txt
+++ b/inc/lang/uk/denied.txt
@@ -1,4 +1,4 @@
 ====== Доступ заборонено ======
 
-Вибачте, але у вас не вистачає прав для продовження. Можливо ви забули увійти в систему?
+Вибачте, але у вас не вистачає прав для продовження.
 
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index 4e91e82a2..56f064c9f 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -53,7 +53,7 @@ $lang['btn_revert']            = 'Відновити';
 $lang['btn_register']          = 'Реєстрація';
 $lang['btn_apply']             = 'Застосувати';
 $lang['btn_deleteuser']        = 'Видалити мій аккаунт';
-$lang['loggedinas']            = 'Ви';
+$lang['loggedinas']            = 'Ви:';
 $lang['user']                  = 'Користувач';
 $lang['pass']                  = 'Пароль';
 $lang['newpass']               = 'Новий пароль';
@@ -94,11 +94,11 @@ $lang['license']               = 'Якщо не вказано інше, вмі�
 $lang['licenseok']             = 'Примітка. Редагуючи ці сторінку, ви погоджуєтесь на розповсюдження інформації за такою ліцензією:';
 $lang['searchmedia']           = 'Пошук файлу:';
 $lang['searchmedia_in']        = 'Шукати у %s';
-$lang['txt_upload']            = 'Виберіть файл для завантаження';
-$lang['txt_filename']          = 'Завантажити як (не обов\'язкове)';
+$lang['txt_upload']            = 'Виберіть файл для завантаження:';
+$lang['txt_filename']          = 'Завантажити як (не обов\'язкове):';
 $lang['txt_overwrt']           = 'Перезаписати існуючий файл';
-$lang['lockedby']              = 'Заблоковано';
-$lang['lockexpire']            = 'Блокування завершується в';
+$lang['lockedby']              = 'Заблоковано:';
+$lang['lockexpire']            = 'Блокування завершується в:';
 $lang['js']['willexpire']      = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
 $lang['js']['notsavedyet']     = 'Незбережені зміни будуть втрачені.
  Дійсно продовжити?';
@@ -172,9 +172,9 @@ $lang['diff_type']             = 'Переглянути відмінності:
 $lang['diff_inline']           = 'Вбудувати';
 $lang['diff_side']             = 'Поряд';
 $lang['line']                  = 'Рядок';
-$lang['breadcrumb']            = 'Відвідано';
-$lang['youarehere']            = 'Ви тут';
-$lang['lastmod']               = 'В останнє змінено';
+$lang['breadcrumb']            = 'Відвідано:';
+$lang['youarehere']            = 'Ви тут:';
+$lang['lastmod']               = 'В останнє змінено:';
 $lang['by']                    = ' ';
 $lang['deleted']               = 'знищено';
 $lang['created']               = 'створено';
@@ -223,17 +223,17 @@ $lang['admin_register']        = 'Додати нового користувач
 $lang['metaedit']              = 'Редагувати метадані';
 $lang['metasaveerr']           = 'Помилка запису метаданих';
 $lang['metasaveok']            = 'Метадані збережено';
-$lang['img_backto']            = 'Повернутися до';
-$lang['img_title']             = 'Назва';
-$lang['img_caption']           = 'Підпис';
-$lang['img_date']              = 'Дата';
-$lang['img_fname']             = 'Ім’я файлу';
-$lang['img_fsize']             = 'Розмір';
-$lang['img_artist']            = 'Фотограф';
-$lang['img_copyr']             = 'Авторські права';
-$lang['img_format']            = 'Формат';
-$lang['img_camera']            = 'Камера';
-$lang['img_keywords']          = 'Ключові слова';
+$lang['btn_img_backto']            = 'Повернутися до %s';
+$lang['img_title']             = 'Назва:';
+$lang['img_caption']           = 'Підпис:';
+$lang['img_date']              = 'Дата:';
+$lang['img_fname']             = 'Ім’я файлу:';
+$lang['img_fsize']             = 'Розмір:';
+$lang['img_artist']            = 'Фотограф:';
+$lang['img_copyr']             = 'Авторські права:';
+$lang['img_format']            = 'Формат:';
+$lang['img_camera']            = 'Камера:';
+$lang['img_keywords']          = 'Ключові слова:';
 $lang['subscr_subscribe_success'] = 'Додано %s до списку підписки для %s';
 $lang['subscr_subscribe_error'] = 'Помилка при додавані %s до списку підписки для %s';
 $lang['subscr_subscribe_noaddress'] = 'Немає адреси, асоційованої з Вашим логіном, тому Ви не можете бути додані до списку підписки.';
diff --git a/inc/lang/vi/denied.txt b/inc/lang/vi/denied.txt
index 35acaeb62..fe6e759fc 100644
--- a/inc/lang/vi/denied.txt
+++ b/inc/lang/vi/denied.txt
@@ -1,3 +1,4 @@
 ====== Không được phép vào ======
 
-Rất tiếc là bạn không được phép để tiếp tục. Bạn quên đăng nhập hay sao?
+Rất tiếc là bạn không được phép để tiếp tục.
+
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index d8e40f875..b2349d0b0 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -45,7 +45,7 @@ $lang['btn_revert']            = 'Phục hồi';
 $lang['btn_register']          = 'Đăng ký';
 $lang['btn_apply']             = 'Chấp nhận';
 $lang['btn_media']             = 'Quản lý tệp tin';
-$lang['loggedinas']            = 'Username đang dùng';
+$lang['loggedinas']            = 'Username đang dùng:';
 $lang['user']                  = 'Username';
 $lang['pass']                  = 'Mật khẩu';
 $lang['newpass']               = 'Mật khẩu mới';
@@ -84,11 +84,11 @@ $lang['license']               = 'Trừ khi có ghi chú khác, nội dung trên
 $lang['licenseok']             = 'Lưu ý: Bằng cách chỉnh sửa trang này, bạn đồng ý cấp giấy phép nội dung của bạn theo giấy phép sau:';
 $lang['searchmedia']           = 'Tìm tên file:';
 $lang['searchmedia_in']        = 'Tìm ở %s';
-$lang['txt_upload']            = 'Chọn tệp để tải lên';
-$lang['txt_filename']          = 'Điền wikiname (tuỳ ý)';
+$lang['txt_upload']            = 'Chọn tệp để tải lên:';
+$lang['txt_filename']          = 'Điền wikiname (tuỳ ý):';
 $lang['txt_overwrt']           = 'Ghi đè file trùng';
-$lang['lockedby']              = 'Đang khoá bởi';
-$lang['lockexpire']            = 'Sẽ được mở khóa vào lúc';
+$lang['lockedby']              = 'Đang khoá bởi:';
+$lang['lockexpire']            = 'Sẽ được mở khóa vào lúc:';
 $lang['js']['willexpire']      = 'Trong một phút nữa bài viết sẽ được mở khóa để cho phép người khác chỉnh sửa.\nĐể tránh xung đột, bạn nên bấm nút Duyệt trước để lập lại thời gian khoá bài';
 $lang['js']['notsavedyet']     = 'Hiện có những thay đổi chưa được bảo lưu, và sẽ mất.\nBạn thật sự muốn tiếp tục?';
 $lang['js']['searchmedia']     = 'Tìm kiếm tập tin';
@@ -156,9 +156,9 @@ $lang['diff_type']             = 'Xem sự khác biệt:';
 $lang['diff_inline']           = 'Nội tuyến';
 $lang['diff_side']             = 'Xếp cạnh nhau';
 $lang['line']                  = 'Dòng';
-$lang['breadcrumb']            = 'Trang đã xem';
-$lang['youarehere']            = 'Bạn đang ở đây';
-$lang['lastmod']               = 'Thời điểm thay đổi';
+$lang['breadcrumb']            = 'Trang đã xem:';
+$lang['youarehere']            = 'Bạn đang ở đây:';
+$lang['lastmod']               = 'Thời điểm thay đổi:';
 $lang['by']                    = 'do';
 $lang['deleted']               = 'bị xoá';
 $lang['created']               = 'được tạo ra';
@@ -192,20 +192,20 @@ $lang['qb_sig']                = 'Đặt chữ ký';
 $lang['metaedit']              = 'Sửa Metadata';
 $lang['metasaveerr']           = 'Thất bại khi viết metadata';
 $lang['metasaveok']            = 'Metadata đã được lưu';
-$lang['img_backto']            = 'Quay lại';
-$lang['img_title']             = 'Tiêu đề';
-$lang['img_caption']           = 'Ghi chú';
-$lang['img_date']              = 'Ngày';
-$lang['img_fname']             = 'Tên file';
-$lang['img_fsize']             = 'Kích cỡ';
-$lang['img_artist']            = 'Người chụp';
-$lang['img_copyr']             = 'Bản quyền';
-$lang['img_format']            = 'Định dạng';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Từ khóa';
-$lang['img_width']             = 'Rộng';
-$lang['img_height']            = 'Cao';
-$lang['img_manager']           = 'Xem trong trình quản lý tệp media';
+$lang['btn_img_backto']            = 'Quay lại %s';
+$lang['img_title']             = 'Tiêu đề:';
+$lang['img_caption']           = 'Ghi chú:';
+$lang['img_date']              = 'Ngày:';
+$lang['img_fname']             = 'Tên file:';
+$lang['img_fsize']             = 'Kích cỡ:';
+$lang['img_artist']            = 'Người chụp:';
+$lang['img_copyr']             = 'Bản quyền:';
+$lang['img_format']            = 'Định dạng:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Từ khóa:';
+$lang['img_width']             = 'Rộng:';
+$lang['img_height']            = 'Cao:';
+$lang['btn_mediaManager']           = 'Xem trong trình quản lý tệp media';
 $lang['i_chooselang']          = 'Chọn ngôn ngữ';
 $lang['i_retry']               = 'Thử lại';
 $lang['years']                 = 'cách đây %d năm';
diff --git a/inc/lang/zh-tw/denied.txt b/inc/lang/zh-tw/denied.txt
index 5a4d483a5..23f306d07 100644
--- a/inc/lang/zh-tw/denied.txt
+++ b/inc/lang/zh-tw/denied.txt
@@ -1,4 +1,4 @@
 ====== 權限拒絕 ======
 
-抱歉，您沒有足夠權限繼續執行。或許您忘了登入？
+抱歉，您沒有足夠權限繼續執行。
 
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 456377810..03d5d54a1 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -57,7 +57,7 @@ $lang['btn_register']          = '註冊';
 $lang['btn_apply']             = '套用';
 $lang['btn_media']             = '多媒體管理器';
 $lang['btn_deleteuser']        = '移除我的帳號';
-$lang['loggedinas']            = '登入成';
+$lang['loggedinas']            = '登入成:';
 $lang['user']                  = '帳號';
 $lang['pass']                  = '密碼';
 $lang['newpass']               = '新密碼';
@@ -102,12 +102,12 @@ $lang['license']               = '若無特別註明，本 wiki 上的內容都�
 $lang['licenseok']             = '注意：編輯此頁面表示您同意用以下授權方式發布您撰寫的內容：';
 $lang['searchmedia']           = '搜尋檔名：';
 $lang['searchmedia_in']        = '在 %s 裏搜尋';
-$lang['txt_upload']            = '請選擇要上傳的檔案';
-$lang['txt_filename']          = '請輸入要上傳至本 wiki 的檔案名稱 (非必要)';
+$lang['txt_upload']            = '請選擇要上傳的檔案:';
+$lang['txt_filename']          = '請輸入要上傳至本 wiki 的檔案名稱 (非必要):';
 $lang['txt_overwrt']           = '是否要覆蓋原有檔案';
 $lang['maxuploadsize']         = '每個上傳檔案不可大於 %s 。';
-$lang['lockedby']              = '目前已被下列人員鎖定';
-$lang['lockexpire']            = '預計解除鎖定於';
+$lang['lockedby']              = '目前已被下列人員鎖定:';
+$lang['lockexpire']            = '預計解除鎖定於:';
 $lang['js']['willexpire']      = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
 $lang['js']['notsavedyet']     = '未儲存的變更將會遺失，繼續嗎？';
 $lang['js']['searchmedia']     = '搜尋檔案';
@@ -188,9 +188,9 @@ $lang['diff_type']             = '檢視差異：';
 $lang['diff_inline']           = '行內';
 $lang['diff_side']             = '並排';
 $lang['line']                  = '行';
-$lang['breadcrumb']            = '足跡';
-$lang['youarehere']            = '您在這裏';
-$lang['lastmod']               = '上一次變更';
+$lang['breadcrumb']            = '足跡:';
+$lang['youarehere']            = '您在這裏:';
+$lang['lastmod']               = '上一次變更:';
 $lang['by']                    = '由';
 $lang['deleted']               = '移除';
 $lang['created']               = '建立';
@@ -243,20 +243,20 @@ $lang['admin_register']        = '新增使用者';
 $lang['metaedit']              = '編輯後設資料';
 $lang['metasaveerr']           = '後設資料無法寫入';
 $lang['metasaveok']            = '後設資料已儲存';
-$lang['img_backto']            = '回上一頁';
-$lang['img_title']             = '標題';
-$lang['img_caption']           = '照片說明';
-$lang['img_date']              = '日期';
-$lang['img_fname']             = '檔名';
-$lang['img_fsize']             = '大小';
-$lang['img_artist']            = '攝影者';
-$lang['img_copyr']             = '版權';
-$lang['img_format']            = '格式';
-$lang['img_camera']            = '相機';
-$lang['img_keywords']          = '關鍵字';
-$lang['img_width']             = '寬度';
-$lang['img_height']            = '高度';
-$lang['img_manager']           = '在多媒體管理器中檢視';
+$lang['btn_img_backto']            = '回上一頁 %s';
+$lang['img_title']             = '標題:';
+$lang['img_caption']           = '照片說明:';
+$lang['img_date']              = '日期:';
+$lang['img_fname']             = '檔名:';
+$lang['img_fsize']             = '大小:';
+$lang['img_artist']            = '攝影者:';
+$lang['img_copyr']             = '版權:';
+$lang['img_format']            = '格式:';
+$lang['img_camera']            = '相機:';
+$lang['img_keywords']          = '關鍵字:';
+$lang['img_width']             = '寬度:';
+$lang['img_height']            = '高度:';
+$lang['btn_mediaManager']           = '在多媒體管理器中檢視';
 $lang['subscr_subscribe_success'] = '已將 %s 加入至 %s 的訂閱列表';
 $lang['subscr_subscribe_error'] = '將 %s 加入至 %s 的訂閱列表時發生錯誤';
 $lang['subscr_subscribe_noaddress'] = '沒有與您登入相關的地址，無法將您加入訂閱列表';
diff --git a/inc/lang/zh/denied.txt b/inc/lang/zh/denied.txt
index 276741c40..94721e48a 100644
--- a/inc/lang/zh/denied.txt
+++ b/inc/lang/zh/denied.txt
@@ -1,3 +1,4 @@
 ====== 拒绝授权 ======
 
-对不起，您没有足够权限，无法继续。也许您忘了登录？
\ No newline at end of file
+对不起，您没有足够权限，无法继续。
+
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 004997d6e..c8a76b66b 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -20,6 +20,9 @@
  * @author Yangyu Huang <yangyu.huang@gmail.com>
  * @author anjianshi <anjianshi@gmail.com>
  * @author oott123 <ip.192.168.1.1@qq.com>
+ * @author Cupen <Cupenoruler@foxmail.com>
+ * @author xiqingongzi <Xiqingongzi@Gmail.com>
+ * @author qinghao <qingxianhao@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -64,7 +67,9 @@ $lang['btn_register']          = '注册';
 $lang['btn_apply']             = '应用';
 $lang['btn_media']             = '媒体管理器';
 $lang['btn_deleteuser']        = '移除我的账户';
-$lang['loggedinas']            = '登录为';
+$lang['btn_img_backto']        = '返回到 %s';
+$lang['btn_mediaManager']      = '在媒体管理器中查看';
+$lang['loggedinas']            = '登录为:';
 $lang['user']                  = '用户名';
 $lang['pass']                  = '密码';
 $lang['newpass']               = '请输入新密码';
@@ -109,12 +114,12 @@ $lang['license']               = '除额外注明的地方外，本维基上的�
 $lang['licenseok']             = '当您选择开始编辑本页，即寓示你同意将你贡献的内容按下列许可协议发布：';
 $lang['searchmedia']           = '查找文件名：';
 $lang['searchmedia_in']        = '在%s中查找';
-$lang['txt_upload']            = '选择要上传的文件';
-$lang['txt_filename']          = '上传并重命名为（可选）';
+$lang['txt_upload']            = '选择要上传的文件:';
+$lang['txt_filename']          = '上传并重命名为（可选）:';
 $lang['txt_overwrt']           = '覆盖已存在的同名文件';
 $lang['maxuploadsize']         = '上传限制。每个文件 %s';
-$lang['lockedby']              = '目前已被下列人员锁定';
-$lang['lockexpire']            = '预计锁定解除于';
+$lang['lockedby']              = '目前已被下列人员锁定:';
+$lang['lockexpire']            = '预计锁定解除于:';
 $lang['js']['willexpire']      = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
 $lang['js']['notsavedyet']     = '未保存的更改将丢失。
 真的要继续？';
@@ -195,10 +200,15 @@ $lang['difflink']              = '到此差别页面的链接';
 $lang['diff_type']             = '查看差异：';
 $lang['diff_inline']           = '行内显示';
 $lang['diff_side']             = '并排显示';
+$lang['diffprevrev']           = '前一修订版';
+$lang['diffnextrev']           = '后一修订版';
+$lang['difflastrev']           = '上一修订版';
+$lang['diffbothprevrev']       = '两侧同时换到之前的修订记录';
+$lang['diffbothnextrev']       = '两侧同时换到之后的修订记录';
 $lang['line']                  = '行';
-$lang['breadcrumb']            = '您的足迹';
-$lang['youarehere']            = '您在这里';
-$lang['lastmod']               = '最后更改';
+$lang['breadcrumb']            = '您的足迹:';
+$lang['youarehere']            = '您在这里:';
+$lang['lastmod']               = '最后更改:';
 $lang['by']                    = '由';
 $lang['deleted']               = '移除';
 $lang['created']               = '创建';
@@ -251,20 +261,18 @@ $lang['admin_register']        = '添加新用户';
 $lang['metaedit']              = '编辑元数据';
 $lang['metasaveerr']           = '写入元数据失败';
 $lang['metasaveok']            = '元数据已保存';
-$lang['img_backto']            = '返回到';
-$lang['img_title']             = '标题';
-$lang['img_caption']           = '说明';
-$lang['img_date']              = '日期';
-$lang['img_fname']             = '名称';
-$lang['img_fsize']             = '大小';
-$lang['img_artist']            = '摄影师';
-$lang['img_copyr']             = '版权';
-$lang['img_format']            = '格式';
-$lang['img_camera']            = '相机';
-$lang['img_keywords']          = '关键字';
-$lang['img_width']             = '宽度';
-$lang['img_height']            = '高度';
-$lang['img_manager']           = '在媒体管理器中查看';
+$lang['img_title']             = '标题:';
+$lang['img_caption']           = '说明:';
+$lang['img_date']              = '日期:';
+$lang['img_fname']             = '名称:';
+$lang['img_fsize']             = '大小:';
+$lang['img_artist']            = '摄影师:';
+$lang['img_copyr']             = '版权:';
+$lang['img_format']            = '格式:';
+$lang['img_camera']            = '相机:';
+$lang['img_keywords']          = '关键字:';
+$lang['img_width']             = '宽度:';
+$lang['img_height']            = '高度:';
 $lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表';
 $lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误';
 $lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表';
diff --git a/inc/load.php b/inc/load.php
index 497dd6921..ac2812a0b 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -96,6 +96,16 @@ function load_autoload($name){
         'DokuWiki_Remote_Plugin' => DOKU_PLUGIN.'remote.php',
         'DokuWiki_Auth_Plugin'   => DOKU_PLUGIN.'auth.php',
 
+        'Doku_Renderer'          => DOKU_INC.'inc/parser/renderer.php',
+        'Doku_Renderer_xhtml'    => DOKU_INC.'inc/parser/xhtml.php',
+        'Doku_Renderer_code'     => DOKU_INC.'inc/parser/code.php',
+        'Doku_Renderer_xhtmlsummary' => DOKU_INC.'inc/parser/xhtmlsummary.php',
+        'Doku_Renderer_metadata' => DOKU_INC.'inc/parser/metadata.php',
+
+        'DokuCLI'                => DOKU_INC.'inc/cli.php',
+        'DokuCLI_Options'        => DOKU_INC.'inc/cli.php',
+        'DokuCLI_Colors'         => DOKU_INC.'inc/cli.php',
+
     );
 
     if(isset($classes[$name])){
diff --git a/inc/mail.php b/inc/mail.php
index 0b60c0a5b..9994ac63e 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -40,6 +40,8 @@ if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['
 function mail_setup(){
     global $conf;
     global $USERINFO;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     // auto constructed address
     $host = @parse_url(DOKU_URL,PHP_URL_HOST);
@@ -53,11 +55,8 @@ function mail_setup(){
         $replace['@MAIL@'] = $noreply;
     }
 
-    if(!empty($_SERVER['REMOTE_USER'])){
-        $replace['@USER@'] = $_SERVER['REMOTE_USER'];
-    }else{
-        $replace['@USER@'] = 'noreply';
-    }
+    // use 'noreply' if no user
+    $replace['@USER@'] = $INPUT->server->str('REMOTE_USER', 'noreply', true);
 
     if(!empty($USERINFO['name'])){
         $replace['@NAME@'] = $USERINFO['name'];
diff --git a/inc/media.php b/inc/media.php
index 960b96e65..185d0a5ba 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -284,7 +284,7 @@ function media_upload_xhr($ns,$auth){
         'copy'
     );
     unlink($path);
-    if ($tmp) dir_delete($tmp);
+    if ($tmp) io_rmdir($tmp, true);
     if (is_array($res)) {
         msg($res[0], $res[1]);
         return false;
@@ -501,7 +501,8 @@ function media_saveOldRevision($id){
     $date = filemtime($oldf);
     if (!$conf['mediarevisions']) return $date;
 
-    if (!getRevisionInfo($id, $date, 8192, true)) {
+    $medialog = new MediaChangeLog($id);
+    if (!$medialog->getRevisionInfo($date)) {
         // there was an external edit,
         // there is no log entry for current version of file
         if (!@file_exists(mediaMetaFN($id,'.changes'))) {
@@ -704,7 +705,7 @@ function media_tab_files_options(){
             if ($checked == $option) {
                 $attrs['checked'] = 'checked';
             }
-            $form->addElement(form_makeRadioField($group, $option,
+            $form->addElement(form_makeRadioField($group . '_dwmedia', $option,
                                        $lang['media_' . $group . '_' . $option],
                                                   $content[0] . '__' . $option,
                                                   $option, $attrs));
@@ -728,10 +729,23 @@ function _media_get_sort_type() {
     return _media_get_display_param('sort', array('default' => 'name', 'date'));
 }
 
+/**
+ * Returns type of listing for the list of files in media manager
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @return string - list type
+ */
 function _media_get_list_type() {
     return _media_get_display_param('list', array('default' => 'thumbs', 'rows'));
 }
 
+/**
+ * Get display parameters
+ *
+ * @param string $param   name of parameter
+ * @param array  $values  allowed values, where default value has index key 'default'
+ * @return string the parameter value
+ */
 function _media_get_display_param($param, $values) {
     global $INPUT;
     if (in_array($INPUT->str($param), $values)) {
@@ -859,6 +873,10 @@ function media_tab_history($image, $ns, $auth=null) {
 /**
  * Prints mediafile details
  *
+ * @param string        $image media id
+ * @param               $auth
+ * @param int|bool      $rev
+ * @param JpegMeta|bool $meta
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_preview($image, $auth, $rev=false, $meta=false) {
@@ -1001,7 +1019,7 @@ function media_file_tags($meta) {
     foreach($fields as $key => $tag){
         $t = array();
         if (!empty($tag[0])) $t = array($tag[0]);
-        if(is_array($tag[3])) $t = array_merge($t,$tag[3]);
+        if(isset($tag[3]) && is_array($tag[3])) $t = array_merge($t,$tag[3]);
         $value = media_getTag($t, $meta);
         $tags[] = array('tag' => $tag, 'value' => $value);
     }
@@ -1024,7 +1042,7 @@ function media_details($image, $auth, $rev=false, $meta=false) {
     foreach($tags as $tag){
         if ($tag['value']) {
             $value = cleanText($tag['value']);
-            echo '<dt>'.$lang[$tag['tag'][1]].':</dt><dd>';
+            echo '<dt>'.$lang[$tag['tag'][1]].'</dt><dd>';
             if ($tag['tag'][2] == 'date') echo dformat($value);
             else echo hsc($value);
             echo '</dd>'.NL;
@@ -1039,7 +1057,6 @@ function media_details($image, $auth, $rev=false, $meta=false) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_diff($image, $ns, $auth, $fromajax = false) {
-    global $lang;
     global $conf;
     global $INPUT;
 
@@ -1077,7 +1094,8 @@ function media_diff($image, $ns, $auth, $fromajax = false) {
         $l_rev = $rev1;
     }else{                        // no revision was given, compare previous to current
         $r_rev = '';
-        $revs = getRevisions($image, 0, 1, 8192, true);
+        $medialog = new MediaChangeLog($image);
+        $revs = $medialog->getRevisions(0, 1);
         if (file_exists(mediaFN($image, $revs[0]))) {
             $l_rev = $revs[0];
         } else {
@@ -1098,9 +1116,15 @@ function media_diff($image, $ns, $auth, $fromajax = false) {
 
 }
 
+/**
+ * Callback for media file diff
+ *
+ * @param $data
+ * @return bool|void
+ */
 function _media_file_diff($data) {
     if(is_array($data) && count($data)===6) {
-        return media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4], $data[5]);
+        media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4], $data[5]);
     } else {
         return false;
     }
@@ -1201,7 +1225,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         foreach($tags as $tag){
             $value = cleanText($tag['value']);
             if (!$value) $value = '-';
-            echo '<dt>'.$lang[$tag['tag'][1]].':</dt>';
+            echo '<dt>'.$lang[$tag['tag'][1]].'</dt>';
             echo '<dd>';
             if ($tag['highlighted']) {
                 echo '<strong>';
@@ -1424,17 +1448,23 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
     echo '</div>'.NL;
 }
 
-function media_printicon($filename){
+/**
+ * Display a media icon
+ *
+ * @param $filename
+ * @param string $size the size subfolder, if not specified 16x16 is used
+ * @return string
+ */
+function media_printicon($filename, $size=''){
     list($ext) = mimetype(mediaFN($filename),false);
 
-    if (@file_exists(DOKU_INC.'lib/images/fileicons/'.$ext.'.png')) {
-        $icon = DOKU_BASE.'lib/images/fileicons/'.$ext.'.png';
+    if (@file_exists(DOKU_INC.'lib/images/fileicons/'.$size.'/'.$ext.'.png')) {
+        $icon = DOKU_BASE.'lib/images/fileicons/'.$size.'/'.$ext.'.png';
     } else {
-        $icon = DOKU_BASE.'lib/images/fileicons/file.png';
+        $icon = DOKU_BASE.'lib/images/fileicons/'.$size.'/file.png';
     }
 
     return '<img src="'.$icon.'" alt="'.$filename.'" class="icon" />';
-
 }
 
 /**
@@ -1458,7 +1488,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
         echo '<a id="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
             media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
             'tab_details' => 'view')).'">';
-        echo media_printicon($item['id']);
+        echo media_printicon($item['id'], '32x32');
         echo '</a>';
     }
     echo '</dt>'.NL;
@@ -1559,7 +1589,7 @@ function media_printimgdetail($item, $fullscreen=false){
  * @param string     $amp - separator
  * @param bool       $abs
  * @param bool       $params_array
- * @return string - link
+ * @return string|array - link
  */
 function media_managerURL($params=false, $amp='&amp;', $abs=false, $params_array=false) {
     global $ID;
@@ -1624,10 +1654,10 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     $form->addElement(formSecurityToken());
     $form->addHidden('ns', hsc($ns));
     $form->addElement(form_makeOpenTag('p'));
-    $form->addElement(form_makeFileField('upload', $lang['txt_upload'].':', 'upload__file'));
+    $form->addElement(form_makeFileField('upload', $lang['txt_upload'], 'upload__file'));
     $form->addElement(form_makeCloseTag('p'));
     $form->addElement(form_makeOpenTag('p'));
-    $form->addElement(form_makeTextField('mediaid', noNS($id), $lang['txt_filename'].':', 'upload__name'));
+    $form->addElement(form_makeTextField('mediaid', noNS($id), $lang['txt_filename'], 'upload__name'));
     $form->addElement(form_makeButton('submit', '', $lang['btn_upload']));
     $form->addElement(form_makeCloseTag('p'));
 
@@ -1757,7 +1787,7 @@ function media_nstree_item($item){
     global $INPUT;
     $pos   = strrpos($item['id'], ':');
     $label = substr($item['id'], $pos > 0 ? $pos + 1 : 0);
-    if(!$item['label']) $item['label'] = $label;
+    if(empty($item['label'])) $item['label'] = $label;
 
     $ret  = '';
     if (!($INPUT->str('do') == 'media'))
@@ -1819,7 +1849,7 @@ function media_resize_image($file, $ext, $w, $h=0){
     if( $mtime > filemtime($file) ||
             media_resize_imageIM($ext,$file,$info[0],$info[1],$local,$w,$h) ||
             media_resize_imageGD($ext,$file,$info[0],$info[1],$local,$w,$h) ){
-        if($conf['fperm']) chmod($local, $conf['fperm']);
+        if(!empty($conf['fperm'])) @chmod($local, $conf['fperm']);
         return $local;
     }
     //still here? resizing failed
@@ -1880,7 +1910,7 @@ function media_crop_image($file, $ext, $w, $h=0){
     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']);
+        if(!empty($conf['fperm'])) @chmod($local, $conf['fperm']);
         return media_resize_image($local,$ext, $w, $h);
     }
 
@@ -2164,7 +2194,7 @@ function media_alternativefiles($src, $exts){
 /**
  * Check if video/audio is supported to be embedded.
  *
- * @param string $src       - mimetype of media file
+ * @param string $mime      - mimetype of media file
  * @param string $type      - type of media files to check ('video', 'audio', or none)
  * @return boolean
  *
diff --git a/inc/pageutils.php b/inc/pageutils.php
index c8d3cf4bb..5f62926e4 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -17,8 +17,13 @@
  * If the second parameter is true (default) the ID is cleaned.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $param  the $_REQUEST variable name, default 'id'
+ * @param bool   $clean  if true, ID is cleaned
+ * @return mixed|string
  */
 function getID($param='id',$clean=true){
+    /** @var Input $INPUT */
     global $INPUT;
     global $conf;
     global $ACT;
@@ -27,7 +32,7 @@ function getID($param='id',$clean=true){
 
     //construct page id from request URI
     if(empty($id) && $conf['userewrite'] == 2){
-        $request = $_SERVER['REQUEST_URI'];
+        $request = $INPUT->server->str('REQUEST_URI');
         $script = '';
 
         //get the script URL
@@ -36,15 +41,15 @@ function getID($param='id',$clean=true){
             if($param != 'id') {
                 $relpath = 'lib/exe/';
             }
-            $script = $conf['basedir'].$relpath.utf8_basename($_SERVER['SCRIPT_FILENAME']);
-
-        }elseif($_SERVER['PATH_INFO']){
-            $request = $_SERVER['PATH_INFO'];
-        }elseif($_SERVER['SCRIPT_NAME']){
-            $script = $_SERVER['SCRIPT_NAME'];
-        }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
-            $script = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
-                    $_SERVER['SCRIPT_FILENAME']);
+            $script = $conf['basedir'].$relpath.utf8_basename($INPUT->server->str('SCRIPT_FILENAME'));
+
+        }elseif($INPUT->server->str('PATH_INFO')){
+            $request = $INPUT->server->str('PATH_INFO');
+        }elseif($INPUT->server->str('SCRIPT_NAME')){
+            $script = $INPUT->server->str('SCRIPT_NAME');
+        }elseif($INPUT->server->str('DOCUMENT_ROOT') && $INPUT->server->str('SCRIPT_FILENAME')){
+            $script = preg_replace ('/^'.preg_quote($INPUT->server->str('DOCUMENT_ROOT'),'/').'/','',
+                    $INPUT->server->str('SCRIPT_FILENAME'));
             $script = '/'.$script;
         }
 
@@ -94,6 +99,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
+ * @return string cleaned id
  */
 function cleanID($raw_id,$ascii=false){
     global $conf;
@@ -144,6 +150,9 @@ function cleanID($raw_id,$ascii=false){
  * Return namespacepart of a wiki ID
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id
+ * @return string|bool the namespace part or false if the given ID has no namespace (root)
  */
 function getNS($id){
     $pos = strrpos((string)$id,':');
@@ -157,6 +166,9 @@ function getNS($id){
  * Returns the ID without the namespace
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id
+ * @return string
  */
 function noNS($id) {
     $pos = strrpos($id, ':');
@@ -171,6 +183,9 @@ function noNS($id) {
  * Returns the current namespace
  *
  * @author Nathan Fritz <fritzn@crown.edu>
+ *
+ * @param string $id
+ * @return string
  */
 function curNS($id) {
     return noNS(getNS($id));
@@ -180,6 +195,9 @@ function curNS($id) {
  * Returns the ID without the namespace or current namespace for 'start' pages
  *
  * @author Nathan Fritz <fritzn@crown.edu>
+ *
+ * @param string $id
+ * @return string
  */
 function noNSorNS($id) {
     global $conf;
@@ -200,6 +218,7 @@ function noNSorNS($id) {
  * @param string  $title   The headline title
  * @param array|bool   $check   Existing IDs (title => number)
  * @return string the title
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function sectionID($title,&$check) {
@@ -230,6 +249,11 @@ function sectionID($title,&$check) {
  * parameters as for wikiFN
  *
  * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param string     $id     page id
+ * @param string|int $rev    empty or revision timestamp
+ * @param bool       $clean  flag indicating that $id should be cleaned (see wikiFN as well)
+ * @return bool exists?
  */
 function page_exists($id,$rev='',$clean=true) {
     return @file_exists(wikiFN($id,$rev,$clean));
@@ -244,6 +268,7 @@ function page_exists($id,$rev='',$clean=true) {
  * @param  $rev     string   page revision, empty string for current
  * @param  $clean   bool     flag indicating that $raw_id should be cleaned.  Only set to false
  *                           when $id is guaranteed to have been cleaned already.
+ * @return string full path
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
@@ -287,6 +312,9 @@ function wikiFN($raw_id,$rev='',$clean=true){
  * Returns the full path to the file for locking the page while editing.
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param string $id page id
+ * @return string full path
  */
 function wikiLockFN($id) {
     global $conf;
@@ -298,6 +326,10 @@ function wikiLockFN($id) {
  * returns the full path to the meta file specified by ID and extension
  *
  * @author Steven Danz <steven-danz@kc.rr.com>
+ *
+ * @param string $id   page id
+ * @param string $ext  file extension
+ * @return string full path
  */
 function metaFN($id,$ext){
     global $conf;
@@ -311,6 +343,10 @@ function metaFN($id,$ext){
  * returns the full path to the media's meta file specified by ID and extension
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $id   media id
+ * @param string $ext  extension of media
+ * @return string
  */
 function mediaMetaFN($id,$ext){
     global $conf;
@@ -325,6 +361,9 @@ function mediaMetaFN($id,$ext){
  *
  * @author Esther Brunner <esther@kaffeehaus.ch>
  * @author Michael Hamann <michael@content-space.de>
+ *
+ * @param string $id page id
+ * @return array
  */
 function metaFiles($id){
     $basename = metaFN($id, '');
@@ -340,6 +379,10 @@ function metaFiles($id){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string     $id  media id
+ * @param string|int $rev empty string or revision timestamp
+ * @return string full path
  */
 function mediaFN($id, $rev=''){
     global $conf;
@@ -361,6 +404,8 @@ function mediaFN($id, $rev=''){
  *
  * @param  string $id  The id of the local file
  * @param  string $ext The file extension (usually txt)
+ * @return string full filepath to localized file
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function localeFN($id,$ext='txt'){
@@ -386,6 +431,11 @@ function localeFN($id,$ext='txt'){
  * http://www.php.net/manual/en/function.realpath.php#57016
  *
  * @author <bart at mediawave dot nl>
+ *
+ * @param string $ns     namespace which is context of id
+ * @param string $id     relative id
+ * @param bool   $clean  flag indicating that id should be cleaned
+ * @return mixed|string
  */
 function resolve_id($ns,$id,$clean=true){
     global $conf;
@@ -431,6 +481,10 @@ function resolve_id($ns,$id,$clean=true){
  * Returns a full media id
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string  $ns     namespace which is context of id
+ * @param string &$page   (reference) relative media id, updated to resolved id
+ * @param bool   &$exists (reference) updated with existance of media
  */
 function resolve_mediaid($ns,&$page,&$exists){
     $page   = resolve_id($ns,$page);
@@ -442,6 +496,10 @@ function resolve_mediaid($ns,&$page,&$exists){
  * Returns a full page id
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string  $ns     namespace which is context of id
+ * @param string &$page   (reference) relative page id, updated to resolved id
+ * @param bool   &$exists (reference) updated with existance of media
  */
 function resolve_pageid($ns,&$page,&$exists){
     global $conf;
@@ -533,6 +591,9 @@ function getCacheName($data,$ext=''){
  * Checks a pageid against $conf['hidepages']
  *
  * @author Andreas Gohr <gohr@cosmocode.de>
+ *
+ * @param string $id page id
+ * @return bool
  */
 function isHiddenPage($id){
     $data = array(
@@ -543,6 +604,11 @@ function isHiddenPage($id){
     return $data['hidden'];
 }
 
+/**
+ * callback checks if page is hidden
+ *
+ * @param array $data event data    - see isHiddenPage()
+ */
 function _isHiddenPage(&$data) {
     global $conf;
     global $ACT;
@@ -560,6 +626,9 @@ function _isHiddenPage(&$data) {
  * Reverse of isHiddenPage
  *
  * @author Andreas Gohr <gohr@cosmocode.de>
+ *
+ * @param string $id page id
+ * @return bool
  */
 function isVisiblePage($id){
     return !isHiddenPage($id);
@@ -572,8 +641,10 @@ function isVisiblePage($id){
  * “*”. Output is escaped.
  *
  * @author Adrian Lang <lang@cosmocode.de>
+ *
+ * @param string $id page id
+ * @return string
  */
-
 function prettyprint_id($id) {
     if (!$id || $id === ':') {
         return '*';
@@ -596,6 +667,10 @@ function prettyprint_id($id) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @see    urlencode
+ *
+ * @param string $file file name
+ * @param bool   $safe if true, only encoded when non ASCII characters detected
+ * @return string
  */
 function utf8_encodeFN($file,$safe=true){
     global $conf;
@@ -621,6 +696,9 @@ function utf8_encodeFN($file,$safe=true){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @see    urldecode
+ *
+ * @param string $file file name
+ * @return string
  */
 function utf8_decodeFN($file){
     global $conf;
diff --git a/inc/parser/code.php b/inc/parser/code.php
index 0b8e3ee02..00b956c27 100644
--- a/inc/parser/code.php
+++ b/inc/parser/code.php
@@ -5,28 +5,27 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 if(!defined('DOKU_INC')) die('meh.');
-require_once DOKU_INC . 'inc/parser/renderer.php';
 
 class Doku_Renderer_code extends Doku_Renderer {
-    var $_codeblock=0;
+    var $_codeblock = 0;
 
     /**
      * Send the wanted code block to the browser
      *
      * When the correct block was found it exits the script.
      */
-    function code($text, $language = null, $filename='' ) {
+    function code($text, $language = null, $filename = '') {
         global $INPUT;
         if(!$language) $language = 'txt';
         if(!$filename) $filename = 'snippet.'.$language;
         $filename = utf8_basename($filename);
         $filename = utf8_stripspecials($filename, '_');
 
-        if($this->_codeblock == $INPUT->str('codeblock')){
+        if($this->_codeblock == $INPUT->str('codeblock')) {
             header("Content-Type: text/plain; charset=utf-8");
             header("Content-Disposition: attachment; filename=$filename");
             header("X-Robots-Tag: noindex");
-            echo trim($text,"\r\n");
+            echo trim($text, "\r\n");
             exit;
         }
 
@@ -36,7 +35,7 @@ class Doku_Renderer_code extends Doku_Renderer {
     /**
      * Wraps around code()
      */
-    function file($text, $language = null, $filename='') {
+    function file($text, $language = null, $filename = '') {
         $this->code($text, $language, $filename);
     }
 
@@ -54,7 +53,7 @@ class Doku_Renderer_code extends Doku_Renderer {
      *
      * @returns string 'code'
      */
-    function getFormat(){
+    function getFormat() {
         return 'code';
     }
 }
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 8ae991209..a1040d12e 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -12,6 +12,7 @@ class Doku_Handler {
 
     var $status = array(
         'section' => false,
+        'doublequote' => 0,
     );
 
     var $rewriteBlocks = true;
@@ -401,11 +402,17 @@ class Doku_Handler {
 
     function doublequoteopening($match, $state, $pos) {
         $this->_addCall('doublequoteopening',array(), $pos);
+        $this->status['doublequote']++;
         return true;
     }
 
     function doublequoteclosing($match, $state, $pos) {
-        $this->_addCall('doublequoteclosing',array(), $pos);
+        if ($this->status['doublequote'] <= 0) {
+            $this->doublequoteopening($match, $state, $pos);
+        } else {
+            $this->_addCall('doublequoteclosing',array(), $pos);
+            $this->status['doublequote'] = max(0, --$this->status['doublequote']);
+        }
         return true;
     }
 
@@ -1149,6 +1156,9 @@ class Doku_Handler_Table {
     var $currentCols = 0;
     var $firstCell = false;
     var $lastCellType = 'tablecell';
+    var $inTableHead = true;
+    var $currentRow = array('tableheader' => 0, 'tablecell' => 0);
+    var $countTableHeadRows = 0;
 
     function Doku_Handler_Table(& $CallWriter) {
         $this->CallWriter = & $CallWriter;
@@ -1216,15 +1226,24 @@ class Doku_Handler_Table {
         $this->firstCell = true;
         $this->lastCellType = 'tablecell';
         $this->maxRows++;
+        if ($this->inTableHead) {
+            $this->currentRow = array('tablecell' => 0, 'tableheader' => 0);
+        }
     }
 
     function tableRowClose($call) {
+        if ($this->inTableHead && ($this->inTableHead = $this->isTableHeadRow())) {
+            $this->countTableHeadRows++;
+        }
         // Strip off final cell opening and anything after it
         while ( $discard = array_pop($this->tableCalls ) ) {
 
             if ( $discard[0] == 'tablecell_open' || $discard[0] == 'tableheader_open') {
                 break;
             }
+            if (!empty($this->currentRow[$discard[0]])) {
+                $this->currentRow[$discard[0]]--;
+            }
         }
         $this->tableCalls[] = array('tablerow_close', array(), $call[2]);
 
@@ -1233,7 +1252,20 @@ class Doku_Handler_Table {
         }
     }
 
+    function isTableHeadRow() {
+        $td = $this->currentRow['tablecell'];
+        $th = $this->currentRow['tableheader'];
+
+        if (!$th || $td > 2) return false;
+        if (2*$td > $th) return false;
+
+        return true;
+    }
+
     function tableCell($call) {
+        if ($this->inTableHead) {
+            $this->currentRow[$call[0]]++;
+        }
         if ( !$this->firstCell ) {
 
             // Increase the span
@@ -1281,6 +1313,13 @@ class Doku_Handler_Table {
         $cellKey = array();
         $toDelete = array();
 
+        // if still in tableheader, then there can be no table header
+        // as all rows can't be within <THEAD>
+        if ($this->inTableHead) {
+            $this->inTableHead = false;
+            $this->countTableHeadRows = 0;
+        }
+
         // Look for the colspan elements and increment the colspan on the
         // previous non-empty opening cell. Once done, delete all the cells
         // that contain colspans
@@ -1288,6 +1327,14 @@ class Doku_Handler_Table {
             $call = $this->tableCalls[$key];
 
             switch ($call[0]) {
+                case 'table_open' :
+                    if($this->countTableHeadRows) {
+                        array_splice($this->tableCalls, $key+1, 0, array(
+                              array('tablethead_open', array(), $call[2]))
+                        );
+                    }
+                    break;
+
                 case 'tablerow_open':
 
                     $lastRow++;
@@ -1357,15 +1404,19 @@ class Doku_Handler_Table {
                     } else {
 
                         $spanning_cell = null;
-                        for($i = $lastRow-1; $i > 0; $i--) {
 
-                            if ( $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tablecell_open' || $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tableheader_open' ) {
+                        // can't cross thead/tbody boundary
+                        if (!$this->countTableHeadRows || ($lastRow-1 != $this->countTableHeadRows)) {
+                            for($i = $lastRow-1; $i > 0; $i--) {
 
-                                if ($this->tableCalls[$cellKey[$i][$lastCell]][1][2] >= $lastRow - $i) {
-                                    $spanning_cell = $i;
-                                    break;
-                                }
+                                if ( $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tablecell_open' || $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tableheader_open' ) {
+
+                                    if ($this->tableCalls[$cellKey[$i][$lastCell]][1][2] >= $lastRow - $i) {
+                                        $spanning_cell = $i;
+                                        break;
+                                    }
 
+                                }
                             }
                         }
                         if (is_null($spanning_cell)) {
@@ -1396,6 +1447,10 @@ class Doku_Handler_Table {
                         $key += 3;
                     }
 
+                    if($this->countTableHeadRows == $lastRow) {
+                        array_splice($this->tableCalls, $key+1, 0, array(
+                              array('tablethead_close', array(), $call[2])));
+                    }
                     break;
 
             }
@@ -1438,7 +1493,7 @@ class Doku_Handler_Block {
     var $blockOpen = array(
             'header',
             'listu_open','listo_open','listitem_open','listcontent_open',
-            'table_open','tablerow_open','tablecell_open','tableheader_open',
+            'table_open','tablerow_open','tablecell_open','tableheader_open','tablethead_open',
             'quote_open',
             'code','file','hr','preformatted','rss',
             'htmlblock','phpblock',
@@ -1448,7 +1503,7 @@ class Doku_Handler_Block {
     var $blockClose = array(
             'header',
             'listu_close','listo_close','listitem_close','listcontent_close',
-            'table_close','tablerow_close','tablecell_close','tableheader_close',
+            'table_close','tablerow_close','tablecell_close','tableheader_close','tablethead_close',
             'quote_close',
             'code','file','hr','preformatted','rss',
             'htmlblock','phpblock',
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 8ba159d62..25bf3fe3d 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -6,131 +6,198 @@
  */
 if(!defined('DOKU_INC')) die('meh.');
 
-if ( !defined('DOKU_LF') ) {
+if(!defined('DOKU_LF')) {
     // Some whitespace to help View > Source
-    define ('DOKU_LF',"\n");
+    define ('DOKU_LF', "\n");
 }
 
-if ( !defined('DOKU_TAB') ) {
+if(!defined('DOKU_TAB')) {
     // Some whitespace to help View > Source
-    define ('DOKU_TAB',"\t");
+    define ('DOKU_TAB', "\t");
 }
 
-require_once DOKU_INC . 'inc/parser/renderer.php';
-
 /**
- * The Renderer
+ * The MetaData Renderer
+ *
+ * Metadata is additional information about a DokuWiki page that gets extracted mainly from the page's content
+ * but also it's own filesystem data (like the creation time). All metadata is stored in the fields $meta and
+ * $persistent.
+ *
+ * Some simplified rendering to $doc is done to gather the page's (text-only) abstract.
  */
 class Doku_Renderer_metadata extends Doku_Renderer {
+    /** the approximate byte lenght to capture for the abstract */
+    const ABSTRACT_LEN = 250;
+
+    /** the maximum UTF8 character length for the abstract */
+    const ABSTRACT_MAX = 500;
+
+    /** @var array transient meta data, will be reset on each rendering */
+    public $meta = array();
 
-    var $doc  = '';
-    var $meta = array();
-    var $persistent = array();
+    /** @var array persistent meta data, will be kept until explicitly deleted */
+    public $persistent = array();
 
-    var $headers = array();
-    var $capture = true;
-    var $store   = '';
-    var $firstimage = '';
+    /** @var array the list of headers used to create unique link ids */
+    protected $headers = array();
 
-    function getFormat(){
+    /** @var string temporary $doc store */
+    protected $store = '';
+
+    /** @var string keeps the first image reference */
+    protected $firstimage = '';
+
+    /** @var bool determines if enough data for the abstract was collected, yet */
+    public $capture = true;
+
+    /** @var int number of bytes captured for abstract */
+    protected $captured = 0;
+
+    /**
+     * Returns the format produced by this renderer.
+     *
+     * @return string always 'metadata'
+     */
+    function getFormat() {
         return 'metadata';
     }
 
-    function document_start(){
+    /**
+     * Initialize the document
+     *
+     * Sets up some of the persistent info about the page if it doesn't exist, yet.
+     */
+    function document_start() {
         global $ID;
 
         $this->headers = array();
 
         // external pages are missing create date
-        if(!$this->persistent['date']['created']){
+        if(!$this->persistent['date']['created']) {
             $this->persistent['date']['created'] = filectime(wikiFN($ID));
         }
-        if(!isset($this->persistent['user'])){
+        if(!isset($this->persistent['user'])) {
             $this->persistent['user'] = '';
         }
-        if(!isset($this->persistent['creator'])){
+        if(!isset($this->persistent['creator'])) {
             $this->persistent['creator'] = '';
         }
         // reset metadata to persistent values
         $this->meta = $this->persistent;
     }
 
-    function document_end(){
+    /**
+     * Finalize the document
+     *
+     * Stores collected data in the metadata
+     */
+    function document_end() {
         global $ID;
 
         // store internal info in metadata (notoc,nocache)
         $this->meta['internal'] = $this->info;
 
-        if (!isset($this->meta['description']['abstract'])){
+        if(!isset($this->meta['description']['abstract'])) {
             // cut off too long abstracts
             $this->doc = trim($this->doc);
-            if (strlen($this->doc) > 500)
-                $this->doc = utf8_substr($this->doc, 0, 500).'…';
+            if(strlen($this->doc) > self::ABSTRACT_MAX) {
+                $this->doc = utf8_substr($this->doc, 0, self::ABSTRACT_MAX).'…';
+            }
             $this->meta['description']['abstract'] = $this->doc;
         }
 
         $this->meta['relation']['firstimage'] = $this->firstimage;
 
-        if(!isset($this->meta['date']['modified'])){
+        if(!isset($this->meta['date']['modified'])) {
             $this->meta['date']['modified'] = filemtime(wikiFN($ID));
         }
 
     }
 
+    /**
+     * Render plain text data
+     *
+     * This function takes care of the amount captured data and will stop capturing when
+     * enough abstract data is available
+     *
+     * @param $text
+     */
+    function cdata($text) {
+        if(!$this->capture) return;
+
+        $this->doc .= $text;
+
+        $this->captured += strlen($text);
+        if($this->captured > self::ABSTRACT_LEN) $this->capture = false;
+    }
+
+    /**
+     * Add an item to the TOC
+     *
+     * @param string $id       the hash link
+     * @param string $text     the text to display
+     * @param int    $level    the nesting level
+     */
     function toc_additem($id, $text, $level) {
         global $conf;
 
         //only add items within configured levels
-        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']){
+        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']) {
             // the TOC is one of our standard ul list arrays ;-)
             $this->meta['description']['tableofcontents'][] = array(
-              'hid'   => $id,
-              'title' => $text,
-              'type'  => 'ul',
-              'level' => $level-$conf['toptoclevel']+1
+                'hid'   => $id,
+                'title' => $text,
+                'type'  => 'ul',
+                'level' => $level - $conf['toptoclevel'] + 1
             );
         }
 
     }
 
+    /**
+     * Render a heading
+     *
+     * @param string $text  the text to display
+     * @param int    $level header level
+     * @param int    $pos   byte position in the original source
+     */
     function header($text, $level, $pos) {
-        if (!isset($this->meta['title'])) $this->meta['title'] = $text;
+        if(!isset($this->meta['title'])) $this->meta['title'] = $text;
 
         // add the header to the TOC
-        $hid = $this->_headerToLink($text,'true');
+        $hid = $this->_headerToLink($text, 'true');
         $this->toc_additem($hid, $text, $level);
 
         // add to summary
-        if ($this->capture && ($level > 1)) $this->doc .= DOKU_LF.$text.DOKU_LF;
+        $this->cdata(DOKU_LF.$text.DOKU_LF);
     }
 
-    function section_open($level){}
-    function section_close(){}
-
-    function cdata($text){
-      if ($this->capture) $this->doc .= $text;
-    }
-
-    function p_open(){
-      if ($this->capture) $this->doc .= DOKU_LF;
+    /**
+     * Open a paragraph
+     */
+    function p_open() {
+        $this->cdata(DOKU_LF);
     }
 
-    function p_close(){
-        if ($this->capture){
-            if (strlen($this->doc) > 250) $this->capture = false;
-            else $this->doc .= DOKU_LF;
-        }
+    /**
+     * Close a paragraph
+     */
+    function p_close() {
+        $this->cdata(DOKU_LF);
     }
 
-    function linebreak(){
-        if ($this->capture) $this->doc .= DOKU_LF;
+    /**
+     * Create a line break
+     */
+    function linebreak() {
+        $this->cdata(DOKU_LF);
     }
 
-    function hr(){
-        if ($this->capture){
-            if (strlen($this->doc) > 250) $this->capture = false;
-            else $this->doc .= DOKU_LF.'----------'.DOKU_LF;
-        }
+    /**
+     * Create a horizontal line
+     */
+    function hr() {
+        $this->cdata(DOKU_LF.'----------'.DOKU_LF);
     }
 
     /**
@@ -143,7 +210,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
      * @author Andreas Gohr <andi@splitbrain.org>
      */
     function footnote_open() {
-        if ($this->capture){
+        if($this->capture) {
             // move current content to store and record footnote
             $this->store = $this->doc;
             $this->doc   = '';
@@ -159,141 +226,214 @@ class Doku_Renderer_metadata extends Doku_Renderer {
      * @author Andreas Gohr
      */
     function footnote_close() {
-        if ($this->capture){
+        if($this->capture) {
             // restore old content
-            $this->doc = $this->store;
+            $this->doc   = $this->store;
             $this->store = '';
         }
     }
 
-    function listu_open(){
-        if ($this->capture) $this->doc .= DOKU_LF;
-    }
-
-    function listu_close(){
-        if ($this->capture && (strlen($this->doc) > 250)) $this->capture = false;
-    }
-
-    function listo_open(){
-        if ($this->capture) $this->doc .= DOKU_LF;
-    }
-
-    function listo_close(){
-        if ($this->capture && (strlen($this->doc) > 250)) $this->capture = false;
+    /**
+     * Open an unordered list
+     */
+    function listu_open() {
+        $this->cdata(DOKU_LF);
     }
 
-    function listitem_open($level){
-        if ($this->capture) $this->doc .= str_repeat(DOKU_TAB, $level).'* ';
+    /**
+     * Open an ordered list
+     */
+    function listo_open() {
+        $this->cdata(DOKU_LF);
     }
 
-    function listitem_close(){
-        if ($this->capture) $this->doc .= DOKU_LF;
+    /**
+     * Open a list item
+     *
+     * @param int $level the nesting level
+     */
+    function listitem_open($level) {
+        $this->cdata(str_repeat(DOKU_TAB, $level).'* ');
     }
 
-    function listcontent_open(){}
-    function listcontent_close(){}
-
-    function unformatted($text){
-        if ($this->capture) $this->doc .= $text;
+    /**
+     * Close a list item
+     */
+    function listitem_close() {
+        $this->cdata(DOKU_LF);
     }
 
-    function preformatted($text){
-        if ($this->capture) $this->doc .= $text;
+    /**
+     * Output preformatted text
+     *
+     * @param string $text
+     */
+    function preformatted($text) {
+        $this->cdata($text);
     }
 
-    function file($text, $lang = null, $file = null){
-        if ($this->capture){
-            $this->doc .= DOKU_LF.$text;
-            if (strlen($this->doc) > 250) $this->capture = false;
-            else $this->doc .= DOKU_LF;
-        }
+    /**
+     * Start a block quote
+     */
+    function quote_open() {
+        $this->cdata(DOKU_LF.DOKU_TAB.'"');
     }
 
-    function quote_open(){
-        if ($this->capture) $this->doc .= DOKU_LF.DOKU_TAB.'"';
+    /**
+     * Stop a block quote
+     */
+    function quote_close() {
+        $this->cdata('"'.DOKU_LF);
     }
 
-    function quote_close(){
-        if ($this->capture){
-            $this->doc .= '"';
-            if (strlen($this->doc) > 250) $this->capture = false;
-            else $this->doc .= DOKU_LF;
-        }
+    /**
+     * Display text as file content, optionally syntax highlighted
+     *
+     * @param string $text text to show
+     * @param string $lang programming language to use for syntax highlighting
+     * @param string $file file path label
+     */
+    function file($text, $lang = null, $file = null) {
+        $this->cdata(DOKU_LF.$text.DOKU_LF);
     }
 
-    function code($text, $language = null, $file = null){
-        if ($this->capture){
-            $this->doc .= DOKU_LF.$text;
-            if (strlen($this->doc) > 250) $this->capture = false;
-            else $this->doc .= DOKU_LF;
-      }
+    /**
+     * Display text as code content, optionally syntax highlighted
+     *
+     * @param string $text     text to show
+     * @param string $language programming language to use for syntax highlighting
+     * @param string $file     file path label
+     */
+    function code($text, $language = null, $file = null) {
+        $this->cdata(DOKU_LF.$text.DOKU_LF);
     }
 
-    function acronym($acronym){
-        if ($this->capture) $this->doc .= $acronym;
+    /**
+     * Format an acronym
+     *
+     * Uses $this->acronyms
+     *
+     * @param string $acronym
+     */
+    function acronym($acronym) {
+        $this->cdata($acronym);
     }
 
-    function smiley($smiley){
-        if ($this->capture) $this->doc .= $smiley;
+    /**
+     * Format a smiley
+     *
+     * Uses $this->smiley
+     *
+     * @param string $smiley
+     */
+    function smiley($smiley) {
+        $this->cdata($smiley);
     }
 
-    function entity($entity){
-        if ($this->capture) $this->doc .= $entity;
+    /**
+     * Format an entity
+     *
+     * Entities are basically small text replacements
+     *
+     * Uses $this->entities
+     *
+     * @param string $entity
+     */
+    function entity($entity) {
+        $this->cdata($entity);
     }
 
-    function multiplyentity($x, $y){
-        if ($this->capture) $this->doc .= $x.'×'.$y;
+    /**
+     * Typographically format a multiply sign
+     *
+     * Example: ($x=640, $y=480) should result in "640×480"
+     *
+     * @param string|int $x first value
+     * @param string|int $y second value
+     */
+    function multiplyentity($x, $y) {
+        $this->cdata($x.'×'.$y);
     }
 
-    function singlequoteopening(){
+    /**
+     * Render an opening single quote char (language specific)
+     */
+    function singlequoteopening() {
         global $lang;
-        if ($this->capture) $this->doc .= $lang['singlequoteopening'];
+        $this->cdata($lang['singlequoteopening']);
     }
 
-    function singlequoteclosing(){
+    /**
+     * Render a closing single quote char (language specific)
+     */
+    function singlequoteclosing() {
         global $lang;
-        if ($this->capture) $this->doc .= $lang['singlequoteclosing'];
+        $this->cdata($lang['singlequoteclosing']);
     }
 
+    /**
+     * Render an apostrophe char (language specific)
+     */
     function apostrophe() {
         global $lang;
-        if ($this->capture) $this->doc .= $lang['apostrophe'];
+        $this->cdata($lang['apostrophe']);
     }
 
-    function doublequoteopening(){
+    /**
+     * Render an opening double quote char (language specific)
+     */
+    function doublequoteopening() {
         global $lang;
-        if ($this->capture) $this->doc .= $lang['doublequoteopening'];
+        $this->cdata($lang['doublequoteopening']);
     }
 
-    function doublequoteclosing(){
+    /**
+     * Render an closinging double quote char (language specific)
+     */
+    function doublequoteclosing() {
         global $lang;
-        if ($this->capture) $this->doc .= $lang['doublequoteclosing'];
+        $this->cdata($lang['doublequoteclosing']);
     }
 
+    /**
+     * Render a CamelCase link
+     *
+     * @param string $link The link name
+     * @see http://en.wikipedia.org/wiki/CamelCase
+     */
     function camelcaselink($link) {
         $this->internallink($link, $link);
     }
 
-    function locallink($hash, $name = null){
+    /**
+     * Render a page local link
+     *
+     * @param string $hash hash link identifier
+     * @param string $name name for the link
+     */
+    function locallink($hash, $name = null) {
         if(is_array($name)) {
             $this->_firstimage($name['src']);
-            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+            if($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
         }
     }
 
     /**
      * keep track of internal links in $this->meta['relation']['references']
+     *
+     * @param string       $id   page ID to link to. eg. 'wiki:syntax'
+     * @param string|array $name name for the link, array for media file
      */
-    function internallink($id, $name = null){
+    function internallink($id, $name = null) {
         global $ID;
 
         if(is_array($name)) {
             $this->_firstimage($name['src']);
-            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+            if($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
         }
 
         $parts = explode('?', $id, 2);
-        if (count($parts) === 2) {
+        if(count($parts) === 2) {
             $id = $parts[0];
         }
 
@@ -301,7 +441,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
 
         // first resolve and clean up the $id
         resolve_pageid(getNS($ID), $id, $exists);
-        list($page, $hash) = explode('#', $id, 2);
+        @list($page) = explode('#', $id, 2);
 
         // set metadata
         $this->meta['relation']['references'][$page] = $exists;
@@ -309,84 +449,141 @@ class Doku_Renderer_metadata extends Doku_Renderer {
         // p_set_metadata($id, $data);
 
         // add link title to summary
-        if ($this->capture){
+        if($this->capture) {
             $name = $this->_getLinkTitle($name, $default, $id);
             $this->doc .= $name;
         }
     }
 
-    function externallink($url, $name = null){
+    /**
+     * Render an external link
+     *
+     * @param string       $url  full URL with scheme
+     * @param string|array $name name for the link, array for media file
+     */
+    function externallink($url, $name = null) {
         if(is_array($name)) {
             $this->_firstimage($name['src']);
-            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+            if($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
         }
 
-        if ($this->capture){
-            $this->doc .= $this->_getLinkTitle($name, '<' . $url . '>');
+        if($this->capture) {
+            $this->doc .= $this->_getLinkTitle($name, '<'.$url.'>');
         }
     }
 
-    function interwikilink($match, $name = null, $wikiName, $wikiUri){
+    /**
+     * Render an interwiki link
+     *
+     * You may want to use $this->_resolveInterWiki() here
+     *
+     * @param string       $match     original link - probably not much use
+     * @param string|array $name      name for the link, array for media file
+     * @param string       $wikiName  indentifier (shortcut) for the remote wiki
+     * @param string       $wikiUri   the fragment parsed from the original link
+     */
+    function interwikilink($match, $name = null, $wikiName, $wikiUri) {
         if(is_array($name)) {
             $this->_firstimage($name['src']);
-            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+            if($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
         }
 
-        if ($this->capture){
-            list($wikiUri, $hash) = explode('#', $wikiUri, 2);
+        if($this->capture) {
+            list($wikiUri) = explode('#', $wikiUri, 2);
             $name = $this->_getLinkTitle($name, $wikiUri);
             $this->doc .= $name;
         }
     }
 
-    function windowssharelink($url, $name = null){
+    /**
+     * Link to windows share
+     *
+     * @param string       $url  the link
+     * @param string|array $name name for the link, array for media file
+     */
+    function windowssharelink($url, $name = null) {
         if(is_array($name)) {
             $this->_firstimage($name['src']);
-            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+            if($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
         }
 
-        if ($this->capture){
-            if ($name) $this->doc .= $name;
+        if($this->capture) {
+            if($name) $this->doc .= $name;
             else $this->doc .= '<'.$url.'>';
         }
     }
 
-    function emaillink($address, $name = null){
+    /**
+     * Render a linked E-Mail Address
+     *
+     * Should honor $conf['mailguard'] setting
+     *
+     * @param string       $address Email-Address
+     * @param string|array $name    name for the link, array for media file
+     */
+    function emaillink($address, $name = null) {
         if(is_array($name)) {
             $this->_firstimage($name['src']);
-            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+            if($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
         }
 
-        if ($this->capture){
-            if ($name) $this->doc .= $name;
+        if($this->capture) {
+            if($name) $this->doc .= $name;
             else $this->doc .= '<'.$address.'>';
         }
     }
 
-    function internalmedia($src, $title=null, $align=null, $width=null,
-                           $height=null, $cache=null, $linking=null){
-        if ($this->capture && $title) $this->doc .= '['.$title.']';
+    /**
+     * Render an internal media file
+     *
+     * @param string $src     media ID
+     * @param string $title   descriptive text
+     * @param string $align   left|center|right
+     * @param int    $width   width of media in pixel
+     * @param int    $height  height of media in pixel
+     * @param string $cache   cache|recache|nocache
+     * @param string $linking linkonly|detail|nolink
+     */
+    function internalmedia($src, $title = null, $align = null, $width = null,
+                           $height = null, $cache = null, $linking = null) {
+        if($this->capture && $title) $this->doc .= '['.$title.']';
         $this->_firstimage($src);
         $this->_recordMediaUsage($src);
     }
 
-    function externalmedia($src, $title=null, $align=null, $width=null,
-                           $height=null, $cache=null, $linking=null){
-        if ($this->capture && $title) $this->doc .= '['.$title.']';
+    /**
+     * Render an external media file
+     *
+     * @param string $src     full media URL
+     * @param string $title   descriptive text
+     * @param string $align   left|center|right
+     * @param int    $width   width of media in pixel
+     * @param int    $height  height of media in pixel
+     * @param string $cache   cache|recache|nocache
+     * @param string $linking linkonly|detail|nolink
+     */
+    function externalmedia($src, $title = null, $align = null, $width = null,
+                           $height = null, $cache = null, $linking = null) {
+        if($this->capture && $title) $this->doc .= '['.$title.']';
         $this->_firstimage($src);
     }
 
-    function rss($url,$params) {
+    /**
+     * Render the output of an RSS feed
+     *
+     * @param string $url    URL of the feed
+     * @param array  $params Finetuning of the output
+     */
+    function rss($url, $params) {
         $this->meta['relation']['haspart'][$url] = true;
 
         $this->meta['date']['valid']['age'] =
-              isset($this->meta['date']['valid']['age']) ?
-                  min($this->meta['date']['valid']['age'],$params['refresh']) :
-                  $params['refresh'];
+            isset($this->meta['date']['valid']['age']) ?
+                min($this->meta['date']['valid']['age'], $params['refresh']) :
+                $params['refresh'];
     }
 
-    //----------------------------------------------------------
-    // Utils
+    #region Utils
 
     /**
      * Removes any Namespace from the given name but keeps
@@ -394,35 +591,36 @@ class Doku_Renderer_metadata extends Doku_Renderer {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function _simpleTitle($name){
+    function _simpleTitle($name) {
         global $conf;
 
         if(is_array($name)) return '';
 
-        if($conf['useslash']){
+        if($conf['useslash']) {
             $nssep = '[:;/]';
-        }else{
+        } else {
             $nssep = '[:;]';
         }
-        $name = preg_replace('!.*'.$nssep.'!','',$name);
+        $name = preg_replace('!.*'.$nssep.'!', '', $name);
         //if there is a hash we use the anchor name only
-        $name = preg_replace('!.*#!','',$name);
+        $name = preg_replace('!.*#!', '', $name);
         return $name;
     }
 
     /**
      * Creates a linkid from a headline
      *
+     * @author Andreas Gohr <andi@splitbrain.org>
      * @param string  $title   The headline title
      * @param boolean $create  Create a new unique ID?
-     * @author Andreas Gohr <andi@splitbrain.org>
+     * @return string
      */
-    function _headerToLink($title, $create=false) {
-        if($create){
-            return sectionID($title,$this->headers);
-        }else{
+    function _headerToLink($title, $create = false) {
+        if($create) {
+            return sectionID($title, $this->headers);
+        } else {
             $check = false;
-            return sectionID($title,$check);
+            return sectionID($title, $check);
         }
     }
 
@@ -430,17 +628,22 @@ class Doku_Renderer_metadata extends Doku_Renderer {
      * Construct a title and handle images in titles
      *
      * @author Harry Fuecks <hfuecks@gmail.com>
+     * @param string|array $title    either string title or media array
+     * @param string       $default  default title if nothing else is found
+     * @param null|string  $id       linked page id (used to extract title from first heading)
+     * @return string title text
      */
-    function _getLinkTitle($title, $default, $id=null) {
-        global $conf;
-
-        $isImage = false;
-        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;
+    function _getLinkTitle($title, $default, $id = null) {
+        if(is_array($title)) {
+            if($title['title']) {
+                return '['.$title['title'].']';
+            } else {
+                return $default;
+            }
+        } 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 {
@@ -448,27 +651,39 @@ class Doku_Renderer_metadata extends Doku_Renderer {
         }
     }
 
-    function _firstimage($src){
+    /**
+     * Remember first image
+     *
+     * @param string $src image URL or ID
+     */
+    function _firstimage($src) {
         if($this->firstimage) return;
         global $ID;
 
-        list($src,$hash) = explode('#',$src,2);
-        if(!media_isexternal($src)){
-            resolve_mediaid(getNS($ID),$src, $exists);
+        list($src) = explode('#', $src, 2);
+        if(!media_isexternal($src)) {
+            resolve_mediaid(getNS($ID), $src, $exists);
         }
-        if(preg_match('/.(jpe?g|gif|png)$/i',$src)){
+        if(preg_match('/.(jpe?g|gif|png)$/i', $src)) {
             $this->firstimage = $src;
         }
     }
 
+    /**
+     * Store list of used media files in metadata
+     *
+     * @param string $src media ID
+     */
     function _recordMediaUsage($src) {
         global $ID;
 
-        list ($src, $hash) = explode('#', $src, 2);
-        if (media_isexternal($src)) return;
+        list ($src) = explode('#', $src, 2);
+        if(media_isexternal($src)) return;
         resolve_mediaid(getNS($ID), $src, $exists);
         $this->meta['relation']['media'][$src] = $exists;
     }
+
+    #endregion
 }
 
 //Setup VIM: ex: et ts=4 :
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 252bd9170..df01f3302 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -200,6 +200,11 @@ class Doku_Parser_Mode_Plugin extends DokuWiki_Plugin implements Doku_Parser_Mod
     var $Lexer;
     var $allowedModes = array();
 
+    /**
+     * Sort for applying this mode
+     *
+     * @return int
+     */
     function getSort() {
         trigger_error('getSort() not implemented in '.get_class($this), E_USER_WARNING);
     }
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index e3401fd48..09294539e 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -6,266 +6,753 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 if(!defined('DOKU_INC')) die('meh.');
-require_once DOKU_INC . 'inc/plugin.php';
-require_once DOKU_INC . 'inc/pluginutils.php';
 
 /**
  * An empty renderer, produces no output
  *
  * Inherits from DokuWiki_Plugin for giving additional functions to render plugins
+ *
+ * The renderer transforms the syntax instructions created by the parser and handler into the
+ * desired output format. For each instruction a corresponding method defined in this class will
+ * be called. That method needs to produce the desired output for the instruction and add it to the
+ * $doc field. When all instructions are processed, the $doc field contents will be cached by
+ * DokuWiki and sent to the user.
  */
 class Doku_Renderer extends DokuWiki_Plugin {
-    var $info = array(
+    /** @var array Settings, control the behavior of the renderer */
+    public $info = array(
         'cache' => true, // may the rendered result cached?
         'toc'   => true, // render the TOC?
     );
 
-    var $doc = '';
+    /** @var array contains the smiley configuration, set in p_render() */
+    public $smileys = array();
+    /** @var array contains the entity configuration, set in p_render() */
+    public $entities = array();
+    /** @var array contains the acronym configuration, set in p_render() */
+    public $acronyms = array();
+    /** @var array contains the interwiki configuration, set in p_render() */
+    public $interwiki = array();
 
-    // keep some config options
-    var $acronyms = array();
-    var $smileys = array();
-    var $badwords = array();
-    var $entities = array();
-    var $interwiki = array();
+    /**
+     * @var string the rendered document, this will be cached after the renderer ran through
+     */
+    public $doc = '';
 
-    // allows renderer to be used again, clean out any per-use values
+    /**
+     * clean out any per-use values
+     *
+     * This is called before each use of the renderer object and should be used to
+     * completely reset the state of the renderer to be reused for a new document
+     */
     function reset() {
     }
 
-    function nocache() {
-        $this->info['cache'] = false;
-    }
-
-    function notoc() {
-        $this->info['toc'] = false;
+    /**
+     * Allow the plugin to prevent DokuWiki from reusing an instance
+     *
+     * Since most renderer plugins fail to implement Doku_Renderer::reset() we default
+     * to reinstantiating the renderer here
+     *
+     * @return bool   false if the plugin has to be instantiated
+     */
+    function isSingleton() {
+        return false;
     }
 
     /**
      * Returns the format produced by this renderer.
      *
-     * Has to be overidden by decendend classes
+     * Has to be overidden by sub classes
+     *
+     * @return string
      */
-    function getFormat(){
+    function getFormat() {
         trigger_error('getFormat() not implemented in '.get_class($this), E_USER_WARNING);
+        return '';
     }
 
     /**
-     * Allow the plugin to prevent DokuWiki from reusing an instance
+     * Disable caching of this renderer's output
+     */
+    function nocache() {
+        $this->info['cache'] = false;
+    }
+
+    /**
+     * Disable TOC generation for this renderer's output
      *
-     * @return bool   false if the plugin has to be instantiated
+     * This might not be used for certain sub renderer
      */
-    function isSingleton() {
-        return false;
+    function notoc() {
+        $this->info['toc'] = false;
     }
 
     /**
-     * handle plugin rendering
+     * Handle plugin rendering
+     *
+     * Most likely this needs NOT to be overwritten by sub classes
      *
-     * @param string $name Plugin name
-     * @param mixed  $data custom data set by handler
+     * @param string $name  Plugin name
+     * @param mixed  $data  custom data set by handler
      * @param string $state matched state if any
      * @param string $match raw matched syntax
      */
-    function plugin($name,$data,$state='',$match=''){
-        $plugin = plugin_load('syntax',$name);
-        if($plugin != null){
-            $plugin->render($this->getFormat(),$this,$data);
+    function plugin($name, $data, $state = '', $match = '') {
+        /** @var DokuWiki_Syntax_Plugin $plugin */
+        $plugin = plugin_load('syntax', $name);
+        if($plugin != null) {
+            $plugin->render($this->getFormat(), $this, $data);
         }
     }
 
     /**
      * handle nested render instructions
      * this method (and nest_close method) should not be overloaded in actual renderer output classes
+     *
+     * @param array $instructions
      */
     function nest($instructions) {
-
-        foreach ( $instructions as $instruction ) {
+        foreach($instructions as $instruction) {
             // execute the callback against ourself
-            if (method_exists($this,$instruction[0])) {
+            if(method_exists($this, $instruction[0])) {
                 call_user_func_array(array($this, $instruction[0]), $instruction[1] ? $instruction[1] : array());
             }
         }
     }
 
-    // dummy closing instruction issued by Doku_Handler_Nest, normally the syntax mode should
-    // override this instruction when instantiating Doku_Handler_Nest - however plugins will not
-    // be able to - as their instructions require data.
-    function nest_close() {}
+    /**
+     * dummy closing instruction issued by Doku_Handler_Nest
+     *
+     * normally the syntax mode should override this instruction when instantiating Doku_Handler_Nest -
+     * however plugins will not be able to - as their instructions require data.
+     */
+    function nest_close() {
+    }
 
-    function document_start() {}
+    #region Syntax modes - sub classes will need to implement them to fill $doc
 
-    function document_end() {}
+    /**
+     * Initialize the document
+     */
+    function document_start() {
+    }
 
-    function render_TOC() { return ''; }
+    /**
+     * Finalize the document
+     */
+    function document_end() {
+    }
 
-    function toc_additem($id, $text, $level) {}
+    /**
+     * Render the Table of Contents
+     *
+     * @return string
+     */
+    function render_TOC() {
+        return '';
+    }
 
-    function header($text, $level, $pos) {}
+    /**
+     * Add an item to the TOC
+     *
+     * @param string $id       the hash link
+     * @param string $text     the text to display
+     * @param int    $level    the nesting level
+     */
+    function toc_additem($id, $text, $level) {
+    }
 
-    function section_open($level) {}
+    /**
+     * Render a heading
+     *
+     * @param string $text  the text to display
+     * @param int    $level header level
+     * @param int    $pos   byte position in the original source
+     */
+    function header($text, $level, $pos) {
+    }
 
-    function section_close() {}
+    /**
+     * Open a new section
+     *
+     * @param int $level section level (as determined by the previous header)
+     */
+    function section_open($level) {
+    }
 
-    function cdata($text) {}
+    /**
+     * Close the current section
+     */
+    function section_close() {
+    }
 
-    function p_open() {}
+    /**
+     * Render plain text data
+     *
+     * @param $text
+     */
+    function cdata($text) {
+    }
 
-    function p_close() {}
+    /**
+     * Open a paragraph
+     */
+    function p_open() {
+    }
 
-    function linebreak() {}
+    /**
+     * Close a paragraph
+     */
+    function p_close() {
+    }
 
-    function hr() {}
+    /**
+     * Create a line break
+     */
+    function linebreak() {
+    }
 
-    function strong_open() {}
+    /**
+     * Create a horizontal line
+     */
+    function hr() {
+    }
 
-    function strong_close() {}
+    /**
+     * Start strong (bold) formatting
+     */
+    function strong_open() {
+    }
 
-    function emphasis_open() {}
+    /**
+     * Stop strong (bold) formatting
+     */
+    function strong_close() {
+    }
 
-    function emphasis_close() {}
+    /**
+     * Start emphasis (italics) formatting
+     */
+    function emphasis_open() {
+    }
 
-    function underline_open() {}
+    /**
+     * Stop emphasis (italics) formatting
+     */
+    function emphasis_close() {
+    }
 
-    function underline_close() {}
+    /**
+     * Start underline formatting
+     */
+    function underline_open() {
+    }
 
-    function monospace_open() {}
+    /**
+     * Stop underline formatting
+     */
+    function underline_close() {
+    }
 
-    function monospace_close() {}
+    /**
+     * Start monospace formatting
+     */
+    function monospace_open() {
+    }
 
-    function subscript_open() {}
+    /**
+     * Stop monospace formatting
+     */
+    function monospace_close() {
+    }
 
-    function subscript_close() {}
+    /**
+     * Start a subscript
+     */
+    function subscript_open() {
+    }
 
-    function superscript_open() {}
+    /**
+     * Stop a subscript
+     */
+    function subscript_close() {
+    }
 
-    function superscript_close() {}
+    /**
+     * Start a superscript
+     */
+    function superscript_open() {
+    }
 
-    function deleted_open() {}
+    /**
+     * Stop a superscript
+     */
+    function superscript_close() {
+    }
 
-    function deleted_close() {}
+    /**
+     * Start deleted (strike-through) formatting
+     */
+    function deleted_open() {
+    }
 
-    function footnote_open() {}
+    /**
+     * Stop deleted (strike-through) formatting
+     */
+    function deleted_close() {
+    }
 
-    function footnote_close() {}
+    /**
+     * Start a footnote
+     */
+    function footnote_open() {
+    }
+
+    /**
+     * Stop a footnote
+     */
+    function footnote_close() {
+    }
 
-    function listu_open() {}
+    /**
+     * Open an unordered list
+     */
+    function listu_open() {
+    }
 
-    function listu_close() {}
+    /**
+     * Close an unordered list
+     */
+    function listu_close() {
+    }
 
-    function listo_open() {}
+    /**
+     * Open an ordered list
+     */
+    function listo_open() {
+    }
 
-    function listo_close() {}
+    /**
+     * Close an ordered list
+     */
+    function listo_close() {
+    }
 
-    function listitem_open($level) {}
+    /**
+     * Open a list item
+     *
+     * @param int $level the nesting level
+     */
+    function listitem_open($level) {
+    }
 
-    function listitem_close() {}
+    /**
+     * Close a list item
+     */
+    function listitem_close() {
+    }
 
-    function listcontent_open() {}
+    /**
+     * Start the content of a list item
+     */
+    function listcontent_open() {
+    }
 
-    function listcontent_close() {}
+    /**
+     * Stop the content of a list item
+     */
+    function listcontent_close() {
+    }
 
-    function unformatted($text) {}
+    /**
+     * Output unformatted $text
+     *
+     * Defaults to $this->cdata()
+     *
+     * @param string $text
+     */
+    function unformatted($text) {
+        $this->cdata($text);
+    }
 
-    function php($text) {}
+    /**
+     * Output inline PHP code
+     *
+     * If $conf['phpok'] is true this should evaluate the given code and append the result
+     * to $doc
+     *
+     * @param string $text The PHP code
+     */
+    function php($text) {
+    }
 
-    function phpblock($text) {}
+    /**
+     * Output block level PHP code
+     *
+     * If $conf['phpok'] is true this should evaluate the given code and append the result
+     * to $doc
+     *
+     * @param string $text The PHP code
+     */
+    function phpblock($text) {
+    }
 
-    function html($text) {}
+    /**
+     * Output raw inline HTML
+     *
+     * If $conf['htmlok'] is true this should add the code as is to $doc
+     *
+     * @param string $text The HTML
+     */
+    function html($text) {
+    }
 
-    function htmlblock($text) {}
+    /**
+     * Output raw block-level HTML
+     *
+     * If $conf['htmlok'] is true this should add the code as is to $doc
+     *
+     * @param string $text The HTML
+     */
+    function htmlblock($text) {
+    }
 
-    function preformatted($text) {}
+    /**
+     * Output preformatted text
+     *
+     * @param string $text
+     */
+    function preformatted($text) {
+    }
 
-    function quote_open() {}
+    /**
+     * Start a block quote
+     */
+    function quote_open() {
+    }
 
-    function quote_close() {}
+    /**
+     * Stop a block quote
+     */
+    function quote_close() {
+    }
 
-    function file($text, $lang = null, $file = null ) {}
+    /**
+     * Display text as file content, optionally syntax highlighted
+     *
+     * @param string $text text to show
+     * @param string $lang programming language to use for syntax highlighting
+     * @param string $file file path label
+     */
+    function file($text, $lang = null, $file = null) {
+    }
 
-    function code($text, $lang = null, $file = null ) {}
+    /**
+     * Display text as code content, optionally syntax highlighted
+     *
+     * @param string $text text to show
+     * @param string $lang programming language to use for syntax highlighting
+     * @param string $file file path label
+     */
+    function code($text, $lang = null, $file = null) {
+    }
 
-    function acronym($acronym) {}
+    /**
+     * Format an acronym
+     *
+     * Uses $this->acronyms
+     *
+     * @param string $acronym
+     */
+    function acronym($acronym) {
+    }
 
-    function smiley($smiley) {}
+    /**
+     * Format a smiley
+     *
+     * Uses $this->smiley
+     *
+     * @param string $smiley
+     */
+    function smiley($smiley) {
+    }
 
-    function wordblock($word) {}
+    /**
+     * Format an entity
+     *
+     * Entities are basically small text replacements
+     *
+     * Uses $this->entities
+     *
+     * @param string $entity
+     */
+    function entity($entity) {
+    }
 
-    function entity($entity) {}
+    /**
+     * Typographically format a multiply sign
+     *
+     * Example: ($x=640, $y=480) should result in "640×480"
+     *
+     * @param string|int $x first value
+     * @param string|int $y second value
+     */
+    function multiplyentity($x, $y) {
+    }
 
-    // 640x480 ($x=640, $y=480)
-    function multiplyentity($x, $y) {}
+    /**
+     * Render an opening single quote char (language specific)
+     */
+    function singlequoteopening() {
+    }
 
-    function singlequoteopening() {}
+    /**
+     * Render a closing single quote char (language specific)
+     */
+    function singlequoteclosing() {
+    }
 
-    function singlequoteclosing() {}
+    /**
+     * Render an apostrophe char (language specific)
+     */
+    function apostrophe() {
+    }
 
-    function apostrophe() {}
+    /**
+     * Render an opening double quote char (language specific)
+     */
+    function doublequoteopening() {
+    }
 
-    function doublequoteopening() {}
+    /**
+     * Render an closinging double quote char (language specific)
+     */
+    function doublequoteclosing() {
+    }
 
-    function doublequoteclosing() {}
+    /**
+     * Render a CamelCase link
+     *
+     * @param string $link The link name
+     * @see http://en.wikipedia.org/wiki/CamelCase
+     */
+    function camelcaselink($link) {
+    }
 
-    // $link like 'SomePage'
-    function camelcaselink($link) {}
+    /**
+     * Render a page local link
+     *
+     * @param string $hash hash link identifier
+     * @param string $name name for the link
+     */
+    function locallink($hash, $name = null) {
+    }
 
-    function locallink($hash, $name = null) {}
+    /**
+     * Render a wiki internal link
+     *
+     * @param string       $link  page ID to link to. eg. 'wiki:syntax'
+     * @param string|array $title name for the link, array for media file
+     */
+    function internallink($link, $title = null) {
+    }
 
-    // $link like 'wiki:syntax', $title could be an array (media)
-    function internallink($link, $title = null) {}
+    /**
+     * Render an external link
+     *
+     * @param string       $link  full URL with scheme
+     * @param string|array $title name for the link, array for media file
+     */
+    function externallink($link, $title = null) {
+    }
 
-    // $link is full URL with scheme, $title could be an array (media)
-    function externallink($link, $title = null) {}
+    /**
+     * Render the output of an RSS feed
+     *
+     * @param string $url    URL of the feed
+     * @param array  $params Finetuning of the output
+     */
+    function rss($url, $params) {
+    }
 
-    function rss ($url,$params) {}
+    /**
+     * Render an interwiki link
+     *
+     * You may want to use $this->_resolveInterWiki() here
+     *
+     * @param string       $link     original link - probably not much use
+     * @param string|array $title    name for the link, array for media file
+     * @param string       $wikiName indentifier (shortcut) for the remote wiki
+     * @param string       $wikiUri  the fragment parsed from the original link
+     */
+    function interwikilink($link, $title = null, $wikiName, $wikiUri) {
+    }
 
-    // $link is the original link - probably not much use
-    // $wikiName is an indentifier for the wiki
-    // $wikiUri is the URL fragment to append to some known URL
-    function interwikilink($link, $title = null, $wikiName, $wikiUri) {}
+    /**
+     * Link to file on users OS
+     *
+     * @param string       $link  the link
+     * @param string|array $title name for the link, array for media file
+     */
+    function filelink($link, $title = null) {
+    }
 
-    // Link to file on users OS, $title could be an array (media)
-    function filelink($link, $title = null) {}
+    /**
+     * Link to windows share
+     *
+     * @param string       $link  the link
+     * @param string|array $title name for the link, array for media file
+     */
+    function windowssharelink($link, $title = null) {
+    }
 
-    // Link to a Windows share, , $title could be an array (media)
-    function windowssharelink($link, $title = null) {}
+    /**
+     * Render a linked E-Mail Address
+     *
+     * Should honor $conf['mailguard'] setting
+     *
+     * @param string $address Email-Address
+     * @param string|array $name name for the link, array for media file
+     */
+    function emaillink($address, $name = null) {
+    }
 
-//  function email($address, $title = null) {}
-    function emaillink($address, $name = null) {}
+    /**
+     * Render an internal media file
+     *
+     * @param string $src     media ID
+     * @param string $title   descriptive text
+     * @param string $align   left|center|right
+     * @param int    $width   width of media in pixel
+     * @param int    $height  height of media in pixel
+     * @param string $cache   cache|recache|nocache
+     * @param string $linking linkonly|detail|nolink
+     */
+    function internalmedia($src, $title = null, $align = null, $width = null,
+                           $height = null, $cache = null, $linking = null) {
+    }
 
-    function internalmedia ($src, $title=null, $align=null, $width=null,
-                            $height=null, $cache=null, $linking=null) {}
+    /**
+     * Render an external media file
+     *
+     * @param string $src     full media URL
+     * @param string $title   descriptive text
+     * @param string $align   left|center|right
+     * @param int    $width   width of media in pixel
+     * @param int    $height  height of media in pixel
+     * @param string $cache   cache|recache|nocache
+     * @param string $linking linkonly|detail|nolink
+     */
+    function externalmedia($src, $title = null, $align = null, $width = null,
+                           $height = null, $cache = null, $linking = null) {
+    }
 
-    function externalmedia ($src, $title=null, $align=null, $width=null,
-                            $height=null, $cache=null, $linking=null) {}
+    /**
+     * Render a link to an internal media file
+     *
+     * @param string $src     media ID
+     * @param string $title   descriptive text
+     * @param string $align   left|center|right
+     * @param int    $width   width of media in pixel
+     * @param int    $height  height of media in pixel
+     * @param string $cache   cache|recache|nocache
+     */
+    function internalmedialink($src, $title = null, $align = null,
+                               $width = null, $height = null, $cache = null) {
+    }
 
-    function internalmedialink (
-        $src,$title=null,$align=null,$width=null,$height=null,$cache=null
-        ) {}
+    /**
+     * Render a link to an external media file
+     *
+     * @param string $src     media ID
+     * @param string $title   descriptive text
+     * @param string $align   left|center|right
+     * @param int    $width   width of media in pixel
+     * @param int    $height  height of media in pixel
+     * @param string $cache   cache|recache|nocache
+     */
+    function externalmedialink($src, $title = null, $align = null,
+                               $width = null, $height = null, $cache = null) {
+    }
 
-    function externalmedialink(
-        $src,$title=null,$align=null,$width=null,$height=null,$cache=null
-        ) {}
+    /**
+     * Start a table
+     *
+     * @param int $maxcols maximum number of columns
+     * @param int $numrows NOT IMPLEMENTED
+     * @param int $pos     byte position in the original source
+     */
+    function table_open($maxcols = null, $numrows = null, $pos = null) {
+    }
 
-    function table_open($maxcols = null, $numrows = null, $pos = null){}
+    /**
+     * Close a table
+     *
+     * @param int $pos byte position in the original source
+     */
+    function table_close($pos = null) {
+    }
 
-    function table_close($pos = null){}
+    /**
+     * Open a table header
+     */
+    function tablethead_open() {
+    }
 
-    function tablerow_open(){}
+    /**
+     * Close a table header
+     */
+    function tablethead_close() {
+    }
 
-    function tablerow_close(){}
+    /**
+     * Open a table row
+     */
+    function tablerow_open() {
+    }
 
-    function tableheader_open($colspan = 1, $align = null, $rowspan = 1){}
+    /**
+     * Close a table row
+     */
+    function tablerow_close() {
+    }
 
-    function tableheader_close(){}
+    /**
+     * Open a table header cell
+     *
+     * @param int    $colspan
+     * @param string $align left|center|right
+     * @param int    $rowspan
+     */
+    function tableheader_open($colspan = 1, $align = null, $rowspan = 1) {
+    }
 
-    function tablecell_open($colspan = 1, $align = null, $rowspan = 1){}
+    /**
+     * Close a table header cell
+     */
+    function tableheader_close() {
+    }
 
-    function tablecell_close(){}
+    /**
+     * Open a table cell
+     *
+     * @param int    $colspan
+     * @param string $align left|center|right
+     * @param int    $rowspan
+     */
+    function tablecell_open($colspan = 1, $align = null, $rowspan = 1) {
+    }
 
+    /**
+     * Close a table cell
+     */
+    function tablecell_close() {
+    }
 
-    // util functions follow, you probably won't need to reimplement them
+    #endregion
 
+    #region util functions, you probably won't need to reimplement them
 
     /**
      * Removes any Namespace from the given name but keeps
@@ -273,17 +760,17 @@ class Doku_Renderer extends DokuWiki_Plugin {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function _simpleTitle($name){
+    function _simpleTitle($name) {
         global $conf;
 
         //if there is a hash we use the ancor name only
-        list($name,$hash) = explode('#',$name,2);
+        @list($name, $hash) = explode('#', $name, 2);
         if($hash) return $hash;
 
-        if($conf['useslash']){
-            $name = strtr($name,';/',';:');
-        }else{
-            $name = strtr($name,';',':');
+        if($conf['useslash']) {
+            $name = strtr($name, ';/', ';:');
+        } else {
+            $name = strtr($name, ';', ':');
         }
 
         return noNSorNS($name);
@@ -292,39 +779,47 @@ class Doku_Renderer extends DokuWiki_Plugin {
     /**
      * Resolve an interwikilink
      */
-    function _resolveInterWiki(&$shortcut,$reference){
+    function _resolveInterWiki(&$shortcut, $reference, &$exists = null) {
         //get interwiki URL
-        if ( isset($this->interwiki[$shortcut]) ) {
+        if(isset($this->interwiki[$shortcut])) {
             $url = $this->interwiki[$shortcut];
         } else {
             // Default to Google I'm feeling lucky
-            $url = 'http://www.google.com/search?q={URL}&amp;btnI=lucky';
+            $url      = 'http://www.google.com/search?q={URL}&amp;btnI=lucky';
             $shortcut = 'go';
         }
 
         //split into hash and url part
-        list($reference,$hash) = explode('#',$reference,2);
+        @list($reference, $hash) = explode('#', $reference, 2);
 
         //replace placeholder
-        if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#',$url)){
+        if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#', $url)) {
             //use placeholders
-            $url = str_replace('{URL}',rawurlencode($reference),$url);
-            $url = str_replace('{NAME}',$reference,$url);
+            $url    = str_replace('{URL}', rawurlencode($reference), $url);
+            $url    = str_replace('{NAME}', $reference, $url);
             $parsed = parse_url($reference);
             if(!$parsed['port']) $parsed['port'] = 80;
-            $url = str_replace('{SCHEME}',$parsed['scheme'],$url);
-            $url = str_replace('{HOST}',$parsed['host'],$url);
-            $url = str_replace('{PORT}',$parsed['port'],$url);
-            $url = str_replace('{PATH}',$parsed['path'],$url);
-            $url = str_replace('{QUERY}',$parsed['query'],$url);
-        }else{
+            $url = str_replace('{SCHEME}', $parsed['scheme'], $url);
+            $url = str_replace('{HOST}', $parsed['host'], $url);
+            $url = str_replace('{PORT}', $parsed['port'], $url);
+            $url = str_replace('{PATH}', $parsed['path'], $url);
+            $url = str_replace('{QUERY}', $parsed['query'], $url);
+        } else {
             //default
             $url = $url.rawurlencode($reference);
         }
+        //handle as wiki links
+        if($url{0} === ':') {
+            list($id, $urlparam) = explode('?', $url, 2);
+            $url    = wl(cleanID($id), $urlparam);
+            $exists = page_exists($id);
+        }
         if($hash) $url .= '#'.rawurlencode($hash);
 
         return $url;
     }
+
+    #endregion
 }
 
 
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 80701cd2e..5c0353688 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -7,40 +7,53 @@
  */
 if(!defined('DOKU_INC')) die('meh.');
 
-if ( !defined('DOKU_LF') ) {
+if(!defined('DOKU_LF')) {
     // Some whitespace to help View > Source
-    define ('DOKU_LF',"\n");
+    define ('DOKU_LF', "\n");
 }
 
-if ( !defined('DOKU_TAB') ) {
+if(!defined('DOKU_TAB')) {
     // Some whitespace to help View > Source
-    define ('DOKU_TAB',"\t");
+    define ('DOKU_TAB', "\t");
 }
 
-require_once DOKU_INC . 'inc/parser/renderer.php';
-require_once DOKU_INC . 'inc/html.php';
-
 /**
- * The Renderer
+ * The XHTML Renderer
+ *
+ * This is DokuWiki's main renderer used to display page content in the wiki
  */
 class Doku_Renderer_xhtml extends Doku_Renderer {
+    /** @var array store the table of contents */
+    public $toc = array();
 
-    // @access public
-    var $doc = '';        // will contain the whole document
-    var $toc = array();   // will contain the Table of Contents
+    /** @var array A stack of section edit data */
+    protected $sectionedits = array();
 
-    var $sectionedits = array(); // A stack of section edit data
-    private $lastsecid = 0; // last section edit id, used by startSectionEdit
+    /** @var int last section edit id, used by startSectionEdit */
+    protected $lastsecid = 0;
+
+    /** @var array the list of headers used to create unique link ids */
+    protected $headers = array();
 
-    var $headers = array();
     /** @var array a list of footnotes, list starts at 1! */
-    var $footnotes = array();
-    var $lastlevel = 0;
-    var $node = array(0,0,0,0,0);
-    var $store = '';
+    protected $footnotes = array();
+
+    /** @var int current section level */
+    protected $lastlevel = 0;
+    /** @var array section node tracker */
+    protected $node = array(0, 0, 0, 0, 0);
 
-    var $_counter   = array(); // used as global counter, introduced for table classes
-    var $_codeblock = 0; // counts the code and file blocks, used to provide download links
+    /** @var string temporary $doc store */
+    protected $store = '';
+
+    /** @var array global counter, for table classes etc. */
+    protected $_counter = array(); //
+
+    /** @var int counts the code and file blocks, used to provide download links */
+    protected $_codeblock = 0;
+
+    /** @var array list of allowed URL schemes */
+    protected $schemes = null;
 
     /**
      * Register a new edit section range
@@ -53,43 +66,53 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      */
     public function startSectionEdit($start, $type, $title = null) {
         $this->sectionedits[] = array(++$this->lastsecid, $start, $type, $title);
-        return 'sectionedit' . $this->lastsecid;
+        return 'sectionedit'.$this->lastsecid;
     }
 
     /**
      * Finish an edit section range
      *
-     * @param $end int The byte position for the edit end; null for the rest of
+     * @param $end     int The byte position for the edit end; null for the rest of
      *                 the page
      * @author Adrian Lang <lang@cosmocode.de>
      */
     public function finishSectionEdit($end = null) {
         list($id, $start, $type, $title) = array_pop($this->sectionedits);
-        if (!is_null($end) && $end <= $start) {
+        if(!is_null($end) && $end <= $start) {
             return;
         }
-        $this->doc .= "<!-- EDIT$id " . strtoupper($type) . ' ';
-        if (!is_null($title)) {
-            $this->doc .= '"' . str_replace('"', '', $title) . '" ';
+        $this->doc .= "<!-- EDIT$id ".strtoupper($type).' ';
+        if(!is_null($title)) {
+            $this->doc .= '"'.str_replace('"', '', $title).'" ';
         }
-        $this->doc .= "[$start-" . (is_null($end) ? '' : $end) . '] -->';
+        $this->doc .= "[$start-".(is_null($end) ? '' : $end).'] -->';
     }
 
-    function getFormat(){
+    /**
+     * Returns the format produced by this renderer.
+     *
+     * @return string always 'xhtml'
+     */
+    function getFormat() {
         return 'xhtml';
     }
 
-
+    /**
+     * Initialize the document
+     */
     function document_start() {
         //reset some internals
         $this->toc     = array();
         $this->headers = array();
     }
 
+    /**
+     * Finalize the document
+     */
     function document_end() {
         // Finish open section edits.
-        while (count($this->sectionedits) > 0) {
-            if ($this->sectionedits[count($this->sectionedits) - 1][1] <= 1) {
+        while(count($this->sectionedits) > 0) {
+            if($this->sectionedits[count($this->sectionedits) - 1][1] <= 1) {
                 // If there is only one section, do not write a section edit
                 // marker.
                 array_pop($this->sectionedits);
@@ -98,12 +121,12 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             }
         }
 
-        if ( count ($this->footnotes) > 0 ) {
+        if(count($this->footnotes) > 0) {
             $this->doc .= '<div class="footnotes">'.DOKU_LF;
 
-            foreach ( $this->footnotes as $id => $footnote ) {
+            foreach($this->footnotes as $id => $footnote) {
                 // check its not a placeholder that indicates actual footnote text is elsewhere
-                if (substr($footnote, 0, 5) != "@@FNT") {
+                if(substr($footnote, 0, 5) != "@@FNT") {
 
                     // open the footnote and set the anchor and backlink
                     $this->doc .= '<div class="fn">';
@@ -113,8 +136,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
                     // get any other footnotes that use the same markup
                     $alt = array_keys($this->footnotes, "@@FNT$id");
 
-                    if (count($alt)) {
-                        foreach ($alt as $ref) {
+                    if(count($alt)) {
+                        foreach($alt as $ref) {
                             // set anchor and backlink for the other footnotes
                             $this->doc .= ', <sup><a href="#fnt__'.($ref).'" id="fn__'.($ref).'" class="fn_bot">';
                             $this->doc .= ($ref).')</a></sup> '.DOKU_LF;
@@ -123,7 +146,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
                     // add footnote markup and close this footnote
                     $this->doc .= $footnote;
-                    $this->doc .= '</div>' . DOKU_LF;
+                    $this->doc .= '</div>'.DOKU_LF;
                 }
             }
             $this->doc .= '</div>'.DOKU_LF;
@@ -131,139 +154,221 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         // Prepare the TOC
         global $conf;
-        if($this->info['toc'] && is_array($this->toc) && $conf['tocminheads'] && count($this->toc) >= $conf['tocminheads']){
+        if($this->info['toc'] && is_array($this->toc) && $conf['tocminheads'] && count($this->toc) >= $conf['tocminheads']) {
             global $TOC;
             $TOC = $this->toc;
         }
 
         // make sure there are no empty paragraphs
-        $this->doc = preg_replace('#<p>\s*</p>#','',$this->doc);
+        $this->doc = preg_replace('#<p>\s*</p>#', '', $this->doc);
     }
 
+    /**
+     * Add an item to the TOC
+     *
+     * @param string $id       the hash link
+     * @param string $text     the text to display
+     * @param int    $level    the nesting level
+     */
     function toc_additem($id, $text, $level) {
         global $conf;
 
         //handle TOC
-        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']){
-            $this->toc[] = html_mktocitem($id, $text, $level-$conf['toptoclevel']+1);
+        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']) {
+            $this->toc[] = html_mktocitem($id, $text, $level - $conf['toptoclevel'] + 1);
         }
     }
 
+    /**
+     * Render a heading
+     *
+     * @param string $text  the text to display
+     * @param int    $level header level
+     * @param int    $pos   byte position in the original source
+     */
     function header($text, $level, $pos) {
         global $conf;
 
         if(!$text) return; //skip empty headlines
 
-        $hid = $this->_headerToLink($text,true);
+        $hid = $this->_headerToLink($text, true);
 
         //only add items within configured levels
         $this->toc_additem($hid, $text, $level);
 
         // adjust $node to reflect hierarchy of levels
-        $this->node[$level-1]++;
-        if ($level < $this->lastlevel) {
-            for ($i = 0; $i < $this->lastlevel-$level; $i++) {
-                $this->node[$this->lastlevel-$i-1] = 0;
+        $this->node[$level - 1]++;
+        if($level < $this->lastlevel) {
+            for($i = 0; $i < $this->lastlevel - $level; $i++) {
+                $this->node[$this->lastlevel - $i - 1] = 0;
             }
         }
         $this->lastlevel = $level;
 
-        if ($level <= $conf['maxseclevel'] &&
+        if($level <= $conf['maxseclevel'] &&
             count($this->sectionedits) > 0 &&
-            $this->sectionedits[count($this->sectionedits) - 1][2] === 'section') {
+            $this->sectionedits[count($this->sectionedits) - 1][2] === 'section'
+        ) {
             $this->finishSectionEdit($pos - 1);
         }
 
         // write the header
         $this->doc .= DOKU_LF.'<h'.$level;
-        if ($level <= $conf['maxseclevel']) {
-            $this->doc .= ' class="' . $this->startSectionEdit($pos, 'section', $text) . '"';
+        if($level <= $conf['maxseclevel']) {
+            $this->doc .= ' class="'.$this->startSectionEdit($pos, 'section', $text).'"';
         }
         $this->doc .= ' id="'.$hid.'">';
         $this->doc .= $this->_xmlEntities($text);
         $this->doc .= "</h$level>".DOKU_LF;
     }
 
+    /**
+     * Open a new section
+     *
+     * @param int $level section level (as determined by the previous header)
+     */
     function section_open($level) {
-        $this->doc .= '<div class="level' . $level . '">' . DOKU_LF;
+        $this->doc .= '<div class="level'.$level.'">'.DOKU_LF;
     }
 
+    /**
+     * Close the current section
+     */
     function section_close() {
         $this->doc .= DOKU_LF.'</div>'.DOKU_LF;
     }
 
+    /**
+     * Render plain text data
+     *
+     * @param $text
+     */
     function cdata($text) {
         $this->doc .= $this->_xmlEntities($text);
     }
 
+    /**
+     * Open a paragraph
+     */
     function p_open() {
         $this->doc .= DOKU_LF.'<p>'.DOKU_LF;
     }
 
+    /**
+     * Close a paragraph
+     */
     function p_close() {
         $this->doc .= DOKU_LF.'</p>'.DOKU_LF;
     }
 
+    /**
+     * Create a line break
+     */
     function linebreak() {
         $this->doc .= '<br/>'.DOKU_LF;
     }
 
+    /**
+     * Create a horizontal line
+     */
     function hr() {
         $this->doc .= '<hr />'.DOKU_LF;
     }
 
+    /**
+     * Start strong (bold) formatting
+     */
     function strong_open() {
         $this->doc .= '<strong>';
     }
 
+    /**
+     * Stop strong (bold) formatting
+     */
     function strong_close() {
         $this->doc .= '</strong>';
     }
 
+    /**
+     * Start emphasis (italics) formatting
+     */
     function emphasis_open() {
         $this->doc .= '<em>';
     }
 
+    /**
+     * Stop emphasis (italics) formatting
+     */
     function emphasis_close() {
         $this->doc .= '</em>';
     }
 
+    /**
+     * Start underline formatting
+     */
     function underline_open() {
         $this->doc .= '<em class="u">';
     }
 
+    /**
+     * Stop underline formatting
+     */
     function underline_close() {
         $this->doc .= '</em>';
     }
 
+    /**
+     * Start monospace formatting
+     */
     function monospace_open() {
         $this->doc .= '<code>';
     }
 
+    /**
+     * Stop monospace formatting
+     */
     function monospace_close() {
         $this->doc .= '</code>';
     }
 
+    /**
+     * Start a subscript
+     */
     function subscript_open() {
         $this->doc .= '<sub>';
     }
 
+    /**
+     * Stop a subscript
+     */
     function subscript_close() {
         $this->doc .= '</sub>';
     }
 
+    /**
+     * Start a superscript
+     */
     function superscript_open() {
         $this->doc .= '<sup>';
     }
 
+    /**
+     * Stop a superscript
+     */
     function superscript_close() {
         $this->doc .= '</sup>';
     }
 
+    /**
+     * Start deleted (strike-through) formatting
+     */
     function deleted_open() {
         $this->doc .= '<del>';
     }
 
+    /**
+     * Stop deleted (strike-through) formatting
+     */
     function deleted_close() {
         $this->doc .= '</del>';
     }
@@ -299,14 +404,14 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $fnid++;
 
         // recover footnote into the stack and restore old content
-        $footnote = $this->doc;
-        $this->doc = $this->store;
+        $footnote    = $this->doc;
+        $this->doc   = $this->store;
         $this->store = '';
 
         // check to see if this footnote has been seen before
         $i = array_search($footnote, $this->footnotes);
 
-        if ($i === false) {
+        if($i === false) {
             // its a new footnote, add it to the $footnotes array
             $this->footnotes[$fnid] = $footnote;
         } else {
@@ -318,38 +423,71 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= '<sup><a href="#fn__'.$fnid.'" id="fnt__'.$fnid.'" class="fn_top">'.$fnid.')</a></sup>';
     }
 
+    /**
+     * Open an unordered list
+     */
     function listu_open() {
         $this->doc .= '<ul>'.DOKU_LF;
     }
 
+    /**
+     * Close an unordered list
+     */
     function listu_close() {
         $this->doc .= '</ul>'.DOKU_LF;
     }
 
+    /**
+     * Open an ordered list
+     */
     function listo_open() {
         $this->doc .= '<ol>'.DOKU_LF;
     }
 
+    /**
+     * Close an ordered list
+     */
     function listo_close() {
         $this->doc .= '</ol>'.DOKU_LF;
     }
 
+    /**
+     * Open a list item
+     *
+     * @param int $level the nesting level
+     */
     function listitem_open($level) {
         $this->doc .= '<li class="level'.$level.'">';
     }
 
+    /**
+     * Close a list item
+     */
     function listitem_close() {
         $this->doc .= '</li>'.DOKU_LF;
     }
 
+    /**
+     * Start the content of a list item
+     */
     function listcontent_open() {
         $this->doc .= '<div class="li">';
     }
 
+    /**
+     * Stop the content of a list item
+     */
     function listcontent_close() {
         $this->doc .= '</div>'.DOKU_LF;
     }
 
+    /**
+     * Output unformatted $text
+     *
+     * Defaults to $this->cdata()
+     *
+     * @param string $text
+     */
     function unformatted($text) {
         $this->doc .= $this->_xmlEntities($text);
     }
@@ -357,15 +495,15 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     /**
      * Execute PHP code if allowed
      *
-     * @param  string   $text      PHP code that is either executed or printed
-     * @param  string   $wrapper   html element to wrap result if $conf['phpok'] is okff
+     * @param  string $text      PHP code that is either executed or printed
+     * @param  string $wrapper   html element to wrap result if $conf['phpok'] is okff
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function php($text, $wrapper='code') {
+    function php($text, $wrapper = 'code') {
         global $conf;
 
-        if($conf['phpok']){
+        if($conf['phpok']) {
             ob_start();
             eval($text);
             $this->doc .= ob_get_contents();
@@ -375,6 +513,14 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
     }
 
+    /**
+     * Output block level PHP code
+     *
+     * If $conf['phpok'] is true this should evaluate the given code and append the result
+     * to $doc
+     *
+     * @param string $text The PHP code
+     */
     function phpblock($text) {
         $this->php($text, 'pre');
     }
@@ -382,75 +528,110 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     /**
      * Insert HTML if allowed
      *
-     * @param  string   $text      html text
-     * @param  string   $wrapper   html element to wrap result if $conf['htmlok'] is okff
+     * @param  string $text      html text
+     * @param  string $wrapper   html element to wrap result if $conf['htmlok'] is okff
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function html($text, $wrapper='code') {
+    function html($text, $wrapper = 'code') {
         global $conf;
 
-        if($conf['htmlok']){
+        if($conf['htmlok']) {
             $this->doc .= $text;
         } else {
             $this->doc .= p_xhtml_cached_geshi($text, 'html4strict', $wrapper);
         }
     }
 
+    /**
+     * Output raw block-level HTML
+     *
+     * If $conf['htmlok'] is true this should add the code as is to $doc
+     *
+     * @param string $text The HTML
+     */
     function htmlblock($text) {
         $this->html($text, 'pre');
     }
 
+    /**
+     * Start a block quote
+     */
     function quote_open() {
         $this->doc .= '<blockquote><div class="no">'.DOKU_LF;
     }
 
+    /**
+     * Stop a block quote
+     */
     function quote_close() {
         $this->doc .= '</div></blockquote>'.DOKU_LF;
     }
 
+    /**
+     * Output preformatted text
+     *
+     * @param string $text
+     */
     function preformatted($text) {
-        $this->doc .= '<pre class="code">' . trim($this->_xmlEntities($text),"\n\r") . '</pre>'. DOKU_LF;
+        $this->doc .= '<pre class="code">'.trim($this->_xmlEntities($text), "\n\r").'</pre>'.DOKU_LF;
     }
 
-    function file($text, $language=null, $filename=null) {
-        $this->_highlight('file',$text,$language,$filename);
+    /**
+     * Display text as file content, optionally syntax highlighted
+     *
+     * @param string $text     text to show
+     * @param string $language programming language to use for syntax highlighting
+     * @param string $filename file path label
+     */
+    function file($text, $language = null, $filename = null) {
+        $this->_highlight('file', $text, $language, $filename);
     }
 
-    function code($text, $language=null, $filename=null) {
-        $this->_highlight('code',$text,$language,$filename);
+    /**
+     * Display text as code content, optionally syntax highlighted
+     *
+     * @param string $text     text to show
+     * @param string $language programming language to use for syntax highlighting
+     * @param string $filename file path label
+     */
+    function code($text, $language = null, $filename = null) {
+        $this->_highlight('code', $text, $language, $filename);
     }
 
     /**
      * Use GeSHi to highlight language syntax in code and file blocks
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     * @param string $type     code|file
+     * @param string $text     text to show
+     * @param string $language programming language to use for syntax highlighting
+     * @param string $filename file path label
      */
-    function _highlight($type, $text, $language=null, $filename=null) {
-        global $conf;
+    function _highlight($type, $text, $language = null, $filename = null) {
         global $ID;
         global $lang;
 
-        if($filename){
+        if($filename) {
             // add icon
-            list($ext) = mimetype($filename,false);
-            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            list($ext) = mimetype($filename, false);
+            $class = preg_replace('/[^_\-a-z0-9]+/i', '_', $ext);
             $class = 'mediafile mf_'.$class;
 
             $this->doc .= '<dl class="'.$type.'">'.DOKU_LF;
-            $this->doc .= '<dt><a href="'.exportlink($ID,'code',array('codeblock'=>$this->_codeblock)).'" title="'.$lang['download'].'" class="'.$class.'">';
+            $this->doc .= '<dt><a href="'.exportlink($ID, 'code', array('codeblock' => $this->_codeblock)).'" title="'.$lang['download'].'" class="'.$class.'">';
             $this->doc .= hsc($filename);
             $this->doc .= '</a></dt>'.DOKU_LF.'<dd>';
         }
 
-        if ($text{0} == "\n") {
+        if($text{0} == "\n") {
             $text = substr($text, 1);
         }
-        if (substr($text, -1) == "\n") {
+        if(substr($text, -1) == "\n") {
             $text = substr($text, 0, -1);
         }
 
-        if ( is_null($language) ) {
+        if(is_null($language)) {
             $this->doc .= '<pre class="'.$type.'">'.$this->_xmlEntities($text).'</pre>'.DOKU_LF;
         } else {
             $class = 'code'; //we always need the code class to make the syntax highlighting apply
@@ -459,16 +640,23 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $this->doc .= "<pre class=\"$class $language\">".p_xhtml_cached_geshi($text, $language, '').'</pre>'.DOKU_LF;
         }
 
-        if($filename){
+        if($filename) {
             $this->doc .= '</dd></dl>'.DOKU_LF;
         }
 
         $this->_codeblock++;
     }
 
+    /**
+     * Format an acronym
+     *
+     * Uses $this->acronyms
+     *
+     * @param string $acronym
+     */
     function acronym($acronym) {
 
-        if ( array_key_exists($acronym, $this->acronyms) ) {
+        if(array_key_exists($acronym, $this->acronyms)) {
 
             $title = $this->_xmlEntities($this->acronyms[$acronym]);
 
@@ -480,73 +668,109 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
     }
 
+    /**
+     * Format a smiley
+     *
+     * Uses $this->smiley
+     *
+     * @param string $smiley
+     */
     function smiley($smiley) {
-        if ( array_key_exists($smiley, $this->smileys) ) {
-            $title = $this->_xmlEntities($this->smileys[$smiley]);
+        if(array_key_exists($smiley, $this->smileys)) {
             $this->doc .= '<img src="'.DOKU_BASE.'lib/images/smileys/'.$this->smileys[$smiley].
                 '" class="icon" alt="'.
-                    $this->_xmlEntities($smiley).'" />';
+                $this->_xmlEntities($smiley).'" />';
         } else {
             $this->doc .= $this->_xmlEntities($smiley);
         }
     }
 
-    /*
-    * not used
-    function wordblock($word) {
-        if ( array_key_exists($word, $this->badwords) ) {
-            $this->doc .= '** BLEEP **';
-        } else {
-            $this->doc .= $this->_xmlEntities($word);
-        }
-    }
-    */
-
+    /**
+     * Format an entity
+     *
+     * Entities are basically small text replacements
+     *
+     * Uses $this->entities
+     *
+     * @param string $entity
+     */
     function entity($entity) {
-        if ( array_key_exists($entity, $this->entities) ) {
+        if(array_key_exists($entity, $this->entities)) {
             $this->doc .= $this->entities[$entity];
         } else {
             $this->doc .= $this->_xmlEntities($entity);
         }
     }
 
+    /**
+     * Typographically format a multiply sign
+     *
+     * Example: ($x=640, $y=480) should result in "640×480"
+     *
+     * @param string|int $x first value
+     * @param string|int $y second value
+     */
     function multiplyentity($x, $y) {
         $this->doc .= "$x&times;$y";
     }
 
+    /**
+     * Render an opening single quote char (language specific)
+     */
     function singlequoteopening() {
         global $lang;
         $this->doc .= $lang['singlequoteopening'];
     }
 
+    /**
+     * Render a closing single quote char (language specific)
+     */
     function singlequoteclosing() {
         global $lang;
         $this->doc .= $lang['singlequoteclosing'];
     }
 
+    /**
+     * Render an apostrophe char (language specific)
+     */
     function apostrophe() {
         global $lang;
         $this->doc .= $lang['apostrophe'];
     }
 
+    /**
+     * Render an opening double quote char (language specific)
+     */
     function doublequoteopening() {
         global $lang;
         $this->doc .= $lang['doublequoteopening'];
     }
 
+    /**
+     * Render an closinging double quote char (language specific)
+     */
     function doublequoteclosing() {
         global $lang;
         $this->doc .= $lang['doublequoteclosing'];
     }
 
     /**
+     * Render a CamelCase link
+     *
+     * @param string $link The link name
+     * @see http://en.wikipedia.org/wiki/CamelCase
      */
     function camelcaselink($link) {
-        $this->internallink($link,$link);
+        $this->internallink($link, $link);
     }
 
-
-    function locallink($hash, $name = null){
+    /**
+     * Render a page local link
+     *
+     * @param string $hash hash link identifier
+     * @param string $name name for the link
+     */
+    function locallink($hash, $name = null) {
         global $ID;
         $name  = $this->_getLinkTitle($name, $hash, $isImage);
         $hash  = $this->_headerToLink($hash);
@@ -563,16 +787,22 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * elsewhere - no need to implement them in other renderers
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     * @param string      $id         pageid
+     * @param string|null $name       link name
+     * @param string|null $search     adds search url param
+     * @param bool        $returnonly whether to return html or write to doc attribute
+     * @param string      $linktype   type to set use of headings
+     * @return void|string writes to doc attribute or returns html depends on $returnonly
      */
-    function internallink($id, $name = null, $search=null,$returnonly=false,$linktype='content') {
+    function internallink($id, $name = null, $search = null, $returnonly = false, $linktype = 'content') {
         global $conf;
         global $ID;
         global $INFO;
 
         $params = '';
-        $parts = explode('?', $id, 2);
-        if (count($parts) === 2) {
-            $id = $parts[0];
+        $parts  = explode('?', $id, 2);
+        if(count($parts) === 2) {
+            $id     = $parts[0];
             $params = $parts[1];
         }
 
@@ -580,7 +810,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         // We need this check because _simpleTitle needs
         // correct $id and resolve_pageid() use cleanID($id)
         // (some things could be lost)
-        if ($id === '') {
+        if($id === '') {
             $id = $ID;
         }
 
@@ -588,22 +818,22 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $default = $this->_simpleTitle($id);
 
         // now first resolve and clean up the $id
-        resolve_pageid(getNS($ID),$id,$exists);
+        resolve_pageid(getNS($ID), $id, $exists);
 
         $name = $this->_getLinkTitle($name, $default, $isImage, $id, $linktype);
-        if ( !$isImage ) {
-            if ( $exists ) {
-                $class='wikilink1';
+        if(!$isImage) {
+            if($exists) {
+                $class = 'wikilink1';
             } else {
-                $class='wikilink2';
-                $link['rel']='nofollow';
+                $class       = 'wikilink2';
+                $link['rel'] = 'nofollow';
             }
         } else {
-            $class='media';
+            $class = 'media';
         }
 
         //keep hash anchor
-        list($id,$hash) = explode('#',$id,2);
+        @list($id, $hash) = explode('#', $id, 2);
         if(!empty($hash)) $hash = $this->_headerToLink($hash);
 
         //prepare for formating
@@ -612,37 +842,43 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['pre']    = '';
         $link['suf']    = '';
         // highlight link to current page
-        if ($id == $INFO['id']) {
-            $link['pre']    = '<span class="curid">';
-            $link['suf']    = '</span>';
+        if($id == $INFO['id']) {
+            $link['pre'] = '<span class="curid">';
+            $link['suf'] = '</span>';
         }
-        $link['more']   = '';
-        $link['class']  = $class;
-        $link['url']    = wl($id, $params);
-        $link['name']   = $name;
-        $link['title']  = $id;
+        $link['more']  = '';
+        $link['class'] = $class;
+        $link['url']   = wl($id, $params);
+        $link['name']  = $name;
+        $link['title'] = $id;
         //add search string
-        if($search){
-            ($conf['userewrite']) ? $link['url'].='?' : $link['url'].='&amp;';
-            if(is_array($search)){
-                $search = array_map('rawurlencode',$search);
-                $link['url'] .= 's[]='.join('&amp;s[]=',$search);
-            }else{
+        if($search) {
+            ($conf['userewrite']) ? $link['url'] .= '?' : $link['url'] .= '&amp;';
+            if(is_array($search)) {
+                $search = array_map('rawurlencode', $search);
+                $link['url'] .= 's[]='.join('&amp;s[]=', $search);
+            } else {
                 $link['url'] .= 's='.rawurlencode($search);
             }
         }
 
         //keep hash
-        if($hash) $link['url'].='#'.$hash;
+        if($hash) $link['url'] .= '#'.$hash;
 
         //output formatted
-        if($returnonly){
+        if($returnonly) {
             return $this->_formatLink($link);
-        }else{
+        } else {
             $this->doc .= $this->_formatLink($link);
         }
     }
 
+    /**
+     * Render an external link
+     *
+     * @param string       $url  full URL with scheme
+     * @param string|array $name name for the link, array for media file
+     */
     function externallink($url, $name = null) {
         global $conf;
 
@@ -650,21 +886,21 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         // url might be an attack vector, only allow registered protocols
         if(is_null($this->schemes)) $this->schemes = getSchemes();
-        list($scheme) = explode('://',$url);
+        list($scheme) = explode('://', $url);
         $scheme = strtolower($scheme);
-        if(!in_array($scheme,$this->schemes)) $url = '';
+        if(!in_array($scheme, $this->schemes)) $url = '';
 
         // is there still an URL?
-        if(!$url){
+        if(!$url) {
             $this->doc .= $name;
             return;
         }
 
         // set class
-        if ( !$isImage ) {
-            $class='urlextern';
+        if(!$isImage) {
+            $class = 'urlextern';
         } else {
-            $class='media';
+            $class = 'media';
         }
 
         //prepare for formating
@@ -676,8 +912,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['class']  = $class;
         $link['url']    = $url;
 
-        $link['name']   = $name;
-        $link['title']  = $this->_xmlEntities($url);
+        $link['name']  = $name;
+        $link['title'] = $this->_xmlEntities($url);
         if($conf['relnofollow']) $link['more'] .= ' rel="nofollow"';
 
         //output formatted
@@ -685,11 +921,19 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
 
     /**
-    */
+     * Render an interwiki link
+     *
+     * You may want to use $this->_resolveInterWiki() here
+     *
+     * @param string       $match     original link - probably not much use
+     * @param string|array $name      name for the link, array for media file
+     * @param string       $wikiName  indentifier (shortcut) for the remote wiki
+     * @param string       $wikiUri   the fragment parsed from the original link
+     */
     function interwikilink($match, $name = null, $wikiName, $wikiUri) {
         global $conf;
 
-        $link = array();
+        $link           = array();
         $link['target'] = $conf['target']['interwiki'];
         $link['pre']    = '';
         $link['suf']    = '';
@@ -697,21 +941,30 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['name']   = $this->_getLinkTitle($name, $wikiUri, $isImage);
 
         //get interwiki URL
-        $url = $this->_resolveInterWiki($wikiName,$wikiUri);
+        $exists = null;
+        $url    = $this->_resolveInterWiki($wikiName, $wikiUri, $exists);
 
-        if ( !$isImage ) {
-            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName);
+        if(!$isImage) {
+            $class         = preg_replace('/[^_\-a-z0-9]+/i', '_', $wikiName);
             $link['class'] = "interwiki iw_$class";
         } else {
             $link['class'] = 'media';
         }
 
         //do we stay at the same server? Use local target
-        if( strpos($url,DOKU_URL) === 0 ){
+        if(strpos($url, DOKU_URL) === 0 OR strpos($url, DOKU_BASE) === 0) {
             $link['target'] = $conf['target']['wiki'];
         }
+        if($exists !== null && !$isImage) {
+            if($exists) {
+                $link['class'] .= ' wikilink1';
+            } else {
+                $link['class'] .= ' wikilink2';
+                $link['rel'] = 'nofollow';
+            }
+        }
 
-        $link['url'] = $url;
+        $link['url']   = $url;
         $link['title'] = htmlspecialchars($link['url']);
 
         //output formatted
@@ -719,54 +972,66 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
 
     /**
+     * Link to windows share
+     *
+     * @param string       $url  the link
+     * @param string|array $name name for the link, array for media file
      */
     function windowssharelink($url, $name = null) {
         global $conf;
-        global $lang;
+
         //simple setup
         $link['target'] = $conf['target']['windows'];
         $link['pre']    = '';
-        $link['suf']   = '';
+        $link['suf']    = '';
         $link['style']  = '';
 
         $link['name'] = $this->_getLinkTitle($name, $url, $isImage);
-        if ( !$isImage ) {
+        if(!$isImage) {
             $link['class'] = 'windows';
         } else {
             $link['class'] = 'media';
         }
 
         $link['title'] = $this->_xmlEntities($url);
-        $url = str_replace('\\','/',$url);
-        $url = 'file:///'.$url;
-        $link['url'] = $url;
+        $url           = str_replace('\\', '/', $url);
+        $url           = 'file:///'.$url;
+        $link['url']   = $url;
 
         //output formatted
         $this->doc .= $this->_formatLink($link);
     }
 
+    /**
+     * Render a linked E-Mail Address
+     *
+     * Honors $conf['mailguard'] setting
+     *
+     * @param string       $address Email-Address
+     * @param string|array $name    name for the link, array for media file
+     */
     function emaillink($address, $name = null) {
         global $conf;
         //simple setup
-        $link = array();
+        $link           = array();
         $link['target'] = '';
         $link['pre']    = '';
-        $link['suf']   = '';
+        $link['suf']    = '';
         $link['style']  = '';
         $link['more']   = '';
 
         $name = $this->_getLinkTitle($name, '', $isImage);
-        if ( !$isImage ) {
-            $link['class']='mail';
+        if(!$isImage) {
+            $link['class'] = 'mail';
         } else {
-            $link['class']='media';
+            $link['class'] = 'media';
         }
 
         $address = $this->_xmlEntities($address);
         $address = obfuscate($address);
         $title   = $address;
 
-        if(empty($name)){
+        if(empty($name)) {
             $name = $address;
         }
 
@@ -780,73 +1045,97 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= $this->_formatLink($link);
     }
 
-    function internalmedia ($src, $title=null, $align=null, $width=null,
-                            $height=null, $cache=null, $linking=null, $return=NULL) {
+    /**
+     * Render an internal media file
+     *
+     * @param string $src       media ID
+     * @param string $title     descriptive text
+     * @param string $align     left|center|right
+     * @param int    $width     width of media in pixel
+     * @param int    $height    height of media in pixel
+     * @param string $cache     cache|recache|nocache
+     * @param string $linking   linkonly|detail|nolink
+     * @param bool   $return    return HTML instead of adding to $doc
+     * @return void|string
+     */
+    function internalmedia($src, $title = null, $align = null, $width = null,
+                           $height = null, $cache = null, $linking = null, $return = false) {
         global $ID;
-        list($src,$hash) = explode('#',$src,2);
-        resolve_mediaid(getNS($ID),$src, $exists);
+        list($src, $hash) = explode('#', $src, 2);
+        resolve_mediaid(getNS($ID), $src, $exists);
 
         $noLink = false;
         $render = ($linking == 'linkonly') ? false : true;
-        $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
+        $link   = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
 
-        list($ext,$mime,$dl) = mimetype($src,false);
-        if(substr($mime,0,5) == 'image' && $render){
-            $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),($linking=='direct'));
-        }elseif(($mime == 'application/x-shockwave-flash' || media_supportedav($mime)) && $render){
+        list($ext, $mime) = mimetype($src, false);
+        if(substr($mime, 0, 5) == 'image' && $render) {
+            $link['url'] = ml($src, array('id' => $ID, 'cache' => $cache), ($linking == 'direct'));
+        } elseif(($mime == 'application/x-shockwave-flash' || media_supportedav($mime)) && $render) {
             // don't link movies
             $noLink = true;
-        }else{
+        } else {
             // add file icons
-            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $class = preg_replace('/[^_\-a-z0-9]+/i', '_', $ext);
             $link['class'] .= ' mediafile mf_'.$class;
-            $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),true);
-            if ($exists) $link['title'] .= ' (' . filesize_h(filesize(mediaFN($src))).')';
+            $link['url'] = ml($src, array('id' => $ID, 'cache' => $cache), true);
+            if($exists) $link['title'] .= ' ('.filesize_h(filesize(mediaFN($src))).')';
         }
 
         if($hash) $link['url'] .= '#'.$hash;
 
         //markup non existing files
-        if (!$exists) {
+        if(!$exists) {
             $link['class'] .= ' wikilink2';
         }
 
         //output formatted
-        if ($return) {
-            if ($linking == 'nolink' || $noLink) return $link['name'];
+        if($return) {
+            if($linking == 'nolink' || $noLink) return $link['name'];
             else return $this->_formatLink($link);
         } else {
-            if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
+            if($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
             else $this->doc .= $this->_formatLink($link);
         }
     }
 
-    function externalmedia ($src, $title=null, $align=null, $width=null,
-                            $height=null, $cache=null, $linking=null) {
-        list($src,$hash) = explode('#',$src,2);
+    /**
+     * Render an external media file
+     *
+     * @param string $src     full media URL
+     * @param string $title   descriptive text
+     * @param string $align   left|center|right
+     * @param int    $width   width of media in pixel
+     * @param int    $height  height of media in pixel
+     * @param string $cache   cache|recache|nocache
+     * @param string $linking linkonly|detail|nolink
+     */
+    function externalmedia($src, $title = null, $align = null, $width = null,
+                           $height = null, $cache = null, $linking = null) {
+        list($src, $hash) = explode('#', $src, 2);
         $noLink = false;
         $render = ($linking == 'linkonly') ? false : true;
-        $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
+        $link   = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
 
-        $link['url']    = ml($src,array('cache'=>$cache));
+        $link['url'] = ml($src, array('cache' => $cache));
 
-        list($ext,$mime,$dl) = mimetype($src,false);
-        if(substr($mime,0,5) == 'image' && $render){
+        list($ext, $mime) = mimetype($src, false);
+        if(substr($mime, 0, 5) == 'image' && $render) {
             // link only jpeg images
             // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = true;
-        }elseif(($mime == 'application/x-shockwave-flash' || media_supportedav($mime)) && $render){
+        } elseif(($mime == 'application/x-shockwave-flash' || media_supportedav($mime)) && $render) {
             // don't link movies
             $noLink = true;
-        }else{
+        } else {
             // add file icons
-            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $class = preg_replace('/[^_\-a-z0-9]+/i', '_', $ext);
             $link['class'] .= ' mediafile mf_'.$class;
         }
 
         if($hash) $link['url'] .= '#'.$hash;
 
         //output formatted
-        if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
+        if($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
         else $this->doc .= $this->_formatLink($link);
     }
 
@@ -855,7 +1144,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function rss ($url,$params){
+    function rss($url, $params) {
         global $lang;
         global $conf;
 
@@ -864,17 +1153,21 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $feed->set_feed_url($url);
 
         //disable warning while fetching
-        if (!defined('DOKU_E_LEVEL')) { $elvl = error_reporting(E_ERROR); }
+        if(!defined('DOKU_E_LEVEL')) {
+            $elvl = error_reporting(E_ERROR);
+        }
         $rc = $feed->init();
-        if (!defined('DOKU_E_LEVEL')) { error_reporting($elvl); }
+        if(isset($elvl)) {
+            error_reporting($elvl);
+        }
 
         //decide on start and end
-        if($params['reverse']){
-            $mod = -1;
-            $start = $feed->get_item_quantity()-1;
+        if($params['reverse']) {
+            $mod   = -1;
+            $start = $feed->get_item_quantity() - 1;
             $end   = $start - ($params['max']);
             $end   = ($end < -1) ? -1 : $end;
-        }else{
+        } else {
             $mod   = 1;
             $start = 0;
             $end   = $feed->get_item_quantity();
@@ -882,36 +1175,38 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
 
         $this->doc .= '<ul class="rss">';
-        if($rc){
-            for ($x = $start; $x != $end; $x += $mod) {
+        if($rc) {
+            for($x = $start; $x != $end; $x += $mod) {
                 $item = $feed->get_item($x);
                 $this->doc .= '<li><div class="li">';
                 // support feeds without links
                 $lnkurl = $item->get_permalink();
-                if($lnkurl){
+                if($lnkurl) {
                     // title is escaped by SimplePie, we unescape here because it
                     // is escaped again in externallink() FS#1705
-                    $this->externallink($item->get_permalink(),
-                                        html_entity_decode($item->get_title(), ENT_QUOTES, 'UTF-8'));
-                }else{
+                    $this->externallink(
+                        $item->get_permalink(),
+                        html_entity_decode($item->get_title(), ENT_QUOTES, 'UTF-8')
+                    );
+                } else {
                     $this->doc .= ' '.$item->get_title();
                 }
-                if($params['author']){
+                if($params['author']) {
                     $author = $item->get_author(0);
-                    if($author){
+                    if($author) {
                         $name = $author->get_name();
                         if(!$name) $name = $author->get_email();
                         if($name) $this->doc .= ' '.$lang['by'].' '.$name;
                     }
                 }
-                if($params['date']){
+                if($params['date']) {
                     $this->doc .= ' ('.$item->get_local_date($conf['dformat']).')';
                 }
-                if($params['details']){
+                if($params['details']) {
                     $this->doc .= '<div class="detail">';
-                    if($conf['htmlok']){
+                    if($conf['htmlok']) {
                         $this->doc .= $item->get_description();
-                    }else{
+                    } else {
                         $this->doc .= strip_tags($item->get_description());
                     }
                     $this->doc .= '</div>';
@@ -919,11 +1214,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
                 $this->doc .= '</div></li>';
             }
-        }else{
+        } else {
             $this->doc .= '<li><div class="li">';
             $this->doc .= '<em>'.$lang['rssfailed'].'</em>';
             $this->externallink($url);
-            if($conf['allowdebug']){
+            if($conf['allowdebug']) {
                 $this->doc .= '<!--'.hsc($feed->error).'-->';
             }
             $this->doc .= '</div></li>';
@@ -931,81 +1226,130 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= '</ul>';
     }
 
-    // $numrows not yet implemented
-    function table_open($maxcols = null, $numrows = null, $pos = null){
-        global $lang;
+    /**
+     * Start a table
+     *
+     * @param int $maxcols maximum number of columns
+     * @param int $numrows NOT IMPLEMENTED
+     * @param int $pos     byte position in the original source
+     */
+    function table_open($maxcols = null, $numrows = null, $pos = null) {
         // initialize the row counter used for classes
         $this->_counter['row_counter'] = 0;
-        $class = 'table';
-        if ($pos !== null) {
-            $class .= ' ' . $this->startSectionEdit($pos, 'table');
+        $class                         = 'table';
+        if($pos !== null) {
+            $class .= ' '.$this->startSectionEdit($pos, 'table');
         }
-        $this->doc .= '<div class="' . $class . '"><table class="inline">' .
-                      DOKU_LF;
+        $this->doc .= '<div class="'.$class.'"><table class="inline">'.
+            DOKU_LF;
     }
 
-    function table_close($pos = null){
+    /**
+     * Close a table
+     *
+     * @param int $pos byte position in the original source
+     */
+    function table_close($pos = null) {
         $this->doc .= '</table></div>'.DOKU_LF;
-        if ($pos !== null) {
+        if($pos !== null) {
             $this->finishSectionEdit($pos);
         }
     }
 
-    function tablerow_open(){
+    /**
+     * Open a table header
+     */
+    function tablethead_open() {
+        $this->doc .= DOKU_TAB.'<thead>'.DOKU_LF;
+    }
+
+    /**
+     * Close a table header
+     */
+    function tablethead_close() {
+        $this->doc .= DOKU_TAB.'</thead>'.DOKU_LF;
+    }
+
+    /**
+     * Open a table row
+     */
+    function tablerow_open() {
         // initialize the cell counter used for classes
         $this->_counter['cell_counter'] = 0;
-        $class = 'row' . $this->_counter['row_counter']++;
-        $this->doc .= DOKU_TAB . '<tr class="'.$class.'">' . DOKU_LF . DOKU_TAB . DOKU_TAB;
+        $class                          = 'row'.$this->_counter['row_counter']++;
+        $this->doc .= DOKU_TAB.'<tr class="'.$class.'">'.DOKU_LF.DOKU_TAB.DOKU_TAB;
     }
 
-    function tablerow_close(){
-        $this->doc .= DOKU_LF . DOKU_TAB . '</tr>' . DOKU_LF;
+    /**
+     * Close a table row
+     */
+    function tablerow_close() {
+        $this->doc .= DOKU_LF.DOKU_TAB.'</tr>'.DOKU_LF;
     }
 
-    function tableheader_open($colspan = 1, $align = null, $rowspan = 1){
-        $class = 'class="col' . $this->_counter['cell_counter']++;
-        if ( !is_null($align) ) {
+    /**
+     * Open a table header cell
+     *
+     * @param int    $colspan
+     * @param string $align left|center|right
+     * @param int    $rowspan
+     */
+    function tableheader_open($colspan = 1, $align = null, $rowspan = 1) {
+        $class = 'class="col'.$this->_counter['cell_counter']++;
+        if(!is_null($align)) {
             $class .= ' '.$align.'align';
         }
         $class .= '"';
-        $this->doc .= '<th ' . $class;
-        if ( $colspan > 1 ) {
-            $this->_counter['cell_counter'] += $colspan-1;
+        $this->doc .= '<th '.$class;
+        if($colspan > 1) {
+            $this->_counter['cell_counter'] += $colspan - 1;
             $this->doc .= ' colspan="'.$colspan.'"';
         }
-        if ( $rowspan > 1 ) {
+        if($rowspan > 1) {
             $this->doc .= ' rowspan="'.$rowspan.'"';
         }
         $this->doc .= '>';
     }
 
-    function tableheader_close(){
+    /**
+     * Close a table header cell
+     */
+    function tableheader_close() {
         $this->doc .= '</th>';
     }
 
-    function tablecell_open($colspan = 1, $align = null, $rowspan = 1){
-        $class = 'class="col' . $this->_counter['cell_counter']++;
-        if ( !is_null($align) ) {
+    /**
+     * Open a table cell
+     *
+     * @param int    $colspan
+     * @param string $align left|center|right
+     * @param int    $rowspan
+     */
+    function tablecell_open($colspan = 1, $align = null, $rowspan = 1) {
+        $class = 'class="col'.$this->_counter['cell_counter']++;
+        if(!is_null($align)) {
             $class .= ' '.$align.'align';
         }
         $class .= '"';
         $this->doc .= '<td '.$class;
-        if ( $colspan > 1 ) {
-            $this->_counter['cell_counter'] += $colspan-1;
+        if($colspan > 1) {
+            $this->_counter['cell_counter'] += $colspan - 1;
             $this->doc .= ' colspan="'.$colspan.'"';
         }
-        if ( $rowspan > 1 ) {
+        if($rowspan > 1) {
             $this->doc .= ' rowspan="'.$rowspan.'"';
         }
         $this->doc .= '>';
     }
 
-    function tablecell_close(){
+    /**
+     * Close a table cell
+     */
+    function tablecell_close() {
         $this->doc .= '</td>';
     }
 
-    //----------------------------------------------------------
-    // Utils
+    #region Utility functions
 
     /**
      * Build a link
@@ -1014,29 +1358,29 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function _formatLink($link){
+    function _formatLink($link) {
         //make sure the url is XHTML compliant (skip mailto)
-        if(substr($link['url'],0,7) != 'mailto:'){
-            $link['url'] = str_replace('&','&amp;',$link['url']);
-            $link['url'] = str_replace('&amp;amp;','&amp;',$link['url']);
+        if(substr($link['url'], 0, 7) != 'mailto:') {
+            $link['url'] = str_replace('&', '&amp;', $link['url']);
+            $link['url'] = str_replace('&amp;amp;', '&amp;', $link['url']);
         }
         //remove double encodings in titles
-        $link['title'] = str_replace('&amp;amp;','&amp;',$link['title']);
+        $link['title'] = str_replace('&amp;amp;', '&amp;', $link['title']);
 
         // be sure there are no bad chars in url or title
         // (we can't do this for name because it can contain an img tag)
-        $link['url']   = strtr($link['url'],array('>'=>'%3E','<'=>'%3C','"'=>'%22'));
-        $link['title'] = strtr($link['title'],array('>'=>'&gt;','<'=>'&lt;','"'=>'&quot;'));
+        $link['url']   = strtr($link['url'], array('>' => '%3E', '<' => '%3C', '"' => '%22'));
+        $link['title'] = strtr($link['title'], array('>' => '&gt;', '<' => '&lt;', '"' => '&quot;'));
 
-        $ret  = '';
+        $ret = '';
         $ret .= $link['pre'];
         $ret .= '<a href="'.$link['url'].'"';
-        if(!empty($link['class']))  $ret .= ' class="'.$link['class'].'"';
+        if(!empty($link['class'])) $ret .= ' class="'.$link['class'].'"';
         if(!empty($link['target'])) $ret .= ' target="'.$link['target'].'"';
-        if(!empty($link['title']))  $ret .= ' title="'.$link['title'].'"';
-        if(!empty($link['style']))  $ret .= ' style="'.$link['style'].'"';
-        if(!empty($link['rel']))    $ret .= ' rel="'.$link['rel'].'"';
-        if(!empty($link['more']))   $ret .= ' '.$link['more'];
+        if(!empty($link['title'])) $ret .= ' title="'.$link['title'].'"';
+        if(!empty($link['style'])) $ret .= ' style="'.$link['style'].'"';
+        if(!empty($link['rel'])) $ret .= ' rel="'.$link['rel'].'"';
+        if(!empty($link['more'])) $ret .= ' '.$link['more'];
         $ret .= '>';
         $ret .= $link['name'];
         $ret .= '</a>';
@@ -1048,120 +1392,112 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * Renders internal and external media
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     * @param string $src       media ID
+     * @param string $title     descriptive text
+     * @param string $align     left|center|right
+     * @param int    $width     width of media in pixel
+     * @param int    $height    height of media in pixel
+     * @param string $cache     cache|recache|nocache
+     * @param bool   $render    should the media be embedded inline or just linked
+     * @return string
      */
-    function _media ($src, $title=null, $align=null, $width=null,
-                      $height=null, $cache=null, $render = true) {
+    function _media($src, $title = null, $align = null, $width = null,
+                    $height = null, $cache = null, $render = true) {
 
         $ret = '';
 
-        list($ext,$mime,$dl) = mimetype($src);
-        if(substr($mime,0,5) == 'image'){
+        list($ext, $mime) = mimetype($src);
+        if(substr($mime, 0, 5) == 'image') {
             // first get the $title
-            if (!is_null($title)) {
-                $title  = $this->_xmlEntities($title);
-            }elseif($ext == 'jpg' || $ext == 'jpeg'){
+            if(!is_null($title)) {
+                $title = $this->_xmlEntities($title);
+            } elseif($ext == 'jpg' || $ext == 'jpeg') {
                 //try to use the caption from IPTC/EXIF
                 require_once(DOKU_INC.'inc/JpegMeta.php');
-                $jpeg =new JpegMeta(mediaFN($src));
+                $jpeg = new JpegMeta(mediaFN($src));
                 if($jpeg !== false) $cap = $jpeg->getTitle();
-                if($cap){
+                if(!empty($cap)) {
                     $title = $this->_xmlEntities($cap);
                 }
             }
-            if (!$render) {
+            if(!$render) {
                 // if the picture is not supposed to be rendered
                 // return the title of the picture
-                if (!$title) {
+                if(!$title) {
                     // just show the sourcename
                     $title = $this->_xmlEntities(utf8_basename(noNS($src)));
                 }
                 return $title;
             }
             //add image tag
-            $ret .= '<img src="'.ml($src,array('w'=>$width,'h'=>$height,'cache'=>$cache)).'"';
+            $ret .= '<img src="'.ml($src, array('w' => $width, 'h' => $height, 'cache' => $cache)).'"';
             $ret .= ' class="media'.$align.'"';
 
-            if ($title) {
-                $ret .= ' title="' . $title . '"';
-                $ret .= ' alt="'   . $title .'"';
-            }else{
+            if($title) {
+                $ret .= ' title="'.$title.'"';
+                $ret .= ' alt="'.$title.'"';
+            } else {
                 $ret .= ' alt=""';
             }
 
-            if ( !is_null($width) )
+            if(!is_null($width))
                 $ret .= ' width="'.$this->_xmlEntities($width).'"';
 
-            if ( !is_null($height) )
+            if(!is_null($height))
                 $ret .= ' height="'.$this->_xmlEntities($height).'"';
 
             $ret .= ' />';
 
-        }elseif(media_supportedav($mime, 'video')){
+        } elseif(media_supportedav($mime, 'video') || media_supportedav($mime, 'audio')) {
             // first get the $title
-            if (!is_null($title)) {
-                $title  = $this->_xmlEntities($title);
-            }
-            if (!$title) {
-                // just show the sourcename
-                $title = $this->_xmlEntities(utf8_basename(noNS($src)));
-            }
-            if (!$render) {
-                // if the video is not supposed to be rendered
-                // return the title of the video
-                return $title;
+            $title = !is_null($title) ? $this->_xmlEntities($title) : false;
+            if(!$render) {
+                // if the file is not supposed to be rendered
+                // return the title of the file (just the sourcename if there is no title)
+                return $title ? $title : $this->_xmlEntities(utf8_basename(noNS($src)));
             }
 
-            $att = array();
+            $att          = array();
             $att['class'] = "media$align";
+            if($title) {
+                $att['title'] = $title;
+            }
 
-            //add video(s)
-            $ret .= $this->_video($src, $width, $height, $att);
-
-        }elseif(media_supportedav($mime, 'audio')){
-            // first get the $title
-            if (!is_null($title)) {
-                $title  = $this->_xmlEntities($title);
+            if(media_supportedav($mime, 'video')) {
+                //add video
+                $ret .= $this->_video($src, $width, $height, $att);
             }
-            if (!$title) {
-                // just show the sourcename
-                $title = $this->_xmlEntities(utf8_basename(noNS($src)));
+            if(media_supportedav($mime, 'audio')) {
+                //add audio
+                $ret .= $this->_audio($src, $att);
             }
-            if (!$render) {
-                // if the video is not supposed to be rendered
-                // return the title of the video
-                return $title;
-            }
-
-            $att = array();
-            $att['class'] = "media$align";
 
-            //add audio
-            $ret .= $this->_audio($src, $att);
-
-        }elseif($mime == 'application/x-shockwave-flash'){
-            if (!$render) {
+        } elseif($mime == 'application/x-shockwave-flash') {
+            if(!$render) {
                 // if the flash is not supposed to be rendered
                 // return the title of the flash
-                if (!$title) {
+                if(!$title) {
                     // just show the sourcename
                     $title = utf8_basename(noNS($src));
                 }
                 return $this->_xmlEntities($title);
             }
 
-            $att = array();
+            $att          = array();
             $att['class'] = "media$align";
             if($align == 'right') $att['align'] = 'right';
-            if($align == 'left')  $att['align'] = 'left';
-            $ret .= html_flashobject(ml($src,array('cache'=>$cache),true,'&'),$width,$height,
-                                     array('quality' => 'high'),
-                                     null,
-                                     $att,
-                                     $this->_xmlEntities($title));
-        }elseif($title){
+            if($align == 'left') $att['align'] = 'left';
+            $ret .= html_flashobject(
+                ml($src, array('cache' => $cache), true, '&'), $width, $height,
+                array('quality' => 'high'),
+                null,
+                $att,
+                $this->_xmlEntities($title)
+            );
+        } elseif($title) {
             // well at least we have a title to display
             $ret .= $this->_xmlEntities($title);
-        }else{
+        } else {
             // just show the sourcename
             $ret .= $this->_xmlEntities(utf8_basename(noNS($src)));
         }
@@ -1169,23 +1505,30 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         return $ret;
     }
 
+    /**
+     * Escape string for output
+     *
+     * @param $string
+     * @return string
+     */
     function _xmlEntities($string) {
-        return htmlspecialchars($string,ENT_QUOTES,'UTF-8');
+        return htmlspecialchars($string, ENT_QUOTES, 'UTF-8');
     }
 
     /**
      * Creates a linkid from a headline
      *
+     * @author Andreas Gohr <andi@splitbrain.org>
      * @param string  $title   The headline title
      * @param boolean $create  Create a new unique ID?
-     * @author Andreas Gohr <andi@splitbrain.org>
+     * @return string
      */
-    function _headerToLink($title,$create=false) {
-        if($create){
-            return sectionID($title,$this->headers);
-        }else{
+    function _headerToLink($title, $create = false) {
+        if($create) {
+            return sectionID($title, $this->headers);
+        } else {
             $check = false;
-            return sectionID($title,$check);
+            return sectionID($title, $check);
         }
     }
 
@@ -1193,18 +1536,22 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * Construct a title and handle images in titles
      *
      * @author Harry Fuecks <hfuecks@gmail.com>
+     * @param string|array $title    either string title or media array
+     * @param string       $default  default title if nothing else is found
+     * @param bool         $isImage  will be set to true if it's a media file
+     * @param null|string  $id       linked page id (used to extract title from first heading)
+     * @param string       $linktype content|navigation
+     * @return string      HTML of the title, might be full image tag or just escaped text
      */
-    function _getLinkTitle($title, $default, & $isImage, $id=null, $linktype='content') {
-        global $conf;
-
+    function _getLinkTitle($title, $default, &$isImage, $id = null, $linktype = 'content') {
         $isImage = false;
-        if ( is_array($title) ) {
+        if(is_array($title)) {
             $isImage = true;
             return $this->_imageTitle($title);
-        } elseif ( is_null($title) || trim($title)=='') {
-            if (useHeading($linktype) && $id) {
+        } elseif(is_null($title) || trim($title) == '') {
+            if(useHeading($linktype) && $id) {
                 $heading = p_get_first_heading($id);
-                if ($heading) {
+                if($heading) {
                     return $this->_xmlEntities($heading);
                 }
             }
@@ -1215,48 +1562,51 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
 
     /**
-     * Returns an HTML code for images used in link titles
+     * Returns HTML code for images used in link titles
      *
-     * @todo Resolve namespace on internal images
      * @author Andreas Gohr <andi@splitbrain.org>
+     * @param string $img
+     * @return string HTML img tag or similar
      */
     function _imageTitle($img) {
         global $ID;
 
         // some fixes on $img['src']
         // see internalmedia() and externalmedia()
-        list($img['src'],$hash) = explode('#',$img['src'],2);
-        if ($img['type'] == 'internalmedia') {
-            resolve_mediaid(getNS($ID),$img['src'],$exists);
+        list($img['src']) = explode('#', $img['src'], 2);
+        if($img['type'] == 'internalmedia') {
+            resolve_mediaid(getNS($ID), $img['src'], $exists);
         }
 
-        return $this->_media($img['src'],
-                              $img['title'],
-                              $img['align'],
-                              $img['width'],
-                              $img['height'],
-                              $img['cache']);
+        return $this->_media(
+            $img['src'],
+            $img['title'],
+            $img['align'],
+            $img['width'],
+            $img['height'],
+            $img['cache']
+        );
     }
 
     /**
-     * _getMediaLinkConf is a helperfunction to internalmedia() and externalmedia()
-     * which returns a basic link to a media.
+     * helperfunction to return a basic link to a media
      *
-     * @author Pierre Spring <pierre.spring@liip.ch>
-     * @param string $src
-     * @param string $title
-     * @param string $align
-     * @param string $width
-     * @param string $height
-     * @param string $cache
-     * @param string $render
-     * @access protected
-     * @return array
+     * used in internalmedia() and externalmedia()
+     *
+     * @author   Pierre Spring <pierre.spring@liip.ch>
+     * @param string $src       media ID
+     * @param string $title     descriptive text
+     * @param string $align     left|center|right
+     * @param int    $width     width of media in pixel
+     * @param int    $height    height of media in pixel
+     * @param string $cache     cache|recache|nocache
+     * @param bool   $render    should the media be embedded inline or just linked
+     * @return array associative array with link config
      */
     function _getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render) {
         global $conf;
 
-        $link = array();
+        $link           = array();
         $link['class']  = 'media';
         $link['style']  = '';
         $link['pre']    = '';
@@ -1269,51 +1619,49 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         return $link;
     }
 
-
     /**
      * Embed video(s) in HTML
      *
      * @author Anika Henke <anika@selfthinker.org>
      *
-     * @param string $src      - ID of video to embed
-     * @param int $width       - width of the video in pixels
-     * @param int $height      - height of the video in pixels
-     * @param array $atts      - additional attributes for the <video> tag
+     * @param string $src         - ID of video to embed
+     * @param int    $width       - width of the video in pixels
+     * @param int    $height      - height of the video in pixels
+     * @param array  $atts        - additional attributes for the <video> tag
      * @return string
      */
-    function _video($src,$width,$height,$atts=null){
-
+    function _video($src, $width, $height, $atts = null) {
         // prepare width and height
         if(is_null($atts)) $atts = array();
         $atts['width']  = (int) $width;
         $atts['height'] = (int) $height;
-        if(!$atts['width'])  $atts['width']  = 320;
+        if(!$atts['width']) $atts['width'] = 320;
         if(!$atts['height']) $atts['height'] = 240;
 
         // prepare alternative formats
-        $extensions = array('webm', 'ogv', 'mp4');
+        $extensions   = array('webm', 'ogv', 'mp4');
         $alternatives = media_alternativefiles($src, $extensions);
-        $poster = media_alternativefiles($src, array('jpg', 'png'), true);
-        $posterUrl = '';
-        if (!empty($poster)) {
-            $posterUrl = ml(reset($poster),array('cache'=>$cache),true,'&');
+        $poster       = media_alternativefiles($src, array('jpg', 'png'), true);
+        $posterUrl    = '';
+        if(!empty($poster)) {
+            $posterUrl = ml(reset($poster), '', true, '&');
         }
 
         $out = '';
         // open video tag
         $out .= '<video '.buildAttributes($atts).' controls="controls"';
-        if ($posterUrl) $out .= ' poster="'.hsc($posterUrl).'"';
+        if($posterUrl) $out .= ' poster="'.hsc($posterUrl).'"';
         $out .= '>'.NL;
         $fallback = '';
 
         // output source for each alternative video format
         foreach($alternatives as $mime => $file) {
-            $url = ml($file,array('cache'=>$cache),true,'&');
-            $title = $this->_xmlEntities(utf8_basename(noNS($file)));
+            $url   = ml($file, '', true, '&');
+            $title = $atts['title'] ? $atts['title'] : $this->_xmlEntities(utf8_basename(noNS($file)));
 
             $out .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
             // alternative content (just a link to the file)
-            $fallback .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
+            $fallback .= $this->internalmedia($file, $title, null, null, null, $cache = null, $linking = 'linkonly', $return = true);
         }
 
         // finish
@@ -1327,14 +1675,14 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      *
      * @author Anika Henke <anika@selfthinker.org>
      *
-     * @param string $src      - ID of audio to embed
-     * @param array $atts      - additional attributes for the <audio> tag
+     * @param string $src       - ID of audio to embed
+     * @param array  $atts      - additional attributes for the <audio> tag
      * @return string
      */
-    function _audio($src,$atts=null){
+    function _audio($src, $atts = null) {
 
         // prepare alternative formats
-        $extensions = array('ogg', 'mp3', 'wav');
+        $extensions   = array('ogg', 'mp3', 'wav');
         $alternatives = media_alternativefiles($src, $extensions);
 
         $out = '';
@@ -1344,12 +1692,12 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         // output source for each alternative audio format
         foreach($alternatives as $mime => $file) {
-            $url = ml($file,array('cache'=>$cache),true,'&');
-            $title = $this->_xmlEntities(utf8_basename(noNS($file)));
+            $url   = ml($file, '', true, '&');
+            $title = $atts['title'] ? $atts['title'] : $this->_xmlEntities(utf8_basename(noNS($file)));
 
             $out .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
             // alternative content (just a link to the file)
-            $fallback .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
+            $fallback .= $this->internalmedia($file, $title, null, null, null, $cache = null, $linking = 'linkonly', $return = true);
         }
 
         // finish
@@ -1358,6 +1706,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         return $out;
     }
 
+    #endregion
 }
 
 //Setup VIM: ex: et ts=4 :
diff --git a/inc/parser/xhtmlsummary.php b/inc/parser/xhtmlsummary.php
index 95f86cbef..867b71f6a 100644
--- a/inc/parser/xhtmlsummary.php
+++ b/inc/parser/xhtmlsummary.php
@@ -1,6 +1,5 @@
 <?php
 if(!defined('DOKU_INC')) die('meh.');
-require_once DOKU_INC . 'inc/parser/xhtml.php';
 
 /**
  * The summary XHTML form selects either up to the first two paragraphs
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 4df273f11..9c2a0b570 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -112,8 +112,7 @@ function p_cached_output($file, $format='xhtml', $id='') {
     } else {
         $parsed = p_render($format, p_cached_instructions($file,false,$id), $info);
 
-        if ($info['cache']) {
-            $cache->storeCache($parsed);               //save cachefile
+        if ($info['cache'] && $cache->storeCache($parsed)) {              // storeCache() attempts to save cachefile
             if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- no cachefile used, but created {$cache->cache} -->\n";
         }else{
             $cache->removeCache();                     //try to delete cachefile
@@ -430,8 +429,9 @@ function p_render_metadata($id, $orig){
     global $ID, $METADATA_RENDERERS;
 
     // avoid recursive rendering processes for the same id
-    if (isset($METADATA_RENDERERS[$id]))
+    if (isset($METADATA_RENDERERS[$id])) {
         return $orig;
+    }
 
     // store the original metadata in the global $METADATA_RENDERERS so p_set_metadata can use it
     $METADATA_RENDERERS[$id] =& $orig;
@@ -444,8 +444,6 @@ function p_render_metadata($id, $orig){
     $evt = new Doku_Event('PARSER_METADATA_RENDER', $orig);
     if ($evt->advise_before()) {
 
-        require_once DOKU_INC."inc/parser/metadata.php";
-
         // get instructions
         $instructions = p_cached_instructions(wikiFN($id),false,$id);
         if(is_null($instructions)){
@@ -588,7 +586,7 @@ function p_sort_modes($a, $b){
 function p_render($mode,$instructions,&$info){
     if(is_null($instructions)) return '';
 
-    $Renderer =& p_get_renderer($mode);
+    $Renderer = p_get_renderer($mode);
     if (is_null($Renderer)) return null;
 
     $Renderer->reset();
@@ -616,43 +614,53 @@ function p_render($mode,$instructions,&$info){
 }
 
 /**
+ * Figure out the correct renderer class to use for $mode,
+ * instantiate and return it
+ *
  * @param $mode string Mode of the renderer to get
  * @return null|Doku_Renderer The renderer
+ *
+ * @author Christopher Smith <chris@jalakai.co.uk>
  */
-function & p_get_renderer($mode) {
+function p_get_renderer($mode) {
     /** @var Doku_Plugin_Controller $plugin_controller */
     global $conf, $plugin_controller;
 
     $rname = !empty($conf['renderer_'.$mode]) ? $conf['renderer_'.$mode] : $mode;
     $rclass = "Doku_Renderer_$rname";
 
+    // if requested earlier or a bundled renderer
     if( class_exists($rclass) ) {
         $Renderer = new $rclass();
         return $Renderer;
     }
 
-    // try default renderer first:
-    $file = DOKU_INC."inc/parser/$rname.php";
-    if(@file_exists($file)){
-        require_once $file;
+    // not bundled, see if its an enabled renderer plugin & when $mode is 'xhtml', the renderer can supply that format.
+    $Renderer = $plugin_controller->load('renderer',$rname);
+    if ($Renderer && is_a($Renderer, 'Doku_Renderer')  && ($mode != 'xhtml' || $mode == $Renderer->getFormat())) {
+        return $Renderer;
+    }
 
-        if ( !class_exists($rclass) ) {
-            trigger_error("Unable to resolve render class $rclass",E_USER_WARNING);
-            msg("Renderer '$rname' for $mode not valid",-1);
-            return null;
+    // there is a configuration error!
+    // not bundled, not a valid enabled plugin, use $mode to try to fallback to a bundled renderer
+    $rclass = "Doku_Renderer_$mode";
+    if ( class_exists($rclass) ) {
+        // viewers should see renderered output, so restrict the warning to admins only
+        $msg = "No renderer '$rname' found for mode '$mode', check your plugins";
+        if ($mode == 'xhtml') {
+            $msg .= " and the 'renderer_xhtml' config setting";
         }
-        $Renderer = new $rclass();
-    }else{
-        // Maybe a plugin/component is available?
-        $Renderer = $plugin_controller->load('renderer',$rname);
+        $msg .= ".<br/>Attempting to fallback to the bundled renderer.";
+        msg($msg,-1,'','',MSG_ADMINS_ONLY);
 
-        if(!isset($Renderer) || is_null($Renderer)){
-            msg("No renderer '$rname' found for mode '$mode'",-1);
-            return null;
-        }
+        $Renderer = new $rclass;
+        $Renderer->nocache();     // fallback only (and may include admin alerts), don't cache
+        return $Renderer;
     }
 
-    return $Renderer;
+    // fallback failed, alert the world
+    msg("No renderer '$rname' found for mode '$mode'",-1);
+    return null;
 }
 
 /**
diff --git a/inc/plugin.php b/inc/plugin.php
index 95bdaee2b..fbfc0325f 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -30,18 +30,19 @@ class DokuWiki_Plugin {
      * desc   - Short description of the plugin (Text only)
      * url    - Website with more information on the plugin (eg. syntax description)
      */
-    function getInfo(){
-        $parts = explode('_',get_class($this));
-        $info  = DOKU_PLUGIN.'/'.$parts[2].'/plugin.info.txt';
+    function getInfo() {
+        $parts = explode('_', get_class($this));
+        $info = DOKU_PLUGIN . '/' . $parts[2] . '/plugin.info.txt';
         if(@file_exists($info)) return confToHash($info);
 
-        msg('getInfo() not implemented in '.get_class($this).
-               ' and '.$info.' not found.<br />This is a bug in the '.
-               $parts[2].' plugin and should be reported to the '.
-               'plugin author.',-1);
+        msg(
+            'getInfo() not implemented in ' . get_class($this) . ' and ' . $info . ' not found.<br />' .
+            'Verify you\'re running the latest version of the plugin. If the problem persists, send a ' .
+            'bug report to the author of the ' . $parts[2] . ' plugin.', -1
+        );
         return array(
-            'date'   => '0000-00-00',
-            'name'   => $parts[2].' plugin',
+            'date' => '0000-00-00',
+            'name' => $parts[2] . ' plugin',
         );
     }
 
@@ -252,10 +253,11 @@ class DokuWiki_Plugin {
      */
     function __call($name, $arguments) {
         if($name == 'render'){
+            dbg_deprecated('render_text()');
             if(!isset($arguments[1])) $arguments[1] = 'xhtml';
             return $this->render_text($arguments[0], $arguments[1]);
         }
-        trigger_error("no such method $name", E_ERROR);
+        trigger_error("no such method $name", E_USER_ERROR);
         return null;
     }
 
diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 894bbefb6..911c4e5c0 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -37,7 +37,7 @@ function plugin_list($type='',$all=false) {
  * @param  $name     string name of the plugin to load
  * @param  $new      bool   true to return a new instance of the plugin, false to use an already loaded instance
  * @param  $disabled bool   true to load even disabled plugins
- * @return DokuWiki_Plugin|DokuWiki_Syntax_Plugin|null  the plugin object or null on failure
+ * @return DokuWiki_Plugin|null  the plugin object or null on failure
  */
 function plugin_load($type,$name,$new=false,$disabled=false) {
     /** @var $plugin_controller Doku_Plugin_Controller */
diff --git a/inc/remote.php b/inc/remote.php
index 2ef28afd2..e27aa74f8 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -169,6 +169,9 @@ class RemoteAPI {
     public function hasAccess() {
         global $conf;
         global $USERINFO;
+        /** @var Input $INPUT */
+        global $INPUT;
+
         if (!$conf['remote']) {
             return false;
         }
@@ -179,7 +182,7 @@ class RemoteAPI {
             return true;
         }
 
-        return auth_isMember($conf['remoteuser'], $_SERVER['REMOTE_USER'], (array) $USERINFO['grps']);
+        return auth_isMember($conf['remoteuser'], $INPUT->server->str('REMOTE_USER'), (array) $USERINFO['grps']);
     }
 
     /**
diff --git a/inc/search.php b/inc/search.php
index c2d31b959..5489dc2c0 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -141,7 +141,7 @@ function search_media(&$data,$base,$file,$type,$lvl,$opts){
 
     //we do nothing with directories
     if($type == 'd') {
-        if(!$opts['depth']) return true; // recurse forever
+        if(empty($opts['depth'])) return true; // recurse forever
         $depth = substr_count($file,'/');
         if($depth >= $opts['depth']) return false; // depth reached
         return true;
@@ -157,12 +157,12 @@ function search_media(&$data,$base,$file,$type,$lvl,$opts){
 
     //check ACL for namespace (we have no ACL for mediafiles)
     $info['perm'] = auth_quickaclcheck(getNS($info['id']).':*');
-    if(!$opts['skipacl'] && $info['perm'] < AUTH_READ){
+    if(empty($opts['skipacl']) && $info['perm'] < AUTH_READ){
         return false;
     }
 
     //check pattern filter
-    if($opts['pattern'] && !@preg_match($opts['pattern'], $info['id'])){
+    if(!empty($opts['pattern']) && !@preg_match($opts['pattern'], $info['id'])){
         return false;
     }
 
@@ -176,7 +176,7 @@ function search_media(&$data,$base,$file,$type,$lvl,$opts){
     }else{
         $info['isimg'] = false;
     }
-    if($opts['hash']){
+    if(!empty($opts['hash'])){
         $info['hash'] = md5(io_readFile(mediaFN($info['id']),false));
     }
 
@@ -317,25 +317,25 @@ function pathID($path,$keeptxt=false){
  * How the function behaves, depends on the options passed in the $opts
  * array, where the following settings can be used.
  *
- * depth      int     recursion depth. 0 for unlimited
- * keeptxt    bool    keep .txt extension for IDs
- * listfiles  bool    include files in listing
- * listdirs   bool    include namespaces in listing
- * pagesonly  bool    restrict files to pages
- * skipacl    bool    do not check for READ permission
- * sneakyacl  bool    don't recurse into nonreadable dirs
- * hash       bool    create MD5 hash for files
- * meta       bool    return file metadata
- * filematch  string  match files against this regexp
- * idmatch    string  match full ID against this regexp
- * dirmatch   string  match directory against this regexp when adding
- * nsmatch    string  match namespace against this regexp when adding
- * recmatch   string  match directory against this regexp when recursing
- * showmsg    bool    warn about non-ID files
- * showhidden bool    show hidden files too
- * firsthead  bool    return first heading for pages
+ * depth      int     recursion depth. 0 for unlimited                       (default: 0)
+ * keeptxt    bool    keep .txt extension for IDs                            (default: false)
+ * listfiles  bool    include files in listing                               (default: false)
+ * listdirs   bool    include namespaces in listing                          (default: false)
+ * pagesonly  bool    restrict files to pages                                (default: false)
+ * skipacl    bool    do not check for READ permission                       (default: false)
+ * sneakyacl  bool    don't recurse into nonreadable dirs                    (default: false)
+ * hash       bool    create MD5 hash for files                              (default: false)
+ * meta       bool    return file metadata                                   (default: false)
+ * filematch  string  match files against this regexp                        (default: '', so accept everything)
+ * idmatch    string  match full ID against this regexp                      (default: '', so accept everything)
+ * dirmatch   string  match directory against this regexp when adding        (default: '', so accept everything)
+ * nsmatch    string  match namespace against this regexp when adding        (default: '', so accept everything)
+ * recmatch   string  match directory against this regexp when recursing     (default: '', so accept everything)
+ * showmsg    bool    warn about non-ID files                                (default: false)
+ * showhidden bool    show hidden files(e.g. by hidepages config) too        (default: false)
+ * firsthead  bool    return first heading for pages                         (default: false)
  *
- * @param array &$data - Reference to the result data structure
+ * @param array &$data  - Reference to the result data structure
  * @param string $base  - Base usually $conf['datadir']
  * @param string $file  - current file or directory relative to $base
  * @param string $type  - Type either 'd' for directory or 'f' for file
@@ -351,17 +351,18 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
     $return = true;
 
     // get ID and check if it is a valid one
-    $item['id'] = pathID($file,($type == 'd' || $opts['keeptxt']));
+    $item['id'] = pathID($file,($type == 'd' || !empty($opts['keeptxt'])));
     if($item['id'] != cleanID($item['id'])){
-        if($opts['showmsg'])
+        if(!empty($opts['showmsg'])){
             msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1);
+        }
         return false; // skip non-valid files
     }
     $item['ns']  = getNS($item['id']);
 
     if($type == 'd') {
         // decide if to recursion into this directory is wanted
-        if(!$opts['depth']){
+        if(empty($opts['depth'])){
             $return = true; // recurse forever
         }else{
             $depth = substr_count($file,'/');
@@ -371,8 +372,12 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
                 $return = true;
             }
         }
-        if($return && !preg_match('/'.$opts['recmatch'].'/',$file)){
-            $return = false; // doesn't match
+
+        if ($return) {
+            $match = empty($opts['recmatch']) || preg_match('/'.$opts['recmatch'].'/',$file);
+            if (!$match) {
+                return false; // doesn't match
+            }
         }
     }
 
@@ -407,7 +412,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
     $item['level'] = $lvl;
     $item['open']  = $return;
 
-    if($opts['meta']){
+    if(!empty($opts['meta'])){
         $item['file']       = utf8_basename($file);
         $item['size']       = filesize($base.'/'.$file);
         $item['mtime']      = filemtime($base.'/'.$file);
@@ -417,8 +422,8 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
     }
 
     if($type == 'f'){
-        if($opts['hash']) $item['hash'] = md5(io_readFile($base.'/'.$file,false));
-        if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER);
+        if(!empty($opts['hash'])) $item['hash'] = md5(io_readFile($base.'/'.$file,false));
+        if(!empty($opts['firsthead'])) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER);
     }
 
     // finally add the item
diff --git a/inc/subscription.php b/inc/subscription.php
index ddf2f39e6..aab6de926 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -256,8 +256,10 @@ class Subscription {
         if(!$this->isenabled()) return false;
 
         global $ID;
+        /** @var Input $INPUT */
+        global $INPUT;
         if(!$id) $id = $ID;
-        if(!$user) $user = $_SERVER['REMOTE_USER'];
+        if(!$user) $user = $INPUT->server->str('REMOTE_USER');
 
         $subs = $this->subscribers($id, $user);
         if(!count($subs)) return false;
@@ -288,17 +290,19 @@ class Subscription {
     public function send_bulk($page) {
         if(!$this->isenabled()) return 0;
 
-        /** @var auth_basic $auth */
+        /** @var DokuWiki_Auth_Plugin $auth */
         global $auth;
         global $conf;
         global $USERINFO;
+        /** @var Input $INPUT */
+        global $INPUT;
         $count = 0;
 
         $subscriptions = $this->subscribers($page, null, array('digest', 'list'));
 
         // remember current user info
         $olduinfo = $USERINFO;
-        $olduser = $_SERVER['REMOTE_USER'];
+        $olduser = $INPUT->server->str('REMOTE_USER');
 
         foreach($subscriptions as $target => $users) {
             if(!$this->lock($target)) continue;
@@ -315,7 +319,7 @@ class Subscription {
 
                 // Work as the user to make sure ACLs apply correctly
                 $USERINFO = $auth->getUserData($user);
-                $_SERVER['REMOTE_USER'] = $user;
+                $INPUT->server->set('REMOTE_USER',$user);
                 if($USERINFO === false) continue;
                 if(!$USERINFO['mail']) continue;
 
@@ -334,9 +338,10 @@ class Subscription {
                 foreach($changes as $rev) {
                     $n = 0;
                     while(!is_null($rev) && $rev['date'] >= $lastupdate &&
-                        ($_SERVER['REMOTE_USER'] === $rev['user'] ||
+                        ($INPUT->server->str('REMOTE_USER') === $rev['user'] ||
                             $rev['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT)) {
-                        $rev = getRevisions($rev['id'], $n++, 1);
+                        $pagelog = new PageChangeLog($rev['id']);
+                        $rev = $pagelog->getRevisions($n++, 1);
                         $rev = (count($rev) > 0) ? $rev[0] : null;
                     }
 
@@ -369,7 +374,7 @@ class Subscription {
 
         // restore current user info
         $USERINFO = $olduinfo;
-        $_SERVER['REMOTE_USER'] = $olduser;
+        $INPUT->server->set('REMOTE_USER',$olduser);
         return $count;
     }
 
@@ -515,9 +520,10 @@ class Subscription {
      * @return bool
      */
     protected function send_digest($subscriber_mail, $id, $lastupdate) {
+        $pagelog = new PageChangeLog($id);
         $n = 0;
         do {
-            $rev = getRevisions($id, $n++, 1);
+            $rev = $pagelog->getRevisions($n++, 1);
             $rev = (count($rev) > 0) ? $rev[0] : null;
         } while(!is_null($rev) && $rev > $lastupdate);
 
@@ -644,16 +650,20 @@ class Subscription {
      * @todo move the whole functionality into this class, trigger SUBSCRIPTION_NOTIFY_ADDRESSLIST instead,
      *       use an array for the addresses within it
      *
-     * @param array &$data Containing $id (the page id), $self (whether the author
-     *                     should be notified, $addresslist (current email address
-     *                     list)
+     * @param array &$data Containing the entries:
+     *    - $id (the page id),
+     *    - $self (whether the author should be notified,
+     *    - $addresslist (current email address list)
+     *    - $replacements (array of additional string substitutions, @KEY@ to be replaced by value)
      */
     public function notifyaddresses(&$data) {
         if(!$this->isenabled()) return;
 
-        /** @var auth_basic $auth */
+        /** @var DokuWiki_Auth_Plugin $auth */
         global $auth;
         global $conf;
+        /** @var Input $INPUT */
+        global $INPUT;
 
         $id = $data['id'];
         $self = $data['self'];
@@ -667,7 +677,7 @@ class Subscription {
                 $userinfo = $auth->getUserData($user);
                 if($userinfo === false) continue;
                 if(!$userinfo['mail']) continue;
-                if(!$self && $user == $_SERVER['REMOTE_USER']) continue; //skip our own changes
+                if(!$self && $user == $INPUT->server->str('REMOTE_USER')) continue; //skip our own changes
 
                 $level = auth_aclcheck($id, $user, $userinfo['grps']);
                 if($level >= AUTH_READ) {
@@ -692,6 +702,7 @@ class Subscription {
  * @deprecated 2012-12-07
  */
 function subscription_addresslist(&$data) {
+    dbg_deprecated('class Subscription');
     $sub = new Subscription();
     $sub->notifyaddresses($data);
 }
diff --git a/inc/template.php b/inc/template.php
index 0a6a9e4aa..c02c9f1ae 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -154,7 +154,7 @@ function tpl_content_core() {
             html_resendpwd();
             break;
         case 'denied':
-            print p_locale_xhtml('denied');
+            html_denied();
             break;
         case 'profile' :
             html_updateprofile();
@@ -210,7 +210,7 @@ function tpl_toc($return = false) {
         } else {
             $tocok = true;
         }
-        $toc = $meta['description']['tableofcontents'];
+        $toc = isset($meta['description']['tableofcontents']) ? $meta['description']['tableofcontents'] : null;
         if(!$tocok || !is_array($toc) || !$conf['tocminheads'] || count($toc) < $conf['tocminheads']) {
             $toc = array();
         }
@@ -291,6 +291,8 @@ function tpl_metaheaders($alt = true) {
     global $lang;
     global $conf;
     global $updateVersion;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     // prepare the head array
     $head = array();
@@ -316,15 +318,17 @@ function tpl_metaheaders($alt = true) {
     }
 
     if($alt) {
-        $head['link'][] = array(
-            'rel'  => 'alternate', 'type'=> 'application/rss+xml',
-            'title'=> $lang['btn_recent'], 'href'=> DOKU_BASE.'feed.php'
-        );
-        $head['link'][] = array(
-            'rel'  => 'alternate', 'type'=> 'application/rss+xml',
-            'title'=> $lang['currentns'],
-            'href' => DOKU_BASE.'feed.php?mode=list&ns='.$INFO['namespace']
-        );
+        if(actionOK('rss')) {
+            $head['link'][] = array(
+                'rel'  => 'alternate', 'type'=> 'application/rss+xml',
+                'title'=> $lang['btn_recent'], 'href'=> DOKU_BASE.'feed.php'
+            );
+            $head['link'][] = array(
+                'rel'  => 'alternate', 'type'=> 'application/rss+xml',
+                'title'=> $lang['currentns'],
+                'href' => DOKU_BASE.'feed.php?mode=list&ns='.$INFO['namespace']
+            );
+        }
         if(($ACT == 'show' || $ACT == 'search') && $INFO['writable']) {
             $head['link'][] = array(
                 'rel'  => 'edit',
@@ -333,7 +337,7 @@ function tpl_metaheaders($alt = true) {
             );
         }
 
-        if($ACT == 'search') {
+        if(actionOK('rss') && $ACT == 'search') {
             $head['link'][] = array(
                 'rel'  => 'alternate', 'type'=> 'application/rss+xml',
                 'title'=> $lang['searchresult'],
@@ -401,7 +405,7 @@ function tpl_metaheaders($alt = true) {
     // make $INFO and other vars available to JavaScripts
     $json   = new JSON();
     $script = "var NS='".$INFO['namespace']."';";
-    if($conf['useacl'] && !empty($_SERVER['REMOTE_USER'])) {
+    if($conf['useacl'] && $INPUT->server->str('REMOTE_USER')) {
         $script .= "var SIG='".toolbar_signature()."';";
     }
     $script .= 'var JSINFO = '.$json->encode($JSINFO).';';
@@ -548,6 +552,7 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals
          * @var string $method
          * @var bool   $nofollow
          * @var array  $params
+         * @var string $replacement
          */
         extract($data);
         if(strpos($id, '#') === 0) {
@@ -556,6 +561,9 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals
             $linktarget = wl($id, $params);
         }
         $caption = $lang['btn_'.$type];
+        if(strpos($caption, '%s')){
+            $caption = sprintf($caption, $replacement);
+        }
         $akey    = $addTitle = '';
         if($accesskey) {
             $akey     = 'accesskey="'.$accesskey.'" ';
@@ -603,17 +611,20 @@ function tpl_get_action($type) {
     global $REV;
     global $ACT;
     global $conf;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     // check disabled actions and fix the badly named ones
     if($type == 'history') $type = 'revisions';
     if ($type == 'subscription') $type = 'subscribe';
     if(!actionOK($type)) return false;
 
-    $accesskey = null;
-    $id        = $ID;
-    $method    = 'get';
-    $params    = array('do' => $type);
-    $nofollow  = true;
+    $accesskey   = null;
+    $id          = $ID;
+    $method      = 'get';
+    $params      = array('do' => $type);
+    $nofollow    = true;
+    $replacement = '';
     switch($type) {
         case 'edit':
             // most complicated type - we need to decide on current action
@@ -637,7 +648,7 @@ function tpl_get_action($type) {
                     $accesskey     = 'v';
                 }
             } else {
-                $params    = array();
+                $params    = array('do' => '');
                 $type      = 'show';
                 $accesskey = 'v';
             }
@@ -658,7 +669,7 @@ function tpl_get_action($type) {
             break;
         case 'top':
             $accesskey = 't';
-            $params    = array();
+            $params    = array('do' => '');
             $id        = '#dokuwiki__top';
             break;
         case 'back':
@@ -667,12 +678,17 @@ function tpl_get_action($type) {
                 return false;
             }
             $id        = $parent;
-            $params    = array();
+            $params    = array('do' => '');
+            $accesskey = 'b';
+            break;
+        case 'img_backto':
+            $params = array();
             $accesskey = 'b';
+            $replacement = $ID;
             break;
         case 'login':
             $params['sectok'] = getSecurityToken();
-            if(isset($_SERVER['REMOTE_USER'])) {
+            if($INPUT->server->has('REMOTE_USER')) {
                 if(!actionOK('logout')) {
                     return false;
                 }
@@ -681,12 +697,12 @@ function tpl_get_action($type) {
             }
             break;
         case 'register':
-            if(!empty($_SERVER['REMOTE_USER'])) {
+            if($INPUT->server->str('REMOTE_USER')) {
                 return false;
             }
             break;
         case 'resendpwd':
-            if(!empty($_SERVER['REMOTE_USER'])) {
+            if($INPUT->server->str('REMOTE_USER')) {
                 return false;
             }
             break;
@@ -703,25 +719,40 @@ function tpl_get_action($type) {
             $params['sectok'] = getSecurityToken();
             break;
         case 'subscribe':
-            if(!$_SERVER['REMOTE_USER']) {
+            if(!$INPUT->server->str('REMOTE_USER')) {
                 return false;
             }
             break;
         case 'backlink':
             break;
         case 'profile':
-            if(!isset($_SERVER['REMOTE_USER'])) {
+            if(!$INPUT->server->has('REMOTE_USER')) {
                 return false;
             }
             break;
         case 'media':
             $params['ns'] = getNS($ID);
             break;
+        case 'mediaManager':
+            // View image in media manager
+            global $IMG;
+            $imgNS = getNS($IMG);
+            $authNS = auth_quickaclcheck("$imgNS:*");
+            if ($authNS < AUTH_UPLOAD) {
+                return false;
+            }
+            $params = array(
+                'ns' => $imgNS,
+                'image' => $IMG,
+                'do' => 'media'
+            );
+            //$type = 'media';
+            break;
         default:
             return '[unknown %s type]';
             break;
     }
-    return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow');
+    return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow', 'replacement');
 }
 
 /**
@@ -805,7 +836,7 @@ function tpl_breadcrumbs($sep = '•') {
     $crumbs_sep = ' <span class="bcsep">'.$sep.'</span> ';
 
     //render crumbs, highlight the last one
-    print '<span class="bchead">'.$lang['breadcrumb'].':</span>';
+    print '<span class="bchead">'.$lang['breadcrumb'].'</span>';
     $last = count($crumbs);
     $i    = 0;
     foreach($crumbs as $id => $name) {
@@ -845,7 +876,7 @@ function tpl_youarehere($sep = ' » ') {
     $parts = explode(':', $ID);
     $count = count($parts);
 
-    echo '<span class="bchead">'.$lang['youarehere'].': </span>';
+    echo '<span class="bchead">'.$lang['youarehere'].' </span>';
 
     // always print the startpage
     echo '<span class="home">';
@@ -885,9 +916,11 @@ function tpl_youarehere($sep = ' » ') {
  */
 function tpl_userinfo() {
     global $lang;
-    global $INFO;
-    if(isset($_SERVER['REMOTE_USER'])) {
-        print $lang['loggedinas'].': <bdi>'.hsc($INFO['userinfo']['name']).'</bdi> (<bdi>'.hsc($_SERVER['REMOTE_USER']).'</bdi>)';
+    /** @var Input $INPUT */
+    global $INPUT;
+
+    if($INPUT->server->str('REMOTE_USER')) {
+        print $lang['loggedinas'].' '.userlink();
         return true;
     }
     return false;
@@ -929,7 +962,7 @@ function tpl_pageinfo($ret = false) {
         $out .= '<bdi>'.$fn.'</bdi>';
         $out .= ' · ';
         $out .= $lang['lastmod'];
-        $out .= ': ';
+        $out .= ' ';
         $out .= $date;
         if($INFO['editor']) {
             $out .= ' '.$lang['by'].' ';
@@ -940,7 +973,7 @@ function tpl_pageinfo($ret = false) {
         if($INFO['locked']) {
             $out .= ' · ';
             $out .= $lang['lockedby'];
-            $out .= ': ';
+            $out .= ' ';
             $out .= '<bdi>'.editorinfo($INFO['locked']).'</bdi>';
         }
         if($ret) {
@@ -1011,12 +1044,73 @@ function tpl_img_getTag($tags, $alt = '', $src = null) {
     static $meta = null;
     if(is_null($meta)) $meta = new JpegMeta($src);
     if($meta === false) return $alt;
-    $info = $meta->getField($tags);
+    $info = cleanText($meta->getField($tags));
     if($info == false) return $alt;
     return $info;
 }
 
 /**
+ * Returns a description list of the metatags of the current image
+ *
+ * @return string html of description list
+ */
+function tpl_img_meta() {
+    global $lang;
+
+    $tags = tpl_get_img_meta();
+
+    echo '<dl>';
+    foreach($tags as $tag) {
+        $label = $lang[$tag['langkey']];
+        if(!$label) $label = $tag['langkey'] . ':';
+
+        echo '<dt>'.$label.'</dt><dd>';
+        if ($tag['type'] == 'date') {
+            echo dformat($tag['value']);
+        } else {
+            echo hsc($tag['value']);
+        }
+        echo '</dd>';
+    }
+    echo '</dl>';
+}
+
+/**
+ * Returns metadata as configured in mediameta config file, ready for creating html
+ *
+ * @return array with arrays containing the entries:
+ *   - string langkey  key to lookup in the $lang var, if not found printed as is
+ *   - string type     type of value
+ *   - string value    tag value (unescaped)
+ */
+function tpl_get_img_meta() {
+
+    $config_files = getConfigFiles('mediameta');
+    foreach ($config_files as $config_file) {
+        if(@file_exists($config_file)) {
+            include($config_file);
+        }
+    }
+    /** @var array $fields the included array with metadata */
+
+    $tags = array();
+    foreach($fields as $tag){
+        $t = array();
+        if (!empty($tag[0])) {
+            $t = array($tag[0]);
+        }
+        if(is_array($tag[3])) {
+            $t = array_merge($t,$tag[3]);
+        }
+        $value = tpl_img_getTag($t);
+        if ($value) {
+            $tags[] = array('langkey' => $tag[1], 'type' => $tag[2], 'value' => $value);
+        }
+    }
+    return $tags;
+}
+
+/**
  * Prints the image with a link to the full sized version
  *
  * Only allowed in: detail.php
@@ -1030,6 +1124,7 @@ function tpl_img_getTag($tags, $alt = '', $src = null) {
  */
 function tpl_img($maxwidth = 0, $maxheight = 0, $link = true, $params = null) {
     global $IMG;
+    /** @var Input $INPUT */
     global $INPUT;
     $w = tpl_img_getTag('File.Width');
     $h = tpl_img_getTag('File.Height');
@@ -1242,6 +1337,7 @@ function tpl_mediaContent($fromajax = false, $sort='natural') {
     global $INUSE;
     global $NS;
     global $JUMPTO;
+    /** @var Input $INPUT */
     global $INPUT;
 
     $do = $INPUT->extract('do')->str('do');
@@ -1291,6 +1387,7 @@ function tpl_mediaFileList() {
     global $NS;
     global $JUMPTO;
     global $lang;
+    /** @var Input $INPUT */
     global $INPUT;
 
     $opened_tab = $INPUT->str('tab_files');
@@ -1331,12 +1428,14 @@ function tpl_mediaFileList() {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_mediaFileDetails($image, $rev) {
-    global $AUTH, $NS, $conf, $DEL, $lang, $INPUT;
+    global $conf, $DEL, $lang;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
     if(!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return;
     if($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
-    if(isset($NS) && getNS($image) != $NS) return;
+    $ns = getNS($image);
     $do = $INPUT->str('mediado');
 
     $opened_tab = $INPUT->str('tab_details');
@@ -1372,13 +1471,13 @@ function tpl_mediaFileDetails($image, $rev) {
     echo '<div class="panelContent">'.NL;
 
     if($opened_tab == 'view') {
-        media_tab_view($image, $NS, $AUTH, $rev);
+        media_tab_view($image, $ns, null, $rev);
 
     } elseif($opened_tab == 'edit' && !$removed) {
-        media_tab_edit($image, $NS, $AUTH);
+        media_tab_edit($image, $ns);
 
     } elseif($opened_tab == 'history' && $conf['mediarevisions']) {
-        media_tab_history($image, $NS, $AUTH);
+        media_tab_history($image, $ns);
     }
 
     echo '</div>'.NL;
@@ -1409,12 +1508,14 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     global $ID;
     global $REV;
     global $lang;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     echo '<form action="'.script().'" method="get" 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.'" />';
-    if (!empty($_SERVER['REMOTE_USER'])) {
+    if ($INPUT->server->str('REMOTE_USER')) {
         echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />';
     }
 
@@ -1780,11 +1881,14 @@ function tpl_media() {
  */
 function tpl_classes() {
     global $ACT, $conf, $ID, $INFO;
+    /** @var Input $INPUT */
+    global $INPUT;
+
     $classes = array(
         'dokuwiki',
         'mode_'.$ACT,
         'tpl_'.$conf['template'],
-        !empty($_SERVER['REMOTE_USER']) ? 'loggedIn' : '',
+        $INPUT->server->bool('REMOTE_USER') ? 'loggedIn' : '',
         $INFO['exists'] ? '' : 'notFound',
         ($ID == $conf['start']) ? 'home' : '',
     );
diff --git a/inc/toolbar.php b/inc/toolbar.php
index d8d2f209b..7cc29e866 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -241,10 +241,12 @@ function toolbar_JSdefines($varname){
 function toolbar_signature(){
     global $conf;
     global $INFO;
+    /** @var Input $INPUT */
+    global $INPUT;
 
     $sig = $conf['signature'];
     $sig = dformat(null,$sig);
-    $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig);
+    $sig = str_replace('@USER@',$INPUT->server->str('REMOTE_USER'),$sig);
     $sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
     $sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
     $sig = str_replace('@DATE@',dformat(),$sig);