From 1015a57dff9a6f85b8e0534d280aa1e09945a598 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 16 Feb 2013 21:08:09 +0000 Subject: FS#2415 add to mediamanager (refactor pageinfo() and shift MEDIAMANAGER_STARTED after mediainfo() sets up ) --- lib/exe/mediamanager.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index 04dd178cc..7e0543540 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -7,15 +7,11 @@ require_once(DOKU_INC.'inc/init.php'); - trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); - session_write_close(); //close session - global $INPUT; // handle passed message if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1); if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1); - // get namespace to display (either direct or from deletion order) if($INPUT->str('delete')){ $DEL = cleanID($INPUT->str('delete')); @@ -29,10 +25,14 @@ $NS = getNS($IMG); }else{ $NS = cleanID($INPUT->str('ns')); + $IMG = null; } - // check auth - $AUTH = auth_quickaclcheck("$NS:*"); + $INFO = mediainfo(); + $AUTH = $INFO['perm']; // shortcut for historical reasons + + trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); + session_write_close(); //close session // do not display the manager if user does not have read access if($AUTH < AUTH_READ && !$fullscreen) { -- cgit v1.2.3 From 51de8ca123f3789b5a6a98852fd9a8c4b938873b Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 18 Feb 2013 14:47:52 +0000 Subject: add comments for recent settings class additions to extra.class.php --- lib/plugins/config/settings/config.metadata.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 22e76a013..4731ffc16 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -42,6 +42,8 @@ * 'im_convert' - as 'setting', input must exist and be an im_convert module * 'disableactions' - as 'setting' * 'compression' - no additional parameters. checks php installation supports possible compression alternatives + * 'licence' - as multichoice, selection constructed from licence strings in language files + * 'renderer' - as multichoice, selection constructed from enabled renderer plugins which canRender() * * Any setting commented or missing will use 'setting' class - text input, minimal validation, quoted output * -- cgit v1.2.3 From c89ab3e93dc9b6fadb29518a47e4b32a49666729 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 18 Feb 2013 14:49:42 +0000 Subject: remove php_strip_whitespace() alternate, no longer required as php min req't ensures its always present --- lib/plugins/config/settings/config.class.php | 94 ---------------------------- 1 file changed, 94 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index e5e09d8f8..427178c40 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -1083,97 +1083,3 @@ if (!class_exists('setting_multicheckbox')) { } } } - -/** - * Provide php_strip_whitespace (php5 function) functionality - * - * @author Chris Smith - */ -if (!function_exists('php_strip_whitespace')) { - - if (function_exists('token_get_all')) { - - if (!defined('T_ML_COMMENT')) { - define('T_ML_COMMENT', T_COMMENT); - } else { - define('T_DOC_COMMENT', T_ML_COMMENT); - } - - /** - * modified from original - * source Google Groups, php.general, by David Otton - */ - function php_strip_whitespace($file) { - if (!@is_readable($file)) return ''; - - $in = join('',@file($file)); - $out = ''; - - $tokens = token_get_all($in); - - foreach ($tokens as $token) { - if (is_string ($token)) { - $out .= $token; - } else { - list ($id, $text) = $token; - switch ($id) { - case T_COMMENT : // fall thru - case T_ML_COMMENT : // fall thru - case T_DOC_COMMENT : // fall thru - case T_WHITESPACE : - break; - default : $out .= $text; break; - } - } - } - return ($out); - } - - } else { - - function is_whitespace($c) { return (strpos("\t\n\r ",$c) !== false); } - function is_quote($c) { return (strpos("\"'",$c) !== false); } - function is_escaped($s,$i) { - $idx = $i-1; - while(($idx>=0) && ($s{$idx} == '\\')) $idx--; - return (($i - $idx + 1) % 2); - } - - function is_commentopen($str, $i) { - if ($str{$i} == '#') return "\n"; - if ($str{$i} == '/') { - if ($str{$i+1} == '/') return "\n"; - if ($str{$i+1} == '*') return "*/"; - } - - return false; - } - - function php_strip_whitespace($file) { - - if (!@is_readable($file)) return ''; - - $contents = join('',@file($file)); - $out = ''; - - $state = 0; - for ($i=0; $i Date: Mon, 18 Feb 2013 15:14:51 +0000 Subject: remove no longer used email pattern, validation is done by mail_* functions --- lib/plugins/config/settings/config.class.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 427178c40..ec5f73fa5 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -659,10 +659,8 @@ if (!class_exists('setting_password')) { } if (!class_exists('setting_email')) { - if (!defined('SETTING_EMAIL_PATTERN')) define('SETTING_EMAIL_PATTERN','<^'.PREG_PATTERN_VALID_EMAIL.'$>'); class setting_email extends setting_string { - var $_pattern = SETTING_EMAIL_PATTERN; // no longer required, retained for backward compatibility - FIXME, may not be necessary var $_multiple = false; var $_placeholders = false; -- cgit v1.2.3 From d110fb0d68e5a037b6db151d7bfd4881c48ccdec Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 18 Feb 2013 15:51:06 +0000 Subject: FS#2722 add settings_regex class, use it for hidepages --- lib/plugins/config/settings/config.class.php | 37 +++++++++++++++++++++++++ lib/plugins/config/settings/config.metadata.php | 8 +++++- 2 files changed, 44 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index ec5f73fa5..bbb25b695 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -1081,3 +1081,40 @@ if (!class_exists('setting_multicheckbox')) { } } } + +if (!class_exists('setting_regex')){ + class setting_regex extends setting_string { + + var $_delimiter = '/'; // regex delimiter to be used in testing input + var $_pregflags = 'ui'; // regex pattern modifiers to be used in testing input + + /** + * update changed setting with user provided value $input + * - if changed value fails error check, save it to $this->_input (to allow echoing later) + * - if changed value passes error check, set $this->_local to the new value + * + * @param mixed $input the new value + * @return boolean true if changed, false otherwise (incl. on error) + */ + function update($input) { + + // let parent do basic checks, value, not changed, etc. + $local = $this->_local; + if (!parent::update($input)) return false; + $this->_local = $local; + + // see if the regex compiles and runs (we don't check for effectiveness) + $regex = $this->_delimiter . $input . $this->_delimiter . $this->_pregflags; + $lastError = error_get_last(); + $ok = @preg_match($regex,'testdata'); + if (preg_last_error() != PREG_NO_ERROR || error_get_last() != $lastError) { + $this->_input = $input; + $this->_error = true; + return false; + } + + $this->_local = $input; + return true; + } + } +} \ No newline at end of file diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 4731ffc16..5aedaa6f1 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -33,6 +33,9 @@ * 'array' - a simple (one dimensional) array of string values, shown as comma separated list in the * config manager but saved as PHP array(). Values may not contain commas themselves. * _pattern matching on the array values supported. + * 'regex' - regular expression string, normally without delimiters; as for string, in addition tested + * to see if will compile & run as a regex. in addition to _pattern, also accepts _delimiter + * (default '/') and _pregflags (default 'ui') * * Single Setting (source: settings/extra.class.php) * ------------------------------------------------- @@ -60,6 +63,9 @@ * '_code' - encoding method to use, accepted values: 'base64','uuencode','plain'. defaults to plain. * '_min' - minimum numeric value, optional for 'numeric' and 'numericopt', ignored by others * '_max' - maximum numeric value, optional for 'numeric' and 'numericopt', ignored by others + * '_delimiter' - string, default '/', a single character used as a delimiter for testing regex input values + * '_pregflags' - string, default 'ui', valid preg pattern modifiers used when testing regex input values, for more + * information see http://uk1.php.net/manual/en/reference.pcre.pattern.modifiers.php * * @author Chris Smith */ @@ -115,7 +121,7 @@ $meta['camelcase'] = array('onoff'); $meta['deaccent'] = array('multichoice','_choices' => array(0,1,2)); $meta['useheading'] = array('multichoice','_choices' => array(0,'navigation','content',1)); $meta['sneaky_index'] = array('onoff'); -$meta['hidepages'] = array('string'); +$meta['hidepages'] = array('regex'); $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); -- cgit v1.2.3 From d433710d8084d65218569a93034cec1e28bbeb43 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 18 Feb 2013 17:32:13 +0000 Subject: fix security caution for 'remote' setting (was 'xmlrpc') --- lib/plugins/config/settings/config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index bbb25b695..f7ab6606b 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -370,7 +370,7 @@ if (!class_exists('setting')) { var $_cautionList = array( 'basedir' => 'danger', 'baseurl' => 'danger', 'savedir' => 'danger', 'cookiedir' => 'danger', 'useacl' => 'danger', 'authtype' => 'danger', 'superuser' => 'danger', 'userewrite' => 'danger', 'start' => 'warning', 'camelcase' => 'warning', 'deaccent' => 'warning', 'sepchar' => 'warning', 'compression' => 'warning', 'xsendfile' => 'warning', 'renderer_xhtml' => 'warning', 'fnencode' => 'warning', - 'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'xmlrpc' => 'security', 'fullpath' => 'security' + 'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'remote' => 'security', 'fullpath' => 'security' ); function setting($key, $params=null) { -- cgit v1.2.3 From 9dc3b8ab758eb9236e8f1933309f2bc539cf3f5e Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 18 Feb 2013 17:51:45 +0000 Subject: replace preset _cautionList property with _caution config metadata parameter, plugins can now easily set cautions on their settings --- lib/plugins/config/settings/config.class.php | 27 +++++++++++---- lib/plugins/config/settings/config.metadata.php | 45 +++++++++++++------------ 2 files changed, 43 insertions(+), 29 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index f7ab6606b..1c7d8f680 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -366,12 +366,11 @@ if (!class_exists('setting')) { var $_pattern = ''; var $_error = false; // only used by those classes which error check var $_input = null; // only used by those classes which error check + var $_caution = null; // used by any setting to provide an alert along with the setting + // valid alerts, 'warning', 'danger', 'security' + // images matching the alerts are in the plugin's images directory - var $_cautionList = array( - 'basedir' => 'danger', 'baseurl' => 'danger', 'savedir' => 'danger', 'cookiedir' => 'danger', 'useacl' => 'danger', 'authtype' => 'danger', 'superuser' => 'danger', 'userewrite' => 'danger', - 'start' => 'warning', 'camelcase' => 'warning', 'deaccent' => 'warning', 'sepchar' => 'warning', 'compression' => 'warning', 'xsendfile' => 'warning', 'renderer_xhtml' => 'warning', 'fnencode' => 'warning', - 'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'remote' => 'security', 'fullpath' => 'security' - ); + static protected $_validCautions = array('warning','danger','security'); function setting($key, $params=null) { $this->_key = $key; @@ -473,8 +472,22 @@ if (!class_exists('setting')) { function error() { return $this->_error; } function caution() { - if (!array_key_exists($this->_key, $this->_cautionList)) return false; - return $this->_cautionList[$this->_key]; + if (!empty($this->_caution)) { + if (!in_array($this->_caution, setting::$_validCautions)) { + trigger_error('Invalid caution string ('.$this->_caution.') in metadata for setting "'.$this->_key.'"', E_USER_WARNING); + return false; + } + return $this->_caution; + } + // compatibility with previous cautionList + // TODO: check if any plugins use; remove + if (!empty($this->_cautionList[$this->_key])) { + $this->_caution = $this->_cautionList[$this->_key]; + unset($this->_cautionList); + + return $this->caution(); + } + return false; } function _out_key($pretty=false,$url=false) { diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5aedaa6f1..08003a3e4 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -51,6 +51,7 @@ * Any setting commented or missing will use 'setting' class - text input, minimal validation, quoted output * * Defined parameters: + * '_caution' - no value (default) or 'warning', 'danger', 'security'. display an alert along with the setting * '_pattern' - string, a preg pattern. input is tested against this pattern before being accepted * optional all classes, except onoff & multichoice which ignore it * '_choices' - array of choices. used to populate a selection box. choice will be replaced by a localised @@ -89,26 +90,26 @@ $config['heading'] = 'Dokuwiki\'s Main Configuration File - Local Settings'; $meta['_basic'] = array('fieldset'); $meta['title'] = array('string'); -$meta['start'] = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces +$meta['start'] = array('string','_caution' => 'warning','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces $meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/'); $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/'); $meta['tagline'] = array('string'); $meta['sidebar'] = array('string'); $meta['license'] = array('license'); -$meta['savedir'] = array('savedir'); -$meta['basedir'] = array('string'); -$meta['baseurl'] = array('string'); -$meta['cookiedir'] = array('string'); +$meta['savedir'] = array('savedir','_caution' => 'danger'); +$meta['basedir'] = array('string','_caution' => 'danger'); +$meta['baseurl'] = array('string','_caution' => 'danger'); +$meta['cookiedir'] = array('string','_caution' => 'danger'); $meta['dmode'] = array('numeric','_pattern' => '/0[0-7]{3,4}/'); // only accept octal representation $meta['fmode'] = array('numeric','_pattern' => '/0[0-7]{3,4}/'); // only accept octal representation -$meta['allowdebug'] = array('onoff'); +$meta['allowdebug'] = array('onoff','_caution' => 'security'); $meta['_display'] = array('fieldset'); $meta['recent'] = array('numeric'); $meta['recent_days'] = array('numeric'); $meta['breadcrumbs'] = array('numeric','_min' => 0); $meta['youarehere'] = array('onoff'); -$meta['fullpath'] = array('onoff'); +$meta['fullpath'] = array('onoff','_caution' => 'security'); $meta['typography'] = array('multichoice','_choices' => array(0,1,2)); $meta['dformat'] = array('string'); $meta['signature'] = array('string'); @@ -117,19 +118,19 @@ $meta['toptoclevel'] = array('multichoice','_choices' => array(1,2,3,4,5)); // $meta['tocminheads'] = array('multichoice','_choices' => array(0,1,2,3,4,5,10,15,20)); $meta['maxtoclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); $meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); // 0 for no sec edit buttons -$meta['camelcase'] = array('onoff'); -$meta['deaccent'] = array('multichoice','_choices' => array(0,1,2)); +$meta['camelcase'] = array('onoff','_caution' => 'warning'); +$meta['deaccent'] = array('multichoice','_choices' => array(0,1,2),'_caution' => 'warning'); $meta['useheading'] = array('multichoice','_choices' => array(0,'navigation','content',1)); $meta['sneaky_index'] = array('onoff'); $meta['hidepages'] = array('regex'); $meta['_authentication'] = array('fieldset'); -$meta['useacl'] = array('onoff'); +$meta['useacl'] = array('onoff','_caution' => 'danger'); $meta['autopasswd'] = array('onoff'); -$meta['authtype'] = array('authtype'); +$meta['authtype'] = array('authtype','_caution' => 'danger'); $meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','mediawiki','bcrypt','djangomd5','djangosha1','sha512')); $meta['defaultgroup']= array('string'); -$meta['superuser'] = array('string'); +$meta['superuser'] = array('string','_caution' => 'danger'); $meta['manager'] = array('string'); $meta['profileconfirm'] = array('onoff'); $meta['rememberme'] = array('onoff'); @@ -138,7 +139,7 @@ $meta['disableactions'] = array('disableactions', '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'))); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); -$meta['remote'] = array('onoff'); +$meta['remote'] = array('onoff','_caution' => 'security'); $meta['remoteuser'] = array('string'); $meta['_anti_spam'] = array('fieldset'); @@ -146,12 +147,12 @@ $meta['usewordblock']= array('onoff'); $meta['relnofollow'] = array('onoff'); $meta['indexdelay'] = array('numeric'); $meta['mailguard'] = array('multichoice','_choices' => array('visible','hex','none')); -$meta['iexssprotect']= array('onoff'); +$meta['iexssprotect']= array('onoff','_caution' => 'security'); $meta['_editing'] = array('fieldset'); $meta['usedraft'] = array('onoff'); -$meta['htmlok'] = array('onoff'); -$meta['phpok'] = array('onoff'); +$meta['htmlok'] = array('onoff','_caution' => 'security'); +$meta['phpok'] = array('onoff','_caution' => 'security'); $meta['locktime'] = array('numeric'); $meta['cachetime'] = array('numeric'); @@ -191,20 +192,20 @@ $meta['rss_show_summary'] = array('onoff'); $meta['_advanced'] = array('fieldset'); $meta['updatecheck'] = array('onoff'); -$meta['userewrite'] = array('multichoice','_choices' => array(0,1,2)); +$meta['userewrite'] = array('multichoice','_choices' => array(0,1,2),'_caution' => 'danger'); $meta['useslash'] = array('onoff'); -$meta['sepchar'] = array('sepchar'); +$meta['sepchar'] = array('sepchar','_caution' => 'warning'); $meta['canonical'] = array('onoff'); -$meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf-8')); +$meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf-8'),'_caution' => 'warning'); $meta['autoplural'] = array('onoff'); $meta['compress'] = array('onoff'); $meta['cssdatauri'] = array('numeric','_pattern' => '/^\d+$/'); $meta['gzip_output'] = array('onoff'); $meta['send404'] = array('onoff'); -$meta['compression'] = array('compression'); +$meta['compression'] = array('compression','_caution' => 'warning'); $meta['broken_iua'] = array('onoff'); -$meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); -$meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); +$meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'warning'); +$meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml'),'_caution' => 'warning'); $meta['readdircache'] = array('numeric'); $meta['_network'] = array('fieldset'); -- cgit v1.2.3 From 9507770d8c13e47b975bf35fe25264448da3f28a Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Wed, 20 Feb 2013 20:26:05 +0100 Subject: Fix remaining missing $INPUT uses FS#2577 This adds $INPUT in all places where it was still missing and available. $INPUT is now also used in places where using $_REQUEST/... was okay in order to make the code consistent. --- lib/plugins/authad/auth.php | 5 +++-- lib/plugins/plugin/admin.php | 3 ++- lib/plugins/revert/admin.php | 13 +++++++------ lib/plugins/usermanager/admin.php | 25 +++++++++++++------------ 4 files changed, 25 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index f651d87a1..6c49eafbb 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -71,6 +71,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { * Constructor */ public function __construct() { + global $INPUT; parent::__construct(); // we load the config early to modify it a bit here @@ -99,8 +100,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { // we need to simulate a login if(empty($_COOKIE[DOKU_COOKIE])) { - $_REQUEST['u'] = $_SERVER['REMOTE_USER']; - $_REQUEST['p'] = 'sso_only'; + $INPUT->set('u', $_SERVER['REMOTE_USER']); + $INPUT->set('p', 'sso_only'); } } diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index 8b1ee3c7d..de4de6aef 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -61,11 +61,12 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin { * handle user request */ function handle() { + global $INPUT; // enable direct access to language strings $this->setupLocale(); - $fn = $_REQUEST['fn']; + $fn = $INPUT->param('fn'); if (is_array($fn)) { $this->cmd = key($fn); $this->plugin = is_array($fn[$this->cmd]) ? key($fn[$this->cmd]) : null; diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php index fcdaa230d..847e38876 100644 --- a/lib/plugins/revert/admin.php +++ b/lib/plugins/revert/admin.php @@ -44,15 +44,16 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { * output appropriate html */ function html() { + global $INPUT; echo $this->plugin_locale_xhtml('intro'); $this->_searchform(); - if(is_array($_REQUEST['revert']) && checkSecurityToken()){ - $this->_revert($_REQUEST['revert'],$_REQUEST['filter']); - }elseif(isset($_REQUEST['filter'])){ - $this->_list($_REQUEST['filter']); + if(is_array($INPUT->param('revert')) && checkSecurityToken()){ + $this->_revert($INPUT->arr('revert'),$INPUT->str('filter')); + }elseif($INPUT->has('filter')){ + $this->_list($INPUT->str('filter')); } } @@ -60,10 +61,10 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { * Display the form for searching spam pages */ function _searchform(){ - global $lang; + global $lang, $INPUT; echo '
'; echo ''; - echo ''; + echo ''; echo ' '; echo ' '.$this->getLang('note1').''; echo '


'; diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index cf8963e64..01f4a4cdb 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -73,11 +73,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { * handle user request */ function handle() { + global $INPUT; if (is_null($this->_auth)) return false; // extract the command and any specific parameters // submit button name is of the form - fn[cmd][param(s)] - $fn = $_REQUEST['fn']; + $fn = $INPUT->param('fn'); if (is_array($fn)) { $cmd = key($fn); @@ -88,8 +89,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } if ($cmd != "search") { - if (!empty($_REQUEST['start'])) - $this->_start = $_REQUEST['start']; + $this->_start = $INPUT->int('start', 0); $this->_filter = $this->_retrieveFilter(); } @@ -345,6 +345,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } function _addUser(){ + global $INPUT; if (!checkSecurityToken()) return false; if (!$this->_auth->canDo('addUser')) return false; @@ -353,7 +354,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if ($this->_auth->canDo('modPass')){ if (empty($pass)){ - if(!empty($_REQUEST['usernotify'])){ + if($INPUT->has('usernotify')){ $pass = auth_pwgen(); } else { msg($this->lang['add_fail'], -1); @@ -393,7 +394,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { msg($this->lang['add_ok'], 1); - if (!empty($_REQUEST['usernotify']) && $pass) { + if ($INPUT->has('usernotify') && $pass) { $this->_notifyUser($user,$pass); } } else { @@ -407,13 +408,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { * Delete user */ function _deleteUser(){ - global $conf; + global $conf, $INPUT; if (!checkSecurityToken()) return false; if (!$this->_auth->canDo('delUser')) return false; - $selected = $_REQUEST['delete']; - if (!is_array($selected) || empty($selected)) return false; + $selected = $INPUT->arr('delete'); + if (empty($selected)) return false; $selected = array_keys($selected); if(in_array($_SERVER['REMOTE_USER'], $selected)) { @@ -463,13 +464,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { * Modify user (modified user data has been recieved) */ function _modifyUser(){ - global $conf; + global $conf, $INPUT; if (!checkSecurityToken()) return false; if (!$this->_auth->canDo('UserMod')) return false; // get currently valid user data - $olduser = cleanID(preg_replace('/.*:/','',$_REQUEST['userid_old'])); + $olduser = cleanID(preg_replace('/.*:/','',$INPUT->str('userid_old'))); $oldinfo = $this->_auth->getUserData($olduser); // get new user data subject to change @@ -494,7 +495,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } // generate password if left empty and notification is on - if(!empty($_REQUEST['usernotify']) && empty($newpass)){ + if($INPUT->has('usernotify') && empty($newpass)){ $newpass = auth_pwgen(); } @@ -510,7 +511,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) { msg($this->lang['update_ok'],1); - if (!empty($_REQUEST['usernotify']) && $newpass) { + if ($INPUT->has('usernotify') && $newpass) { $notify = empty($changes['user']) ? $olduser : $newuser; $this->_notifyUser($notify,$newpass); } -- cgit v1.2.3 From a4655683f1e9b4bf77a25334cd447b4b50e1c151 Mon Sep 17 00:00:00 2001 From: Lorenzo Radaelli Date: Sun, 24 Feb 2013 10:36:18 +0100 Subject: Italian language update --- lib/plugins/authad/lang/it/settings.php | 5 +++++ lib/plugins/authldap/lang/it/settings.php | 5 +++++ lib/plugins/authmysql/lang/it/settings.php | 5 +++++ lib/plugins/authpgsql/lang/it/settings.php | 5 +++++ lib/plugins/config/lang/it/lang.php | 1 + 5 files changed, 21 insertions(+) create mode 100644 lib/plugins/authad/lang/it/settings.php create mode 100644 lib/plugins/authldap/lang/it/settings.php create mode 100644 lib/plugins/authmysql/lang/it/settings.php create mode 100644 lib/plugins/authpgsql/lang/it/settings.php (limited to 'lib') diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php new file mode 100644 index 000000000..10ae72f87 --- /dev/null +++ b/lib/plugins/authad/lang/it/settings.php @@ -0,0 +1,5 @@ + Date: Sun, 24 Feb 2013 10:37:45 +0100 Subject: Simplified Chinese language update --- lib/plugins/authad/lang/zh/settings.php | 18 ++++++++++++++ lib/plugins/authldap/lang/zh/settings.php | 20 +++++++++++++++ lib/plugins/authmysql/lang/zh/settings.php | 40 ++++++++++++++++++++++++++++++ lib/plugins/authpgsql/lang/zh/settings.php | 37 +++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 lib/plugins/authad/lang/zh/settings.php create mode 100644 lib/plugins/authldap/lang/zh/settings.php create mode 100644 lib/plugins/authmysql/lang/zh/settings.php create mode 100644 lib/plugins/authpgsql/lang/zh/settings.php (limited to 'lib') diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php new file mode 100644 index 000000000..9fd3c4e35 --- /dev/null +++ b/lib/plugins/authad/lang/zh/settings.php @@ -0,0 +1,18 @@ + + */ +$lang['account_suffix'] = '您的账户后缀。例如 @my.domain.org'; +$lang['base_dn'] = '您的基本分辨名。例如 DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = '逗号分隔的域名控制器列表。例如 srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = '一个活动目录的特权用户，可以查看其他所有用户的数据。可选，但对某些活动例如发送订阅邮件是必须的。'; +$lang['ad_password'] = '上述用户的密码。'; +$lang['sso'] = '是否使用经由 Kerberos 和 NTLM 的 Single-Sign-On？'; +$lang['real_primarygroup'] = ' 是否解析真实的主要组，而不是假设为“域用户” (较慢)'; +$lang['use_ssl'] = '使用 SSL 连接？如果是，不要激活下面的 TLS。'; +$lang['use_tls'] = '使用 TLS 连接？如果是 ，不要激活上面的 SSL。'; +$lang['debug'] = '有错误时显示额外的调试信息？'; +$lang['expirywarn'] = '提前多少天警告用户密码即将到期。0 则禁用。'; +$lang['additional'] = '需要从用户数据中获取的额外 AD 属性的列表，以逗号分隔。用于某些插件。'; diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php new file mode 100644 index 000000000..e84511b42 --- /dev/null +++ b/lib/plugins/authldap/lang/zh/settings.php @@ -0,0 +1,20 @@ + + */ +$lang['server'] = '您的 LDAP 服务器。填写主机名 (localhost) 或者完整的 URL (ldap://server.tld:389)'; +$lang['port'] = 'LDAP 服务器端口 (如果上面没有给出完整的 URL)'; +$lang['usertree'] = '何处查找用户账户。例如 ou=People, dc=server, dc=tld'; +$lang['grouptree'] = '何处查找用户组。例如 ou=Group, dc=server, dc=tld'; +$lang['userfilter'] = '用于搜索用户账户的 LDAP 筛选器。例如 (&(uid=%{user})(objectClass=posixAccount))'; +$lang['groupfilter'] = '用于搜索组的 LDAP 筛选器。例如 (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; +$lang['version'] = '使用的协议版本。您或许需要设置为 3'; +$lang['starttls'] = '使用 TLS 连接？'; +$lang['referrals'] = '是否允许引用 (referrals)？'; +$lang['binddn'] = '一个可选的绑定用户的 DN (如果匿名绑定不满足要求)。例如 Eg. cn=admin, dc=my, dc=home'; +$lang['bindpw'] = '上述用户的密码'; +$lang['userscope'] = '限制用户搜索的范围'; +$lang['groupscope'] = '限制组搜索的范围'; +$lang['debug'] = '有错误时显示额外的调试信息'; diff --git a/lib/plugins/authmysql/lang/zh/settings.php b/lib/plugins/authmysql/lang/zh/settings.php new file mode 100644 index 000000000..43cfbb3c0 --- /dev/null +++ b/lib/plugins/authmysql/lang/zh/settings.php @@ -0,0 +1,40 @@ + + */ +$lang['server'] = '您的 MySQL 服务器'; +$lang['user'] = 'MySQL 用户名'; +$lang['password'] = '上述用户的密码'; +$lang['database'] = '使用的数据库'; +$lang['debug'] = '显示额外调试信息'; +$lang['forwardClearPass'] = '将用户密码以明文形式传送给下面的 SQL 语句，而不使用 passcrypt 密码加密选项'; +$lang['TablesToLock'] = '在写操作时需要锁定的数据表列表，以逗号分隔'; +$lang['checkPass'] = '检查密码的 SQL 语句'; +$lang['getUserInfo'] = '获取用户信息的 SQL 语句'; +$lang['getGroups'] = '或许用户的组成员身份的 SQL 语句'; +$lang['getUsers'] = '列出所有用户的 SQL 语句'; +$lang['FilterLogin'] = '根据登录名筛选用户的 SQL 子句'; +$lang['FilterName'] = '根据全名筛选用户的 SQL 子句'; +$lang['FilterEmail'] = '根据电子邮件地址筛选用户的 SQL 子句'; +$lang['FilterGroup'] = '根据组成员身份筛选用户的 SQL 子句'; +$lang['SortOrder'] = '对用户排序的 SQL 子句'; +$lang['addUser'] = '添加新用户的 SQL 语句'; +$lang['addGroup'] = '添加新组的 SQL 语句'; +$lang['addUserGroup'] = '将用户添加到现有组的 SQL 语句'; +$lang['delGroup'] = '删除组的 SQL 语句'; +$lang['getUserID'] = '获取用户主键的 SQL 语句'; +$lang['delUser'] = '删除用户的 SQL 语句'; +$lang['delUserRefs'] = '从所有组中删除一个用户的 SQL 语句'; +$lang['updateUser'] = '更新用户信息的 SQL 语句'; +$lang['UpdateLogin'] = '更新用户登录名的 Update 子句'; +$lang['UpdatePass'] = '更新用户密码的 Update 子句'; +$lang['UpdateEmail'] = '更新用户电子邮件地址的 Update 子句'; +$lang['UpdateName'] = '更新用户全名的 Update 子句'; +$lang['UpdateTarget'] = '更新时识别用户的 Limit 子句'; +$lang['delUserGroup'] = '从指定组删除用户的 SQL 语句'; +$lang['getGroupID'] = '获取指定组主键的 SQL 语句'; +$lang['debug_o_0'] = '无'; +$lang['debug_o_1'] = '仅在有错误时'; +$lang['debug_o_2'] = '所有 SQL 查询'; diff --git a/lib/plugins/authpgsql/lang/zh/settings.php b/lib/plugins/authpgsql/lang/zh/settings.php new file mode 100644 index 000000000..dc7223d89 --- /dev/null +++ b/lib/plugins/authpgsql/lang/zh/settings.php @@ -0,0 +1,37 @@ + + */ +$lang['server'] = '您的 PostgreSQL 服务器'; +$lang['port'] = '您的 PostgreSQL 服务器端口'; +$lang['user'] = 'PostgreSQL 用户名'; +$lang['password'] = '上述用户的密码'; +$lang['database'] = '使用的数据库'; +$lang['debug'] = '显示额外调试信息'; +$lang['forwardClearPass'] = '将用户密码以明文形式传送给下面的 SQL 语句，而不使用 passcrypt 密码加密选项'; +$lang['checkPass'] = '检查密码的 SQL 语句'; +$lang['getUserInfo'] = '获取用户信息的 SQL 语句'; +$lang['getGroups'] = '获取用户的组成员身份的 SQL 语句'; +$lang['getUsers'] = '列出所有用户的 SQL 语句'; +$lang['FilterLogin'] = '根据登录名筛选用户的 SQL 子句'; +$lang['FilterName'] = '根据全名筛选用户的 SQL 子句'; +$lang['FilterEmail'] = '根据电子邮件地址筛选用户的 SQL 子句'; +$lang['FilterGroup'] = '根据组成员身份筛选用户的 SQL 子句'; +$lang['SortOrder'] = '对用户排序的 SQL 子句'; +$lang['addUser'] = '添加新用户的 SQL 语句'; +$lang['addGroup'] = '添加新组的 SQL 语句'; +$lang['addUserGroup'] = '将用户添加到现有组的 SQL 语句'; +$lang['delGroup'] = '删除组的 SQL 语句'; +$lang['getUserID'] = '获取用户主键的 SQL 语句'; +$lang['delUser'] = '删除用户的 SQL 语句'; +$lang['delUserRefs'] = '从所有组中删除一个用户的 SQL 语句'; +$lang['updateUser'] = '更新用户信息的 SQL 语句'; +$lang['UpdateLogin'] = '更新用户登录名的 Update 子句'; +$lang['UpdatePass'] = '更新用户密码的 Update 子句'; +$lang['UpdateEmail'] = '更新用户电子邮件地址的 Update 子句'; +$lang['UpdateName'] = '更新用户全名的 Update 子句'; +$lang['UpdateTarget'] = '更新时识别用户的 Limit 子句'; +$lang['delUserGroup'] = '从指定组删除用户的 SQL 语句'; +$lang['getGroupID'] = '获取指定组主键的 SQL 语句'; -- cgit v1.2.3 From bdac741579f8c6f00248d5d3ec635d4c2e08fb1e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 24 Feb 2013 10:39:52 +0100 Subject: fixed typos --- lib/plugins/authldap/lang/en/settings.php | 4 ++-- lib/plugins/authpgsql/lang/en/settings.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/plugins/authldap/lang/en/settings.php b/lib/plugins/authldap/lang/en/settings.php index 0bb397be5..ddedf8ae3 100644 --- a/lib/plugins/authldap/lang/en/settings.php +++ b/lib/plugins/authldap/lang/en/settings.php @@ -1,14 +1,14 @@ localhost) or full qualified URL (ldap://server.tld:389)'; $lang['port'] = 'LDAP server port if no full URL was given above'; -$lang['usertree'] = 'Where to finde the user accounts. Eg. ou=People, dc=server, dc=tld'; +$lang['usertree'] = 'Where to find the user accounts. Eg. ou=People, dc=server, dc=tld'; $lang['grouptree'] = 'Where to find the user groups. Eg. ou=Group, dc=server, dc=tld'; $lang['userfilter'] = 'LDAP filter to search for user accounts. Eg. (&(uid=%{user})(objectClass=posixAccount))'; $lang['groupfilter'] = 'LDAP filter to search for groups. Eg. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; $lang['version'] = 'The protocol version to use. You may need to set this to 3'; $lang['starttls'] = 'Use TLS connections?'; $lang['referrals'] = 'Shall referrals be followed?'; -$lang['binddn'] = 'DN of an ptional bind user if anonymous bind is not sufficient. Eg. cn=admin, dc=my, dc=home'; +$lang['binddn'] = 'DN of an optional bind user if anonymous bind is not sufficient. Eg. cn=admin, dc=my, dc=home'; $lang['bindpw'] = 'Password of above user'; $lang['userscope'] = 'Limit search scope for user search'; $lang['groupscope'] = 'Limit search scope for group search'; diff --git a/lib/plugins/authpgsql/lang/en/settings.php b/lib/plugins/authpgsql/lang/en/settings.php index 74a1c1cc9..8c048fa0f 100644 --- a/lib/plugins/authpgsql/lang/en/settings.php +++ b/lib/plugins/authpgsql/lang/en/settings.php @@ -20,7 +20,7 @@ $lang['addUser'] = 'SQL statement to add a new user'; $lang['addGroup'] = 'SQL statement to add a new group'; $lang['addUserGroup'] = 'SQL statment to add a user to an existing group'; $lang['delGroup'] = 'SQL statement to remove a group'; -$lang['getUserID'] = 'SQL statement to get the primary ey of a user'; +$lang['getUserID'] = 'SQL statement to get the primary key of a user'; $lang['delUser'] = 'SQL statement to delete a user'; $lang['delUserRefs'] = 'SQL statement to remove a user from all groups'; $lang['updateUser'] = 'SQL statement to update a user profile'; -- cgit v1.2.3 From ca22711e6b0caa2525d6134c28bf0af78e8fcda3 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 3 Mar 2013 18:30:48 +0000 Subject: make global, ensure created in mediamanager is global and merged with any pre-existing --- lib/exe/mediamanager.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index a205c4570..3ec749cd8 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -12,6 +12,7 @@ if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1); if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1); + global $DEL; // get namespace to display (either direct or from deletion order) if($INPUT->str('delete')){ $DEL = cleanID($INPUT->str('delete')); @@ -28,7 +29,8 @@ $IMG = null; } - $INFO = mediainfo(); + global $INFO; + $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo(); $AUTH = $INFO['perm']; // shortcut for historical reasons trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); -- cgit v1.2.3 From b613287149ac4707ec40a96b1b6fe8b190fa6439 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 3 Mar 2013 18:34:33 +0000 Subject: include image info in in detail.php; ensure populated before DETAIL_STARTED event --- lib/exe/detail.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/exe/detail.php b/lib/exe/detail.php index db635c016..7008b126f 100644 --- a/lib/exe/detail.php +++ b/lib/exe/detail.php @@ -2,13 +2,18 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); define('DOKU_MEDIADETAIL',1); require_once(DOKU_INC.'inc/init.php'); -trigger_event('DETAIL_STARTED', $tmp=array()); -//close session -session_write_close(); $IMG = getID('media'); $ID = cleanID($INPUT->str('id')); +// this makes some general infos available as well as the info about the +// "parent" page +$INFO = array_merge(pageinfo(),mediainfo()); +trigger_event('DETAIL_STARTED', $tmp=array()); + +//close session +session_write_close(); + if($conf['allowdebug'] && $INPUT->has('debug')){ print '
';
     foreach(explode(' ','basedir userewrite baseurl useslash') as $x){
@@ -39,10 +44,6 @@ if($AUTH >= AUTH_READ){
     $ERROR = p_locale_xhtml('denied');
 }
 
-// this makes some general infos available as well as the info about the
-// "parent" page
-$INFO = pageinfo();
-
 //start output and load template
 header('Content-Type: text/html; charset=utf-8');
 include(template('detail.php'));
-- 
cgit v1.2.3


From 3074e3428bd5d1e38078dbac80a1eb9b96f917d7 Mon Sep 17 00:00:00 2001
From: Christopher Smith 
Date: Sun, 3 Mar 2013 18:35:27 +0000
Subject: fix comment grammar

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

(limited to 'lib')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 3ec749cd8..66e5ddc82 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -54,7 +54,7 @@
         exit;
     }
 
-    // give info on PHP catched upload errors
+    // give info on PHP caught upload errors
     if($_FILES['upload']['error']){
         switch($_FILES['upload']['error']){
             case 1:
-- 
cgit v1.2.3


From bc1e9ee1b1fffcb554afced8504270032c97341f Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Mon, 4 Mar 2013 10:04:57 +0000
Subject: added loggedIn class to main tpl container

---
 lib/tpl/dokuwiki/detail.php | 2 +-
 lib/tpl/dokuwiki/main.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index a8c5fef8a..f20301a89 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die();
 
     
     

+        class="dokuwiki site mode_ ">
 
         
 
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 963750a1c..cd5a66ad4 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -29,7 +29,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     
     

+        ?>  ">
 
         
 
-- 
cgit v1.2.3


From 37764cbb34237da3c96bab21102e44ffe2715cd9 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 15 May 2013 10:06:23 +0200
Subject: fixed space of list points beside a floating image

---
 lib/tpl/dokuwiki/css/basic.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index a0a60d295..f7addc321 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -111,7 +111,7 @@ div {
 
 ul,
 ol {
-    padding: 0 0 0 1.5em;
+    padding: 0 0 0 0.5em;
 }
 [dir=rtl] ul,
 [dir=rtl] ol {
@@ -146,8 +146,8 @@ li li {
     font-size: 100%;
 }
 
-ul             { list-style: square outside; }
-ol             { list-style: decimal outside; }
+ul             { list-style: square inside; }
+ol             { list-style: decimal inside; }
 ol ol          { list-style-type: lower-alpha; }
 ol ol ol       { list-style-type: upper-roman; }
 ol ol ol ol    { list-style-type: upper-alpha; }
-- 
cgit v1.2.3


From 712b791cc1f86484279cd54b41dfc14d0ded6fff Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 15 May 2013 12:04:02 +0200
Subject: Revert "fixed space of list points beside a floating image"

This reverts commit 37764cbb34237da3c96bab21102e44ffe2715cd9.
---
 lib/tpl/dokuwiki/css/basic.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index f7addc321..a0a60d295 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -111,7 +111,7 @@ div {
 
 ul,
 ol {
-    padding: 0 0 0 0.5em;
+    padding: 0 0 0 1.5em;
 }
 [dir=rtl] ul,
 [dir=rtl] ol {
@@ -146,8 +146,8 @@ li li {
     font-size: 100%;
 }
 
-ul             { list-style: square inside; }
-ol             { list-style: decimal inside; }
+ul             { list-style: square outside; }
+ol             { list-style: decimal outside; }
 ol ol          { list-style-type: lower-alpha; }
 ol ol ol       { list-style-type: upper-roman; }
 ol ol ol ol    { list-style-type: upper-alpha; }
-- 
cgit v1.2.3


From d572baf83c5a6d61a7f97aa4d115eba76c5f106c Mon Sep 17 00:00:00 2001
From: Klap-in 
Date: Tue, 21 May 2013 21:40:37 +0200
Subject: Add check for token when resizing and caching external images

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

(limited to 'lib')

diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index 7a2250373..5967494bf 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -60,6 +60,7 @@ if (defined('SIMPLE_TEST')) {
     if($evt->advise_before()) {
         // redirects
         if($data['status'] > 300 && $data['status'] <= 304) {
+            if (defined('SIMPLE_TEST')) return; //TestResponse doesn't recognize redirects
             send_redirect($data['statusmessage']);
         }
         // send any non 200 status
-- 
cgit v1.2.3


From 6b519690e45cefe83fbef5691e372c6078c3fb9b Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Mon, 27 May 2013 16:26:40 +0100
Subject: fixed broken default config options (FS#2789)

---
 lib/plugins/authldap/conf/default.php  | 2 +-
 lib/plugins/authmysql/conf/default.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
index d07f9c82e..d530d59c9 100644
--- a/lib/plugins/authldap/conf/default.php
+++ b/lib/plugins/authldap/conf/default.php
@@ -16,4 +16,4 @@ $conf['bindpw']      = '';
 $conf['userscope']  = 'sub';
 $conf['groupscope'] = 'sub';
 $conf['groupkey']   = 'cn';
-$conf['debug']      = array('onoff');
\ No newline at end of file
+$conf['debug']      = 0;
\ No newline at end of file
diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
index 647f3d96c..427bea273 100644
--- a/lib/plugins/authmysql/conf/default.php
+++ b/lib/plugins/authmysql/conf/default.php
@@ -7,7 +7,7 @@ $conf['password']         = '';
 $conf['database']         = '';
 $conf['debug']            = 0;
 $conf['forwardClearPass'] = 0;
-$conf['TablesToLock']     = '';
+$conf['TablesToLock']     = array();
 $conf['checkPass']        = '';
 $conf['getUserInfo']      = '';
 $conf['getGroups']        = '';
-- 
cgit v1.2.3


From 01fb97e278338569ebf861059b81adff5f4a55c6 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Mon, 27 May 2013 17:01:43 +0100
Subject: fixed references from old mysql authtype to new mysql plugin in
 mysql.conf example

---
 lib/plugins/authmysql/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/authmysql/auth.php b/lib/plugins/authmysql/auth.php
index 5f6e86c71..036644a67 100644
--- a/lib/plugins/authmysql/auth.php
+++ b/lib/plugins/authmysql/auth.php
@@ -843,7 +843,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
     /**
      * Locked a list of tables for exclusive access so that modifications
      * to the database can't be disturbed by other threads. The list
-     * could be set with $conf['auth']['mysql']['TablesToLock'] = array()
+     * could be set with $conf['plugin']['authmysql']['TablesToLock'] = array()
      *
      * If aliases for tables are used in SQL statements, also this aliases
      * must be locked. For eg. you use a table 'user' and the alias 'u' in
-- 
cgit v1.2.3


From b9cf8ad44bcbbbded9d6e991f96b0d5f36310a9b Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sat, 1 Jun 2013 23:36:28 +0100
Subject: moved X-UA-Compatible from meta tag to be sent by http header instead

---
 lib/tpl/dokuwiki/detail.php       | 2 +-
 lib/tpl/dokuwiki/main.php         | 2 +-
 lib/tpl/dokuwiki/mediamanager.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index a8c5fef8a..d2ed530a3 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -9,12 +9,12 @@
 
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
+header('X-UA-Compatible: IE=edge,chrome=1');
 
 ?>
 
 
     
-    
     
         <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
         [<?php echo strip_tags($conf['title'])?>]
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 963750a1c..43a0c0da7 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -9,6 +9,7 @@
  */
 
 if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
+header('X-UA-Compatible: IE=edge,chrome=1');
 
 $hasSidebar = page_findnearest($conf['sidebar']);
 $showSidebar = $hasSidebar && ($ACT=='show');
@@ -16,7 +17,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 <html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
 <head>
     <meta charset="utf-8" />
-    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
     <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]
     
     
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php
index 23c9cee79..dadf2b10f 100644
--- a/lib/tpl/dokuwiki/mediamanager.php
+++ b/lib/tpl/dokuwiki/mediamanager.php
@@ -7,12 +7,12 @@
  */
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
+header('X-UA-Compatible: IE=edge,chrome=1');
 
 ?>
 
 
     
-    
     
         <?php echo hsc($lang['mediaselect'])?>
         [<?php echo strip_tags($conf['title'])?>]
-- 
cgit v1.2.3


From 7482f2d6e43ea5768b2de40d89c7e7ea836a60df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com>
Date: Fri, 7 Jun 2013 11:30:39 +0200
Subject: Korean language update

---
 lib/plugins/acl/lang/ko/lang.php         |  2 +-
 lib/plugins/config/lang/ko/intro.txt     |  2 +-
 lib/plugins/config/lang/ko/lang.php      | 22 +++++++++++-----------
 lib/plugins/popularity/lang/ko/intro.txt |  2 +-
 lib/plugins/revert/lang/ko/lang.php      |  2 +-
 lib/plugins/usermanager/lang/ko/lang.php |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 5cec4b8fd..7c1e9a43d 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -40,4 +40,4 @@ $lang['acl_perm4']             = '만들기';
 $lang['acl_perm8']             = '올리기';
 $lang['acl_perm16']            = '삭제';
 $lang['acl_new']               = '새 항목 추가';
-$lang['acl_mod']               = '선택 항목 수정';
+$lang['acl_mod']               = '항목 수정';
diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt
index a2dc7b6f6..b9eb763a4 100644
--- a/lib/plugins/config/lang/ko/intro.txt
+++ b/lib/plugins/config/lang/ko/intro.txt
@@ -2,6 +2,6 @@
 
 DokuWiki 설치할 때 설정을 바꾸기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서 (영어)]]를 참고하세요.
 
-플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 바꾸지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정이 가능합니다.
+플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 바꾸지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
 
 이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀐 값은 적용되지 않습니다.
\ No newline at end of file
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index f69af2df6..da155bcef 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -11,14 +11,14 @@
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['menu']                  = '환경 설정';
-$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 수정한 값을 검토하고 확인을 누르세요.
+$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 바뀜을 검토하고 확인을 누르세요.
 <br />잘못된 값은 빨간 선으로 둘러싸여 있습니다.';
 $lang['updated']               = '설정이 성공적으로 바뀌었습니다.';
 $lang['nochoice']              = '(다른 선택이 불가능합니다)';
-$lang['locked']                = '환경 설정 파일을 수정할 수 없습니다. 의도한 행동이 아니라면,<br />
+$lang['locked']                = '환경 설정 파일을 바꿀 수 없습니다. 의도한 행동이 아니라면,<br />
 파일 이름과 권한이 맞는지 확인하세요.';
-$lang['danger']                = '위험: 이 옵션을 잘못 수정하면 환경설정 메뉴를 사용할 수 없을 수도 있습니다.';
-$lang['warning']               = '경고: 이 옵션을 잘못 수정하면 잘못 동작할 수 있습니다.';
+$lang['danger']                = '위험: 이 옵션을 잘못 바꾸면 환경 설정 메뉴를 사용할 수 없을 수도 있습니다.';
+$lang['warning']               = '경고: 이 옵션을 잘못 바꾸면 잘못 동작할 수 있습니다.';
 $lang['security']              = '보안 경고: 이 옵션은 보안에 위험이 있을 수 있습니다.';
 $lang['_configuration_manager'] = '환경 설정 관리자';
 $lang['_header_dokuwiki']      = 'DokuWiki 설정';
@@ -48,13 +48,13 @@ $lang['template']              = '템플릿 (위키 디자인)';
 $lang['tagline']               = '태그 라인 (템플릿이 지원할 때에 한함)';
 $lang['sidebar']               = '사이드바 문서 이름 (템플릿이 지원할 때에 한함), 비워두면 사이드바를 비활성화';
 $lang['license']               = '콘텐츠에 어떤 라이선스를 적용하겠습니까?';
-$lang['savedir']               = '데이타 저장 디렉토리';
+$lang['savedir']               = '데이터 저장 디렉토리';
 $lang['basedir']               = '서버 경로 (예를 들어 <code>/dokuwiki/</code>). 자동 감지를 하려면 비우세요.';
 $lang['baseurl']               = '서버 URL (예를 들어 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비우세요.';
 $lang['cookiedir']             = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.';
 $lang['dmode']                 = '디렉토리 만들기 모드';
 $lang['fmode']                 = '파일 만들기 모드';
-$lang['allowdebug']            = '디버그 허용 <b>필요하지 않으면 비활성화할 것!</b>';
+$lang['allowdebug']            = '디버그 허용 <b>필요하지 않으면 비활성화하세요!</b>';
 $lang['recent']                = '최근 바뀐 문서당 항목 수';
 $lang['recent_days']           = '최근 바뀐 문서 기준 시간 (일)';
 $lang['breadcrumbs']           = '위치 "추적" 수. 0으로 설정하면 비활성화합니다.';
@@ -63,7 +63,7 @@ $lang['fullpath']              = '문서 하단에 전체 경로 보여주기';
 $lang['typography']            = '기호 대체';
 $lang['dformat']               = '날짜 형식 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능 참고)';
 $lang['signature']             = '편집기에서 서명 버튼을 누를 때 삽입할 내용';
-$lang['showuseras']            = '마지막에 문서를 수정한 사용자를 보여줄지 여부';
+$lang['showuseras']            = '마지막에 문서를 편집한 사용자를 보여줄지 여부';
 $lang['toptoclevel']           = '목차 최상위 항목';
 $lang['tocminheads']           = '목차 표시 여부를 결정할 최소한의 문단 제목 항목의 수';
 $lang['maxtoclevel']           = '목차 최대 단계';
@@ -102,7 +102,7 @@ $lang['htmlok']                = 'HTML 내장 허용';
 $lang['phpok']                 = 'PHP 내장 허용';
 $lang['locktime']              = '최대 파일 잠금 시간(초)';
 $lang['cachetime']             = '최대 캐시 생존 시간 (초)';
-$lang['target____wiki']        = '내부 링크에 대한 타겟 창';
+$lang['target____wiki']        = '안쪽 링크에 대한 타겟 창';
 $lang['target____interwiki']   = '인터위키 링크에 대한 타겟 창';
 $lang['target____extern']      = '바깥 링크에 대한 타겟 창';
 $lang['target____media']       = '미디어 링크에 대한 타겟 창';
@@ -133,7 +133,7 @@ $lang['userewrite']            = '멋진 URL 사용';
 $lang['useslash']              = 'URL에서 이름 구분자로 슬래시 문자 사용';
 $lang['sepchar']               = '문서 이름 단어 구분자';
 $lang['canonical']             = '완전한 canonical URL 사용';
-$lang['fnencode']              = '아스키가 아닌 파일 이름을 인코딩 하는 방법.';
+$lang['fnencode']              = 'ASCII가 아닌 파일 이름을 인코딩 하는 방법.';
 $lang['autoplural']            = '링크 연결시 복수 양식 검사';
 $lang['compression']           = '첨부 파일 압축 방법 선택';
 $lang['gzip_output']           = 'xhml 내용 gzip 압축 사용';
@@ -143,9 +143,9 @@ $lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP
 $lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&task_id=852">버그 852</a>를 참고하시기 바랍니다.';
 $lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
 $lang['renderer_xhtml']        = '주 (xhtml) 위키 출력 처리기';
-$lang['renderer__core']        = '%s (DokuWiki 내부 기능)';
+$lang['renderer__core']        = '%s (DokuWiki 내부)';
 $lang['renderer__plugin']      = '%s (플러그인)';
-$lang['dnslookups']            = '이 옵션을 활성화하면 DokuWiki가 문서를 수정하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화하세요';
+$lang['dnslookups']            = '이 옵션을 활성화하면 DokuWiki가 문서를 편집하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화하세요';
 $lang['proxy____host']         = '프록시 서버 이름';
 $lang['proxy____port']         = '프록시 서버 포트';
 $lang['proxy____user']         = '프록시 사용자 이름';
diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index 2513b77b4..c75c57ba5 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -2,7 +2,7 @@
 
 설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
-설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이타는 익명 ID로 구별되어집니다.
+설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
 보내려는 데이터는 설치 DokuWiki 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
 
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index d36726279..f944361b8 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -16,5 +16,5 @@ $lang['reverted']              = '%s 판을 %s 판으로 되돌림';
 $lang['removed']               = '%s 삭제함';
 $lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 되돌리시기 바랍니다.';
 $lang['revstop']               = '되돌리기 작업이 성공적으로 끝났습니다.';
-$lang['note1']                 = '참고: 대소문자를 구별하여 찾습니다';
+$lang['note1']                 = '참고: 대소문자를 구별해 찾습니다';
 $lang['note2']                 = '참고: 이 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최근 이전 판으로 되돌립니다. ';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index f8c400d19..57bfbc4a2 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -23,8 +23,8 @@ $lang['value']                 = '값';
 $lang['add']                   = '추가';
 $lang['delete']                = '삭제';
 $lang['delete_selected']       = '선택 삭제';
-$lang['edit']                  = '수정';
-$lang['edit_prompt']           = '이 사용자 수정';
+$lang['edit']                  = '편집';
+$lang['edit_prompt']           = '이 사용자 편집';
 $lang['modify']                = '바뀜 저장';
 $lang['search']                = '찾기';
 $lang['search_prompt']         = '찾기 실행';
-- 
cgit v1.2.3


From 12d195ab7189878b41dc4d211befafc79ae402a6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 7 Jun 2013 12:48:07 +0200
Subject: treat empty AD credentials as NULL values FS#2781

---
 lib/plugins/authad/auth.php         | 5 +++++
 lib/plugins/authad/conf/default.php | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index b6b5dd268..fcbd2eeef 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -489,6 +489,11 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
             $this->cando['modPass'] = false;
         }
 
+        // adLDAP expects empty user/pass as NULL, we're less strict FS#2781
+        if(empty($opts['admin_username'])) $opts['admin_username'] = null;
+        if(empty($opts['admin_password'])) $opts['admin_password'] = null;
+
+        // user listing needs admin priviledges
         if(!empty($opts['admin_username']) && !empty($opts['admin_password'])) {
             $this->cando['getUsers'] = true;
         } else {
diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php
index 9274db209..f71202cfc 100644
--- a/lib/plugins/authad/conf/default.php
+++ b/lib/plugins/authad/conf/default.php
@@ -4,8 +4,8 @@ $conf['account_suffix']     = '';
 $conf['base_dn']            = '';
 $conf['domain_controllers'] = '';
 $conf['sso']                = 0;
-$conf['admin_username']        = '';
-$conf['admin_password']        = '';
+$conf['admin_username']     = '';
+$conf['admin_password']     = '';
 $conf['real_primarygroup']  = 0;
 $conf['use_ssl']            = 0;
 $conf['use_tls']            = 0;
-- 
cgit v1.2.3


From e7fbe18945e8d94fd400fd66f36e67174951f290 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 7 Jun 2013 13:23:40 +0200
Subject: fix ldap deref option FS2798

Do not pass timelimit and deref settings to ldap_search. These values
should be set globally via ldap_set_option() instead (as we do for
deref).
---
 lib/plugins/authldap/auth.php             | 8 ++++----
 lib/plugins/authldap/conf/default.php     | 1 +
 lib/plugins/authldap/conf/metadata.php    | 1 +
 lib/plugins/authldap/lang/en/settings.php | 9 ++++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index b49aa4792..e43c3f828 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -502,23 +502,23 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
      * @return resource
      */
     protected function _ldapsearch($link_identifier, $base_dn, $filter, $scope = 'sub', $attributes = null,
-                         $attrsonly = 0, $sizelimit = 0, $timelimit = 0, $deref = LDAP_DEREF_NEVER) {
+                         $attrsonly = 0, $sizelimit = 0) {
         if(is_null($attributes)) $attributes = array();
 
         if($scope == 'base') {
             return @ldap_read(
                 $link_identifier, $base_dn, $filter, $attributes,
-                $attrsonly, $sizelimit, $timelimit, $deref
+                $attrsonly, $sizelimit
             );
         } elseif($scope == 'one') {
             return @ldap_list(
                 $link_identifier, $base_dn, $filter, $attributes,
-                $attrsonly, $sizelimit, $timelimit, $deref
+                $attrsonly, $sizelimit
             );
         } else {
             return @ldap_search(
                 $link_identifier, $base_dn, $filter, $attributes,
-                $attrsonly, $sizelimit, $timelimit, $deref
+                $attrsonly, $sizelimit
             );
         }
     }
diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
index d530d59c9..2c295eeeb 100644
--- a/lib/plugins/authldap/conf/default.php
+++ b/lib/plugins/authldap/conf/default.php
@@ -9,6 +9,7 @@ $conf['groupfilter'] = '';
 $conf['version']     = 2;
 $conf['starttls']    = 0;
 $conf['referrals']   = 0;
+$conf['deref']       = 0;
 $conf['binddn']      = '';
 $conf['bindpw']      = '';
 //$conf['mapping']['name']  unsupported in config manager
diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index fc5b2e63c..a3256628c 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -8,6 +8,7 @@ $meta['groupfilter'] = array('string');
 $meta['version']     = array('numeric');
 $meta['starttls']    = array('onoff');
 $meta['referrals']   = array('onoff');
+$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3));
 $meta['binddn']      = array('string');
 $meta['bindpw']      = array('password');
 //$meta['mapping']['name']  unsupported in config manager
diff --git a/lib/plugins/authldap/lang/en/settings.php b/lib/plugins/authldap/lang/en/settings.php
index ddedf8ae3..e3f385f99 100644
--- a/lib/plugins/authldap/lang/en/settings.php
+++ b/lib/plugins/authldap/lang/en/settings.php
@@ -8,9 +8,16 @@ $lang['groupfilter'] = 'LDAP filter to search for groups. Eg. <code>(&(objec
 $lang['version']     = 'The protocol version to use. You may need to set this to <code>3</code>';
 $lang['starttls']    = 'Use TLS connections?';
 $lang['referrals']   = 'Shall referrals be followed?';
+$lang['deref']       = 'How to dereference aliases?';
 $lang['binddn']      = 'DN of an optional bind user if anonymous bind is not sufficient. Eg. <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']      = 'Password of above user';
 $lang['userscope']   = 'Limit search scope for user search';
 $lang['groupscope']  = 'Limit search scope for group search';
-$lang['groupkey']    = 'Group member ship from any user attribute (instead of standard AD groups) e.g. group from department or telephone number';
+$lang['groupkey']    = 'Group membership from any user attribute (instead of standard AD groups) e.g. group from department or telephone number';
 $lang['debug']       = 'Display additional debug information on errors';
+
+
+$lang['deref_o_0']   = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']   = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']   = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']   = 'LDAP_DEREF_ALWAYS';
\ No newline at end of file
-- 
cgit v1.2.3


From 04e4890db370bdb57201f76581fe3dc0a3adb614 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 7 Jun 2013 13:50:46 +0200
Subject: fix problem when ldap returns no groups FS#2788

---
 lib/plugins/authldap/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index e43c3f828..6a967a6d4 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -248,7 +248,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
         }
 
         // always add the default group to the list of groups
-        if(!in_array($conf['defaultgroup'], $info['grps'])) {
+        if(!$info['grps'] or !in_array($conf['defaultgroup'], $info['grps'])) {
             $info['grps'][] = $conf['defaultgroup'];
         }
         return $info;
-- 
cgit v1.2.3


From 8a285f7fa7f09ae969e12cf4b7bda0f5123bb0fb Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 9 Jun 2013 02:29:27 +0200
Subject: AUTH_PASSWORD_GENERATE event added

This is needed to replace the password generator by a plugin
implementation. Related to PR #166 and FS#2147
---
 lib/plugins/usermanager/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 01f4a4cdb..445836a50 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -355,7 +355,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if ($this->_auth->canDo('modPass')){
           if (empty($pass)){
             if($INPUT->has('usernotify')){
-              $pass = auth_pwgen();
+              $pass = auth_pwgen($user);
             } else {
               msg($this->lang['add_fail'], -1);
               return false;
@@ -496,7 +496,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         // generate password if left empty and notification is on
         if($INPUT->has('usernotify') && empty($newpass)){
-            $newpass = auth_pwgen();
+            $newpass = auth_pwgen($olduser);
         }
 
         if (!empty($newpass) && $this->_auth->canDo('modPass'))
-- 
cgit v1.2.3


From 9d24536dd8ad865dfad2c0259d6b00273e826c12 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 14 Jun 2013 17:11:37 +0200
Subject: correctly count deleted users in plain auth FS#2800

reloading the user list after the delete action will make sure the count
is always correct.
---
 lib/plugins/authplain/auth.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php
index 3416ede89..8c4ce0dd9 100644
--- a/lib/plugins/authplain/auth.php
+++ b/lib/plugins/authplain/auth.php
@@ -198,13 +198,9 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
         if(empty($deleted)) return 0;
 
         $pattern = '/^('.join('|', $deleted).'):/';
+        io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true);
 
-        if(io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true)) {
-            foreach($deleted as $user) unset($this->users[$user]);
-            return count($deleted);
-        }
-
-        // problem deleting, reload the user list and count the difference
+        // reload the user list and count the difference
         $count = count($this->users);
         $this->_loadUserData();
         $count -= count($this->users);
-- 
cgit v1.2.3


From 81ee3b1c4ea669b4278fc1160162c686b82e559c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 16 Jun 2013 18:09:34 +0200
Subject: Swedish language update

---
 lib/plugins/acl/lang/sv/lang.php           |   1 +
 lib/plugins/authad/lang/sv/settings.php    |  11 ++++
 lib/plugins/authldap/lang/sv/settings.php  |  16 +++++
 lib/plugins/authmysql/lang/sv/settings.php |  25 ++++++++
 lib/plugins/authpgsql/lang/sv/settings.php |  28 ++++++++
 lib/plugins/config/lang/sv/lang.php        | 100 ++++++++++++++++-------------
 lib/plugins/plugin/lang/sv/lang.php        |   2 +
 lib/plugins/popularity/lang/sv/lang.php    |   1 +
 lib/plugins/revert/lang/sv/lang.php        |   1 +
 lib/plugins/usermanager/lang/sv/lang.php   |   1 +
 10 files changed, 140 insertions(+), 46 deletions(-)
 create mode 100644 lib/plugins/authad/lang/sv/settings.php
 create mode 100644 lib/plugins/authldap/lang/sv/settings.php
 create mode 100644 lib/plugins/authmysql/lang/sv/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/sv/settings.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/sv/lang.php b/lib/plugins/acl/lang/sv/lang.php
index 7f963d5e1..388672fc0 100644
--- a/lib/plugins/acl/lang/sv/lang.php
+++ b/lib/plugins/acl/lang/sv/lang.php
@@ -16,6 +16,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['admin_acl']             = 'Hantera behörighetslistan (ACL)';
 $lang['acl_group']             = 'Grupp';
diff --git a/lib/plugins/authad/lang/sv/settings.php b/lib/plugins/authad/lang/sv/settings.php
new file mode 100644
index 000000000..b1eb1cb96
--- /dev/null
+++ b/lib/plugins/authad/lang/sv/settings.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Swedish language file
+ *
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['account_suffix']        = 'Ditt konto suffix. T.ex. <code>min.domän.org</code>';
+$lang['admin_password']        = 'Lösenord för användare ovan.';
+$lang['sso']                   = 'Ska Single-Sign-On via Kerberos eller NTLM användas?';
+$lang['use_ssl']               = 'Använda SSL anslutning? Om använd, möjliggör inte TLS nedan.';
+$lang['use_tls']               = 'Använda TLS anslutning? Om använd, möjliggör inte SSL ovan.';
diff --git a/lib/plugins/authldap/lang/sv/settings.php b/lib/plugins/authldap/lang/sv/settings.php
new file mode 100644
index 000000000..0fdcad147
--- /dev/null
+++ b/lib/plugins/authldap/lang/sv/settings.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Swedish language file
+ *
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['server']                = 'Din LDAO server. Antingen värdnamn (<code>localhost</code>) eller giltig full URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'LDAP server port, om det inte angavs full URL ovan';
+$lang['usertree']              = 'Specificera var användarkonton finns. T.ex. <code>ou=Användare, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Specificera var grupper finns. T.ex. <code>ou=Grupp, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP filter för att söka efter användarkonton. T.ex. <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP filter för att söka efter grupper. T.ex. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Version av protokoll att använda. Du kan behöva sätta detta till <code>3</code>';
+$lang['bindpw']                = 'Lösenord för användare ovan';
+$lang['groupkey']              = 'Gruppmedlemskap från något användarattribut (istället för standard AD grupp) t.ex. grupp från avdelning eller telefonnummer';
+$lang['debug']                 = 'Visa ytterligare felsökningsinformation vid fel';
diff --git a/lib/plugins/authmysql/lang/sv/settings.php b/lib/plugins/authmysql/lang/sv/settings.php
new file mode 100644
index 000000000..027c64025
--- /dev/null
+++ b/lib/plugins/authmysql/lang/sv/settings.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Swedish language file
+ *
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['server']                = 'Din MySQL server';
+$lang['user']                  = 'Användarnamn för MySQL';
+$lang['password']              = 'Lösenord för användare ovan';
+$lang['database']              = 'Databas att använda';
+$lang['debug']                 = 'Visa ytterligare felsökningsinformation';
+$lang['forwardClearPass']      = 'Skicka användares lösenord i klartext till SQL sats nedan, istället för att använda passcrypt alternativet';
+$lang['checkPass']             = 'SQL sats för kontroll av lösenord';
+$lang['getUserInfo']           = 'SQL sats för att hämta användarinformation';
+$lang['getGroups']             = 'SQL sats för att hämta en användares gruppmedlemskap';
+$lang['getUsers']              = 'SQL sats för att lista alla användare';
+$lang['addUser']               = 'SQL sats för att lägga till en användare';
+$lang['addGroup']              = 'SQL sats för att lägga till en grupp';
+$lang['addUserGroup']          = 'SQL sats för att lägga till en användare i en existerande grupp';
+$lang['delGroup']              = 'SQL sats för att ta bort en grupp';
+$lang['delUser']               = 'SQL sats för att ta bort en användare';
+$lang['delUserRefs']           = 'SQL sats för att ta bort en användare från alla grupper';
+$lang['updateUser']            = 'SQL sats för att uppdatera en användarprofil';
+$lang['delUserGroup']          = 'SQL sats för att ta bort en användare från en angiven grupp';
+$lang['debug_o_0']             = 'ingen';
diff --git a/lib/plugins/authpgsql/lang/sv/settings.php b/lib/plugins/authpgsql/lang/sv/settings.php
new file mode 100644
index 000000000..27cb2601d
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/sv/settings.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Swedish language file
+ *
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['server']                = 'Din PostgreSQL server';
+$lang['port']                  = 'Din PostgreSQL servers port';
+$lang['user']                  = 'PostgreSQL användarnamn';
+$lang['password']              = 'Lösenord för användaren ovan';
+$lang['database']              = 'Databas att använda';
+$lang['debug']                 = 'Visa ytterligare felsökningsinformation';
+$lang['forwardClearPass']      = 'Skicka lösenord för användare som klartext till SQL satserna nedan, istället för att använda krypteringsalternativet';
+$lang['checkPass']             = 'SQL sats för kontroll av lösenord';
+$lang['getUserInfo']           = 'SQL sats för att hämta användarinformation';
+$lang['getGroups']             = 'SQL sats för att hämta en användares gruppmedlemskap';
+$lang['getUsers']              = 'SQL sats för att lista alla användare';
+$lang['FilterLogin']           = 'SQL klausul för att filtrera användare efter inloggningsnamn';
+$lang['FilterName']            = 'SQL klausul för att filtrera användare efter fullt namn';
+$lang['FilterEmail']           = 'SQL klausul för att filtrera användare efter e-post adress';
+$lang['addUser']               = 'SQL sats för att lägga till en ny användare';
+$lang['addGroup']              = 'SQL sats för att lägga till en ny grupp';
+$lang['addUserGroup']          = 'SQL sats för att lägga till en användare i en existerande grupp';
+$lang['delGroup']              = 'SQL sats för att ta bort en grupp';
+$lang['delUser']               = 'SQL sats för att ta bort en användare';
+$lang['delUserRefs']           = 'SQL sats för att ta bort en användare från alla grupper';
+$lang['updateUser']            = 'SQL sats för att uppdatera en användarprofil';
+$lang['delUserGroup']          = 'SQL sats för att ta bort en användare från angiven grupp';
diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php
index 3d8392840..d59b4b17e 100644
--- a/lib/plugins/config/lang/sv/lang.php
+++ b/lib/plugins/config/lang/sv/lang.php
@@ -16,6 +16,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['menu']                  = 'Hantera inställningar';
 $lang['error']                 = 'Inställningarna uppdaterades inte på grund av ett felaktigt värde. Titta igenom dina ändringar och försök sedan spara igen.
@@ -39,6 +40,8 @@ $lang['_anti_spam']            = 'Inställningar för anti-spam';
 $lang['_editing']              = 'Inställningar för redigering';
 $lang['_links']                = 'Inställningar för länkar';
 $lang['_media']                = 'Inställningar för medier';
+$lang['_notifications']        = 'Noterings inställningar';
+$lang['_syndication']          = 'Syndikats inställningar';
 $lang['_advanced']             = 'Avancerade inställningar';
 $lang['_network']              = 'Nätverksinställningar';
 $lang['_plugin_sufix']         = '(inställningar för insticksmodul)';
@@ -46,25 +49,27 @@ $lang['_template_sufix']       = '(inställningar för mall)';
 $lang['_msg_setting_undefined'] = 'Ingen inställningsmetadata.';
 $lang['_msg_setting_no_class'] = 'Ingen inställningsklass.';
 $lang['_msg_setting_no_default'] = 'Inget standardvärde.';
-$lang['fmode']                 = 'Filskydd för nya filer';
-$lang['dmode']                 = 'Filskydd för nya kataloger';
-$lang['lang']                  = 'Språk';
-$lang['basedir']               = 'Grundkatalog';
-$lang['baseurl']               = 'Grund-webbadress';
-$lang['savedir']               = 'Katalog för att spara data';
-$lang['start']                 = 'Startsidans namn';
 $lang['title']                 = 'Wikins namn';
+$lang['start']                 = 'Startsidans namn';
+$lang['lang']                  = 'Språk';
 $lang['template']              = 'Mall';
 $lang['license']               = 'Under vilken licens skall ditt innehåll publiceras?';
-$lang['fullpath']              = 'Visa fullständig sökväg i sidfoten';
+$lang['savedir']               = 'Katalog för att spara data';
+$lang['basedir']               = 'Grundkatalog';
+$lang['baseurl']               = 'Grund-webbadress';
+$lang['cookiedir']             = 'Cookie sökväg. Lämna blankt för att använda basurl.';
+$lang['dmode']                 = 'Filskydd för nya kataloger';
+$lang['fmode']                 = 'Filskydd för nya filer';
+$lang['allowdebug']            = 'Tillåt felsökning <b>stäng av om det inte behövs!</b>';
 $lang['recent']                = 'Antal poster under "Nyligen ändrat"';
+$lang['recent_days']           = 'Hur många ändringar som ska sparas (dagar)';
 $lang['breadcrumbs']           = 'Antal spår';
 $lang['youarehere']            = 'Hierarkiska spår';
+$lang['fullpath']              = 'Visa fullständig sökväg i sidfoten';
 $lang['typography']            = 'Aktivera typografiska ersättningar';
-$lang['htmlok']                = 'Tillåt inbäddad HTML';
-$lang['phpok']                 = 'Tillåt inbäddad PHP';
 $lang['dformat']               = 'Datumformat (se PHP:s <a href="http://www.php.net/strftime">strftime</a>-funktion)';
 $lang['signature']             = 'Signatur';
+$lang['showuseras']            = 'Vad som skall visas när man visar den användare som senast redigerade en sida';
 $lang['toptoclevel']           = 'Toppnivå för innehållsförteckning';
 $lang['tocminheads']           = 'Minimalt antal rubriker för att avgöra om innehållsförteckning byggs';
 $lang['maxtoclevel']           = 'Maximal nivå för innehållsförteckning';
@@ -72,15 +77,8 @@ $lang['maxseclevel']           = 'Maximal nivå för redigering av rubriker';
 $lang['camelcase']             = 'Använd CamelCase för länkar';
 $lang['deaccent']              = 'Rena sidnamn';
 $lang['useheading']            = 'Använda första rubriken som sidnamn';
-$lang['refcheck']              = 'Kontrollera referenser till mediafiler';
-$lang['refshow']               = 'Antal mediareferenser som ska visas';
-$lang['allowdebug']            = 'Tillåt felsökning <b>stäng av om det inte behövs!</b>';
-$lang['usewordblock']          = 'Blockera spam baserat på ordlista';
-$lang['indexdelay']            = 'Tidsfördröjning före indexering (sek)';
-$lang['relnofollow']           = 'Använd rel="nofollow" för externa länkar';
-$lang['mailguard']             = 'Koda e-postadresser';
-$lang['iexssprotect']          = 'Kontrollera om uppladdade filer innehåller eventuellt skadlig JavaScript eller HTML-kod';
-$lang['showuseras']            = 'Vad som skall visas när man visar den användare som senast redigerade en sida';
+$lang['sneaky_index']          = 'Som standard visar DokuWiki alla namnrymder på indexsidan. Genom att aktivera det här valet döljer man namnrymder som användaren inte har behörighet att läsa. Det kan leda till att man döljer åtkomliga undernamnrymder, och gör indexet oanvändbart med vissa ACL-inställningar.';
+$lang['hidepages']             = 'Dölj matchande sidor (reguljära uttryck)';
 $lang['useacl']                = 'Använd behörighetslista (ACL)';
 $lang['autopasswd']            = 'Autogenerera lösenord';
 $lang['authtype']              = 'System för autentisering';
@@ -89,60 +87,69 @@ $lang['defaultgroup']          = 'Förvald grupp';
 $lang['superuser']             = 'Huvudadministratör - en grupp eller en användare med full tillgång till alla sidor och funktioner, oavsett behörighetsinställningars';
 $lang['manager']               = 'Administratör -- en grupp eller användare med tillgång till vissa administrativa funktioner.';
 $lang['profileconfirm']        = 'Bekräfta ändringarna i profilen med lösenordet';
+$lang['rememberme']            = 'Tillåt permanenta inloggningscookies (kom ihåg mig)';
 $lang['disableactions']        = 'Stäng av funktioner i DokuWiki';
 $lang['disableactions_check']  = 'Kontroll';
 $lang['disableactions_subscription'] = 'Prenumerera/Säg upp prenumeration';
 $lang['disableactions_wikicode'] = 'Visa källkod/Exportera råtext';
 $lang['disableactions_other']  = 'Andra funktioner (kommaseparerade)';
-$lang['sneaky_index']          = 'Som standard visar DokuWiki alla namnrymder på indexsidan. Genom att aktivera det här valet döljer man namnrymder som användaren inte har behörighet att läsa. Det kan leda till att man döljer åtkomliga undernamnrymder, och gör indexet oanvändbart med vissa ACL-inställningar.';
 $lang['auth_security_timeout'] = 'Autentisieringssäkerhets timeout (sekunder)';
 $lang['securecookie']          = 'Skall cookies som sätts via HTTPS endast skickas via HTTPS från webbläsaren? Avaktivera detta alternativ endast om inloggningen till din wiki är säkrad med SSL men läsning av wikin är osäkrad.';
-$lang['updatecheck']           = 'Kontrollera uppdateringar och säkerhetsvarningar? DokuWiki behöver kontakta update.dokuwiki.org för den här funktionen.';
-$lang['userewrite']            = 'Använd rena webbadresser';
-$lang['useslash']              = 'Använd snedstreck för att separera namnrymder i webbadresser';
+$lang['usewordblock']          = 'Blockera spam baserat på ordlista';
+$lang['relnofollow']           = 'Använd rel="nofollow" för externa länkar';
+$lang['indexdelay']            = 'Tidsfördröjning före indexering (sek)';
+$lang['mailguard']             = 'Koda e-postadresser';
+$lang['iexssprotect']          = 'Kontrollera om uppladdade filer innehåller eventuellt skadlig JavaScript eller HTML-kod';
 $lang['usedraft']              = 'Spara utkast automatiskt under redigering';
-$lang['sepchar']               = 'Ersätt blanktecken i webbadresser med';
-$lang['canonical']             = 'Använd fullständiga webbadresser';
-$lang['autoplural']            = 'Leta efter pluralformer av länkar';
-$lang['compression']           = 'Metod för komprimering av gamla versioner';
-$lang['cachetime']             = 'Maximal livslängd för cache (sek)';
+$lang['htmlok']                = 'Tillåt inbäddad HTML';
+$lang['phpok']                 = 'Tillåt inbäddad PHP';
 $lang['locktime']              = 'Maximal livslängd för fillåsning (sek)';
+$lang['cachetime']             = 'Maximal livslängd för cache (sek)';
+$lang['target____wiki']        = 'Målfönster för interna länkar';
+$lang['target____interwiki']   = 'Målfönster för interwiki-länkar';
+$lang['target____extern']      = 'Målfönster för externa länkar';
+$lang['target____media']       = 'Målfönster för medialänkar';
+$lang['target____windows']     = 'Målfönster för windowslänkar';
+$lang['refcheck']              = 'Kontrollera referenser till mediafiler';
+$lang['refshow']               = 'Antal mediareferenser som ska visas';
+$lang['gdlib']                 = 'Version av GD-biblioteket';
+$lang['im_convert']            = 'Sökväg till ImageMagicks konverteringsverktyg';
+$lang['jpg_quality']           = 'Kvalitet för JPG-komprimering (0-100)';
 $lang['fetchsize']             = 'Maximal storlek (bytes) som fetch.php får ladda ned  externt';
+$lang['subscribers']           = 'Aktivera stöd för prenumeration på ändringar';
 $lang['notify']                = 'Skicka meddelande om ändrade sidor till den här e-postadressen';
 $lang['registernotify']        = 'Skicka meddelande om nyregistrerade användare till en här e-postadressen';
 $lang['mailfrom']              = 'Avsändaradress i automatiska e-postmeddelanden';
 $lang['mailprefix']            = 'Prefix i början på ämnesraden vid automatiska e-postmeddelanden';
+$lang['sitemap']               = 'Skapa Google sitemap (dagar)';
+$lang['rss_type']              = 'Typ av XML-flöde';
+$lang['rss_linkto']            = 'XML-flöde pekar på';
+$lang['rss_content']           = 'Vad ska visas för saker i XML-flödet?';
+$lang['rss_update']            = 'Uppdateringsintervall för XML-flöde (sek)';
+$lang['rss_show_summary']      = 'XML-flöde visar sammanfattning i rubriken';
+$lang['rss_media']             = 'Vilka ändringar ska listas i XML flödet?';
+$lang['updatecheck']           = 'Kontrollera uppdateringar och säkerhetsvarningar? DokuWiki behöver kontakta update.dokuwiki.org för den här funktionen.';
+$lang['userewrite']            = 'Använd rena webbadresser';
+$lang['useslash']              = 'Använd snedstreck för att separera namnrymder i webbadresser';
+$lang['sepchar']               = 'Ersätt blanktecken i webbadresser med';
+$lang['canonical']             = 'Använd fullständiga webbadresser';
+$lang['fnencode']              = 'Metod för kodning av icke-ASCII filnamn.';
+$lang['autoplural']            = 'Leta efter pluralformer av länkar';
+$lang['compression']           = 'Metod för komprimering av gamla versioner';
 $lang['gzip_output']           = 'Använd gzip Content-Encoding för xhtml';
-$lang['gdlib']                 = 'Version av GD-biblioteket';
-$lang['im_convert']            = 'Sökväg till ImageMagicks konverteringsverktyg';
-$lang['jpg_quality']           = 'Kvalitet för JPG-komprimering (0-100)';
-$lang['subscribers']           = 'Aktivera stöd för prenumeration på ändringar';
 $lang['compress']              = 'Komprimera CSS och javascript';
-$lang['hidepages']             = 'Dölj matchande sidor (reguljära uttryck)';
 $lang['send404']               = 'Skicka "HTTP 404/Page Not Found" för sidor som inte finns';
-$lang['sitemap']               = 'Skapa Google sitemap (dagar)';
 $lang['broken_iua']            = 'Är funktionen ignore_user_abort trasig på ditt system? Det kan i så fall leda till att indexering av sökningar inte fungerar. Detta är ett känt problem med IIS+PHP/CGI. Se <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> för mer info.';
 $lang['xsendfile']             = 'Använd X-Sendfile huvudet för att låta webservern leverera statiska filer? Din webserver behöver stöd för detta.';
 $lang['renderer_xhtml']        = 'Generera för användning i huvudwikipresentation (xhtml)';
 $lang['renderer__core']        = '%s (dokuwiki core)';
 $lang['renderer__plugin']      = '%s (plugin)';
-$lang['rememberme']            = 'Tillåt permanenta inloggningscookies (kom ihåg mig)';
-$lang['rss_type']              = 'Typ av XML-flöde';
-$lang['rss_linkto']            = 'XML-flöde pekar på';
-$lang['rss_content']           = 'Vad ska visas för saker i XML-flödet?';
-$lang['rss_update']            = 'Uppdateringsintervall för XML-flöde (sek)';
-$lang['recent_days']           = 'Hur många ändringar som ska sparas (dagar)';
-$lang['rss_show_summary']      = 'XML-flöde visar sammanfattning i rubriken';
-$lang['target____wiki']        = 'Målfönster för interna länkar';
-$lang['target____interwiki']   = 'Målfönster för interwiki-länkar';
-$lang['target____extern']      = 'Målfönster för externa länkar';
-$lang['target____media']       = 'Målfönster för medialänkar';
-$lang['target____windows']     = 'Målfönster för windowslänkar';
 $lang['proxy____host']         = 'Proxyserver';
 $lang['proxy____port']         = 'Proxyport';
 $lang['proxy____user']         = 'Användarnamn för proxy';
 $lang['proxy____pass']         = 'Lösenord för proxy';
 $lang['proxy____ssl']          = 'Använd ssl för anslutning till proxy';
+$lang['proxy____except']       = 'Regular expression för matchning av URL som proxy ska hoppa över.';
 $lang['safemodehack']          = 'Aktivera safemode hack';
 $lang['ftp____host']           = 'FTP-server för safemode hack';
 $lang['ftp____port']           = 'FTP-port för safemode hack';
@@ -190,3 +197,4 @@ $lang['useheading_o_0']        = 'Aldrig';
 $lang['useheading_o_navigation'] = 'Endst navigering';
 $lang['useheading_o_content']  = 'Endast innehåll i wiki';
 $lang['useheading_o_1']        = 'Alltid';
+$lang['readdircache']          = 'Max ålder för readdir cache (sek)';
diff --git a/lib/plugins/plugin/lang/sv/lang.php b/lib/plugins/plugin/lang/sv/lang.php
index 5892e42b5..a8578c03c 100644
--- a/lib/plugins/plugin/lang/sv/lang.php
+++ b/lib/plugins/plugin/lang/sv/lang.php
@@ -16,6 +16,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['menu']                  = 'Hantera insticksmoduler';
 $lang['download']              = 'Ladda ned och installera en ny insticksmodul';
@@ -61,3 +62,4 @@ $lang['enabled']               = 'Tilläggsmodulen %s är aktiverad.';
 $lang['notenabled']            = 'Tilläggsmodulen %s kunde inte aktiveras, kontrollera filrättigheterna.';
 $lang['disabled']              = 'Tiläggsmodulen %s är avaktiverad.';
 $lang['notdisabled']           = 'Tilläggsmodulen %s kunde inte avaktiveras, kontrollera filrättigheterna.';
+$lang['packageinstalled']      = 'Tilläggs paket (%d tillägg: %s) har installerats.';
diff --git a/lib/plugins/popularity/lang/sv/lang.php b/lib/plugins/popularity/lang/sv/lang.php
index 8be542e7f..90d820ba0 100644
--- a/lib/plugins/popularity/lang/sv/lang.php
+++ b/lib/plugins/popularity/lang/sv/lang.php
@@ -13,6 +13,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['name']                  = 'Popularitets-feedback (det kan ta en stund att ladda sidan)';
 $lang['submit']                = 'Sänd data';
diff --git a/lib/plugins/revert/lang/sv/lang.php b/lib/plugins/revert/lang/sv/lang.php
index 29c6702eb..4a727b339 100644
--- a/lib/plugins/revert/lang/sv/lang.php
+++ b/lib/plugins/revert/lang/sv/lang.php
@@ -15,6 +15,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['menu']                  = 'Hantera återställningar';
 $lang['filter']                = 'Sök efter spamsidor';
diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php
index bd747927e..f8b530d90 100644
--- a/lib/plugins/usermanager/lang/sv/lang.php
+++ b/lib/plugins/usermanager/lang/sv/lang.php
@@ -15,6 +15,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['menu']                  = 'Hantera användare';
 $lang['noauth']                = '(användarautentisering ej tillgänlig)';
-- 
cgit v1.2.3


From 603a638180749a2925e589bc0c13f19899b6c732 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Tue, 18 Jun 2013 21:18:20 +0200
Subject: add newest plugin types to info plugin

---
 lib/plugins/info/syntax.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 97b28076b..5e7543603 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -81,6 +81,12 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
                 case 'helperplugins':
                     $this->_plugins_xhtml('helper', $renderer);
                     break;
+                case 'authplugins':
+                    $this->_plugins_xhtml('auth', $renderer);
+                    break;
+                case 'remoteplugins':
+                    $this->_plugins_xhtml('remote', $renderer);
+                    break;
                 case 'helpermethods':
                     $this->_helpermethods_xhtml($renderer);
                     break;
-- 
cgit v1.2.3


From 88833bac87e7fb295c0479a8260d1d63051bca8d Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Mon, 24 Jun 2013 15:05:59 +0300
Subject: Fixes validation problems with base64 encoded images in CSS.

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

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 1e662c64a..768c8eda4 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -314,7 +314,7 @@ function css_datauri($match){
         $data = base64_encode(file_get_contents($local));
     }
     if($data){
-        $url = 'data:image/'.$ext.';base64,'.$data;
+        $url = '\'data:image/'.$ext.';base64,'.$data.'\'';
     }else{
         $url = $base.$url;
     }
-- 
cgit v1.2.3


From f91bd3d821fdaba4fb431006fbacb2d99744ecf0 Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Mon, 24 Jun 2013 15:38:28 +0300
Subject: Fixes validation problems with base64 encoded images in CSS.

---
 lib/tpl/dokuwiki/css/basic.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index a0a60d295..eef7a03e2 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -401,7 +401,7 @@ button,
 .qq-upload-button {
     color: #333;
     background-color: #eee;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
+    background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+');
     background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
@@ -439,7 +439,7 @@ button:focus,
 .qq-upload-button:hover {
     border-color: #999;
     background-color: #ddd;
-    background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
+    background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+');
     background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
     background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
     background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-- 
cgit v1.2.3


From 935ecb0ef751ac1d658932316e06410e70c483e0 Mon Sep 17 00:00:00 2001
From: haobug <qingxianhao@gmail.com>
Date: Fri, 28 Jun 2013 05:18:19 +0800
Subject: Improve Linkwizard, make it can be used more than once.

As reported in https://forum.dokuwiki.org/thread/9988
the previous implementation can not handle the situation of use the
linkwiz more than once. Now you can use in you toolbar plugin
    'type' => 'linkwiz'
to make use of the handy Linkwizard for choosing the wiki pages.
---
 lib/scripts/linkwiz.js | 24 ++++++++++++++++++------
 lib/scripts/toolbar.js |  5 +++--
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index c55650d68..875d4a995 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -22,6 +22,8 @@ var dw_linkwiz = {
         var pos = $editor.position();
 
         // create HTML Structure
+        if(dw_linkwiz.$wiz)
+            return;
         dw_linkwiz.$wiz = jQuery(document.createElement('div'))
                .dialog({
                    autoOpen: false,
@@ -235,15 +237,25 @@ var dw_linkwiz = {
            link = ':' + link;
         }
 
-        var so = link.length+3;
 
-        link = '[['+link+'|';
-        if(stxt) {
-            link += stxt;
+        var so = link.length;
+        var eo = 0;
+        if(dw_linkwiz.val){
+            if(dw_linkwiz.val.open) {
+                so += dw_linkwiz.val.open.length;
+                link = dw_linkwiz.val.open+link;
+            }
+            if(stxt) {
+                link += '|'+stxt;
+                so += 1;
+            }
+            if(dw_linkwiz.val.close) {
+                link += dw_linkwiz.val.close;
+                eo = dw_linkwiz.val.close.length;
+            }
         }
-        link += ']]';
 
-        pasteText(sel,link,{startofs: so, endofs: 2});
+        pasteText(sel,link,{startofs: so, endofs: eo});
         dw_linkwiz.hide();
 
         // reset the entry to the parent namespace
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 6d75215e0..e33fa8677 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -211,9 +211,10 @@ function addBtnActionPicker($btn, props, edid) {
  * @return boolean    If button should be appended
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
-function addBtnActionLinkwiz(btn, props, edid) {
+function addBtnActionLinkwiz($btn, props, edid) {
     dw_linkwiz.init(jQuery('#'+edid));
-    jQuery(btn).click(function(){
+    jQuery($btn).click(function(){
+        dw_linkwiz.val = props;
         dw_linkwiz.toggle();
         return false;
     });
-- 
cgit v1.2.3


From 22c5d8b475ffef3674a95847a6f2bcbf759c42e6 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 12 Jul 2013 00:08:14 +0100
Subject: fixed picker buttons not showing in IE8 and below

---
 lib/tpl/dokuwiki/css/basic.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index a0a60d295..ad04f7c41 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -227,7 +227,8 @@ audio {
     max-width: 100%;
 }
 #IE7 img,
-#IE8 img {
+#IE8 img,
+button img {
     max-width: none;
 }
 
-- 
cgit v1.2.3


From b243b168571b08a674d34701cfbb7ac0a03239e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20B=C3=B6dker?= <volker@boedker.de>
Date: Fri, 12 Jul 2013 17:04:41 +0200
Subject: Informal German language update

---
 lib/plugins/acl/lang/de-informal/lang.php           | 1 +
 lib/plugins/authad/lang/de-informal/settings.php    | 1 +
 lib/plugins/authldap/lang/de-informal/settings.php  | 6 ++++++
 lib/plugins/authmysql/lang/de-informal/settings.php | 1 +
 lib/plugins/authpgsql/lang/de-informal/settings.php | 1 +
 lib/plugins/config/lang/de-informal/lang.php        | 1 +
 lib/plugins/plugin/lang/de-informal/lang.php        | 1 +
 lib/plugins/popularity/lang/de-informal/lang.php    | 1 +
 lib/plugins/revert/lang/de-informal/lang.php        | 1 +
 lib/plugins/usermanager/lang/de-informal/lang.php   | 1 +
 10 files changed, 15 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index 8b1416137..45a993982 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -9,6 +9,7 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['admin_acl']             = 'Zugangsverwaltung';
 $lang['acl_group']             = 'Gruppe';
diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php
index 4d0b93e5d..a458617b8 100644
--- a/lib/plugins/authad/lang/de-informal/settings.php
+++ b/lib/plugins/authad/lang/de-informal/settings.php
@@ -4,6 +4,7 @@
  *
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['account_suffix']        = 'Dein Account-Suffix. Z.B. <code>@my.domain.org</code>';
 $lang['base_dn']               = 'Dein Base-DN. Z.B. <code>DC=my,DC=domain,DC=org</code>';
diff --git a/lib/plugins/authldap/lang/de-informal/settings.php b/lib/plugins/authldap/lang/de-informal/settings.php
index fa0fc1521..15e4d8129 100644
--- a/lib/plugins/authldap/lang/de-informal/settings.php
+++ b/lib/plugins/authldap/lang/de-informal/settings.php
@@ -4,6 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
 $lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
@@ -14,9 +15,14 @@ $lang['groupfilter']           = 'LDAP-Filter, um die Benutzergruppen zu suchen.
 $lang['version']               = 'Zu verwendende Protokollversion von LDAP.';
 $lang['starttls']              = 'Verbindung über TLS aufbauen?';
 $lang['referrals']             = 'Weiterverfolgen von LDAP-Referrals (Verweise)?';
+$lang['deref']                 = 'Wie sollen Aliasse derefernziert werden?';
 $lang['binddn']                = 'DN eines optionalen Benutzers, wenn der anonyme Zugriff nicht ausreichend ist. Zum Beispiel: <code>cn=admin, dc=my, dc=home</code>.';
 $lang['bindpw']                = 'Passwort des angegebenen Benutzers.';
 $lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
 $lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
 $lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
 $lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NIEMALS';
+$lang['deref_o_1']             = 'LDAP_DEREF_SUCHEN';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDEN';
+$lang['deref_o_3']             = 'LDAP_DEREF_IMMER';
diff --git a/lib/plugins/authmysql/lang/de-informal/settings.php b/lib/plugins/authmysql/lang/de-informal/settings.php
index 0c9bc85fe..540979cf4 100644
--- a/lib/plugins/authmysql/lang/de-informal/settings.php
+++ b/lib/plugins/authmysql/lang/de-informal/settings.php
@@ -4,6 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['server']                = 'MySQL-Server';
 $lang['user']                  = 'Benutzername für den Zugriff auf den MySQL-Server.';
diff --git a/lib/plugins/authpgsql/lang/de-informal/settings.php b/lib/plugins/authpgsql/lang/de-informal/settings.php
index 4c80245d6..d864d14d4 100644
--- a/lib/plugins/authpgsql/lang/de-informal/settings.php
+++ b/lib/plugins/authpgsql/lang/de-informal/settings.php
@@ -4,6 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['server']                = 'PostgreSQL-Server';
 $lang['port']                  = 'Port des PostgreSQL-Servers.';
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index ac61e4c85..10fa363dc 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -10,6 +10,7 @@
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Mateng Schimmerlos <mateng@firemail.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['menu']                  = 'Konfiguration';
 $lang['error']                 = 'Konfiguration wurde nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfe deine Änderungen und versuche es erneut.<br />Die/der ungültige(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.';
diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php
index a082218d8..5d1649434 100644
--- a/lib/plugins/plugin/lang/de-informal/lang.php
+++ b/lib/plugins/plugin/lang/de-informal/lang.php
@@ -9,6 +9,7 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['menu']                  = 'Plugins verwalten';
 $lang['download']              = 'Herunterladen und installieren einer neuen Erweiterung';
diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php
index 513a1b6e1..0abf90b0b 100644
--- a/lib/plugins/popularity/lang/de-informal/lang.php
+++ b/lib/plugins/popularity/lang/de-informal/lang.php
@@ -9,6 +9,7 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['name']                  = 'Popularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)';
 $lang['submit']                = 'Sende Daten';
diff --git a/lib/plugins/revert/lang/de-informal/lang.php b/lib/plugins/revert/lang/de-informal/lang.php
index 3a96429c7..b702e7727 100644
--- a/lib/plugins/revert/lang/de-informal/lang.php
+++ b/lib/plugins/revert/lang/de-informal/lang.php
@@ -9,6 +9,7 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['menu']                  = 'Zurückstellungsmanager';
 $lang['filter']                = 'Durchsuche als Spam markierte Seiten';
diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php
index 07390854f..791cfa74f 100644
--- a/lib/plugins/usermanager/lang/de-informal/lang.php
+++ b/lib/plugins/usermanager/lang/de-informal/lang.php
@@ -9,6 +9,7 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['menu']                  = 'Benutzerverwaltung';
 $lang['noauth']                = '(Benutzeranmeldung ist nicht verfügbar)';
-- 
cgit v1.2.3


From dbd5b4caeac5f2f45d05da38f1a54282d972b3ce Mon Sep 17 00:00:00 2001
From: Victor Westmann <victor.westmann@gmail.com>
Date: Fri, 12 Jul 2013 17:06:30 +0200
Subject: Brazilian Portuguese language update

---
 lib/plugins/authad/lang/pt-br/settings.php   | 2 ++
 lib/plugins/authldap/lang/pt-br/settings.php | 7 +++++++
 2 files changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/pt-br/settings.php b/lib/plugins/authad/lang/pt-br/settings.php
index 29f8db4ad..308d122dd 100644
--- a/lib/plugins/authad/lang/pt-br/settings.php
+++ b/lib/plugins/authad/lang/pt-br/settings.php
@@ -7,8 +7,10 @@
 $lang['account_suffix']        = 'Sufixo de sua conta. Eg. <code>@meu.domínio.org</code>';
 $lang['base_dn']               = 'Sua base DN. Eg. <code>DC=meu,DC=domínio,DC=org</code>';
 $lang['domain_controllers']    = 'Uma lista de controles de domínios separada por vírgulas. Eg. <code>srv1.domínio.org,srv2.domínio.org</code>';
+$lang['admin_username']        = 'Um usuário com privilégios do Active Directory com acesso a todos os dados dos outros usuários. Opcional, mas necessário para certas ações como enviar emails de inscrição.';
 $lang['admin_password']        = 'A senha do usuário acima.';
 $lang['sso']                   = 'Usar Single-Sign-On através do Kerberos ou NTLM?';
+$lang['real_primarygroup']     = 'Deverá o grupo real primário ser resolvido ao invés de assumir "Usuários de domínio" (mais lento) ';
 $lang['use_ssl']               = 'Usar conexão SSL? Se usar, não habilitar TLS abaixo.';
 $lang['use_tls']               = 'Usar conexão TLS? se usar, não habilitar SSL acima.';
 $lang['debug']                 = 'Mostrar saída adicional de depuração em mensagens de erros?';
diff --git a/lib/plugins/authldap/lang/pt-br/settings.php b/lib/plugins/authldap/lang/pt-br/settings.php
index daf9efd00..70b68b289 100644
--- a/lib/plugins/authldap/lang/pt-br/settings.php
+++ b/lib/plugins/authldap/lang/pt-br/settings.php
@@ -8,12 +8,19 @@ $lang['server']                = 'Seu servidor LDAP. Ou hostname (<code>localhos
 $lang['port']                  = 'Porta LDAP do servidor se nenhuma URL completa tiver sido fornecida acima';
 $lang['usertree']              = 'Onde encontrar as contas de usuários. Eg. <code>ou=Pessoas, dc=servidor, dc=tld</code>';
 $lang['grouptree']             = 'Onde encontrar os grupos de usuários. Eg. <code>ou=Pessoas, dc=servidor, dc=tld</code>';
+$lang['userfilter']            = 'Filtro do LDAP para procurar por contas de usuários. Eg. <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filtro do LDAP 0ara procurar por grupos. Eg. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = 'A versão do protocolo para usar. Você talvez deva definir isto para <code>3</code>';
 $lang['starttls']              = 'Usar conexões TLS?';
 $lang['referrals']             = 'Permitir referências serem seguidas?';
+$lang['deref']                 = 'Como respeitar aliases ?';
 $lang['binddn']                = 'DN de um vínculo opcional de usuário se vínculo anônimo não for suficiente. Eg. <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = 'Senha do usuário acima';
 $lang['userscope']             = 'Limitar escopo da busca para busca de usuário';
 $lang['groupscope']            = 'Limitar escopo da busca para busca de grupo';
 $lang['groupkey']              = 'Membro de grupo vem de qualquer atributo do usuário (ao invés de grupos padrões AD) e.g. departamento de grupo ou número de telefone';
 $lang['debug']                 = 'Mostrar informações adicionais de depuração em erros';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
-- 
cgit v1.2.3


From fbd8067eeeb9f424981aad8b283e17f734c738c3 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 12 Jul 2013 17:29:28 +0200
Subject: updated jquery.cookie.js to 1.3.1 FS#2804

---
 lib/scripts/jquery/jquery.cookie.js | 59 ++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/jquery/jquery.cookie.js b/lib/scripts/jquery/jquery.cookie.js
index 2d4c05a84..c4f99af00 100644
--- a/lib/scripts/jquery/jquery.cookie.js
+++ b/lib/scripts/jquery/jquery.cookie.js
@@ -1,13 +1,19 @@
 /*!
- * jQuery Cookie Plugin v1.3
+ * jQuery Cookie Plugin v1.3.1
  * https://github.com/carhartl/jquery-cookie
  *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
+ * Copyright 2013 Klaus Hartl
+ * Released under the MIT license
  */
-(function ($, document, undefined) {
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD. Register as anonymous module.
+		define(['jquery'], factory);
+	} else {
+		// Browser globals.
+		factory(jQuery);
+	}
+}(function ($) {
 
 	var pluses = /\+/g;
 
@@ -19,16 +25,22 @@
 		return decodeURIComponent(s.replace(pluses, ' '));
 	}
 
+	function converted(s) {
+		if (s.indexOf('"') === 0) {
+			// This is a quoted cookie as according to RFC2068, unescape
+			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+		}
+		try {
+			return config.json ? JSON.parse(s) : s;
+		} catch(er) {}
+	}
+
 	var config = $.cookie = function (key, value, options) {
 
 		// write
 		if (value !== undefined) {
 			options = $.extend({}, config.defaults, options);
 
-			if (value === null) {
-				options.expires = -1;
-			}
-
 			if (typeof options.expires === 'number') {
 				var days = options.expires, t = options.expires = new Date();
 				t.setDate(t.getDate() + days);
@@ -37,7 +49,9 @@
 			value = config.json ? JSON.stringify(value) : String(value);
 
 			return (document.cookie = [
-				encodeURIComponent(key), '=', config.raw ? value : encodeURIComponent(value),
+				config.raw ? key : encodeURIComponent(key),
+				'=',
+				config.raw ? value : encodeURIComponent(value),
 				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
 				options.path    ? '; path=' + options.path : '',
 				options.domain  ? '; domain=' + options.domain : '',
@@ -48,25 +62,34 @@
 		// read
 		var decode = config.raw ? raw : decoded;
 		var cookies = document.cookie.split('; ');
+		var result = key ? undefined : {};
 		for (var i = 0, l = cookies.length; i < l; i++) {
 			var parts = cookies[i].split('=');
-			if (decode(parts.shift()) === key) {
-				var cookie = decode(parts.join('='));
-				return config.json ? JSON.parse(cookie) : cookie;
+			var name = decode(parts.shift());
+			var cookie = decode(parts.join('='));
+
+			if (key && key === name) {
+				result = converted(cookie);
+				break;
+			}
+
+			if (!key) {
+				result[name] = converted(cookie);
 			}
 		}
 
-		return null;
+		return result;
 	};
 
 	config.defaults = {};
 
 	$.removeCookie = function (key, options) {
-		if ($.cookie(key) !== null) {
-			$.cookie(key, null, options);
+		if ($.cookie(key) !== undefined) {
+			// Must not alter options, thus extending a fresh object...
+			$.cookie(key, '', $.extend({}, options, { expires: -1 }));
 			return true;
 		}
 		return false;
 	};
 
-})(jQuery, document);
+}));
-- 
cgit v1.2.3


From 0a8f03d88cd0597d1317cf5164383dea2ae29ca4 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 12 Jul 2013 19:53:46 +0200
Subject: add TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY event to template

This adds a custom event to the 'dokuwiki' template that allows plugin
authors to easily integrate custom pagetool buttons into the template.
---
 lib/tpl/dokuwiki/detail.php | 22 +++++++++++++++++-----
 lib/tpl/dokuwiki/main.php   | 23 +++++++++++++++++------
 2 files changed, 34 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index d2ed530a3..1768b665e 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -109,16 +109,28 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                     <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3>
                     <div class="tools">
                         <ul>
-                            <?php // View in media manager; @todo: transfer logic to backend
+                            <?php
+                                $data = array();
+
+                                // View in media manager; @todo: transfer logic to backend
                                 $imgNS = getNS($IMG);
                                 $authNS = auth_quickaclcheck("$imgNS:*");
                                 if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) {
                                     $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG));
-                                    echo '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
+                                    $data['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
                                 }
-                            ?>
-                            <?php // Back to [ID]; @todo: transfer logic to backend
-                                echo '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+
+                                // Back to [ID]; @todo: transfer logic to backend
+                                $data['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+
+                                // the page tools can be ammended through a custom plugin hook
+                                $evt = new Doku_Event('TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY', $data);
+                                if($evt->advise_before()){
+                                    foreach($evt->data as $k => $html) echo $html;
+                                }
+                                $evt->advise_after();
+                                unset($data);
+                                unset($evt);
                             ?>
                         </ul>
                     </div>
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 43a0c0da7..30cd4dda9 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -75,12 +75,23 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                 <div class="tools">
                     <ul>
                         <?php
-                            tpl_action('edit',      1, 'li', 0, '<span>', '</span>');
-                            tpl_action('revert',    1, 'li', 0, '<span>', '</span>');
-                            tpl_action('revisions', 1, 'li', 0, '<span>', '</span>');
-                            tpl_action('backlink',  1, 'li', 0, '<span>', '</span>');
-                            tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>');
-                            tpl_action('top',       1, 'li', 0, '<span>', '</span>');
+                            $data = array(
+                                'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
+                                'revert'    => tpl_action('revert',    1, 'li', 1, '<span>', '</span>'),
+                                'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
+                                'backlink'  => tpl_action('backlink',  1, 'li', 1, '<span>', '</span>'),
+                                'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
+                                'top'       => tpl_action('top',       1, 'li', 1, '<span>', '</span>')
+                            );
+
+                            // the page tools can be ammended through a custom plugin hook
+                            $evt = new Doku_Event('TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY', $data);
+                            if($evt->advise_before()){
+                                foreach($evt->data as $k => $html) echo $html;
+                            }
+                            $evt->advise_after();
+                            unset($data);
+                            unset($evt);
                         ?>
                     </ul>
                 </div>
-- 
cgit v1.2.3


From c71db656795e82055d114764ad93f71a968a2f28 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 21 Jul 2013 21:20:44 +0100
Subject: added tpl_classes() to return useful layout classes

---
 lib/tpl/dokuwiki/detail.php | 4 ++--
 lib/tpl/dokuwiki/main.php   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 9108504f1..c44a697dd 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -28,8 +28,8 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 
 <body>
     <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
-    <div id="dokuwiki__site"><div id="dokuwiki__top"
-        class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($_SERVER['REMOTE_USER']) ? 'loggedIn' : '' ?>">
+    <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
+        echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
 
         <?php include('tpl_header.php') ?>
 
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index d432a701e..016146275 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -27,9 +27,8 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 
 <body>
     <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
-    <div id="dokuwiki__site"><div id="dokuwiki__top"
-        class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'showSidebar' : '';
-        ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?> <?php echo ($_SERVER['REMOTE_USER']) ? 'loggedIn' : '' ?>">
+    <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
+        echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
 
         <?php include('tpl_header.php') ?>
 
-- 
cgit v1.2.3


From 6b0ec830e5ac0044252908630e52d4494f1df570 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 21 Jul 2013 22:59:27 +0200
Subject: In debug mode: catch and log JS errors with file information

When debugging is enabled (allowdebug enabled) JS errors are now catched
for each non-core JS file and logged with the additional information
from which file they came. This should make it easier to find out which
plugin is the cause for broken JS code. The feature isn't enabled by
default as defining functions inside try-clauses isn't allowed in strict
mode and causes a warning at least in Firefox.
---
 lib/exe/js.php         |  3 +++
 lib/scripts/helpers.js | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'lib')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 4ff48133e..06769d895 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -104,10 +104,13 @@ function js_out(){
     // load files
     foreach($files as $file){
         $ismin = (substr($file,-7) == '.min.js');
+        $debugjs = ($conf['allowdebug'] && strpos($file, DOKU_INC.'lib/scripts/') !== 0);
 
         echo "\n\n/* XXXXXXXXXX begin of ".str_replace(DOKU_INC, '', $file) ." XXXXXXXXXX */\n\n";
         if($ismin) echo "\n/* BEGIN NOCOMPRESS */\n";
+        if ($debugjs) echo "\ntry {\n";
         js_load($file);
+        if ($debugjs) echo "\n} catch (e) {\n   logError(e, '".str_replace(DOKU_INC, '', $file)."');\n}\n";
         if($ismin) echo "\n/* END NOCOMPRESS */\n";
         echo "\n\n/* XXXXXXXXXX end of " . str_replace(DOKU_INC, '', $file) . " XXXXXXXXXX */\n\n";
     }
diff --git a/lib/scripts/helpers.js b/lib/scripts/helpers.js
index d6f36967d..fdac13b71 100644
--- a/lib/scripts/helpers.js
+++ b/lib/scripts/helpers.js
@@ -68,3 +68,18 @@ function bind(fnc/*, ... */) {
                          static_args.concat(Aps.call(arguments, 0)));
     };
 }
+
+/**
+ * Report an error from a JS file to the console
+ *
+ * @param e    The error object
+ * @param file The file in which the error occurred
+ */
+function logError(e, file) {
+    if (window.console && console.error) {
+        console.error('The error "%s: %s" occurred in file "%s". ' +
+            'If this is in a plugin try updating or disabling the plugin, ' +
+            'if this is in a template try updating the template or switching to the "default" or "dokuwiki" template.',
+            e.name, e.message, file);
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 654436fbc9a7765d9faacab950c7d3e8508b747c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 21 Jul 2013 23:21:00 +0100
Subject: fixed references to images in old template (FS#2816)

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

(limited to 'lib')

diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php
index 73939c347..98f5f52d5 100644
--- a/lib/exe/opensearch.php
+++ b/lib/exe/opensearch.php
@@ -21,7 +21,7 @@ if(file_exists(DOKU_INC.'favicon.ico')){
 }elseif(file_exists(tpl_incdir().'favicon.ico')){
     $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico';
 }else{
-    $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico';
+    $ico = DOKU_URL.'lib/tpl/dokuwiki/images/favicon.ico';
 }
 
 // output
-- 
cgit v1.2.3


From b3fd863955b2c6c1987f36b9206b806da6e487c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com>
Date: Sun, 28 Jul 2013 02:00:10 +0200
Subject: Korean language update

---
 lib/plugins/acl/lang/ko/help.txt            | 2 +-
 lib/plugins/authldap/lang/ko/settings.php   | 5 +++++
 lib/plugins/config/lang/ko/intro.txt        | 6 +++---
 lib/plugins/config/lang/ko/lang.php         | 4 ++--
 lib/plugins/plugin/lang/ko/admin_plugin.txt | 2 +-
 lib/plugins/plugin/lang/ko/lang.php         | 4 ++--
 lib/plugins/popularity/lang/ko/intro.txt    | 2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index 0386b5990..ba3dd6d9f 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -5,4 +5,4 @@
 * 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
 * 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
 
-DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
+DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 7f7efe8d0..6200a03b9 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -13,9 +13,14 @@ $lang['groupfilter']           = '그룹을 찾을 LDAP 필터. 예를 들어 <c
 $lang['version']               = '사용할 프로토콜 버전. <code>3</code>으로 설정해야 할 수도 있습니다';
 $lang['starttls']              = 'TLS 연결을 사용하겠습니까?';
 $lang['referrals']             = '참고(referrals)를 허용하겠습니까? ';
+$lang['deref']                 = '어떻게 별명을 간접 참고하겠습니까?';
 $lang['binddn']                = '익명 바인드가 충분하지 않으면 선택적인 바인드 사용자의 DN. 예를 들어 <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = '위 사용자의 비밀번호';
 $lang['userscope']             = '사용자 찾기에 대한 찾기 범위 제한';
 $lang['groupscope']            = '그룹 찾기에 대한 찾기 범위 제한';
 $lang['groupkey']              = '(표준 AD 그룹 대신) 사용자 속성에서 그룹 구성원. 예를 들어 부서나 전화에서 그룹';
 $lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이기';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER (없음)';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING (검색)';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING (발견)';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS (항상)';
diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt
index b9eb763a4..c8b146930 100644
--- a/lib/plugins/config/lang/ko/intro.txt
+++ b/lib/plugins/config/lang/ko/intro.txt
@@ -1,7 +1,7 @@
-====== 환경 설정 관리 ======
+====== 환경 설정 관리자 ======
 
-DokuWiki 설치할 때 설정을 바꾸기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서 (영어)]]를 참고하세요.
+DokuWiki 설치할 때 설정을 바꾸기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정]] 문서를 참고하세요. 플러그인에 대한 자세한 정보가 필요하다면 [[doku>ko:plugin:config|플러그인 설정]] 문서를 참고하세요.
 
-플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 바꾸지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
+빨간 배경색으로 보이는 설정은 이 플러그인에서 바꾸지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
 
 이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀐 값은 적용되지 않습니다.
\ No newline at end of file
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index da155bcef..f0f7f60fa 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -62,7 +62,7 @@ $lang['youarehere']            = '계층형 위치 추적 (다음 위의 옵션
 $lang['fullpath']              = '문서 하단에 전체 경로 보여주기';
 $lang['typography']            = '기호 대체';
 $lang['dformat']               = '날짜 형식 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능 참고)';
-$lang['signature']             = '편집기에서 서명 버튼을 누를 때 삽입할 내용';
+$lang['signature']             = '편집기에서 서명 버튼을 누를 때 넣을 내용';
 $lang['showuseras']            = '마지막에 문서를 편집한 사용자를 보여줄지 여부';
 $lang['toptoclevel']           = '목차 최상위 항목';
 $lang['tocminheads']           = '목차 표시 여부를 결정할 최소한의 문단 제목 항목의 수';
@@ -86,7 +86,7 @@ $lang['rememberme']            = '항상 로그인 정보 저장 허용 (기억
 $lang['disableactions']        = 'DokuWiki 활동 비활성화';
 $lang['disableactions_check']  = '검사';
 $lang['disableactions_subscription'] = '구독 신청/구독 취소';
-$lang['disableactions_wikicode'] = '내용 보기/원본 내보내기';
+$lang['disableactions_wikicode'] = '원본 보기/원본 내보내기';
 $lang['disableactions_other']  = '다른 활동 (쉼표로 구분)';
 $lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)';
 $lang['securecookie']          = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.';
diff --git a/lib/plugins/plugin/lang/ko/admin_plugin.txt b/lib/plugins/plugin/lang/ko/admin_plugin.txt
index 7cbd08f7a..aeef5fedf 100644
--- a/lib/plugins/plugin/lang/ko/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/ko/admin_plugin.txt
@@ -1,3 +1,3 @@
 ====== 플러그인 관리 ======
 
-이 페이지에서 Dokuwiki [[doku>plugins|플러그인]]에 관련된 모든 관리 작업을 합니다. 플러그인을 다운로드하거나 설치하기 위해서는 웹 서버가 플러그인 디렉토리에 대해 쓰기 권한을 가지고 있어야 합니다.
\ No newline at end of file
+이 페이지에서 Dokuwiki [[doku>ko:plugins|플러그인]]에 관련된 모든 관리 작업을 합니다. 플러그인을 다운로드하거나 설치하기 위해서는 웹 서버가 플러그인 디렉토리에 대해 쓰기 권한을 가지고 있어야 합니다.
\ No newline at end of file
diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index 447fe667b..4e615b118 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -10,7 +10,7 @@
  * @author erial2@gmail.com
  * @author Myeongjin <aranet100@gmail.com>
  */
-$lang['menu']                  = '플러그인 관리자';
+$lang['menu']                  = '플러그인 관리';
 $lang['download']              = '새 플러그인 다운로드 및 설치';
 $lang['manage']                = '이미 설치한 플러그인';
 $lang['btn_info']              = '정보';
@@ -22,7 +22,7 @@ $lang['btn_enable']            = '저장';
 $lang['url']                   = 'URL';
 $lang['installed']             = '설치됨:';
 $lang['lastupdate']            = '가장 나중에 업데이트됨:';
-$lang['source']                = '내용:';
+$lang['source']                = '원본:';
 $lang['unknown']               = '알 수 없음';
 $lang['updating']              = '업데이트 중 ...';
 $lang['updated']               = '%s 플러그인을 성공적으로 업데이트했습니다';
diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index c75c57ba5..0c884546a 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,6 +1,6 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
-- 
cgit v1.2.3


From 4b0e9be14f53973587becf18a79ad97e0b8ae195 Mon Sep 17 00:00:00 2001
From: Maciej Matejczuk <mmatejczuk@gmail.com>
Date: Sun, 28 Jul 2013 02:11:25 +0200
Subject: Polish language update

---
 lib/plugins/authad/lang/pl/settings.php    | 10 ++++++++++
 lib/plugins/authldap/lang/pl/settings.php  |  7 +++++++
 lib/plugins/authmysql/lang/pl/settings.php | 10 ++++++++++
 lib/plugins/authpgsql/lang/pl/settings.php |  5 +++++
 4 files changed, 32 insertions(+)
 create mode 100644 lib/plugins/authad/lang/pl/settings.php
 create mode 100644 lib/plugins/authldap/lang/pl/settings.php
 create mode 100644 lib/plugins/authmysql/lang/pl/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/pl/settings.php

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php
new file mode 100644
index 000000000..9113c0e51
--- /dev/null
+++ b/lib/plugins/authad/lang/pl/settings.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Polish language file
+ *
+ */
+$lang['account_suffix']        = 'Przyrostek twojej nazwy konta np. <code>@my.domain.org</code>';
+$lang['admin_password']        = 'Hasło dla powyższego użytkownika.';
+$lang['use_ssl']               = 'Użyć połączenie SSL? Jeśli tak to nie aktywuj TLS poniżej.';
+$lang['use_tls']               = 'Użyć połączenie TLS? Jeśli tak to nie aktywuj SSL powyżej.';
+$lang['expirywarn']            = 'Dni poprzedzających powiadomienie użytkownika o wygasającym haśle. 0 aby wyłączyć.';
diff --git a/lib/plugins/authldap/lang/pl/settings.php b/lib/plugins/authldap/lang/pl/settings.php
new file mode 100644
index 000000000..44641f514
--- /dev/null
+++ b/lib/plugins/authldap/lang/pl/settings.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Polish language file
+ *
+ */
+$lang['starttls']              = 'Użyć połączeń TLS?';
+$lang['bindpw']                = 'Hasło powyższego użytkownika';
diff --git a/lib/plugins/authmysql/lang/pl/settings.php b/lib/plugins/authmysql/lang/pl/settings.php
new file mode 100644
index 000000000..93528cf34
--- /dev/null
+++ b/lib/plugins/authmysql/lang/pl/settings.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Polish language file
+ *
+ */
+$lang['server']                = 'Twój server MySQL';
+$lang['user']                  = 'Nazwa użytkownika MySQL';
+$lang['password']              = 'Hasło dla powyższego użytkownika';
+$lang['database']              = 'Używana baza danych';
+$lang['charset']               = 'Zestaw znaków uzyty w bazie danych';
diff --git a/lib/plugins/authpgsql/lang/pl/settings.php b/lib/plugins/authpgsql/lang/pl/settings.php
new file mode 100644
index 000000000..37afb252d
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/pl/settings.php
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Polish language file
+ *
+ */
-- 
cgit v1.2.3


From 22064dd98283bc61e1b444e45707c1c51230eb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Seb=C5=91k?= <sebokmarton@gmail.com>
Date: Sun, 28 Jul 2013 02:12:20 +0200
Subject: Hungarian language update

---
 lib/plugins/acl/lang/hu/lang.php           |  15 ++--
 lib/plugins/authad/lang/hu/settings.php    |  18 +++++
 lib/plugins/authldap/lang/hu/settings.php  |  26 +++++++
 lib/plugins/authmysql/lang/hu/settings.php |  41 ++++++++++
 lib/plugins/authpgsql/lang/hu/settings.php |  37 +++++++++
 lib/plugins/config/lang/hu/lang.php        | 121 ++++++++++++++++-------------
 lib/plugins/plugin/lang/hu/lang.php        |  29 +++----
 lib/plugins/popularity/lang/hu/lang.php    |   1 +
 lib/plugins/revert/lang/hu/lang.php        |   3 +-
 lib/plugins/usermanager/lang/hu/lang.php   |   9 ++-
 10 files changed, 220 insertions(+), 80 deletions(-)
 create mode 100644 lib/plugins/authad/lang/hu/settings.php
 create mode 100644 lib/plugins/authldap/lang/hu/settings.php
 create mode 100644 lib/plugins/authmysql/lang/hu/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/hu/settings.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php
index 255d838b6..9565eddc3 100644
--- a/lib/plugins/acl/lang/hu/lang.php
+++ b/lib/plugins/acl/lang/hu/lang.php
@@ -8,25 +8,26 @@
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
  * @author David Szabo <szabo.david@gyumolcstarhely.hu>
+ * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['admin_acl']             = 'Hozzáférési lista (ACL) kezelő';
 $lang['acl_group']             = 'Csoport:';
 $lang['acl_user']              = 'Felhasználó:';
 $lang['acl_perms']             = 'Jogosultság ehhez:';
-$lang['page']                  = 'oldal';
-$lang['namespace']             = 'névtér';
+$lang['page']                  = 'Oldal';
+$lang['namespace']             = 'Névtér';
 $lang['btn_select']            = 'Kiválaszt';
 $lang['p_user_id']             = 'A(z) <b class="acluser">%s</b> felhasználónak jelenleg a következő jogosultsága van ezen az oldalon:  <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'A(z) <b class="acluser">%s</b> felhasználónak jelenleg a következő jogosultsága van ebben a névtérben: <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'A(z) <b class="aclgroup">%s</b> csoport tagjainak jelenleg a következő jogosultsága van ezen az oldalon:  <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_group_ns']            = 'A(z) <b class="aclgroup">%s</b> csoport tagjainak jelenleg a következő jogosultsága van ebben a névtérben: <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id']           = 'A felső formon <b>adjon meg egy felhasználót vagy csoportot</b>, akinek a(z) <b class="aclpage">%s</b> oldalhoz beállított jogosultságait megtekinteni vagy változtatni szeretné.';
-$lang['p_choose_ns']           = 'A felső formon <b>adjon meg egy felhasználót vagy csoportot</b>, akinek a(z) <b class="aclns">%s</b> névtérhez beállított jogosultságait megtekinteni vagy változtatni szeretné.';
+$lang['p_choose_id']           = 'A felső űrlapon <b>adjon meg egy felhasználót vagy csoportot</b>, akinek a(z) <b class="aclpage">%s</b> oldalhoz beállított jogosultságait megtekinteni vagy változtatni szeretné.';
+$lang['p_choose_ns']           = 'A felső űrlapon <b>adj meg egy felhasználót vagy csoportot</b>, akinek a(z) <b class="aclns">%s</b> névtérhez beállított jogosultságait megtekinteni vagy változtatni szeretnéd.';
 $lang['p_inherited']           = 'Megjegyzés: ezek a jogok nem itt lettek explicit beállítva, hanem öröklődtek egyéb csoportokból vagy felsőbb névterekből.';
-$lang['p_isadmin']             = 'Megjegyzés: a kiválasztott csoportnak vagy felhasználónak mindig teljes jogosultsága lesz, mert Wiki-gazdának van beállítva.';
-$lang['p_include']             = 'A magasabb jogok tartalmazzák az alacsonyabbakat.  A Létrehozás, Feltöltés és Törlés jogosultságok csak névterekre alkalmazhatók, az egyes oldalakra nem.';
+$lang['p_isadmin']             = 'Megjegyzés: a kiválasztott csoportnak vagy felhasználónak mindig teljes jogosultsága lesz, mert Adminisztrátornak van beállítva.';
+$lang['p_include']             = 'A magasabb szintű jogok tartalmazzák az alacsonyabbakat. A Létrehozás, Feltöltés és Törlés jogosultságok csak névterekre alkalmazhatók, az egyes oldalakra nem.';
 $lang['current']               = 'Jelenlegi hozzáférési szabályok';
-$lang['where']                 = 'Oldal/névtér';
+$lang['where']                 = 'Oldal/Névtér';
 $lang['who']                   = 'Felhasználó/Csoport';
 $lang['perm']                  = 'Jogosultságok';
 $lang['acl_perm0']             = 'Semmi';
diff --git a/lib/plugins/authad/lang/hu/settings.php b/lib/plugins/authad/lang/hu/settings.php
new file mode 100644
index 000000000..c2cab410f
--- /dev/null
+++ b/lib/plugins/authad/lang/hu/settings.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Hungarian language file
+ *
+ * @author Marton Sebok <sebokmarton@gmail.com>
+ */
+$lang['account_suffix']        = 'Felhasználói azonosító végződése, pl. <code>@my.domain.org</code>.';
+$lang['base_dn']               = 'Bázis DN, pl. <code>DC=my,DC=domain,DC=org</code>.';
+$lang['domain_controllers']    = 'Tartománykezelők listája vesszővel elválasztva, pl. <code>srv1.domain.org,srv2.domain.org</code>.';
+$lang['admin_username']        = 'Privilegizált AD felhasználó, aki az összes feéhasználó adatait elérheti. Elhagyható, de bizonyos funkciókhoz, például a feliratkozási e-mailek kiküldéséhez szükséges.';
+$lang['admin_password']        = 'Ehhez tartozó jelszó.';
+$lang['sso']                   = 'Single-Sign-On Kerberos-szal vagy NTML használata?';
+$lang['real_primarygroup']     = 'A valódi elsődleges csoport feloldása a "Tartományfelhasználók" csoport használata helyett? (lassabb)';
+$lang['use_ssl']               = 'SSL használata? Ha használjuk, tiltsuk le a TLS-t!';
+$lang['use_tls']               = 'TLS használata? Ha használjuk, tiltsuk le az SSL-t!';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['expirywarn']            = 'Felhasználók értesítése ennyi nappal a jelszavuk lejárata előtt. 0 a funkció kikapcsolásához.';
+$lang['additional']            = 'Vesszővel elválasztott lista a további AD attribútumok lekéréshez. Néhány plugin használhatja.';
diff --git a/lib/plugins/authldap/lang/hu/settings.php b/lib/plugins/authldap/lang/hu/settings.php
new file mode 100644
index 000000000..b4b28d0a0
--- /dev/null
+++ b/lib/plugins/authldap/lang/hu/settings.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Hungarian language file
+ *
+ * @author Marton Sebok <sebokmarton@gmail.com>
+ */
+$lang['server']                = 'LDAP-szerver. Hosztnév (<code>localhost</code>) vagy abszolút URL portszámmal (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'LDAP-szerver port, ha nem URL lett megadva';
+$lang['usertree']              = 'Hol találom a felhasználókat? Pl. <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Hol találom a csoportokat? Pl. <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP szűrő a felhasználók kereséséhez, pl. <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP szűrő a csoportok kereséséhez, pl. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'A használt protokollverzió. Valószínűleg a <code>3</code> megfelelő';
+$lang['starttls']              = 'TLS használata?';
+$lang['referrals']             = 'Hivatkozások követése?';
+$lang['deref']                 = 'Hogyan fejtsük vissza az aliasokat?';
+$lang['binddn']                = 'Egy hozzáféréshez használt felhasználó DN-je, ha nincs névtelen hozzáférés. Pl. <code>cn=admin, dc=my, dc=home</code>';
+$lang['bindpw']                = 'Ehhez tartozó jelszó.';
+$lang['userscope']             = 'A keresési tartomány korlátozása erre a felhasználókra való keresésnél';
+$lang['groupscope']            = 'A keresési tartomány korlátozása erre a csoportokra való keresésnél';
+$lang['groupkey']              = 'Csoport meghatározása a következő attribútumból (az alapértelmezett AD csoporttagság helyett), pl. a szervezeti egység vagy a telefonszám';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authmysql/lang/hu/settings.php b/lib/plugins/authmysql/lang/hu/settings.php
new file mode 100644
index 000000000..9489c73f9
--- /dev/null
+++ b/lib/plugins/authmysql/lang/hu/settings.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Hungarian language file
+ *
+ * @author Marton Sebok <sebokmarton@gmail.com>
+ */
+$lang['server']                = 'MySQL-szerver';
+$lang['user']                  = 'MySQL felhasználónév';
+$lang['password']              = 'Ehhez a jelszó';
+$lang['database']              = 'Adatbázis';
+$lang['charset']               = 'Az adatbázisban használt karakterkészlet';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['forwardClearPass']      = 'A jelszó nyílt szövegben való átadása a következő SQL utasításokban a passcrypt opció használata helyett';
+$lang['TablesToLock']          = 'Az íráskor zárolandó táblák vesszővel elválasztott listája';
+$lang['checkPass']             = 'SQL utasítás a jelszavak ellenőrzéséhez';
+$lang['getUserInfo']           = 'SQL utasítás a felhasználói információk lekérdezéséhez';
+$lang['getGroups']             = 'SQL utasítás egy felhasználó csoporttagságainak lekérdezéséhez';
+$lang['getUsers']              = 'SQL utasítás a felhasználók listázásához';
+$lang['FilterLogin']           = 'SQL kifejezés a felhasználók azonosító alapú szűréséhez';
+$lang['FilterName']            = 'SQL kifejezés a felhasználók név alapú szűréséhez';
+$lang['FilterEmail']           = 'SQL kifejezés a felhasználók e-mail cím alapú szűréséhez';
+$lang['FilterGroup']           = 'SQL kifejezés a felhasználók csoporttagság alapú szűréséhez';
+$lang['SortOrder']             = 'SQL kifejezés a felhasználók rendezéséhez';
+$lang['addUser']               = 'SQL utasítás új felhasználó hozzáadásához';
+$lang['addGroup']              = 'SQL utasítás új csoport hozzáadásához';
+$lang['addUserGroup']          = 'SQL utasítás egy felhasználó egy meglévő csoporthoz való hozzáadásához';
+$lang['delGroup']              = 'SQL utasítás egy csoport törléséhez';
+$lang['getUserID']             = 'SQL utasítás egy felhasználó elsődleges kulcsának lekérdezéséhez';
+$lang['delUser']               = 'SQL utasítás egy felhasználó törléséhez';
+$lang['delUserRefs']           = 'SQL utasítás egy felhasználó eltávolításához az összes csoportból';
+$lang['updateUser']            = 'SQL utasítás egy felhasználó profiljának frissítéséhez';
+$lang['UpdateLogin']           = 'SQL kifejezés a felhasználó azonosítójának frissítéséhez';
+$lang['UpdatePass']            = 'SQL kifejezés a felhasználó jelszavának frissítéséhez';
+$lang['UpdateEmail']           = 'SQL kifejezés a felhasználó e-mail címének frissítéséhez';
+$lang['UpdateName']            = 'SQL kifejezés a felhasználó nevének frissítéséhez';
+$lang['UpdateTarget']          = 'SQL kifejezés a felhasználó kiválasztásához az adatok frissítésekor';
+$lang['delUserGroup']          = 'SQL utasítás egy felhasználó eltávolításához egy adott csoportból';
+$lang['getGroupID']            = 'SQL utasítás egy csoport elsődleges kulcsának lekérdezéséhez';
+$lang['debug_o_0']             = 'nem';
+$lang['debug_o_1']             = 'csak hiba esetén';
+$lang['debug_o_2']             = 'minden SQL-lekérdezésnél';
diff --git a/lib/plugins/authpgsql/lang/hu/settings.php b/lib/plugins/authpgsql/lang/hu/settings.php
new file mode 100644
index 000000000..7b9393256
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/hu/settings.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Hungarian language file
+ *
+ * @author Marton Sebok <sebokmarton@gmail.com>
+ */
+$lang['server']                = 'PostgreSQL-szerver';
+$lang['port']                  = 'PostgreSQL-port';
+$lang['user']                  = 'PostgreSQL felhasználónév';
+$lang['password']              = 'Ehhez a jelszó';
+$lang['database']              = 'Adatbázis';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['forwardClearPass']      = 'A jelszó nyílt szövegben való átadása a következő SQL utasításokban a passcrypt opció használata helyett';
+$lang['checkPass']             = 'SQL utasítás a jelszavak ellenőrzéséhez';
+$lang['getUserInfo']           = 'SQL utasítás a felhasználói információk lekérdezéséhez';
+$lang['getGroups']             = 'SQL utasítás egy felhasználó csoporttagságainak lekérdezéséhez';
+$lang['getUsers']              = 'SQL utasítás a felhasználók listázásához';
+$lang['FilterLogin']           = 'SQL kifejezés a felhasználók azonosító alapú szűréséhez';
+$lang['FilterName']            = 'SQL kifejezés a felhasználók név alapú szűréséhez';
+$lang['FilterEmail']           = 'SQL kifejezés a felhasználók e-mail cím alapú szűréséhez';
+$lang['FilterGroup']           = 'SQL kifejezés a felhasználók csoporttagság alapú szűréséhez';
+$lang['SortOrder']             = 'SQL kifejezés a felhasználók rendezéséhez';
+$lang['addUser']               = 'SQL utasítás új felhasználó hozzáadásához';
+$lang['addGroup']              = 'SQL utasítás új csoport hozzáadásához';
+$lang['addUserGroup']          = 'SQL utasítás egy felhasználó egy meglévő csoporthoz való hozzáadásához';
+$lang['delGroup']              = 'SQL utasítás egy csoport törléséhez';
+$lang['getUserID']             = 'SQL utasítás egy felhasználó elsődleges kulcsának lekérdezéséhez';
+$lang['delUser']               = 'SQL utasítás egy felhasználó törléséhez';
+$lang['delUserRefs']           = 'SQL utasítás egy felhasználó eltávolításához az összes csoportból';
+$lang['updateUser']            = 'SQL utasítás egy felhasználó profiljának frissítéséhez';
+$lang['UpdateLogin']           = 'SQL kifejezés a felhasználó azonosítójának frissítéséhez';
+$lang['UpdatePass']            = 'SQL kifejezés a felhasználó jelszavának frissítéséhez';
+$lang['UpdateEmail']           = 'SQL kifejezés a felhasználó e-mail címének frissítéséhez';
+$lang['UpdateName']            = 'SQL kifejezés a felhasználó nevének frissítéséhez';
+$lang['UpdateTarget']          = 'SQL kifejezés a felhasználó kiválasztásához az adatok frissítésekor';
+$lang['delUserGroup']          = 'SQL utasítás egy felhasználó eltávolításához egy adott csoportból';
+$lang['getGroupID']            = 'SQL utasítás egy csoport elsődleges kulcsának lekérdezéséhez';
diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php
index a1de94160..c68cf4337 100644
--- a/lib/plugins/config/lang/hu/lang.php
+++ b/lib/plugins/config/lang/hu/lang.php
@@ -8,8 +8,9 @@
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
  * @author David Szabo <szabo.david@gyumolcstarhely.hu>
+ * @author Marton Sebok <sebokmarton@gmail.com>
  */
-$lang['menu']                  = 'Beállító Központ';
+$lang['menu']                  = 'Beállítóközpont';
 $lang['error']                 = 'Helytelen érték miatt a módosítások nem mentődtek. Nézd át a módosításokat, és ments újra.
 <br />A helytelen érték(ek)et piros kerettel jelöljük.';
 $lang['updated']               = 'A módosítások sikeresen beállítva.';
@@ -19,7 +20,7 @@ Nézd meg, hogy a fájl neve és jogosultságai helyesen vannak-e beállítva!';
 $lang['danger']                = 'Figyelem: ezt a beállítást megváltoztatva a konfigurációs menü hozzáférhetetlenné válhat.';
 $lang['warning']               = 'Figyelmeztetés: a beállítás megváltoztatása nem kívánt viselkedést okozhat.';
 $lang['security']              = 'Biztonsági figyelmeztetés: a beállítás megváltoztatása biztonsági veszélyforrást okozhat.';
-$lang['_configuration_manager'] = 'Beállító Központ';
+$lang['_configuration_manager'] = 'Beállítóközpont';
 $lang['_header_dokuwiki']      = 'DokuWiki beállítások';
 $lang['_header_plugin']        = 'Bővítmények beállításai';
 $lang['_header_template']      = 'Sablon beállítások';
@@ -30,33 +31,39 @@ $lang['_authentication']       = 'Azonosítás beállításai';
 $lang['_anti_spam']            = 'Anti-Spam beállítások';
 $lang['_editing']              = 'Szerkesztési beállítások';
 $lang['_links']                = 'Link beállítások';
-$lang['_media']                = 'Media beállítások';
+$lang['_media']                = 'Média beállítások';
+$lang['_notifications']        = 'Értesítési beállítások';
+$lang['_syndication']          = 'Hírfolyam beállítások';
 $lang['_advanced']             = 'Haladó beállítások';
 $lang['_network']              = 'Hálózati beállítások';
 $lang['_plugin_sufix']         = 'Bővítmények beállításai';
 $lang['_template_sufix']       = 'Sablon beállítások';
-$lang['_msg_setting_undefined'] = 'Nincs beállított meta-adat.';
+$lang['_msg_setting_undefined'] = 'Nincs beállított metaadat.';
 $lang['_msg_setting_no_class'] = 'Nincs beállított osztály.';
 $lang['_msg_setting_no_default'] = 'Nincs alapértelmezett érték.';
-$lang['fmode']                 = 'Fájl létrehozási maszk';
-$lang['dmode']                 = 'Könyvtár létrehozási maszk';
-$lang['lang']                  = 'Nyelv';
-$lang['basedir']               = 'Báziskönyvtár';
-$lang['baseurl']               = 'Alap URL';
-$lang['savedir']               = 'Könyvtár az adatok mentésére';
+$lang['title']                 = 'Wiki neve';
 $lang['start']                 = 'Kezdőoldal neve';
-$lang['title']                 = 'Wiki címe';
+$lang['lang']                  = 'Nyelv';
 $lang['template']              = 'Sablon';
+$lang['tagline']               = 'Lábléc (ha a sablon támogatja)';
+$lang['sidebar']               = 'Oldalsáv oldal neve (ha a sablon támogatja), az üres mező letiltja az oldalsáv megjelenítését';
 $lang['license']               = 'Milyen licenc alatt érhető el a tartalom?';
-$lang['fullpath']              = 'Az oldalak teljes útvonalának mutatása a láblécben';
+$lang['savedir']               = 'Könyvtár az adatok mentésére';
+$lang['basedir']               = 'Báziskönyvtár (pl. <code>/dokuwiki/</code>). Hagyd üresen az automatikus beállításhoz!';
+$lang['baseurl']               = 'Báziscím (pl. <code>http://www.yourserver.com</code>). Hagyd üresen az automatikus beállításhoz!';
+$lang['cookiedir']             = 'Sütik címe. Hagy üresen a báziscím használatához!';
+$lang['dmode']                 = 'Könyvtár létrehozási maszk';
+$lang['fmode']                 = 'Fájl létrehozási maszk';
+$lang['allowdebug']            = 'Debug üzemmód <b>Kapcsold ki, hacsak biztos nem szükséges!</b>';
 $lang['recent']                = 'Utolsó változatok száma';
+$lang['recent_days']           = 'Hány napig tartsuk meg a korábbi változatokat?';
 $lang['breadcrumbs']           = 'Nyomvonal elemszám';
 $lang['youarehere']            = 'Hierarchikus nyomvonal';
+$lang['fullpath']              = 'Az oldalak teljes útvonalának mutatása a láblécben';
 $lang['typography']            = 'Legyen-e tipográfiai csere';
-$lang['htmlok']                = 'Beágyazott HTML engedélyezése';
-$lang['phpok']                 = 'Beágyazott PHP engedélyezése';
 $lang['dformat']               = 'Dátum formázás (lásd a PHP <a href="http://www.php.net/strftime">strftime</a> függvényt)';
 $lang['signature']             = 'Aláírás';
+$lang['showuseras']            = 'A felhasználó melyik adatát mutassunk az utolsó változtatás adatainál?';
 $lang['toptoclevel']           = 'A tartalomjegyzék felső szintje';
 $lang['tocminheads']           = 'Legalább ennyi címsor hatására generálódjon tartalomjegyzék';
 $lang['maxtoclevel']           = 'A tartalomjegyzék mélysége';
@@ -64,75 +71,81 @@ $lang['maxseclevel']           = 'A szakasz-szerkesztés maximális szintje';
 $lang['camelcase']             = 'CamelCase használata hivatkozásként';
 $lang['deaccent']              = 'Oldalnevek ékezettelenítése';
 $lang['useheading']            = 'Az első fejléc legyen az oldalnév';
-$lang['refcheck']              = 'Médiafájlok hivatkozásainak ellenőrzése';
-$lang['refshow']               = 'Média-hivatkozások maximálisan mutatott szintje';
-$lang['allowdebug']            = 'Debug üzemmód <b>Kapcsold ki, hacsak biztos nem szükséges!</b>';
-$lang['usewordblock']          = 'Szólista alapú spam-szűrés';
-$lang['indexdelay']            = 'Várakozás indexelés előtt (másodperc)';
-$lang['relnofollow']           = 'rel="nofollow" beállítás használata külső hivatkozásokra';
-$lang['mailguard']             = 'Email címek olvashatatlanná tétele címgyűjtők számára';
-$lang['iexssprotect']          = 'Feltöltött fájlok ellenőrzése kártékony JavaScript vagy HTML kód elkerülésére';
-$lang['showuseras']            = 'A felhasználó melyik adatát mutassunk az utolsó változtatás adatainál?';
+$lang['sneaky_index']          = 'Alapértelmezetten minden névtér látszik a DokuWiki áttekintő (index) oldalán. Ezen opció bekapcsolása után azok nem jelennek meg, melyekhez a felhasználónak nincs olvasás joga. De ezzel eltakarhatunk egyébként elérhető al-névtereket is, így bizonyos ACL beállításoknál használhatatlan indexet eredményez ez a beállítás.';
+$lang['hidepages']             = 'Az itt megadott oldalak elrejtése (reguláris kifejezés)';
 $lang['useacl']                = 'Hozzáférési listák (ACL) használata';
 $lang['autopasswd']            = 'Jelszavak automatikus generálása';
 $lang['authtype']              = 'Authentikációs háttérrendszer';
 $lang['passcrypt']             = 'Jelszó titkosítási módszer';
 $lang['defaultgroup']          = 'Alapértelmezett csoport';
-$lang['superuser']             = 'Szuper-felhasználó (Wiki-gazda) - csoport vagy felhasználó, aki teljes hozzáférési joggal rendelkezik az oldalakhoz és funkciókhoz, a hozzáférési jogosultságoktól függetlenül';
+$lang['superuser']             = 'Adminisztrátor - csoport vagy felhasználó, aki teljes hozzáférési joggal rendelkezik az oldalakhoz és funkciókhoz, a hozzáférési jogosultságoktól függetlenül';
 $lang['manager']               = 'Menedzser - csoport vagy felhasználó, aki bizonyos menedzsment funkciókhoz hozzáfér';
 $lang['profileconfirm']        = 'Beállítások változtatásának megerősítése jelszóval';
+$lang['rememberme']            = 'Állandó sütik engedélyezése (az "emlékezz rám" funkcióhoz)';
 $lang['disableactions']        = 'Bizonyos DokuWiki tevékenységek (action) tiltása';
 $lang['disableactions_check']  = 'Ellenőrzés';
 $lang['disableactions_subscription'] = 'Feliratkozás/Leiratkozás';
 $lang['disableactions_wikicode'] = 'Forrás megtekintése/Nyers adat exportja';
 $lang['disableactions_other']  = 'Egyéb tevékenységek (vesszővel elválasztva)';
-$lang['sneaky_index']          = 'Alapértelmezetten minden névtér látszik a DokuWiki áttekintő (index) oldalán. Ezen opció bekapcsolása után azok nem jelennek meg, melyekhez a felhasználónak nincs olvasás joga. De ezzel eltakarhatunk egyébként elérhető al-névtereket is, így bizonyos ACL beállításoknál használhatatlan indexet eredményez ez a beállítás.';
 $lang['auth_security_timeout'] = 'Authentikációs biztonsági időablak (másodperc)';
 $lang['securecookie']          = 'A böngészők a HTTPS felett beállított sütijüket csak HTTPS felett küldhetik? Kapcsoljuk ki ezt az opciót, ha csak a bejelentkezést védjük SSL-lel, a wiki tartalmának böngészése nyílt forgalommal történik.';
+$lang['remote']                = 'Távoli API engedélyezése. Ezzel más alkalmazások XML-RPC-n keresztül hozzáférhetnek a wikihez.';
+$lang['remoteuser']            = 'A távoli API hozzáférés korlátozása a következő felhasználókra vagy csoportokra. Hagyd üresen, ha mindenki számára elérhető!';
+$lang['usewordblock']          = 'Szólista alapú spam-szűrés';
+$lang['relnofollow']           = 'rel="nofollow" beállítás használata külső hivatkozásokra';
+$lang['indexdelay']            = 'Várakozás indexelés előtt (másodperc)';
+$lang['mailguard']             = 'Email címek olvashatatlanná tétele címgyűjtők számára';
+$lang['iexssprotect']          = 'Feltöltött fájlok ellenőrzése kártékony JavaScript vagy HTML kód elkerülésére';
+$lang['usedraft']              = 'Piszkozat automatikus mentése szerkesztés alatt';
+$lang['htmlok']                = 'Beágyazott HTML engedélyezése';
+$lang['phpok']                 = 'Beágyazott PHP engedélyezése';
+$lang['locktime']              = 'Oldal-zárolás maximális időtartama (másodperc)';
+$lang['cachetime']             = 'A gyorsítótár maximális élettartama (másodperc)';
+$lang['target____wiki']        = 'Cél-ablak belső hivatkozásokhoz';
+$lang['target____interwiki']   = 'Cél-ablak interwiki hivatkozásokhoz';
+$lang['target____extern']      = 'Cél-ablak külső hivatkozásokhoz';
+$lang['target____media']       = 'Cél-ablak média-fájl hivatkozásokhoz';
+$lang['target____windows']     = 'Cél-ablak Windows hivatkozásokhoz';
+$lang['mediarevisions']        = 'Médiafájlok verziókövetésének engedélyezése';
+$lang['refcheck']              = 'Médiafájlok hivatkozásainak ellenőrzése';
+$lang['refshow']               = 'Médiafájlok hivatkozásainak maximálisan mutatott szintje';
+$lang['gdlib']                 = 'GD Lib verzió';
+$lang['im_convert']            = 'Útvonal az ImageMagick csomag convert parancsához';
+$lang['jpg_quality']           = 'JPG tömörítés minősége (0-100)';
+$lang['fetchsize']             = 'Maximális méret (bájtban), amit a fetch.php letölthet kívülről';
+$lang['subscribers']           = 'Oldalváltozás-listára feliratkozás engedélyezése';
+$lang['subscribe_time']        = 'Az értesítések kiküldésének késleltetése (másodperc); Érdemes kisebbet választani, mint a változások megőrzésének maximális ideje.';
+$lang['notify']                = 'Az oldal-változásokat erre az e-mail címre küldje';
+$lang['registernotify']        = 'Értesítés egy újonnan regisztrált felhasználóról erre az e-mail címre';
+$lang['mailfrom']              = 'Az automatikusan küldött levelekben használt e-mail cím';
+$lang['mailprefix']            = 'Előtag az automatikus e-mailek tárgyában';
+$lang['htmlmail']              = 'Szebb, de nagyobb méretű HTML multipart e-mailek küldése. Tiltsd le a nyers szöveges üzenetekhez!';
+$lang['sitemap']               = 'Hány naponként generáljunk Google sitemap-ot?';
+$lang['rss_type']              = 'XML hírfolyam típus';
+$lang['rss_linkto']            = 'XML hírfolyam hivatkozás';
+$lang['rss_content']           = 'Mit mutassunk az XML hírfolyam elemekben?';
+$lang['rss_update']            = 'Hány másodpercenként frissítsük az XML hírfolyamot?';
+$lang['rss_show_summary']      = 'A hírfolyam címébe összefoglaló helyezése';
+$lang['rss_media']             = 'Milyen változások legyenek felsorolva az XML hírfolyamban?';
 $lang['updatecheck']           = 'Frissítések és biztonsági figyelmeztetések figyelése. Ehhez a DokuWikinek kapcsolatba kell lépnie a update.dokuwiki.org-gal.';
 $lang['userewrite']            = 'Szép URL-ek használata';
 $lang['useslash']              = 'Per-jel használata névtér-elválasztóként az URL-ekben';
-$lang['usedraft']              = 'Piszkozat automatikus mentése szerkesztés alatt';
 $lang['sepchar']               = 'Szó elválasztó az oldalnevekben';
 $lang['canonical']             = 'Teljesen kanonikus URL-ek használata';
 $lang['fnencode']              = 'A nem ASCII fájlnevek dekódolási módja';
 $lang['autoplural']            = 'Többes szám ellenőrzés a hivatkozásokban (angol)';
 $lang['compression']           = 'Tömörítés használata a törölt lapokhoz';
-$lang['cachetime']             = 'A gyorsítótár maximális élettartama (másodperc)';
-$lang['locktime']              = 'Oldal-zárolás maximális időtartama (másodperc)';
-$lang['fetchsize']             = 'Maximális méret (bájtban), amit a fetch.php letölthet kívülről';
-$lang['notify']                = 'Az oldal-változásokat erre az e-mail címre küldje';
-$lang['registernotify']        = 'Értesítés egy újonnan regisztrált felhasználóról erre az e-mail címre';
-$lang['mailfrom']              = 'Az automatikusan küldött levelekben használt e-mail cím';
-$lang['mailprefix']            = 'Előtag az automatikus e-mailek tárgyában';
 $lang['gzip_output']           = 'gzip tömörítés használata xhtml-hez (Content-Encoding)';
-$lang['gdlib']                 = 'GD Lib verzió';
-$lang['im_convert']            = 'Útvonal az ImageMagick csomag convert parancsához';
-$lang['jpg_quality']           = 'JPG tömörítés minősége (0-100)';
-$lang['subscribers']           = 'Oldalváltozás-listára feliratkozás engedélyezése';
-$lang['subscribe_time']        = 'Az értesítések kiküldésének késleltetése (másodperc); Érdemes kisebbet választani, mint a változások megőrzésének maximális ideje.';
 $lang['compress']              = 'CSS és JavaScript fájlok tömörítése';
-$lang['hidepages']             = 'Az itt megadott oldalak elrejtése (reguláris kifejezés)';
+$lang['cssdatauri']            = 'Mérethatár bájtokban, ami alatti CSS-ben hivatkozott fájlok közvetlenül beágyazódjanak a stíluslapba. Ez IE 7-ben és alatta nem fog működni! <code>400</code>-<code>600</code> bájt ideális érték. Állítsd <code>0</code>-ra a beágyazás kikapcsolásához!';
 $lang['send404']               = '"HTTP 404/Page Not Found" küldése nemlétező oldalak esetén';
-$lang['sitemap']               = 'Hány naponként generáljunk Google sitemap-ot?';
 $lang['broken_iua']            = 'Az ignore_user_abort függvény hibát dob a rendszereden? Ez nem működő keresési indexet eredményezhet. Az IIS+PHP/CGI összeállításról tudjuk, hogy hibát dob. Lásd a <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> oldalt a további infóért.';
 $lang['xsendfile']             = 'Használjuk az X-Sendfile fejlécet, hogy a webszerver statikus állományokat tudjon küldeni? A webszervernek is támogatnia kell ezt a funkciót.';
 $lang['renderer_xhtml']        = 'Az elsődleges (xhtml) wiki kimenet generálója';
 $lang['renderer__core']        = '%s (dokuwiki mag)';
 $lang['renderer__plugin']      = '%s (bővítmény)';
-$lang['rememberme']            = 'Állandó sütik engedélyezése (az "emlékezz rám" funkcióhoz)';
-$lang['rss_type']              = 'XML hírfolyam típus';
-$lang['rss_linkto']            = 'XML hírfolyam hivatkozás';
-$lang['rss_content']           = 'Mit mutassunk az XML hírfolyam elemekben?';
-$lang['rss_update']            = 'Hány másodpercenként frissítsük az XML hírfolyamot?';
-$lang['recent_days']           = 'Hány napig tartsuk meg a korábbi változatokat?';
-$lang['rss_show_summary']      = 'A hírfolyam címébe összefoglaló helyezése';
-$lang['target____wiki']        = 'Cél-ablak belső hivatkozásokhoz';
-$lang['target____interwiki']   = 'Cél-ablak interwiki hivatkozásokhoz';
-$lang['target____extern']      = 'Cél-ablak külső hivatkozásokhoz';
-$lang['target____media']       = 'Cél-ablak média-fájl hivatkozásokhoz';
-$lang['target____windows']     = 'Cél-ablak Windows hivatkozásokhoz';
-$lang['proxy____host']         = 'Proxy szerver neve';
+$lang['dnslookups']            = 'A DokuWiki megpróbál hosztneveket keresni a távoli IP-címekhez. Amennyiben lassú, vagy nem működő DNS-szervered van vagy csak nem szeretnéd ezt a funkciót, tiltsd le ezt az opciót!';
+$lang['proxy____host']         = 'Proxy-szerver neve';
 $lang['proxy____port']         = 'Proxy port';
 $lang['proxy____user']         = 'Proxy felhasználó név';
 $lang['proxy____pass']         = 'Proxy jelszó';
@@ -174,7 +187,7 @@ $lang['compression_o_0']       = 'nincs tömörítés';
 $lang['compression_o_gz']      = 'gzip';
 $lang['compression_o_bz2']     = 'bz2';
 $lang['xsendfile_o_0']         = 'nincs használatban';
-$lang['xsendfile_o_1']         = 'lighttpd saját fejléc (1.5-ös verzió előtti)';
+$lang['xsendfile_o_1']         = 'Lighttpd saját fejléc (1.5-ös verzió előtti)';
 $lang['xsendfile_o_2']         = 'Standard X-Sendfile fejléc';
 $lang['xsendfile_o_3']         = 'Nginx saját X-Accel-Redirect fejléce';
 $lang['showuseras_o_loginname'] = 'Azonosító';
diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php
index 34309a53f..235d33a0e 100644
--- a/lib/plugins/plugin/lang/hu/lang.php
+++ b/lib/plugins/plugin/lang/hu/lang.php
@@ -8,6 +8,7 @@
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
  * @author David Szabo <szabo.david@gyumolcstarhely.hu>
+ * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['menu']                  = 'Bővítménykezelő';
 $lang['download']              = 'Új bővítmény letöltése és telepítése';
@@ -18,24 +19,24 @@ $lang['btn_delete']            = 'törlés';
 $lang['btn_settings']          = 'beállítások';
 $lang['btn_download']          = 'Letöltés';
 $lang['btn_enable']            = 'Mentés';
-$lang['url']                   = 'URL:';
+$lang['url']                   = 'Cím';
 $lang['installed']             = 'Telepítve:';
 $lang['lastupdate']            = 'Utolsó frissítés:';
 $lang['source']                = 'Forrás:';
 $lang['unknown']               = 'ismeretlen';
 $lang['updating']              = 'Frissítés...';
-$lang['updated']               = 'A %s bővítmény sikeresen frissült.';
-$lang['updates']               = 'A következő bővítmények sikeresen frissültek:';
+$lang['updated']               = 'A %s bővítmény frissítése sikeres';
+$lang['updates']               = 'A következő bővítmények frissítése sikeres:';
 $lang['update_none']           = 'Nem találtam újabb verziót.';
 $lang['deleting']              = 'Törlés...';
-$lang['deleted']               = 'A %s bővítményt eltávolítottam.';
+$lang['deleted']               = 'A %s bővítményt eltávolítva.';
 $lang['downloading']           = 'Letöltés...';
-$lang['downloaded']            = 'A %s bővítmény sikeresen feltelepült.';
-$lang['downloads']             = 'A következő bővítmények sikeresen feltelepültek:';
-$lang['download_none']         = 'Nem találtam bővítményt, vagy ismeretlen hiba történt a letöltés/telepítés közben.';
+$lang['downloaded']            = 'A %s bővítmény telepítése sikeres.';
+$lang['downloads']             = 'A következő bővítmények telepítése sikeres.';
+$lang['download_none']         = 'Nem találtam bővítményt vagy ismeretlen hiba történt a letöltés/telepítés közben.';
 $lang['plugin']                = 'Bővítmény:';
 $lang['components']            = 'Részek';
-$lang['noinfo']                = 'Ez a bővítmény nem tartalmaz infót, lehet, hogy hibás.';
+$lang['noinfo']                = 'Ez a bővítmény nem tartalmaz információt, lehet, hogy hibás.';
 $lang['name']                  = 'Név:';
 $lang['date']                  = 'Dátum:';
 $lang['type']                  = 'Típus:';
@@ -43,14 +44,14 @@ $lang['desc']                  = 'Leírás:';
 $lang['author']                = 'Szerző:';
 $lang['www']                   = 'Web:';
 $lang['error']                 = 'Ismeretlen hiba lépett fel.';
-$lang['error_download']        = 'Nem tudom letölteni a bővítmény fájlt: %s';
+$lang['error_download']        = 'Nem tudom letölteni a fájlt a bővítményhez: %s';
 $lang['error_badurl']          = 'Feltehetően rossz URL - nem tudom meghatározni a fájlnevet az URL-ből.';
 $lang['error_dircreate']       = 'Nem tudom létrehozni az átmeneti könyvtárat a letöltéshez.';
 $lang['error_decompress']      = 'A Bővítménykezelő nem tudta a letöltött állományt kicsomagolni. Ennek oka lehet hibás letöltés, ebben az esetben újra letöltéssel próbálkozhatsz, esetleg a tömörítés módja ismeretlen, ebben az esetben kézzel kell letölteni és telepíteni a bővítményt.';
-$lang['error_copy']            = 'Fájl másolási hiba történt a(z) <em>%s</em> bővítmény telepítése közben: vagy a lemezterület fogyott el, vagy az állomány hozzáférési jogosultságok nem megfelelőek. Emiatt előfordulhat, hogy a bővítményt csak részben sikerült telepíteni, és a wiki összeomolhat.';
-$lang['error_delete']          = 'Hiba történt a(z) <em>%s</em> bővítmény eltávolítása közben. A legvalószínűbb ok, hogy a könyvtár vagy állomány hozzáférési jogosultságok nem megfelelőek.';
+$lang['error_copy']            = 'Fájl másolási hiba történt a(z) <em>%s</em> bővítmény telepítése közben: vagy a lemezterület fogyott el, vagy az állomány hozzáférési jogosultságai nem megfelelőek. Emiatt előfordulhat, hogy a bővítményt csak részben sikerült telepíteni és a wiki összeomolhat.';
+$lang['error_delete']          = 'Hiba történt a(z) <em>%s</em> bővítmény eltávolítása közben. A legvalószínűbb ok, hogy a könyvtár vagy állomány hozzáférési jogosultságai nem megfelelőek.';
 $lang['enabled']               = 'A(z) %s bővítmény bekapcsolva.';
-$lang['notenabled']            = 'A(z) %s bővítmény engedélyezése nem sikerült. Ellenőrizze a fájl-hozzáférési engedélyeket.';
+$lang['notenabled']            = 'A(z) %s bővítmény engedélyezése nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.';
 $lang['disabled']              = 'A(z) %s bővítmény kikapcsolva.';
-$lang['notdisabled']           = 'A(z) %s bővítmény kikapcsolása nem sikerült. Ellenőrizze a fájl-hozzáférési engedélyeket.';
-$lang['packageinstalled']      = 'A bővítmény csomag(ok) feltelepült(ek): %d plugin(s): %s';
+$lang['notdisabled']           = 'A(z) %s bővítmény kikapcsolása nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.';
+$lang['packageinstalled']      = 'A bővítménycsomag(ok) feltelepült(ek): %d plugin(s): %s';
diff --git a/lib/plugins/popularity/lang/hu/lang.php b/lib/plugins/popularity/lang/hu/lang.php
index 5dcd1adf0..5ee40eacc 100644
--- a/lib/plugins/popularity/lang/hu/lang.php
+++ b/lib/plugins/popularity/lang/hu/lang.php
@@ -8,6 +8,7 @@
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
  * @author David Szabo <szabo.david@gyumolcstarhely.hu>
+ * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['name']                  = 'Visszajelzés a DokuWiki használatáról (sok időt vehet igénybe a betöltése)';
 $lang['submit']                = 'Adatok elküldése';
diff --git a/lib/plugins/revert/lang/hu/lang.php b/lib/plugins/revert/lang/hu/lang.php
index 058a63196..051e7b7d7 100644
--- a/lib/plugins/revert/lang/hu/lang.php
+++ b/lib/plugins/revert/lang/hu/lang.php
@@ -8,6 +8,7 @@
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
  * @author David Szabo <szabo.david@gyumolcstarhely.hu>
+ * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['menu']                  = 'Visszaállítás kezelő (anti-SPAM)';
 $lang['filter']                = 'SPAM tartalmú oldalak keresése';
@@ -16,5 +17,5 @@ $lang['reverted']              = '%s a következő változatra lett visszaállí
 $lang['removed']               = '%s törölve';
 $lang['revstart']              = 'A visszaállítási folyamat elindult. Ez hosszú ideig eltarthat. Ha időtúllépés miatt nem tud lefutni, kisebb darabbal kell próbálkozni.';
 $lang['revstop']               = 'A visszaállítási folyamat sikeresen befejeződött.';
-$lang['note1']                 = 'Megjegyzés: a keresés kisbetű-nagybetűre érzékeny';
+$lang['note1']                 = 'Megjegyzés: a keresés kisbetű-nagybetű érzékeny';
 $lang['note2']                 = 'Megjegyzés: Az oldalt az utolsó olyan változatra állítjuk vissza, ami nem tartalmazza a megadott spam kifejezést: <i>%s</i>.';
diff --git a/lib/plugins/usermanager/lang/hu/lang.php b/lib/plugins/usermanager/lang/hu/lang.php
index 9b9740cb0..71a5b4bc9 100644
--- a/lib/plugins/usermanager/lang/hu/lang.php
+++ b/lib/plugins/usermanager/lang/hu/lang.php
@@ -8,12 +8,13 @@
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
  * @author David Szabo <szabo.david@gyumolcstarhely.hu>
+ * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['menu']                  = 'Felhasználók kezelése';
 $lang['noauth']                = '(A felhasználói azonosítás nem működik.)';
 $lang['nosupport']             = '(A felhasználók kezelése nem támogatott.)';
 $lang['badauth']               = 'nem érvényes autentikációs technika';
-$lang['user_id']               = 'Felhasználó azonosító';
+$lang['user_id']               = 'Felhasználói azonosító';
 $lang['user_pass']             = 'Jelszó';
 $lang['user_name']             = 'Név';
 $lang['user_mail']             = 'E-mail';
@@ -30,8 +31,8 @@ $lang['search']                = 'Keresés';
 $lang['search_prompt']         = 'Keresés';
 $lang['clear']                 = 'Keresési szűrés törlése';
 $lang['filter']                = 'Szűrés';
-$lang['summary']               = '%1$d-%2$d. felhasználókat mutatom a(z) %3$d megtalált felhasználóból. %4$d felhasználó van összesen.';
-$lang['nonefound']             = 'Nem találtam ilyen felhasználót. %d felhasználó van összesen.';
+$lang['summary']               = '%1$d-%2$d. felhasználók megjelenítése a(z) %3$d megtalált felhasználóból. %4$d felhasználó van összesen.';
+$lang['nonefound']             = 'Nincs ilyen felhasználó. %d felhasználó van összesen.';
 $lang['delete_ok']             = '%d felhasználó törölve.';
 $lang['delete_fail']           = '%d felhasználót nem sikerült törölni.';
 $lang['update_ok']             = 'A felhasználó adatait sikeresen elmentettem.';
@@ -45,7 +46,7 @@ $lang['edit_usermissing']      = 'A kiválasztott felhasználót nem találom, a
 $lang['user_notify']           = 'Felhasználó értesítése';
 $lang['note_notify']           = 'Csak akkor küld értesítő e-mailt, ha a felhasználó új jelszót kapott.';
 $lang['note_group']            = 'Ha nincs csoport meghatározva, az új felhasználó az alapértelmezett csoportba (%s) kerül.';
-$lang['note_pass']             = 'Ha a baloldali mező üres, és a felhasználó értesítés aktív, akkor generált jelszó lesz.';
+$lang['note_pass']             = 'Ha a baloldali mező üres és a felhasználó értesítés aktív, akkor a jelszót a rendszer generálja.';
 $lang['add_ok']                = 'A felhasználó sikeresen hozzáadva.';
 $lang['add_fail']              = 'A felhasználó hozzáadása nem sikerült.';
 $lang['notify_ok']             = 'Értesítő levél elküldve.';
-- 
cgit v1.2.3


From 9b136f13f2219fd6d292ab3064122bec0ec33d0d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 28 Jul 2013 13:48:36 +0100
Subject: fixed typo in commented section indenting css

---
 lib/tpl/dokuwiki/css/content.css | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index 119859e38..b1498d4de 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -8,16 +8,16 @@
 
 /*____________ section indenting ____________
 
-.dokuwiki.page  h1 {margin-left: 0;}
-.dokuwiki.page  h2 {margin-left: .666em;}
-.dokuwiki.page  h3 {margin-left: 1.776em;}
-.dokuwiki.page  h4 {margin-left: 3em;}
-.dokuwiki.page  h5 {margin-left: 4.5712em;}
-.dokuwiki.page  div.level1 {margin-left: 0;}
-.dokuwiki.page  div.level2 {margin-left: 1em;}
-.dokuwiki.page  div.level3 {margin-left: 2em;}
-.dokuwiki.page  div.level4 {margin-left: 3em;}
-.dokuwiki.page  div.level5 {margin-left: 4em;}
+.dokuwiki .page  h1 {margin-left: 0;}
+.dokuwiki .page  h2 {margin-left: .666em;}
+.dokuwiki .page  h3 {margin-left: 1.776em;}
+.dokuwiki .page  h4 {margin-left: 3em;}
+.dokuwiki .page  h5 {margin-left: 4.5712em;}
+.dokuwiki .page  div.level1 {margin-left: 0;}
+.dokuwiki .page  div.level2 {margin-left: 1em;}
+.dokuwiki .page  div.level3 {margin-left: 2em;}
+.dokuwiki .page  div.level4 {margin-left: 3em;}
+.dokuwiki .page  div.level5 {margin-left: 4em;}
 
 [dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;}
 [dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;}
-- 
cgit v1.2.3


From 7d8a6abbb21979fd77dca10275ebb8e01a04b6e4 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 29 Jul 2013 16:33:44 +0200
Subject: Fix popularity data submission in the backend FS#2808

The POST data contained the raw data instead of an array with the data
that should be submitted like in the requests from the browser. The
server backend has been fixed to be able to process both versions.
---
 lib/plugins/popularity/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 5bbeddba0..0e38bcb88 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -85,7 +85,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
     function sendData($data){
         $error = '';
         $httpClient = new DokuHTTPClient();
-        $status = $httpClient->sendRequest($this->submitUrl, $data, 'POST');
+        $status = $httpClient->sendRequest($this->submitUrl, array('data' => $data), 'POST');
         if ( ! $status ){
             $error = $httpClient->error;
         }
-- 
cgit v1.2.3


From d4a1ece8f011dd69db05b83d2f98e3207f1a7e48 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 29 Jul 2013 20:06:01 +0200
Subject: add LESS support

still needs testing
---
 lib/exe/css.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 1e662c64a..4a9c825c1 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -154,7 +154,11 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
-    // place all @import statements at the top of the file
+    // parse LESS
+    $less = new lessc();
+    $css = $less->compile($css);
+
+    // place all remaining @import statements at the top of the file
     $css = css_moveimports($css);
 
     // compress whitespace and comments
@@ -175,6 +179,9 @@ function css_out(){
  * Does placeholder replacements in the style according to
  * the ones defined in a templates style.ini file
  *
+ * This also adds the ini defined placeholders as less variables
+ * (sans the surrounding __ and with a ini_ prefix)
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function css_applystyle($css,$tplinc){
@@ -182,6 +189,13 @@ function css_applystyle($css,$tplinc){
 
     if($styleini){
         $css = strtr($css,$styleini['replacements']);
+
+        $less = '';
+        foreach($styleini as $key => $value){
+            $key = trim($key, '_');
+            $key = '@ini_'.$key;
+            $less .= "$key: $value\n";
+        }
     }
     return $css;
 }
@@ -333,14 +347,17 @@ function css_pluginstyles($mediatype='screen'){
     $plugins = plugin_list();
     foreach ($plugins as $p){
         $list[DOKU_PLUGIN."$p/$mediatype.css"]  = DOKU_BASE."lib/plugins/$p/";
+        $list[DOKU_PLUGIN."$p/$mediatype.less"]  = DOKU_BASE."lib/plugins/$p/";
         // alternative for screen.css
         if ($mediatype=='screen') {
             $list[DOKU_PLUGIN."$p/style.css"]  = DOKU_BASE."lib/plugins/$p/";
+            $list[DOKU_PLUGIN."$p/style.less"]  = DOKU_BASE."lib/plugins/$p/";
         }
         // @deprecated 2012-04-09: rtl will cease to be a mode of its own,
         //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
         if($lang['direction'] == 'rtl'){
             $list[DOKU_PLUGIN."$p/rtl.css"] = DOKU_BASE."lib/plugins/$p/";
+            $list[DOKU_PLUGIN."$p/rtl.less"] = DOKU_BASE."lib/plugins/$p/";
         }
     }
     return $list;
-- 
cgit v1.2.3


From 9f8068d2077ef7add4108b4a8593764a39518d8d Mon Sep 17 00:00:00 2001
From: Mohamed Amine BERGAOUI <mabergaoui@gmail.com>
Date: Tue, 30 Jul 2013 11:21:18 +0200
Subject: moving ACL remote functions to the ACL plugin

---
 lib/plugins/acl/remote.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 lib/plugins/acl/remote.php

(limited to 'lib')

diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
new file mode 100644
index 000000000..8210e5414
--- /dev/null
+++ b/lib/plugins/acl/remote.php
@@ -0,0 +1,32 @@
+<?php
+
+class remote_plugin_acl extends DokuWiki_Remote_Plugin {
+	function _getMethods() {
+        return array(
+            'plugin.acl.addAcl' => array(
+                'args' => array('string','string','int'),
+                'return' => 'int',
+                'name' => 'addAcl',
+                'doc' => 'Adds a new ACL rule.'
+			), 'plugin.delAcl' => array(
+                'args' => array('string','string'),
+                'return' => 'int',
+                'name' => 'delAcl',
+                'doc' => 'Delete an existing ACL rule.'
+			),
+        );
+    }
+
+	
+	function addAcl($scope, $user, $level){
+		$apa = new admin_plugin_acl(); 
+		return $apa->_acl_add($scope, $user, $level);
+	}
+	
+	function delAcl($scope, $user){
+		$apa = new admin_plugin_acl(); 
+		return $apa->_acl_del($scope, $user);
+	}
+}
+
+?>
-- 
cgit v1.2.3


From 1b7fc214a838c5f460f865cc7712364a8ec8f3e7 Mon Sep 17 00:00:00 2001
From: Mohamed Amine BERGAOUI <mabergaoui@gmail.com>
Date: Tue, 30 Jul 2013 12:03:23 +0200
Subject: corrected coding style, deleted ?>, renamed function keys and used
 plugin_load

---
 lib/plugins/acl/remote.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 8210e5414..8f6dfbcd9 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -1,32 +1,30 @@
 <?php
 
 class remote_plugin_acl extends DokuWiki_Remote_Plugin {
-	function _getMethods() {
+    function _getMethods() {
         return array(
-            'plugin.acl.addAcl' => array(
+            'addAcl' => array(
                 'args' => array('string','string','int'),
                 'return' => 'int',
                 'name' => 'addAcl',
                 'doc' => 'Adds a new ACL rule.'
-			), 'plugin.delAcl' => array(
+            ), 'delAcl' => array(
                 'args' => array('string','string'),
                 'return' => 'int',
                 'name' => 'delAcl',
                 'doc' => 'Delete an existing ACL rule.'
-			),
+            ),
         );
     }
-
 	
-	function addAcl($scope, $user, $level){
-		$apa = new admin_plugin_acl(); 
-		return $apa->_acl_add($scope, $user, $level);
-	}
+    function addAcl($scope, $user, $level){
+        $apa = plugin_load('admin', 'acl'); 
+        return $apa->_acl_add($scope, $user, $level);
+    }
 	
-	function delAcl($scope, $user){
-		$apa = new admin_plugin_acl(); 
-		return $apa->_acl_del($scope, $user);
-	}
+    function delAcl($scope, $user){
+        $apa = plugin_load('admin', 'acl'); 
+        return $apa->_acl_del($scope, $user);
+    }
 }
 
-?>
-- 
cgit v1.2.3


From c51b334ee77310dc0055311092f224be0342cd65 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 12:07:15 +0200
Subject: fixed ini replacement to less variables stuff

---
 lib/exe/css.php                  |   6 +-
 lib/tpl/dokuwiki/css/design.css  | 405 ---------------------------------------
 lib/tpl/dokuwiki/css/design.less | 405 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 409 insertions(+), 407 deletions(-)
 delete mode 100644 lib/tpl/dokuwiki/css/design.css
 create mode 100644 lib/tpl/dokuwiki/css/design.less

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 4a9c825c1..04516e8ba 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -191,11 +191,13 @@ function css_applystyle($css,$tplinc){
         $css = strtr($css,$styleini['replacements']);
 
         $less = '';
-        foreach($styleini as $key => $value){
+        foreach($styleini['replacements'] as $key => $value){
             $key = trim($key, '_');
             $key = '@ini_'.$key;
-            $less .= "$key: $value\n";
+            $less .= "$key: $value;\n";
         }
+
+        $css = $less.$css;
     }
     return $css;
 }
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
deleted file mode 100644
index 457414839..000000000
--- a/lib/tpl/dokuwiki/css/design.css
+++ /dev/null
@@ -1,405 +0,0 @@
-/**
- * This file provides the main design styles for the
- * bits that surround the content.
- *
- * @author Anika Henke <anika@selfthinker.org>
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Clarence Lee <clarencedglee@gmail.com>
- */
-
-/* header
-********************************************************************/
-
-#dokuwiki__header {
-    padding: 2em 0 1.5em;
-}
-
-#dokuwiki__header .headings,
-#dokuwiki__header .tools {
-    margin-bottom: 1.5em;
-    width: 49%;
-}
-#dokuwiki__header h1 img {
-    float: left;
-    margin-right: .5em;
-}
-[dir=rtl] #dokuwiki__header h1 img {
-    float: right;
-    margin-left: .5em;
-    margin-right: 0;
-}
-#dokuwiki__header h1 span {
-    display: block;
-    padding-top: 10px;
-}
-#dokuwiki__header h1 {
-    margin: 0;
-    font-size: 1.5em;
-    font-weight: normal;
-}
-#dokuwiki__header h1 a {
-    text-decoration: none;
-    color: __text__;
-    background-color: inherit;
-}
-#dokuwiki__header h1 a:hover,
-#dokuwiki__header h1 a:active,
-#dokuwiki__header h1 a:focus {
-}
-#dokuwiki__header p.claim {
-    margin-bottom: 0;
-    font-size: 0.875em;
-}
-
-#dokuwiki__header .tools {
-    margin-top: .2em;
-}
-
-
-/* tools
-********************************************************************/
-
-/* highlight selected tool */
-.mode_admin a.action.admin,
-.mode_login a.action.login,
-.mode_register a.action.register,
-.mode_profile a.action.profile,
-.mode_recent a.action.recent,
-.mode_index a.action.index,
-.mode_media a.action.media,
-.mode_revisions a.action.revs,
-.mode_backlink a.action.backlink,
-.mode_subscribe a.action.subscribe {
-    font-weight: bold;
-}
-
-#dokuwiki__header .tools ul {
-    padding-left: 0;
-    margin-bottom: 0;
-}
-#dokuwiki__header .tools li {
-    font-size: 0.875em;
-    margin-left: 1em;
-    list-style: none;
-    display: inline;
-}
-[dir=rtl] #dokuwiki__header .tools li {
-    margin-right: 1em;
-    margin-left: 0;
-}
-#dokuwiki__header .tools form.search div.ajax_qsearch li {
-    font-size: 1em;
-    margin-left: 0;
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-#dokuwiki__usertools a.action {
-    padding-left: 20px;
-    background: transparent url(images/usertools.png) no-repeat 0 0;
-}
-[dir=rtl] #dokuwiki__usertools a.action {
-    padding-left: 0;
-    padding-right: 20px;
-}
-[dir=rtl] #IE7 #dokuwiki__usertools a.action {
-    display: inline-block;
-}
-
-
-#dokuwiki__header .mobileTools {
-    display: none; /* hide mobile tools dropdown to only show in mobile view */
-}
-
-/*____________ user tools ____________*/
-
-#dokuwiki__usertools {
-    position: absolute;
-    top: .5em;
-    right: .5em;
-    text-align: right;
-    width: 100%;
-}
-[dir=rtl] #dokuwiki__usertools {
-    text-align: left;
-    left: 40px;
-    right: auto;
-}
-#dokuwiki__usertools ul {
-    margin: 0 auto;
-    padding: 0;
-    max-width: __site_width__;
-}
-#dokuwiki__usertools ul li.user {
-}
-
-#dokuwiki__usertools a.action.admin {
-    background-position: left 0;
-}
-[dir=rtl] #dokuwiki__usertools a.action.admin {
-    background-position: right 0;
-}
-#dokuwiki__usertools a.action.profile {
-    background-position: left -32px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.profile {
-    background-position: right -32px;
-}
-#dokuwiki__usertools a.action.register {
-    background-position: left -64px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.register {
-    background-position: right -64px;
-}
-#dokuwiki__usertools a.action.login {
-    background-position: left -96px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.login {
-    background-position: right -96px;
-}
-#dokuwiki__usertools a.action.logout {
-    background-position: left -128px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.logout {
-    background-position: right -128px;
-}
-
-
-/*____________ site tools ____________*/
-
-#dokuwiki__sitetools {
-    text-align: right;
-}
-[dir=rtl] #dokuwiki__sitetools {
-    text-align: left;
-}
-
-#dokuwiki__sitetools form.search {
-    display: block;
-    font-size: 0.875em;
-    position: relative;
-}
-#IE7 #dokuwiki__sitetools form.search {
-    min-height: 1px;
-    z-index: 21;
-}
-#dokuwiki__sitetools form.search input.edit {
-    width: 18em;
-    padding: .35em 22px .35em .1em;
-}
-[dir=rtl] #dokuwiki__sitetools form.search input.edit {
-    padding: .35em .1em .35em 22px;
-}
-#dokuwiki__sitetools form.search input.button {
-    background: transparent url(images/search.png) no-repeat 0 0;
-    border-width: 0;
-    width: 19px;
-    height: 14px;
-    text-indent: -99999px;
-    margin-left: -20px;
-    box-shadow: none;
-    padding: 0;
-}
-[dir=rtl] #dokuwiki__sitetools form.search input.button {
-    background-position: 5px 0;
-    margin-left: 0;
-    margin-right: -20px;
-    position: relative;
-}
-
-#dokuwiki__sitetools ul {
-    margin-top: 0.5em;
-}
-#dokuwiki__sitetools li {
-}
-
-/*____________ breadcrumbs ____________*/
-
-.dokuwiki div.breadcrumbs {
-    border-top: 1px solid __border__;
-    border-bottom: 1px solid __background__;
-    margin-bottom: .5em;
-    font-size: 0.875em;
-    clear: both;
-}
-.dokuwiki div.breadcrumbs div {
-    padding: .1em .35em;
-}
-
-.dokuwiki div.breadcrumbs div:only-child {
-    border-top: 1px solid __background__;
-    border-bottom: 1px solid __border__;
-}
-.dokuwiki div.breadcrumbs div:first-child {
-    border-top: 1px solid __background__;
-}
-#IE7 .dokuwiki div.breadcrumbs div,
-#IE8 .dokuwiki div.breadcrumbs div {
-    border-bottom: 1px solid __border__;
-}
-.dokuwiki div.breadcrumbs div:last-child {
-    border-bottom: 1px solid __border__;
-}
-
-.dokuwiki div.breadcrumbs a {
-    color: __link__;
-    background-color: inherit;
-}
-.dokuwiki div.breadcrumbs .bcsep {
-    font-size: 0.75em;
-}
-
-
-/* sidebar
-********************************************************************/
-
-#dokuwiki__aside {
-}
-#dokuwiki__aside > .pad {
-    font-size: 0.875em;
-    overflow: hidden;
-    word-wrap: break-word;
-}
-
-/* make sidebar more condensed */
-
-#dokuwiki__aside h1 {
-    font-size: 1.714em;
-    margin-bottom: .292em;
-}
-#dokuwiki__aside h2 {
-    margin-bottom: .333em;
-}
-#dokuwiki__aside h3 {
-    margin-bottom: .444em;
-}
-#dokuwiki__aside h4 {
-    margin-bottom: .5em;
-}
-#dokuwiki__aside h5 {
-    margin-bottom: .5714em;
-}
-
-#dokuwiki__aside p,
-#dokuwiki__aside ul,
-#dokuwiki__aside ol,
-#dokuwiki__aside dl,
-#dokuwiki__aside pre,
-#dokuwiki__aside table,
-#dokuwiki__aside fieldset,
-#dokuwiki__aside hr,
-#dokuwiki__aside blockquote,
-#dokuwiki__aside address {
-    margin-bottom: .7em;
-}
-
-#dokuwiki__aside ul,
-#dokuwiki__aside ol {
-    padding-left: .5em;
-}
-[dir=rtl] #dokuwiki__aside ul,
-[dir=rtl] #dokuwiki__aside ol {
-    padding-right: .5em;
-}
-#dokuwiki__aside li ul,
-#dokuwiki__aside li ol {
-    margin-bottom: 0;
-    padding: 0;
-}
-
-#dokuwiki__aside a:link,
-#dokuwiki__aside a:visited {
-    color: __link__;
-    background-color: inherit;
-}
-
-
-/* content
-********************************************************************/
-
-#dokuwiki__content {
-}
-
-.dokuwiki .pageId {
-    position: absolute;
-    top: -2.3em;
-    right: -1em;
-    overflow: hidden;
-    padding: 1em 1em 0;
-}
-[dir=rtl] .dokuwiki .pageId {
-    right: auto;
-    left: -1em;
-}
-.dokuwiki .pageId span {
-    font-size: 0.875em;
-    border: solid __background_alt__;
-    border-width: 1px 1px 0;
-    background-color: __background__;
-    color: __text_alt__;
-    padding: .1em .35em;
-    border-top-left-radius: 2px;
-    border-top-right-radius: 2px;
-    box-shadow: 0 0 .5em __text_alt__;
-    display: block;
-}
-
-.dokuwiki div.page {
-    background: __background__;
-    color: inherit;
-    border: 1px solid __background_alt__;
-    box-shadow: 0 0 .5em __text_alt__;
-    border-radius: 2px;
-    padding: 1.556em 2em 2em;
-    margin-bottom: .5em;
-    overflow: hidden;
-    word-wrap: break-word;
-}
-
-.dokuwiki .docInfo {
-    font-size: 0.875em;
-    text-align: right;
-}
-[dir=rtl] .dokuwiki .docInfo {
-    text-align: left;
-}
-
-/* license note under edit window */
-.dokuwiki div.license {
-    font-size: 93.75%;
-}
-
-
-/* footer
-********************************************************************/
-
-.dokuwiki .wrapper {
-    margin-bottom: 1.4em;
-}
-
-#dokuwiki__footer {
-    margin-bottom: 1em;
-    text-align: center;
-}
-#dokuwiki__footer > .pad {
-    font-size: 0.875em;
-}
-
-#dokuwiki__footer div.license {
-    margin-bottom: 0.5em;
-    font-size: 100%;
-}
-
-[dir=rtl] #dokuwiki__footer .license img {
-    margin: 0 0 0 .5em;
-}
-
-#dokuwiki__footer div.buttons a img {
-    opacity: 0.5;
-}
-#dokuwiki__footer div.buttons a:hover img,
-#dokuwiki__footer div.buttons a:active img,
-#dokuwiki__footer div.buttons a:focus img {
-    opacity: 1;
-}
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
new file mode 100644
index 000000000..457414839
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -0,0 +1,405 @@
+/**
+ * This file provides the main design styles for the
+ * bits that surround the content.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Clarence Lee <clarencedglee@gmail.com>
+ */
+
+/* header
+********************************************************************/
+
+#dokuwiki__header {
+    padding: 2em 0 1.5em;
+}
+
+#dokuwiki__header .headings,
+#dokuwiki__header .tools {
+    margin-bottom: 1.5em;
+    width: 49%;
+}
+#dokuwiki__header h1 img {
+    float: left;
+    margin-right: .5em;
+}
+[dir=rtl] #dokuwiki__header h1 img {
+    float: right;
+    margin-left: .5em;
+    margin-right: 0;
+}
+#dokuwiki__header h1 span {
+    display: block;
+    padding-top: 10px;
+}
+#dokuwiki__header h1 {
+    margin: 0;
+    font-size: 1.5em;
+    font-weight: normal;
+}
+#dokuwiki__header h1 a {
+    text-decoration: none;
+    color: __text__;
+    background-color: inherit;
+}
+#dokuwiki__header h1 a:hover,
+#dokuwiki__header h1 a:active,
+#dokuwiki__header h1 a:focus {
+}
+#dokuwiki__header p.claim {
+    margin-bottom: 0;
+    font-size: 0.875em;
+}
+
+#dokuwiki__header .tools {
+    margin-top: .2em;
+}
+
+
+/* tools
+********************************************************************/
+
+/* highlight selected tool */
+.mode_admin a.action.admin,
+.mode_login a.action.login,
+.mode_register a.action.register,
+.mode_profile a.action.profile,
+.mode_recent a.action.recent,
+.mode_index a.action.index,
+.mode_media a.action.media,
+.mode_revisions a.action.revs,
+.mode_backlink a.action.backlink,
+.mode_subscribe a.action.subscribe {
+    font-weight: bold;
+}
+
+#dokuwiki__header .tools ul {
+    padding-left: 0;
+    margin-bottom: 0;
+}
+#dokuwiki__header .tools li {
+    font-size: 0.875em;
+    margin-left: 1em;
+    list-style: none;
+    display: inline;
+}
+[dir=rtl] #dokuwiki__header .tools li {
+    margin-right: 1em;
+    margin-left: 0;
+}
+#dokuwiki__header .tools form.search div.ajax_qsearch li {
+    font-size: 1em;
+    margin-left: 0;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#dokuwiki__usertools a.action {
+    padding-left: 20px;
+    background: transparent url(images/usertools.png) no-repeat 0 0;
+}
+[dir=rtl] #dokuwiki__usertools a.action {
+    padding-left: 0;
+    padding-right: 20px;
+}
+[dir=rtl] #IE7 #dokuwiki__usertools a.action {
+    display: inline-block;
+}
+
+
+#dokuwiki__header .mobileTools {
+    display: none; /* hide mobile tools dropdown to only show in mobile view */
+}
+
+/*____________ user tools ____________*/
+
+#dokuwiki__usertools {
+    position: absolute;
+    top: .5em;
+    right: .5em;
+    text-align: right;
+    width: 100%;
+}
+[dir=rtl] #dokuwiki__usertools {
+    text-align: left;
+    left: 40px;
+    right: auto;
+}
+#dokuwiki__usertools ul {
+    margin: 0 auto;
+    padding: 0;
+    max-width: __site_width__;
+}
+#dokuwiki__usertools ul li.user {
+}
+
+#dokuwiki__usertools a.action.admin {
+    background-position: left 0;
+}
+[dir=rtl] #dokuwiki__usertools a.action.admin {
+    background-position: right 0;
+}
+#dokuwiki__usertools a.action.profile {
+    background-position: left -32px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.profile {
+    background-position: right -32px;
+}
+#dokuwiki__usertools a.action.register {
+    background-position: left -64px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.register {
+    background-position: right -64px;
+}
+#dokuwiki__usertools a.action.login {
+    background-position: left -96px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.login {
+    background-position: right -96px;
+}
+#dokuwiki__usertools a.action.logout {
+    background-position: left -128px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.logout {
+    background-position: right -128px;
+}
+
+
+/*____________ site tools ____________*/
+
+#dokuwiki__sitetools {
+    text-align: right;
+}
+[dir=rtl] #dokuwiki__sitetools {
+    text-align: left;
+}
+
+#dokuwiki__sitetools form.search {
+    display: block;
+    font-size: 0.875em;
+    position: relative;
+}
+#IE7 #dokuwiki__sitetools form.search {
+    min-height: 1px;
+    z-index: 21;
+}
+#dokuwiki__sitetools form.search input.edit {
+    width: 18em;
+    padding: .35em 22px .35em .1em;
+}
+[dir=rtl] #dokuwiki__sitetools form.search input.edit {
+    padding: .35em .1em .35em 22px;
+}
+#dokuwiki__sitetools form.search input.button {
+    background: transparent url(images/search.png) no-repeat 0 0;
+    border-width: 0;
+    width: 19px;
+    height: 14px;
+    text-indent: -99999px;
+    margin-left: -20px;
+    box-shadow: none;
+    padding: 0;
+}
+[dir=rtl] #dokuwiki__sitetools form.search input.button {
+    background-position: 5px 0;
+    margin-left: 0;
+    margin-right: -20px;
+    position: relative;
+}
+
+#dokuwiki__sitetools ul {
+    margin-top: 0.5em;
+}
+#dokuwiki__sitetools li {
+}
+
+/*____________ breadcrumbs ____________*/
+
+.dokuwiki div.breadcrumbs {
+    border-top: 1px solid __border__;
+    border-bottom: 1px solid __background__;
+    margin-bottom: .5em;
+    font-size: 0.875em;
+    clear: both;
+}
+.dokuwiki div.breadcrumbs div {
+    padding: .1em .35em;
+}
+
+.dokuwiki div.breadcrumbs div:only-child {
+    border-top: 1px solid __background__;
+    border-bottom: 1px solid __border__;
+}
+.dokuwiki div.breadcrumbs div:first-child {
+    border-top: 1px solid __background__;
+}
+#IE7 .dokuwiki div.breadcrumbs div,
+#IE8 .dokuwiki div.breadcrumbs div {
+    border-bottom: 1px solid __border__;
+}
+.dokuwiki div.breadcrumbs div:last-child {
+    border-bottom: 1px solid __border__;
+}
+
+.dokuwiki div.breadcrumbs a {
+    color: __link__;
+    background-color: inherit;
+}
+.dokuwiki div.breadcrumbs .bcsep {
+    font-size: 0.75em;
+}
+
+
+/* sidebar
+********************************************************************/
+
+#dokuwiki__aside {
+}
+#dokuwiki__aside > .pad {
+    font-size: 0.875em;
+    overflow: hidden;
+    word-wrap: break-word;
+}
+
+/* make sidebar more condensed */
+
+#dokuwiki__aside h1 {
+    font-size: 1.714em;
+    margin-bottom: .292em;
+}
+#dokuwiki__aside h2 {
+    margin-bottom: .333em;
+}
+#dokuwiki__aside h3 {
+    margin-bottom: .444em;
+}
+#dokuwiki__aside h4 {
+    margin-bottom: .5em;
+}
+#dokuwiki__aside h5 {
+    margin-bottom: .5714em;
+}
+
+#dokuwiki__aside p,
+#dokuwiki__aside ul,
+#dokuwiki__aside ol,
+#dokuwiki__aside dl,
+#dokuwiki__aside pre,
+#dokuwiki__aside table,
+#dokuwiki__aside fieldset,
+#dokuwiki__aside hr,
+#dokuwiki__aside blockquote,
+#dokuwiki__aside address {
+    margin-bottom: .7em;
+}
+
+#dokuwiki__aside ul,
+#dokuwiki__aside ol {
+    padding-left: .5em;
+}
+[dir=rtl] #dokuwiki__aside ul,
+[dir=rtl] #dokuwiki__aside ol {
+    padding-right: .5em;
+}
+#dokuwiki__aside li ul,
+#dokuwiki__aside li ol {
+    margin-bottom: 0;
+    padding: 0;
+}
+
+#dokuwiki__aside a:link,
+#dokuwiki__aside a:visited {
+    color: __link__;
+    background-color: inherit;
+}
+
+
+/* content
+********************************************************************/
+
+#dokuwiki__content {
+}
+
+.dokuwiki .pageId {
+    position: absolute;
+    top: -2.3em;
+    right: -1em;
+    overflow: hidden;
+    padding: 1em 1em 0;
+}
+[dir=rtl] .dokuwiki .pageId {
+    right: auto;
+    left: -1em;
+}
+.dokuwiki .pageId span {
+    font-size: 0.875em;
+    border: solid __background_alt__;
+    border-width: 1px 1px 0;
+    background-color: __background__;
+    color: __text_alt__;
+    padding: .1em .35em;
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    box-shadow: 0 0 .5em __text_alt__;
+    display: block;
+}
+
+.dokuwiki div.page {
+    background: __background__;
+    color: inherit;
+    border: 1px solid __background_alt__;
+    box-shadow: 0 0 .5em __text_alt__;
+    border-radius: 2px;
+    padding: 1.556em 2em 2em;
+    margin-bottom: .5em;
+    overflow: hidden;
+    word-wrap: break-word;
+}
+
+.dokuwiki .docInfo {
+    font-size: 0.875em;
+    text-align: right;
+}
+[dir=rtl] .dokuwiki .docInfo {
+    text-align: left;
+}
+
+/* license note under edit window */
+.dokuwiki div.license {
+    font-size: 93.75%;
+}
+
+
+/* footer
+********************************************************************/
+
+.dokuwiki .wrapper {
+    margin-bottom: 1.4em;
+}
+
+#dokuwiki__footer {
+    margin-bottom: 1em;
+    text-align: center;
+}
+#dokuwiki__footer > .pad {
+    font-size: 0.875em;
+}
+
+#dokuwiki__footer div.license {
+    margin-bottom: 0.5em;
+    font-size: 100%;
+}
+
+[dir=rtl] #dokuwiki__footer .license img {
+    margin: 0 0 0 .5em;
+}
+
+#dokuwiki__footer div.buttons a img {
+    opacity: 0.5;
+}
+#dokuwiki__footer div.buttons a:hover img,
+#dokuwiki__footer div.buttons a:active img,
+#dokuwiki__footer div.buttons a:focus img {
+    opacity: 1;
+}
-- 
cgit v1.2.3


From c19c611efcf1cdfe0c1798defdda02809fb19be9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 12:09:59 +0200
Subject: lessyfied the first of template's CSS files

---
 lib/tpl/dokuwiki/css/design.less | 582 +++++++++++++++++++++------------------
 lib/tpl/dokuwiki/style.ini       |   2 +-
 2 files changed, 311 insertions(+), 273 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 457414839..aba9c9c7b 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -12,49 +12,49 @@
 
 #dokuwiki__header {
     padding: 2em 0 1.5em;
-}
 
-#dokuwiki__header .headings,
-#dokuwiki__header .tools {
-    margin-bottom: 1.5em;
-    width: 49%;
-}
-#dokuwiki__header h1 img {
-    float: left;
-    margin-right: .5em;
+    .headings,
+    .tools {
+        margin-bottom: 1.5em;
+        width: 49%;
+    }
+    .tools {
+        margin-top: .2em;
+    }
+
+    h1 {
+        margin: 0;
+        font-size: 1.5em;
+        font-weight: normal;
+
+        img {
+            float: left;
+            margin-right: .5em;
+        }
+
+        span {
+            display: block;
+            padding-top: 10px;
+        }
+
+        a {
+            text-decoration: none;
+            color: @ini_text;
+            background-color: inherit;
+        }
+    }
+
+    p.claim {
+        margin-bottom: 0;
+        font-size: 0.875em;
+    }
 }
+
 [dir=rtl] #dokuwiki__header h1 img {
     float: right;
     margin-left: .5em;
     margin-right: 0;
 }
-#dokuwiki__header h1 span {
-    display: block;
-    padding-top: 10px;
-}
-#dokuwiki__header h1 {
-    margin: 0;
-    font-size: 1.5em;
-    font-weight: normal;
-}
-#dokuwiki__header h1 a {
-    text-decoration: none;
-    color: __text__;
-    background-color: inherit;
-}
-#dokuwiki__header h1 a:hover,
-#dokuwiki__header h1 a:active,
-#dokuwiki__header h1 a:focus {
-}
-#dokuwiki__header p.claim {
-    margin-bottom: 0;
-    font-size: 0.875em;
-}
-
-#dokuwiki__header .tools {
-    margin-top: .2em;
-}
-
 
 /* tools
 ********************************************************************/
@@ -73,41 +73,49 @@
     font-weight: bold;
 }
 
-#dokuwiki__header .tools ul {
-    padding-left: 0;
-    margin-bottom: 0;
-}
-#dokuwiki__header .tools li {
-    font-size: 0.875em;
-    margin-left: 1em;
-    list-style: none;
-    display: inline;
+#dokuwiki__header .tools {
+    ul {
+        padding-left: 0;
+        margin-bottom: 0;
+    }
+
+    li {
+        font-size: 0.875em;
+        margin-left: 1em;
+        list-style: none;
+        display: inline;
+    }
+
+    form.search div.ajax_qsearch li {
+        font-size: 1em;
+        margin-left: 0;
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 }
+
 [dir=rtl] #dokuwiki__header .tools li {
     margin-right: 1em;
     margin-left: 0;
 }
-#dokuwiki__header .tools form.search div.ajax_qsearch li {
-    font-size: 1em;
-    margin-left: 0;
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
 
-#dokuwiki__usertools a.action {
-    padding-left: 20px;
-    background: transparent url(images/usertools.png) no-repeat 0 0;
+#dokuwiki__usertools {
+    a.action {
+        padding-left: 20px;
+        background: transparent url(images/usertools.png) no-repeat 0 0;
+    }
 }
+
 [dir=rtl] #dokuwiki__usertools a.action {
     padding-left: 0;
     padding-right: 20px;
 }
+
 [dir=rtl] #IE7 #dokuwiki__usertools a.action {
     display: inline-block;
 }
 
-
 #dokuwiki__header .mobileTools {
     display: none; /* hide mobile tools dropdown to only show in mobile view */
 }
@@ -120,257 +128,285 @@
     right: .5em;
     text-align: right;
     width: 100%;
+
+    ul {
+        margin: 0 auto;
+        padding: 0;
+        max-width: @ini_site_width;
+    }
+
+    a.action.admin {
+        background-position: left 0;
+    }
+
+    a.action.profile {
+        background-position: left -32px;
+    }
+
+    a.action.register {
+        background-position: left -64px;
+    }
+
+    a.action.login {
+        background-position: left -96px;
+    }
+
+    a.action.logout {
+        background-position: left -128px;
+    }
 }
+
 [dir=rtl] #dokuwiki__usertools {
     text-align: left;
     left: 40px;
     right: auto;
-}
-#dokuwiki__usertools ul {
-    margin: 0 auto;
-    padding: 0;
-    max-width: __site_width__;
-}
-#dokuwiki__usertools ul li.user {
-}
 
-#dokuwiki__usertools a.action.admin {
-    background-position: left 0;
-}
-[dir=rtl] #dokuwiki__usertools a.action.admin {
-    background-position: right 0;
-}
-#dokuwiki__usertools a.action.profile {
-    background-position: left -32px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.profile {
-    background-position: right -32px;
-}
-#dokuwiki__usertools a.action.register {
-    background-position: left -64px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.register {
-    background-position: right -64px;
-}
-#dokuwiki__usertools a.action.login {
-    background-position: left -96px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.login {
-    background-position: right -96px;
-}
-#dokuwiki__usertools a.action.logout {
-    background-position: left -128px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.logout {
-    background-position: right -128px;
-}
+    a.action.admin {
+        background-position: right 0;
+    }
+
+    a.action.profile {
+        background-position: right -32px;
+    }
 
+    a.action.register {
+        background-position: right -64px;
+    }
+
+    a.action.login {
+        background-position: right -96px;
+    }
+
+    a.action.logout {
+        background-position: right -128px;
+    }
+}
 
 /*____________ site tools ____________*/
 
 #dokuwiki__sitetools {
     text-align: right;
+
+    form.search {
+        display: block;
+        font-size: 0.875em;
+        position: relative;
+
+        input.edit {
+            width: 18em;
+            padding: .35em 22px .35em .1em;
+        }
+
+        input.button {
+            background: transparent url(images/search.png) no-repeat 0 0;
+            border-width: 0;
+            width: 19px;
+            height: 14px;
+            text-indent: -99999px;
+            margin-left: -20px;
+            box-shadow: none;
+            padding: 0;
+        }
+    }
+
+    ul {
+        margin-top: 0.5em;
+    }
 }
+
 [dir=rtl] #dokuwiki__sitetools {
     text-align: left;
-}
 
-#dokuwiki__sitetools form.search {
-    display: block;
-    font-size: 0.875em;
-    position: relative;
+    form.search {
+        input.edit {
+            padding: .35em .1em .35em 22px;
+        }
+
+        input.button {
+            background-position: 5px 0;
+            margin-left: 0;
+            margin-right: -20px;
+            position: relative;
+        }
+    }
 }
+
 #IE7 #dokuwiki__sitetools form.search {
     min-height: 1px;
     z-index: 21;
 }
-#dokuwiki__sitetools form.search input.edit {
-    width: 18em;
-    padding: .35em 22px .35em .1em;
-}
-[dir=rtl] #dokuwiki__sitetools form.search input.edit {
-    padding: .35em .1em .35em 22px;
-}
-#dokuwiki__sitetools form.search input.button {
-    background: transparent url(images/search.png) no-repeat 0 0;
-    border-width: 0;
-    width: 19px;
-    height: 14px;
-    text-indent: -99999px;
-    margin-left: -20px;
-    box-shadow: none;
-    padding: 0;
-}
-[dir=rtl] #dokuwiki__sitetools form.search input.button {
-    background-position: 5px 0;
-    margin-left: 0;
-    margin-right: -20px;
-    position: relative;
-}
-
-#dokuwiki__sitetools ul {
-    margin-top: 0.5em;
-}
-#dokuwiki__sitetools li {
-}
 
 /*____________ breadcrumbs ____________*/
 
 .dokuwiki div.breadcrumbs {
-    border-top: 1px solid __border__;
-    border-bottom: 1px solid __background__;
+    border-top: 1px solid @ini_border;
+    border-bottom: 1px solid @ini_background;
     margin-bottom: .5em;
     font-size: 0.875em;
     clear: both;
-}
-.dokuwiki div.breadcrumbs div {
-    padding: .1em .35em;
-}
 
-.dokuwiki div.breadcrumbs div:only-child {
-    border-top: 1px solid __background__;
-    border-bottom: 1px solid __border__;
-}
-.dokuwiki div.breadcrumbs div:first-child {
-    border-top: 1px solid __background__;
+    div {
+        padding: .1em .35em;
+    }
+
+    div:only-child {
+        border-top: 1px solid @ini_background;
+        border-bottom: 1px solid @ini_border;
+    }
+
+    div:first-child {
+        border-top: 1px solid @ini_background;
+    }
+
+    div:last-child {
+        border-bottom: 1px solid @ini_border;
+    }
+
+    a {
+        color: @ini_link;
+        background-color: inherit;
+    }
+
+    .bcsep {
+        font-size: 0.75em;
+    }
 }
+
 #IE7 .dokuwiki div.breadcrumbs div,
 #IE8 .dokuwiki div.breadcrumbs div {
-    border-bottom: 1px solid __border__;
-}
-.dokuwiki div.breadcrumbs div:last-child {
-    border-bottom: 1px solid __border__;
-}
-
-.dokuwiki div.breadcrumbs a {
-    color: __link__;
-    background-color: inherit;
-}
-.dokuwiki div.breadcrumbs .bcsep {
-    font-size: 0.75em;
+    border-bottom: 1px solid @ini_border;
 }
 
-
 /* sidebar
 ********************************************************************/
 
 #dokuwiki__aside {
-}
-#dokuwiki__aside > .pad {
-    font-size: 0.875em;
-    overflow: hidden;
-    word-wrap: break-word;
-}
 
-/* make sidebar more condensed */
-
-#dokuwiki__aside h1 {
-    font-size: 1.714em;
-    margin-bottom: .292em;
-}
-#dokuwiki__aside h2 {
-    margin-bottom: .333em;
-}
-#dokuwiki__aside h3 {
-    margin-bottom: .444em;
-}
-#dokuwiki__aside h4 {
-    margin-bottom: .5em;
-}
-#dokuwiki__aside h5 {
-    margin-bottom: .5714em;
-}
-
-#dokuwiki__aside p,
-#dokuwiki__aside ul,
-#dokuwiki__aside ol,
-#dokuwiki__aside dl,
-#dokuwiki__aside pre,
-#dokuwiki__aside table,
-#dokuwiki__aside fieldset,
-#dokuwiki__aside hr,
-#dokuwiki__aside blockquote,
-#dokuwiki__aside address {
-    margin-bottom: .7em;
+    > .pad {
+        font-size: 0.875em;
+        overflow: hidden;
+        word-wrap: break-word;
+    }
+
+    /* make sidebar more condensed */
+
+    h1 {
+        font-size: 1.714em;
+        margin-bottom: .292em;
+    }
+
+    h2 {
+        margin-bottom: .333em;
+    }
+
+    h3 {
+        margin-bottom: .444em;
+    }
+
+    h4 {
+        margin-bottom: .5em;
+    }
+
+    h5 {
+        margin-bottom: .5714em;
+    }
+
+    p,
+    ul,
+    ol,
+    dl,
+    pre,
+    table,
+    fieldset,
+    hr,
+    blockquote,
+    address {
+        margin-bottom: .7em;
+    }
+
+    ul,
+    ol {
+        padding-left: .5em;
+    }
+
+    li ul,
+    li ol {
+        margin-bottom: 0;
+        padding: 0;
+    }
+
+    a:link,
+    a:visited {
+        color: @ini_link;
+        background-color: inherit;
+    }
 }
 
-#dokuwiki__aside ul,
-#dokuwiki__aside ol {
-    padding-left: .5em;
-}
 [dir=rtl] #dokuwiki__aside ul,
 [dir=rtl] #dokuwiki__aside ol {
     padding-right: .5em;
 }
-#dokuwiki__aside li ul,
-#dokuwiki__aside li ol {
-    margin-bottom: 0;
-    padding: 0;
-}
-
-#dokuwiki__aside a:link,
-#dokuwiki__aside a:visited {
-    color: __link__;
-    background-color: inherit;
-}
-
 
 /* content
 ********************************************************************/
 
-#dokuwiki__content {
-}
-
-.dokuwiki .pageId {
-    position: absolute;
-    top: -2.3em;
-    right: -1em;
-    overflow: hidden;
-    padding: 1em 1em 0;
-}
-[dir=rtl] .dokuwiki .pageId {
-    right: auto;
-    left: -1em;
-}
-.dokuwiki .pageId span {
-    font-size: 0.875em;
-    border: solid __background_alt__;
-    border-width: 1px 1px 0;
-    background-color: __background__;
-    color: __text_alt__;
-    padding: .1em .35em;
-    border-top-left-radius: 2px;
-    border-top-right-radius: 2px;
-    box-shadow: 0 0 .5em __text_alt__;
-    display: block;
-}
-
-.dokuwiki div.page {
-    background: __background__;
-    color: inherit;
-    border: 1px solid __background_alt__;
-    box-shadow: 0 0 .5em __text_alt__;
-    border-radius: 2px;
-    padding: 1.556em 2em 2em;
-    margin-bottom: .5em;
-    overflow: hidden;
-    word-wrap: break-word;
-}
-
-.dokuwiki .docInfo {
-    font-size: 0.875em;
-    text-align: right;
-}
-[dir=rtl] .dokuwiki .docInfo {
-    text-align: left;
-}
-
-/* license note under edit window */
-.dokuwiki div.license {
-    font-size: 93.75%;
+.dokuwiki {
+
+    .pageId {
+        position: absolute;
+        top: -2.3em;
+        right: -1em;
+        overflow: hidden;
+        padding: 1em 1em 0;
+    }
+
+    .pageId span {
+        font-size: 0.875em;
+        border: solid @ini_background_alt;
+        border-width: 1px 1px 0;
+        background-color: @ini_background;
+        color: @ini_text_alt;
+        padding: .1em .35em;
+        border-top-left-radius: 2px;
+        border-top-right-radius: 2px;
+        box-shadow: 0 0 .5em @ini_text_alt;
+        display: block;
+    }
+
+    div.page {
+        background: @ini_background;
+        color: inherit;
+        border: 1px solid @ini_background_alt;
+        box-shadow: 0 0 .5em @ini_text_alt;
+        border-radius: 2px;
+        padding: 1.556em 2em 2em;
+        margin-bottom: .5em;
+        overflow: hidden;
+        word-wrap: break-word;
+    }
+
+    .docInfo {
+        font-size: 0.875em;
+        text-align: right;
+    }
+
+    /* license note under edit window */
+    div.license {
+        font-size: 93.75%;
+    }
+}
+
+[dir=rtl] .dokuwiki {
+    .docInfo {
+        text-align: left;
+    }
+
+    .pageId {
+        right: auto;
+        left: -1em;
+    }
 }
 
-
 /* footer
 ********************************************************************/
 
@@ -381,25 +417,27 @@
 #dokuwiki__footer {
     margin-bottom: 1em;
     text-align: center;
-}
-#dokuwiki__footer > .pad {
-    font-size: 0.875em;
-}
 
-#dokuwiki__footer div.license {
-    margin-bottom: 0.5em;
-    font-size: 100%;
+    > .pad {
+        font-size: 0.875em;
+    }
+
+    div.license {
+        margin-bottom: 0.5em;
+        font-size: 100%;
+    }
+
+    div.buttons a img {
+        opacity: 0.5;
+    }
+
+    div.buttons a:hover img,
+    div.buttons a:active img,
+    div.buttons a:focus img {
+        opacity: 1;
+    }
 }
 
 [dir=rtl] #dokuwiki__footer .license img {
     margin: 0 0 0 .5em;
 }
-
-#dokuwiki__footer div.buttons a img {
-    opacity: 0.5;
-}
-#dokuwiki__footer div.buttons a:hover img,
-#dokuwiki__footer div.buttons a:active img,
-#dokuwiki__footer div.buttons a:focus img {
-    opacity: 1;
-}
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 77bb98236..e4725a4fd 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -29,7 +29,7 @@ css/_modal.css            = screen
 css/_forms.css            = screen
 css/_admin.css            = screen
 css/structure.css         = screen
-css/design.css            = screen
+css/design.less           = screen
 css/pagetools.css         = screen
 css/content.css           = screen
 css/includes.css          = screen
-- 
cgit v1.2.3


From bd9a4965eaaebb5de8ad1c502d2af32c6897e6f1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 13:24:13 +0200
Subject: lessyfied another one

---
 lib/tpl/dokuwiki/css/content.css  | 362 -----------------------------------
 lib/tpl/dokuwiki/css/content.less | 391 ++++++++++++++++++++++++++++++++++++++
 lib/tpl/dokuwiki/css/mixins.less  |  15 ++
 lib/tpl/dokuwiki/style.ini        |   2 +
 4 files changed, 408 insertions(+), 362 deletions(-)
 delete mode 100644 lib/tpl/dokuwiki/css/content.css
 create mode 100644 lib/tpl/dokuwiki/css/content.less
 create mode 100644 lib/tpl/dokuwiki/css/mixins.less

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
deleted file mode 100644
index b1498d4de..000000000
--- a/lib/tpl/dokuwiki/css/content.css
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * This file provides the main design styles for the page content.
- *
- * @author Anika Henke <anika@selfthinker.org>
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Clarence Lee <clarencedglee@gmail.com>
- */
-
-/*____________ section indenting ____________
-
-.dokuwiki .page  h1 {margin-left: 0;}
-.dokuwiki .page  h2 {margin-left: .666em;}
-.dokuwiki .page  h3 {margin-left: 1.776em;}
-.dokuwiki .page  h4 {margin-left: 3em;}
-.dokuwiki .page  h5 {margin-left: 4.5712em;}
-.dokuwiki .page  div.level1 {margin-left: 0;}
-.dokuwiki .page  div.level2 {margin-left: 1em;}
-.dokuwiki .page  div.level3 {margin-left: 2em;}
-.dokuwiki .page  div.level4 {margin-left: 3em;}
-.dokuwiki .page  div.level5 {margin-left: 4em;}
-
-[dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;}
-[dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;}
-[dir=rtl] .dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;}
-[dir=rtl] .dokuwiki .page h4 {margin-left: 0; margin-right: 3em;}
-[dir=rtl] .dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;}
-[dir=rtl] .dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;}
-[dir=rtl] .dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;}
-[dir=rtl] .dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;}
-[dir=rtl] .dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;}
-[dir=rtl] .dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;}
-*/
-/* hx margin-left = (1 / font-size) * .levelx-margin */
-
-
-/*____________ links to wiki pages (addition to _links) ____________*/
-
-/* existing wikipage */
-.dokuwiki a.wikilink1 {
-    color: __existing__;
-    background-color: inherit;
-}
-/* not existing wikipage */
-.dokuwiki a.wikilink2 {
-    color: __missing__;
-    background-color: inherit;
-}
-
-
-/*____________ images ____________*/
-
-/* embedded images (styles are already partly set in lib/styles/all.css) */
-.dokuwiki img.media {
-    margin: .2em 0;
-}
-.dokuwiki img.medialeft {
-    margin: .2em 1em .2em 0;
-}
-.dokuwiki img.mediaright {
-    margin: .2em 0 .2em 1em;
-}
-.dokuwiki img.mediacenter {
-    margin: .2em auto;
-}
-
-
-/*____________ lists ____________*/
-
-#dokuwiki__content ul li,
-#dokuwiki__aside ul li {
-    color: __text_alt__;
-}
-#dokuwiki__content ol li,
-#dokuwiki__aside ol li {
-    color: __text_neu__;
-}
-#dokuwiki__content li .li,
-#dokuwiki__aside li .li {
-    color: __text__;
-}
-
-
-/*____________ tables ____________*/
-
-/* div around each table */
-.dokuwiki div.table {
-    overflow-x: auto;
-    margin-bottom: 1.4em;
-}
-.dokuwiki div.table table {
-    margin-bottom: 0;
-}
-
-.dokuwiki table.inline {
-    min-width: 50%;
-}
-.dokuwiki table.inline tr:hover td {
-    background-color: __background_alt__;
-}
-.dokuwiki table.inline tr:hover th {
-    background-color: __border__;
-}
-
-
-/*____________ code ____________*/
-
-/* fix if background-color hides underlining */
-.dokuwiki em.u code {
-    text-decoration: underline;
-}
-
-/* for code in <file> */
-.dokuwiki pre.file {
-}
-
-/* filenames for downloadable file and code blocks */
-.dokuwiki dl.code,
-.dokuwiki dl.file {
-}
-
-.dokuwiki dl.code dt,
-.dokuwiki dl.file dt {
-    background-color: __background_site__;
-    background: -moz-linear-gradient(   top, __background_alt__ 0%, __background_site__ 100%);
-    background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%);
-    background: -o-linear-gradient(     top, __background_alt__ 0%, __background_site__ 100%);
-    background: -ms-linear-gradient(    top, __background_alt__ 0%, __background_site__ 100%);
-    background: linear-gradient(        top, __background_alt__ 0%, __background_site__ 100%);
-    color: inherit;
-    border: 1px solid __border__;
-    border-bottom-color: __background_site__;
-    border-top-left-radius: .3em;
-    border-top-right-radius: .3em;
-    padding: .3em .6em .1em;
-    margin-bottom: -1px;
-    float: left;
-}
-[dir=rtl] .dokuwiki dl.code dt,
-[dir=rtl] .dokuwiki dl.file dt {
-    float: right;
-}
-.dokuwiki dl.code dt a,
-.dokuwiki dl.file dt a {
-    background-color: transparent;
-    font-size: 0.875em;
-    font-weight: normal;
-    display: block;
-    min-height: 16px;
-}
-
-.dokuwiki dl.code dd,
-.dokuwiki dl.file dd {
-    margin: 0;
-    clear: left;
-    min-height: 1px; /* for IE7 */
-}
-[dir=rtl] .dokuwiki dl.code dd,
-[dir=rtl] .dokuwiki dl.file dd {
-    clear: right;
-}
-
-.dokuwiki dl.code pre,
-.dokuwiki dl.file pre {
-    box-shadow: inset -4px -4px .5em -.3em __border__;
-}
-
-
-/*____________ JS popup ____________*/
-
-.JSpopup {
-    background-color: __background__;
-    color: __text__;
-    border: 1px solid __border__;
-    box-shadow: .1em .1em .1em __border__;
-    border-radius: 2px;
-    padding: .3em .5em;
-    font-size: .9em;
-}
-.dokuwiki form.search div.ajax_qsearch {
-    top: -.35em;
-    font-size: 1em;
-    text-overflow: ellipsis;
-}
-
-.JSpopup ul,
-.JSpopup ol {
-    padding-left: 0;
-}
-[dir=rtl] .JSpopup ul,
-[dir=rtl] .JSpopup ol {
-    padding-right: 0;
-}
-
-
-/* changes to underscored CSS files
-********************************************************************/
-
-#acl__tree li {
-    margin: 0;
-}
-
-#dokuwiki__content span.curid a {
-    font-weight: normal;
-}
-#dokuwiki__content strong span.curid a {
-    font-weight: bold;
-}
-
-
-/*____________ changes to _edit ____________*/
-
-.dokuwiki div.toolbar button.toolbutton {
-    border-radius: 0;
-    border-left-width: 0;
-    padding: .1em .35em;
-}
-.dokuwiki div.toolbar button.toolbutton:first-child {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-left-width: 1px;
-}
-[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-left-width: 0;
-    border-right-width: 1px;
-}
-.dokuwiki div.toolbar button.toolbutton:last-child {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}
-[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-left-width: 1px;
-}
-
-.dokuwiki div.section_highlight {
-    margin: 0 -2em;
-    padding: 0 1em;
-    border-width: 0 1em;
-}
-
-.dokuwiki textarea.edit {
-    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
-}
-
-.dokuwiki div.preview {
-    margin: 0 -2em;
-    padding: 0 2em;
-}
-.dokuwiki.hasSidebar div.preview {
-    border-right: __sidebar_width__ solid __background_alt__;
-}
-[dir=rtl] .dokuwiki.hasSidebar div.preview {
-    border-right-width: 0;
-    border-left: __sidebar_width__ solid __background_alt__;
-}
-.dokuwiki div.preview div.pad {
-    padding: 1.556em 0 2em;
-}
-
-
-/*____________ changes to _toc ____________*/
-
-#dw__toc {
-    margin:  -1.556em -2em .5em 1.4em;
-    width: __sidebar_width__;
-    border-left: 1px solid __border__;
-    background: __background__;
-    color: inherit;
-}
-[dir=rtl] #dw__toc {
-    margin: -1.556em 1.4em .5em -2em;
-    border-left-width: 0;
-    border-right: 1px solid __border__;
-}
-
-.dokuwiki h3.toggle {
-    padding: .5em 1em;
-    margin-bottom: 0;
-    font-size: .875em;
-    letter-spacing: .1em;
-}
-#dokuwiki__aside h3.toggle {
-    display: none;
-}
-
-.dokuwiki .toggle strong {
-    background: transparent url(images/toc-arrows.png) 0 0;
-    width: 8px;
-    height: 5px;
-    margin: .4em 0 0;
-}
-.dokuwiki .toggle.closed strong {
-    background-position: 0 -5px;
-}
-
-.dokuwiki .toggle strong span {
-    display: none;
-}
-
-
-#dw__toc > div {
-    font-size: 0.875em;
-    padding: .5em 1em 1em;
-}
-#dw__toc ul {
-    padding: 0 0 0 1.2em;
-}
-[dir=rtl] #dw__toc ul {
-    padding: 0 1.5em 0 0;
-}
-#dw__toc ul li {
-    list-style-image: url(images/toc-bullet.png);
-}
-#dw__toc ul li.clear {
-    list-style: none;
-}
-#dw__toc ul li div.li {
-    padding: .2em 0;
-}
-
-
-/*____________ changes to _imgdetail ____________*/
-
-#dokuwiki__detail {
-    padding: 0;
-}
-#dokuwiki__detail img {
-    float: none;
-    margin-bottom: 1.4em;
-}
-#dokuwiki__detail div.img_detail {
-    float: none;
-}
-
-#dokuwiki__detail div.img_detail dl {
-    overflow: hidden;
-}
-#dokuwiki__detail div.img_detail dl dt {
-    float: left;
-    width: 9em;
-    text-align: right;
-    clear: left;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dt {
-    float: right;
-    text-align: left;
-    clear: right;
-}
-#dokuwiki__detail div.img_detail dl dd {
-    margin-left: 9.5em;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dd {
-    margin-left: 0;
-    margin-right: 9.5em;
-}
diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
new file mode 100644
index 000000000..f6022b4e9
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -0,0 +1,391 @@
+/**
+ * This file provides the main design styles for the page content.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Clarence Lee <clarencedglee@gmail.com>
+ */
+
+/*____________ section indenting ____________
+
+.dokuwiki .page  h1 {margin-left: 0;}
+.dokuwiki .page  h2 {margin-left: .666em;}
+.dokuwiki .page  h3 {margin-left: 1.776em;}
+.dokuwiki .page  h4 {margin-left: 3em;}
+.dokuwiki .page  h5 {margin-left: 4.5712em;}
+.dokuwiki .page  div.level1 {margin-left: 0;}
+.dokuwiki .page  div.level2 {margin-left: 1em;}
+.dokuwiki .page  div.level3 {margin-left: 2em;}
+.dokuwiki .page  div.level4 {margin-left: 3em;}
+.dokuwiki .page  div.level5 {margin-left: 4em;}
+
+[dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;}
+[dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;}
+[dir=rtl] .dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;}
+[dir=rtl] .dokuwiki .page h4 {margin-left: 0; margin-right: 3em;}
+[dir=rtl] .dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;}
+[dir=rtl] .dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;}
+[dir=rtl] .dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;}
+[dir=rtl] .dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;}
+[dir=rtl] .dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;}
+[dir=rtl] .dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;}
+*/
+/* hx margin-left = (1 / font-size) * .levelx-margin */
+
+/*____________ links to wiki pages (addition to _links) ____________*/
+
+/* existing wikipage */
+.dokuwiki a.wikilink1 {
+    color: @ini_existing;
+    background-color: inherit;
+}
+
+/* not existing wikipage */
+.dokuwiki a.wikilink2 {
+    color: @ini_missing;
+    background-color: inherit;
+}
+
+/*____________ images ____________*/
+
+/* embedded images (styles are already partly set in lib/styles/all.css) */
+.dokuwiki img.media {
+    margin: .2em 0;
+}
+
+.dokuwiki img.medialeft {
+    margin: .2em 1em .2em 0;
+}
+
+.dokuwiki img.mediaright {
+    margin: .2em 0 .2em 1em;
+}
+
+.dokuwiki img.mediacenter {
+    margin: .2em auto;
+}
+
+/*____________ lists ____________*/
+
+#dokuwiki__content ul li,
+#dokuwiki__aside ul li {
+    color: @ini_text_alt;
+}
+
+#dokuwiki__content ol li,
+#dokuwiki__aside ol li {
+    color: @ini_text_neu;
+}
+
+#dokuwiki__content li .li,
+#dokuwiki__aside li .li {
+    color: @ini_text;
+}
+
+/*____________ tables ____________*/
+
+/* div around each table */
+.dokuwiki div.table {
+    overflow-x: auto;
+    margin-bottom: 1.4em;
+}
+
+.dokuwiki div.table table {
+    margin-bottom: 0;
+}
+
+.dokuwiki table.inline {
+    min-width: 50%;
+}
+
+.dokuwiki table.inline tr:hover td {
+    background-color: @ini_background_alt;
+}
+
+.dokuwiki table.inline tr:hover th {
+    background-color: @ini_border;
+}
+
+/*____________ code ____________*/
+
+/* fix if background-color hides underlining */
+.dokuwiki em.u code {
+    text-decoration: underline;
+}
+
+/* for code in <file> */
+.dokuwiki pre.file {
+}
+
+/* filenames for downloadable file and code blocks */
+.dokuwiki dl.code,
+.dokuwiki dl.file {
+    dt,
+    dt {
+        .linear-gradient(@ini_background_site, @ini_background_alt, @ini_background_site);
+        color: inherit;
+        border: 1px solid @ini_border;
+        border-bottom-color: @ini_background_site;
+        border-top-left-radius: .3em;
+        border-top-right-radius: .3em;
+        padding: .3em .6em .1em;
+        margin-bottom: -1px;
+        float: left;
+    }
+    dt a,
+    dt a {
+        background-color: transparent;
+        font-size: 0.875em;
+        font-weight: normal;
+        display: block;
+        min-height: 16px;
+    }
+
+    dd,
+    dd {
+        margin: 0;
+        clear: left;
+        min-height: 1px; /* for IE7 */
+    }
+
+    pre,
+    pre {
+        box-shadow: inset -4px -4px .5em -.3em @ini_border;
+    }
+}
+
+[dir=rtl] .dokuwiki dl.code,
+[dir=rtl] .dokuwiki dl.file {
+    dt,
+    dt {
+        float: right;
+    }
+
+    dd,
+    dd {
+        clear: right;
+    }
+}
+
+/*____________ JS popup ____________*/
+
+.JSpopup {
+    background-color: @ini_background;
+    color: @ini_text;
+    border: 1px solid @ini_border;
+    box-shadow: .1em .1em .1em @ini_border;
+    border-radius: 2px;
+    padding: .3em .5em;
+    font-size: .9em;
+}
+
+.dokuwiki form.search div.ajax_qsearch {
+    top: -.35em;
+    font-size: 1em;
+    text-overflow: ellipsis;
+}
+
+.JSpopup ul,
+.JSpopup ol {
+    padding-left: 0;
+}
+
+[dir=rtl] .JSpopup ul,
+[dir=rtl] .JSpopup ol {
+    padding-right: 0;
+}
+
+/* changes to underscored CSS files
+********************************************************************/
+
+#acl__tree li {
+    margin: 0;
+}
+
+#dokuwiki__content span.curid a {
+    font-weight: normal;
+}
+
+#dokuwiki__content strong span.curid a {
+    font-weight: bold;
+}
+
+/*____________ changes to _edit ____________*/
+
+.dokuwiki div.toolbar {
+    button.toolbutton {
+        border-radius: 0;
+        border-left-width: 0;
+        padding: .1em .35em;
+    }
+
+    button.toolbutton:first-child {
+        border-top-left-radius: 4px;
+        border-bottom-left-radius: 4px;
+        border-left-width: 1px;
+    }
+
+    button.toolbutton:last-child {
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+    }
+}
+
+[dir=rtl] .dokuwiki div.toolbar {
+    button.toolbutton:last-child {
+        border-top-left-radius: 4px;
+        border-bottom-left-radius: 4px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border-left-width: 1px;
+    }
+
+    button.toolbutton:first-child {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+        border-left-width: 0;
+        border-right-width: 1px;
+    }
+}
+
+.dokuwiki div.section_highlight {
+    margin: 0 -2em;
+    padding: 0 1em;
+    border-width: 0 1em;
+}
+
+.dokuwiki textarea.edit {
+    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
+}
+
+.dokuwiki div.preview {
+    margin: 0 -2em;
+    padding: 0 2em;
+}
+
+.dokuwiki.hasSidebar div.preview {
+    border-right: @ini_sidebar_width solid @ini_background_alt;
+}
+
+[dir=rtl] .dokuwiki.hasSidebar div.preview {
+    border-right-width: 0;
+    border-left: @ini_sidebar_width solid @ini_background_alt;
+}
+
+.dokuwiki div.preview div.pad {
+    padding: 1.556em 0 2em;
+}
+
+/*____________ changes to _toc ____________*/
+
+#dw__toc {
+    margin: -1.556em -2em .5em 1.4em;
+    width: @ini_sidebar_width;
+    border-left: 1px solid @ini_border;
+    background: @ini_background;
+    color: inherit;
+}
+
+[dir=rtl] #dw__toc {
+    margin: -1.556em 1.4em .5em -2em;
+    border-left-width: 0;
+    border-right: 1px solid @ini_border;
+}
+
+.dokuwiki h3.toggle {
+    padding: .5em 1em;
+    margin-bottom: 0;
+    font-size: .875em;
+    letter-spacing: .1em;
+}
+
+#dokuwiki__aside h3.toggle {
+    display: none;
+}
+
+.dokuwiki .toggle strong {
+    background: transparent url(images/toc-arrows.png) 0 0;
+    width: 8px;
+    height: 5px;
+    margin: .4em 0 0;
+}
+
+.dokuwiki .toggle.closed strong {
+    background-position: 0 -5px;
+}
+
+.dokuwiki .toggle strong span {
+    display: none;
+}
+
+#dw__toc {
+    > div {
+        font-size: 0.875em;
+        padding: .5em 1em 1em;
+    }
+
+    ul {
+        padding: 0 0 0 1.2em;
+    }
+
+    ul li {
+        list-style-image: url(images/toc-bullet.png);
+    }
+
+    ul li.clear {
+        list-style: none;
+    }
+
+    ul li div.li {
+        padding: .2em 0;
+    }
+}
+
+[dir=rtl] #dw__toc ul {
+    padding: 0 1.5em 0 0;
+}
+
+/*____________ changes to _imgdetail ____________*/
+
+#dokuwiki__detail {
+    padding: 0;
+
+    img {
+        float: none;
+        margin-bottom: 1.4em;
+    }
+
+    div.img_detail {
+        float: none;
+    }
+
+    div.img_detail dl {
+        overflow: hidden;
+    }
+
+    div.img_detail dl dt {
+        float: left;
+        width: 9em;
+        text-align: right;
+        clear: left;
+    }
+
+    div.img_detail dl dd {
+        margin-left: 9.5em;
+    }
+}
+
+[dir=rtl] #dokuwiki__detail div.img_detail {
+    dl dt {
+        float: right;
+        text-align: left;
+        clear: right;
+    }
+
+    dl dd {
+        margin-left: 0;
+        margin-right: 9.5em;
+    }
+}
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less
new file mode 100644
index 000000000..7ecae4a0b
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/mixins.less
@@ -0,0 +1,15 @@
+/**
+ * linear gradient x-browser support
+ *
+ * @param color fallback background color
+ * @param start start color
+ * @param stop  end color
+ */
+.linear-gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
+    background: @color;
+    background: -moz-linear-gradient(   top, @start 0%, @stop 100%);
+    background: -webkit-linear-gradient(top, @start 0%, @stop 100%);
+    background: -o-linear-gradient(     top, @start 0%, @stop 100%);
+    background: -ms-linear-gradient(    top, @start 0%, @stop 100%);
+    background: linear-gradient(        top, @start 0%, @stop 100%);
+}
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index e4725a4fd..9cf6cb64f 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -12,6 +12,8 @@
 
 [stylesheets]
 
+css/mixins.less           = screen
+
 css/basic.css             = screen
 css/_imgdetail.css        = screen
 css/_media_popup.css      = screen
-- 
cgit v1.2.3


From 45d3363005120ca17df1184280e1a9df0fddc062 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 14:48:06 +0200
Subject: lessified more files

---
 lib/tpl/dokuwiki/css/basic.css      | 468 ------------------------------------
 lib/tpl/dokuwiki/css/basic.less     | 460 +++++++++++++++++++++++++++++++++++
 lib/tpl/dokuwiki/css/content.less   |   3 +-
 lib/tpl/dokuwiki/css/includes.css   |   4 -
 lib/tpl/dokuwiki/css/mixins.less    |  17 +-
 lib/tpl/dokuwiki/css/mobile.css     | 288 ----------------------
 lib/tpl/dokuwiki/css/mobile.less    | 288 ++++++++++++++++++++++
 lib/tpl/dokuwiki/css/pagetools.css  | 421 --------------------------------
 lib/tpl/dokuwiki/css/pagetools.less | 421 ++++++++++++++++++++++++++++++++
 lib/tpl/dokuwiki/css/structure.css  |  81 -------
 lib/tpl/dokuwiki/css/structure.less |  94 ++++++++
 lib/tpl/dokuwiki/style.ini          |  14 +-
 12 files changed, 1280 insertions(+), 1279 deletions(-)
 delete mode 100644 lib/tpl/dokuwiki/css/basic.css
 create mode 100644 lib/tpl/dokuwiki/css/basic.less
 delete mode 100644 lib/tpl/dokuwiki/css/includes.css
 delete mode 100644 lib/tpl/dokuwiki/css/mobile.css
 create mode 100644 lib/tpl/dokuwiki/css/mobile.less
 delete mode 100644 lib/tpl/dokuwiki/css/pagetools.css
 create mode 100644 lib/tpl/dokuwiki/css/pagetools.less
 delete mode 100644 lib/tpl/dokuwiki/css/structure.css
 create mode 100644 lib/tpl/dokuwiki/css/structure.less

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
deleted file mode 100644
index ad04f7c41..000000000
--- a/lib/tpl/dokuwiki/css/basic.css
+++ /dev/null
@@ -1,468 +0,0 @@
-/**
- * This file provides the most basic styles.
- *
- * If you integrate DokuWiki into another project, you might either
- * want to integrate this file into the other project as well, or use
- * the other project's basic CSS for DokuWiki instead of this one.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-html {
-    overflow-x: auto;
-    overflow-y: scroll;
-}
-html,
-body {
-    color: __text__;
-    background: __background_site__ url(images/page-gradient.png) top left repeat-x;
-    margin: 0;
-    padding: 0;
-}
-body {
-    font: normal 87.5%/1.4 Arial, sans-serif;
-    /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */
-    -webkit-text-size-adjust: 100%;
-}
-
-
-/*____________ headers ____________*/
-
-caption,
-figcaption,
-summary,
-legend {
-    padding: 0;
-    margin: 0 0 .35em;
-    line-height: 1.2;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-    font-weight: bold;
-    padding: 0;
-    line-height: 1.2;
-    clear: left; /* ideally 'both', but problems with toc */
-}
-[dir=rtl] h1,
-[dir=rtl] h2,
-[dir=rtl] h3,
-[dir=rtl] h4,
-[dir=rtl] h5,
-[dir=rtl] h6 {
-    clear: right;
-}
-
-h1 {
-    font-size: 2em;
-    margin: 0 0 0.444em;
-}
-h2 {
-    font-size: 1.5em;
-    margin: 0 0 0.666em;
-}
-h3 {
-    font-size: 1.125em;
-    margin: 0 0 0.888em;
-}
-h4 {
-    font-size: 1em;
-    margin: 0 0 1.0em;
-}
-h5 {
-    font-size: .875em;
-    margin: 0 0 1.1428em;
-}
-h6 {
-    font-size: .75em;
-    margin: 0 0 1.333em;
-}
-/* bottom margin = 1 / font-size */
-
-
-/*____________ basic margins and paddings ____________*/
-
-p,
-ul,
-ol,
-dl,
-pre,
-table,
-hr,
-blockquote,
-figure,
-details,
-fieldset,
-address {
-    margin: 0 0 1.4em 0; /* bottom margin = line-height */
-    padding: 0;
-}
-
-div {
-    margin: 0;
-    padding: 0;
-}
-
-
-/*____________ lists ____________*/
-
-ul,
-ol {
-    padding: 0 0 0 1.5em;
-}
-[dir=rtl] ul,
-[dir=rtl] ol {
-    padding: 0 1.5em 0 0;
-}
-
-li,
-dd {
-    padding: 0;
-    margin: 0 0 0 1.5em;
-}
-[dir=rtl] li,
-[dir=rtl] dd {
-    margin: 0 1.5em 0 0;
-}
-dt {
-    font-weight: bold;
-    margin: 0;
-    padding: 0;
-}
-
-li ul,
-li ol,
-li dl,
-dl ul,
-dl ol,
-dl dl {
-    margin-bottom: 0;
-    padding: 0;
-}
-li li {
-    font-size: 100%;
-}
-
-ul             { list-style: square outside; }
-ol             { list-style: decimal outside; }
-ol ol          { list-style-type: lower-alpha; }
-ol ol ol       { list-style-type: upper-roman; }
-ol ol ol ol    { list-style-type: upper-alpha; }
-ol ol ol ol ol { list-style-type: lower-roman; }
-
-
-/*____________ tables ____________*/
-
-table {
-    border-collapse: collapse;
-    empty-cells: show;
-    border-spacing: 0;
-    border: 1px solid __border__;
-}
-
-caption {
-    caption-side: top;
-    text-align: left;
-}
-[dir=rtl] caption {
-    text-align: right;
-}
-
-th,
-td {
-    padding: .3em .5em;
-    margin: 0;
-    vertical-align: top;
-    border: 1px solid __border__;
-}
-th {
-    font-weight: bold;
-    background-color: __background_alt__;
-    text-align: left;
-}
-[dir=rtl] th {
-    text-align: right;
-}
-
-
-/*____________ links ____________*/
-
-a {
-    outline: none;
-}
-a:link,
-a:visited {
-    text-decoration: none;
-    color: __link__;
-}
-a:link:hover,
-a:visited:hover,
-a:link:focus,
-a:visited:focus,
-a:link:active,
-a:visited:active {
-    text-decoration: underline;
-}
-
-
-/*____________ misc ____________*/
-
-img {
-    border-width: 0;
-    vertical-align: middle;
-    color: #666;
-    background-color: transparent;
-    font-style: italic;
-    height: auto;
-}
-img,
-object,
-embed,
-iframe,
-video,
-audio {
-    max-width: 100%;
-}
-#IE7 img,
-#IE8 img,
-button img {
-    max-width: none;
-}
-
-hr {
-    border-top: solid __border__;
-    border-bottom: solid __background__;
-    border-width: 1px 0;
-    height: 0;
-    text-align: center;
-    clear: both;
-}
-
-acronym,
-abbr {
-    cursor: help;
-    border-bottom: 1px dotted;
-    font-style: normal;
-}
-em acronym,
-em abbr {
-    font-style: italic;
-}
-
-mark {
-    background-color: __highlight__;
-    color: inherit;
-}
-
-pre,
-code,
-samp,
-kbd {
-    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
-    /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */
-    font-size: 1em;
-    direction: ltr;
-    text-align: left;
-    background-color: __background_site__;
-    color: __text__;
-    box-shadow: inset 0 0 .3em __border__;
-    border-radius: 2px;
-}
-pre {
-    overflow: auto;
-    word-wrap: normal;
-    border: 1px solid __border__;
-    border-radius: 2px;
-    box-shadow: inset 0 0 .5em __border__;
-    padding: .7em 1em;
-}
-
-blockquote {
-    padding: 0 .5em;
-    border: solid __border__;
-    border-width: 0 0 0 .25em;
-}
-[dir=rtl] blockquote {
-    border-width: 0 .25em 0 0;
-}
-q:before,
-q:after {
-    content: '';
-}
-
-sub,
-sup {
-    font-size: .8em;
-    line-height: 1;
-}
-sub {
-    vertical-align: sub;
-}
-sup {
-    vertical-align: super;
-}
-
-small {
-    font-size: .8em;
-}
-
-/*____________ forms ____________*/
-
-/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */
-
-form {
-    display: inline;
-    margin: 0;
-    padding: 0;
-}
-fieldset {
-    padding: .7em 1em 0;
-    padding: .7rem 1rem; /* for those browsers understanding :last-child */
-    border: 1px solid __text_alt__;
-}
-fieldset > :last-child {
-    margin-bottom: 0;
-}
-legend {
-    margin: 0;
-    padding: 0 .1em;
-}
-label {
-    vertical-align: middle;
-    cursor: pointer;
-}
-
-input,
-textarea,
-button,
-select,
-optgroup,
-option,
-keygen,
-output,
-meter,
-progress {
-    font: inherit;
-    font-weight: normal;
-    color: #333;
-    background-color: #fff;
-    line-height: normal;
-    margin: 0;
-    vertical-align: middle;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
-optgroup {
-    font-style: italic;
-    font-weight: bold;
-}
-option {
-    font-style: normal;
-    font-weight: normal;
-}
-
-input,
-textarea,
-select,
-keygen {
-    border: 1px solid #ccc;
-    box-shadow: inset 0 0 1px #eee;
-    border-radius: 2px;
-}
-input:active,
-input:focus,
-textarea:active,
-textarea:focus,
-select:active,
-select:focus,
-keygen:active,
-keygen:focus {
-    border-color: #999;
-}
-input[type=radio],
-input[type=checkbox],
-input[type=image] {
-    padding: 0;
-    border-style: none;
-    box-shadow: none;
-}
-
-/* all types of buttons */
-input[type=submit],
-input[type=button],
-input[type=reset],
-input.button,
-a.button,
-button,
-.qq-upload-button {
-    color: #333;
-    background-color: #eee;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    border: 1px solid #ccc;
-    border-radius: 2px;
-    padding: .1em .5em;
-    cursor: pointer;
-}
-#IE7 input.button,
-#IE7 button {
-    line-height: 1.4;
-    overflow: visible;
-}
-
-input[type=submit]:hover,
-input[type=submit]:active,
-input[type=submit]:focus,
-input[type=button]:hover,
-input[type=button]:active,
-input[type=button]:hover,
-input[type=reset]:hover,
-input[type=reset]:active,
-input[type=reset]:hover,
-input.button:hover,
-input.button:active,
-input.button:focus,
-a.button:hover,
-a.button:active,
-a.button:focus,
-button:hover,
-button:active,
-button:focus,
-.qq-upload-button:hover {
-    border-color: #999;
-    background-color: #ddd;
-    background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-}
-
-input::-moz-focus-inner,
-button::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}
-
-input[disabled],
-button[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-button[readonly],
-select[readonly],
-textarea[readonly] {
-    cursor: auto;
-    opacity: .5;
-    background-color: #eee;
-}
diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
new file mode 100644
index 000000000..1dd56813e
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -0,0 +1,460 @@
+/**
+ * This file provides the most basic styles.
+ *
+ * If you integrate DokuWiki into another project, you might either
+ * want to integrate this file into the other project as well, or use
+ * the other project's basic CSS for DokuWiki instead of this one.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+
+html {
+    overflow-x: auto;
+    overflow-y: scroll;
+}
+html,
+body {
+    color: @ini_text;
+    background: @ini_background_site url(images/page-gradient.png) top left repeat-x;
+    margin: 0;
+    padding: 0;
+}
+body {
+    font: normal 87.5%/1.4 Arial, sans-serif;
+    /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */
+    -webkit-text-size-adjust: 100%;
+}
+
+
+/*____________ headers ____________*/
+
+caption,
+figcaption,
+summary,
+legend {
+    padding: 0;
+    margin: 0 0 .35em;
+    line-height: 1.2;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-weight: bold;
+    padding: 0;
+    line-height: 1.2;
+    clear: left; /* ideally 'both', but problems with toc */
+}
+[dir=rtl] h1,
+[dir=rtl] h2,
+[dir=rtl] h3,
+[dir=rtl] h4,
+[dir=rtl] h5,
+[dir=rtl] h6 {
+    clear: right;
+}
+
+h1 {
+    font-size: 2em;
+    margin: 0 0 0.444em;
+}
+h2 {
+    font-size: 1.5em;
+    margin: 0 0 0.666em;
+}
+h3 {
+    font-size: 1.125em;
+    margin: 0 0 0.888em;
+}
+h4 {
+    font-size: 1em;
+    margin: 0 0 1.0em;
+}
+h5 {
+    font-size: .875em;
+    margin: 0 0 1.1428em;
+}
+h6 {
+    font-size: .75em;
+    margin: 0 0 1.333em;
+}
+/* bottom margin = 1 / font-size */
+
+
+/*____________ basic margins and paddings ____________*/
+
+p,
+ul,
+ol,
+dl,
+pre,
+table,
+hr,
+blockquote,
+figure,
+details,
+fieldset,
+address {
+    margin: 0 0 1.4em 0; /* bottom margin = line-height */
+    padding: 0;
+}
+
+div {
+    margin: 0;
+    padding: 0;
+}
+
+
+/*____________ lists ____________*/
+
+ul,
+ol {
+    padding: 0 0 0 1.5em;
+}
+[dir=rtl] ul,
+[dir=rtl] ol {
+    padding: 0 1.5em 0 0;
+}
+
+li,
+dd {
+    padding: 0;
+    margin: 0 0 0 1.5em;
+}
+[dir=rtl] li,
+[dir=rtl] dd {
+    margin: 0 1.5em 0 0;
+}
+dt {
+    font-weight: bold;
+    margin: 0;
+    padding: 0;
+}
+
+li ul,
+li ol,
+li dl,
+dl ul,
+dl ol,
+dl dl {
+    margin-bottom: 0;
+    padding: 0;
+}
+li li {
+    font-size: 100%;
+}
+
+ul             { list-style: square outside; }
+ol             { list-style: decimal outside; }
+ol ol          { list-style-type: lower-alpha; }
+ol ol ol       { list-style-type: upper-roman; }
+ol ol ol ol    { list-style-type: upper-alpha; }
+ol ol ol ol ol { list-style-type: lower-roman; }
+
+
+/*____________ tables ____________*/
+
+table {
+    border-collapse: collapse;
+    empty-cells: show;
+    border-spacing: 0;
+    border: 1px solid @ini_border;
+}
+
+caption {
+    caption-side: top;
+    text-align: left;
+}
+[dir=rtl] caption {
+    text-align: right;
+}
+
+th,
+td {
+    padding: .3em .5em;
+    margin: 0;
+    vertical-align: top;
+    border: 1px solid @ini_border;
+}
+th {
+    font-weight: bold;
+    background-color: @ini_background_alt;
+    text-align: left;
+}
+[dir=rtl] th {
+    text-align: right;
+}
+
+
+/*____________ links ____________*/
+
+a {
+    outline: none;
+}
+a:link,
+a:visited {
+    text-decoration: none;
+    color: @ini_link;
+}
+a:link:hover,
+a:visited:hover,
+a:link:focus,
+a:visited:focus,
+a:link:active,
+a:visited:active {
+    text-decoration: underline;
+}
+
+
+/*____________ misc ____________*/
+
+img {
+    border-width: 0;
+    vertical-align: middle;
+    color: #666;
+    background-color: transparent;
+    font-style: italic;
+    height: auto;
+}
+img,
+object,
+embed,
+iframe,
+video,
+audio {
+    max-width: 100%;
+}
+#IE7 img,
+#IE8 img,
+button img {
+    max-width: none;
+}
+
+hr {
+    border-top: solid @ini_border;
+    border-bottom: solid @ini_background;
+    border-width: 1px 0;
+    height: 0;
+    text-align: center;
+    clear: both;
+}
+
+acronym,
+abbr {
+    cursor: help;
+    border-bottom: 1px dotted;
+    font-style: normal;
+}
+em acronym,
+em abbr {
+    font-style: italic;
+}
+
+mark {
+    background-color: @ini_highlight;
+    color: inherit;
+}
+
+pre,
+code,
+samp,
+kbd {
+    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
+    /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */
+    font-size: 1em;
+    direction: ltr;
+    text-align: left;
+    background-color: @ini_background_site;
+    color: @ini_text;
+    box-shadow: inset 0 0 .3em @ini_border;
+    border-radius: 2px;
+}
+pre {
+    overflow: auto;
+    word-wrap: normal;
+    border: 1px solid @ini_border;
+    border-radius: 2px;
+    box-shadow: inset 0 0 .5em @ini_border;
+    padding: .7em 1em;
+}
+
+blockquote {
+    padding: 0 .5em;
+    border: solid @ini_border;
+    border-width: 0 0 0 .25em;
+}
+[dir=rtl] blockquote {
+    border-width: 0 .25em 0 0;
+}
+q:before,
+q:after {
+    content: '';
+}
+
+sub,
+sup {
+    font-size: .8em;
+    line-height: 1;
+}
+sub {
+    vertical-align: sub;
+}
+sup {
+    vertical-align: super;
+}
+
+small {
+    font-size: .8em;
+}
+
+/*____________ forms ____________*/
+
+/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */
+
+form {
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
+fieldset {
+    padding: .7em 1em 0;
+    padding: .7rem 1rem; /* for those browsers understanding :last-child */
+    border: 1px solid @ini_text_alt;
+}
+fieldset > :last-child {
+    margin-bottom: 0;
+}
+legend {
+    margin: 0;
+    padding: 0 .1em;
+}
+label {
+    vertical-align: middle;
+    cursor: pointer;
+}
+
+input,
+textarea,
+button,
+select,
+optgroup,
+option,
+keygen,
+output,
+meter,
+progress {
+    font: inherit;
+    font-weight: normal;
+    color: #333;
+    background-color: #fff;
+    line-height: normal;
+    margin: 0;
+    vertical-align: middle;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+optgroup {
+    font-style: italic;
+    font-weight: bold;
+}
+option {
+    font-style: normal;
+    font-weight: normal;
+}
+
+input,
+textarea,
+select,
+keygen {
+    border: 1px solid #ccc;
+    box-shadow: inset 0 0 1px #eee;
+    border-radius: 2px;
+}
+input:active,
+input:focus,
+textarea:active,
+textarea:focus,
+select:active,
+select:focus,
+keygen:active,
+keygen:focus {
+    border-color: #999;
+}
+input[type=radio],
+input[type=checkbox],
+input[type=image] {
+    padding: 0;
+    border-style: none;
+    box-shadow: none;
+}
+
+/* all types of buttons */
+input[type=submit],
+input[type=button],
+input[type=reset],
+input.button,
+a.button,
+button,
+.qq-upload-button {
+    color: #333;
+    background-color: #eee;
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
+    .linear-gradient("top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%");
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    padding: .1em .5em;
+    cursor: pointer;
+}
+#IE7 input.button,
+#IE7 button {
+    line-height: 1.4;
+    overflow: visible;
+}
+
+input[type=submit]:hover,
+input[type=submit]:active,
+input[type=submit]:focus,
+input[type=button]:hover,
+input[type=button]:active,
+input[type=button]:hover,
+input[type=reset]:hover,
+input[type=reset]:active,
+input[type=reset]:hover,
+input.button:hover,
+input.button:active,
+input.button:focus,
+a.button:hover,
+a.button:active,
+a.button:focus,
+button:hover,
+button:active,
+button:focus,
+.qq-upload-button:hover {
+    border-color: #999;
+    background-color: #ddd;
+    background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
+    .linear-gradient("top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%");
+}
+
+input::-moz-focus-inner,
+button::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+input[disabled],
+button[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+button[readonly],
+select[readonly],
+textarea[readonly] {
+    cursor: auto;
+    opacity: .5;
+    background-color: #eee;
+}
diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index f6022b4e9..ae97d7d5e 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -122,7 +122,8 @@
 .dokuwiki dl.file {
     dt,
     dt {
-        .linear-gradient(@ini_background_site, @ini_background_alt, @ini_background_site);
+        background-color: @ini_background_site;
+        .linear-gradient(~"top, @{ini_background_alt} 0%, @{ini_background_site} 100%");
         color: inherit;
         border: 1px solid @ini_border;
         border-bottom-color: @ini_background_site;
diff --git a/lib/tpl/dokuwiki/css/includes.css b/lib/tpl/dokuwiki/css/includes.css
deleted file mode 100644
index bc189962f..000000000
--- a/lib/tpl/dokuwiki/css/includes.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * This file provides styles for included seperate html files
- * (added through "include hooks").
- */
diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less
index 7ecae4a0b..a88767e97 100644
--- a/lib/tpl/dokuwiki/css/mixins.less
+++ b/lib/tpl/dokuwiki/css/mixins.less
@@ -1,15 +1,10 @@
 /**
  * linear gradient x-browser support
- *
- * @param color fallback background color
- * @param start start color
- * @param stop  end color
  */
-.linear-gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
-    background: @color;
-    background: -moz-linear-gradient(   top, @start 0%, @stop 100%);
-    background: -webkit-linear-gradient(top, @start 0%, @stop 100%);
-    background: -o-linear-gradient(     top, @start 0%, @stop 100%);
-    background: -ms-linear-gradient(    top, @start 0%, @stop 100%);
-    background: linear-gradient(        top, @start 0%, @stop 100%);
+.linear-gradient(@declaration: 0) {
+    background: -moz-linear-gradient(   @declaration);
+    background: -webkit-linear-gradient(@declaration);
+    background: -o-linear-gradient(     @declaration);
+    background: -ms-linear-gradient(    @declaration);
+    background: linear-gradient(        @declaration);
 }
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
deleted file mode 100644
index 71f80599d..000000000
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ /dev/null
@@ -1,288 +0,0 @@
-/**
- * This file provides styles for mobile devices
- * and smaller screens (up to 480px and 768px width).
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-/* for detecting media queries in JavaScript (see script.js): */
-#screen__mode {
-    position: relative;
-    z-index: 0;
-}
-
-/* for screen widths in the tablet range
-********************************************************************/
-@media only screen and (max-width: __tablet_width__) {
-
-#screen__mode {
-    z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
-}
-
-/* structure */
-#dokuwiki__aside {
-    width: 100%;
-    float: none;
-}
-
-#dokuwiki__aside > .pad,
-[dir=rtl] #dokuwiki__aside > .pad {
-    margin: 0 0 .5em;
-    /* style like .page */
-    background: __background__;
-    color: inherit;
-    border: 1px solid #eee;
-    box-shadow: 0 0 .5em __text_alt__;
-    border-radius: 2px;
-    padding: 1em;
-    margin-bottom: .5em;
-}
-
-#dokuwiki__aside h3.toggle {
-    font-size: 1em;
-}
-#dokuwiki__aside h3.toggle.closed {
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-#dokuwiki__aside h3.toggle.open {
-    border-bottom: 1px solid __border__;
-}
-
-.showSidebar #dokuwiki__content {
-    float: none;
-    margin-left: 0;
-    width: 100%;
-}
-.showSidebar #dokuwiki__content > .pad {
-    margin-left: 0;
-}
-
-[dir=rtl] .showSidebar #dokuwiki__content,
-[dir=rtl] .showSidebar #dokuwiki__content > .pad {
-    margin-right: 0;
-}
-
-/* toc */
-#dw__toc {
-    float: none;
-    margin: 0 0 1em 0;
-    width: auto;
-    border-left-width: 0;
-    border-bottom: 1px solid __border__;
-}
-[dir=rtl] #dw__toc {
-    float: none;
-    margin: 0 0 1em 0;
-    border-right-width: 0;
-}
-
-.dokuwiki h3.toggle {
-    padding: 0 .5em .5em 0;
-}
-#dw__toc > div,
-#dokuwiki__aside div.content {
-    padding: .2em 0 .5em;
-}
-
-/* page */
-.dokuwiki div.page {
-    padding: 1em;
-}
-/* enable horizontal scrolling in media manager */
-.mode_media div.page {
-    overflow: auto;
-}
-
-/* _edit */
-.dokuwiki div.section_highlight {
-    margin: 0 -1em;
-    padding: 0 .5em;
-    border-width: 0 .5em;
-}
-.dokuwiki div.preview {
-    margin: 0 -1em;
-    padding: 1em;
-}
-
-/* _recent */
-.dokuwiki form.changes ul {
-    padding-left: 0;
-}
-[dir=rtl] .dokuwiki form.changes ul {
-    padding-right: 0;
-}
-
-
-} /* /@media */
-
-
-/* for screen widths in the smartphone range
-********************************************************************/
-@media only screen and (max-width: __phone_width__) {
-
-#screen__mode {
-    z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
-}
-
-body {
-    font-size: 100%;
-}
-
-/*____________ structure ____________*/
-
-#dokuwiki__site {
-    max-width: 100%;
-}
-#dokuwiki__site > .site {
-    padding: 0 .5em;
-}
-#dokuwiki__header {
-    padding: .5em 0;
-}
-
-
-/*____________ header ____________*/
-
-#dokuwiki__header ul.a11y.skip {
-    position: static !important;
-    left: 0 !important;
-    width: auto !important;
-    height: auto !important;
-    float: right;
-    font-size: 0.875em;
-    list-style: none;
-    padding-left: 0;
-    margin: 0;
-}
-[dir=rtl] #dokuwiki__header ul.a11y.skip {
-    left: auto !important;
-    right: 0 !important;
-    float: left;
-    padding-right: 0;
-}
-#dokuwiki__header ul.a11y.skip li {
-    margin-left: .35em;
-    display: inline;
-}
-[dir=rtl] #dokuwiki__header ul.a11y.skip li {
-    margin: 0 .35em 0 0;
-}
-
-#dokuwiki__header .headings,
-#dokuwiki__header .tools {
-    float: none;
-    text-align: left;
-    width: auto;
-    margin-bottom: .5em;
-}
-[dir=rtl] #dokuwiki__header .headings,
-[dir=rtl] #dokuwiki__header .tools {
-    float: none;
-    text-align: right;
-    width: auto;
-}
-#dokuwiki__sitetools {
-    text-align: left;
-}
-[dir=rtl] #dokuwiki__sitetools {
-    text-align: right;
-}
-#dokuwiki__usertools,
-#dokuwiki__sitetools ul,
-#dokuwiki__sitetools h3,
-#dokuwiki__pagetools,
-.dokuwiki div.breadcrumbs, /* @todo: maybe move breadcrumbs to the bottom? */
-.dokuwiki .pageId {
-    display: none;
-}
-
-/* search form */
-#dokuwiki__sitetools form.search {
-    float: left;
-    margin: 0 .2em .2em 0;
-    width: 49%;
-}
-[dir=rtl] #dokuwiki__sitetools form.search {
-    float: right;
-    margin: 0 0 .2em .2em;
-}
-
-#dokuwiki__sitetools form.search input.edit {
-    width: 100% !important;
-}
-.dokuwiki form.search div.ajax_qsearch {
-    display: none !important;
-}
-
-/* action dropdown is alternative for all hidden tools */
-#dokuwiki__header .mobileTools {
-    display: block;
-    font-size: 0.875em;
-    margin: 0 0 .2em 0;
-    float: right;
-    width: 49%;
-}
-[dir=rtl] #dokuwiki__header .mobileTools {
-    float: left;
-}
-#dokuwiki__header .mobileTools select {
-    padding: .3em .1em;
-    width: 100% !important;
-}
-
-/* force same height on search input and tools select */
-#dokuwiki__sitetools form.search input.edit,
-#dokuwiki__header .mobileTools select {
-    height: 2.1em;
-    line-height: 2.1em;
-    overflow: visible;
-}
-
-
-/*____________ content ____________*/
-
-#dokuwiki__aside > .pad,
-.dokuwiki div.page {
-    padding: .5em;
-}
-
-/* form elements */
-#config__manager fieldset td.value,
-#config__manager td .input,
-.dokuwiki fieldset,
-.dokuwiki input.edit,
-.dokuwiki textarea,
-.dokuwiki select {
-    width: auto !important;
-    max-width: 100% !important;
-}
-#config__manager fieldset {
-    margin-left: 0;
-    margin-right: 0;
-}
-
-.dokuwiki label.block {
-    text-align: left;
-}
-[dir=rtl] .dokuwiki label.block {
-    text-align: right;
-}
-.dokuwiki label.block span {
-    display: block;
-}
-
-/* _edit */
-.dokuwiki div.section_highlight {
-    margin: 0;
-    padding: 0;
-    border-width: 0;
-}
-.dokuwiki div.preview {
-    margin: 0 -.5em;
-    padding: .5em;
-}
-
-
-
-} /* /@media */
diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
new file mode 100644
index 000000000..4362656a1
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -0,0 +1,288 @@
+/**
+ * This file provides styles for mobile devices
+ * and smaller screens (up to 480px and 768px width).
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+
+/* for detecting media queries in JavaScript (see script.js): */
+#screen__mode {
+    position: relative;
+    z-index: 0;
+}
+
+/* for screen widths in the tablet range
+********************************************************************/
+@media only screen and (max-width: @ini_tablet_width) {
+
+#screen__mode {
+    z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
+}
+
+/* structure */
+#dokuwiki__aside {
+    width: 100%;
+    float: none;
+}
+
+#dokuwiki__aside > .pad,
+[dir=rtl] #dokuwiki__aside > .pad {
+    margin: 0 0 .5em;
+    /* style like .page */
+    background: @ini_background;
+    color: inherit;
+    border: 1px solid #eee;
+    box-shadow: 0 0 .5em @ini_text_alt;
+    border-radius: 2px;
+    padding: 1em;
+    margin-bottom: .5em;
+}
+
+#dokuwiki__aside h3.toggle {
+    font-size: 1em;
+}
+#dokuwiki__aside h3.toggle.closed {
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
+#dokuwiki__aside h3.toggle.open {
+    border-bottom: 1px solid @ini_border;
+}
+
+.showSidebar #dokuwiki__content {
+    float: none;
+    margin-left: 0;
+    width: 100%;
+}
+.showSidebar #dokuwiki__content > .pad {
+    margin-left: 0;
+}
+
+[dir=rtl] .showSidebar #dokuwiki__content,
+[dir=rtl] .showSidebar #dokuwiki__content > .pad {
+    margin-right: 0;
+}
+
+/* toc */
+#dw__toc {
+    float: none;
+    margin: 0 0 1em 0;
+    width: auto;
+    border-left-width: 0;
+    border-bottom: 1px solid @ini_border;
+}
+[dir=rtl] #dw__toc {
+    float: none;
+    margin: 0 0 1em 0;
+    border-right-width: 0;
+}
+
+.dokuwiki h3.toggle {
+    padding: 0 .5em .5em 0;
+}
+#dw__toc > div,
+#dokuwiki__aside div.content {
+    padding: .2em 0 .5em;
+}
+
+/* page */
+.dokuwiki div.page {
+    padding: 1em;
+}
+/* enable horizontal scrolling in media manager */
+.mode_media div.page {
+    overflow: auto;
+}
+
+/* _edit */
+.dokuwiki div.section_highlight {
+    margin: 0 -1em;
+    padding: 0 .5em;
+    border-width: 0 .5em;
+}
+.dokuwiki div.preview {
+    margin: 0 -1em;
+    padding: 1em;
+}
+
+/* _recent */
+.dokuwiki form.changes ul {
+    padding-left: 0;
+}
+[dir=rtl] .dokuwiki form.changes ul {
+    padding-right: 0;
+}
+
+
+} /* /@media */
+
+
+/* for screen widths in the smartphone range
+********************************************************************/
+@media only screen and (max-width: @ini_phone_width) {
+
+#screen__mode {
+    z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
+}
+
+body {
+    font-size: 100%;
+}
+
+/*____________ structure ____________*/
+
+#dokuwiki__site {
+    max-width: 100%;
+}
+#dokuwiki__site > .site {
+    padding: 0 .5em;
+}
+#dokuwiki__header {
+    padding: .5em 0;
+}
+
+
+/*____________ header ____________*/
+
+#dokuwiki__header ul.a11y.skip {
+    position: static !important;
+    left: 0 !important;
+    width: auto !important;
+    height: auto !important;
+    float: right;
+    font-size: 0.875em;
+    list-style: none;
+    padding-left: 0;
+    margin: 0;
+}
+[dir=rtl] #dokuwiki__header ul.a11y.skip {
+    left: auto !important;
+    right: 0 !important;
+    float: left;
+    padding-right: 0;
+}
+#dokuwiki__header ul.a11y.skip li {
+    margin-left: .35em;
+    display: inline;
+}
+[dir=rtl] #dokuwiki__header ul.a11y.skip li {
+    margin: 0 .35em 0 0;
+}
+
+#dokuwiki__header .headings,
+#dokuwiki__header .tools {
+    float: none;
+    text-align: left;
+    width: auto;
+    margin-bottom: .5em;
+}
+[dir=rtl] #dokuwiki__header .headings,
+[dir=rtl] #dokuwiki__header .tools {
+    float: none;
+    text-align: right;
+    width: auto;
+}
+#dokuwiki__sitetools {
+    text-align: left;
+}
+[dir=rtl] #dokuwiki__sitetools {
+    text-align: right;
+}
+#dokuwiki__usertools,
+#dokuwiki__sitetools ul,
+#dokuwiki__sitetools h3,
+#dokuwiki__pagetools,
+.dokuwiki div.breadcrumbs, /* @todo: maybe move breadcrumbs to the bottom? */
+.dokuwiki .pageId {
+    display: none;
+}
+
+/* search form */
+#dokuwiki__sitetools form.search {
+    float: left;
+    margin: 0 .2em .2em 0;
+    width: 49%;
+}
+[dir=rtl] #dokuwiki__sitetools form.search {
+    float: right;
+    margin: 0 0 .2em .2em;
+}
+
+#dokuwiki__sitetools form.search input.edit {
+    width: 100% !important;
+}
+.dokuwiki form.search div.ajax_qsearch {
+    display: none !important;
+}
+
+/* action dropdown is alternative for all hidden tools */
+#dokuwiki__header .mobileTools {
+    display: block;
+    font-size: 0.875em;
+    margin: 0 0 .2em 0;
+    float: right;
+    width: 49%;
+}
+[dir=rtl] #dokuwiki__header .mobileTools {
+    float: left;
+}
+#dokuwiki__header .mobileTools select {
+    padding: .3em .1em;
+    width: 100% !important;
+}
+
+/* force same height on search input and tools select */
+#dokuwiki__sitetools form.search input.edit,
+#dokuwiki__header .mobileTools select {
+    height: 2.1em;
+    line-height: 2.1em;
+    overflow: visible;
+}
+
+
+/*____________ content ____________*/
+
+#dokuwiki__aside > .pad,
+.dokuwiki div.page {
+    padding: .5em;
+}
+
+/* form elements */
+#config__manager fieldset td.value,
+#config__manager td .input,
+.dokuwiki fieldset,
+.dokuwiki input.edit,
+.dokuwiki textarea,
+.dokuwiki select {
+    width: auto !important;
+    max-width: 100% !important;
+}
+#config__manager fieldset {
+    margin-left: 0;
+    margin-right: 0;
+}
+
+.dokuwiki label.block {
+    text-align: left;
+}
+[dir=rtl] .dokuwiki label.block {
+    text-align: right;
+}
+.dokuwiki label.block span {
+    display: block;
+}
+
+/* _edit */
+.dokuwiki div.section_highlight {
+    margin: 0;
+    padding: 0;
+    border-width: 0;
+}
+.dokuwiki div.preview {
+    margin: 0 -.5em;
+    padding: .5em;
+}
+
+
+
+} /* /@media */
diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
deleted file mode 100644
index 21e5c13ec..000000000
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ /dev/null
@@ -1,421 +0,0 @@
-/**
- * This file provides the styles for the page tools
- * (fly out navigation beside the page to edit, etc).
- *
- * @author Anika Henke <anika@selfthinker.org>
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-
-#dokuwiki__site > .site {
-    /* give space to the right so the tools won't disappear on smaller screens */
-    /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */
-    padding-right: 40px;
-    /* give the same space to the left to balance it out */
-    padding-left: 40px;
-}
-.dokuwiki div.page {
-    height: 190px;
-    min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */
-    height: auto;
-}
-#dokuwiki__usertools {
-    /* move the tools just outside of the site */
-    right: 40px;
-}
-[dir=rtl] #dokuwiki__usertools {
-    right: auto;
-    left: 40px;
-}
-
-
-#dokuwiki__pagetools {
-    position: absolute;
-    right: -40px;
-    /* on same vertical level as first headline, because .page has 2em padding */
-    top: 2em;
-    width: 40px;
-}
-[dir=rtl] #dokuwiki__pagetools {
-    right: auto;
-    left: -40px;
-}
-
-#dokuwiki__pagetools div.tools {
-    position: fixed;
-    width: 40px;
-}
-
-#dokuwiki__pagetools ul {
-    position: absolute;
-    right: 0;
-    text-align: right;
-    margin: 0;
-    padding: 0;
-    /* add transparent border to prevent jumping when proper border is added on hover */
-    border: 1px solid transparent;
-    z-index: 10;
-}
-[dir=rtl] #dokuwiki__pagetools ul {
-    right: auto;
-    left: 0;
-    text-align: left;
-}
-
-#dokuwiki__pagetools ul li {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-    font-size: 0.875em;
-}
-
-#dokuwiki__pagetools ul li a {
-    display: block;
-    min-height: 20px; /* 30 - 2x5 */
-    line-height: 20px;
-    padding: 0;
-    background-position: right 0;
-    background-repeat: no-repeat;
-    /* add transparent border to prevent jumping when proper border is added on focus */
-    border: 1px solid transparent;
-    white-space: nowrap;
-    width: 30px;
-    height: 30px;
-    overflow: hidden;
-    margin-left: auto; /* align right if the ul is larger because one item is focused */
-}
-
-#dokuwiki__pagetools ul li a:before {
-    content: url(images/pagetools-sprite.png);
-    display: inline-block;
-    font-size: 0;
-    line-height: 0;
-}
-
-[dir=rtl] #dokuwiki__pagetools ul li a {
-    background-position: left 0;
-    margin-right: auto;
-    margin-left: 0;
-}
-
-/* show all tools on hover and individual tools on focus */
-#dokuwiki__pagetools:hover ul,
-#dokuwiki__pagetools ul li a:focus,
-#dokuwiki__pagetools ul li a:active {
-    background-color: __background__;
-    border-color: __border__;
-    border-radius: 2px;
-    box-shadow: 2px 2px 2px __text_alt__;
-}
-
-#dokuwiki__pagetools:hover ul li a,
-#dokuwiki__pagetools ul li a:focus,
-#dokuwiki__pagetools ul li a:active {
-    width: auto;
-    height: auto;
-    overflow: visible;
-    padding: 5px 40px 5px 5px;
-    background-image: url(images/pagetools-sprite.png);
-}
-
-#dokuwiki__pagetools:hover ul li a:before,
-#dokuwiki__pagetools ul li a:focus:before {
-    content: none;
-}
-
-[dir=rtl] #dokuwiki__pagetools:hover ul,
-[dir=rtl] #dokuwiki__pagetools ul li a:focus {
-    box-shadow: -2px 2px 2px __text_alt__;
-}
-
-[dir=rtl] #dokuwiki__pagetools:hover li a,
-[dir=rtl] #dokuwiki__pagetools ul li a:focus,
-[dir=rtl] #dokuwiki__pagetools ul li a:active {
-    padding: 5px 5px 5px 40px;
-}
-
-/* IE7 fixes, doesn't work without images */
-
-#IE7 #dokuwiki__pagetools ul li a {
-    background-image: url(images/pagetools-sprite.png);
-}
-
-#IE7 #dokuwiki__pagetools:hover ul li a span,
-#IE7 #dokuwiki__pagetools ul li a:focus span,
-#IE7 #dokuwiki__pagetools ul li a:active span {
-    clip: auto;
-    display: inline;
-    position: static;
-}
-
-#IE7 #dokuwiki__pagetools ul li a span {
-    clip: rect(0 0 0 0);
-    position: absolute;
-}
-
-#dokuwiki__pagetools ul li a:hover,
-#dokuwiki__pagetools ul li a:active,
-#dokuwiki__pagetools ul li a:focus {
-    text-decoration: none;
-}
-#dokuwiki__pagetools ul li a:hover {
-    background-color: __background_alt__;
-}
-
-/*____________ all available icons in sprite ____________*/
-
-#dokuwiki__pagetools ul li a.edit {
-    background-position: right 0;
-}
-#dokuwiki__pagetools ul li a.edit:hover,
-#dokuwiki__pagetools ul li a.edit:active,
-#dokuwiki__pagetools ul li a.edit:focus {
-    background-position: right -45px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.edit {
-    background-position: left 0;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus {
-    background-position: left -45px;
-}
-
-#dokuwiki__pagetools ul li a.create:before {
-    margin-top: -90px;
-}
-#dokuwiki__pagetools ul li a.create {
-    background-position: right -90px;
-}
-#dokuwiki__pagetools ul li a.create:hover,
-#dokuwiki__pagetools ul li a.create:active,
-#dokuwiki__pagetools ul li a.create:focus {
-    background-position: right -135px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.create {
-    background-position: left -90px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.create:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.create:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.create:focus {
-    background-position: left -135px;
-}
-
-#dokuwiki__pagetools ul li a.show {
-    background-position: right -270px;
-}
-#dokuwiki__pagetools ul li a.show:before {
-    margin-top: -270px;
-}
-#dokuwiki__pagetools ul li a.show:hover,
-#dokuwiki__pagetools ul li a.show:active,
-#dokuwiki__pagetools ul li a.show:focus {
-    background-position: right -315px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.show {
-    background-position: left -270px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.show:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.show:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.show:focus {
-    background-position: left -315px;
-}
-
-#dokuwiki__pagetools ul li a.source {
-    background-position: right -360px;
-}
-#dokuwiki__pagetools ul li a.source:before {
-    margin-top: -360px;
-}
-#dokuwiki__pagetools ul li a.source:hover,
-#dokuwiki__pagetools ul li a.source:active,
-#dokuwiki__pagetools ul li a.source:focus {
-    background-position: right -405px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.source {
-    background-position: left -360px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.source:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.source:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.source:focus {
-    background-position: left -405px;
-}
-
-#dokuwiki__pagetools ul li a.draft {
-    background-position: right -180px;
-}
-#dokuwiki__pagetools ul li a.draft:before {
-    margin-top: -180px;
-}
-#dokuwiki__pagetools ul li a.draft:hover,
-#dokuwiki__pagetools ul li a.draft:active,
-#dokuwiki__pagetools ul li a.draft:focus {
-    background-position: right -225px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.draft {
-    background-position: left -180px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus {
-    background-position: left -225px;
-}
-
-#dokuwiki__pagetools ul li a.revs {
-    background-position: right -540px;
-}
-#dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -540px;
-}
-#dokuwiki__pagetools ul li a.revs:hover,
-#dokuwiki__pagetools ul li a.revs:active,
-#dokuwiki__pagetools ul li a.revs:focus,
-.mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: right -585px;
-}
-.mode_revisions #dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -585px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revs {
-    background-position: left -540px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus,
-[dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: left -585px;
-}
-
-#dokuwiki__pagetools ul li a.backlink {
-    background-position: right -630px;
-}
-#dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -630px;
-}
-#dokuwiki__pagetools ul li a.backlink:hover,
-#dokuwiki__pagetools ul li a.backlink:active,
-#dokuwiki__pagetools ul li a.backlink:focus,
-.mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: right -675px;
-}
-.mode_backlink #dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -675px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -630px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus,
-[dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -675px;
-}
-
-#dokuwiki__pagetools ul li a.top {
-    background-position: right -810px;
-}
-#dokuwiki__pagetools ul li a.top:before{
-    margin-top: -810px;
-}
-#dokuwiki__pagetools ul li a.top:hover,
-#dokuwiki__pagetools ul li a.top:active,
-#dokuwiki__pagetools ul li a.top:focus {
-    background-position: right -855px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.top {
-    background-position: left -810px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.top:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.top:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.top:focus {
-    background-position: left -855px;
-}
-
-#dokuwiki__pagetools ul li a.revert {
-    background-position: right -450px;
-}
-#dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -450px;
-}
-#dokuwiki__pagetools ul li a.revert:hover,
-#dokuwiki__pagetools ul li a.revert:active,
-#dokuwiki__pagetools ul li a.revert:focus,
-.mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: right -495px;
-}
-.mode_revert #dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -450px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revert {
-    background-position: left -450px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus,
-[dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: left -495px;
-}
-
-#dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -720px;
-}
-#dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -720px;
-}
-#dokuwiki__pagetools ul li a.subscribe:hover,
-#dokuwiki__pagetools ul li a.subscribe:active,
-#dokuwiki__pagetools ul li a.subscribe:focus,
-.mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -765px;
-}
-.mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -765px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -720px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus,
-[dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -765px;
-}
-
-#dokuwiki__pagetools ul li a.mediaManager {
-    background-position: right -900px;
-}
-#dokuwiki__pagetools ul li a.mediaManager:before {
-    margin-top: -900px;
-}
-#dokuwiki__pagetools ul li a.mediaManager:hover,
-#dokuwiki__pagetools ul li a.mediaManager:active,
-#dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: right -945px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager {
-    background-position: left -900px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: left -945px;
-}
-
-#dokuwiki__pagetools ul li a.back {
-    background-position: right -990px;
-}
-#dokuwiki__pagetools ul li a.back {
-    margin-top: -990px;
-}
-#dokuwiki__pagetools ul li a.back:hover,
-#dokuwiki__pagetools ul li a.back:active,
-#dokuwiki__pagetools ul li a.back:focus {
-    background-position: right -1035px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.back {
-    background-position: left -990px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.back:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.back:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.back:focus {
-    background-position: left -1035px;
-}
diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
new file mode 100644
index 000000000..21e5c13ec
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -0,0 +1,421 @@
+/**
+ * This file provides the styles for the page tools
+ * (fly out navigation beside the page to edit, etc).
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+
+#dokuwiki__site > .site {
+    /* give space to the right so the tools won't disappear on smaller screens */
+    /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */
+    padding-right: 40px;
+    /* give the same space to the left to balance it out */
+    padding-left: 40px;
+}
+.dokuwiki div.page {
+    height: 190px;
+    min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */
+    height: auto;
+}
+#dokuwiki__usertools {
+    /* move the tools just outside of the site */
+    right: 40px;
+}
+[dir=rtl] #dokuwiki__usertools {
+    right: auto;
+    left: 40px;
+}
+
+
+#dokuwiki__pagetools {
+    position: absolute;
+    right: -40px;
+    /* on same vertical level as first headline, because .page has 2em padding */
+    top: 2em;
+    width: 40px;
+}
+[dir=rtl] #dokuwiki__pagetools {
+    right: auto;
+    left: -40px;
+}
+
+#dokuwiki__pagetools div.tools {
+    position: fixed;
+    width: 40px;
+}
+
+#dokuwiki__pagetools ul {
+    position: absolute;
+    right: 0;
+    text-align: right;
+    margin: 0;
+    padding: 0;
+    /* add transparent border to prevent jumping when proper border is added on hover */
+    border: 1px solid transparent;
+    z-index: 10;
+}
+[dir=rtl] #dokuwiki__pagetools ul {
+    right: auto;
+    left: 0;
+    text-align: left;
+}
+
+#dokuwiki__pagetools ul li {
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    font-size: 0.875em;
+}
+
+#dokuwiki__pagetools ul li a {
+    display: block;
+    min-height: 20px; /* 30 - 2x5 */
+    line-height: 20px;
+    padding: 0;
+    background-position: right 0;
+    background-repeat: no-repeat;
+    /* add transparent border to prevent jumping when proper border is added on focus */
+    border: 1px solid transparent;
+    white-space: nowrap;
+    width: 30px;
+    height: 30px;
+    overflow: hidden;
+    margin-left: auto; /* align right if the ul is larger because one item is focused */
+}
+
+#dokuwiki__pagetools ul li a:before {
+    content: url(images/pagetools-sprite.png);
+    display: inline-block;
+    font-size: 0;
+    line-height: 0;
+}
+
+[dir=rtl] #dokuwiki__pagetools ul li a {
+    background-position: left 0;
+    margin-right: auto;
+    margin-left: 0;
+}
+
+/* show all tools on hover and individual tools on focus */
+#dokuwiki__pagetools:hover ul,
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
+    background-color: __background__;
+    border-color: __border__;
+    border-radius: 2px;
+    box-shadow: 2px 2px 2px __text_alt__;
+}
+
+#dokuwiki__pagetools:hover ul li a,
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
+    width: auto;
+    height: auto;
+    overflow: visible;
+    padding: 5px 40px 5px 5px;
+    background-image: url(images/pagetools-sprite.png);
+}
+
+#dokuwiki__pagetools:hover ul li a:before,
+#dokuwiki__pagetools ul li a:focus:before {
+    content: none;
+}
+
+[dir=rtl] #dokuwiki__pagetools:hover ul,
+[dir=rtl] #dokuwiki__pagetools ul li a:focus {
+    box-shadow: -2px 2px 2px __text_alt__;
+}
+
+[dir=rtl] #dokuwiki__pagetools:hover li a,
+[dir=rtl] #dokuwiki__pagetools ul li a:focus,
+[dir=rtl] #dokuwiki__pagetools ul li a:active {
+    padding: 5px 5px 5px 40px;
+}
+
+/* IE7 fixes, doesn't work without images */
+
+#IE7 #dokuwiki__pagetools ul li a {
+    background-image: url(images/pagetools-sprite.png);
+}
+
+#IE7 #dokuwiki__pagetools:hover ul li a span,
+#IE7 #dokuwiki__pagetools ul li a:focus span,
+#IE7 #dokuwiki__pagetools ul li a:active span {
+    clip: auto;
+    display: inline;
+    position: static;
+}
+
+#IE7 #dokuwiki__pagetools ul li a span {
+    clip: rect(0 0 0 0);
+    position: absolute;
+}
+
+#dokuwiki__pagetools ul li a:hover,
+#dokuwiki__pagetools ul li a:active,
+#dokuwiki__pagetools ul li a:focus {
+    text-decoration: none;
+}
+#dokuwiki__pagetools ul li a:hover {
+    background-color: __background_alt__;
+}
+
+/*____________ all available icons in sprite ____________*/
+
+#dokuwiki__pagetools ul li a.edit {
+    background-position: right 0;
+}
+#dokuwiki__pagetools ul li a.edit:hover,
+#dokuwiki__pagetools ul li a.edit:active,
+#dokuwiki__pagetools ul li a.edit:focus {
+    background-position: right -45px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.edit {
+    background-position: left 0;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.edit:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus {
+    background-position: left -45px;
+}
+
+#dokuwiki__pagetools ul li a.create:before {
+    margin-top: -90px;
+}
+#dokuwiki__pagetools ul li a.create {
+    background-position: right -90px;
+}
+#dokuwiki__pagetools ul li a.create:hover,
+#dokuwiki__pagetools ul li a.create:active,
+#dokuwiki__pagetools ul li a.create:focus {
+    background-position: right -135px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.create {
+    background-position: left -90px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.create:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.create:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.create:focus {
+    background-position: left -135px;
+}
+
+#dokuwiki__pagetools ul li a.show {
+    background-position: right -270px;
+}
+#dokuwiki__pagetools ul li a.show:before {
+    margin-top: -270px;
+}
+#dokuwiki__pagetools ul li a.show:hover,
+#dokuwiki__pagetools ul li a.show:active,
+#dokuwiki__pagetools ul li a.show:focus {
+    background-position: right -315px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.show {
+    background-position: left -270px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.show:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.show:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.show:focus {
+    background-position: left -315px;
+}
+
+#dokuwiki__pagetools ul li a.source {
+    background-position: right -360px;
+}
+#dokuwiki__pagetools ul li a.source:before {
+    margin-top: -360px;
+}
+#dokuwiki__pagetools ul li a.source:hover,
+#dokuwiki__pagetools ul li a.source:active,
+#dokuwiki__pagetools ul li a.source:focus {
+    background-position: right -405px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.source {
+    background-position: left -360px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.source:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.source:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.source:focus {
+    background-position: left -405px;
+}
+
+#dokuwiki__pagetools ul li a.draft {
+    background-position: right -180px;
+}
+#dokuwiki__pagetools ul li a.draft:before {
+    margin-top: -180px;
+}
+#dokuwiki__pagetools ul li a.draft:hover,
+#dokuwiki__pagetools ul li a.draft:active,
+#dokuwiki__pagetools ul li a.draft:focus {
+    background-position: right -225px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.draft {
+    background-position: left -180px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.draft:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus {
+    background-position: left -225px;
+}
+
+#dokuwiki__pagetools ul li a.revs {
+    background-position: right -540px;
+}
+#dokuwiki__pagetools ul li a.revs:before {
+    margin-top: -540px;
+}
+#dokuwiki__pagetools ul li a.revs:hover,
+#dokuwiki__pagetools ul li a.revs:active,
+#dokuwiki__pagetools ul li a.revs:focus,
+.mode_revisions #dokuwiki__pagetools ul li a.revs {
+    background-position: right -585px;
+}
+.mode_revisions #dokuwiki__pagetools ul li a.revs:before {
+    margin-top: -585px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.revs {
+    background-position: left -540px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.revs:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus,
+[dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs {
+    background-position: left -585px;
+}
+
+#dokuwiki__pagetools ul li a.backlink {
+    background-position: right -630px;
+}
+#dokuwiki__pagetools ul li a.backlink:before {
+    margin-top: -630px;
+}
+#dokuwiki__pagetools ul li a.backlink:hover,
+#dokuwiki__pagetools ul li a.backlink:active,
+#dokuwiki__pagetools ul li a.backlink:focus,
+.mode_backlink #dokuwiki__pagetools ul li a.backlink {
+    background-position: right -675px;
+}
+.mode_backlink #dokuwiki__pagetools ul li a.backlink:before {
+    margin-top: -675px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.backlink {
+    background-position: left -630px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus,
+[dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink {
+    background-position: left -675px;
+}
+
+#dokuwiki__pagetools ul li a.top {
+    background-position: right -810px;
+}
+#dokuwiki__pagetools ul li a.top:before{
+    margin-top: -810px;
+}
+#dokuwiki__pagetools ul li a.top:hover,
+#dokuwiki__pagetools ul li a.top:active,
+#dokuwiki__pagetools ul li a.top:focus {
+    background-position: right -855px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.top {
+    background-position: left -810px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.top:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.top:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.top:focus {
+    background-position: left -855px;
+}
+
+#dokuwiki__pagetools ul li a.revert {
+    background-position: right -450px;
+}
+#dokuwiki__pagetools ul li a.revert:before {
+    margin-top: -450px;
+}
+#dokuwiki__pagetools ul li a.revert:hover,
+#dokuwiki__pagetools ul li a.revert:active,
+#dokuwiki__pagetools ul li a.revert:focus,
+.mode_revert #dokuwiki__pagetools ul li a.revert {
+    background-position: right -495px;
+}
+.mode_revert #dokuwiki__pagetools ul li a.revert:before {
+    margin-top: -450px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.revert {
+    background-position: left -450px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.revert:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus,
+[dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert {
+    background-position: left -495px;
+}
+
+#dokuwiki__pagetools ul li a.subscribe {
+    background-position: right -720px;
+}
+#dokuwiki__pagetools ul li a.subscribe:before {
+    margin-top: -720px;
+}
+#dokuwiki__pagetools ul li a.subscribe:hover,
+#dokuwiki__pagetools ul li a.subscribe:active,
+#dokuwiki__pagetools ul li a.subscribe:focus,
+.mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
+    background-position: right -765px;
+}
+.mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before {
+    margin-top: -765px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
+    background-position: left -720px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus,
+[dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
+    background-position: left -765px;
+}
+
+#dokuwiki__pagetools ul li a.mediaManager {
+    background-position: right -900px;
+}
+#dokuwiki__pagetools ul li a.mediaManager:before {
+    margin-top: -900px;
+}
+#dokuwiki__pagetools ul li a.mediaManager:hover,
+#dokuwiki__pagetools ul li a.mediaManager:active,
+#dokuwiki__pagetools ul li a.mediaManager:focus {
+    background-position: right -945px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager {
+    background-position: left -900px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus {
+    background-position: left -945px;
+}
+
+#dokuwiki__pagetools ul li a.back {
+    background-position: right -990px;
+}
+#dokuwiki__pagetools ul li a.back {
+    margin-top: -990px;
+}
+#dokuwiki__pagetools ul li a.back:hover,
+#dokuwiki__pagetools ul li a.back:active,
+#dokuwiki__pagetools ul li a.back:focus {
+    background-position: right -1035px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.back {
+    background-position: left -990px;
+}
+[dir=rtl] #dokuwiki__pagetools ul li a.back:hover,
+[dir=rtl] #dokuwiki__pagetools ul li a.back:active,
+[dir=rtl] #dokuwiki__pagetools ul li a.back:focus {
+    background-position: left -1035px;
+}
diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css
deleted file mode 100644
index 00642e90b..000000000
--- a/lib/tpl/dokuwiki/css/structure.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * This file provides styles for the general layout structure.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-body {
-    margin: 0 auto;
-}
-#dokuwiki__site {
-    margin: 0 auto;
-    max-width: __site_width__;
-}
-#dokuwiki__site > .site {
-    padding: 0 .5em;
-}
-
-#dokuwiki__header {
-    width: 100%;
-}
-#dokuwiki__header > .pad {
-}
-    #dokuwiki__header .headings {
-        float: left;
-    }
-    [dir=rtl] #dokuwiki__header .headings {
-        float: right;
-        text-align: right;
-    }
-    #dokuwiki__header .tools {
-        float: right;
-        text-align: right;
-    }
-    [dir=rtl] #dokuwiki__header .tools {
-        float: left;
-        text-align: left;
-    }
-
-#dokuwiki__site .wrapper {
-    position: relative;
-}
-
-    #dokuwiki__aside {
-        width: __sidebar_width__;
-        float: left;
-        position: relative;
-        display: block;
-    }
-    [dir=rtl] #dokuwiki__aside {
-        float: right;
-    }
-    #dokuwiki__aside > .pad {
-        margin: 0 1.5em 0 0;
-    }
-    [dir=rtl] #dokuwiki__aside > .pad {
-        margin: 0 0 0 1.5em;
-    }
-
-    .showSidebar #dokuwiki__content {
-        float: right;
-        margin-left: -__sidebar_width__;
-        width: 100%;
-    }
-    [dir=rtl] .showSidebar #dokuwiki__content {
-        float: left;
-        margin-left: 0;
-        margin-right: -__sidebar_width__;
-    }
-    .showSidebar #dokuwiki__content > .pad {
-        margin-left: __sidebar_width__;
-    }
-    [dir=rtl] .showSidebar #dokuwiki__content > .pad {
-        margin-left: 0;
-        margin-right: __sidebar_width__;
-    }
-
-#dokuwiki__footer {
-    clear: both;
-}
-#dokuwiki__footer > .pad {
-}
diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less
new file mode 100644
index 000000000..3f22f57e3
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/structure.less
@@ -0,0 +1,94 @@
+/**
+ * This file provides styles for the general layout structure.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+body {
+    margin: 0 auto;
+}
+
+#dokuwiki__site {
+    margin: 0 auto;
+    max-width: @ini_site_width;
+}
+
+#dokuwiki__site > .site {
+    padding: 0 .5em;
+}
+
+#dokuwiki__header {
+    width: 100%;
+}
+
+#dokuwiki__header > .pad {
+}
+
+#dokuwiki__header .headings {
+    float: left;
+}
+
+[dir=rtl] #dokuwiki__header .headings {
+    float: right;
+    text-align: right;
+}
+
+#dokuwiki__header .tools {
+    float: right;
+    text-align: right;
+}
+
+[dir=rtl] #dokuwiki__header .tools {
+    float: left;
+    text-align: left;
+}
+
+#dokuwiki__site .wrapper {
+    position: relative;
+}
+
+#dokuwiki__aside {
+    width: @ini_sidebar_width;
+    float: left;
+    position: relative;
+    display: block;
+}
+
+[dir=rtl] #dokuwiki__aside {
+    float: right;
+}
+
+#dokuwiki__aside > .pad {
+    margin: 0 1.5em 0 0;
+}
+
+[dir=rtl] #dokuwiki__aside > .pad {
+    margin: 0 0 0 1.5em;
+}
+
+.showSidebar #dokuwiki__content {
+    float: right;
+    margin-left: -@ini_sidebar_width;
+    width: 100%;
+}
+
+[dir=rtl] .showSidebar #dokuwiki__content {
+    float: left;
+    margin-left: 0;
+    margin-right: -@ini_sidebar_width;
+}
+
+.showSidebar #dokuwiki__content > .pad {
+    margin-left: @ini_sidebar_width;
+}
+
+[dir=rtl] .showSidebar #dokuwiki__content > .pad {
+    margin-left: 0;
+    margin-right: @ini_sidebar_width;
+}
+
+#dokuwiki__footer {
+    clear: both;
+}
+
+#dokuwiki__footer > .pad {
+}
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 9cf6cb64f..c6962fcd2 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -9,12 +9,15 @@
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
 ; print, screen and all are supported.
+; You can reference CSS and LESS files here. Files referenced here will
+; be checked for updates when considering a cache rebuild while files
+; included through LESS' @import statements are not
 
 [stylesheets]
 
 css/mixins.less           = screen
 
-css/basic.css             = screen
+css/basic.less            = screen
 css/_imgdetail.css        = screen
 css/_media_popup.css      = screen
 css/_media_fullscreen.css = screen
@@ -32,17 +35,18 @@ css/_forms.css            = screen
 css/_admin.css            = screen
 css/structure.css         = screen
 css/design.less           = screen
-css/pagetools.css         = screen
-css/content.css           = screen
-css/includes.css          = screen
+css/pagetools.less        = screen
+css/content.less          = screen
 
-css/mobile.css            = all
+css/mobile.less           = all
 css/print.css             = print
 
 
 ; This section is used to configure some placeholder values used in
 ; the stylesheets. Changing this file is the simplest method to
 ; give your wiki a new look.
+; Placeholders defined here will also be made available as LESS variables
+; (with surrounding underscores removed, and the prefix @ini_ added)
 
 [replacements]
 
-- 
cgit v1.2.3


From b0df08e2753e34829c2d27f82d25807a4f5bd4b8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 15:55:34 +0200
Subject: make sure calculations are correct

---
 lib/tpl/dokuwiki/css/structure.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less
index 3f22f57e3..f24440f08 100644
--- a/lib/tpl/dokuwiki/css/structure.less
+++ b/lib/tpl/dokuwiki/css/structure.less
@@ -67,14 +67,14 @@ body {
 
 .showSidebar #dokuwiki__content {
     float: right;
-    margin-left: -@ini_sidebar_width;
+    margin-left: (-1 * @ini_sidebar_width);
     width: 100%;
 }
 
 [dir=rtl] .showSidebar #dokuwiki__content {
     float: left;
     margin-left: 0;
-    margin-right: -@ini_sidebar_width;
+    margin-right: (-1 * @ini_sidebar_width);
 }
 
 .showSidebar #dokuwiki__content > .pad {
-- 
cgit v1.2.3


From cbe37079b2519e6a79696ab6525a61498ab3c3a6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 15:56:29 +0200
Subject: convert ini replacements to less vars first

This makes it possible to safely overwrite ini replacements from within
any less file
---
 lib/exe/css.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 04516e8ba..0157e6a40 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -154,6 +154,9 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
+    print $css;
+
+
     // parse LESS
     $less = new lessc();
     $css = $less->compile($css);
@@ -188,15 +191,21 @@ function css_applystyle($css,$tplinc){
     $styleini = css_styleini($tplinc);
 
     if($styleini){
-        $css = strtr($css,$styleini['replacements']);
-
+        // we convert ini replacements to LESS variable names
+        // and build a list of variable: value; pairs
         $less = '';
         foreach($styleini['replacements'] as $key => $value){
-            $key = trim($key, '_');
-            $key = '@ini_'.$key;
-            $less .= "$key: $value;\n";
+            $lkey = trim($key, '_');
+            $lkey = '@ini_'.$lkey;
+            $less .= "$lkey: $value;\n";
+
+            $styleini['replacements'][$key] = $lkey;
         }
 
+        // we now replace all old ini replacements with LESS variables
+        $css = strtr($css, $styleini['replacements']);
+
+        // now prepend the list of LESS variables as the very first thing
         $css = $less.$css;
     }
     return $css;
-- 
cgit v1.2.3


From fbaa87779929e23ede8a79fd3890ef493fdb1d81 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 16:00:28 +0200
Subject: removed debug statement. sorry

---
 lib/exe/css.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 0157e6a40..cd531ef35 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -154,9 +154,6 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
-    print $css;
-
-
     // parse LESS
     $less = new lessc();
     $css = $less->compile($css);
-- 
cgit v1.2.3


From c6f665dd924dfa715fc19140c26d25eddcef9841 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 30 Jul 2013 17:50:17 +0200
Subject: Don't recommend the deprecated default template for JS debugging

---
 lib/scripts/helpers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/helpers.js b/lib/scripts/helpers.js
index fdac13b71..677abbad7 100644
--- a/lib/scripts/helpers.js
+++ b/lib/scripts/helpers.js
@@ -79,7 +79,7 @@ function logError(e, file) {
     if (window.console && console.error) {
         console.error('The error "%s: %s" occurred in file "%s". ' +
             'If this is in a plugin try updating or disabling the plugin, ' +
-            'if this is in a template try updating the template or switching to the "default" or "dokuwiki" template.',
+            'if this is in a template try updating the template or switching to the "dokuwiki" template.',
             e.name, e.message, file);
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From ea9bf4168ca264f9e7ca66fe468f61b9df1fc62a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 30 Jul 2013 17:23:55 +0100
Subject: fixed broken structure

---
 lib/tpl/dokuwiki/style.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index c6962fcd2..24faffdb3 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -33,7 +33,7 @@ css/_edit.css             = screen
 css/_modal.css            = screen
 css/_forms.css            = screen
 css/_admin.css            = screen
-css/structure.css         = screen
+css/structure.less        = screen
 css/design.less           = screen
 css/pagetools.less        = screen
 css/content.less          = screen
-- 
cgit v1.2.3


From b0a0b422439fd5c86ced0c8a7f89bb2b93a11564 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 30 Jul 2013 17:24:54 +0100
Subject: unlessified and lessified a few more css

---
 lib/tpl/dokuwiki/css/content.less   | 27 +++++------
 lib/tpl/dokuwiki/css/design.less    | 94 ++++++++++++++++++-------------------
 lib/tpl/dokuwiki/css/mobile.less    | 52 +++++++++++---------
 lib/tpl/dokuwiki/css/structure.less | 67 ++++++++++++--------------
 4 files changed, 116 insertions(+), 124 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index ae97d7d5e..56551fe3b 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -120,7 +120,6 @@
 /* filenames for downloadable file and code blocks */
 .dokuwiki dl.code,
 .dokuwiki dl.file {
-    dt,
     dt {
         background-color: @ini_background_site;
         .linear-gradient(~"top, @{ini_background_alt} 0%, @{ini_background_site} 100%");
@@ -132,24 +131,22 @@
         padding: .3em .6em .1em;
         margin-bottom: -1px;
         float: left;
-    }
-    dt a,
-    dt a {
-        background-color: transparent;
-        font-size: 0.875em;
-        font-weight: normal;
-        display: block;
-        min-height: 16px;
+
+        a {
+            background-color: transparent;
+            font-size: 0.875em;
+            font-weight: normal;
+            display: block;
+            min-height: 16px;
+        }
     }
 
-    dd,
     dd {
         margin: 0;
         clear: left;
         min-height: 1px; /* for IE7 */
     }
 
-    pre,
     pre {
         box-shadow: inset -4px -4px .5em -.3em @ini_border;
     }
@@ -157,12 +154,10 @@
 
 [dir=rtl] .dokuwiki dl.code,
 [dir=rtl] .dokuwiki dl.file {
-    dt,
     dt {
         float: right;
     }
 
-    dd,
     dd {
         clear: right;
     }
@@ -329,10 +324,10 @@
 
     ul {
         padding: 0 0 0 1.2em;
-    }
 
-    ul li {
-        list-style-image: url(images/toc-bullet.png);
+        li {
+            list-style-image: url(images/toc-bullet.png);
+        }
     }
 
     ul li.clear {
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index aba9c9c7b..42292de49 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -100,11 +100,9 @@
     margin-left: 0;
 }
 
-#dokuwiki__usertools {
-    a.action {
-        padding-left: 20px;
-        background: transparent url(images/usertools.png) no-repeat 0 0;
-    }
+#dokuwiki__usertools a.action {
+    padding-left: 20px;
+    background: transparent url(images/usertools.png) no-repeat 0 0;
 }
 
 [dir=rtl] #dokuwiki__usertools a.action {
@@ -350,17 +348,14 @@
 /* content
 ********************************************************************/
 
-.dokuwiki {
-
-    .pageId {
-        position: absolute;
-        top: -2.3em;
-        right: -1em;
-        overflow: hidden;
-        padding: 1em 1em 0;
-    }
+.dokuwiki .pageId {
+    position: absolute;
+    top: -2.3em;
+    right: -1em;
+    overflow: hidden;
+    padding: 1em 1em 0;
 
-    .pageId span {
+    span {
         font-size: 0.875em;
         border: solid @ini_background_alt;
         border-width: 1px 1px 0;
@@ -372,39 +367,37 @@
         box-shadow: 0 0 .5em @ini_text_alt;
         display: block;
     }
+}
 
-    div.page {
-        background: @ini_background;
-        color: inherit;
-        border: 1px solid @ini_background_alt;
-        box-shadow: 0 0 .5em @ini_text_alt;
-        border-radius: 2px;
-        padding: 1.556em 2em 2em;
-        margin-bottom: .5em;
-        overflow: hidden;
-        word-wrap: break-word;
-    }
+.dokuwiki div.page {
+    background: @ini_background;
+    color: inherit;
+    border: 1px solid @ini_background_alt;
+    box-shadow: 0 0 .5em @ini_text_alt;
+    border-radius: 2px;
+    padding: 1.556em 2em 2em;
+    margin-bottom: .5em;
+    overflow: hidden;
+    word-wrap: break-word;
+}
 
-    .docInfo {
-        font-size: 0.875em;
-        text-align: right;
-    }
+.dokuwiki .docInfo {
+    font-size: 0.875em;
+    text-align: right;
+}
 
-    /* license note under edit window */
-    div.license {
-        font-size: 93.75%;
-    }
+/* license note under edit window */
+.dokuwiki div.license {
+    font-size: 93.75%;
 }
 
-[dir=rtl] .dokuwiki {
-    .docInfo {
-        text-align: left;
-    }
+[dir=rtl] .dokuwiki .docInfo {
+    text-align: left;
+}
 
-    .pageId {
-        right: auto;
-        left: -1em;
-    }
+[dir=rtl] .dokuwiki .pageId {
+    right: auto;
+    left: -1em;
 }
 
 /* footer
@@ -427,15 +420,18 @@
         font-size: 100%;
     }
 
-    div.buttons a img {
-        opacity: 0.5;
-    }
+    div.buttons a {
+        img {
+            opacity: 0.5;
+        }
 
-    div.buttons a:hover img,
-    div.buttons a:active img,
-    div.buttons a:focus img {
-        opacity: 1;
+        &:hover img,
+        &:active img,
+        &:focus img {
+            opacity: 1;
+        }
     }
+
 }
 
 [dir=rtl] #dokuwiki__footer .license img {
diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index 4362656a1..289f5afa3 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -40,22 +40,24 @@
 
 #dokuwiki__aside h3.toggle {
     font-size: 1em;
-}
-#dokuwiki__aside h3.toggle.closed {
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-#dokuwiki__aside h3.toggle.open {
-    border-bottom: 1px solid @ini_border;
+
+    &.closed {
+        margin-bottom: 0;
+        padding-bottom: 0;
+    }
+    &.open {
+        border-bottom: 1px solid @ini_border;
+    }
 }
 
 .showSidebar #dokuwiki__content {
     float: none;
     margin-left: 0;
     width: 100%;
-}
-.showSidebar #dokuwiki__content > .pad {
-    margin-left: 0;
+
+    > .pad {
+        margin-left: 0;
+    }
 }
 
 [dir=rtl] .showSidebar #dokuwiki__content,
@@ -133,9 +135,10 @@ body {
 
 #dokuwiki__site {
     max-width: 100%;
-}
-#dokuwiki__site > .site {
-    padding: 0 .5em;
+
+    > .site {
+        padding: 0 .5em;
+    }
 }
 #dokuwiki__header {
     padding: .5em 0;
@@ -154,19 +157,21 @@ body {
     list-style: none;
     padding-left: 0;
     margin: 0;
+
+    li {
+        margin-left: .35em;
+        display: inline;
+    }
 }
 [dir=rtl] #dokuwiki__header ul.a11y.skip {
     left: auto !important;
     right: 0 !important;
     float: left;
     padding-right: 0;
-}
-#dokuwiki__header ul.a11y.skip li {
-    margin-left: .35em;
-    display: inline;
-}
-[dir=rtl] #dokuwiki__header ul.a11y.skip li {
-    margin: 0 .35em 0 0;
+
+    li {
+        margin: 0 .35em 0 0;
+    }
 }
 
 #dokuwiki__header .headings,
@@ -264,13 +269,14 @@ body {
 
 .dokuwiki label.block {
     text-align: left;
+
+    span {
+        display: block;
+    }
 }
 [dir=rtl] .dokuwiki label.block {
     text-align: right;
 }
-.dokuwiki label.block span {
-    display: block;
-}
 
 /* _edit */
 .dokuwiki div.section_highlight {
diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less
index f24440f08..3ea2f83eb 100644
--- a/lib/tpl/dokuwiki/css/structure.less
+++ b/lib/tpl/dokuwiki/css/structure.less
@@ -18,28 +18,27 @@ body {
 
 #dokuwiki__header {
     width: 100%;
-}
 
-#dokuwiki__header > .pad {
-}
+    .headings {
+        float: left;
+    }
 
-#dokuwiki__header .headings {
-    float: left;
+    .tools {
+        float: right;
+        text-align: right;
+    }
 }
 
-[dir=rtl] #dokuwiki__header .headings {
-    float: right;
-    text-align: right;
-}
+[dir=rtl] #dokuwiki__header {
+    .headings {
+        float: right;
+        text-align: right;
+    }
 
-#dokuwiki__header .tools {
-    float: right;
-    text-align: right;
-}
-
-[dir=rtl] #dokuwiki__header .tools {
-    float: left;
-    text-align: left;
+    .tools {
+        float: left;
+        text-align: left;
+    }
 }
 
 #dokuwiki__site .wrapper {
@@ -51,44 +50,40 @@ body {
     float: left;
     position: relative;
     display: block;
+
+    > .pad {
+        margin: 0 1.5em 0 0;
+    }
 }
 
 [dir=rtl] #dokuwiki__aside {
     float: right;
-}
-
-#dokuwiki__aside > .pad {
-    margin: 0 1.5em 0 0;
-}
-
-[dir=rtl] #dokuwiki__aside > .pad {
-    margin: 0 0 0 1.5em;
+    > .pad {
+        margin: 0 0 0 1.5em;
+    }
 }
 
 .showSidebar #dokuwiki__content {
     float: right;
     margin-left: (-1 * @ini_sidebar_width);
     width: 100%;
+
+    > .pad {
+        margin-left: @ini_sidebar_width;
+    }
 }
 
 [dir=rtl] .showSidebar #dokuwiki__content {
     float: left;
     margin-left: 0;
     margin-right: (-1 * @ini_sidebar_width);
-}
 
-.showSidebar #dokuwiki__content > .pad {
-    margin-left: @ini_sidebar_width;
-}
-
-[dir=rtl] .showSidebar #dokuwiki__content > .pad {
-    margin-left: 0;
-    margin-right: @ini_sidebar_width;
+    > .pad {
+        margin-left: 0;
+        margin-right: @ini_sidebar_width;
+    }
 }
 
 #dokuwiki__footer {
     clear: both;
 }
-
-#dokuwiki__footer > .pad {
-}
-- 
cgit v1.2.3


From e8e5221c8fef184d755602564343787c9e3196d9 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 31 Jul 2013 11:56:08 +0100
Subject: switched to LESS variables in rest of template's css files

---
 lib/tpl/dokuwiki/css/_admin.css            |  2 +-
 lib/tpl/dokuwiki/css/_diff.css             |  2 +-
 lib/tpl/dokuwiki/css/_edit.css             | 12 ++++-----
 lib/tpl/dokuwiki/css/_fileuploader.css     |  8 +++---
 lib/tpl/dokuwiki/css/_footnotes.css        |  2 +-
 lib/tpl/dokuwiki/css/_forms.css            |  2 +-
 lib/tpl/dokuwiki/css/_media_fullscreen.css | 40 +++++++++++++++---------------
 lib/tpl/dokuwiki/css/_media_popup.css      | 12 ++++-----
 lib/tpl/dokuwiki/css/_modal.css            | 10 ++++----
 lib/tpl/dokuwiki/css/_search.css           |  6 ++---
 lib/tpl/dokuwiki/css/_tabs.css             | 14 +++++------
 lib/tpl/dokuwiki/css/_toc.css              |  2 +-
 lib/tpl/dokuwiki/css/pagetools.less        | 10 ++++----
 lib/tpl/dokuwiki/style.ini                 | 32 ++++++++++++------------
 14 files changed, 77 insertions(+), 77 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css
index c8f3694b5..a9518d0ed 100644
--- a/lib/tpl/dokuwiki/css/_admin.css
+++ b/lib/tpl/dokuwiki/css/_admin.css
@@ -50,7 +50,7 @@
 .dokuwiki #admin__version {
     clear: left;
     float: right;
-    color: __text_neu__;
+    color: @ini_text_neu;
     background-color: inherit;
 }
 [dir=rtl] .dokuwiki #admin__version {
diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css
index 58c24b5c7..b7c82d829 100644
--- a/lib/tpl/dokuwiki/css/_diff.css
+++ b/lib/tpl/dokuwiki/css/_diff.css
@@ -19,7 +19,7 @@
 
 /* table header */
 .dokuwiki table.diff th {
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
     font-size: 110%;
     font-weight: normal;
 }
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 92ce62126..f40aaa891 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -16,7 +16,7 @@
 }
 #draft__status {
     float: right;
-    color: __text_alt__;
+    color: @ini_text_alt;
     background-color: inherit;
 }
 [dir=rtl] #draft__status {
@@ -35,8 +35,8 @@
 /* picker popups (outside of .dokuwiki) */
 div.picker {
     width: 300px;
-    border: 1px solid __border__;
-    background-color: __background_alt__;
+    border: 1px solid @ini_border;
+    background-color: @ini_background_alt;
     color: inherit;
 }
 /* picker for headlines */
@@ -106,7 +106,7 @@ div.picker button.toolbutton {
 }
 /* change background colour if summary is missing */
 .dokuwiki .editBar .summary input.missing {
-    color: __text__;
+    color: @ini_text;
     background-color: #ffcccc;
 }
 
@@ -114,7 +114,7 @@ div.picker button.toolbutton {
 ********************************************************************/
 
 .dokuwiki div.preview {
-    border: dotted __border__;
+    border: dotted @ini_border;
     border-width: .2em 0;
     padding: 1.4em 0;
     margin-bottom: 1.4em;
@@ -138,6 +138,6 @@ div.picker button.toolbutton {
 .dokuwiki div.section_highlight {
     margin: 0 -1em; /* negative side margin = side padding + side border */
     padding: 0 .5em;
-    border: solid __background_alt__;
+    border: solid @ini_background_alt;
     border-width: 0 .5em;
 }
diff --git a/lib/tpl/dokuwiki/css/_fileuploader.css b/lib/tpl/dokuwiki/css/_fileuploader.css
index 42004de28..3c2cd4683 100644
--- a/lib/tpl/dokuwiki/css/_fileuploader.css
+++ b/lib/tpl/dokuwiki/css/_fileuploader.css
@@ -42,8 +42,8 @@
     height: 100%;
     min-height: 70px;
     z-index: 2;
-    background: __background_neu__;
-    color: __text__;
+    background: @ini_background_neu;
+    color: @ini_text;
     text-align: center;
 }
 
@@ -57,7 +57,7 @@
 }
 
 .qq-upload-drop-area-active {
-    background: __background_alt__;
+    background: @ini_background_alt;
 }
 
 /* list of files to upload */
@@ -70,7 +70,7 @@ div.qq-uploader ul {
 
 .qq-uploader li {
     margin: 0 0 5px;
-    color: __text__;
+    color: @ini_text;
 }
 
 .qq-uploader li span,
diff --git a/lib/tpl/dokuwiki/css/_footnotes.css b/lib/tpl/dokuwiki/css/_footnotes.css
index a20f2964e..5d5f7ca30 100644
--- a/lib/tpl/dokuwiki/css/_footnotes.css
+++ b/lib/tpl/dokuwiki/css/_footnotes.css
@@ -16,7 +16,7 @@ div.insitu-footnote {
 /*____________ footnotes at the bottom of the page ____________*/
 
 .dokuwiki div.footnotes {
-    border-top: 1px solid __border__;
+    border-top: 1px solid @ini_border;
     padding: .5em 0 0 0;
     margin: 1em 0 0 0;
     clear: both;
diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 6744750ba..940a27f80 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -48,7 +48,7 @@
 .dokuwiki fieldset {
   width: 400px;
   text-align: center;
-  border: 1px solid __border__;
+  border: 1px solid @ini_border;
   padding: 0.5em;
   margin: auto;
 }
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 8d5e1e8ca..28e347882 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -38,7 +38,7 @@
 }
 
 #mediamanager__page .panelHeader {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
     margin: 0 10px 10px 0;
     padding: 10px 10px 8px;
     text-align: left;
@@ -68,7 +68,7 @@
     background: transparent url(../../images/resizecol.png) center center no-repeat;
 }
 #mediamanager__page .ui-resizable-e:hover {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 
 
@@ -99,10 +99,10 @@
     margin: 0 0 0 .3em;
     border-radius: .5em .5em 0 0;
     font-weight: normal;
-    background-color: __background_alt__;
-    color: __text__;
-    border: 1px solid __border__;
-    border-bottom-color: __background_alt__;
+    background-color: @ini_background_alt;
+    color: @ini_text;
+    border: 1px solid @ini_border;
+    border-bottom-color: @ini_background_alt;
     line-height: 1.4em;
     position: relative;
     bottom: -1px;
@@ -118,7 +118,7 @@
     right: 10px;
 }
 #mediamanager__page .namespaces .panelHeader {
-    border-top: 1px solid __border__;
+    border-top: 1px solid @ini_border;
     z-index: 1;
 }
 
@@ -164,7 +164,7 @@
     padding: 0;
 }
 #mediamanager__page .panelHeader ul li {
-    color: __text__;
+    color: @ini_text;
     float: left;
     line-height: 1;
     padding-left: 3px;
@@ -205,7 +205,7 @@
 }
 
 #mediamanager__page .filelist .panelContent ul li:hover {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 
 #mediamanager__page .filelist li dt a {
@@ -231,8 +231,8 @@
     display: -moz-inline-stack;
     /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
     margin: 0 6px 10px 0;
-    background-color: __background_neu__;
-    color: __text__;
+    background-color: @ini_background_neu;
+    color: @ini_text;
     padding: 5px;
     vertical-align: top;
     text-align: center;
@@ -287,13 +287,13 @@
     max-height: 50px;
     margin: 0;
     margin-bottom: 3px;
-    background-color: __background__;
-    color: __text__;
+    background-color: @ini_background;
+    color: @ini_text;
     overflow: hidden;
 }
 
 #mediamanager__page .filelist .rows li:nth-child(2n+1) {
-    background-color: __background_neu__;
+    background-color: @ini_background_neu;
 }
 
 #mediamanager__page .filelist .rows li dt {
@@ -372,11 +372,11 @@
 #mediamanager__page .file dl dt {
     font-weight: bold;
     display: block;
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 #mediamanager__page .file dl dd {
     display: block;
-    background-color: __background_neu__;
+    background-color: @ini_background_neu;
 }
 
 
@@ -415,7 +415,7 @@
 
 #mediamanager__page #page__revisions ul li div.li div {
     font-size: 90%;
-    color: __text_neu__;
+    color: @ini_text_neu;
     padding-left: 18px;
 }
 
@@ -438,7 +438,7 @@
     padding: 0;
     vertical-align: top;
     text-align: left;
-    border-color: __background__;
+    border-color: @ini_background;
 }
 [dir=rtl] #mediamanager__diff td,
 [dir=rtl] #mediamanager__diff th {
@@ -447,7 +447,7 @@
 
 #mediamanager__diff th {
     font-weight: normal;
-    background-color: __background__;
+    background-color: @ini_background;
     line-height: 1.2;
 }
 #mediamanager__diff th a {
@@ -459,7 +459,7 @@
 
 #mediamanager__diff dl dd strong{
     background-color: __highlight__;
-    color: __text__;
+    color: @ini_text;
     font-weight: normal;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css
index c776e6b8a..1fefd68b6 100644
--- a/lib/tpl/dokuwiki/css/_media_popup.css
+++ b/lib/tpl/dokuwiki/css/_media_popup.css
@@ -20,13 +20,13 @@ html.popup {
     overflow: auto;
     position: absolute;
     left: 0;
-    border-right: 1px solid __border__;
+    border-right: 1px solid @ini_border;
 }
 [dir=rtl] #mediamgr__aside {
     left: auto;
     right: 0;
     border-right-width: 0;
-    border-left: 1px solid __border__;
+    border-left: 1px solid @ini_border;
 }
 #mediamgr__aside .pad {
     padding: .5em;
@@ -52,7 +52,7 @@ html.popup {
     font-size: 1.5em;
     margin-bottom: .5em;
     padding-bottom: .2em;
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
 }
 
 /* left side
@@ -141,13 +141,13 @@ html.popup {
     padding: .5em;
 }
 #media__content .odd {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 #media__content .even {
 }
 /* highlight newly uploaded or edited file */
 #media__content #scroll__here {
-    border: 1px dashed __border__;
+    border: 1px dashed @ini_border;
 }
 
 /* link which inserts media file */
@@ -167,7 +167,7 @@ html.popup {
 
 /* info how to insert media, if JS disabled */
 #media__content div.example {
-    color: __text_neu__;
+    color: @ini_text_neu;
     margin-left: 1em;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css
index a3d3be194..a46dff30e 100644
--- a/lib/tpl/dokuwiki/css/_modal.css
+++ b/lib/tpl/dokuwiki/css/_modal.css
@@ -18,11 +18,11 @@
 }
 
 #link__wiz_result {
-    background-color: __background__;
+    background-color: @ini_background;
     width:  293px;
     height: 193px;
     overflow: auto;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
     margin: 3px auto;
     text-align: left;
     line-height: 1;
@@ -57,16 +57,16 @@
 }
 
 #link__wiz_result div.even {
-    background-color: __background_neu__;
+    background-color: @ini_background_neu;
 }
 
 #link__wiz_result div.selected {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 
 #link__wiz_result span {
     display: block;
-    color: __text_neu__;
+    color: @ini_text_neu;
     margin-left: 22px;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css
index 0090308c9..a8972ae72 100644
--- a/lib/tpl/dokuwiki/css/_search.css
+++ b/lib/tpl/dokuwiki/css/_search.css
@@ -44,14 +44,14 @@
 }
 /* search snippet */
 .dokuwiki dl.search_results dd {
-    color: __text_alt__;
+    color: @ini_text_alt;
     background-color: inherit;
     margin: 0 0 1.2em 0;
 }
 
 /* search hit in normal text */
 .dokuwiki .search_hit {
-    color: __text__;
+    color: @ini_text;
     background-color: __highlight__;
 }
 /* search hit in search results */
@@ -60,7 +60,7 @@
 }
 /* ellipsis separating snippets */
 .dokuwiki .search_results .search_sep {
-    color: __text__;
+    color: @ini_text;
     background-color: inherit;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css
index 845ec9a57..860545a27 100644
--- a/lib/tpl/dokuwiki/css/_tabs.css
+++ b/lib/tpl/dokuwiki/css/_tabs.css
@@ -17,7 +17,7 @@
     width: 100%;
     bottom: 0;
     left: 0;
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
     z-index: 1;
 }
 
@@ -39,9 +39,9 @@
     display: inline-block;
     padding: .3em .8em;
     margin: 0 0 0 .3em;
-    background-color: __background_neu__;
-    color: __text__;
-    border: 1px solid __border__;
+    background-color: @ini_background_neu;
+    color: @ini_text;
+    border: 1px solid @ini_border;
     border-radius: .5em .5em 0 0;
     position: relative;
     z-index: 0;
@@ -68,8 +68,8 @@
 .dokuwiki ul.tabs li a:active,
 .dokuwiki ul.tabs li a:focus,
 .dokuwiki ul.tabs li strong {
-    background-color: __background_alt__;
-    color: __text__;
+    background-color: @ini_background_alt;
+    color: @ini_text;
     text-decoration: none;
     font-weight: normal;
 }
@@ -78,5 +78,5 @@
 .dokuwiki .tabs > ul li .active a,
 .dokuwiki ul.tabs li strong {
     z-index: 2;
-    border-bottom-color: __background_alt__;
+    border-bottom-color: @ini_background_alt;
 }
diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css
index 1226b5b5b..469e9278c 100644
--- a/lib/tpl/dokuwiki/css/_toc.css
+++ b/lib/tpl/dokuwiki/css/_toc.css
@@ -11,7 +11,7 @@
     float: right;
     margin: 0 0 1.4em 1.4em;
     width: 12em;
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
     color: inherit;
 }
 [dir=rtl] #dw__toc {
diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index 21e5c13ec..2e316122f 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -101,10 +101,10 @@
 #dokuwiki__pagetools:hover ul,
 #dokuwiki__pagetools ul li a:focus,
 #dokuwiki__pagetools ul li a:active {
-    background-color: __background__;
-    border-color: __border__;
+    background-color: @ini_background;
+    border-color: @ini_border;
     border-radius: 2px;
-    box-shadow: 2px 2px 2px __text_alt__;
+    box-shadow: 2px 2px 2px @ini_text_alt;
 }
 
 #dokuwiki__pagetools:hover ul li a,
@@ -124,7 +124,7 @@
 
 [dir=rtl] #dokuwiki__pagetools:hover ul,
 [dir=rtl] #dokuwiki__pagetools ul li a:focus {
-    box-shadow: -2px 2px 2px __text_alt__;
+    box-shadow: -2px 2px 2px @ini_text_alt;
 }
 
 [dir=rtl] #dokuwiki__pagetools:hover li a,
@@ -158,7 +158,7 @@
     text-decoration: none;
 }
 #dokuwiki__pagetools ul li a:hover {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 
 /*____________ all available icons in sprite ____________*/
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 24faffdb3..897b6e6da 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -54,32 +54,32 @@ css/print.css             = print
 ;------ guaranteed dokuwiki color placeholders that every plugin can use
 
 ; main text and background colors
-__text__            = "#333"
-__background__      = "#fff"
+__text__            = "#333"            ; @ini_text
+__background__      = "#fff"            ; @ini_background
 ; alternative text and background colors
-__text_alt__        = "#999"
-__background_alt__  = "#eee"
+__text_alt__        = "#999"            ; @ini_text_alt
+__background_alt__  = "#eee"            ; @ini_background_alt
 ; neutral text and background colors
-__text_neu__        = "#666"
-__background_neu__  = "#ddd"
+__text_neu__        = "#666"            ; @ini_text_neu
+__background_neu__  = "#ddd"            ; @ini_background_neu
 ; border color
-__border__          = "#ccc"
+__border__          = "#ccc"            ; @ini_border
 
 ; highlighted text (e.g. search snippets)
-__highlight__       = "#ff9"
+__highlight__       = "#ff9"            ; @ini_highlight
 
 ;--------------------------------------------------------------------------
 
-__background_site__ = "#fbfaf9"
+__background_site__ = "#fbfaf9"         ; @ini_background_site
 
 ; these are used for links
-__link__            = "#2b73b7"
-__existing__        = "#080"
-__missing__         = "#d30"
+__link__            = "#2b73b7"         ; @ini_link
+__existing__        = "#080"            ; @ini_existing
+__missing__         = "#d30"            ; @ini_missing
 
 ; site and sidebar widths
-__site_width__      = "75em"
-__sidebar_width__   = "16em"
+__site_width__      = "75em"            ; @ini_site_width
+__sidebar_width__   = "16em"            ; @ini_sidebar_width
 ; cut off points for mobile devices
-__tablet_width__    = "800px"
-__phone_width__     = "480px"
+__tablet_width__    = "800px"           ; @ini_tablet_width
+__phone_width__     = "480px"           ; @ini_phone_width
-- 
cgit v1.2.3


From fd975da73e627193ca68a681ea6b2556c8327f63 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 31 Jul 2013 11:58:47 +0100
Subject: removed possibility to have rtl.less files in plugins

---
 lib/exe/css.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index cd531ef35..5c966db82 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -365,7 +365,6 @@ function css_pluginstyles($mediatype='screen'){
         //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
         if($lang['direction'] == 'rtl'){
             $list[DOKU_PLUGIN."$p/rtl.css"] = DOKU_BASE."lib/plugins/$p/";
-            $list[DOKU_PLUGIN."$p/rtl.less"] = DOKU_BASE."lib/plugins/$p/";
         }
     }
     return $list;
-- 
cgit v1.2.3


From 0e1777cbe86faf809f67198704842a01034a1a98 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 31 Jul 2013 17:05:07 +0100
Subject: added aria attributes to tree and show/hide functions

---
 lib/scripts/behaviour.js |  2 ++
 lib/scripts/tree.js      | 20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index f1c46bf4c..85ddf503e 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -5,6 +5,7 @@
  * @author Adrian Lang <mail@adrianlang.de>
  */
 jQuery.fn.dw_hide = function(fn) {
+    this.attr('aria-expanded', 'false');
     return this.slideUp('fast', fn);
 };
 
@@ -15,6 +16,7 @@ jQuery.fn.dw_hide = function(fn) {
  * @author Adrian Lang <mail@adrianlang.de>
  */
 jQuery.fn.dw_show = function(fn) {
+    this.attr('aria-expanded', 'true');
     return this.slideDown('fast', fn);
 };
 
diff --git a/lib/scripts/tree.js b/lib/scripts/tree.js
index 96763053d..c4e1da3f7 100644
--- a/lib/scripts/tree.js
+++ b/lib/scripts/tree.js
@@ -14,6 +14,12 @@ jQuery.fn.dw_tree = function(overrides) {
         init: function () {
             this.$obj.delegate(this.toggle_selector, 'click', this,
                                this.toggle);
+            jQuery('ul:first', this.$obj).attr('role', 'tree');
+            jQuery('ul', this.$obj).not(':first').attr('role', 'group');
+            jQuery('li', this.$obj).attr('role', 'treeitem');
+            jQuery('li.open > ul', this.$obj).attr('aria-expanded', 'true');
+            jQuery('li.closed > ul', this.$obj).attr('aria-expanded', 'false');
+            jQuery('li.closed', this.$obj).attr('aria-live', 'assertive');
         },
 
         /**
@@ -35,8 +41,14 @@ jQuery.fn.dw_tree = function(overrides) {
             $listitem = $clicky.closest('li');
             $sublist = $listitem.find('ul').first();
             opening = $listitem.hasClass('closed');
-            $listitem.toggleClass('open closed');
             dw_tree.toggle_display($clicky, opening);
+            if ($sublist.is(':visible')) {
+                $listitem.removeClass('open').addClass('closed');
+                $sublist.attr('aria-expanded', 'false');
+            } else {
+                $listitem.removeClass('closed').addClass('open');
+                $sublist.attr('aria-expanded', 'true');
+            }
 
             // if already open, close by hiding the sublist
             if (!opening) {
@@ -48,6 +60,8 @@ jQuery.fn.dw_tree = function(overrides) {
                 $sublist.hide();
                 if (typeof data !== 'undefined') {
                     $sublist.html(data);
+                    $sublist.parent().attr('aria-busy', 'false').removeAttr('aria-live');
+                    jQuery('li.closed', $sublist).attr('aria-live', 'assertive');
                 }
                 if ($listitem.hasClass('open')) {
                     // Only show if user didn’t close the list since starting
@@ -63,11 +77,11 @@ jQuery.fn.dw_tree = function(overrides) {
             }
 
             //prepare the new ul
-            $sublist = jQuery('<ul class="idx"/>');
+            $sublist = jQuery('<ul class="idx" role="group"/>');
             $listitem.append($sublist);
 
             timeout = window.setTimeout(
-                bind(show_sublist, '<li><img src="' + DOKU_BASE + 'lib/images/throbber.gif" alt="loading..." title="loading..." /></li>'), dw_tree.throbber_delay);
+                bind(show_sublist, '<li aria-busy="true"><img src="' + DOKU_BASE + 'lib/images/throbber.gif" alt="loading..." title="loading..." /></li>'), dw_tree.throbber_delay);
 
             dw_tree.load_data(function (data) {
                                   window.clearTimeout(timeout);
-- 
cgit v1.2.3


From 0320882f767e5685df9d7ac4bec5a3e3f1b1f216 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Wed, 31 Jul 2013 17:57:58 +0200
Subject: Remove search_references() and the refshow configuration option

The refshow configuration option wasn't used as described anymore
already in the latest release and after the introduction of the media
usage index the parameter is also no longer relevant for internal
optimization. The only place where it was still used is the no longer
used search_references()-function which is removed here, too.
---
 lib/plugins/config/lang/ar/lang.php             | 1 -
 lib/plugins/config/lang/bg/lang.php             | 1 -
 lib/plugins/config/lang/ca-valencia/lang.php    | 1 -
 lib/plugins/config/lang/ca/lang.php             | 1 -
 lib/plugins/config/lang/cs/lang.php             | 1 -
 lib/plugins/config/lang/da/lang.php             | 1 -
 lib/plugins/config/lang/de-informal/lang.php    | 1 -
 lib/plugins/config/lang/de/lang.php             | 1 -
 lib/plugins/config/lang/el/lang.php             | 1 -
 lib/plugins/config/lang/en/lang.php             | 1 -
 lib/plugins/config/lang/eo/lang.php             | 1 -
 lib/plugins/config/lang/es/lang.php             | 1 -
 lib/plugins/config/lang/eu/lang.php             | 1 -
 lib/plugins/config/lang/fa/lang.php             | 1 -
 lib/plugins/config/lang/fi/lang.php             | 1 -
 lib/plugins/config/lang/fr/lang.php             | 1 -
 lib/plugins/config/lang/gl/lang.php             | 1 -
 lib/plugins/config/lang/he/lang.php             | 1 -
 lib/plugins/config/lang/hu/lang.php             | 1 -
 lib/plugins/config/lang/ia/lang.php             | 1 -
 lib/plugins/config/lang/it/lang.php             | 1 -
 lib/plugins/config/lang/ja/lang.php             | 1 -
 lib/plugins/config/lang/ko/lang.php             | 1 -
 lib/plugins/config/lang/la/lang.php             | 1 -
 lib/plugins/config/lang/lv/lang.php             | 1 -
 lib/plugins/config/lang/mr/lang.php             | 1 -
 lib/plugins/config/lang/nl/lang.php             | 1 -
 lib/plugins/config/lang/no/lang.php             | 1 -
 lib/plugins/config/lang/pl/lang.php             | 1 -
 lib/plugins/config/lang/pt-br/lang.php          | 1 -
 lib/plugins/config/lang/pt/lang.php             | 1 -
 lib/plugins/config/lang/ro/lang.php             | 1 -
 lib/plugins/config/lang/ru/lang.php             | 1 -
 lib/plugins/config/lang/sk/lang.php             | 1 -
 lib/plugins/config/lang/sl/lang.php             | 1 -
 lib/plugins/config/lang/sq/lang.php             | 1 -
 lib/plugins/config/lang/sr/lang.php             | 1 -
 lib/plugins/config/lang/sv/lang.php             | 1 -
 lib/plugins/config/lang/tr/lang.php             | 1 -
 lib/plugins/config/lang/uk/lang.php             | 1 -
 lib/plugins/config/lang/zh-tw/lang.php          | 1 -
 lib/plugins/config/lang/zh/lang.php             | 1 -
 lib/plugins/config/settings/config.metadata.php | 1 -
 43 files changed, 43 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php
index 76c155812..11b59dacd 100644
--- a/lib/plugins/config/lang/ar/lang.php
+++ b/lib/plugins/config/lang/ar/lang.php
@@ -104,7 +104,6 @@ $lang['target____media']       = 'النافذة الهدف لروابط الو
 $lang['target____windows']     = 'النافذة الهدف لروابط النوافذ';
 $lang['mediarevisions']        = 'تفعيل إصدارات الوسائط؟';
 $lang['refcheck']              = 'التحقق من مرجع الوسائط';
-$lang['refshow']               = 'عدد مراجع الوسائط لتعرض';
 $lang['gdlib']                 = 'اصدار مكتبة GD';
 $lang['im_convert']            = 'المسار إلى اداة تحويل ImageMagick';
 $lang['jpg_quality']           = 'دقة ضغط JPG (0-100)';
diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php
index 43c961bfc..1a370eafe 100644
--- a/lib/plugins/config/lang/bg/lang.php
+++ b/lib/plugins/config/lang/bg/lang.php
@@ -136,7 +136,6 @@ $lang['target____windows']   = 'Прозорец за препратки към
 /* Media Settings */
 $lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?';
 $lang['refcheck']    = 'Проверка за препратка към медия, преди да бъде изтрита';
-$lang['refshow']     = 'Брой на показваните медийни препратки';
 $lang['gdlib']       = 'Версия на GD Lib';
 $lang['im_convert']  = 'Път до инструмента за трансформация на ImageMagick';
 $lang['jpg_quality'] = 'Качество на JPG компресията (0-100)';
diff --git a/lib/plugins/config/lang/ca-valencia/lang.php b/lib/plugins/config/lang/ca-valencia/lang.php
index 4a8c10895..dd319bdb7 100644
--- a/lib/plugins/config/lang/ca-valencia/lang.php
+++ b/lib/plugins/config/lang/ca-valencia/lang.php
@@ -62,7 +62,6 @@ $lang['camelcase']             = 'Utilisar CamelCase per als vínculs';
 $lang['deaccent']              = 'Depurar els noms de pàgines';
 $lang['useheading']            = 'Utilisar el primer titular per al nom de pàgina';
 $lang['refcheck']              = 'Comprovar referències a mijos';
-$lang['refshow']               = 'Número de referències a mijos a mostrar';
 $lang['allowdebug']            = 'Permetre depurar (<b>¡desactivar quan no es necessite!</b>)';
 $lang['usewordblock']          = 'Bloquejar spam basant-se en una llista de paraules';
 $lang['indexdelay']            = 'Retart abans d\'indexar (seg.)';
diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php
index 205d7aa6b..6de8caf02 100644
--- a/lib/plugins/config/lang/ca/lang.php
+++ b/lib/plugins/config/lang/ca/lang.php
@@ -102,7 +102,6 @@ $lang['target____extern']      = 'Finestra de destinació en enllaços externs';
 $lang['target____media']       = 'Finestra de destinació en enllaços de mitjans';
 $lang['target____windows']     = 'Finestra de destinació en enllaços de Windows';
 $lang['refcheck']              = 'Comprova la referència en els fitxers de mitjans';
-$lang['refshow']               = 'Nombre de referències de mitjans per mostrar';
 $lang['gdlib']                 = 'Versió GD Lib';
 $lang['im_convert']            = 'Camí de la utilitat convert d\'ImageMagick';
 $lang['jpg_quality']           = 'Qualitat de compressió JPEG (0-100)';
diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php
index d35ebec9b..921abb54a 100644
--- a/lib/plugins/config/lang/cs/lang.php
+++ b/lib/plugins/config/lang/cs/lang.php
@@ -119,7 +119,6 @@ $lang['target____media']       = 'Cílové okno pro odkazy na média';
 $lang['target____windows']     = 'Cílové okno pro odkazy na windows sdílení';
 $lang['mediarevisions']        = 'Aktivovat revize souborů';
 $lang['refcheck']              = 'Kontrolovat odkazy na média (před vymazáním)';
-$lang['refshow']               = 'Počet zobrazených odkazů na média';
 $lang['gdlib']                 = 'Verze GD knihovny';
 $lang['im_convert']            = 'Cesta k nástroji convert z balíku ImageMagick';
 $lang['jpg_quality']           = 'Kvalita komprese JPEG (0-100)';
diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php
index 239a4986f..79d8dc852 100644
--- a/lib/plugins/config/lang/da/lang.php
+++ b/lib/plugins/config/lang/da/lang.php
@@ -110,7 +110,6 @@ $lang['target____media']       = 'Målvindue for mediehenvisninger';
 $lang['target____windows']     = 'Målvindue til Windows-henvisninger';
 $lang['mediarevisions']        = 'Akvtivér media udgaver?';
 $lang['refcheck']              = 'Mediehenvisningerkontrol';
-$lang['refshow']               = 'Antal viste mediehenvisninger';
 $lang['gdlib']                 = 'Udgave af GD Lib';
 $lang['im_convert']            = 'Sti til ImageMagick\'s omdannerværktøj';
 $lang['jpg_quality']           = 'JPG komprimeringskvalitet (0-100)';
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 10fa363dc..81cdc0e70 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -108,7 +108,6 @@ $lang['target____media']       = 'Zielfenstername für Medienlinks';
 $lang['target____windows']     = 'Zielfenstername für Windows-Freigaben-Links';
 $lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
-$lang['refshow']               = 'Wie viele Verwendungsorte der Media-Datei zeigen';
 $lang['gdlib']                 = 'GD Lib Version';
 $lang['im_convert']            = 'Pfad zu ImageMagicks-Konvertierwerkzeug';
 $lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index dd29f8038..f2ada5f7b 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -78,7 +78,6 @@ $lang['camelcase']             = 'CamelCase-Verlinkungen verwenden';
 $lang['deaccent']              = 'Seitennamen bereinigen';
 $lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
-$lang['refshow']               = 'Wiev iele Verwendungsorte der Media-Datei zeigen';
 $lang['allowdebug']            = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>';
 $lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['usewordblock']          = 'Spam-Blocking benutzen';
diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php
index d2801e507..e766c1a4c 100644
--- a/lib/plugins/config/lang/el/lang.php
+++ b/lib/plugins/config/lang/el/lang.php
@@ -111,7 +111,6 @@ $lang['target____media']       = 'Παράθυρο-στόχος για συνδ
 $lang['target____windows']     = 'Παράθυρο-στόχος για συνδέσμους σε Windows shares';
 $lang['mediarevisions']        = 'Ενεργοποίηση Mediarevisions;';
 $lang['refcheck']              = 'Πριν τη διαγραφή ενός αρχείου να ελέγχεται η ύπαρξη σελίδων που το χρησιμοποιούν';
-$lang['refshow']               = 'Εμφανιζόμενος αριθμός σελίδων που χρησιμοποιούν ένα αρχείο';
 $lang['gdlib']                 = 'Έκδοση βιβλιοθήκης GD';
 $lang['im_convert']            = 'Διαδρομή προς το εργαλείο μετατροπής εικόνων του ImageMagick';
 $lang['jpg_quality']           = 'Ποιότητα συμπίεσης JPG (0-100)';
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 83c843b3a..2d012701b 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -134,7 +134,6 @@ $lang['target____windows']   = 'Target window for windows links';
 /* Media Settings */
 $lang['mediarevisions'] = 'Enable Mediarevisions?';
 $lang['refcheck']    = 'Check if a media file is still in use before deleting it';
-$lang['refshow']     = 'Number of media references to show when the above setting is enabled';
 $lang['gdlib']       = 'GD Lib version';
 $lang['im_convert']  = 'Path to ImageMagick\'s convert tool';
 $lang['jpg_quality'] = 'JPG compression quality (0-100)';
diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php
index 36f865c28..b3300c1b5 100644
--- a/lib/plugins/config/lang/eo/lang.php
+++ b/lib/plugins/config/lang/eo/lang.php
@@ -108,7 +108,6 @@ $lang['target____media']       = 'Parametro "target" (celo) por aŭdvidaĵaj lig
 $lang['target____windows']     = 'Parametro "target" (celo) por Vindozaj ligiloj';
 $lang['mediarevisions']        = 'Ĉu ebligi reviziadon de aŭdvidaĵoj?';
 $lang['refcheck']              = 'Kontrolo por referencoj al aŭdvidaĵoj';
-$lang['refshow']               = 'Nombro da referencoj al aŭdvidaĵoj por montri';
 $lang['gdlib']                 = 'Versio de GD-Lib';
 $lang['im_convert']            = 'Pado al la konvertilo de ImageMagick';
 $lang['jpg_quality']           = 'Kompaktiga kvalito de JPG (0-100)';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index 5d03efb60..3a2db95b8 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -121,7 +121,6 @@ $lang['target____media']       = 'Ventana para enlaces a medios';
 $lang['target____windows']     = 'Ventana para enlaces a ventanas';
 $lang['mediarevisions']        = '¿Habilitar Mediarevisions?';
 $lang['refcheck']              = 'Control de referencia a medios';
-$lang['refshow']               = 'Número de referencias a medios a mostrar';
 $lang['gdlib']                 = 'Versión de GD Lib';
 $lang['im_convert']            = 'Ruta a la herramienta de conversión de ImageMagick';
 $lang['jpg_quality']           = 'Calidad de compresión de JPG (0-100)';
diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php
index 4dd3ff351..280e57df9 100644
--- a/lib/plugins/config/lang/eu/lang.php
+++ b/lib/plugins/config/lang/eu/lang.php
@@ -97,7 +97,6 @@ $lang['target____media']       = 'Multimedia estekentzat helburu leihoa';
 $lang['target____windows']     = 'Leihoen estekentzat helburu leihoa';
 $lang['mediarevisions']        = 'Media rebisioak gaitu?';
 $lang['refcheck']              = 'Multimedia erreferentzia kontrolatu';
-$lang['refshow']               = 'Erakusteko multimedia erreferentzia kopurua';
 $lang['gdlib']                 = 'GD Lib bertsioa';
 $lang['im_convert']            = 'ImageMagick-en aldaketa tresnara bidea';
 $lang['jpg_quality']           = 'JPG konprimitze kalitatea (0-100)';
diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php
index 34c76780c..229fe012e 100644
--- a/lib/plugins/config/lang/fa/lang.php
+++ b/lib/plugins/config/lang/fa/lang.php
@@ -106,7 +106,6 @@ $lang['target____media']       = 'پنجره‌ی هدف در پیوند‌ها
 $lang['target____windows']     = 'پنجره‌ی هدف در پیوند‌های پنجره‌ای';
 $lang['mediarevisions']        = 'تجدید نظر رسانه ، فعال؟';
 $lang['refcheck']              = 'بررسی کردن مرجع رسانه‌ها';
-$lang['refshow']               = 'تعداد مراجعی که برای یک رسانه نمایش داده شود';
 $lang['gdlib']                 = 'نگارش کتاب‌خانه‌ی GD';
 $lang['im_convert']            = 'مسیر ابزار convert از برنامه‌ی ImageMagick';
 $lang['jpg_quality']           = 'کیفیت فشرده سازی JPEG (از 0 تا 100)';
diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php
index 990852f99..a5075d2cf 100644
--- a/lib/plugins/config/lang/fi/lang.php
+++ b/lib/plugins/config/lang/fi/lang.php
@@ -105,7 +105,6 @@ $lang['target____media']       = 'Kohdeikkuna media-linkeissä';
 $lang['target____windows']     = 'Kohdeikkuna Windows-linkeissä';
 $lang['mediarevisions']        = 'Otetaan käyttään Media-versiointi';
 $lang['refcheck']              = 'Mediaviitteen tarkistus';
-$lang['refshow']               = 'Montako mediaviitettä näytetään';
 $lang['gdlib']                 = 'GD Lib versio';
 $lang['im_convert']            = 'ImageMagick-muunnostyökalun polku';
 $lang['jpg_quality']           = 'JPG pakkauslaatu (0-100)';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index f9e89f603..a7b3d5e3b 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -118,7 +118,6 @@ $lang['target____media']       = 'Cible pour liens média';
 $lang['target____windows']     = 'Cible pour liens vers partages Windows';
 $lang['mediarevisions']        = 'Activer les révisions (gestion de versions) des médias';
 $lang['refcheck']              = 'Vérifier si un média est toujours utilisé avant de le supprimer';
-$lang['refshow']               = 'Nombre de références de média à montrer lorsque le paramètre précédent est actif';
 $lang['gdlib']                 = 'Version de la librairie GD';
 $lang['im_convert']            = 'Chemin vers l\'outil de conversion ImageMagick';
 $lang['jpg_quality']           = 'Qualité de la compression JPEG (0-100)';
diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php
index 21fe17452..0dafd9271 100644
--- a/lib/plugins/config/lang/gl/lang.php
+++ b/lib/plugins/config/lang/gl/lang.php
@@ -104,7 +104,6 @@ $lang['target____media']       = 'Fiestra de destino para as ligazóns de media'
 $lang['target____windows']     = 'Fiestra de destino para as ligazóns de fiestras';
 $lang['mediarevisions']        = 'Habilitar revisións dos arquivos-media?';
 $lang['refcheck']              = 'Comprobar a referencia media';
-$lang['refshow']               = 'Número de referencias media a amosar';
 $lang['gdlib']                 = 'Versión da Libraría GD';
 $lang['im_convert']            = 'Ruta deica a ferramenta de conversión ImageMagick';
 $lang['jpg_quality']           = 'Calidade de compresión dos JPG (0-100)';
diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php
index b200082c9..687072764 100644
--- a/lib/plugins/config/lang/he/lang.php
+++ b/lib/plugins/config/lang/he/lang.php
@@ -60,7 +60,6 @@ $lang['camelcase']             = 'השתמש בראשיות גדולות לקי
 $lang['deaccent']              = 'נקה שמות דפים';
 $lang['useheading']            = 'השתמש בכותרת הראשונה לשם הדף';
 $lang['refcheck']              = 'בדוק שיוך מדיה';
-$lang['refshow']               = 'מספר שיוכי המדיה שיוצגו';
 $lang['allowdebug']            = 'אפשר דיבוג <b>יש לבטל אם אין צורך!</b>';
 $lang['usewordblock']          = 'חסימת דואר זבל לפי רשימת מילים';
 $lang['indexdelay']            = 'השהיה בטרם הכנסה לאינדקס (שניות)';
diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php
index c68cf4337..6c47e09a3 100644
--- a/lib/plugins/config/lang/hu/lang.php
+++ b/lib/plugins/config/lang/hu/lang.php
@@ -108,7 +108,6 @@ $lang['target____media']       = 'Cél-ablak média-fájl hivatkozásokhoz';
 $lang['target____windows']     = 'Cél-ablak Windows hivatkozásokhoz';
 $lang['mediarevisions']        = 'Médiafájlok verziókövetésének engedélyezése';
 $lang['refcheck']              = 'Médiafájlok hivatkozásainak ellenőrzése';
-$lang['refshow']               = 'Médiafájlok hivatkozásainak maximálisan mutatott szintje';
 $lang['gdlib']                 = 'GD Lib verzió';
 $lang['im_convert']            = 'Útvonal az ImageMagick csomag convert parancsához';
 $lang['jpg_quality']           = 'JPG tömörítés minősége (0-100)';
diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php
index fdb9d954e..1f4e881bb 100644
--- a/lib/plugins/config/lang/ia/lang.php
+++ b/lib/plugins/config/lang/ia/lang.php
@@ -59,7 +59,6 @@ $lang['camelcase']             = 'Usar CamelCase pro ligamines';
 $lang['deaccent']              = 'Nomines nette de paginas';
 $lang['useheading']            = 'Usar le prime titulo como nomine de pagina';
 $lang['refcheck']              = 'Verification de referentias multimedia';
-$lang['refshow']               = 'Numero de referentias multimedia a monstrar';
 $lang['allowdebug']            = 'Permitter debugging <b>disactiva si non necessari!</b>';
 $lang['usewordblock']          = 'Blocar spam a base de lista de parolas';
 $lang['indexdelay']            = 'Retardo ante generation de indice (secundas)';
diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php
index 62dd00f0c..d2272075a 100644
--- a/lib/plugins/config/lang/it/lang.php
+++ b/lib/plugins/config/lang/it/lang.php
@@ -114,7 +114,6 @@ $lang['target____media']       = 'Finestra di destinazione per i collegamenti ai
 $lang['target____windows']     = 'Finestra di destinazione per i collegamenti alle risorse condivise';
 $lang['mediarevisions']        = 'Abilita Mediarevisions?';
 $lang['refcheck']              = 'Controlla i riferimenti ai file';
-$lang['refshow']               = 'Numero di riferimenti da visualizzare';
 $lang['gdlib']                 = 'Versione GD Lib ';
 $lang['im_convert']            = 'Percorso per il convertitore di ImageMagick';
 $lang['jpg_quality']           = 'Qualità di compressione JPG (0-100)';
diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index 807436cca..15eadf731 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -109,7 +109,6 @@ $lang['target____media']       = 'メディアリンクの表示先';
 $lang['target____windows']     = 'Windowsリンクの表示先';
 $lang['mediarevisions']        = 'メディアファイルの履歴を有効にしますか?';
 $lang['refcheck']              = 'メディア参照元チェック';
-$lang['refshow']               = 'メディア参照元表示数';
 $lang['gdlib']                 = 'GDlibバージョン';
 $lang['im_convert']            = 'ImageMagick変換ツールへのパス';
 $lang['jpg_quality']           = 'JPG圧縮品質（0-100）';
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index f0f7f60fa..74fe3d8a0 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -109,7 +109,6 @@ $lang['target____media']       = '미디어 링크에 대한 타겟 창';
 $lang['target____windows']     = '창 링크에 대한 타겟 창';
 $lang['mediarevisions']        = '미디어 판 관리를 사용하겠습니까?';
 $lang['refcheck']              = '미디어 파일을 삭제하기 전에 사용하고 있는지 검사';
-$lang['refshow']               = '위의 설정이 활성화되었을 때 보여줄 미디어 참고 수';
 $lang['gdlib']                 = 'GD 라이브러리 버전';
 $lang['im_convert']            = 'ImageMagick 변환 도구 위치';
 $lang['jpg_quality']           = 'JPG 압축 품질 (0-100)';
diff --git a/lib/plugins/config/lang/la/lang.php b/lib/plugins/config/lang/la/lang.php
index 057e69974..2aff60753 100644
--- a/lib/plugins/config/lang/la/lang.php
+++ b/lib/plugins/config/lang/la/lang.php
@@ -58,7 +58,6 @@ $lang['camelcase']             = 'SignaContinua nexis apta facere';
 $lang['deaccent']              = 'Titulus paginarum abrogare';
 $lang['useheading']            = 'Capite primo ut titulo paginae uti';
 $lang['refcheck']              = 'Documenta uisiua inspicere';
-$lang['refshow']               = 'Numerus documentorum ostendorum';
 $lang['allowdebug']            = '<b>ineptum facias si non necessarium!</b> aptum facere';
 $lang['usewordblock']          = 'Malum interretiale ob uerba delere';
 $lang['indexdelay']            = 'Tempus transitum in ordinando (sec)';
diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php
index 3adfd1871..7fcf0fa45 100644
--- a/lib/plugins/config/lang/lv/lang.php
+++ b/lib/plugins/config/lang/lv/lang.php
@@ -95,7 +95,6 @@ $lang['target____extern']      = 'Kur atvērt ārējās saites';
 $lang['target____media']       = 'Kur atvērt mēdiju saites';
 $lang['target____windows']     = 'Kur atvērt saites uz tīkla mapēm';
 $lang['refcheck']              = 'Pārbaudīt saites uz mēdiju failiem';
-$lang['refshow']               = 'Cik saites uz mēdiju failiem rādīt';
 $lang['gdlib']                 = 'GD Lib versija';
 $lang['im_convert']            = 'Ceļš uz ImageMagick convert rīku';
 $lang['jpg_quality']           = 'JPG saspiešanas kvalitāte';
diff --git a/lib/plugins/config/lang/mr/lang.php b/lib/plugins/config/lang/mr/lang.php
index 4f33bfa7c..deef82690 100644
--- a/lib/plugins/config/lang/mr/lang.php
+++ b/lib/plugins/config/lang/mr/lang.php
@@ -62,7 +62,6 @@ $lang['camelcase']             = 'लिंकसाठी कॅमलकेस
 $lang['deaccent']              = 'सरळ्सोट पृष्ठ नाम';
 $lang['useheading']            = 'पहिलं शीर्षक पृष्ठ नाम म्हणुन वापरा';
 $lang['refcheck']              = 'दृक्श्राव्य माध्यमाचा संदर्भ तपासा';
-$lang['refshow']               = 'दृक्श्राव्य माध्यामाचे संदर्भ दाखवण्याची संख्या';
 $lang['allowdebug']            = 'डिबगची परवानगी <b> गरज नसल्यास बंद ठेवा !</b>';
 $lang['usewordblock']          = 'भंकस मजकूर थोपवण्यासाठी शब्दसमुह वापरा';
 $lang['indexdelay']            = 'सूचीकरणापूर्वीचा अवकाश ( सेकंदात )';
diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index 26ea3d8c1..9aa17c23d 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -113,7 +113,6 @@ $lang['target____media']       = 'Doelvenster voor medialinks';
 $lang['target____windows']     = 'Doelvenster voor windows links';
 $lang['mediarevisions']        = 'Mediarevisies activeren?';
 $lang['refcheck']              = 'Controleer of er verwijzingen bestaan naar een mediabestand voor het wijderen';
-$lang['refshow']               = 'Aantal te tonen mediaverwijzingen';
 $lang['gdlib']                 = 'Versie GD Lib ';
 $lang['im_convert']            = 'Path naar ImageMagick\'s convert tool';
 $lang['jpg_quality']           = 'JPG compressiekwaliteit (0-100)';
diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php
index b01637dd1..c049c643a 100644
--- a/lib/plugins/config/lang/no/lang.php
+++ b/lib/plugins/config/lang/no/lang.php
@@ -76,7 +76,6 @@ $lang['camelcase']             = 'Gjør KamelKasse til lenke automatisk';
 $lang['deaccent']              = 'Rensk sidenavn';
 $lang['useheading']            = 'Bruk første overskrift som tittel';
 $lang['refcheck']              = 'Sjekk referanser før mediafiler slettes';
-$lang['refshow']               = 'Antall viste referanser til mediafiler';
 $lang['allowdebug']            = 'Tillat feilsøking <b>skru av om det ikke behøves!</b>';
 $lang['mediarevisions']        = 'Slå på mediaversjonering?';
 $lang['usewordblock']          = 'Blokker søppel basert på ordliste';
diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php
index 8441722cd..ede824d75 100644
--- a/lib/plugins/config/lang/pl/lang.php
+++ b/lib/plugins/config/lang/pl/lang.php
@@ -112,7 +112,6 @@ $lang['target____media']       = 'Okno docelowe odnośników do plików';
 $lang['target____windows']     = 'Okno docelowe odnośników zasobów Windows';
 $lang['mediarevisions']        = 'Włączyć wersjonowanie multimediów?';
 $lang['refcheck']              = 'Sprawdzanie odwołań przed usunięciem pliku';
-$lang['refshow']               = 'Ilość pokazywanych odwołań do pliku';
 $lang['gdlib']                 = 'Wersja biblioteki GDLib';
 $lang['im_convert']            = 'Ścieżka do programu imagemagick';
 $lang['jpg_quality']           = 'Jakość kompresji JPG (0-100)';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index 85218439a..6633ab0c4 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -116,7 +116,6 @@ $lang['target____media']       = 'Parâmetro "target" para links de mídia';
 $lang['target____windows']     = 'Parâmetro "target" para links do Windows';
 $lang['mediarevisions']        = 'Habilitar revisões de mídias?';
 $lang['refcheck']              = 'Verificação de referência da mídia';
-$lang['refshow']               = 'Número de referências de mídia a exibir';
 $lang['gdlib']                 = 'Versão da biblioteca "GD Lib"';
 $lang['im_convert']            = 'Caminho para a ferramenta de conversão ImageMagick';
 $lang['jpg_quality']           = 'Qualidade de compressão do JPG (0-100)';
diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php
index d0fe0ac0d..681ff487f 100644
--- a/lib/plugins/config/lang/pt/lang.php
+++ b/lib/plugins/config/lang/pt/lang.php
@@ -63,7 +63,6 @@ $lang['camelcase']             = 'Usar CamelCase';
 $lang['deaccent']              = 'Nomes das páginas sem acentos';
 $lang['useheading']            = 'Usar o primeiro cabeçalho para o nome da página';
 $lang['refcheck']              = 'Verificação de referência da media';
-$lang['refshow']               = 'Número de referências de media a exibir';
 $lang['allowdebug']            = 'Permitir depuração <b>desabilite se não for necessário!</b>';
 $lang['usewordblock']          = 'Bloquear spam baseado em lista de palavras (wordlist)';
 $lang['indexdelay']            = 'Tempo de espera antes da indexação (seg)';
diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php
index 72b205b90..5e853f7d0 100644
--- a/lib/plugins/config/lang/ro/lang.php
+++ b/lib/plugins/config/lang/ro/lang.php
@@ -69,7 +69,6 @@ $lang['camelcase']             = 'Foloseşte CamelCase pentru legături';
 $lang['deaccent']              = 'numedepagină curate';
 $lang['useheading']            = 'Foloseşte primul titlu pentru numele paginii';
 $lang['refcheck']              = 'Verificare referinţă media';
-$lang['refshow']               = 'Numărul de referinţe media de arătat';
 $lang['allowdebug']            = 'Permite depanarea <b>dezactivaţi dacă cu e necesar!</b>';
 $lang['mediarevisions']        = 'Activare Revizii Media?';
 $lang['usewordblock']          = 'Blochează spam-ul pe baza listei de cuvinte';
diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php
index 42cbbd35a..cdafacf8f 100644
--- a/lib/plugins/config/lang/ru/lang.php
+++ b/lib/plugins/config/lang/ru/lang.php
@@ -115,7 +115,6 @@ $lang['target____media']       = 'target для ссылок на медиафа
 $lang['target____windows']     = 'target для ссылок на сетевые каталоги';
 $lang['mediarevisions']        = 'Включение версий медиафайлов';
 $lang['refcheck']              = 'Проверять ссылки на медиафайлы';
-$lang['refshow']               = 'Показывать ссылок на медиафайлы';
 $lang['gdlib']                 = 'Версия LibGD';
 $lang['im_convert']            = 'Путь к ImageMagick';
 $lang['jpg_quality']           = 'Качество сжатия JPG (0–100). Значение по умолчанию — 70.';
diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php
index 9e18b3ed9..23a60db90 100644
--- a/lib/plugins/config/lang/sk/lang.php
+++ b/lib/plugins/config/lang/sk/lang.php
@@ -103,7 +103,6 @@ $lang['target____media']       = 'Cieľové okno (target) pre media odkazy';
 $lang['target____windows']     = 'Cieľové okno (target) pre windows odkazy';
 $lang['mediarevisions']        = 'Povoliť verzie súborov?';
 $lang['refcheck']              = 'Kontrolovať odkazy na médiá (pred vymazaním)';
-$lang['refshow']               = 'Počet zobrazených odkazov na médiá';
 $lang['gdlib']                 = 'Verzia GD Lib';
 $lang['im_convert']            = 'Cesta k ImageMagick convert tool';
 $lang['jpg_quality']           = 'Kvalita JPG kompresie (0-100)';
diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php
index 364e0fd7f..dcec62288 100644
--- a/lib/plugins/config/lang/sl/lang.php
+++ b/lib/plugins/config/lang/sl/lang.php
@@ -64,7 +64,6 @@ $lang['camelcase']             = 'Uporabi EnoBesedni zapisa za povezave';
 $lang['deaccent']              = 'Počisti imena strani';
 $lang['useheading']            = 'Uporabi prvi naslov za ime strani';
 $lang['refcheck']              = 'Preverjanje sklica predstavnih datotek';
-$lang['refshow']               = 'Število predstavih sklicev za prikaz';
 $lang['allowdebug']            = 'Dovoli razhroščevanje (po potrebi!)';
 $lang['mediarevisions']        = 'Ali naj se omogočijo objave predstavnih vsebin?';
 $lang['usewordblock']          = 'Zaustavi neželeno besedilo glede na seznam besed';
diff --git a/lib/plugins/config/lang/sq/lang.php b/lib/plugins/config/lang/sq/lang.php
index 69e283b11..972b2894c 100644
--- a/lib/plugins/config/lang/sq/lang.php
+++ b/lib/plugins/config/lang/sq/lang.php
@@ -59,7 +59,6 @@ $lang['camelcase']             = 'Përdor CamelCase (shkronja e parë e çdo fja
 $lang['deaccent']              = 'Emra faqesh të pastër';
 $lang['useheading']            = 'Përdor titra të nivelit të parë për faqet e emrave';
 $lang['refcheck']              = 'Kontroll për referim mediash';
-$lang['refshow']               = 'Numri i referimeve të medias që duhet të tregohet';
 $lang['allowdebug']            = 'Lejo debug <b>çaktivizoje nëse nuk nevojitet!</b>';
 $lang['usewordblock']          = 'Blloko spam-in duke u bazuar mbi listë fjalësh';
 $lang['indexdelay']            = 'Vonesa në kohë para index-imit (sekonda)';
diff --git a/lib/plugins/config/lang/sr/lang.php b/lib/plugins/config/lang/sr/lang.php
index c675b84e6..b6d7268aa 100644
--- a/lib/plugins/config/lang/sr/lang.php
+++ b/lib/plugins/config/lang/sr/lang.php
@@ -60,7 +60,6 @@ $lang['camelcase']             = 'Користи CamelCase за линкове';
 $lang['deaccent']              = 'Чисти имена страница';
 $lang['useheading']            = 'Преузми наслов првог нивоа за назив странице';
 $lang['refcheck']              = 'Провери референце медијских датотека';
-$lang['refshow']               = 'Број референци које се приказују за медијске датотеке';
 $lang['allowdebug']            = 'Укључи дебаговање <b>искључи ако није потребно!</b>';
 $lang['usewordblock']          = 'Блокирај спам на основу листе речи';
 $lang['indexdelay']            = 'Одлагање индексирања (секунде)';
diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php
index d59b4b17e..2a83195d7 100644
--- a/lib/plugins/config/lang/sv/lang.php
+++ b/lib/plugins/config/lang/sv/lang.php
@@ -111,7 +111,6 @@ $lang['target____extern']      = 'Målfönster för externa länkar';
 $lang['target____media']       = 'Målfönster för medialänkar';
 $lang['target____windows']     = 'Målfönster för windowslänkar';
 $lang['refcheck']              = 'Kontrollera referenser till mediafiler';
-$lang['refshow']               = 'Antal mediareferenser som ska visas';
 $lang['gdlib']                 = 'Version av GD-biblioteket';
 $lang['im_convert']            = 'Sökväg till ImageMagicks konverteringsverktyg';
 $lang['jpg_quality']           = 'Kvalitet för JPG-komprimering (0-100)';
diff --git a/lib/plugins/config/lang/tr/lang.php b/lib/plugins/config/lang/tr/lang.php
index 5bc4f3fc1..45d70eeb0 100644
--- a/lib/plugins/config/lang/tr/lang.php
+++ b/lib/plugins/config/lang/tr/lang.php
@@ -79,7 +79,6 @@ $lang['iexssprotect']          = 'Yüklenmiş dosyaları muhtemel kötu niyetli
 $lang['htmlok']                = 'Gömülü HTML koduna izin ver';
 $lang['phpok']                 = 'Gömülü PHP koduna izin ver';
 $lang['refcheck']              = 'Araç kaynak denetimi';
-$lang['refshow']               = 'Gösterilecek araç kaynağı sayısı';
 $lang['gdlib']                 = 'GD Lib sürümü';
 $lang['jpg_quality']           = 'JPG sıkıştırma kalitesi [0-100]';
 $lang['mailfrom']              = 'Otomatik e-postalar için kullanılacak e-posta adresi';
diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php
index 3d463fc72..c938d911b 100644
--- a/lib/plugins/config/lang/uk/lang.php
+++ b/lib/plugins/config/lang/uk/lang.php
@@ -102,7 +102,6 @@ $lang['target____extern']      = 'Target для зовнішніх посила
 $lang['target____media']       = 'Target для медіа-посилань';
 $lang['target____windows']     = 'Target для посилань на мережеві папки';
 $lang['refcheck']              = 'Перевіряти посилання на медіа-файлі';
-$lang['refshow']               = 'Показувати кількість медіа-посилань';
 $lang['gdlib']                 = 'Версія GD Lib';
 $lang['im_convert']            = 'Шлях до ImageMagick';
 $lang['jpg_quality']           = 'Якість компресії JPG (0-100)';
diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php
index cc6e0246e..7890730a6 100644
--- a/lib/plugins/config/lang/zh-tw/lang.php
+++ b/lib/plugins/config/lang/zh-tw/lang.php
@@ -109,7 +109,6 @@ $lang['target____media']       = '媒體連結的目標視窗';
 $lang['target____windows']     = 'Windows 連結的目標視窗';
 $lang['mediarevisions']        = '啟用媒體修訂歷史嗎？';
 $lang['refcheck']              = '媒體連結檢查';
-$lang['refshow']               = '媒體連結的顯示數量';
 $lang['gdlib']                 = 'GD Lib 版本';
 $lang['im_convert']            = 'ImageMagick 的轉換工具路徑';
 $lang['jpg_quality']           = 'JPG 壓縮品質(0-100)';
diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index 832dfe749..903e987a3 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/lang/zh/lang.php
@@ -114,7 +114,6 @@ $lang['target____media']       = '媒体文件链接的目标窗口';
 $lang['target____windows']     = 'Windows 链接的目标窗口';
 $lang['mediarevisions']        = '激活媒体修订历史？';
 $lang['refcheck']              = '检查媒体与页面的挂钩情况';
-$lang['refshow']               = '显示媒体与页面挂钩情况的数量';
 $lang['gdlib']                 = 'GD 库版本';
 $lang['im_convert']            = 'ImageMagick 转换工具的路径';
 $lang['jpg_quality']           = 'JPG 压缩质量（0-100）';
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index 22e76a013..ec549d6b4 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -161,7 +161,6 @@ $meta['im_convert']  = array('im_convert');
 $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/');  //(0-100)
 $meta['fetchsize']   = array('numeric');
 $meta['refcheck']    = array('onoff');
-$meta['refshow']     = array('numeric');
 
 $meta['_notifications'] = array('fieldset');
 $meta['subscribers']    = array('onoff');
-- 
cgit v1.2.3


From 2a7abf2d7fee6a2d6418e5ad4b79e37e6049bd92 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 31 Jul 2013 18:14:26 +0200
Subject: FS#2751 - self deletion of user account

---
 lib/plugins/config/lang/en/lang.php             | 1 +
 lib/plugins/config/settings/config.metadata.php | 2 +-
 lib/tpl/dokuwiki/css/_forms.css                 | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 83c843b3a..9558e53dc 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -104,6 +104,7 @@ $lang['disableactions'] = 'Disable DokuWiki actions';
 $lang['disableactions_check'] = 'Check';
 $lang['disableactions_subscription'] = 'Subscribe/Unsubscribe';
 $lang['disableactions_wikicode'] = 'View source/Export Raw';
+$lang['disableactions_profile_delete'] = 'Delete Own Account';
 $lang['disableactions_other'] = 'Other actions (comma separated)';
 $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)';
 $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.';
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index 22e76a013..ffff15af5 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -126,7 +126,7 @@ $meta['manager']     = array('string');
 $meta['profileconfirm'] = array('onoff');
 $meta['rememberme'] = array('onoff');
 $meta['disableactions'] = array('disableactions',
-                                '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','edit','wikicode','check'),
+                                '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','profile_delete','edit','wikicode','check'),
                                 '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw')));
 $meta['auth_security_timeout'] = array('numeric');
 $meta['securecookie'] = array('onoff');
diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 6744750ba..84b7db8e1 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -79,7 +79,10 @@
 #dw__register fieldset {
     padding-bottom: 0.7em;
 }
-
+#dw__profiledelete {
+    display: block;
+    margin-top: 2.8em;
+}
 
 /**
  * Styles for the subscription page
-- 
cgit v1.2.3


From 7b3674bd7a2b20df3ba37b32b7cc33f574a95dc5 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 31 Jul 2013 18:51:06 +0200
Subject: add html5 'email' type to the user manager forms

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 445836a50..ca4c6a650 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -311,6 +311,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if($name == 'userpass'){
             $fieldtype = 'password';
             $autocomp  = 'autocomplete="off"';
+        }elseif($name == 'usermail'){
+            $fieldtype = 'email';
+            $autocomp  = '';
         }else{
             $fieldtype = 'text';
             $autocomp  = '';
-- 
cgit v1.2.3


From 2586f61fa6012e65f30cd5e9004ea4d6dea25238 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 31 Jul 2013 19:07:29 +0200
Subject: add html5 attributes to email fields of the config manager

---
 lib/plugins/config/settings/config.class.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 8eb99284d..63be3a726 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -717,6 +717,29 @@ if (!class_exists('setting_email')) {
         $this->_local = $input;
         return true;
     }
+    function html(&$plugin, $echo=false) {
+        $value = '';
+        $disable = '';
+
+        if ($this->is_protected()) {
+          $value = $this->_protected;
+          $disable = 'disabled="disabled"';
+        } else {
+          if ($echo && $this->_error) {
+            $value = $this->_input;
+          } else {
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+          }
+        }
+
+        $multiple = $this->_multiple ? 'multiple="multiple"' : '';
+        $key = htmlspecialchars($this->_key);
+        $value = htmlspecialchars($value);
+
+        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
+        $input = '<input id="config___'.$key.'" name="config['.$key.']" type="email" class="edit" value="'.$value.'" '.$multiple.' '.$disable.'/>';
+        return array($label,$input);
+    }
   }
 }
 
-- 
cgit v1.2.3


From 65f0aa62806695ee51cc94679913449b7ad862d6 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Thu, 1 Aug 2013 11:49:52 +0200
Subject: update config metadata comments for parameter '_multiple'

---
 lib/plugins/config/settings/config.metadata.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index ec549d6b4..2fb08037d 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -20,7 +20,8 @@
  *   'numericopt'   - like above, but accepts empty values
  *   'onoff'        - checkbox input, setting output  0|1
  *   'multichoice'  - select input (single choice), setting output with quotes, required _choices parameter
- *   'email'        - text input, input must conform to email address format
+ *   'email'        - text input, input must conform to email address format, supports optional '_multiple'
+ *                    parameter for multiple comma separated email addresses
  *   'password'     - password input, minimal input validation, setting output text in quotes, maybe encoded
  *                    according to the _code parameter
  *   'dirchoice'    - as multichoice, selection choices based on folders found at location specified in _dir
@@ -58,6 +59,7 @@
  *   '_code'       - encoding method to use, accepted values: 'base64','uuencode','plain'.  defaults to plain.
  *   '_min'        - minimum numeric value, optional for 'numeric' and 'numericopt', ignored by others
  *   '_max'        - maximum numeric value, optional for 'numeric' and 'numericopt', ignored by others
+ *   '_multiple'   - bool, allow multiple comma separated email values; optional for 'email', ignored by others
  *
  * @author    Chris Smith <chris@jalakai.co.uk>
  */
-- 
cgit v1.2.3


From 5a99d25b24f7e14f137084100f40325b7a2a71b4 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 1 Aug 2013 16:38:02 +0100
Subject: added aria attributes to edit mode

---
 lib/scripts/edit.js    |  9 ++++++---
 lib/scripts/editor.js  |  1 +
 lib/scripts/toolbar.js | 29 ++++++++++++++++++++---------
 3 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 5a5e829bd..b1dbff683 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -23,7 +23,7 @@ function createToolButton(icon,label,key,id,classname){
         $btn.addClass(classname);
     }
 
-    $btn.attr('title', label);
+    $btn.attr('title', label).attr('aria-controls', 'wiki__text');
     if(key){
         $btn.attr('title', label + ' ['+key.toUpperCase()+']')
             .attr('accessKey', key);
@@ -40,6 +40,7 @@ function createToolButton(icon,label,key,id,classname){
         icon = DOKU_BASE + 'lib/images/toolbar/' + icon;
     }
     $ico.attr('src', icon);
+    $ico.attr('alt', '');
     $ico.attr('width', 16);
     $ico.attr('height', 16);
     $btn.append($ico);
@@ -76,6 +77,7 @@ function createPicker(id,props,edid){
     function $makebutton(title) {
         var $btn = jQuery(document.createElement('button'))
             .addClass('pickerbutton').attr('title', title)
+            .attr('aria-controls', edid)
             .bind('click', bind(pickerInsert, title, edid))
             .appendTo($picker);
         return $btn;
@@ -93,6 +95,7 @@ function createPicker(id,props,edid){
             }
             jQuery(document.createElement('img'))
                 .attr('src', item)
+                .attr('alt', '')
                 .appendTo($makebutton(key));
         }else if (typeof item == 'string'){
             // a list of text -> treat as text picker
@@ -132,9 +135,9 @@ function pickerInsert(text,edid){
 function addBtnActionSignature($btn, props, edid) {
     if(typeof SIG != 'undefined' && SIG != ''){
         $btn.bind('click', bind(insertAtCarret,edid,SIG));
-        return true;
+        return edid;
     }
-    return false;
+    return '';
 }
 
 /**
diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js
index 042e34608..2c0924eb7 100644
--- a/lib/scripts/editor.js
+++ b/lib/scripts/editor.js
@@ -65,6 +65,7 @@ var dw_editor = {
         ], function (_, img) {
             jQuery(document.createElement('IMG'))
                 .attr('src', DOKU_BASE+'lib/images/' + img[0] + '.gif')
+                .attr('alt', '')
                 .click(img[1])
                 .appendTo($ctl);
         });
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 6d75215e0..5fc4d835e 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -52,8 +52,13 @@ function initToolbar(tbid,edid,tb, allowblock){
         // type is a init function -> execute it
         actionFunc = 'addBtnAction'+val.type.charAt(0).toUpperCase()+val.type.substring(1);
         if( jQuery.isFunction(window[actionFunc]) ){
-            if(window[actionFunc]($btn, val, edid)){
+            var pickerid = window[actionFunc]($btn, val, edid);
+            if(pickerid !== ''){
                 $toolbar.append($btn);
+                $btn.attr('aria-controls', pickerid);
+                if (actionFunc === 'addBtnActionPicker') {
+                    $btn.attr('aria-haspopup', 'true');
+                }
             }
             return;
         }
@@ -190,16 +195,17 @@ function tb_autohead(btn, props, edid){
  */
 function addBtnActionPicker($btn, props, edid) {
     var pickerid = 'picker'+(pickercounter++);
-    createPicker(pickerid, props, edid);
+    var picker = createPicker(pickerid, props, edid);
+    jQuery(picker).attr('aria-hidden', 'true');
 
     $btn.click(
         function() {
             pickerToggle(pickerid,$btn);
-            return false;
+            return '';
         }
     );
 
-    return true;
+    return pickerid;
 }
 
 /**
@@ -215,22 +221,26 @@ function addBtnActionLinkwiz(btn, props, edid) {
     dw_linkwiz.init(jQuery('#'+edid));
     jQuery(btn).click(function(){
         dw_linkwiz.toggle();
-        return false;
+        return '';
     });
-    return true;
+    return 'link__wiz';
 }
 
 
 /**
- * Show/Hide a previosly created picker window
+ * Show/Hide a previously created picker window
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function pickerToggle(pickerid,$btn){
     var $picker = jQuery('#' + pickerid),
         pos = $btn.offset();
-    $picker.toggleClass('a11y')
-           .offset({left: pos.left+3, top: pos.top+$btn[0].offsetHeight+3});
+    if ($picker.hasClass('a11y')) {
+        $picker.removeClass('a11y').attr('aria-hidden', 'false');
+    } else {
+        $picker.addClass('a11y').attr('aria-hidden', 'true');
+    }
+    $picker.offset({left: pos.left+3, top: pos.top+$btn[0].offsetHeight+3});
 }
 
 /**
@@ -252,4 +262,5 @@ function fixtxt(str){
 
 jQuery(function () {
     initToolbar('tool__bar','wiki__text',toolbar);
+    jQuery('#tool__bar').attr('role', 'toolbar');
 });
-- 
cgit v1.2.3


From 193e22801d763e715f03f241b135a2e249c6132e Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 1 Aug 2013 16:42:31 +0100
Subject: removed unused and old hasFlash() JS function

---
 lib/scripts/helpers.js | 19 -------------------
 lib/scripts/media.js   | 19 -------------------
 2 files changed, 38 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/helpers.js b/lib/scripts/helpers.js
index d6f36967d..632c4bff2 100644
--- a/lib/scripts/helpers.js
+++ b/lib/scripts/helpers.js
@@ -2,25 +2,6 @@
  * Various helper functions
  */
 
-/**
- * Very simplistic Flash plugin check, probably works for Flash 8 and higher only
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-function hasFlash(version){
-    var ver = 0;
-    try{
-        if(navigator.plugins != null && navigator.plugins.length > 0){
-           ver = navigator.plugins["Shockwave Flash"].description.split(' ')[2].split('.')[0];
-        }else{
-           ver = (new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
-                 .GetVariable("$version").split(' ')[1].split(',')[0];
-        }
-    }catch(e){ }
-
-    return ver >= version;
-}
-
 /**
  * A PHP-style substr_replace
  *
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 182d5fefe..8ca21ecab 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -921,23 +921,4 @@ var dw_mediamanager = {
     }
 };
 
-// moved from helpers.js temporarily here
-/**
- * Very simplistic Flash plugin check, probably works for Flash 8 and higher only
- *
- */
-function hasFlash(version){
-    var ver = 0, axo;
-    try{
-        if(navigator.plugins !== null && navigator.plugins.length > 0){
-           ver = navigator.plugins["Shockwave Flash"].description.split(' ')[2].split('.')[0];
-        }else{
-           axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-           ver = axo.GetVariable("$version").split(' ')[1].split(',')[0];
-        }
-    }catch(e){ }
-
-    return ver >= version;
-}
-
 jQuery(dw_mediamanager.init);
-- 
cgit v1.2.3


From 5c967d3d04622c1420313f1a514da5cda99827f3 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Thu, 1 Aug 2013 18:04:01 +0200
Subject: add csv export functionality to the user manager

---
 lib/plugins/usermanager/admin.php        | 39 +++++++++++++++++++++++++++++++-
 lib/plugins/usermanager/lang/en/lang.php |  2 ++
 2 files changed, 40 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index ca4c6a650..72ac47e15 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -101,6 +101,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
           case "search" : $this->_setFilter($param);
                           $this->_start = 0;
                           break;
+          case "export" : $this->_export(); break;
         }
 
         $this->_user_total = $this->_auth->canDo('getUserCount') ? $this->_auth->getUserCount($this->_filter) : -1;
@@ -133,6 +134,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $delete_disable = $this->_auth->canDo('delUser') ? '' : 'disabled="disabled"';
 
         $editable = $this->_auth->canDo('UserMod');
+        $export_label = empty($this->_filter) ? $this->lang['export_all'] : $this->lang[export_filtered];
 
         print $this->locale_xhtml('intro');
         print $this->locale_xhtml('list');
@@ -196,7 +198,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("          <input type=\"submit\" name=\"fn[next]\" ".$page_buttons['next']." class=\"button\" value=\"".$this->lang['next']."\" />");
         ptln("          <input type=\"submit\" name=\"fn[last]\" ".$page_buttons['last']." class=\"button\" value=\"".$this->lang['last']."\" />");
         ptln("        </span>");
-        ptln("        <input type=\"submit\" name=\"fn[search][clear]\" class=\"button\" value=\"".$this->lang['clear']."\" />");
+        if (!empty($this->_filter)) {
+            ptln("    <input type=\"submit\" name=\"fn[search][clear]\" class=\"button\" value=\"".$this->lang['clear']."\" />");
+        }
+        ptln("        <input type=\"submit\" name=\"fn[export]\" class=\"button\" value=\"".$export_label."\" />");
         ptln("        <input type=\"hidden\" name=\"do\"    value=\"admin\" />");
         ptln("        <input type=\"hidden\" name=\"page\"  value=\"usermanager\" />");
 
@@ -629,4 +634,36 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         return $buttons;
     }
+
+    /*
+     *  export a list of users in csv format using the current filter criteria
+     */
+    function _export() {
+        // list of users for export - based on current filter criteria
+        $user_list = $this->_auth->retrieveUsers(0, 0, $this->_filter);
+        $column_headings = array(
+            $this->lang["user_id"],
+            $this->lang["user_name"],
+            $this->lang["user_mail"],
+            $this->lang["user_groups"]
+        );
+
+        // ==============================================================================================
+        // GENERATE OUTPUT
+        // normal headers for downloading...
+        header('Content-type: text/csv;charset=utf-8');
+        header('Content-Disposition: attachment; filename="wikiusers.csv"');
+#       // for debugging assistance, send as text plain to the browser
+#       header('Content-type: text/plain;charset=utf-8');
+
+        // output the csv
+        $fd = fopen('php://output','w');
+        fputcsv($fd, $column_headings);
+        foreach ($user_list as $user => $info) {
+            $line = array($user, $info['name'], $info['mail'], join(',',$info['grps']));
+            fputcsv($fd, $line);
+        }
+        fclose($fd);
+        die;
+    }
 }
diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php
index 189a1db20..ae0ee1c16 100644
--- a/lib/plugins/usermanager/lang/en/lang.php
+++ b/lib/plugins/usermanager/lang/en/lang.php
@@ -31,6 +31,8 @@ $lang['search']      = 'Search';
 $lang['search_prompt'] = 'Perform search';
 $lang['clear']       = 'Reset Search Filter';
 $lang['filter']      = 'Filter';
+$lang['export_all']  = 'Export All Users (CSV)';
+$lang['export_filtered'] = 'Export Filtered User list (CSV)';
 
 $lang['summary']     = 'Displaying users %1$d-%2$d of %3$d found. %4$d users total.';
 $lang['nonefound']   = 'No users found. %d users total.';
-- 
cgit v1.2.3


From 763ffe58812aba9b1e6fe2bca4bb74187ab16ea3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 1 Aug 2013 17:11:29 +0100
Subject: added aria attributes for footnote tooltips

---
 lib/scripts/page.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index 4ab0bf9b5..7b4958d82 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -62,7 +62,9 @@ dw_page = {
             $fndiv = jQuery(document.createElement('div'))
                 .attr('id', popup_id)
                 .addClass('insitu-footnote JSpopup')
-                .mouseleave(function () {jQuery(this).hide();});
+                .attr('aria-hidden', 'true')
+                .mouseleave(function () {jQuery(this).hide().attr('aria-hidden', 'true');})
+                .attr('role', 'tooltip');
             jQuery('.dokuwiki:first').append($fndiv);
         }
 
@@ -97,7 +99,7 @@ dw_page = {
         content = content.replace(/\bid=(['"])([^"']+)\1/gi,'id="insitu__$2');
 
         // now put the content into the wrapper
-        dw_page.insituPopup(this, 'insitu__fn').html(content).show();
+        dw_page.insituPopup(this, 'insitu__fn').html(content).show().attr('aria-hidden', 'false');
     },
 
     /**
-- 
cgit v1.2.3


From 9805efa058358e0fcbd3976fa553901cabe0b2e0 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 1 Aug 2013 17:20:25 +0100
Subject: added aria roles to search and acl manager

---
 lib/plugins/acl/script.js | 1 +
 lib/scripts/tw-sack.js    | 1 +
 2 files changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index c3763dc8d..0abb80d67 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -61,6 +61,7 @@ var dw_acl = {
      */
     loadinfo: function () {
         jQuery('#acl__info')
+            .attr('role', 'alert')
             .html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="..." />')
             .load(
                 DOKU_BASE + 'lib/plugins/acl/ajax.php',
diff --git a/lib/scripts/tw-sack.js b/lib/scripts/tw-sack.js
index cc988f5be..b0e570151 100644
--- a/lib/scripts/tw-sack.js
+++ b/lib/scripts/tw-sack.js
@@ -2,6 +2,7 @@
 /* ©2005 Gregory Wild-Smith */
 /* www.twilightuniverse.com */
 /* Software licenced under a modified X11 licence, see documentation or authors website for more details */
+/* @deprecated */
 
 function sack(file){
   this.AjaxFailedAlert = "Your browser does not support the enhanced functionality of this website, and therefore you will have an experience that differs from the intended one.\n";
-- 
cgit v1.2.3


From ab3a75dc6d3e7c7136a38c796c4b0da66ce96bc2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 1 Aug 2013 19:31:35 +0200
Subject: rename event to TEMPLATE_DOKUWIKI_PAGETOOLS_DISPLAY

also made it more secure against copy'n'paste
---
 lib/tpl/dokuwiki/detail.php | 6 +++++-
 lib/tpl/dokuwiki/main.php   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 1768b665e..76a6c7140 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -124,7 +124,11 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                                 $data['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
 
                                 // the page tools can be ammended through a custom plugin hook
-                                $evt = new Doku_Event('TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY', $data);
+                                // if you're deriving from this template and your design is close enough to
+                                // the dokuwiki template you might want to trigger a DOKUWIKI event instead
+                                // of using $conf['tpl'] here
+                                $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+                                $evt = new Doku_Event($hook, $data);
                                 if($evt->advise_before()){
                                     foreach($evt->data as $k => $html) echo $html;
                                 }
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 30cd4dda9..712d01175 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -85,7 +85,11 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                             );
 
                             // the page tools can be ammended through a custom plugin hook
-                            $evt = new Doku_Event('TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY', $data);
+                            // if you're deriving from this template and your design is close enough to
+                            // the dokuwiki template you might want to trigger a DOKUWIKI event instead
+                            // of using $conf['tpl'] here
+                            $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+                            $evt = new Doku_Event($hook, $data);
                             if($evt->advise_before()){
                                 foreach($evt->data as $k => $html) echo $html;
                             }
-- 
cgit v1.2.3


From d6d38cc20037bd20fb7183733267d2fbf68b03e4 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Thu, 1 Aug 2013 22:06:14 +0200
Subject: de/de-informal: localization updates (delete user function)

---
 lib/plugins/config/lang/de-informal/lang.php | 1 +
 lib/plugins/config/lang/de/lang.php          | 1 +
 2 files changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 10fa363dc..ce1e6b7b2 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -86,6 +86,7 @@ $lang['disableactions']        = 'Deaktiviere DokuWiki\'s Zugriffe';
 $lang['disableactions_check']  = 'Check';
 $lang['disableactions_subscription'] = 'Bestellen/Abbestellen';
 $lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten';
+$lang['disableactions_profile_delete'] = 'Eigenes Benutzerprofil löschen';
 $lang['disableactions_other']  = 'Weitere Aktionen (durch Komma getrennt)';
 $lang['auth_security_timeout'] = 'Zeitüberschreitung bei der Authentifizierung (Sekunden)';
 $lang['securecookie']          = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktiviere diese Option, wenn nur der Login deines Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index dd29f8038..b1acd6afe 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -99,6 +99,7 @@ $lang['disableactions']        = 'DokuWiki-Aktionen deaktivieren';
 $lang['disableactions_check']  = 'Check';
 $lang['disableactions_subscription'] = 'Seiten-Abonnements';
 $lang['disableactions_wikicode'] = 'Quelltext betrachten/exportieren';
+$lang['disableactions_profile_delete'] = 'Eigenes Benutzerprofil löschen';
 $lang['disableactions_other']  = 'Andere Aktionen (durch Komma getrennt)';
 $lang['sneaky_index']          = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.';
 $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)';
-- 
cgit v1.2.3


From ada93257a4fa6340635bb65f6b963cdae484e6e3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 1 Aug 2013 21:21:43 +0100
Subject: added default icon to pagetools

---
 lib/tpl/dokuwiki/css/pagetools.css               | 131 ++++++++++++-----------
 lib/tpl/dokuwiki/images/pagetools-sprite.png     | Bin 5931 -> 11325 bytes
 lib/tpl/dokuwiki/images/pagetools/00_default.png | Bin 0 -> 616 bytes
 3 files changed, 67 insertions(+), 64 deletions(-)
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/00_default.png

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index 21e5c13ec..7ce7de3cf 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -85,7 +85,7 @@
 }
 
 #dokuwiki__pagetools ul li a:before {
-    content: url(images/pagetools-sprite.png);
+    content: url(images/pagetools-sprite.png?v=2);
     display: inline-block;
     font-size: 0;
     line-height: 0;
@@ -163,13 +163,16 @@
 
 /*____________ all available icons in sprite ____________*/
 
+#dokuwiki__pagetools ul li a.edit:before {
+    margin-top: -90px;
+}
 #dokuwiki__pagetools ul li a.edit {
-    background-position: right 0;
+    background-position: right -90px;
 }
 #dokuwiki__pagetools ul li a.edit:hover,
 #dokuwiki__pagetools ul li a.edit:active,
 #dokuwiki__pagetools ul li a.edit:focus {
-    background-position: right -45px;
+    background-position: right -135px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.edit {
     background-position: left 0;
@@ -177,245 +180,245 @@
 [dir=rtl] #dokuwiki__pagetools ul li a.edit:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.edit:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.edit:focus {
-    background-position: left -45px;
+    background-position: left -135px;
 }
 
 #dokuwiki__pagetools ul li a.create:before {
-    margin-top: -90px;
+    margin-top: -180px;
 }
 #dokuwiki__pagetools ul li a.create {
-    background-position: right -90px;
+    background-position: right -180px;
 }
 #dokuwiki__pagetools ul li a.create:hover,
 #dokuwiki__pagetools ul li a.create:active,
 #dokuwiki__pagetools ul li a.create:focus {
-    background-position: right -135px;
+    background-position: right -225px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.create {
-    background-position: left -90px;
+    background-position: left -180px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.create:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.create:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.create:focus {
-    background-position: left -135px;
+    background-position: left -225px;
 }
 
 #dokuwiki__pagetools ul li a.show {
-    background-position: right -270px;
+    background-position: right -360px;
 }
 #dokuwiki__pagetools ul li a.show:before {
-    margin-top: -270px;
+    margin-top: -360px;
 }
 #dokuwiki__pagetools ul li a.show:hover,
 #dokuwiki__pagetools ul li a.show:active,
 #dokuwiki__pagetools ul li a.show:focus {
-    background-position: right -315px;
+    background-position: right -405px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.show {
-    background-position: left -270px;
+    background-position: left -360px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.show:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.show:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.show:focus {
-    background-position: left -315px;
+    background-position: left -405px;
 }
 
 #dokuwiki__pagetools ul li a.source {
-    background-position: right -360px;
+    background-position: right -450px;
 }
 #dokuwiki__pagetools ul li a.source:before {
-    margin-top: -360px;
+    margin-top: -450px;
 }
 #dokuwiki__pagetools ul li a.source:hover,
 #dokuwiki__pagetools ul li a.source:active,
 #dokuwiki__pagetools ul li a.source:focus {
-    background-position: right -405px;
+    background-position: right -495px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.source {
-    background-position: left -360px;
+    background-position: left -450px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.source:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.source:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.source:focus {
-    background-position: left -405px;
+    background-position: left -495px;
 }
 
 #dokuwiki__pagetools ul li a.draft {
-    background-position: right -180px;
+    background-position: right -270px;
 }
 #dokuwiki__pagetools ul li a.draft:before {
-    margin-top: -180px;
+    margin-top: -270px;
 }
 #dokuwiki__pagetools ul li a.draft:hover,
 #dokuwiki__pagetools ul li a.draft:active,
 #dokuwiki__pagetools ul li a.draft:focus {
-    background-position: right -225px;
+    background-position: right -315px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.draft {
-    background-position: left -180px;
+    background-position: left -270px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.draft:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.draft:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.draft:focus {
-    background-position: left -225px;
+    background-position: left -315px;
 }
 
 #dokuwiki__pagetools ul li a.revs {
-    background-position: right -540px;
+    background-position: right -630px;
 }
 #dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -540px;
+    margin-top: -630px;
 }
 #dokuwiki__pagetools ul li a.revs:hover,
 #dokuwiki__pagetools ul li a.revs:active,
 #dokuwiki__pagetools ul li a.revs:focus,
 .mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: right -585px;
+    background-position: right -675px;
 }
 .mode_revisions #dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -585px;
+    margin-top: -675px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.revs {
-    background-position: left -540px;
+    background-position: left -630px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.revs:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.revs:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.revs:focus,
 [dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: left -585px;
+    background-position: left -675px;
 }
 
 #dokuwiki__pagetools ul li a.backlink {
-    background-position: right -630px;
+    background-position: right -720px;
 }
 #dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -630px;
+    margin-top: -720px;
 }
 #dokuwiki__pagetools ul li a.backlink:hover,
 #dokuwiki__pagetools ul li a.backlink:active,
 #dokuwiki__pagetools ul li a.backlink:focus,
 .mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: right -675px;
+    background-position: right -765px;
 }
 .mode_backlink #dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -675px;
+    margin-top: -765px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -630px;
+    background-position: left -720px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus,
 [dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -675px;
+    background-position: left -765px;
 }
 
 #dokuwiki__pagetools ul li a.top {
-    background-position: right -810px;
+    background-position: right -900px;
 }
 #dokuwiki__pagetools ul li a.top:before{
-    margin-top: -810px;
+    margin-top: -900px;
 }
 #dokuwiki__pagetools ul li a.top:hover,
 #dokuwiki__pagetools ul li a.top:active,
 #dokuwiki__pagetools ul li a.top:focus {
-    background-position: right -855px;
+    background-position: right -945px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.top {
-    background-position: left -810px;
+    background-position: left -900px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.top:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.top:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.top:focus {
-    background-position: left -855px;
+    background-position: left -945px;
 }
 
 #dokuwiki__pagetools ul li a.revert {
-    background-position: right -450px;
+    background-position: right -540px;
 }
 #dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -450px;
+    margin-top: -540px;
 }
 #dokuwiki__pagetools ul li a.revert:hover,
 #dokuwiki__pagetools ul li a.revert:active,
 #dokuwiki__pagetools ul li a.revert:focus,
 .mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: right -495px;
+    background-position: right -585px;
 }
 .mode_revert #dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -450px;
+    margin-top: -540px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.revert {
-    background-position: left -450px;
+    background-position: left -540px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.revert:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.revert:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.revert:focus,
 [dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: left -495px;
+    background-position: left -585px;
 }
 
 #dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -720px;
+    background-position: right -810px;
 }
 #dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -720px;
+    margin-top: -810px;
 }
 #dokuwiki__pagetools ul li a.subscribe:hover,
 #dokuwiki__pagetools ul li a.subscribe:active,
 #dokuwiki__pagetools ul li a.subscribe:focus,
 .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -765px;
+    background-position: right -855px;
 }
 .mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -765px;
+    margin-top: -855px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -720px;
+    background-position: left -810px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus,
 [dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -765px;
+    background-position: left -855px;
 }
 
 #dokuwiki__pagetools ul li a.mediaManager {
-    background-position: right -900px;
+    background-position: right -990px;
 }
 #dokuwiki__pagetools ul li a.mediaManager:before {
-    margin-top: -900px;
+    margin-top: -990px;
 }
 #dokuwiki__pagetools ul li a.mediaManager:hover,
 #dokuwiki__pagetools ul li a.mediaManager:active,
 #dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: right -945px;
+    background-position: right -1035px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.mediaManager {
-    background-position: left -900px;
+    background-position: left -990px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: left -945px;
+    background-position: left -1035px;
 }
 
 #dokuwiki__pagetools ul li a.back {
-    background-position: right -990px;
+    background-position: right -1080px;
 }
-#dokuwiki__pagetools ul li a.back {
-    margin-top: -990px;
+#dokuwiki__pagetools ul li a.back:before {
+    margin-top: -1080px;
 }
 #dokuwiki__pagetools ul li a.back:hover,
 #dokuwiki__pagetools ul li a.back:active,
 #dokuwiki__pagetools ul li a.back:focus {
-    background-position: right -1035px;
+    background-position: right -1125px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.back {
-    background-position: left -990px;
+    background-position: left -1080px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.back:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.back:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.back:focus {
-    background-position: left -1035px;
+    background-position: left -1125px;
 }
diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png
index 898f0f4a6..b6e808717 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/00_default.png b/lib/tpl/dokuwiki/images/pagetools/00_default.png
new file mode 100644
index 000000000..95d122e17
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/00_default.png differ
-- 
cgit v1.2.3


From a191bd2a8ef9a6cde5c9a80e84eef2369a247214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederico=20Guimar=C3=A3es?= <frederico@teia.bio.br>
Date: Thu, 1 Aug 2013 22:27:42 +0200
Subject: Brazilian Portuguese language update

---
 lib/plugins/authad/lang/pt-br/settings.php    | 5 +++--
 lib/plugins/authldap/lang/pt-br/settings.php  | 9 +++++----
 lib/plugins/authmysql/lang/pt-br/settings.php | 1 +
 lib/plugins/authpgsql/lang/pt-br/settings.php | 1 +
 lib/plugins/config/lang/pt-br/lang.php        | 1 +
 5 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/pt-br/settings.php b/lib/plugins/authad/lang/pt-br/settings.php
index 308d122dd..56f37b75f 100644
--- a/lib/plugins/authad/lang/pt-br/settings.php
+++ b/lib/plugins/authad/lang/pt-br/settings.php
@@ -3,14 +3,15 @@
  * Brazilian Portuguese language file
  *
  * @author Victor Westmann <victor.westmann@gmail.com>
+ * @author Frederico Guimarães <frederico@teia.bio.br>
  */
 $lang['account_suffix']        = 'Sufixo de sua conta. Eg. <code>@meu.domínio.org</code>';
 $lang['base_dn']               = 'Sua base DN. Eg. <code>DC=meu,DC=domínio,DC=org</code>';
 $lang['domain_controllers']    = 'Uma lista de controles de domínios separada por vírgulas. Eg. <code>srv1.domínio.org,srv2.domínio.org</code>';
-$lang['admin_username']        = 'Um usuário com privilégios do Active Directory com acesso a todos os dados dos outros usuários. Opcional, mas necessário para certas ações como enviar emails de inscrição.';
+$lang['admin_username']        = 'Um usuário do Active Directory com privilégios para acessar os dados de todos os outros usuários. Opcional, mas necessário para realizar certas ações, tais como enviar mensagens de assinatura.';
 $lang['admin_password']        = 'A senha do usuário acima.';
 $lang['sso']                   = 'Usar Single-Sign-On através do Kerberos ou NTLM?';
-$lang['real_primarygroup']     = 'Deverá o grupo real primário ser resolvido ao invés de assumir "Usuários de domínio" (mais lento) ';
+$lang['real_primarygroup']     = 'O grupo primário real deve ser resolvido ao invés de assumirmos como "Usuários do Domínio" (mais lento)';
 $lang['use_ssl']               = 'Usar conexão SSL? Se usar, não habilitar TLS abaixo.';
 $lang['use_tls']               = 'Usar conexão TLS? se usar, não habilitar SSL acima.';
 $lang['debug']                 = 'Mostrar saída adicional de depuração em mensagens de erros?';
diff --git a/lib/plugins/authldap/lang/pt-br/settings.php b/lib/plugins/authldap/lang/pt-br/settings.php
index 70b68b289..d12a9cf36 100644
--- a/lib/plugins/authldap/lang/pt-br/settings.php
+++ b/lib/plugins/authldap/lang/pt-br/settings.php
@@ -3,17 +3,18 @@
  * Brazilian Portuguese language file
  *
  * @author Victor Westmann <victor.westmann@gmail.com>
+ * @author Frederico Guimarães <frederico@teia.bio.br>
  */
 $lang['server']                = 'Seu servidor LDAP. Ou hostname (<code>localhost</code>) ou uma URL completa (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'Porta LDAP do servidor se nenhuma URL completa tiver sido fornecida acima';
 $lang['usertree']              = 'Onde encontrar as contas de usuários. Eg. <code>ou=Pessoas, dc=servidor, dc=tld</code>';
 $lang['grouptree']             = 'Onde encontrar os grupos de usuários. Eg. <code>ou=Pessoas, dc=servidor, dc=tld</code>';
-$lang['userfilter']            = 'Filtro do LDAP para procurar por contas de usuários. Eg. <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
-$lang['groupfilter']           = 'Filtro do LDAP 0ara procurar por grupos. Eg. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['userfilter']            = 'Filtro LDAP para pesquisar por contas de usuários. Ex. <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filtro LDAP para pesquisar por grupos. Ex. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = 'A versão do protocolo para usar. Você talvez deva definir isto para <code>3</code>';
 $lang['starttls']              = 'Usar conexões TLS?';
-$lang['referrals']             = 'Permitir referências serem seguidas?';
-$lang['deref']                 = 'Como respeitar aliases ?';
+$lang['referrals']             = 'Permitir que as referências sejam seguidas?';
+$lang['deref']                 = 'Como dereferenciar os aliases?';
 $lang['binddn']                = 'DN de um vínculo opcional de usuário se vínculo anônimo não for suficiente. Eg. <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = 'Senha do usuário acima';
 $lang['userscope']             = 'Limitar escopo da busca para busca de usuário';
diff --git a/lib/plugins/authmysql/lang/pt-br/settings.php b/lib/plugins/authmysql/lang/pt-br/settings.php
index 5febedd13..8ac775b54 100644
--- a/lib/plugins/authmysql/lang/pt-br/settings.php
+++ b/lib/plugins/authmysql/lang/pt-br/settings.php
@@ -3,6 +3,7 @@
  * Brazilian Portuguese language file
  *
  * @author Victor Westmann <victor.westmann@gmail.com>
+ * @author Frederico Guimarães <frederico@teia.bio.br>
  */
 $lang['server']                = 'Seu servidor MySQL';
 $lang['user']                  = 'usuário MySQL';
diff --git a/lib/plugins/authpgsql/lang/pt-br/settings.php b/lib/plugins/authpgsql/lang/pt-br/settings.php
index d91e9c8e5..5ffe13465 100644
--- a/lib/plugins/authpgsql/lang/pt-br/settings.php
+++ b/lib/plugins/authpgsql/lang/pt-br/settings.php
@@ -3,6 +3,7 @@
  * Brazilian Portuguese language file
  *
  * @author Victor Westmann <victor.westmann@gmail.com>
+ * @author Frederico Guimarães <frederico@teia.bio.br>
  */
 $lang['server']                = 'Seu servidor PostgreSQL';
 $lang['port']                  = 'Sua porta do servidor PostgreSQL';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index 6633ab0c4..85218439a 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -116,6 +116,7 @@ $lang['target____media']       = 'Parâmetro "target" para links de mídia';
 $lang['target____windows']     = 'Parâmetro "target" para links do Windows';
 $lang['mediarevisions']        = 'Habilitar revisões de mídias?';
 $lang['refcheck']              = 'Verificação de referência da mídia';
+$lang['refshow']               = 'Número de referências de mídia a exibir';
 $lang['gdlib']                 = 'Versão da biblioteca "GD Lib"';
 $lang['im_convert']            = 'Caminho para a ferramenta de conversão ImageMagick';
 $lang['jpg_quality']           = 'Qualidade de compressão do JPG (0-100)';
-- 
cgit v1.2.3


From 4fb6e51447e840624b59742bec61641d606f5006 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 1 Aug 2013 21:36:35 +0100
Subject: prevent overlong select boxes (FS#2817)

---
 lib/tpl/dokuwiki/css/basic.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index 3e0306448..ba263f4c5 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -357,6 +357,9 @@ progress {
     box-sizing: border-box;
 }
 
+select {
+    max-width: 100%;
+}
 optgroup {
     font-style: italic;
     font-weight: bold;
-- 
cgit v1.2.3


From d6d855093f24c6c3f608d005189385959a7efbf7 Mon Sep 17 00:00:00 2001
From: DokuWiki Translation <>
Date: Fri, 2 Aug 2013 00:30:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/zh-tw/lang.php           | 7 +++----
 lib/plugins/authad/lang/zh-tw/settings.php    | 5 +++--
 lib/plugins/authldap/lang/zh-tw/settings.php  | 5 +++--
 lib/plugins/authmysql/lang/zh-tw/settings.php | 5 +++--
 lib/plugins/authpgsql/lang/zh-tw/settings.php | 5 +++--
 lib/plugins/plugin/lang/zh-tw/lang.php        | 8 ++++----
 lib/plugins/popularity/lang/zh-tw/lang.php    | 8 ++++----
 lib/plugins/revert/lang/zh-tw/lang.php        | 8 ++++----
 lib/plugins/usermanager/lang/zh-tw/lang.php   | 8 ++++----
 9 files changed, 31 insertions(+), 28 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php
index ff2c6a184..2173c9cf2 100644
--- a/lib/plugins/acl/lang/zh-tw/lang.php
+++ b/lib/plugins/acl/lang/zh-tw/lang.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Chinese(Traditional) language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author chinsan <chinsan@mail2000.com.tw>
- * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php
index c46e5f96f..bd5d9413a 100644
--- a/lib/plugins/authad/lang/zh-tw/settings.php
+++ b/lib/plugins/authad/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['account_suffix']        = '您的帳號後綴。如： <code>@my.domain.org</code>';
diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index e93190516..d2513eeff 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 LDAP 伺服器。填寫主機名稱 (<code>localhost</code>) 或完整的 URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authmysql/lang/zh-tw/settings.php b/lib/plugins/authmysql/lang/zh-tw/settings.php
index 95d068150..3fbee151c 100644
--- a/lib/plugins/authmysql/lang/zh-tw/settings.php
+++ b/lib/plugins/authmysql/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 MySQL 伺服器';
diff --git a/lib/plugins/authpgsql/lang/zh-tw/settings.php b/lib/plugins/authpgsql/lang/zh-tw/settings.php
index 6a04214ad..b7dd9c6d8 100644
--- a/lib/plugins/authpgsql/lang/zh-tw/settings.php
+++ b/lib/plugins/authpgsql/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 PostgreSQL 伺服器';
diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php
index 56149e79e..248582aa6 100644
--- a/lib/plugins/plugin/lang/zh-tw/lang.php
+++ b/lib/plugins/plugin/lang/zh-tw/lang.php
@@ -1,11 +1,11 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
- * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php
index b34efe995..bc7ceb11b 100644
--- a/lib/plugins/popularity/lang/zh-tw/lang.php
+++ b/lib/plugins/popularity/lang/zh-tw/lang.php
@@ -1,11 +1,11 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
- * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/revert/lang/zh-tw/lang.php b/lib/plugins/revert/lang/zh-tw/lang.php
index 88a77f7a1..dc83d8c29 100644
--- a/lib/plugins/revert/lang/zh-tw/lang.php
+++ b/lib/plugins/revert/lang/zh-tw/lang.php
@@ -1,11 +1,11 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
- * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index 980d974cc..aa70e67c0 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -1,12 +1,12 @@
 <?php
+
 /**
- * English language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author chinsan <chinsan.tw@gmail.com>
- * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
-- 
cgit v1.2.3


From 8ae55d68448098e1830dc09f9e658fb534aa0dc6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 2 Aug 2013 09:39:49 +0200
Subject: Revert "translation update"

This reverts commit d6d855093f24c6c3f608d005189385959a7efbf7.

I guess it was a bit too early to think straight :-/
---
 lib/plugins/acl/lang/zh-tw/lang.php           | 7 ++++---
 lib/plugins/authad/lang/zh-tw/settings.php    | 5 ++---
 lib/plugins/authldap/lang/zh-tw/settings.php  | 5 ++---
 lib/plugins/authmysql/lang/zh-tw/settings.php | 5 ++---
 lib/plugins/authpgsql/lang/zh-tw/settings.php | 5 ++---
 lib/plugins/plugin/lang/zh-tw/lang.php        | 8 ++++----
 lib/plugins/popularity/lang/zh-tw/lang.php    | 8 ++++----
 lib/plugins/revert/lang/zh-tw/lang.php        | 8 ++++----
 lib/plugins/usermanager/lang/zh-tw/lang.php   | 8 ++++----
 9 files changed, 28 insertions(+), 31 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php
index 2173c9cf2..ff2c6a184 100644
--- a/lib/plugins/acl/lang/zh-tw/lang.php
+++ b/lib/plugins/acl/lang/zh-tw/lang.php
@@ -1,12 +1,13 @@
 <?php
-
 /**
+ * Chinese(Traditional) language file
+ *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
  * @author chinsan <chinsan@mail2000.com.tw>
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
+ * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php
index bd5d9413a..c46e5f96f 100644
--- a/lib/plugins/authad/lang/zh-tw/settings.php
+++ b/lib/plugins/authad/lang/zh-tw/settings.php
@@ -1,8 +1,7 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ * Chinese Traditional language file
+ *
  * @author syaoranhinata@gmail.com
  */
 $lang['account_suffix']        = '您的帳號後綴。如： <code>@my.domain.org</code>';
diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index d2513eeff..e93190516 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -1,8 +1,7 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ * Chinese Traditional language file
+ *
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 LDAP 伺服器。填寫主機名稱 (<code>localhost</code>) 或完整的 URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authmysql/lang/zh-tw/settings.php b/lib/plugins/authmysql/lang/zh-tw/settings.php
index 3fbee151c..95d068150 100644
--- a/lib/plugins/authmysql/lang/zh-tw/settings.php
+++ b/lib/plugins/authmysql/lang/zh-tw/settings.php
@@ -1,8 +1,7 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ * Chinese Traditional language file
+ *
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 MySQL 伺服器';
diff --git a/lib/plugins/authpgsql/lang/zh-tw/settings.php b/lib/plugins/authpgsql/lang/zh-tw/settings.php
index b7dd9c6d8..6a04214ad 100644
--- a/lib/plugins/authpgsql/lang/zh-tw/settings.php
+++ b/lib/plugins/authpgsql/lang/zh-tw/settings.php
@@ -1,8 +1,7 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ * Chinese Traditional language file
+ *
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 PostgreSQL 伺服器';
diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php
index 248582aa6..56149e79e 100644
--- a/lib/plugins/plugin/lang/zh-tw/lang.php
+++ b/lib/plugins/plugin/lang/zh-tw/lang.php
@@ -1,11 +1,11 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
+ * Chinese Traditional language file
+ *
+ * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php
index bc7ceb11b..b34efe995 100644
--- a/lib/plugins/popularity/lang/zh-tw/lang.php
+++ b/lib/plugins/popularity/lang/zh-tw/lang.php
@@ -1,11 +1,11 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
+ * Chinese Traditional language file
+ *
+ * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/revert/lang/zh-tw/lang.php b/lib/plugins/revert/lang/zh-tw/lang.php
index dc83d8c29..88a77f7a1 100644
--- a/lib/plugins/revert/lang/zh-tw/lang.php
+++ b/lib/plugins/revert/lang/zh-tw/lang.php
@@ -1,11 +1,11 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
+ * Chinese Traditional language file
+ *
+ * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index aa70e67c0..980d974cc 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -1,12 +1,12 @@
 <?php
-
 /**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ * English language file
+ *
  * @author chinsan <chinsan.tw@gmail.com>
- * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
+ * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
-- 
cgit v1.2.3


From 363c0a9eb7c11cf712293630c861febb907ce17f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 2 Aug 2013 10:49:52 +0100
Subject: small fix for pagetools in RTL languages

---
 lib/tpl/dokuwiki/css/pagetools.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index 7ce7de3cf..98e4ff1fc 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -175,7 +175,7 @@
     background-position: right -135px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.edit {
-    background-position: left 0;
+    background-position: left -90px;
 }
 [dir=rtl] #dokuwiki__pagetools ul li a.edit:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.edit:active,
-- 
cgit v1.2.3


From acd3eb673b5f7c26fc8ec53d0147b30769e2a866 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Fri, 2 Aug 2013 13:41:42 +0200
Subject: Enable LANG.template.<template>.key to provide localized strings in
 templates

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

(limited to 'lib')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 06769d895..4b4b598de 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -96,6 +96,10 @@ function js_out(){
     // load JS specific translations
     $json = new JSON();
     $lang['js']['plugins'] = js_pluginstrings();
+    $templatestrings = js_templatestrings();
+    if(!empty($templatestrings)) {
+        $lang['js']['template'] = $templatestrings;
+    }
     echo 'LANG = '.$json->encode($lang['js']).";\n";
 
     // load toolbar
@@ -210,6 +214,21 @@ function js_pluginstrings()
     return $pluginstrings;
 }
 
+function js_templatestrings() {
+    global $conf;
+    $templatestrings = array();
+    if (@file_exists(tpl_incdir()."lang/en/lang.php")) {
+        include tpl_incdir()."lang/en/lang.php";
+    }
+    if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
+        include tpl_incdir()."lang/".$conf['lang']."/lang.php";
+    }
+    if (isset($lang['js'])) {
+        $templatestrings[$conf['template']] = $lang['js'];
+    }
+    return $templatestrings;
+}
+
 /**
  * Escapes a String to be embedded in a JavaScript call, keeps \n
  * as newline
-- 
cgit v1.2.3


From dc0680528a593198449a846d9f1acdd25c51e873 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Fri, 2 Aug 2013 16:11:40 +0200
Subject: de/de-informal updates: Replace "Nutzer" with more common word
 "Benutzer" / fix several typos / Fixes FS#2821

---
 lib/plugins/acl/lang/de-informal/lang.php         |  4 ++--
 lib/plugins/acl/lang/de/help.txt                  |  2 +-
 lib/plugins/acl/lang/de/lang.php                  |  6 +++---
 lib/plugins/config/lang/de-informal/lang.php      | 12 +++++++-----
 lib/plugins/config/lang/de/lang.php               | 24 ++++++++++++-----------
 lib/plugins/popularity/lang/de-informal/intro.txt |  2 +-
 lib/plugins/popularity/lang/de/intro.txt          |  2 +-
 lib/plugins/usermanager/lang/de/lang.php          |  8 ++++----
 8 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index 45a993982..3487f4257 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -22,8 +22,8 @@ $lang['p_user_id']             = 'Benutzer <b class="acluser">%s</b> hat im Mome
 $lang['p_user_ns']             = 'Benutzer <b class="acluser">%s</b> hat momentan die folgenden Rechte im Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Die Gruppenmitglieder <b class="aclgroup">%s</b> haben momentan die folgenden Rechte auf der Seite <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_group_ns']            = 'Die Mitglieder der Gruppe <b class="aclgroup">%s</b> haben gerade Zugriff in folgenden Namensräumen <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen der Seite <b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
-$lang['p_choose_ns']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen des Namenraumes <b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
+$lang['p_choose_id']           = 'Bitte <b>gib einen Benutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen der Seite <b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
+$lang['p_choose_ns']           = 'Bitte <b>gib einen Benutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen des Namenraumes <b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
 $lang['p_inherited']           = 'Hinweis: Diese Rechte wurden nicht explizit gesetzt, sondern von anderen Gruppen oder übergeordneten Namensräumen geerbt.';
 $lang['p_isadmin']             = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.';
 $lang['p_include']             = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Löschrechte sind nur für Namensräume, nicht für Seiten.';
diff --git a/lib/plugins/acl/lang/de/help.txt b/lib/plugins/acl/lang/de/help.txt
index 783ae22e7..2a3efe5f0 100644
--- a/lib/plugins/acl/lang/de/help.txt
+++ b/lib/plugins/acl/lang/de/help.txt
@@ -4,7 +4,7 @@ Auf dieser Seite können sie Zugriffsberechtigungen für Seiten und Namensräume
 
 Die Liste links zeigt alle verfügbaren Namensräume und Seiten.
 
-Das Formular oben erlaubt Anzeige, Ändern und Hinzufügen von Zugriffsregeln für einen ausgewählten Nutzer oder eine Gruppe.
+Das Formular oben erlaubt Anzeige, Ändern und Hinzufügen von Zugriffsregeln für einen ausgewählten Benutzer oder eine Gruppe.
 
 In der Tabelle unten werden alle bestehenden Regeln aufgeführt und können dort modifiziert oder gelöscht werden.
 
diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php
index eb23636c4..5f3e51a32 100644
--- a/lib/plugins/acl/lang/de/lang.php
+++ b/lib/plugins/acl/lang/de/lang.php
@@ -33,10 +33,10 @@ $lang['p_user_id']             = 'Nutzer <b class="acluser">%s</b> hat momentan
 $lang['p_user_ns']             = 'Nutzer <b class="acluser">%s</b> hat momentan folgende Berechtigungen im Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Mitglieder der Gruppe <b class="aclgroup">%s</b> haben momentan folgende Berechtigungen für die Seite <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_group_ns']            = 'Mitglieder der Gruppe <b class="aclgroup">%s</b> haben momentan folgende Berechtigungen für den Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id']           = 'Bitte geben Sie in obigem Formular eine <b>einen Nutzer oder eine Gruppe</b> an, um die Berechtigungen für die Seite <b class="aclpage">%s</b> zu sehen oder zu ändern.';
-$lang['p_choose_ns']           = 'Bitte geben Sie in obigem Formular eine <b>einen Nutzer oder eine Gruppe</b> an, um die Berechtigungen für den Namensraum <b class="aclns">%s</b> zu sehen oder zu ändern.';
+$lang['p_choose_id']           = 'Bitte geben Sie in obigem Formular eine <b>einen Benutzer oder eine Gruppe</b> an, um die Berechtigungen für die Seite <b class="aclpage">%s</b> zu sehen oder zu ändern.';
+$lang['p_choose_ns']           = 'Bitte geben Sie in obigem Formular eine <b>einen Benutzer oder eine Gruppe</b> an, um die Berechtigungen für den Namensraum <b class="aclns">%s</b> zu sehen oder zu ändern.';
 $lang['p_inherited']           = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt, sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.';
-$lang['p_isadmin']             = 'Hinweis: Die ausgewählte Gruppe oder Nutzer haben immer alle Berechtigungen das sie als Superuser konfiguriert wurden.';
+$lang['p_isadmin']             = 'Hinweis: Die ausgewählte Gruppe oder Benutzer haben immer alle Berechtigungen das sie als Superuser konfiguriert wurden.';
 $lang['p_include']             = 'Höhere Berechtigungen schließen niedrigere mit ein. Anlegen, Hochladen und Entfernen gilt nur für Namensräume, nicht für einzelne Seiten';
 $lang['current']               = 'Momentane Zugriffsregeln';
 $lang['where']                 = 'Seite/Namensraum';
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 81cdc0e70..262a6332e 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -27,7 +27,7 @@ $lang['_header_template']      = 'Template-Konfiguration';
 $lang['_header_undefined']     = 'Unbekannte Werte';
 $lang['_basic']                = 'Grund-Konfiguration';
 $lang['_display']              = 'Darstellungs-Konfiguration';
-$lang['_authentication']       = 'Authentifizierung-Konfiguration';
+$lang['_authentication']       = 'Authentifizierungs-Konfiguration';
 $lang['_anti_spam']            = 'Anti-Spam-Konfiguration';
 $lang['_editing']              = 'Bearbeitungs-Konfiguration';
 $lang['_links']                = 'Links-Konfiguration';
@@ -66,7 +66,7 @@ $lang['signature']             = 'Signatur';
 $lang['showuseras']            = 'Was angezeigt werden soll, wenn der Benutzer, der zuletzt eine Seite bearbeitet hat, angezeigt wird';
 $lang['toptoclevel']           = 'Inhaltsverzeichnis bei dieser Überschriftengröße beginnen';
 $lang['tocminheads']           = 'Mindestanzahl der Überschriften die entscheidet, ob ein Inhaltsverzeichnis erscheinen soll';
-$lang['maxtoclevel']           = 'Maximale Überschriftsgröße für Inhaltsverzeichnis';
+$lang['maxtoclevel']           = 'Maximale Überschriftengröße für Inhaltsverzeichnis';
 $lang['maxseclevel']           = 'Abschnitte bis zu dieser Stufe einzeln editierbar machen';
 $lang['camelcase']             = 'CamelCase-Verlinkungen verwenden';
 $lang['deaccent']              = 'Seitennamen bereinigen';
@@ -78,14 +78,15 @@ $lang['autopasswd']            = 'Automatisch erzeugte Passwörter';
 $lang['authtype']              = 'Authentifizierungsmethode';
 $lang['passcrypt']             = 'Passwortverschlüsselungsmethode';
 $lang['defaultgroup']          = 'Standardgruppe';
-$lang['superuser']             = 'Administrator - Eine Gruppe oder Nutzer mit vollem Zugriff auf alle Seiten und Administrationswerkzeuge.';
-$lang['manager']               = 'Manager - Eine Gruppe oder Nutzer mit Zugriff auf einige Administrationswerkzeuge.';
+$lang['superuser']             = 'Administrator - Eine Gruppe oder Benutzer mit vollem Zugriff auf alle Seiten und Administrationswerkzeuge.';
+$lang['manager']               = 'Manager - Eine Gruppe oder Benutzer mit Zugriff auf einige Administrationswerkzeuge.';
 $lang['profileconfirm']        = 'Änderungen am Benutzerprofil mit Passwort bestätigen';
 $lang['rememberme']            = 'Permanente Login-Cookies erlauben (Auf diesem Computer eingeloggt bleiben)';
 $lang['disableactions']        = 'Deaktiviere DokuWiki\'s Zugriffe';
 $lang['disableactions_check']  = 'Check';
 $lang['disableactions_subscription'] = 'Bestellen/Abbestellen';
 $lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten';
+$lang['disableactions_profile_delete'] = 'Eigenes Benutzerprofil löschen';
 $lang['disableactions_other']  = 'Weitere Aktionen (durch Komma getrennt)';
 $lang['auth_security_timeout'] = 'Zeitüberschreitung bei der Authentifizierung (Sekunden)';
 $lang['securecookie']          = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktiviere diese Option, wenn nur der Login deines Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.';
@@ -108,6 +109,7 @@ $lang['target____media']       = 'Zielfenstername für Medienlinks';
 $lang['target____windows']     = 'Zielfenstername für Windows-Freigaben-Links';
 $lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
+$lang['refshow']               = 'Wie viele Verwendungsorte der Media-Datei zeigen';
 $lang['gdlib']                 = 'GD Lib Version';
 $lang['im_convert']            = 'Pfad zu ImageMagicks-Konvertierwerkzeug';
 $lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
@@ -190,7 +192,7 @@ $lang['xsendfile_o_1']         = 'Proprietärer lighttpd-Header (vor Release 1.5
 $lang['xsendfile_o_2']         = 'Standard X-Sendfile-Header';
 $lang['xsendfile_o_3']         = 'Proprietärer Nginx X-Accel-Redirect-Header';
 $lang['showuseras_o_loginname'] = 'Login-Name';
-$lang['showuseras_o_username'] = 'Voller Name des Nutzers';
+$lang['showuseras_o_username'] = 'Voller Name des Benutzers';
 $lang['showuseras_o_email']    = 'E-Mail-Adresse des Benutzers (je nach Mailguard-Einstellung verschleiert)';
 $lang['showuseras_o_email_link'] = 'E-Mail-Adresse des Benutzers als mailto:-Link';
 $lang['useheading_o_0']        = 'Niemals';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index f2ada5f7b..aeadef897 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -72,12 +72,13 @@ $lang['dformat']               = 'Datumsformat (Siehe PHP <a href="http://www.ph
 $lang['signature']             = 'Signatur';
 $lang['toptoclevel']           = 'Inhaltsverzeichnis bei dieser Überschriftengröße beginnen';
 $lang['tocminheads']           = 'Mindestanzahl der Überschriften die entscheidet, ob ein Inhaltsverzeichnis erscheinen soll';
-$lang['maxtoclevel']           = 'Maximale Überschriftsgröße für Inhaltsverzeichnis';
+$lang['maxtoclevel']           = 'Maximale Überschriftengröße für Inhaltsverzeichnis';
 $lang['maxseclevel']           = 'Abschnitte bis zu dieser Stufe einzeln editierbar machen';
 $lang['camelcase']             = 'CamelCase-Verlinkungen verwenden';
 $lang['deaccent']              = 'Seitennamen bereinigen';
 $lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
+$lang['refshow']               = 'Wie viele Verwendungsorte der Media-Datei zeigen';
 $lang['allowdebug']            = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>';
 $lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['usewordblock']          = 'Spam-Blocking benutzen';
@@ -91,18 +92,19 @@ $lang['autopasswd']            = 'Passwort automatisch generieren';
 $lang['authtype']              = 'Authentifizierungsmechanismus';
 $lang['passcrypt']             = 'Verschlüsselungsmechanismus';
 $lang['defaultgroup']          = 'Standardgruppe';
-$lang['superuser']             = 'Administrator - Eine Gruppe oder Nutzer mit vollem Zugriff auf alle Seiten und Administrationswerkzeuge.';
-$lang['manager']               = 'Manager - Eine Gruppe oder Nutzer mit Zugriff auf einige Administrationswerkzeuge.';
+$lang['superuser']             = 'Administrator - Eine Gruppe oder Benutzer mit vollem Zugriff auf alle Seiten und Administrationswerkzeuge.';
+$lang['manager']               = 'Manager - Eine Gruppe oder Benutzer mit Zugriff auf einige Administrationswerkzeuge.';
 $lang['profileconfirm']        = 'Profiländerung nur nach Passwortbestätigung';
 $lang['disableactions']        = 'DokuWiki-Aktionen deaktivieren';
 $lang['disableactions_check']  = 'Check';
 $lang['disableactions_subscription'] = 'Seiten-Abonnements';
 $lang['disableactions_wikicode'] = 'Quelltext betrachten/exportieren';
+$lang['disableactions_profile_delete'] = 'Eigenes Benutzerprofil löschen';
 $lang['disableactions_other']  = 'Andere Aktionen (durch Komma getrennt)';
 $lang['sneaky_index']          = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.';
 $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)';
 $lang['securecookie']          = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktivieren Sie diese Option, wenn nur der Login Ihres Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.';
-$lang['remote']                = 'Aktiviert den externen API-Zugang. Diese Option erlaubt es externen Anwendungen von außen auf die XML-RPC-Schnittstelle oder anderweitigen Schnittstellen zuzugreifen.';
+$lang['remote']                = 'Aktiviert den externen API-Zugang. Diese Option erlaubt es externen Anwendungen von außen auf die XML-RPC-Schnittstelle oder anderweitigen Schnittstellen zu zugreifen.';
 $lang['remoteuser']            = 'Zugriff auf die externen Schnittstellen durch kommaseparierte Angabe von Benutzern oder Gruppen einschränken. Ein leeres Feld erlaubt Zugriff für jeden.';
 $lang['updatecheck']           = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.';
 $lang['userewrite']            = 'URL rewriting';
@@ -117,18 +119,18 @@ $lang['cachetime']             = 'Maximale Cachespeicherung (Sekunden)';
 $lang['locktime']              = 'Maximales Alter für Seitensperren (Sekunden)';
 $lang['fetchsize']             = 'Maximale Größe (in Bytes), die fetch.php von extern herunterladen darf';
 $lang['notify']                = 'Änderungsmitteilungen an diese E-Mail-Adresse versenden';
-$lang['registernotify']        = 'Information über neu registrierte Nutzer an diese E-Mail-Adresse senden';
+$lang['registernotify']        = 'Information über neu registrierte Benutzer an diese E-Mail-Adresse senden';
 $lang['mailfrom']              = 'Absender-E-Mail-Adresse für automatische Mails';
 $lang['mailprefix']            = 'Präfix für E-Mail-Betreff beim automatischen Versand von Benachrichtigungen';
 $lang['htmlmail']              = 'Versendet optisch angenehmere, aber größere E-Mails im HTML-Format (multipart). Deaktivieren, um Text-Mails zu versenden.';
 $lang['gzip_output']           = 'Seiten mit gzip komprimiert ausliefern';
 $lang['gdlib']                 = 'GD Lib Version';
-$lang['im_convert']            = 'Pfad zu ImageMagicks-Konvertierwerkzeug';
+$lang['im_convert']            = 'Pfad zum ImageMagicks-Konvertierwerkzeug';
 $lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
 $lang['subscribers']           = 'E-Mail-Abos zulassen';
 $lang['subscribe_time']        = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.';
 $lang['compress']              = 'JavaScript und Stylesheets komprimieren';
-$lang['cssdatauri']            = 'Größe in Bytes, bis zu der Bilder in css-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter!  Empfohlene Einstellung: <code>400</code> to <code>600</code> Bytes. Setzen Sie die Einstellung auf <code>0</code> um die Funktion zu deaktivieren.';
+$lang['cssdatauri']            = 'Größe in Bytes, bis zu der Bilder in CSS-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter!  Empfohlene Einstellung: <code>400</code> to <code>600</code> Bytes. Setzen Sie die Einstellung auf <code>0</code> um die Funktion zu deaktivieren.';
 $lang['hidepages']             = 'Seiten verstecken (Regulärer Ausdruck)';
 $lang['send404']               = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten';
 $lang['sitemap']               = 'Google Sitemap erzeugen (Tage)';
@@ -142,7 +144,7 @@ $lang['rss_type']              = 'XML-Feed-Format';
 $lang['rss_linkto']            = 'XML-Feed verlinken auf';
 $lang['rss_content']           = 'Welche Inhalte sollen im XML-Feed dargestellt werden?';
 $lang['rss_update']            = 'XML-Feed Aktualisierungsintervall (Sekunden)';
-$lang['recent_days']           = 'Wieviele letzte Änderungen sollen einsehbar bleiben? (Tage)';
+$lang['recent_days']           = 'Wie viele letzte Änderungen sollen einsehbar bleiben? (Tage)';
 $lang['rss_show_summary']      = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen';
 $lang['rss_media']             = 'Welche Änderungen sollen im XML-Feed angezeigt werden?';
 $lang['target____wiki']        = 'Zielfenster für interne Links (target Attribut)';
@@ -150,17 +152,17 @@ $lang['target____interwiki']   = 'Zielfenster für InterWiki-Links (target Attri
 $lang['target____extern']      = 'Zielfenster für Externe Links (target Attribut)';
 $lang['target____media']       = 'Zielfenster für (Bild-)Dateien (target Attribut)';
 $lang['target____windows']     = 'Zielfenster für Windows Freigaben (target Attribut)';
-$lang['dnslookups']            = 'DokuWiki löst die IP-Adressen von Benutzern zu deren Hostnamen auf. Wenn du einen langsamen, unbrauchbaren DNS-Server verwendest oder die Funktion nicht benötigst, dann sollte diese Option deaktivert sein.';
+$lang['dnslookups']            = 'DokuWiki löst die IP-Adressen von Benutzern zu deren Hostnamen auf. Wenn du einen langsamen, unbrauchbaren DNS-Server verwendest oder die Funktion nicht benötigst, dann sollte diese Option deaktiviert sein.';
 $lang['proxy____host']         = 'Proxy-Server';
 $lang['proxy____port']         = 'Proxy-Port';
-$lang['proxy____user']         = 'Proxy Nutzername';
+$lang['proxy____user']         = 'Proxy Benutzername';
 $lang['proxy____pass']         = 'Proxy Passwort';
 $lang['proxy____ssl']          = 'SSL bei Verbindung zum Proxy verwenden';
 $lang['proxy____except']       = 'Regulärer Ausdruck um Adressen zu beschreiben, für die kein Proxy verwendet werden soll';
 $lang['safemodehack']          = 'Safemodehack verwenden';
 $lang['ftp____host']           = 'FTP-Host für Safemodehack';
 $lang['ftp____port']           = 'FTP-Port für Safemodehack';
-$lang['ftp____user']           = 'FTP Nutzername für Safemodehack';
+$lang['ftp____user']           = 'FTP Benutzername für Safemodehack';
 $lang['ftp____pass']           = 'FTP Passwort für Safemodehack';
 $lang['ftp____root']           = 'FTP Wurzelverzeichnis für Safemodehack';
 $lang['license_o_']            = 'Keine gewählt';
diff --git a/lib/plugins/popularity/lang/de-informal/intro.txt b/lib/plugins/popularity/lang/de-informal/intro.txt
index ddae9347d..a414b6687 100644
--- a/lib/plugins/popularity/lang/de-informal/intro.txt
+++ b/lib/plugins/popularity/lang/de-informal/intro.txt
@@ -1,6 +1,6 @@
 ===== Rückmeldung zur Zufriedenheit =====
 
-Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Nutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind.
+Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Benutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind.
 
 Bitte wiederhole diesen Schritt von Zeit zu Zeit, um die Entwickler zu informieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen Identifikationsnummer zugeordnet.
 
diff --git a/lib/plugins/popularity/lang/de/intro.txt b/lib/plugins/popularity/lang/de/intro.txt
index dc014e029..ba88ce270 100644
--- a/lib/plugins/popularity/lang/de/intro.txt
+++ b/lib/plugins/popularity/lang/de/intro.txt
@@ -1,6 +1,6 @@
 ====== Popularitäts-Feedback ======
 
-Dieses [[doku>popularity|Werkzeug]] sammelt verschiedene anonyme Daten über Ihr Wiki und erlaubt es Ihnen, diese an die DokuWiki-Entwickler zurückzusenden. Diese Daten helfen den Entwicklern besser zu verstehen, wie DokuWiki eingesetzt wird und stellt sicher, dass zukünftige, die Weiterentwicklung von DokuWiki betreffende, Entscheidungen auf Basis echter Nutzerdaten getroffen werden.
+Dieses [[doku>popularity|Werkzeug]] sammelt verschiedene anonyme Daten über Ihr Wiki und erlaubt es Ihnen, diese an die DokuWiki-Entwickler zurückzusenden. Diese Daten helfen den Entwicklern besser zu verstehen, wie DokuWiki eingesetzt wird und stellt sicher, dass zukünftige, die Weiterentwicklung von DokuWiki betreffende, Entscheidungen auf Basis echter Benutzerdaten getroffen werden.
 
 Bitte wiederholen Sie das Versenden der Daten von Zeit zu Zeit, um die Entwickler über das Wachstum Ihres Wikis auf dem Laufenden zu halten. Ihre wiederholten Dateneinsendungen werden über eine anonyme ID identifiziert.
 
diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php
index 0dd90cc68..2b9755de8 100644
--- a/lib/plugins/usermanager/lang/de/lang.php
+++ b/lib/plugins/usermanager/lang/de/lang.php
@@ -45,16 +45,16 @@ $lang['delete_ok']             = '%d Benutzer gelöscht';
 $lang['delete_fail']           = '%d konnten nicht gelöscht werden.';
 $lang['update_ok']             = 'Benutzerdaten erfolgreich geändert.';
 $lang['update_fail']           = 'Änderung der Benutzerdaten fehlgeschlagen.';
-$lang['update_exists']         = 'Nutzername konnte nicht geändert werden, weil der angegebene Nutzer (%s) bereits existiert (alle anderen Änderungen wurden durchgeführt).';
+$lang['update_exists']         = 'Benutzername konnte nicht geändert werden, weil der angegebene Benutzer (%s) bereits existiert (alle anderen Änderungen wurden durchgeführt).';
 $lang['start']                 = 'Anfang';
 $lang['prev']                  = 'Vorherige';
 $lang['next']                  = 'Nächste';
 $lang['last']                  = 'Ende';
-$lang['edit_usermissing']      = 'Der ausgewählte Nutzer wurde nicht gefunden. Möglicherweise wurde er gelöscht oder der Nutzer wurde anderswo geändert.';
+$lang['edit_usermissing']      = 'Der ausgewählte Benutzer wurde nicht gefunden. Möglicherweise wurde er gelöscht oder der Benutzer wurde anderswo geändert.';
 $lang['user_notify']           = 'Nutzer benachrichtigen';
 $lang['note_notify']           = 'Benachrichtigungs-E-Mails werden nur versandt, wenn ein neues Passwort vergeben wurde.';
-$lang['note_group']            = 'Neue Nutzer werden der Standard-Gruppe (%s) hinzugefügt, wenn keine Gruppe angegeben wurde.';
-$lang['note_pass']             = 'Das Passwort wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Nutzers aktiviert ist.';
+$lang['note_group']            = 'Neue Benutzer werden der Standard-Gruppe (%s) hinzugefügt, wenn keine Gruppe angegeben wurde.';
+$lang['note_pass']             = 'Das Passwort wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Benutzers aktiviert ist.';
 $lang['add_ok']                = 'Nutzer erfolgreich angelegt';
 $lang['add_fail']              = 'Nutzer konnte nicht angelegt werden';
 $lang['notify_ok']             = 'Benachrichtigungsmail wurde versandt';
-- 
cgit v1.2.3


From ae1afd2f6529e4d07b18317304e5e2c302d783ce Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 2 Aug 2013 17:21:48 +0200
Subject: add csv import functionality to the user manager

---
 lib/plugins/usermanager/admin.php          | 187 +++++++++++++++++++++++++++++
 lib/plugins/usermanager/lang/en/import.txt |   9 ++
 lib/plugins/usermanager/lang/en/lang.php   |  15 +++
 lib/plugins/usermanager/style.css          |   3 +
 4 files changed, 214 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/en/import.txt

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 72ac47e15..ddf10a115 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -30,6 +30,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     var $_edit_user = '';     // set to user selected for editing
     var $_edit_userdata = array();
     var $_disabled = '';      // if disabled set to explanatory string
+    var $_import_failures = array();
 
     /**
      * Constructor
@@ -49,6 +50,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
           $this->_auth = & $auth;
 
         }
+
+        // attempt to retrieve any import failures from the session
+        if ($_SESSION['import_failures']){
+            $this->_import_failures = $_SESSION['import_failures'];
+        }
     }
 
      /**
@@ -102,6 +108,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
                           $this->_start = 0;
                           break;
           case "export" : $this->_export(); break;
+          case "import" : $this->_import(); break;
+          case "importfails" : $this->_downloadImportFailures(); break;
         }
 
         $this->_user_total = $this->_auth->canDo('getUserCount') ? $this->_auth->getUserCount($this->_filter) : -1;
@@ -238,6 +246,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
           ptln("  </div>");
           ptln("</div>");
         }
+
+        if ($this->_auth->canDo('addUser')) {
+          $this->_htmlImportForm();
+        }
         ptln("</div>");
     }
 
@@ -352,6 +364,59 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
     }
 
+    function _htmlImportForm($indent=0) {
+        global $ID;
+
+        $failure_download_link = wl($ID,array('do'=>'admin','page'=>'usermanager','fn[importfails]'=>1));
+
+        ptln('<div class="level2 import_users">',$indent);
+        print $this->locale_xhtml('import');
+        ptln('  <form action="'.wl($ID).'" method="post" enctype="multipart/form-data">',$indent);
+        formSecurityToken();
+        ptln('    <label>User list file (csv):  <input type="file" name="import" /></label>',$indent);
+        ptln('    <input type="submit" name="fn[import]" value="'.$this->lang['import'].'" />',$indent);
+        ptln('    <input type="hidden" name="do"    value="admin" />',$indent);
+        ptln('    <input type="hidden" name="page"  value="usermanager" />',$indent);
+
+        $this->_htmlFilterSettings($indent+4);
+        ptln('  </form>',$indent);
+        ptln('</div>');
+
+        // list failures from the previous import
+        if ($this->_import_failures) {
+            $digits = strlen(count($this->_import_failures));
+            ptln('<div class="level3 import_failures">',$indent);
+            ptln('  <h3>Most Recent Import - Failures</h3>');
+            ptln('  <table class="import_failures">',$indent);
+            ptln('    <thead>',$indent);
+            ptln('      <tr>',$indent);
+            ptln('        <th class="line">'.$this->lang['line'].'</th>',$indent);
+            ptln('        <th class="error">'.$this->lang['error'].'</th>',$indent);
+            ptln('        <th class="userid">'.$this->lang['user_id'].'</th>',$indent);
+            ptln('        <th class="username">'.$this->lang['user_name'].'</th>',$indent);
+            ptln('        <th class="usermail">'.$this->lang['user_mail'].'</th>',$indent);
+            ptln('        <th class="usergroups">'.$this->lang['user_groups'].'</th>',$indent);
+            ptln('      </tr>',$indent);
+            ptln('    </thead>',$indent);
+            ptln('    <tbody>',$indent);
+            foreach ($this->_import_failures as $line => $failure) {
+                ptln('      <tr>',$indent);
+                ptln('        <td class="lineno"> '.sprintf('%0'.$digits.'d',$line).' </td>',$indent);
+                ptln('        <td class="error">' .$failure['error'].' </td>', $indent);
+                ptln('        <td class="field userid"> '.hsc($failure['user'][0]).' </td>',$indent);
+                ptln('        <td class="field username"> '.hsc($failure['user'][2]).' </td>',$indent);
+                ptln('        <td class="field usermail"> '.hsc($failure['user'][3]).' </td>',$indent);
+                ptln('        <td class="field usergroups"> '.hsc($failure['user'][4]).' </td>',$indent);
+                ptln('      </tr>',$indent);
+            }
+            ptln('    </tbody>',$indent);
+            ptln('  </table>',$indent);
+            ptln('  <p><a href="'.$failure_download_link.'">Download Failures as CSV for correction</a></p>');
+            ptln('</div>');
+        }
+
+    }
+
     function _addUser(){
         global $INPUT;
         if (!checkSecurityToken()) return false;
@@ -666,4 +731,126 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         fclose($fd);
         die;
     }
+
+    /*
+     * import a file of users in csv format
+     *
+     * csv file should have 4 columns, user_id, full name, email, groups (comma separated)
+     */
+    function _import() {
+        // check we are allowed to add users
+        if (!checkSecurityToken()) return false;
+        if (!$this->_auth->canDo('addUser')) return false;
+
+        // check file uploaded ok.
+        if (empty($_FILES['import']['size']) || !empty($FILES['import']['error']) && is_uploaded_file($FILES['import']['tmp_name'])) {
+            msg($this->lang['import_error_upload'],-1);
+            return false;
+        }
+        // retrieve users from the file
+        $this->_import_failures = array();
+        $import_success_count = 0;
+        $import_fail_count = 0;
+        $line = 0;
+        $fd = fopen($_FILES['import']['tmp_name'],'r');
+        if ($fd) {
+            while($csv = fgets($fd)){
+                $raw = str_getcsv($csv);
+                $error = '';                        // clean out any errors from the previous line
+                // data checks...
+                if (1 == ++$line) {
+                    if ($raw[0] == 'user_id' || $raw[0] == $this->lang['user_id']) continue;    // skip headers
+                }
+                if (count($raw) < 4) {                                        // need at least four fields
+                    $import_fail_count++;
+                    $error = sprintf($this->lang['import_error_fields'], count($raw));
+                    $this->_import_failures[$line] = array('error' => $error, 'user' => $raw, 'orig' => $csv);
+                    continue;
+                }
+                array_splice($raw,1,0,auth_pwgen());                          // splice in a generated password
+                $clean = $this->_cleanImportUser($raw, $error);
+                if ($clean && $this->_addImportUser($clean, $error)) {
+#                    $this->_notifyUser($clean[0],$clean[1]);
+                    $import_success_count++;
+                } else {
+                    $import_fail_count++;
+                    $this->_import_failures[$line] = array('error' => $error, 'user' => $raw, 'orig' => $csv);
+                }
+            }
+            msg(sprintf($this->lang['import_success_count'], ($import_success_count+$import_fail_count), $import_success_count),($import_success_count ? 1 : -1));
+            if ($import_fail_count) {
+                msg(sprintf($this->lang['import_failure_count'], $import_fail_count),-1);
+            }
+        } else {
+            msg($this->lang['import_error_readfail'],-1);
+        }
+
+        // save import failures into the session
+        if (!headers_sent()) {
+          session_start();
+          $_SESSION['import_failures'] = $this->_import_failures;
+          session_write_close();
+        }
+    }
+
+    function _cleanImportUser($candidate, & $error){
+        global $INPUT;
+
+        // kludgy ....
+        $INPUT->set('userid', $candidate[0]);
+        $INPUT->set('userpass', $candidate[1]);
+        $INPUT->set('username', $candidate[2]);
+        $INPUT->set('usermail', $candidate[3]);
+        $INPUT->set('usergroups', $candidate[4]);
+
+        $cleaned = $this->_retrieveUser();
+        list($user,$pass,$name,$mail,$grps) = $cleaned;
+        if (empty($user)) {
+            $error = $this->lang['import_error_baduserid'];
+            return false;
+        }
+
+        // no need to check password, handled elsewhere
+
+        if (!($this->_auth->canDo('modName') xor empty($name))){
+            $error = $this->lang['import_error_badname'];
+            return false;
+        }
+
+        if (!($this->_auth->canDo('modMail') xor empty($mail))){
+            $error = $this->lang['import_error_badmail'];
+            return false;
+        }
+
+        return $cleaned;
+    }
+
+    function _addImportUser($user, & $error){
+        if (!$this->_auth->triggerUserMod('create', $user)) {
+            $error = $this->lang['import_error_create'];
+            return false;
+        }
+
+        return true;
+    }
+
+    function _downloadImportFailures(){
+
+        // ==============================================================================================
+        // GENERATE OUTPUT
+        // normal headers for downloading...
+        header('Content-type: text/csv;charset=utf-8');
+        header('Content-Disposition: attachment; filename="importfails.csv"');
+#       // for debugging assistance, send as text plain to the browser
+#       header('Content-type: text/plain;charset=utf-8');
+
+        // output the csv
+        $fd = fopen('php://output','w');
+        foreach ($this->_import_failures as $line => $fail) {
+            fputs($fd, $fail['orig']);
+        }
+        fclose($fd);
+        die;
+    }
+
 }
diff --git a/lib/plugins/usermanager/lang/en/import.txt b/lib/plugins/usermanager/lang/en/import.txt
new file mode 100644
index 000000000..2087083e0
--- /dev/null
+++ b/lib/plugins/usermanager/lang/en/import.txt
@@ -0,0 +1,9 @@
+===== Bulk User Import =====
+
+Requires a CSV file of users with at least four columns.
+The columns must contain, in order: user-id, full name, email address and groups.
+The CSV fields should be separated by commas (,) and strings delimited by quotation marks ("").  Backslash (\) can be used for escaping.
+For an example of a suitable file, try the "Export Users" function above.  
+Duplicate user-ids will be ignored.
+
+A password will be generated and emailed to each successfully imported user.
diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php
index ae0ee1c16..f22d1f805 100644
--- a/lib/plugins/usermanager/lang/en/lang.php
+++ b/lib/plugins/usermanager/lang/en/lang.php
@@ -33,6 +33,9 @@ $lang['clear']       = 'Reset Search Filter';
 $lang['filter']      = 'Filter';
 $lang['export_all']  = 'Export All Users (CSV)';
 $lang['export_filtered'] = 'Export Filtered User list (CSV)';
+$lang['import']      = 'Import New Users';
+$lang['line']        = 'Line no.';
+$lang['error']       = 'Error message';
 
 $lang['summary']     = 'Displaying users %1$d-%2$d of %3$d found. %4$d users total.';
 $lang['nonefound']   = 'No users found. %d users total.';
@@ -58,3 +61,15 @@ $lang['add_fail'] = 'User addition failed';
 $lang['notify_ok'] = 'Notification email sent';
 $lang['notify_fail'] = 'Notification email could not be sent';
 
+// import errors
+$lang['import_success_count'] = 'User Import: %d users found, %d imported successfully.';
+$lang['import_failure_count'] = 'User Import: %d failed. Failures are listed below.';
+$lang['import_error_fields']  = "Insufficient fields, found %d, require 4.";
+$lang['import_error_baduserid'] = "User-id missing";
+$lang['import_error_badname'] = 'Bad name';
+$lang['import_error_badmail'] = 'Bad mail';
+$lang['import_error_upload']  = 'Import Failed. The csv file could not be uploaded or is empty.';
+$lang['import_error_readfail'] = 'Import Failed. Unable to read uploaded file.';
+$lang['import_error_create']  = 'Unable to create the user';
+
+
diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css
index ff8e5d9d1..61b6c2c4e 100644
--- a/lib/plugins/usermanager/style.css
+++ b/lib/plugins/usermanager/style.css
@@ -17,4 +17,7 @@
   color: #ccc!important;
   border-color: #ccc!important;
 }
+#user__manager .import_failures {
+	margin-top: 1em;
+}
 /* IE won't understand but doesn't require it */
-- 
cgit v1.2.3


From ee9498f56bb996332665780f790257bcd010ac3c Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 2 Aug 2013 17:28:45 +0200
Subject: usermanager: fix an issue where edit user table would incorrectly
 show the password blank message

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index ca4c6a650..62d3b3e5e 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -270,7 +270,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6);
 
         if ($this->_auth->canDo("modPass")) {
-          $notes[] = $this->lang['note_pass'];
+          if ($cmd == 'add') {
+            $notes[] = $this->lang['note_pass'];
+          }
           if ($user) {
             $notes[] = $this->lang['note_notify'];
           }
-- 
cgit v1.2.3


From 45c199029a4e9e615c042ca521c50b5aef6fc3db Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 2 Aug 2013 17:29:30 +0200
Subject: improve html structure and styling for add & edit user notes

made necessary by PR#254 which adds content below these notes.
---
 lib/plugins/usermanager/admin.php | 12 ++++++++----
 lib/plugins/usermanager/style.css |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 62d3b3e5e..3c8d38c5e 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -298,11 +298,15 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("      </tr>",$indent);
         ptln("    </tbody>",$indent);
         ptln("  </table>",$indent);
-        ptln("  </div>",$indent);
-
-        foreach ($notes as $note)
-          ptln("<div class=\"fn\">".$note."</div>",$indent);
 
+        if ($notes) {
+          ptln("    <ul class=\"notes\">");
+          foreach ($notes as $note) {
+            ptln("      <li><span class=\"li\">".$note."</span></li>",$indent);
+          }
+          ptln("    </ul>");
+        }
+        ptln("  </div>",$indent);
         ptln("</form>",$indent);
     }
 
diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css
index ff8e5d9d1..506bd7928 100644
--- a/lib/plugins/usermanager/style.css
+++ b/lib/plugins/usermanager/style.css
@@ -13,6 +13,10 @@
 #user__manager table {
   margin-bottom: 1em;
 }
+#user__manager ul.notes {
+  padding-left: 0;
+  padding-right: 1.4em;
+}
 #user__manager input.button[disabled] {
   color: #ccc!important;
   border-color: #ccc!important;
-- 
cgit v1.2.3


From 72a66eb76026e69cd4554035a010693d6ae017ad Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 2 Aug 2013 18:12:46 +0200
Subject: check less compilation for errors

This now gives proper files and line numbers for errors
---
 lib/exe/css.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 5c966db82..91fc11d66 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -131,6 +131,8 @@ function css_out(){
         // load files
         $css_content = '';
         foreach($files[$mediatype] as $file => $location){
+            $display = str_replace(fullpath(DOKU_INC), '', fullpath($file));
+            $css_content .= "\n/* XXXXXXXXX $display XXXXXXXXX */\n";
             $css_content .= css_loadfile($file, $location);
         }
         switch ($mediatype) {
@@ -154,9 +156,8 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
-    // parse LESS
-    $less = new lessc();
-    $css = $less->compile($css);
+    // parse less
+    $css = css_parseless($css);
 
     // place all remaining @import statements at the top of the file
     $css = css_moveimports($css);
@@ -175,6 +176,59 @@ function css_out(){
     http_cached_finish($cache->cache, $css);
 }
 
+/**
+ * Uses phpless to parse LESS in our CSS
+ *
+ * most of this function is error handling to show a nice useful error when
+ * LESS compilation fails
+ *
+ * @param $css
+ * @return string
+ */
+function css_parseless($css) {
+    $less = new lessc();
+    try {
+        return $less->compile($css);
+    } catch(Exception $e) {
+        // get exception message
+        $msg = str_replace(array("\n", "\r", "'"), array(), $e->getMessage());
+
+        // try to use line number to find affected file
+        if(preg_match('/line: (\d+)$/', $msg, $m)){
+            $msg = substr($msg, 0, -1* strlen($m[0])); //remove useless linenumber
+            $lno = $m[1];
+
+            // walk upwards to last include
+            $lines = explode("\n", $css);
+            $count = count($lines);
+            for($i=$lno-1; $i>=0; $i--){
+                if(preg_match('/\/(\* XXXXXXXXX )(.*?)( XXXXXXXXX \*)\//', $lines[$i], $m)){
+                    // we found it, add info to message
+                    $msg .= ' in '.$m[2].' at line '.($lno-$i);
+                    break;
+                }
+            }
+        }
+
+        // something went wrong
+        $error = 'A fatal error occured during compilation of the CSS files. '.
+            'If you recently installed a new plugin or template it '.
+            'might be broken and you should try disabling it again. ['.$msg.']';
+
+        echo ".dokuwiki:before {
+            content: '$error';
+            background-color: red;
+            display: block;
+            background-color: #fcc;
+            border-color: #ebb;
+            color: #000;
+            padding: 0.5em;
+        }";
+
+        exit;
+    }
+}
+
 /**
  * Does placeholder replacements in the style according to
  * the ones defined in a templates style.ini file
-- 
cgit v1.2.3


From cd3ed83c4f89831e192b021c8d660574a95eb168 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Fri, 2 Aug 2013 18:44:12 +0200
Subject: de/de-informal/en: Removed redundant suffixes in TOC of configuration
 manager / Synchronize terms in de and de-informal

---
 lib/plugins/config/admin.php                  |  4 +--
 lib/plugins/config/lang/ar/lang.php           |  2 --
 lib/plugins/config/lang/bg/lang.php           |  6 -----
 lib/plugins/config/lang/ca-valencia/lang.php  |  2 --
 lib/plugins/config/lang/ca/lang.php           |  2 --
 lib/plugins/config/lang/cs/lang.php           |  2 --
 lib/plugins/config/lang/da/lang.php           |  2 --
 lib/plugins/config/lang/de-informal/lang.php  | 35 +++++++++++++--------------
 lib/plugins/config/lang/de/lang.php           | 34 ++++++++++++--------------
 lib/plugins/config/lang/el/lang.php           |  2 --
 lib/plugins/config/lang/en/lang.php           | 35 ++++++++++++---------------
 lib/plugins/config/lang/eo/lang.php           |  2 --
 lib/plugins/config/lang/es/lang.php           |  2 --
 lib/plugins/config/lang/et/lang.php           |  2 --
 lib/plugins/config/lang/eu/lang.php           |  2 --
 lib/plugins/config/lang/fa/lang.php           |  2 --
 lib/plugins/config/lang/fi/lang.php           |  2 --
 lib/plugins/config/lang/fr/lang.php           |  2 --
 lib/plugins/config/lang/gl/lang.php           |  2 --
 lib/plugins/config/lang/he/lang.php           |  2 --
 lib/plugins/config/lang/hu/lang.php           |  2 --
 lib/plugins/config/lang/ia/lang.php           |  2 --
 lib/plugins/config/lang/is/lang.php           |  1 -
 lib/plugins/config/lang/it/lang.php           |  2 --
 lib/plugins/config/lang/ja/lang.php           |  2 --
 lib/plugins/config/lang/ko/lang.php           |  2 --
 lib/plugins/config/lang/la/lang.php           |  2 --
 lib/plugins/config/lang/lv/lang.php           |  2 --
 lib/plugins/config/lang/mr/lang.php           |  2 --
 lib/plugins/config/lang/ne/lang.php           |  2 --
 lib/plugins/config/lang/nl/lang.php           |  2 --
 lib/plugins/config/lang/no/lang.php           |  2 --
 lib/plugins/config/lang/pl/lang.php           |  2 --
 lib/plugins/config/lang/pt-br/lang.php        |  2 --
 lib/plugins/config/lang/pt/lang.php           |  2 --
 lib/plugins/config/lang/ro/lang.php           |  2 --
 lib/plugins/config/lang/ru/lang.php           |  2 --
 lib/plugins/config/lang/sk/lang.php           |  2 --
 lib/plugins/config/lang/sl/lang.php           |  2 --
 lib/plugins/config/lang/sq/lang.php           |  2 --
 lib/plugins/config/lang/sr/lang.php           |  2 --
 lib/plugins/config/lang/sv/lang.php           |  2 --
 lib/plugins/config/lang/th/lang.php           |  1 -
 lib/plugins/config/lang/tr/lang.php           |  2 --
 lib/plugins/config/lang/uk/lang.php           |  2 --
 lib/plugins/config/lang/zh-tw/lang.php        |  2 --
 lib/plugins/config/lang/zh/lang.php           |  2 --
 lib/plugins/revert/lang/de-informal/intro.txt |  4 +--
 lib/plugins/revert/lang/de-informal/lang.php  | 13 +++++-----
 lib/plugins/revert/lang/de/intro.txt          |  4 +--
 lib/plugins/revert/lang/de/lang.php           |  9 ++++---
 51 files changed, 66 insertions(+), 160 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index cbe9d336a..29529760c 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -268,7 +268,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
           // fill in the plugin name if missing (should exist for plugins with settings)
           if (!isset($this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'])) {
             $this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'] =
-              ucwords(str_replace('_', ' ', $plugin)).' '.$this->getLang('_plugin_sufix');
+              ucwords(str_replace('_', ' ', $plugin));
           }
         }
         closedir($dh);
@@ -289,7 +289,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       // fill in the template name if missing (should exist for templates with settings)
       if (!isset($this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'])) {
         $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] =
-          ucwords(str_replace('_', ' ', $tpl)).' '.$this->getLang('_template_sufix');
+          ucwords(str_replace('_', ' ', $tpl));
       }
 
       return true;
diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php
index 11b59dacd..66bb4240f 100644
--- a/lib/plugins/config/lang/ar/lang.php
+++ b/lib/plugins/config/lang/ar/lang.php
@@ -31,8 +31,6 @@ $lang['_media']                = 'اعدادات الوسائط';
 $lang['_notifications']        = 'اعدادات التنبيه';
 $lang['_advanced']             = 'اعدادات متقدمة';
 $lang['_network']              = 'اعدادات الشبكة';
-$lang['_plugin_sufix']         = 'اعدادات الملحقات';
-$lang['_template_sufix']       = 'اعدادات القوالب';
 $lang['_msg_setting_undefined'] = 'لا بيانات إعدادات.';
 $lang['_msg_setting_no_class'] = 'لا صنف إعدادات.';
 $lang['_msg_setting_no_default'] = 'لا قيمة افتراضية.';
diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php
index 1a370eafe..d0df38cae 100644
--- a/lib/plugins/config/lang/bg/lang.php
+++ b/lib/plugins/config/lang/bg/lang.php
@@ -42,12 +42,6 @@ $lang['_notifications'] = 'Настройки за известяване';
 $lang['_syndication']   = 'Настройки на RSS емисиите';
 $lang['_advanced'] = 'Допълнителни настройки';
 $lang['_network'] = 'Мрежови настройки';
-// The settings group name for plugins and templates can be set with
-// plugin_settings_name and template_settings_name respectively. If one
-// of these lang properties is not set, the group name will be generated
-// from the plugin or template name and the localized suffix.
-$lang['_plugin_sufix'] = ' (приставка)';
-$lang['_template_sufix'] = ' (шаблон)';
 
 /* --- Undefined Setting Messages --- */
 $lang['_msg_setting_undefined'] = 'Няма метаданни за настройките.';
diff --git a/lib/plugins/config/lang/ca-valencia/lang.php b/lib/plugins/config/lang/ca-valencia/lang.php
index dd319bdb7..b6ceadd59 100644
--- a/lib/plugins/config/lang/ca-valencia/lang.php
+++ b/lib/plugins/config/lang/ca-valencia/lang.php
@@ -30,8 +30,6 @@ $lang['_links']                = 'Ajusts de vínculs';
 $lang['_media']                = 'Ajusts de mijos';
 $lang['_advanced']             = 'Ajusts alvançats';
 $lang['_network']              = 'Ajusts de ret';
-$lang['_plugin_sufix']         = 'Ajusts de plúgins';
-$lang['_template_sufix']       = '(ajusts de la plantilla)';
 $lang['_msg_setting_undefined'] = 'Ajust sense informació.';
 $lang['_msg_setting_no_class'] = 'Ajust sense classe.';
 $lang['_msg_setting_no_default'] = 'Sense valor predeterminat.';
diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php
index 6de8caf02..a53a859a0 100644
--- a/lib/plugins/config/lang/ca/lang.php
+++ b/lib/plugins/config/lang/ca/lang.php
@@ -33,8 +33,6 @@ $lang['_notifications']        = 'Paràmetres de notificació';
 $lang['_syndication']          = 'Paràmetres de sindicació';
 $lang['_advanced']             = 'Paràmetres avançats';
 $lang['_network']              = 'Paràmetres de xarxa';
-$lang['_plugin_sufix']         = 'Paràmetres de connectors';
-$lang['_template_sufix']       = 'Paràmetres de plantilla';
 $lang['_msg_setting_undefined'] = 'Falten metadades de paràmetre.';
 $lang['_msg_setting_no_class'] = 'Falta classe de paràmetre.';
 $lang['_msg_setting_no_default'] = 'No hi ha valor per defecte.';
diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php
index 921abb54a..289c458e5 100644
--- a/lib/plugins/config/lang/cs/lang.php
+++ b/lib/plugins/config/lang/cs/lang.php
@@ -42,8 +42,6 @@ $lang['_notifications']        = 'Nastavení upozornění';
 $lang['_syndication']          = 'Nastavení syndikace';
 $lang['_advanced']             = 'Pokročilá nastavení';
 $lang['_network']              = 'Nastavení sítě';
-$lang['_plugin_sufix']         = 'Nastavení pluginů ';
-$lang['_template_sufix']       = 'Nastavení šablon';
 $lang['_msg_setting_undefined'] = 'Chybí metadata položky.';
 $lang['_msg_setting_no_class'] = 'Chybí třída položky.';
 $lang['_msg_setting_no_default'] = 'Chybí výchozí hodnota položky.';
diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php
index 79d8dc852..59a602ee5 100644
--- a/lib/plugins/config/lang/da/lang.php
+++ b/lib/plugins/config/lang/da/lang.php
@@ -38,8 +38,6 @@ $lang['_media']                = 'Medieindstillinger';
 $lang['_notifications']        = 'Notificeringsindstillinger';
 $lang['_advanced']             = 'Avancerede indstillinger';
 $lang['_network']              = 'Netværksindstillinger';
-$lang['_plugin_sufix']         = 'Udvidelsesindstillinger';
-$lang['_template_sufix']       = 'Skabelonindstillinger';
 $lang['_msg_setting_undefined'] = 'Ingen indstillingsmetadata.';
 $lang['_msg_setting_no_class'] = 'Ingen indstillingsklasse.';
 $lang['_msg_setting_no_default'] = 'Ingen standardværdi.';
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 262a6332e..598c1a72d 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -11,6 +11,7 @@
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Mateng Schimmerlos <mateng@firemail.de>
  * @author Volker Bödker <volker@boedker.de>
+ * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
 $lang['menu']                  = 'Konfiguration';
 $lang['error']                 = 'Konfiguration wurde nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfe deine Änderungen und versuche es erneut.<br />Die/der ungültige(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.';
@@ -20,24 +21,22 @@ $lang['locked']                = 'Die Konfigurationsdatei kann nicht aktualisier
 $lang['danger']                = '**Achtung**: Eine Änderung dieser Einstellung kann dein Wiki und das Einstellungsmenü unerreichbar machen.';
 $lang['warning']               = 'Achtung: Eine Änderungen dieser Option kann zu unbeabsichtigtem Verhalten führen.';
 $lang['security']              = 'Sicherheitswarnung: Eine Änderungen dieser Option können ein Sicherheitsrisiko bedeuten.';
-$lang['_configuration_manager'] = 'Konfiguration';
-$lang['_header_dokuwiki']      = 'DokuWiki-Konfiguration';
-$lang['_header_plugin']        = 'Plugin-Konfiguration';
-$lang['_header_template']      = 'Template-Konfiguration';
+$lang['_configuration_manager'] = 'Konfigurations-Manager';
+$lang['_header_dokuwiki']      = 'DokuWiki';
+$lang['_header_plugin']        = 'Plugin';
+$lang['_header_template']      = 'Template';
 $lang['_header_undefined']     = 'Unbekannte Werte';
-$lang['_basic']                = 'Grund-Konfiguration';
-$lang['_display']              = 'Darstellungs-Konfiguration';
-$lang['_authentication']       = 'Authentifizierungs-Konfiguration';
-$lang['_anti_spam']            = 'Anti-Spam-Konfiguration';
-$lang['_editing']              = 'Bearbeitungs-Konfiguration';
-$lang['_links']                = 'Links-Konfiguration';
-$lang['_media']                = 'Medien-Konfiguration';
-$lang['_notifications']        = 'Benachrichtigungs-Konfiguration';
-$lang['_syndication']          = 'Syndication-Konfiguration (RSS)';
-$lang['_advanced']             = 'Erweiterte Konfiguration';
-$lang['_network']              = 'Netzwerk-Konfiguration';
-$lang['_plugin_sufix']         = 'Plugin-Konfiguration';
-$lang['_template_sufix']       = 'Template-Konfiguration';
+$lang['_basic']                = 'Basis';
+$lang['_display']              = 'Darstellung';
+$lang['_authentication']       = 'Authentifizierung';
+$lang['_anti_spam']            = 'Anti-Spam';
+$lang['_editing']              = 'Bearbeitung';
+$lang['_links']                = 'Links';
+$lang['_media']                = 'Medien';
+$lang['_notifications']        = 'Benachrichtigung';
+$lang['_syndication']          = 'Syndication (RSS)';
+$lang['_advanced']             = 'Erweitert';
+$lang['_network']              = 'Netzwerk';
 $lang['_msg_setting_undefined'] = 'Keine Konfigurationsmetadaten.';
 $lang['_msg_setting_no_class'] = 'Keine Konfigurationsklasse.';
 $lang['_msg_setting_no_default'] = 'Kein Standardwert.';
@@ -46,7 +45,7 @@ $lang['start']                 = 'Name der Startseite';
 $lang['lang']                  = 'Sprache';
 $lang['template']              = 'Vorlage';
 $lang['tagline']               = 'Tag-Linie (nur, wenn vom Template unterstützt)';
-$lang['sidebar']               = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt)), ein leeres Feld deaktiviert die Sidebar';
+$lang['sidebar']               = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt), ein leeres Feld deaktiviert die Sidebar';
 $lang['license']               = 'Unter welcher Lizenz sollte Ihr Inhalt veröffentlicht werden?';
 $lang['savedir']               = 'Ordner zum Speichern von Daten';
 $lang['basedir']               = 'Installationsverzeichnis';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index aeadef897..07eb4a750 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -27,24 +27,22 @@ $lang['locked']                = 'Die Konfigurationsdatei kann nicht geändert w
 $lang['danger']                = 'Vorsicht: Die Änderung dieser Option könnte Ihr Wiki und das Konfigurationsmenü unzugänglich machen.';
 $lang['warning']               = 'Hinweis: Die Änderung dieser Option könnte unbeabsichtigtes Verhalten hervorrufen.';
 $lang['security']              = 'Sicherheitswarnung: Die Änderung dieser Option könnte ein Sicherheitsrisiko darstellen.';
-$lang['_configuration_manager'] = 'Konfiguration';
-$lang['_header_dokuwiki']      = 'DokuWiki-Konfiguration';
-$lang['_header_plugin']        = 'Plugin-Konfiguration';
-$lang['_header_template']      = 'Template-Konfiguration';
+$lang['_configuration_manager'] = 'Konfigurations-Manager';
+$lang['_header_dokuwiki']      = 'DokuWiki';
+$lang['_header_plugin']        = 'Plugin';
+$lang['_header_template']      = 'Template';
 $lang['_header_undefined']     = 'Unbekannte Werte';
-$lang['_basic']                = 'Grund-Konfiguration';
-$lang['_display']              = 'Darstellungs-Konfiguration';
-$lang['_authentication']       = 'Authentifizierungs-Konfiguration';
-$lang['_anti_spam']            = 'Anti-Spam-Konfiguration';
-$lang['_editing']              = 'Bearbeitungs-Konfiguration';
-$lang['_links']                = 'Links-Konfiguration';
-$lang['_media']                = 'Medien-Konfiguration';
-$lang['_notifications']        = 'Benachrichtigungs-Konfiguration';
-$lang['_syndication']          = 'Syndication-Konfiguration (RSS)';
-$lang['_advanced']             = 'Erweiterte Konfiguration';
-$lang['_network']              = 'Netzwerk-Konfiguration';
-$lang['_plugin_sufix']         = 'Plugin-Konfiguration';
-$lang['_template_sufix']       = 'Template-Konfiguration';
+$lang['_basic']                = 'Basis';
+$lang['_display']              = 'Darstellung';
+$lang['_authentication']       = 'Authentifizierung';
+$lang['_anti_spam']            = 'Anti-Spam';
+$lang['_editing']              = 'Bearbeitung';
+$lang['_links']                = 'Links';
+$lang['_media']                = 'Medien';
+$lang['_notifications']        = 'Benachrichtigung';
+$lang['_syndication']          = 'Syndication (RSS)';
+$lang['_advanced']             = 'Erweitertet';
+$lang['_network']              = 'Netzwerk';
 $lang['_msg_setting_undefined'] = 'Keine Konfigurationsmetadaten.';
 $lang['_msg_setting_no_class'] = 'Keine Konfigurationsklasse.';
 $lang['_msg_setting_no_default'] = 'Kein Standardwert.';
@@ -59,7 +57,7 @@ $lang['start']                 = 'Startseitenname';
 $lang['title']                 = 'Titel des Wikis';
 $lang['template']              = 'Designvorlage (Template)';
 $lang['tagline']               = 'Tag-Linie (nur, wenn vom Template unterstützt)';
-$lang['sidebar']               = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt)), ein leeres Feld deaktiviert die Sidebar';
+$lang['sidebar']               = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt), ein leeres Feld deaktiviert die Sidebar';
 $lang['license']               = 'Unter welcher Lizenz sollen Ihre Inhalte veröffentlicht werden?';
 $lang['fullpath']              = 'Den kompletten Dateipfad im Footer anzeigen';
 $lang['recent']                = 'Anzahl der Einträge in der Änderungsliste';
diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php
index e766c1a4c..4c24e067e 100644
--- a/lib/plugins/config/lang/el/lang.php
+++ b/lib/plugins/config/lang/el/lang.php
@@ -39,8 +39,6 @@ $lang['_notifications']        = 'Ρυθμίσεις ενημερώσεων';
 $lang['_syndication']          = 'Ρυθμίσεις σύνδεσης';
 $lang['_advanced']             = 'Ρυθμίσεις για Προχωρημένους';
 $lang['_network']              = 'Ρυθμίσεις Δικτύου';
-$lang['_plugin_sufix']         = 'Ρυθμίσεις Επεκτάσεων';
-$lang['_template_sufix']       = 'Ρυθμίσεις Προτύπων παρουσίασης';
 $lang['_msg_setting_undefined'] = 'Δεν έχουν οριστεί metadata.';
 $lang['_msg_setting_no_class'] = 'Δεν έχει οριστεί κλάση.';
 $lang['_msg_setting_no_default'] = 'Δεν υπάρχει τιμή εξ ορισμού.';
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 2d012701b..8d0e7b047 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -4,6 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Christopher Smith <chris@jalakai.co.uk>
+ * @author     Matthias Schulte <dokuwiki@lupo49.de>
  */
 
 // for admin plugins, the menu prompt to be displayed in the admin menu
@@ -23,29 +24,23 @@ $lang['security']   = 'Security Warning: Changing this option could present a se
 
 /* --- Config Setting Headers --- */
 $lang['_configuration_manager'] = 'Configuration Manager'; //same as heading in intro.txt
-$lang['_header_dokuwiki'] = 'DokuWiki Settings';
-$lang['_header_plugin'] = 'Plugin Settings';
-$lang['_header_template'] = 'Template Settings';
+$lang['_header_dokuwiki'] = 'DokuWiki';
+$lang['_header_plugin'] = 'Plugin';
+$lang['_header_template'] = 'Template';
 $lang['_header_undefined'] = 'Undefined Settings';
 
 /* --- Config Setting Groups --- */
-$lang['_basic'] = 'Basic Settings';
-$lang['_display'] = 'Display Settings';
-$lang['_authentication'] = 'Authentication Settings';
-$lang['_anti_spam'] = 'Anti-Spam Settings';
-$lang['_editing'] = 'Editing Settings';
-$lang['_links'] = 'Link Settings';
-$lang['_media'] = 'Media Settings';
-$lang['_notifications'] = 'Notification Settings';
-$lang['_syndication']   = 'Syndication Settings';
-$lang['_advanced'] = 'Advanced Settings';
-$lang['_network'] = 'Network Settings';
-// The settings group name for plugins and templates can be set with
-// plugin_settings_name and template_settings_name respectively. If one
-// of these lang properties is not set, the group name will be generated
-// from the plugin or template name and the localized suffix.
-$lang['_plugin_sufix'] = 'Plugin Settings';
-$lang['_template_sufix'] = 'Template Settings';
+$lang['_basic'] = 'Basic';
+$lang['_display'] = 'Display';
+$lang['_authentication'] = 'Authentication';
+$lang['_anti_spam'] = 'Anti-Spam';
+$lang['_editing'] = 'Editing';
+$lang['_links'] = 'Links';
+$lang['_media'] = 'Media';
+$lang['_notifications'] = 'Notification';
+$lang['_syndication']   = 'Syndication (RSS)';
+$lang['_advanced'] = 'Advanced';
+$lang['_network'] = 'Network';
 
 /* --- Undefined Setting Messages --- */
 $lang['_msg_setting_undefined'] = 'No setting metadata.';
diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php
index b3300c1b5..440d771dc 100644
--- a/lib/plugins/config/lang/eo/lang.php
+++ b/lib/plugins/config/lang/eo/lang.php
@@ -36,8 +36,6 @@ $lang['_notifications']        = 'Sciigaj agordoj';
 $lang['_syndication']          = 'Kunhavigaj agordoj';
 $lang['_advanced']             = 'Fakaj difinoj';
 $lang['_network']              = 'Difinoj por reto';
-$lang['_plugin_sufix']         = 'Difinoj por kromaĵoj';
-$lang['_template_sufix']       = 'Difinoj por ŝablonoj';
 $lang['_msg_setting_undefined'] = 'Neniu difinanta metadatumaro.';
 $lang['_msg_setting_no_class'] = 'Neniu difinanta klaso.';
 $lang['_msg_setting_no_default'] = 'Neniu apriora valoro.';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index 3a2db95b8..847b326a8 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -49,8 +49,6 @@ $lang['_notifications']        = 'Configuración de notificaciones';
 $lang['_syndication']          = 'Configuración de sindicación';
 $lang['_advanced']             = 'Parámetros Avanzados';
 $lang['_network']              = 'Parámetros de Red';
-$lang['_plugin_sufix']         = 'Parámetros de Plugins';
-$lang['_template_sufix']       = 'Parámetros de Plantillas';
 $lang['_msg_setting_undefined'] = 'Sin parámetros de metadata.';
 $lang['_msg_setting_no_class'] = 'Sin clase establecida.';
 $lang['_msg_setting_no_default'] = 'Sin valor por defecto.';
diff --git a/lib/plugins/config/lang/et/lang.php b/lib/plugins/config/lang/et/lang.php
index 27f2e87ac..cce679f31 100644
--- a/lib/plugins/config/lang/et/lang.php
+++ b/lib/plugins/config/lang/et/lang.php
@@ -16,8 +16,6 @@ $lang['_links']                = 'Lingi seaded';
 $lang['_media']                = 'Meedia seaded';
 $lang['_advanced']             = 'Laiendatud seaded';
 $lang['_network']              = 'Võrgu seaded';
-$lang['_plugin_sufix']         = 'Plugina seaded';
-$lang['_template_sufix']       = 'Kujunduse seaded';
 $lang['title']                 = 'Wiki pealkiri';
 $lang['template']              = 'Kujundus';
 $lang['recent']                = 'Viimased muudatused';
diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php
index 280e57df9..2b67a49ed 100644
--- a/lib/plugins/config/lang/eu/lang.php
+++ b/lib/plugins/config/lang/eu/lang.php
@@ -30,8 +30,6 @@ $lang['_notifications']        = 'Abisuen ezarpenak';
 $lang['_syndication']          = 'Sindikazio ezarpenak';
 $lang['_advanced']             = 'Ezarpen Aurreratuak';
 $lang['_network']              = 'Sare Ezarpenak';
-$lang['_plugin_sufix']         = 'Plugin Ezarpenak';
-$lang['_template_sufix']       = 'Txantiloi Ezarpenak';
 $lang['_msg_setting_undefined'] = 'Ezarpen metadaturik ez.';
 $lang['_msg_setting_no_class'] = 'Ezarpen klaserik ez.';
 $lang['_msg_setting_no_default'] = 'Balio lehenetsirik ez.';
diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php
index 229fe012e..dd97f716e 100644
--- a/lib/plugins/config/lang/fa/lang.php
+++ b/lib/plugins/config/lang/fa/lang.php
@@ -34,8 +34,6 @@ $lang['_notifications']        = 'تنظیمات آگاه سازی';
 $lang['_syndication']          = 'تنظیمات پیوند';
 $lang['_advanced']             = 'تنظیمات پیشرفته';
 $lang['_network']              = 'تنظیمات شبکه';
-$lang['_plugin_sufix']         = 'تنظیمات افزونه';
-$lang['_template_sufix']       = 'تنظیمات قالب';
 $lang['_msg_setting_undefined'] = 'داده‌نمایی برای تنظیمات وجود ندارد';
 $lang['_msg_setting_no_class'] = 'هیچ دسته‌ای برای تنظیمات وجود ندارد.';
 $lang['_msg_setting_no_default'] = 'بدون مقدار پیش‌فرض';
diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php
index a5075d2cf..9fd3fba24 100644
--- a/lib/plugins/config/lang/fi/lang.php
+++ b/lib/plugins/config/lang/fi/lang.php
@@ -33,8 +33,6 @@ $lang['_notifications']        = 'Ilmoitus-asetukset';
 $lang['_syndication']          = 'Syöteasetukset';
 $lang['_advanced']             = 'Lisäasetukset';
 $lang['_network']              = 'Verkkoasetukset';
-$lang['_plugin_sufix']         = 'liitännäisen asetukset';
-$lang['_template_sufix']       = 'Sivumallin asetukset';
 $lang['_msg_setting_undefined'] = 'Ei asetusten metadataa.';
 $lang['_msg_setting_no_class'] = 'Ei asetusluokkaa.';
 $lang['_msg_setting_no_default'] = 'Ei oletusarvoa';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index a7b3d5e3b..e92144b22 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -46,8 +46,6 @@ $lang['_notifications']        = 'Paramètres de notification';
 $lang['_syndication']          = 'Paramètres de syndication';
 $lang['_advanced']             = 'Paramètres avancés';
 $lang['_network']              = 'Paramètres réseaux';
-$lang['_plugin_sufix']         = 'Paramètres d\'extension';
-$lang['_template_sufix']       = 'Paramètres de modèle';
 $lang['_msg_setting_undefined'] = 'Pas de définition de métadonnées';
 $lang['_msg_setting_no_class'] = 'Pas de définition de paramètres.';
 $lang['_msg_setting_no_default'] = 'Pas de valeur par défaut.';
diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php
index 0dafd9271..44942cc7c 100644
--- a/lib/plugins/config/lang/gl/lang.php
+++ b/lib/plugins/config/lang/gl/lang.php
@@ -32,8 +32,6 @@ $lang['_notifications']        = 'Opcións de Notificación';
 $lang['_syndication']          = 'Opcións de Sindicación';
 $lang['_advanced']             = 'Configuración Avanzada';
 $lang['_network']              = 'Configuración de Rede';
-$lang['_plugin_sufix']         = 'Configuración de Extensións';
-$lang['_template_sufix']       = 'Configuración de Sobreplanta';
 $lang['_msg_setting_undefined'] = 'Non hai configuración de metadatos.';
 $lang['_msg_setting_no_class'] = 'Non hai configuración de clase.';
 $lang['_msg_setting_no_default'] = 'Non hai valor predeterminado.';
diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php
index 687072764..bddfd90af 100644
--- a/lib/plugins/config/lang/he/lang.php
+++ b/lib/plugins/config/lang/he/lang.php
@@ -30,8 +30,6 @@ $lang['_links']                = 'הגדרות קישורים';
 $lang['_media']                = 'הגדרות מדיה';
 $lang['_advanced']             = 'הגדרות מתקדמות';
 $lang['_network']              = 'הגדרות רשת';
-$lang['_plugin_sufix']         = 'הגדרות תוסף';
-$lang['_template_sufix']       = 'הגדרות תבנית';
 $lang['_msg_setting_undefined'] = 'אין מידע-על להגדרה.';
 $lang['_msg_setting_no_class'] = 'אין קבוצה להגדרה.';
 $lang['_msg_setting_no_default'] = 'אין ערך ברירת מחדל.';
diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php
index 6c47e09a3..6f774bfac 100644
--- a/lib/plugins/config/lang/hu/lang.php
+++ b/lib/plugins/config/lang/hu/lang.php
@@ -36,8 +36,6 @@ $lang['_notifications']        = 'Értesítési beállítások';
 $lang['_syndication']          = 'Hírfolyam beállítások';
 $lang['_advanced']             = 'Haladó beállítások';
 $lang['_network']              = 'Hálózati beállítások';
-$lang['_plugin_sufix']         = 'Bővítmények beállításai';
-$lang['_template_sufix']       = 'Sablon beállítások';
 $lang['_msg_setting_undefined'] = 'Nincs beállított metaadat.';
 $lang['_msg_setting_no_class'] = 'Nincs beállított osztály.';
 $lang['_msg_setting_no_default'] = 'Nincs alapértelmezett érték.';
diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php
index 1f4e881bb..c3430030c 100644
--- a/lib/plugins/config/lang/ia/lang.php
+++ b/lib/plugins/config/lang/ia/lang.php
@@ -27,8 +27,6 @@ $lang['_links']                = 'Configurationes de ligamines';
 $lang['_media']                = 'Configurationes de multimedia';
 $lang['_advanced']             = 'Configurationes avantiate';
 $lang['_network']              = 'Configurationes de rete';
-$lang['_plugin_sufix']         = 'Configurationes de plug-ins';
-$lang['_template_sufix']       = 'Configurationes de patronos';
 $lang['_msg_setting_undefined'] = 'Nulle metadatos de configuration.';
 $lang['_msg_setting_no_class'] = 'Nulle classe de configuration.';
 $lang['_msg_setting_no_default'] = 'Nulle valor predefinite.';
diff --git a/lib/plugins/config/lang/is/lang.php b/lib/plugins/config/lang/is/lang.php
index c4905d0f9..a99b39ca2 100644
--- a/lib/plugins/config/lang/is/lang.php
+++ b/lib/plugins/config/lang/is/lang.php
@@ -13,7 +13,6 @@ $lang['nochoice']              = '(engir aðrir valmöguleikar fyrir hendi)';
 $lang['_display']              = 'Skjástillingar';
 $lang['_anti_spam']            = 'Stillingar gegn ruslpósti';
 $lang['_editing']              = 'Útgáfastillingar';
-$lang['_plugin_sufix']         = 'Viðbótstillingar';
 $lang['lang']                  = 'Tungumál';
 $lang['title']                 = 'Heiti wikis';
 $lang['template']              = 'Mát';
diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php
index d2272075a..7a831c8de 100644
--- a/lib/plugins/config/lang/it/lang.php
+++ b/lib/plugins/config/lang/it/lang.php
@@ -42,8 +42,6 @@ $lang['_notifications']        = 'Impostazioni di notifica';
 $lang['_syndication']          = 'Impostazioni di collaborazione';
 $lang['_advanced']             = 'Impostazioni Avanzate';
 $lang['_network']              = 'Impostazioni Rete';
-$lang['_plugin_sufix']         = 'Impostazioni Plugin';
-$lang['_template_sufix']       = 'Impostazioni Modello';
 $lang['_msg_setting_undefined'] = 'Nessun metadato definito.';
 $lang['_msg_setting_no_class'] = 'Nessuna classe definita.';
 $lang['_msg_setting_no_default'] = 'Nessun valore predefinito.';
diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index 15eadf731..e8cf8227b 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -37,8 +37,6 @@ $lang['_notifications']        = '通知設定';
 $lang['_syndication']          = 'RSS配信設定';
 $lang['_advanced']             = '高度な設定';
 $lang['_network']              = 'ネットワーク';
-$lang['_plugin_sufix']         = 'プラグイン設定';
-$lang['_template_sufix']       = 'テンプレート設定';
 $lang['_msg_setting_undefined'] = '設定のためのメタデータがありません。';
 $lang['_msg_setting_no_class'] = '設定クラスがありません。';
 $lang['_msg_setting_no_default'] = '初期値が設定されていません。';
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 74fe3d8a0..1aab4731a 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -36,8 +36,6 @@ $lang['_notifications']        = '알림 설정';
 $lang['_syndication']          = '신디케이션 설정';
 $lang['_advanced']             = '고급 설정';
 $lang['_network']              = '네트워크 설정';
-$lang['_plugin_sufix']         = '플러그인 설정';
-$lang['_template_sufix']       = '템플릿 설정';
 $lang['_msg_setting_undefined'] = '설정된 메타데이터가 없습니다.';
 $lang['_msg_setting_no_class'] = '설정된 클래스가 없습니다.';
 $lang['_msg_setting_no_default'] = '기본값이 없습니다.';
diff --git a/lib/plugins/config/lang/la/lang.php b/lib/plugins/config/lang/la/lang.php
index 2aff60753..100f06431 100644
--- a/lib/plugins/config/lang/la/lang.php
+++ b/lib/plugins/config/lang/la/lang.php
@@ -26,8 +26,6 @@ $lang['_links']                = 'Nexi Optiones';
 $lang['_media']                = 'Visiuorum Optiones';
 $lang['_advanced']             = 'Maiores Optiones';
 $lang['_network']              = 'Interretis Optiones';
-$lang['_plugin_sufix']         = 'Addendorum Optiones';
-$lang['_template_sufix']       = 'Vicis Formae Optiones';
 $lang['_msg_setting_undefined'] = 'Res codicum sine optionibus.';
 $lang['_msg_setting_no_class'] = 'Classes sine optionibus';
 $lang['_msg_setting_no_default'] = 'Nihil';
diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php
index 7fcf0fa45..aa692c1e4 100644
--- a/lib/plugins/config/lang/lv/lang.php
+++ b/lib/plugins/config/lang/lv/lang.php
@@ -29,8 +29,6 @@ $lang['_media']                = 'Mēdiju iestatījumi';
 $lang['_notifications']        = 'Brīdinājumu iestatījumi';
 $lang['_advanced']             = 'Smalkāka iestatīšana';
 $lang['_network']              = 'Tīkla iestatījumi';
-$lang['_plugin_sufix']         = 'moduļa iestatījumi';
-$lang['_template_sufix']       = 'šablona iestatījumi';
 $lang['_msg_setting_undefined'] = 'Nav atrodami iestatījumu metadati';
 $lang['_msg_setting_no_class'] = 'Nav iestatījumu klases';
 $lang['_msg_setting_no_default'] = 'Nav noklusētās vērtības';
diff --git a/lib/plugins/config/lang/mr/lang.php b/lib/plugins/config/lang/mr/lang.php
index deef82690..172c47e4f 100644
--- a/lib/plugins/config/lang/mr/lang.php
+++ b/lib/plugins/config/lang/mr/lang.php
@@ -30,8 +30,6 @@ $lang['_links']                = 'लिंक सेटिंग';
 $lang['_media']                = 'दृक्श्राव्य माध्यम सेटिंग';
 $lang['_advanced']             = 'सविस्तर सेटिंग';
 $lang['_network']              = 'नेटवर्क सेटिंग';
-$lang['_plugin_sufix']         = 'प्लगिन सेटिंग';
-$lang['_template_sufix']       = 'टेम्पलेट ( नमुना ) सेटिंग';
 $lang['_msg_setting_undefined'] = 'सेटिंगविषयी उप-डेटा उपलब्ध नाही.';
 $lang['_msg_setting_no_class'] = 'सेटिंगचा क्लास उपलब्ध नाही';
 $lang['_msg_setting_no_default'] = 'आपोआप किम्मत नाही';
diff --git a/lib/plugins/config/lang/ne/lang.php b/lib/plugins/config/lang/ne/lang.php
index a8b426b9c..ffa7713fa 100644
--- a/lib/plugins/config/lang/ne/lang.php
+++ b/lib/plugins/config/lang/ne/lang.php
@@ -21,8 +21,6 @@ $lang['_links']                = 'लिङ्क सेटिंङ्ग';
 $lang['_media']                = 'मिडिया सेटिंङ्ग';
 $lang['_advanced']             = 'विशिष्ठ सेटिंङ्ग';
 $lang['_network']              = 'सञ्जाल सेटिंङ्ग';
-$lang['_plugin_sufix']         = 'प्लगइन सेटिंङ्ग';
-$lang['_template_sufix']       = 'टेम्प्लेट सेटिंङ्ग';
 $lang['_msg_setting_undefined'] = 'सेटिंङ्ग मेटाडाटा नभएको';
 $lang['_msg_setting_no_class'] = 'सेटिंङ्ग वर्ग नभएको';
 $lang['_msg_setting_no_default'] = 'कुनै पूर्व निर्धारित मान छैन ।';
diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index 9aa17c23d..14c8f9b1e 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -41,8 +41,6 @@ $lang['_notifications']        = 'Meldingsinstellingen';
 $lang['_syndication']          = 'Syndication-instellingen';
 $lang['_advanced']             = 'Geavanceerde instellingen';
 $lang['_network']              = 'Netwerkinstellingen';
-$lang['_plugin_sufix']         = 'Plugin-instellingen';
-$lang['_template_sufix']       = 'Sjabloon-instellingen';
 $lang['_msg_setting_undefined'] = 'Geen metadata voor deze instelling.';
 $lang['_msg_setting_no_class'] = 'Geen class voor deze instelling.';
 $lang['_msg_setting_no_default'] = 'Geen standaard waarde.';
diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php
index c049c643a..f048a0fe9 100644
--- a/lib/plugins/config/lang/no/lang.php
+++ b/lib/plugins/config/lang/no/lang.php
@@ -43,8 +43,6 @@ $lang['_links']                = 'Innstillinger for lenker';
 $lang['_media']                = 'Innstillinger for mediafiler';
 $lang['_advanced']             = 'Avanserte innstillinger';
 $lang['_network']              = 'Nettverksinnstillinger';
-$lang['_plugin_sufix']         = '– innstillinger for tillegg';
-$lang['_template_sufix']       = '– innstillinger for mal';
 $lang['_msg_setting_undefined'] = 'Ingen innstillingsmetadata';
 $lang['_msg_setting_no_class'] = 'Ingen innstillingsklasse';
 $lang['_msg_setting_no_default'] = 'Ingen standard verdi';
diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php
index ede824d75..9a7cc49ba 100644
--- a/lib/plugins/config/lang/pl/lang.php
+++ b/lib/plugins/config/lang/pl/lang.php
@@ -40,8 +40,6 @@ $lang['_notifications']        = 'Ustawienia powiadomień';
 $lang['_syndication']          = 'Ustawienia RSS';
 $lang['_advanced']             = 'Zaawansowane';
 $lang['_network']              = 'Sieć';
-$lang['_plugin_sufix']         = 'Wtyczki';
-$lang['_template_sufix']       = 'Motywy';
 $lang['_msg_setting_undefined'] = 'Brak danych o ustawieniu.';
 $lang['_msg_setting_no_class'] = 'Brak kategorii ustawień.';
 $lang['_msg_setting_no_default'] = 'Brak wartości domyślnej.';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index 6633ab0c4..795ee81c0 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -44,8 +44,6 @@ $lang['_notifications']        = 'Configurações de notificação';
 $lang['_syndication']          = 'Configurações de sindicância';
 $lang['_advanced']             = 'Configurações avançadas';
 $lang['_network']              = 'Configurações de rede';
-$lang['_plugin_sufix']         = 'Configurações de plug-ins';
-$lang['_template_sufix']       = 'Configurações do modelo';
 $lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.';
 $lang['_msg_setting_no_class'] = 'Nenhuma classe definida.';
 $lang['_msg_setting_no_default'] = 'Nenhum valor padrão.';
diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php
index 681ff487f..7a9111c62 100644
--- a/lib/plugins/config/lang/pt/lang.php
+++ b/lib/plugins/config/lang/pt/lang.php
@@ -31,8 +31,6 @@ $lang['_links']                = 'Configuração de Ligações';
 $lang['_media']                = 'Configuração de Media';
 $lang['_advanced']             = 'Configurações Avançadas';
 $lang['_network']              = 'Configuração de Rede';
-$lang['_plugin_sufix']         = 'Configuração dos Plugins';
-$lang['_template_sufix']       = 'Configuração das Templates';
 $lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.';
 $lang['_msg_setting_no_class'] = 'Nenhuma classe definida.';
 $lang['_msg_setting_no_default'] = 'Sem valor por omissão.';
diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php
index 5e853f7d0..e95c551e7 100644
--- a/lib/plugins/config/lang/ro/lang.php
+++ b/lib/plugins/config/lang/ro/lang.php
@@ -34,8 +34,6 @@ $lang['_links']                = 'Setări Legături';
 $lang['_media']                = 'Setări Media';
 $lang['_advanced']             = 'Setări Avansate';
 $lang['_network']              = 'Setări Reţea';
-$lang['_plugin_sufix']         = 'Setări Plugin-uri';
-$lang['_template_sufix']       = 'Setări Şabloane';
 $lang['_msg_setting_undefined'] = 'Nesetat metadata';
 $lang['_msg_setting_no_class'] = 'Nesetat class';
 $lang['_msg_setting_no_default'] = 'Nici o valoare implicită';
diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php
index cdafacf8f..596ad4ead 100644
--- a/lib/plugins/config/lang/ru/lang.php
+++ b/lib/plugins/config/lang/ru/lang.php
@@ -43,8 +43,6 @@ $lang['_notifications']        = 'Параметры уведомлений';
 $lang['_syndication']          = 'Настройки синдикаций';
 $lang['_advanced']             = 'Тонкая настройка';
 $lang['_network']              = 'Параметры сети';
-$lang['_plugin_sufix']         = 'Параметры плагина';
-$lang['_template_sufix']       = 'Параметры шаблона';
 $lang['_msg_setting_undefined'] = 'Не найдены метаданные настроек.';
 $lang['_msg_setting_no_class'] = 'Не найден класс настроек.';
 $lang['_msg_setting_no_default'] = 'Не задано значение по умолчанию.';
diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php
index 23a60db90..46e4081a9 100644
--- a/lib/plugins/config/lang/sk/lang.php
+++ b/lib/plugins/config/lang/sk/lang.php
@@ -31,8 +31,6 @@ $lang['_notifications']        = 'Nastavenie upozornení';
 $lang['_syndication']          = 'Nastavenie poskytovania obsahu';
 $lang['_advanced']             = 'Rozšírené nastavenia';
 $lang['_network']              = 'Nastavenia siete';
-$lang['_plugin_sufix']         = 'Nastavenia plug-inu';
-$lang['_template_sufix']       = 'Nastavenia šablóny';
 $lang['_msg_setting_undefined'] = 'Nenastavené metadata.';
 $lang['_msg_setting_no_class'] = 'Nenastavená trieda.';
 $lang['_msg_setting_no_default'] = 'Žiadna predvolená hodnota.';
diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php
index dcec62288..fe334db55 100644
--- a/lib/plugins/config/lang/sl/lang.php
+++ b/lib/plugins/config/lang/sl/lang.php
@@ -29,8 +29,6 @@ $lang['_links']                = 'Nastavitve povezav';
 $lang['_media']                = 'Predstavne nastavitve';
 $lang['_advanced']             = 'Napredne nastavitve';
 $lang['_network']              = 'Omrežne nastavitve';
-$lang['_plugin_sufix']         = 'nastavitve';
-$lang['_template_sufix']       = 'nastavitve';
 $lang['_msg_setting_undefined'] = 'Ni nastavitvenih metapodatkov.';
 $lang['_msg_setting_no_class'] = 'Ni nastavitvenega razreda.';
 $lang['_msg_setting_no_default'] = 'Ni privzete vrednosti.';
diff --git a/lib/plugins/config/lang/sq/lang.php b/lib/plugins/config/lang/sq/lang.php
index 972b2894c..a6f30875b 100644
--- a/lib/plugins/config/lang/sq/lang.php
+++ b/lib/plugins/config/lang/sq/lang.php
@@ -27,8 +27,6 @@ $lang['_links']                = 'Kuadrot e Link-eve';
 $lang['_media']                = 'Kuadrot e Medias';
 $lang['_advanced']             = 'Kuadro të Avancuara';
 $lang['_network']              = 'Kuadrot e Rrjetit';
-$lang['_plugin_sufix']         = 'Kuadrot e Plugin-eve';
-$lang['_template_sufix']       = 'Kuadrot e Template-eve';
 $lang['_msg_setting_undefined'] = 'Metadata pa kuadro.';
 $lang['_msg_setting_no_class'] = 'Klasë pa kuadro.';
 $lang['_msg_setting_no_default'] = 'Asnjë vlerë default.';
diff --git a/lib/plugins/config/lang/sr/lang.php b/lib/plugins/config/lang/sr/lang.php
index b6d7268aa..1c3250e86 100644
--- a/lib/plugins/config/lang/sr/lang.php
+++ b/lib/plugins/config/lang/sr/lang.php
@@ -28,8 +28,6 @@ $lang['_links']                = 'Подешавања линковања';
 $lang['_media']                = 'Подешавања медија';
 $lang['_advanced']             = 'Напредна подешавања';
 $lang['_network']              = 'Подешавања мреже';
-$lang['_plugin_sufix']         = 'Подешавања за додатке';
-$lang['_template_sufix']       = 'Подешавања за шаблоне';
 $lang['_msg_setting_undefined'] = 'Нема метаподатака подешавања';
 $lang['_msg_setting_no_class'] = 'Нема класе подешавања';
 $lang['_msg_setting_no_default'] = 'Нема подразумеване вредности';
diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php
index 2a83195d7..74f59502c 100644
--- a/lib/plugins/config/lang/sv/lang.php
+++ b/lib/plugins/config/lang/sv/lang.php
@@ -44,8 +44,6 @@ $lang['_notifications']        = 'Noterings inställningar';
 $lang['_syndication']          = 'Syndikats inställningar';
 $lang['_advanced']             = 'Avancerade inställningar';
 $lang['_network']              = 'Nätverksinställningar';
-$lang['_plugin_sufix']         = '(inställningar för insticksmodul)';
-$lang['_template_sufix']       = '(inställningar för mall)';
 $lang['_msg_setting_undefined'] = 'Ingen inställningsmetadata.';
 $lang['_msg_setting_no_class'] = 'Ingen inställningsklass.';
 $lang['_msg_setting_no_default'] = 'Inget standardvärde.';
diff --git a/lib/plugins/config/lang/th/lang.php b/lib/plugins/config/lang/th/lang.php
index 140a287df..68ee8b8a2 100644
--- a/lib/plugins/config/lang/th/lang.php
+++ b/lib/plugins/config/lang/th/lang.php
@@ -23,7 +23,6 @@ $lang['_links']                = 'การตั้งค่าลิงก์'
 $lang['_media']                = 'การตั้งค่าภาพ-เสียง';
 $lang['_advanced']             = 'การตั้งค่าขั้นสูง';
 $lang['_network']              = 'การตั้งค่าเครือข่าย';
-$lang['_plugin_sufix']         = 'การตั้งค่าโปรแกรมเสริม (plugin)';
 $lang['lang']                  = 'ภาษา';
 $lang['basedir']               = 'ไดเรคทอรีพื้นฐาน';
 $lang['baseurl']               = 'URL พื้นฐาน';
diff --git a/lib/plugins/config/lang/tr/lang.php b/lib/plugins/config/lang/tr/lang.php
index 45d70eeb0..cb610f4ff 100644
--- a/lib/plugins/config/lang/tr/lang.php
+++ b/lib/plugins/config/lang/tr/lang.php
@@ -32,8 +32,6 @@ $lang['_links']                = 'Bağlantı Ayarları';
 $lang['_media']                = 'Medya Ayarları';
 $lang['_advanced']             = 'Gelişmiş Ayarlar';
 $lang['_network']              = 'Ağ Ayarları';
-$lang['_plugin_sufix']         = 'Eklenti Ayarları';
-$lang['_template_sufix']       = 'Şablon (Template) Ayarları';
 $lang['_msg_setting_undefined'] = 'Ayar üstverisi yok.';
 $lang['_msg_setting_no_class'] = 'Ayar sınıfı yok.';
 $lang['_msg_setting_no_default'] = 'Varsayılan değer yok.';
diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php
index c938d911b..dea9203e8 100644
--- a/lib/plugins/config/lang/uk/lang.php
+++ b/lib/plugins/config/lang/uk/lang.php
@@ -36,8 +36,6 @@ $lang['_media']                = 'Налаштування медіа';
 $lang['_notifications']        = 'Налаштування сповіщень';
 $lang['_advanced']             = 'Розширені налаштування';
 $lang['_network']              = 'Налаштування мережі';
-$lang['_plugin_sufix']         = 'Налаштування (доданок)';
-$lang['_template_sufix']       = 'Налаштування (шаблон)';
 $lang['_msg_setting_undefined'] = 'Немає метаданих параметру.';
 $lang['_msg_setting_no_class'] = 'Немає класу параметру.';
 $lang['_msg_setting_no_default'] = 'Немає значення за замовчуванням.';
diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php
index 7890730a6..cc2c28c31 100644
--- a/lib/plugins/config/lang/zh-tw/lang.php
+++ b/lib/plugins/config/lang/zh-tw/lang.php
@@ -37,8 +37,6 @@ $lang['_notifications']        = '提醒設定';
 $lang['_syndication']          = '聚合設定';
 $lang['_advanced']             = '進階設定';
 $lang['_network']              = '網路設定';
-$lang['_plugin_sufix']         = '附加元件設定';
-$lang['_template_sufix']       = '樣板設定';
 $lang['_msg_setting_undefined'] = '設定的後設數據不存在。';
 $lang['_msg_setting_no_class'] = '設定的分類不存在。';
 $lang['_msg_setting_no_default'] = '無預設值';
diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index 903e987a3..364ad3fe6 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/lang/zh/lang.php
@@ -42,8 +42,6 @@ $lang['_notifications']        = '通知设置';
 $lang['_syndication']          = '聚合设置';
 $lang['_advanced']             = '高级设置';
 $lang['_network']              = '网络设置';
-$lang['_plugin_sufix']         = '插件设置';
-$lang['_template_sufix']       = '模板设置';
 $lang['_msg_setting_undefined'] = '设置的元数据不存在。';
 $lang['_msg_setting_no_class'] = '设置的分类不存在。';
 $lang['_msg_setting_no_default'] = '设置的默认值不存在。';
diff --git a/lib/plugins/revert/lang/de-informal/intro.txt b/lib/plugins/revert/lang/de-informal/intro.txt
index d5a092155..a1733af3a 100644
--- a/lib/plugins/revert/lang/de-informal/intro.txt
+++ b/lib/plugins/revert/lang/de-informal/intro.txt
@@ -1,3 +1,3 @@
-====== Seiten wieder herstellen ======
+====== Seiten wiederherstellen ======
 
-Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam-Angriff. Geben Sie zunächst einen Suchbegriff (z.B. eine Spam URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem Sie sich vergewissert haben, dass die gefundenen Seiten wirklich Spam enthalten, können Sie die Seiten wieder herstellen.
+Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam-Angriff. Gib zunächst einen Suchbegriff (z. B. eine Spam-URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem du dich vergewissert hast, dass die gefundenen Seiten wirklich Spam enthalten, kannst du die Seiten wiederherstellen.
diff --git a/lib/plugins/revert/lang/de-informal/lang.php b/lib/plugins/revert/lang/de-informal/lang.php
index b702e7727..7ca141e3c 100644
--- a/lib/plugins/revert/lang/de-informal/lang.php
+++ b/lib/plugins/revert/lang/de-informal/lang.php
@@ -10,13 +10,14 @@
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Volker Bödker <volker@boedker.de>
+ * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
-$lang['menu']                  = 'Zurückstellungsmanager';
+$lang['menu']                  = 'Seiten wiederherstellen';
 $lang['filter']                = 'Durchsuche als Spam markierte Seiten';
 $lang['revert']                = 'Setze ausgewählte Seiten zurück.';
-$lang['reverted']              = '%s zu Revision %s zurückgesetzt';
+$lang['reverted']              = '%s zu Revision %s wiederhergestellt';
 $lang['removed']               = '%s entfernt';
-$lang['revstart']              = 'Zurückstellungsprozess gestartet. Dies kann eine längere Zeit dauern. Wenn das Skript vor Fertigstellung stoppt, solltest du es in kleineren Stücken versuchen.';
-$lang['revstop']               = 'Zurückstellungsprozess erfolgreich beendet.';
-$lang['note1']                 = 'Beachte: Diese Suche berücksichtigt Gross- und Kleinschreibung';
-$lang['note2']                 = 'Beachte: Diese Seite wid zurückgestellt auf die letzte Version, die nicht den Spam-Ausdruck <i>%s</i> enthält.';
+$lang['revstart']              = 'Wiederherstellung gestartet. Dies kann eine längere Zeit dauern. Wenn das Skript vor Fertigstellung stoppt, solltest du es in kleineren Stücken versuchen.';
+$lang['revstop']               = 'Wiederherstellung erfolgreich beendet.';
+$lang['note1']                 = 'Beachte: Diese Suche berücksichtigt Groß- und Kleinschreibung';
+$lang['note2']                 = 'Beachte: Diese Seite wird wiederhergestellt auf die letzte Version, die nicht den Spam-Begriff <i>%s</i> enthält.';
diff --git a/lib/plugins/revert/lang/de/intro.txt b/lib/plugins/revert/lang/de/intro.txt
index d5a092155..fe74461d9 100644
--- a/lib/plugins/revert/lang/de/intro.txt
+++ b/lib/plugins/revert/lang/de/intro.txt
@@ -1,3 +1,3 @@
-====== Seiten wieder herstellen ======
+====== Seiten wiederherstellen ======
 
-Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam-Angriff. Geben Sie zunächst einen Suchbegriff (z.B. eine Spam URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem Sie sich vergewissert haben, dass die gefundenen Seiten wirklich Spam enthalten, können Sie die Seiten wieder herstellen.
+Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam-Angriff. Geben Sie zunächst einen Suchbegriff (z. B. eine Spam-URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem Sie sich vergewissert haben, dass die gefundenen Seiten wirklich Spam enthalten, können Sie die Seiten wiederherstellen.
diff --git a/lib/plugins/revert/lang/de/lang.php b/lib/plugins/revert/lang/de/lang.php
index b430ce876..2db065f21 100644
--- a/lib/plugins/revert/lang/de/lang.php
+++ b/lib/plugins/revert/lang/de/lang.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Germanlanguage file
+ * German language file
  *
  * @author Michael Klier <chi@chimeric.de>
  * @author Leo Moll <leo@yeasoft.com>
@@ -16,13 +16,14 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Paul Lachewsky <kaeptn.haddock@gmail.com>
  * @author Pierre Corell <info@joomla-praxis.de>
+ * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
-$lang['menu']                  = 'Seiten wieder herstellen';
+$lang['menu']                  = 'Seiten wiederherstellen';
 $lang['filter']                = 'Nach betroffenen Seiten suchen';
-$lang['revert']                = 'Ausgewählte Seiten wieder herstellen';
+$lang['revert']                = 'Ausgewählte Seiten wiederherstellen';
 $lang['reverted']              = '%s wieder hergestellt zu Version %s';
 $lang['removed']               = '%s entfernt';
 $lang['revstart']              = 'Wiederherstellung gestartet. Dies kann einige Zeit dauern. Wenn das Script abbricht, bevor alle Seiten wieder hergestellt wurden, reduzieren Sie die Anzahl der Seiten und wiederholen Sie den Vorgang.';
 $lang['revstop']               = 'Wiederherstellung erfolgreich abgeschlossen.';
 $lang['note1']                 = 'Anmerkung: diese Suche unterscheidet Groß- und Kleinschreibung';
-$lang['note2']                 = 'Anmerkung: die Seite wird zur letzten Version, die nicht den angegebenen Spam Begriff <i>%s</i> enthält, wieder hergestellt.';
+$lang['note2']                 = 'Anmerkung: die Seite wird wiederhergestellt auf die letzte Version, die nicht den angegebenen Spam Begriff <i>%s</i> enthält.';
-- 
cgit v1.2.3


From 8c824552a6a23a7a54eda69d449a233561cde32a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 2 Aug 2013 22:42:36 +0200
Subject: removed a merge conflict I missed on merge

---
 lib/tpl/dokuwiki/css/basic.less | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
index f0ce10b51..5886889fd 100644
--- a/lib/tpl/dokuwiki/css/basic.less
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -439,17 +439,8 @@ button:focus,
 .qq-upload-button:hover {
     border-color: #999;
     background-color: #ddd;
-<<<<<<< HEAD:lib/tpl/dokuwiki/css/basic.css
-    background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+');
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-=======
     background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
     .linear-gradient("top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%");
->>>>>>> less:lib/tpl/dokuwiki/css/basic.less
 }
 
 input::-moz-focus-inner,
-- 
cgit v1.2.3


From 328143f8a20933744be51a2693c99f35234ce5b3 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 2 Aug 2013 22:53:21 +0200
Subject: enable email notifications & alert messages for imported users

---
 lib/plugins/usermanager/admin.php        | 28 +++++++++++++++++++++-------
 lib/plugins/usermanager/lang/en/lang.php |  3 ++-
 2 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index ddf10a115..395b91053 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -606,12 +606,16 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     /**
      * send password change notification email
      */
-    function _notifyUser($user, $password) {
+    function _notifyUser($user, $password, $status_alert=true) {
 
         if ($sent = auth_sendPassword($user,$password)) {
-          msg($this->lang['notify_ok'], 1);
+          if ($status_alert) {
+            msg($this->lang['notify_ok'], 1);
+          }
         } else {
-          msg($this->lang['notify_fail'], -1);
+          if ($status_alert) {
+            msg($this->lang['notify_fail'], -1);
+          }
         }
 
         return $sent;
@@ -770,7 +774,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
                 array_splice($raw,1,0,auth_pwgen());                          // splice in a generated password
                 $clean = $this->_cleanImportUser($raw, $error);
                 if ($clean && $this->_addImportUser($clean, $error)) {
-#                    $this->_notifyUser($clean[0],$clean[1]);
+                    $sent = $this->_notifyUser($clean[0],$clean[1],false);
+                    if (!$sent){
+                        msg(sprintf($this->lang['import_notify_fail'],$clean[0],$clean[3]),-1);
+                    }
                     $import_success_count++;
                 } else {
                     $import_fail_count++;
@@ -817,9 +824,16 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             return false;
         }
 
-        if (!($this->_auth->canDo('modMail') xor empty($mail))){
-            $error = $this->lang['import_error_badmail'];
-            return false;
+        if ($this->_auth->canDo('modMail')) {
+            if (empty($mail) || !mail_isvalid($mail)) {
+                $error = $this->lang['import_error_badmail'];
+                return false;
+            }
+        } else {
+            if (!empty($mail)) {
+                $error = $this->lang['import_error_badmail'];
+                return false;
+            }
         }
 
         return $cleaned;
diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php
index f22d1f805..69119e196 100644
--- a/lib/plugins/usermanager/lang/en/lang.php
+++ b/lib/plugins/usermanager/lang/en/lang.php
@@ -67,9 +67,10 @@ $lang['import_failure_count'] = 'User Import: %d failed. Failures are listed bel
 $lang['import_error_fields']  = "Insufficient fields, found %d, require 4.";
 $lang['import_error_baduserid'] = "User-id missing";
 $lang['import_error_badname'] = 'Bad name';
-$lang['import_error_badmail'] = 'Bad mail';
+$lang['import_error_badmail'] = 'Bad email address';
 $lang['import_error_upload']  = 'Import Failed. The csv file could not be uploaded or is empty.';
 $lang['import_error_readfail'] = 'Import Failed. Unable to read uploaded file.';
 $lang['import_error_create']  = 'Unable to create the user';
+$lang['import_notify_fail']   = 'Notification message could not be sent for imported user, %s with email %s.';
 
 
-- 
cgit v1.2.3


From c4d11518ab222262dd0a974b9db5228ccb5df9d7 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 2 Aug 2013 22:55:32 +0200
Subject: style improvements

---
 lib/plugins/usermanager/style.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css
index 61b6c2c4e..3529d8b32 100644
--- a/lib/plugins/usermanager/style.css
+++ b/lib/plugins/usermanager/style.css
@@ -17,7 +17,13 @@
   color: #ccc!important;
   border-color: #ccc!important;
 }
+#user__manager .import_users {
+	margin-top: 1.4em;
+}
 #user__manager .import_failures {
-	margin-top: 1em;
+	margin-top: 1.4em;
+}
+#user__manager .import_failures td.lineno {
+	text-align: center;
 }
 /* IE won't understand but doesn't require it */
-- 
cgit v1.2.3


From dc235f9689a496b476b4f3c98deb3ad746284668 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Sat, 3 Aug 2013 00:08:52 +0200
Subject: Re-enable displaying the date in the revert manager (Fixes FS#2073)

---
 lib/plugins/revert/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index ccad6e9de..beff10ced 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -128,7 +128,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
             }
 
             $cnt++;
-            $date = strftime($conf['dformat'],$recent['date']);
+            $date = dformat($recent['date']);
 
             echo ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) ? '<li class="minor">' : '<li>';
             echo '<div class="li">';
-- 
cgit v1.2.3


From 6a8cbb12e8b5d489c3abef4676de0dbee82994c3 Mon Sep 17 00:00:00 2001
From: Henrik <henrik@idealis.se>
Date: Sat, 3 Aug 2013 05:45:55 +0200
Subject: translation update

---
 lib/plugins/acl/lang/sv/lang.php           | 7 +++----
 lib/plugins/authad/lang/sv/settings.php    | 5 +++--
 lib/plugins/authldap/lang/sv/settings.php  | 5 +++--
 lib/plugins/authmysql/lang/sv/settings.php | 5 +++--
 lib/plugins/authpgsql/lang/sv/settings.php | 5 +++--
 lib/plugins/plugin/lang/sv/lang.php        | 7 +++----
 lib/plugins/popularity/lang/sv/lang.php    | 8 ++++----
 lib/plugins/revert/lang/sv/lang.php        | 9 +++++----
 lib/plugins/usermanager/lang/sv/lang.php   | 8 ++++----
 9 files changed, 31 insertions(+), 28 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/sv/lang.php b/lib/plugins/acl/lang/sv/lang.php
index 388672fc0..f226542e6 100644
--- a/lib/plugins/acl/lang/sv/lang.php
+++ b/lib/plugins/acl/lang/sv/lang.php
@@ -1,11 +1,11 @@
 <?php
+
 /**
- * swedish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Per Foreby <per@foreby.se>
  * @author Nicklas Henriksson <nicklas[at]nihe.se>
- * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @author Håkan Sandell <hakan.sandell@home.se>
  * @author Dennis Karlsson
  * @author Tormod Otter Johansson <tormod@latast.se>
  * @author emil@sys.nu
@@ -14,7 +14,6 @@
  * @author Emil Lind <emil@sys.nu>
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
- * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
  */
diff --git a/lib/plugins/authad/lang/sv/settings.php b/lib/plugins/authad/lang/sv/settings.php
index b1eb1cb96..17eb523a8 100644
--- a/lib/plugins/authad/lang/sv/settings.php
+++ b/lib/plugins/authad/lang/sv/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Swedish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['account_suffix']        = 'Ditt konto suffix. T.ex. <code>min.domän.org</code>';
diff --git a/lib/plugins/authldap/lang/sv/settings.php b/lib/plugins/authldap/lang/sv/settings.php
index 0fdcad147..68dbccfd0 100644
--- a/lib/plugins/authldap/lang/sv/settings.php
+++ b/lib/plugins/authldap/lang/sv/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Swedish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['server']                = 'Din LDAO server. Antingen värdnamn (<code>localhost</code>) eller giltig full URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authmysql/lang/sv/settings.php b/lib/plugins/authmysql/lang/sv/settings.php
index 027c64025..420e443f4 100644
--- a/lib/plugins/authmysql/lang/sv/settings.php
+++ b/lib/plugins/authmysql/lang/sv/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Swedish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['server']                = 'Din MySQL server';
diff --git a/lib/plugins/authpgsql/lang/sv/settings.php b/lib/plugins/authpgsql/lang/sv/settings.php
index 27cb2601d..7da2e82c8 100644
--- a/lib/plugins/authpgsql/lang/sv/settings.php
+++ b/lib/plugins/authpgsql/lang/sv/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Swedish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['server']                = 'Din PostgreSQL server';
diff --git a/lib/plugins/plugin/lang/sv/lang.php b/lib/plugins/plugin/lang/sv/lang.php
index a8578c03c..b7c23743b 100644
--- a/lib/plugins/plugin/lang/sv/lang.php
+++ b/lib/plugins/plugin/lang/sv/lang.php
@@ -1,11 +1,11 @@
 <?php
+
 /**
- * swedish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Per Foreby <per@foreby.se>
  * @author Nicklas Henriksson <nicklas[at]nihe.se>
- * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @author Håkan Sandell <hakan.sandell@home.se>
  * @author Dennis Karlsson
  * @author Tormod Otter Johansson <tormod@latast.se>
  * @author emil@sys.nu
@@ -14,7 +14,6 @@
  * @author Emil Lind <emil@sys.nu>
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
- * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
  */
diff --git a/lib/plugins/popularity/lang/sv/lang.php b/lib/plugins/popularity/lang/sv/lang.php
index 90d820ba0..942a708c4 100644
--- a/lib/plugins/popularity/lang/sv/lang.php
+++ b/lib/plugins/popularity/lang/sv/lang.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
- * Swedish language file
- *
- * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Håkan Sandell <hakan.sandell@home.se>
  * @author Dennis Karlsson
  * @author Tormod Otter Johansson <tormod@latast.se>
  * @author emil@sys.nu
@@ -11,7 +12,6 @@
  * @author Emil Lind <emil@sys.nu>
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
- * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
  */
diff --git a/lib/plugins/revert/lang/sv/lang.php b/lib/plugins/revert/lang/sv/lang.php
index 4a727b339..4a5b944f6 100644
--- a/lib/plugins/revert/lang/sv/lang.php
+++ b/lib/plugins/revert/lang/sv/lang.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
- * Swedish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Per Foreby <per@foreby.se>
  * @author Nicklas Henriksson <nicklas[at]nihe.se>
- * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @author Håkan Sandell <hakan.sandell@home.se>
  * @author Dennis Karlsson
  * @author Tormod Otter Johansson <tormod@latast.se>
  * @author emil@sys.nu
@@ -13,9 +14,9 @@
  * @author Emil Lind <emil@sys.nu>
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
- * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
+ * @author Henrik <henrik@idealis.se>
  */
 $lang['menu']                  = 'Hantera återställningar';
 $lang['filter']                = 'Sök efter spamsidor';
diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php
index f8b530d90..68f5bbc31 100644
--- a/lib/plugins/usermanager/lang/sv/lang.php
+++ b/lib/plugins/usermanager/lang/sv/lang.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
- * Swedish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Per Foreby <per@foreby.se>
  * @author Nicklas Henriksson <nicklas[at]nihe.se>
- * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @author Håkan Sandell <hakan.sandell@home.se>
  * @author Dennis Karlsson
  * @author Tormod Otter Johansson <tormod@latast.se>
  * @author emil@sys.nu
@@ -13,7 +14,6 @@
  * @author Emil Lind <emil@sys.nu>
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
- * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
  */
-- 
cgit v1.2.3


From 354c39ffc9aa3bbd7d59d5e182a36d1f390c5b7e Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 10:31:46 +0100
Subject: fixed old pagetools sprite loading from cache when hovering

---
 lib/tpl/dokuwiki/css/pagetools.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index 850e75d7a..b65e6fc0d 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -114,7 +114,7 @@
     height: auto;
     overflow: visible;
     padding: 5px 40px 5px 5px;
-    background-image: url(images/pagetools-sprite.png);
+    background-image: url(images/pagetools-sprite.png?v=2);
 }
 
 #dokuwiki__pagetools:hover ul li a:before,
@@ -136,7 +136,7 @@
 /* IE7 fixes, doesn't work without images */
 
 #IE7 #dokuwiki__pagetools ul li a {
-    background-image: url(images/pagetools-sprite.png);
+    background-image: url(images/pagetools-sprite.png?v=2);
 }
 
 #IE7 #dokuwiki__pagetools:hover ul li a span,
-- 
cgit v1.2.3


From fb845f0bf5887103be99e1fb93bdbad7d272c72d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 12:05:54 +0100
Subject: lessified pagetools items, added mixins simplify maintenance

---
 lib/tpl/dokuwiki/css/pagetools.less | 313 +++++++-----------------------------
 1 file changed, 54 insertions(+), 259 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index b65e6fc0d..633686bb3 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -163,262 +163,57 @@
 
 /*____________ all available icons in sprite ____________*/
 
-#dokuwiki__pagetools ul li a.edit:before {
-    margin-top: -90px;
-}
-#dokuwiki__pagetools ul li a.edit {
-    background-position: right -90px;
-}
-#dokuwiki__pagetools ul li a.edit:hover,
-#dokuwiki__pagetools ul li a.edit:active,
-#dokuwiki__pagetools ul li a.edit:focus {
-    background-position: right -135px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.edit {
-    background-position: left -90px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus {
-    background-position: left -135px;
-}
-
-#dokuwiki__pagetools ul li a.create:before {
-    margin-top: -180px;
-}
-#dokuwiki__pagetools ul li a.create {
-    background-position: right -180px;
-}
-#dokuwiki__pagetools ul li a.create:hover,
-#dokuwiki__pagetools ul li a.create:active,
-#dokuwiki__pagetools ul li a.create:focus {
-    background-position: right -225px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.create {
-    background-position: left -180px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.create:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.create:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.create:focus {
-    background-position: left -225px;
-}
-
-#dokuwiki__pagetools ul li a.show {
-    background-position: right -360px;
-}
-#dokuwiki__pagetools ul li a.show:before {
-    margin-top: -360px;
-}
-#dokuwiki__pagetools ul li a.show:hover,
-#dokuwiki__pagetools ul li a.show:active,
-#dokuwiki__pagetools ul li a.show:focus {
-    background-position: right -405px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.show {
-    background-position: left -360px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.show:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.show:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.show:focus {
-    background-position: left -405px;
-}
-
-#dokuwiki__pagetools ul li a.source {
-    background-position: right -450px;
-}
-#dokuwiki__pagetools ul li a.source:before {
-    margin-top: -450px;
-}
-#dokuwiki__pagetools ul li a.source:hover,
-#dokuwiki__pagetools ul li a.source:active,
-#dokuwiki__pagetools ul li a.source:focus {
-    background-position: right -495px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.source {
-    background-position: left -450px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.source:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.source:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.source:focus {
-    background-position: left -495px;
-}
-
-#dokuwiki__pagetools ul li a.draft {
-    background-position: right -270px;
-}
-#dokuwiki__pagetools ul li a.draft:before {
-    margin-top: -270px;
-}
-#dokuwiki__pagetools ul li a.draft:hover,
-#dokuwiki__pagetools ul li a.draft:active,
-#dokuwiki__pagetools ul li a.draft:focus {
-    background-position: right -315px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.draft {
-    background-position: left -270px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus {
-    background-position: left -315px;
-}
-
-#dokuwiki__pagetools ul li a.revs {
-    background-position: right -630px;
-}
-#dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -630px;
-}
-#dokuwiki__pagetools ul li a.revs:hover,
-#dokuwiki__pagetools ul li a.revs:active,
-#dokuwiki__pagetools ul li a.revs:focus,
-.mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: right -675px;
-}
-.mode_revisions #dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -675px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revs {
-    background-position: left -630px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus,
-[dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: left -675px;
-}
-
-#dokuwiki__pagetools ul li a.backlink {
-    background-position: right -720px;
-}
-#dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -720px;
-}
-#dokuwiki__pagetools ul li a.backlink:hover,
-#dokuwiki__pagetools ul li a.backlink:active,
-#dokuwiki__pagetools ul li a.backlink:focus,
-.mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: right -765px;
-}
-.mode_backlink #dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -765px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -720px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus,
-[dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -765px;
-}
-
-#dokuwiki__pagetools ul li a.top {
-    background-position: right -900px;
-}
-#dokuwiki__pagetools ul li a.top:before{
-    margin-top: -900px;
-}
-#dokuwiki__pagetools ul li a.top:hover,
-#dokuwiki__pagetools ul li a.top:active,
-#dokuwiki__pagetools ul li a.top:focus {
-    background-position: right -945px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.top {
-    background-position: left -900px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.top:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.top:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.top:focus {
-    background-position: left -945px;
-}
-
-#dokuwiki__pagetools ul li a.revert {
-    background-position: right -540px;
-}
-#dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -540px;
-}
-#dokuwiki__pagetools ul li a.revert:hover,
-#dokuwiki__pagetools ul li a.revert:active,
-#dokuwiki__pagetools ul li a.revert:focus,
-.mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: right -585px;
-}
-.mode_revert #dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -540px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revert {
-    background-position: left -540px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus,
-[dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: left -585px;
-}
-
-#dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -810px;
-}
-#dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -810px;
-}
-#dokuwiki__pagetools ul li a.subscribe:hover,
-#dokuwiki__pagetools ul li a.subscribe:active,
-#dokuwiki__pagetools ul li a.subscribe:focus,
-.mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -855px;
-}
-.mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -855px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -810px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus,
-[dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -855px;
-}
-
-#dokuwiki__pagetools ul li a.mediaManager {
-    background-position: right -990px;
-}
-#dokuwiki__pagetools ul li a.mediaManager:before {
-    margin-top: -990px;
-}
-#dokuwiki__pagetools ul li a.mediaManager:hover,
-#dokuwiki__pagetools ul li a.mediaManager:active,
-#dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: right -1035px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager {
-    background-position: left -990px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: left -1035px;
-}
-
-#dokuwiki__pagetools ul li a.back {
-    background-position: right -1080px;
-}
-#dokuwiki__pagetools ul li a.back:before {
-    margin-top: -1080px;
-}
-#dokuwiki__pagetools ul li a.back:hover,
-#dokuwiki__pagetools ul li a.back:active,
-#dokuwiki__pagetools ul li a.back:focus {
-    background-position: right -1125px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.back {
-    background-position: left -1080px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.back:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.back:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.back:focus {
-    background-position: left -1125px;
-}
+@pagetools_icon_space: -90px;
+
+.pagetools-item(@action, @position) {
+    @position-active: (@position+0.5);
+
+    #dokuwiki__pagetools ul li a.@{action} {
+        background-position: right @pagetools_icon_space * @position;
+
+        &:before {
+            margin-top: @pagetools_icon_space * @position;
+        }
+        &:hover,
+        &:active,
+        &:focus {
+            background-position: right @pagetools_icon_space * @position-active;
+        }
+    }
+    [dir=rtl] #dokuwiki__pagetools ul li a.@{action} {
+        background-position: left @pagetools_icon_space * @position;
+
+        &:hover,
+        &:active,
+        &:focus {
+            background-position: left @pagetools_icon_space * @position-active;
+        }
+    }
+}
+.pagetools-item-highlight(@action, @position, @mode) {
+    .pagetools-item(@action, @position);
+    @position-active: (@position+0.5);
+
+    .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
+        background-position: right @pagetools_icon_space * @position-active;
+        &:before {
+            margin-top: @pagetools_icon_space * @position-active;
+        }
+    }
+    [dir=rtl] .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
+        background-position: left @pagetools_icon_space * @position-active;
+    }
+}
+
+.pagetools-item(edit, 1);
+.pagetools-item(create, 2);
+.pagetools-item(show, 4);
+.pagetools-item(source, 5);
+.pagetools-item(draft, 3);
+.pagetools-item-highlight(revs, 7, revisions);
+.pagetools-item-highlight(backlink, 8, backlink);
+.pagetools-item(top, 10);
+.pagetools-item-highlight(revert, 6, revert);
+.pagetools-item-highlight(subscribe, 9);
+.pagetools-item(mediaManager, 11);
+.pagetools-item(back, 12);
-- 
cgit v1.2.3


From d1e37fb0c8f6a5f768bd6cacfcce6c338b4c3831 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Sat, 3 Aug 2013 13:07:28 +0200
Subject: Populate global variable JSINFO also in the Media Manager popup

---
 lib/exe/mediamanager.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 66e5ddc82..7cd91fe8f 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -29,12 +29,13 @@
         $IMG = null;
     }
 
-    global $INFO;
+    global $INFO, $JSINFO;
     $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo();
+    $JSINFO = array('id' => $ID, 'namespace' => $NS);
     $AUTH = $INFO['perm'];    // shortcut for historical reasons
 
-    trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
-    session_write_close();  //close session
+    trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
+    session_write_close();  //close session
 
     // do not display the manager if user does not have read access
     if($AUTH < AUTH_READ && !$fullscreen) {
-- 
cgit v1.2.3


From 041a602de97e0bb0e06b7a5a92564e6aadbfa81a Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 14:27:05 +0200
Subject: fix a bug in acl manager where it attempted to correct too high page
 permission levels using the wrong var

---
 lib/plugins/acl/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 0d9cd742a..50377da81 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -724,7 +724,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         static $label = 0; //number labels
         $ret = '';
 
-        if($ispage && $setperm > AUTH_EDIT) $perm = AUTH_EDIT;
+        if($ispage && $setperm > AUTH_EDIT) $setperm = AUTH_EDIT;
 
         foreach(array(AUTH_NONE,AUTH_READ,AUTH_EDIT,AUTH_CREATE,AUTH_UPLOAD,AUTH_DELETE) as $perm){
             $label += 1;
-- 
cgit v1.2.3


From afb2c08218345dc3604024c829a5c408e3f39277 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 3 Aug 2013 14:42:05 +0200
Subject: allow for a style.ini in conf/<tpl>/style.ini

This is another go at what pull request #227 tried to do. This removes
support for a style.local.ini in the template file in preference of a
style.ini in the conf folder
---
 lib/exe/css.php | 139 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 79 insertions(+), 60 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 83972d407..ce6a83fea 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -40,43 +40,33 @@ function css_out(){
         $type = '';
     }
 
+    // decide from where to get the template
     $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
-    if($tpl){
-        $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/';
-        $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/';
-    }else{
-        $tplinc = tpl_incdir();
-        $tpldir = tpl_basedir();
-    }
-
-    // used style.ini file
-    $styleini = css_styleini($tplinc);
+    if(!$tpl) $tpl = $conf['template'];
 
     // The generated script depends on some dynamic options
-    $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tplinc.$type,'.css');
+    $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl.$type,'.css');
 
-    // load template styles
-    $tplstyles = array();
-    if ($styleini) {
-        foreach($styleini['stylesheets'] as $file => $mode) {
-            $tplstyles[$mode][$tplinc.$file] = $tpldir;
-        }
-    }
+    // load styl.ini
+    $styleini = css_styleini($tpl);
+
+    print_r($styleini);
 
     // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
     if (isset($config_cascade['userstyle']['default'])) {
         $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
     }
 
-    // Array of needed files and their web locations, the latter ones
-    // are needed to fix relative paths in the stylesheets
-    $files = array();
-
+    // cache influencers
+    $tplinc = tpl_basedir($tpl);
     $cache_files = getConfigFiles('main');
     $cache_files[] = $tplinc.'style.ini';
-    $cache_files[] = $tplinc.'style.local.ini';
+    $cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
     $cache_files[] = __FILE__;
 
+    // Array of needed files and their web locations, the latter ones
+    // are needed to fix relative paths in the stylesheets
+    $files = array();
     foreach($mediatypes as $mediatype) {
         $files[$mediatype] = array();
         // load core styles
@@ -88,8 +78,8 @@ function css_out(){
         // load plugin styles
         $files[$mediatype] = array_merge($files[$mediatype], css_pluginstyles($mediatype));
         // load template styles
-        if (isset($tplstyles[$mediatype])) {
-            $files[$mediatype] = array_merge($files[$mediatype], $tplstyles[$mediatype]);
+        if (isset($styleini['stylesheets'][$mediatype])) {
+            $files[$mediatype] = array_merge($files[$mediatype], $styleini['stylesheets'][$mediatype]);
         }
         // load user styles
         if(isset($config_cascade['userstyle'][$mediatype])){
@@ -101,7 +91,7 @@ function css_out(){
         //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
         if ($mediatype=='screen') {
             if($lang['direction'] == 'rtl'){
-                if (isset($tplstyles['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $tplstyles['rtl']);
+                if (isset($styleini['stylesheets']['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $styleini['stylesheets']['rtl']);
                 if (isset($config_cascade['userstyle']['rtl'])) $files[$mediatype][$config_cascade['userstyle']['rtl']] = DOKU_BASE;
             }
         }
@@ -154,7 +144,7 @@ function css_out(){
     ob_end_clean();
 
     // apply style replacements
-    $css = css_applystyle($css,$tplinc);
+    $css = css_applystyle($css, $styleini['replacements']);
 
     // parse less
     $css = css_parseless($css);
@@ -200,7 +190,6 @@ function css_parseless($css) {
 
             // walk upwards to last include
             $lines = explode("\n", $css);
-            $count = count($lines);
             for($i=$lno-1; $i>=0; $i--){
                 if(preg_match('/\/(\* XXXXXXXXX )(.*?)( XXXXXXXXX \*)\//', $lines[$i], $m)){
                     // we found it, add info to message
@@ -238,50 +227,80 @@ function css_parseless($css) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function css_applystyle($css,$tplinc){
-    $styleini = css_styleini($tplinc);
-
-    if($styleini){
-        // we convert ini replacements to LESS variable names
-        // and build a list of variable: value; pairs
-        $less = '';
-        foreach($styleini['replacements'] as $key => $value){
-            $lkey = trim($key, '_');
-            $lkey = '@ini_'.$lkey;
-            $less .= "$lkey: $value;\n";
-
-            $styleini['replacements'][$key] = $lkey;
-        }
+function css_applystyle($css, $replacements) {
+    // we convert ini replacements to LESS variable names
+    // and build a list of variable: value; pairs
+    $less = '';
+    foreach((array) $replacements as $key => $value) {
+        $lkey = trim($key, '_');
+        $lkey = '@ini_'.$lkey;
+        $less .= "$lkey: $value;\n";
+
+        $replacements[$key] = $lkey;
+    }
 
-        // we now replace all old ini replacements with LESS variables
-        $css = strtr($css, $styleini['replacements']);
+    // we now replace all old ini replacements with LESS variables
+    $css = strtr($css, $replacements);
 
-        // now prepend the list of LESS variables as the very first thing
-        $css = $less.$css;
-    }
+    // now prepend the list of LESS variables as the very first thing
+    $css = $less.$css;
     return $css;
 }
 
 /**
- * Get contents of merged style.ini and style.local.ini as an array.
+ * Load style ini contents
+ *
+ * Loads and merges style.ini files from template and config and prepares
+ * the stylesheet modes
  *
- * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param string $tpl the used template
+ * @return array with keys 'stylesheets' and 'replacements'
  */
-function css_styleini($tplinc) {
-    $styleini = array();
+function css_styleini($tpl) {
+    $stylesheets = array(); // mode, file => base
+    $replacements = array(); // placeholder => value
+
+    // load template's style.ini
+    $incbase = tpl_incdir($tpl);
+    $webbase = tpl_basedir($tpl);
+    $ini = $incbase.'style.ini';
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
 
-    foreach (array($tplinc.'style.ini', $tplinc.'style.local.ini') as $ini) {
-        $tmp = (@file_exists($ini)) ? parse_ini_file($ini, true) : array();
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, $data['replacements']);
+        }
+    }
 
-        foreach($tmp as $key => $value) {
-            if(array_key_exists($key, $styleini) && is_array($value)) {
-                $styleini[$key] = array_merge($styleini[$key], $tmp[$key]);
-            } else {
-                $styleini[$key] = $value;
-            }
+    // load configs's style.ini
+    $incbase = dirname($ini).'/';
+    $webbase = DOKU_BASE;
+    $ini = DOKU_CONF."/tpl/$tpl/style.ini";
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
+
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, $data['replacements']);
         }
     }
-    return $styleini;
+
+    return array(
+        'stylesheets' => $stylesheets,
+        'replacements' => $replacements
+    );
 }
 
 /**
-- 
cgit v1.2.3


From a5365cbe15702d1211b52128cb0bec6473ba15cc Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Sat, 3 Aug 2013 15:24:42 +0200
Subject: JSINFO in Media Manager: Initialize with empty array, as $ID and $NS
 aren't useful and available. This is just for adding more values in e. g. an
 action plugin.

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

(limited to 'lib')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 7cd91fe8f..d9e4a6b04 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -31,7 +31,7 @@
 
     global $INFO, $JSINFO;
     $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo();
-    $JSINFO = array('id' => $ID, 'namespace' => $NS);
+    $JSINFO = array('id' => '', 'namespace' => '');
     $AUTH = $INFO['perm'];    // shortcut for historical reasons
 
     trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
-- 
cgit v1.2.3


From cc57a25b03553bd3f5ec9f6339c47c045e236ec1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 3 Aug 2013 16:09:59 +0200
Subject: use only one mixin name for pagetools

less will use the right one based on parameter counts
---
 lib/tpl/dokuwiki/css/pagetools.less | 44 ++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index 633686bb3..145287f7a 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -165,6 +165,12 @@
 
 @pagetools_icon_space: -90px;
 
+/**
+ * page tools without highlighting
+ *
+ * @param string @action The action class
+ * @param int @position Position in the page tools
+ */
 .pagetools-item(@action, @position) {
     @position-active: (@position+0.5);
 
@@ -190,19 +196,27 @@
         }
     }
 }
-.pagetools-item-highlight(@action, @position, @mode) {
-    .pagetools-item(@action, @position);
-    @position-active: (@position+0.5);
 
-    .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
-        background-position: right @pagetools_icon_space * @position-active;
-        &:before {
-            margin-top: @pagetools_icon_space * @position-active;
-        }
-    }
-    [dir=rtl] .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
-        background-position: left @pagetools_icon_space * @position-active;
+/**
+ * page tools with highlighting
+ *
+ * @param string @action The action class
+ * @param int @position Position in the page tools
+ * @param string @mode The mode in which this tool should be highlighted
+ */
+.pagetools-item(@action, @position, @mode) {
+  .pagetools-item(@action, @position);
+  @position-active: (@position+0.5);
+
+  .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
+    background-position: right @pagetools_icon_space * @position-active;
+    &:before {
+      margin-top: @pagetools_icon_space * @position-active;
     }
+  }
+  [dir=rtl] .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
+    background-position: left @pagetools_icon_space * @position-active;
+  }
 }
 
 .pagetools-item(edit, 1);
@@ -210,10 +224,10 @@
 .pagetools-item(show, 4);
 .pagetools-item(source, 5);
 .pagetools-item(draft, 3);
-.pagetools-item-highlight(revs, 7, revisions);
-.pagetools-item-highlight(backlink, 8, backlink);
+.pagetools-item(revs, 7, revisions);
+.pagetools-item(backlink, 8, backlink);
 .pagetools-item(top, 10);
-.pagetools-item-highlight(revert, 6, revert);
-.pagetools-item-highlight(subscribe, 9);
+.pagetools-item(revert, 6, revert);
+.pagetools-item(subscribe, 9, subscribe);
 .pagetools-item(mediaManager, 11);
 .pagetools-item(back, 12);
-- 
cgit v1.2.3


From 568ffd7ef769ecacdf91ac7bdf01dbcedaf8643a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 3 Aug 2013 16:25:02 +0200
Subject: Readded style.local.ini and deprecated it

---
 lib/exe/css.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index ce6a83fea..aa82ba9a2 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -279,6 +279,23 @@ function css_styleini($tpl) {
         }
     }
 
+    // load template's style.local.ini
+    // @deprecated 2013-08-03
+    $ini = $incbase.'style.local.ini';
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
+
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, $data['replacements']);
+        }
+    }
+
     // load configs's style.ini
     $incbase = dirname($ini).'/';
     $webbase = DOKU_BASE;
-- 
cgit v1.2.3


From 681ee01735dac6212c68e1f83538bd0888c9ed0c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 16:07:48 +0100
Subject: corrected comment in pagetools-item() mixin

---
 lib/tpl/dokuwiki/css/pagetools.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index 145287f7a..ecb3038c3 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -169,7 +169,7 @@
  * page tools without highlighting
  *
  * @param string @action The action class
- * @param int @position Position in the page tools
+ * @param int @position Position in the page tools sprite
  */
 .pagetools-item(@action, @position) {
     @position-active: (@position+0.5);
@@ -201,7 +201,7 @@
  * page tools with highlighting
  *
  * @param string @action The action class
- * @param int @position Position in the page tools
+ * @param int @position Position in the page tools sprite
  * @param string @mode The mode in which this tool should be highlighted
  */
 .pagetools-item(@action, @position, @mode) {
-- 
cgit v1.2.3


From 00e3e3940de140e6fe6ce3c558c71a47f676b456 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:17:58 +0200
Subject: fix the default ordering of media files to be "natural".

also allow the order to be specified in more places.
---
 lib/exe/ajax.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 9769503a7..6e2011cd9 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -219,10 +219,11 @@ function ajax_medialist(){
     global $INPUT;
 
     $NS = cleanID($INPUT->post->str('ns'));
+    $sort = $INPUT->post->bool('recent') ? 'date' : 'natural';
     if ($INPUT->post->str('do') == 'media') {
         tpl_mediaFileList();
     } else {
-        tpl_mediaContent(true);
+        tpl_mediaContent(true, $sort);
     }
 }
 
-- 
cgit v1.2.3


From c84391dcf5eb8a23bcae9e558285975c6b47e7f1 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:19:28 +0200
Subject: show media files in date order (most recent first) after an upload is
 completed

---
 lib/scripts/fileuploaderextended.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index 0ba7a0525..f5786c387 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -188,6 +188,7 @@ qq.extend(qq.FileUploaderExtended.prototype, {
             if (i) action = action.substr(0, i);
             var button = '<form method="post" action="' + action + '" id="mediamanager__done_form"><div>';
             button += '<input type="hidden" value="' + result.ns + '" name="ns">';
+            button += '<input type="hidden" value="1" name="recent">';
             button += '<input class="button" type="submit" value="' + LANG.media_done_btn + '"></div></form>';
             jQuery('#mediamanager__uploader').append(button);
         }
-- 
cgit v1.2.3


From 893decf1230dd0052bcf5db59a41ffeee9987715 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:40:29 +0200
Subject: add 'danger' alert to authad config settings

---
 lib/plugins/authad/conf/metadata.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php
index fbc3f163c..29f9a5ae9 100644
--- a/lib/plugins/authad/conf/metadata.php
+++ b/lib/plugins/authad/conf/metadata.php
@@ -1,14 +1,14 @@
 <?php
 
-$meta['account_suffix']     = array('string');
-$meta['base_dn']            = array('string');
-$meta['domain_controllers'] = array('string');
-$meta['sso']                = array('onoff');
-$meta['admin_username']        = array('string');
-$meta['admin_password']        = array('password');
-$meta['real_primarygroup']  = array('onoff');
-$meta['use_ssl']            = array('onoff');
-$meta['use_tls']            = array('onoff');
-$meta['debug']              = array('onoff');
-$meta['expirywarn']         = array('numeric', '_min'=>0);
-$meta['additional']         = array('string');
+$meta['account_suffix']     = array('string','_caution' => 'danger');
+$meta['base_dn']            = array('string','_caution' => 'danger');
+$meta['domain_controllers'] = array('string','_caution' => 'danger');
+$meta['sso']                = array('onoff','_caution' => 'danger');
+$meta['admin_username']     = array('string','_caution' => 'danger');
+$meta['admin_password']     = array('password','_caution' => 'danger');
+$meta['real_primarygroup']  = array('onoff','_caution' => 'danger');
+$meta['use_ssl']            = array('onoff','_caution' => 'danger');
+$meta['use_tls']            = array('onoff','_caution' => 'danger');
+$meta['debug']              = array('onoff','_caution' => 'danger');
+$meta['expirywarn']         = array('numeric', '_min'=>0,'_caution' => 'danger');
+$meta['additional']         = array('string','_caution' => 'danger');
-- 
cgit v1.2.3


From 7e2d11334fbe7c1174bfe6711f88a5625e982042 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:42:41 +0200
Subject: add 'danger' alert to authldap config settings

---
 lib/plugins/authldap/conf/metadata.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index a3256628c..a165a322c 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -1,19 +1,19 @@
 <?php
-$meta['server']      = array('string');
-$meta['port']        = array('numeric');
-$meta['usertree']    = array('string');
-$meta['grouptree']   = array('string');
-$meta['userfilter']  = array('string');
-$meta['groupfilter'] = array('string');
-$meta['version']     = array('numeric');
-$meta['starttls']    = array('onoff');
-$meta['referrals']   = array('onoff');
-$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3));
-$meta['binddn']      = array('string');
-$meta['bindpw']      = array('password');
+$meta['server']      = array('string','_caution' => 'danger');
+$meta['port']        = array('numeric','_caution' => 'danger');
+$meta['usertree']    = array('string','_caution' => 'danger');
+$meta['grouptree']   = array('string','_caution' => 'danger');
+$meta['userfilter']  = array('string','_caution' => 'danger');
+$meta['groupfilter'] = array('string','_caution' => 'danger');
+$meta['version']     = array('numeric','_caution' => 'danger');
+$meta['starttls']    = array('onoff','_caution' => 'danger');
+$meta['referrals']   = array('onoff','_caution' => 'danger');
+$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'danger');
+$meta['binddn']      = array('string','_caution' => 'danger');
+$meta['bindpw']      = array('password','_caution' => 'danger');
 //$meta['mapping']['name']  unsupported in config manager
 //$meta['mapping']['grps']  unsupported in config manager
-$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'));
-$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'));
-$meta['groupkey']    = array('string');
-$meta['debug']       = array('onoff');
\ No newline at end of file
+$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupkey']    = array('string','_caution' => 'danger');
+$meta['debug']       = array('onoff','_caution' => 'danger');
\ No newline at end of file
-- 
cgit v1.2.3


From 733675ab67406e6a89c9779ff871a55ad6d9dbea Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:43:28 +0200
Subject: add 'danger' alert to authmysql config settings

---
 lib/plugins/authmysql/conf/metadata.php | 64 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authmysql/conf/metadata.php b/lib/plugins/authmysql/conf/metadata.php
index 05d150fdf..73e9ec1a8 100644
--- a/lib/plugins/authmysql/conf/metadata.php
+++ b/lib/plugins/authmysql/conf/metadata.php
@@ -1,34 +1,34 @@
 <?php
 
-$meta['server']           = array('string');
-$meta['user']             = array('string');
-$meta['password']         = array('password');
-$meta['database']         = array('string');
-$meta['charset']          = array('string');
-$meta['debug']            = array('multichoice','_choices' => array(0,1,2));
-$meta['forwardClearPass'] = array('onoff');
-$meta['TablesToLock']     = array('array');
-$meta['checkPass']        = array('');
-$meta['getUserInfo']      = array('');
-$meta['getGroups']        = array('');
-$meta['getUsers']         = array('');
-$meta['FilterLogin']      = array('string');
-$meta['FilterName']       = array('string');
-$meta['FilterEmail']      = array('string');
-$meta['FilterGroup']      = array('string');
-$meta['SortOrder']        = array('string');
-$meta['addUser']          = array('');
-$meta['addGroup']         = array('');
-$meta['addUserGroup']     = array('');
-$meta['delGroup']         = array('');
-$meta['getUserID']        = array('');
-$meta['delUser']          = array('');
-$meta['delUserRefs']      = array('');
-$meta['updateUser']       = array('string');
-$meta['UpdateLogin']      = array('string');
-$meta['UpdatePass']       = array('string');
-$meta['UpdateEmail']      = array('string');
-$meta['UpdateName']       = array('string');
-$meta['UpdateTarget']     = array('string');
-$meta['delUserGroup']     = array('');
-$meta['getGroupID']       = array('');
\ No newline at end of file
+$meta['server']           = array('string','_caution' => 'danger');
+$meta['user']             = array('string','_caution' => 'danger');
+$meta['password']         = array('password','_caution' => 'danger');
+$meta['database']         = array('string','_caution' => 'danger');
+$meta['charset']          = array('string','_caution' => 'danger');
+$meta['debug']            = array('multichoice','_choices' => array(0,1,2),'_caution' => 'danger');
+$meta['forwardClearPass'] = array('onoff','_caution' => 'danger');
+$meta['TablesToLock']     = array('array','_caution' => 'danger');
+$meta['checkPass']        = array('','_caution' => 'danger');
+$meta['getUserInfo']      = array('','_caution' => 'danger');
+$meta['getGroups']        = array('','_caution' => 'danger');
+$meta['getUsers']         = array('','_caution' => 'danger');
+$meta['FilterLogin']      = array('string','_caution' => 'danger');
+$meta['FilterName']       = array('string','_caution' => 'danger');
+$meta['FilterEmail']      = array('string','_caution' => 'danger');
+$meta['FilterGroup']      = array('string','_caution' => 'danger');
+$meta['SortOrder']        = array('string','_caution' => 'danger');
+$meta['addUser']          = array('','_caution' => 'danger');
+$meta['addGroup']         = array('','_caution' => 'danger');
+$meta['addUserGroup']     = array('','_caution' => 'danger');
+$meta['delGroup']         = array('','_caution' => 'danger');
+$meta['getUserID']        = array('','_caution' => 'danger');
+$meta['delUser']          = array('','_caution' => 'danger');
+$meta['delUserRefs']      = array('','_caution' => 'danger');
+$meta['updateUser']       = array('string','_caution' => 'danger');
+$meta['UpdateLogin']      = array('string','_caution' => 'danger');
+$meta['UpdatePass']       = array('string','_caution' => 'danger');
+$meta['UpdateEmail']      = array('string','_caution' => 'danger');
+$meta['UpdateName']       = array('string','_caution' => 'danger');
+$meta['UpdateTarget']     = array('string','_caution' => 'danger');
+$meta['delUserGroup']     = array('','_caution' => 'danger');
+$meta['getGroupID']       = array('','_caution' => 'danger');
\ No newline at end of file
-- 
cgit v1.2.3


From 39245054d28c2796f1922792c77f36fbcf29f6e7 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:43:51 +0200
Subject: add 'danger' alert to authpgsql config settings

---
 lib/plugins/authpgsql/conf/metadata.php | 60 ++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authpgsql/conf/metadata.php b/lib/plugins/authpgsql/conf/metadata.php
index d52a17865..9868cf9b5 100644
--- a/lib/plugins/authpgsql/conf/metadata.php
+++ b/lib/plugins/authpgsql/conf/metadata.php
@@ -1,33 +1,33 @@
 <?php
 
-$meta['server']           = array('string');
-$meta['port']             = array('numeric');
-$meta['user']             = array('string');
-$meta['password']         = array('password');
-$meta['database']         = array('string');
-$meta['debug']            = array('onoff');
-$meta['forwardClearPass'] = array('onoff');
-$meta['checkPass']        = array('');
-$meta['getUserInfo']      = array('');
+$meta['server']           = array('string','_caution' => 'danger');
+$meta['port']             = array('numeric','_caution' => 'danger');
+$meta['user']             = array('string','_caution' => 'danger');
+$meta['password']         = array('password','_caution' => 'danger');
+$meta['database']         = array('string','_caution' => 'danger');
+$meta['debug']            = array('onoff','_caution' => 'danger');
+$meta['forwardClearPass'] = array('onoff','_caution' => 'danger');
+$meta['checkPass']        = array('','_caution' => 'danger');
+$meta['getUserInfo']      = array('','_caution' => 'danger');
 $meta['getGroups']        = array('');
-$meta['getUsers']         = array('');
-$meta['FilterLogin']      = array('string');
-$meta['FilterName']       = array('string');
-$meta['FilterEmail']      = array('string');
-$meta['FilterGroup']      = array('string');
-$meta['SortOrder']        = array('string');
-$meta['addUser']          = array('');
-$meta['addGroup']         = array('');
-$meta['addUserGroup']     = array('');
-$meta['delGroup']         = array('');
-$meta['getUserID']        = array('');
-$meta['delUser']          = array('');
-$meta['delUserRefs']      = array('');
-$meta['updateUser']       = array('string');
-$meta['UpdateLogin']      = array('string');
-$meta['UpdatePass']       = array('string');
-$meta['UpdateEmail']      = array('string');
-$meta['UpdateName']       = array('string');
-$meta['UpdateTarget']     = array('string');
-$meta['delUserGroup']     = array('');
-$meta['getGroupID']       = array('');
\ No newline at end of file
+$meta['getUsers']         = array('','_caution' => 'danger');
+$meta['FilterLogin']      = array('string','_caution' => 'danger');
+$meta['FilterName']       = array('string','_caution' => 'danger');
+$meta['FilterEmail']      = array('string','_caution' => 'danger');
+$meta['FilterGroup']      = array('string','_caution' => 'danger');
+$meta['SortOrder']        = array('string','_caution' => 'danger');
+$meta['addUser']          = array('','_caution' => 'danger');
+$meta['addGroup']         = array('','_caution' => 'danger');
+$meta['addUserGroup']     = array('','_caution' => 'danger');
+$meta['delGroup']         = array('','_caution' => 'danger');
+$meta['getUserID']        = array('','_caution' => 'danger');
+$meta['delUser']          = array('','_caution' => 'danger');
+$meta['delUserRefs']      = array('','_caution' => 'danger');
+$meta['updateUser']       = array('string','_caution' => 'danger');
+$meta['UpdateLogin']      = array('string','_caution' => 'danger');
+$meta['UpdatePass']       = array('string','_caution' => 'danger');
+$meta['UpdateEmail']      = array('string','_caution' => 'danger');
+$meta['UpdateName']       = array('string','_caution' => 'danger');
+$meta['UpdateTarget']     = array('string','_caution' => 'danger');
+$meta['delUserGroup']     = array('','_caution' => 'danger');
+$meta['getGroupID']       = array('','_caution' => 'danger');
\ No newline at end of file
-- 
cgit v1.2.3


From efcec72bb2994a220c7885c5b6855a934e80b52d Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 18:06:54 +0200
Subject: convert from iso-8859-1 if not utf8

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 395b91053..4c555ba67 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -759,6 +759,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $fd = fopen($_FILES['import']['tmp_name'],'r');
         if ($fd) {
             while($csv = fgets($fd)){
+                if (!utf8_check($csv)) {
+                    $csv = utf8_encode($csv);
+                }
                 $raw = str_getcsv($csv);
                 $error = '';                        // clean out any errors from the previous line
                 // data checks...
-- 
cgit v1.2.3


From bed4ab799d58cd04a3fabc7355084181da86e843 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 18:09:35 +0200
Subject: change 'debug' setting to 'security' (rather than 'danger')

---
 lib/plugins/authad/conf/metadata.php    | 2 +-
 lib/plugins/authldap/conf/metadata.php  | 2 +-
 lib/plugins/authmysql/conf/metadata.php | 2 +-
 lib/plugins/authpgsql/conf/metadata.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php
index 29f9a5ae9..7b4f895d0 100644
--- a/lib/plugins/authad/conf/metadata.php
+++ b/lib/plugins/authad/conf/metadata.php
@@ -9,6 +9,6 @@ $meta['admin_password']     = array('password','_caution' => 'danger');
 $meta['real_primarygroup']  = array('onoff','_caution' => 'danger');
 $meta['use_ssl']            = array('onoff','_caution' => 'danger');
 $meta['use_tls']            = array('onoff','_caution' => 'danger');
-$meta['debug']              = array('onoff','_caution' => 'danger');
+$meta['debug']              = array('onoff','_caution' => 'security');
 $meta['expirywarn']         = array('numeric', '_min'=>0,'_caution' => 'danger');
 $meta['additional']         = array('string','_caution' => 'danger');
diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index a165a322c..6aa53c40d 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -16,4 +16,4 @@ $meta['bindpw']      = array('password','_caution' => 'danger');
 $meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
 $meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
 $meta['groupkey']    = array('string','_caution' => 'danger');
-$meta['debug']       = array('onoff','_caution' => 'danger');
\ No newline at end of file
+$meta['debug']       = array('onoff','_caution' => 'security');
\ No newline at end of file
diff --git a/lib/plugins/authmysql/conf/metadata.php b/lib/plugins/authmysql/conf/metadata.php
index 73e9ec1a8..54d6f1404 100644
--- a/lib/plugins/authmysql/conf/metadata.php
+++ b/lib/plugins/authmysql/conf/metadata.php
@@ -5,7 +5,7 @@ $meta['user']             = array('string','_caution' => 'danger');
 $meta['password']         = array('password','_caution' => 'danger');
 $meta['database']         = array('string','_caution' => 'danger');
 $meta['charset']          = array('string','_caution' => 'danger');
-$meta['debug']            = array('multichoice','_choices' => array(0,1,2),'_caution' => 'danger');
+$meta['debug']            = array('multichoice','_choices' => array(0,1,2),'_caution' => 'security');
 $meta['forwardClearPass'] = array('onoff','_caution' => 'danger');
 $meta['TablesToLock']     = array('array','_caution' => 'danger');
 $meta['checkPass']        = array('','_caution' => 'danger');
diff --git a/lib/plugins/authpgsql/conf/metadata.php b/lib/plugins/authpgsql/conf/metadata.php
index 9868cf9b5..fbd051270 100644
--- a/lib/plugins/authpgsql/conf/metadata.php
+++ b/lib/plugins/authpgsql/conf/metadata.php
@@ -5,7 +5,7 @@ $meta['port']             = array('numeric','_caution' => 'danger');
 $meta['user']             = array('string','_caution' => 'danger');
 $meta['password']         = array('password','_caution' => 'danger');
 $meta['database']         = array('string','_caution' => 'danger');
-$meta['debug']            = array('onoff','_caution' => 'danger');
+$meta['debug']            = array('onoff','_caution' => 'security');
 $meta['forwardClearPass'] = array('onoff','_caution' => 'danger');
 $meta['checkPass']        = array('','_caution' => 'danger');
 $meta['getUserInfo']      = array('','_caution' => 'danger');
-- 
cgit v1.2.3


From 90e793b91a348ae2876ed14c8b0d0000192d55e5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 3 Aug 2013 22:52:10 +0200
Subject: removed debug statement

---
 lib/exe/css.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index aa82ba9a2..299e1ebcf 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -50,8 +50,6 @@ function css_out(){
     // load styl.ini
     $styleini = css_styleini($tpl);
 
-    print_r($styleini);
-
     // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
     if (isset($config_cascade['userstyle']['default'])) {
         $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
-- 
cgit v1.2.3


From 8c5aad7bcd74959cceb191697de486a5f6e98fd7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 22:16:08 +0100
Subject: fixed conf style.ini not working due to wrong incbase path

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

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index aa82ba9a2..48304b2b6 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -297,9 +297,9 @@ function css_styleini($tpl) {
     }
 
     // load configs's style.ini
-    $incbase = dirname($ini).'/';
     $webbase = DOKU_BASE;
-    $ini = DOKU_CONF."/tpl/$tpl/style.ini";
+    $ini = DOKU_CONF."tpl/$tpl/style.ini";
+    $incbase = dirname($ini).'/';
     if(file_exists($ini)){
         $data = parse_ini_file($ini, true);
 
-- 
cgit v1.2.3


From 724f299965bd5272d45b883477424bd693c9ce95 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 22:23:37 +0100
Subject: added style.local.ini to cache files

---
 lib/exe/css.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 08dc4d5dd..9e1e22e1a 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -59,6 +59,7 @@ function css_out(){
     $tplinc = tpl_basedir($tpl);
     $cache_files = getConfigFiles('main');
     $cache_files[] = $tplinc.'style.ini';
+    $cache_files[] = $tplinc.'style.local.ini'; // @deprecated
     $cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
     $cache_files[] = __FILE__;
 
-- 
cgit v1.2.3


From 5d92c7d222f614c23229a455bc6738bbaaf0a6ce Mon Sep 17 00:00:00 2001
From: mprins <mprins@users.sf.net>
Date: Sun, 4 Aug 2013 10:50:57 +0200
Subject: translation update

---
 lib/plugins/acl/lang/nl/lang.php           | 4 ++--
 lib/plugins/authad/lang/nl/settings.php    | 5 +++--
 lib/plugins/authldap/lang/nl/settings.php  | 5 +++--
 lib/plugins/authmysql/lang/nl/settings.php | 5 +++--
 lib/plugins/authpgsql/lang/nl/settings.php | 5 +++--
 lib/plugins/plugin/lang/nl/lang.php        | 5 +++--
 lib/plugins/popularity/lang/nl/lang.php    | 5 +++--
 lib/plugins/revert/lang/nl/lang.php        | 5 +++--
 lib/plugins/usermanager/lang/nl/lang.php   | 5 +++--
 9 files changed, 26 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index 567eb46dc..e3a95e779 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * dutch language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author François Kooman <fkooman.tuxed.net>
  * @author Jack van Klaren <dokuwiki@afentoe.xs4all.nl>
  * @author Riny Heijdendael <riny@heijdendael.nl>
diff --git a/lib/plugins/authad/lang/nl/settings.php b/lib/plugins/authad/lang/nl/settings.php
index 933566d18..8f5c84043 100644
--- a/lib/plugins/authad/lang/nl/settings.php
+++ b/lib/plugins/authad/lang/nl/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['account_suffix']        = 'Je account domeinnaam. Bijv <code>@mijn.domein.org</code>';
 $lang['base_dn']               = 'Je basis DN. Bijv. <code>DC=mijn,DC=domein,DC=org</code>';
diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index 274c3b7fc..958bd4d6f 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['server']                = 'Je LDAP server. Ofwel servernaam (<code>localhost</code>) of volledige URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'LDAP server poort als hiervoor geen volledige URL is opgegeven';
diff --git a/lib/plugins/authmysql/lang/nl/settings.php b/lib/plugins/authmysql/lang/nl/settings.php
index dc85b7eee..39fa32112 100644
--- a/lib/plugins/authmysql/lang/nl/settings.php
+++ b/lib/plugins/authmysql/lang/nl/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['server']                = 'Je MySQL server';
 $lang['user']                  = 'MySql gebruikersnaam';
diff --git a/lib/plugins/authpgsql/lang/nl/settings.php b/lib/plugins/authpgsql/lang/nl/settings.php
index 4e6c007c6..496017f1c 100644
--- a/lib/plugins/authpgsql/lang/nl/settings.php
+++ b/lib/plugins/authpgsql/lang/nl/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['server']                = 'Je PostgrSQL server';
 $lang['port']                  = 'Je PostgreSQL server poort';
diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php
index 10db78411..1317e44f2 100644
--- a/lib/plugins/plugin/lang/nl/lang.php
+++ b/lib/plugins/plugin/lang/nl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Wouter Schoot <wouter@schoot.org>
  * @author John de Graaff <john@de-graaff.net>
  * @author Niels Schoot <niels.schoot@quintiq.com>
diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php
index b32ad9eb6..dda4a1d7f 100644
--- a/lib/plugins/popularity/lang/nl/lang.php
+++ b/lib/plugins/popularity/lang/nl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Wouter Schoot <wouter@schoot.org>
  * @author Niels Schoot <niels.schoot@quintiq.com>
  * @author Dion Nicolaas <dion@nicolaas.net>
diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php
index 0a2880105..882675b81 100644
--- a/lib/plugins/revert/lang/nl/lang.php
+++ b/lib/plugins/revert/lang/nl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Wouter Schoot <wouter@schoot.org>
  * @author John de Graaff <john@de-graaff.net>
  * @author Niels Schoot <niels.schoot@quintiq.com>
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index e960e9a14..e1bf126fb 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Wouter Schoot <wouter@schoot.org>
  * @author John de Graaff <john@de-graaff.net>
  * @author Niels Schoot <niels.schoot@quintiq.com>
-- 
cgit v1.2.3


From 2f46ade0bbc43b599bedf620e2514171cce072df Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 4 Aug 2013 10:58:52 +0200
Subject: FS#2806 - fix auth capability listing in html_debug()

---
 lib/plugins/auth.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index ec8ed7e58..dc66d6380 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -54,6 +54,18 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
         // constructors do the real work
     }
 
+    /**
+     * Available Capabilities. [ DO NOT OVERRIDE ]
+     *
+     * For introspection/debugging
+     *
+     * @author  Christopher Smith <chris@jalakai.co.uk>
+     * @return  array
+     */
+    public function getCapabilities(){
+        return array_keys($this->cando);
+    }
+
     /**
      * Capability check. [ DO NOT OVERRIDE ]
      *
-- 
cgit v1.2.3


From ae68c26a08e2dd3416a96691181f2600ed54afc6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 13:05:25 +0200
Subject: removed now unused interwiki icons

---
 lib/images/interwiki/meatball.gif | Bin 339 -> 0 bytes
 lib/images/interwiki/wiki.gif     | Bin 131 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 lib/images/interwiki/meatball.gif
 delete mode 100644 lib/images/interwiki/wiki.gif

(limited to 'lib')

diff --git a/lib/images/interwiki/meatball.gif b/lib/images/interwiki/meatball.gif
deleted file mode 100644
index 8a4cbdbfc..000000000
Binary files a/lib/images/interwiki/meatball.gif and /dev/null differ
diff --git a/lib/images/interwiki/wiki.gif b/lib/images/interwiki/wiki.gif
deleted file mode 100644
index df241d6bb..000000000
Binary files a/lib/images/interwiki/wiki.gif and /dev/null differ
-- 
cgit v1.2.3


From d5808163ba1734a45356b87153595c69205f0756 Mon Sep 17 00:00:00 2001
From: Sven <Svenluecke48@gmx.d>
Date: Sun, 4 Aug 2013 16:55:57 +0200
Subject: translation update

---
 lib/plugins/acl/lang/de/lang.php           |  4 ++--
 lib/plugins/authad/lang/de/settings.php    |  5 +++--
 lib/plugins/authldap/lang/de/settings.php  |  4 ++--
 lib/plugins/authmysql/lang/de/settings.php |  4 ++--
 lib/plugins/authpgsql/lang/de/settings.php |  4 ++--
 lib/plugins/plugin/lang/de/lang.php        |  4 ++--
 lib/plugins/popularity/lang/de/lang.php    |  5 +++--
 lib/plugins/revert/lang/de/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/de/lang.php   | 20 ++++++++++++++++++--
 9 files changed, 37 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php
index 5f3e51a32..77de4b097 100644
--- a/lib/plugins/acl/lang/de/lang.php
+++ b/lib/plugins/acl/lang/de/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * german language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Christof <gagi@fin.de>
  * @author Anika Henke <anika@selfthinker.org>
diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php
index f4e86dedd..fd624ad02 100644
--- a/lib/plugins/authad/lang/de/settings.php
+++ b/lib/plugins/authad/lang/de/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index b237201d8..b24c792f9 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
diff --git a/lib/plugins/authmysql/lang/de/settings.php b/lib/plugins/authmysql/lang/de/settings.php
index 97ba06a9d..90e0ee5a8 100644
--- a/lib/plugins/authmysql/lang/de/settings.php
+++ b/lib/plugins/authmysql/lang/de/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
 $lang['server']                = 'MySQL-Server';
diff --git a/lib/plugins/authpgsql/lang/de/settings.php b/lib/plugins/authpgsql/lang/de/settings.php
index 4c80245d6..061f56e45 100644
--- a/lib/plugins/authpgsql/lang/de/settings.php
+++ b/lib/plugins/authpgsql/lang/de/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
 $lang['server']                = 'PostgreSQL-Server';
diff --git a/lib/plugins/plugin/lang/de/lang.php b/lib/plugins/plugin/lang/de/lang.php
index 9f26a2933..f41486007 100644
--- a/lib/plugins/plugin/lang/de/lang.php
+++ b/lib/plugins/plugin/lang/de/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * german language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Esther Brunner <esther@kaffeehaus.ch>
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
diff --git a/lib/plugins/popularity/lang/de/lang.php b/lib/plugins/popularity/lang/de/lang.php
index 42bdc14d5..a86fce50d 100644
--- a/lib/plugins/popularity/lang/de/lang.php
+++ b/lib/plugins/popularity/lang/de/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Leo Moll <leo@yeasoft.com>
  * @author Florian Anderiasch <fa@art-core.org>
  * @author Robin Kluth <commi1993@gmail.com>
diff --git a/lib/plugins/revert/lang/de/lang.php b/lib/plugins/revert/lang/de/lang.php
index 2db065f21..7d0b243bb 100644
--- a/lib/plugins/revert/lang/de/lang.php
+++ b/lib/plugins/revert/lang/de/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Michael Klier <chi@chimeric.de>
  * @author Leo Moll <leo@yeasoft.com>
  * @author Florian Anderiasch <fa@art-core.org>
diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php
index 2b9755de8..68cdf359f 100644
--- a/lib/plugins/usermanager/lang/de/lang.php
+++ b/lib/plugins/usermanager/lang/de/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
@@ -17,6 +18,7 @@
  * @author Paul Lachewsky <kaeptn.haddock@gmail.com>
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author Sven <Svenluecke48@gmx.d>
  */
 $lang['menu']                  = 'Benutzerverwaltung';
 $lang['noauth']                = '(Authentifizierungssystem nicht verfügbar)';
@@ -39,6 +41,11 @@ $lang['search']                = 'Suchen';
 $lang['search_prompt']         = 'Benutzerdaten filtern';
 $lang['clear']                 = 'Filter zurücksetzen';
 $lang['filter']                = 'Filter';
+$lang['export_all']            = 'Alle User exportieren (CSV)';
+$lang['export_filtered']       = 'Exportiere gefilterte Userliste (CSV)';
+$lang['import']                = 'Importiere neue User';
+$lang['line']                  = 'Zeilennr.';
+$lang['error']                 = 'Fehlermeldung';
 $lang['summary']               = 'Zeige Benutzer %1$d-%2$d von %3$d gefundenen. %4$d Benutzer insgesamt.';
 $lang['nonefound']             = 'Keine Benutzer gefunden. %d Benutzer insgesamt.';
 $lang['delete_ok']             = '%d Benutzer gelöscht';
@@ -59,3 +66,12 @@ $lang['add_ok']                = 'Nutzer erfolgreich angelegt';
 $lang['add_fail']              = 'Nutzer konnte nicht angelegt werden';
 $lang['notify_ok']             = 'Benachrichtigungsmail wurde versandt';
 $lang['notify_fail']           = 'Benachrichtigungsmail konnte nicht versandt werden';
+$lang['import_success_count']  = 'User-Import: %d User gefunden, %d erfolgreich importiert.';
+$lang['import_failure_count']  = 'User-Import: %d fehlgeschlagen. Fehlgeschlagene User sind nachfolgend aufgelistet.';
+$lang['import_error_fields']   = 'Unzureichende Anzahl an Feldern: %d gefunden, benötigt sind 4.';
+$lang['import_error_baduserid'] = 'User-Id fehlt';
+$lang['import_error_badname']  = 'Ungültiger Name';
+$lang['import_error_badmail']  = 'Ungültige E-Mail';
+$lang['import_error_upload']   = 'Import fehlgeschlagen. Die CSV-Datei konnte nicht hochgeladen werden, oder ist leer.';
+$lang['import_error_readfail'] = 'Import fehlgeschlagen. Die hochgeladene Datei konnte nicht gelesen werden.';
+$lang['import_error_create']   = 'User konnte nicht angelegt werden';
-- 
cgit v1.2.3


From 72a0f401d75ff021ae5dc3b3739f008ff4220d80 Mon Sep 17 00:00:00 2001
From: Constantinos Xanthopoulos <conx@xanthopoulos.info>
Date: Sun, 4 Aug 2013 21:05:53 +0200
Subject: translation update

---
 lib/plugins/acl/lang/el/lang.php         | 7 ++-----
 lib/plugins/plugin/lang/el/lang.php      | 7 ++-----
 lib/plugins/popularity/lang/el/lang.php  | 5 +++--
 lib/plugins/revert/lang/el/lang.php      | 8 +++-----
 lib/plugins/usermanager/lang/el/lang.php | 8 +++-----
 5 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/el/lang.php b/lib/plugins/acl/lang/el/lang.php
index 516d7bdf5..dc4a9f034 100644
--- a/lib/plugins/acl/lang/el/lang.php
+++ b/lib/plugins/acl/lang/el/lang.php
@@ -1,11 +1,8 @@
 <?php
+
 /**
- * Greek language file
- *
- * Based on DokuWiki Version rc2007-05-24 english language file
- * Original english language file contents included for reference
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Anika Henke <anika@selfthinker.org>
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
diff --git a/lib/plugins/plugin/lang/el/lang.php b/lib/plugins/plugin/lang/el/lang.php
index 4a6f1dbfd..f50e26c46 100644
--- a/lib/plugins/plugin/lang/el/lang.php
+++ b/lib/plugins/plugin/lang/el/lang.php
@@ -1,11 +1,8 @@
 <?php
+
 /**
- * Greek language file
- *
- * Based on DokuWiki Version rc2007-05-24 english language file
- * Original english language file contents included for reference
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Christopher Smith <chris@jalakai.co.uk>
  * @author Thanos Massias <tm@thriasio.gr>
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
diff --git a/lib/plugins/popularity/lang/el/lang.php b/lib/plugins/popularity/lang/el/lang.php
index 10268a4c3..37a036930 100644
--- a/lib/plugins/popularity/lang/el/lang.php
+++ b/lib/plugins/popularity/lang/el/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Greek language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Konstantinos Koryllos <koryllos@gmail.com>
  * @author George Petsagourakis <petsagouris@gmail.com>
  * @author Petros Vidalis <pvidalis@gmail.com>
diff --git a/lib/plugins/revert/lang/el/lang.php b/lib/plugins/revert/lang/el/lang.php
index c6e8bd56c..4c93ee5a8 100644
--- a/lib/plugins/revert/lang/el/lang.php
+++ b/lib/plugins/revert/lang/el/lang.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * Greek language file
- *
- * Based on DokuWiki Version rc2007-05-24 english language file
- * Original english language file contents included for reference
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Thanos Massias <tm@thriasio.gr>
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
  * @author Konstantinos Koryllos <koryllos@gmail.com>
diff --git a/lib/plugins/usermanager/lang/el/lang.php b/lib/plugins/usermanager/lang/el/lang.php
index da7c8fb0f..e14aa615e 100644
--- a/lib/plugins/usermanager/lang/el/lang.php
+++ b/lib/plugins/usermanager/lang/el/lang.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * Greek language file
- *
- * Based on DokuWiki Version rc2007-05-24 english language file
- * Original english language file contents included for reference
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Chris Smith <chris@jalakai.co.uk>
  * @author Thanos Massias <tm@thriasio.gr>
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
-- 
cgit v1.2.3


From c03b461102c569da6cded4ca3c473f5ae149cea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20H=C3=A4rnqvist?= <tor.harnqvist@gmail.com>
Date: Sun, 4 Aug 2013 23:00:55 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/sv/settings.php |  2 ++
 lib/plugins/revert/lang/sv/lang.php       |  1 +
 lib/plugins/usermanager/lang/sv/lang.php  | 13 +++++++++++++
 3 files changed, 16 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/sv/settings.php b/lib/plugins/authldap/lang/sv/settings.php
index 68dbccfd0..d98400461 100644
--- a/lib/plugins/authldap/lang/sv/settings.php
+++ b/lib/plugins/authldap/lang/sv/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Smorkster Andersson smorkster@gmail.com
+ * @author Tor Härnqvist <tor.harnqvist@gmail.com>
  */
 $lang['server']                = 'Din LDAO server. Antingen värdnamn (<code>localhost</code>) eller giltig full URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'LDAP server port, om det inte angavs full URL ovan';
@@ -12,6 +13,7 @@ $lang['grouptree']             = 'Specificera var grupper finns. T.ex. <code>ou=
 $lang['userfilter']            = 'LDAP filter för att söka efter användarkonton. T.ex. <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
 $lang['groupfilter']           = 'LDAP filter för att söka efter grupper. T.ex. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = 'Version av protokoll att använda. Du kan behöva sätta detta till <code>3</code>';
+$lang['starttls']              = 'Använd TLS-anslutningar';
 $lang['bindpw']                = 'Lösenord för användare ovan';
 $lang['groupkey']              = 'Gruppmedlemskap från något användarattribut (istället för standard AD grupp) t.ex. grupp från avdelning eller telefonnummer';
 $lang['debug']                 = 'Visa ytterligare felsökningsinformation vid fel';
diff --git a/lib/plugins/revert/lang/sv/lang.php b/lib/plugins/revert/lang/sv/lang.php
index 4a5b944f6..c30f82d93 100644
--- a/lib/plugins/revert/lang/sv/lang.php
+++ b/lib/plugins/revert/lang/sv/lang.php
@@ -17,6 +17,7 @@
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
  * @author Henrik <henrik@idealis.se>
+ * @author Tor Härnqvist <tor.harnqvist@gmail.com>
  */
 $lang['menu']                  = 'Hantera återställningar';
 $lang['filter']                = 'Sök efter spamsidor';
diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php
index 68f5bbc31..340886578 100644
--- a/lib/plugins/usermanager/lang/sv/lang.php
+++ b/lib/plugins/usermanager/lang/sv/lang.php
@@ -16,6 +16,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
+ * @author Tor Härnqvist <tor.harnqvist@gmail.com>
  */
 $lang['menu']                  = 'Hantera användare';
 $lang['noauth']                = '(användarautentisering ej tillgänlig)';
@@ -38,6 +39,10 @@ $lang['search']                = 'Sök';
 $lang['search_prompt']         = 'Utför sökning';
 $lang['clear']                 = 'Återställ sökfilter';
 $lang['filter']                = 'Filter';
+$lang['export_all']            = 'Exportera alla användare (CSV)';
+$lang['export_filtered']       = 'Exportera filtrerade användarlistningen (CSV)';
+$lang['import']                = 'Importera nya användare';
+$lang['error']                 = 'Error-meddelande';
 $lang['summary']               = 'Visar användare %1$d-%2$d av %3$d funna. %4$d användare totalt.';
 $lang['nonefound']             = 'Inga användare hittades. %d användare totalt.';
 $lang['delete_ok']             = '%d användare raderade';
@@ -58,3 +63,11 @@ $lang['add_ok']                = 'Användaren tillagd';
 $lang['add_fail']              = 'Användare kunde inte läggas till';
 $lang['notify_ok']             = 'E-postmeddelande skickat';
 $lang['notify_fail']           = 'E-postmeddelande kunde inte skickas';
+$lang['import_success_count']  = 'Användar-import: %d användare funna, %d importerade framgångsrikt.';
+$lang['import_failure_count']  = 'Användar-import: %d misslyckades. Misslyckandena listas nedan.';
+$lang['import_error_baduserid'] = 'Användar-id saknas';
+$lang['import_error_badname']  = 'Felaktigt namn';
+$lang['import_error_badmail']  = 'Felaktig e-postadress';
+$lang['import_error_upload']   = 'Import misslyckades. Csv-filen kunde inte laddas upp eller är tom.';
+$lang['import_error_readfail'] = 'Import misslyckades. Den uppladdade filen gick inte att läsa.';
+$lang['import_error_create']   = 'Misslyckades att skapa användaren.';
-- 
cgit v1.2.3


From 024914eb509865786ac98b9999cffacb1ebeaeb6 Mon Sep 17 00:00:00 2001
From: Pavel <ivanovtsk@mail.ru>
Date: Mon, 5 Aug 2013 07:55:56 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ru/lang.php           |  4 ++--
 lib/plugins/authmysql/lang/ru/settings.php |  5 +++--
 lib/plugins/plugin/lang/ru/lang.php        |  4 ++--
 lib/plugins/popularity/lang/ru/lang.php    |  5 +++--
 lib/plugins/revert/lang/ru/lang.php        |  4 +++-
 lib/plugins/usermanager/lang/ru/import.txt |  9 +++++++++
 lib/plugins/usermanager/lang/ru/lang.php   | 20 ++++++++++++++++++--
 7 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 lib/plugins/usermanager/lang/ru/import.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index 2501c00e2..f042ab724 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Russian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Denis Simakov <akinoame1@gmail.com>
  * @author Змей Этерийский evil_snake@eternion.ru
  * @author Hikaru Nakajima <jisatsu@mail.ru>
diff --git a/lib/plugins/authmysql/lang/ru/settings.php b/lib/plugins/authmysql/lang/ru/settings.php
index 066598331..23fd349af 100644
--- a/lib/plugins/authmysql/lang/ru/settings.php
+++ b/lib/plugins/authmysql/lang/ru/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  */
 $lang['server']                = 'Ваш MySQL-сервер';
diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php
index 7b9579e96..fb53c321f 100644
--- a/lib/plugins/plugin/lang/ru/lang.php
+++ b/lib/plugins/plugin/lang/ru/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * russian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Denis Simakov <akinoame1@gmail.com>
  * @author Andrew Pleshakov <beotiger@mail.ru>
  * @author Змей Этерийский evil_snake@eternion.ru
diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php
index a7f33156f..9c03ccda6 100644
--- a/lib/plugins/popularity/lang/ru/lang.php
+++ b/lib/plugins/popularity/lang/ru/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Змей Этерийский evil_snake@eternion.ru
  * @author Hikaru Nakajima <jisatsu@mail.ru>
  * @author Alexei Tereschenko <alexeitlex@yahoo.com>
diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php
index 817bd1064..defd86de0 100644
--- a/lib/plugins/revert/lang/ru/lang.php
+++ b/lib/plugins/revert/lang/ru/lang.php
@@ -1,6 +1,8 @@
 <?php
+
 /**
- * russian language file
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Denis Simakov <akinoame1@gmail.com>
  * @author Andrew Pleshakov <beotiger@mail.ru>
  * @author Змей Этерийский evil_snake@eternion.ru
diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt
new file mode 100644
index 000000000..271a9b177
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ru/import.txt
@@ -0,0 +1,9 @@
+===== Импорт нескольких пользователей =====
+
+Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
+Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы.
+Поля CSV должны быть отделены запятой (,) а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание.
+В качестве примера можете взять список пользователей, экспортированный через "Экспорт пользователей".
+Повторяющиеся идентификаторы user-id будут игнорироваться.
+
+Парол доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 29cee6576..f2029e58b 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Russian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Denis Simakov <akinoame1@gmail.com>
  * @author Andrew Pleshakov <beotiger@mail.ru>
  * @author Змей Этерийский evil_snake@eternion.ru
@@ -18,6 +18,7 @@
  * @author Eugene <windy.wanderer@gmail.com>
  * @author Johnny Utah <pcpa@cyberpunk.su>
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Pavel <ivanovtsk@mail.ru>
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
@@ -40,6 +41,11 @@ $lang['search']                = 'Поиск';
 $lang['search_prompt']         = 'Искать';
 $lang['clear']                 = 'Сброс фильтра поиска';
 $lang['filter']                = 'Фильтр';
+$lang['export_all']            = 'Экспорт всех пользователей (CSV)';
+$lang['export_filtered']       = 'Экспорт пользователей с фильтрацией списка (CSV)';
+$lang['import']                = 'Импорт новых пользователей';
+$lang['line']                  = 'Строка №.';
+$lang['error']                 = 'Ошибка';
 $lang['summary']               = 'Показаны пользователи %1$d-%2$d из %3$d найденных. Всего пользователей: %4$d.';
 $lang['nonefound']             = 'Не найдено ни одного пользователя. Всего пользователей: %d.';
 $lang['delete_ok']             = 'Удалено пользователей: %d';
@@ -60,3 +66,13 @@ $lang['add_ok']                = 'Пользователь успешно доб
 $lang['add_fail']              = 'Не удалось добавить пользователя';
 $lang['notify_ok']             = 'Письмо с уведомлением отправлено';
 $lang['notify_fail']           = 'Не удалось отправить письмо с уведомлением';
+$lang['import_success_count']  = 'Импорт пользователей: %d пользователей найдено, %d импортировано успешно.';
+$lang['import_failure_count']  = 'Импорт пользователей: %d не удалось. Список ошибок прочтите ниже.';
+$lang['import_error_fields']   = 'Не все поля заполнены. Найдено %d, а нужно 4.';
+$lang['import_error_baduserid'] = 'Отсутствует идентификатор пользователя';
+$lang['import_error_badname']  = 'Имя не годится';
+$lang['import_error_badmail']  = 'Адрес электронной почты не годится';
+$lang['import_error_upload']   = 'Импорт не удался. CSV файл не загружен или пуст.';
+$lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.';
+$lang['import_error_create']   = 'Невозможно создать пользователя';
+$lang['import_notify_fail']    = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.';
-- 
cgit v1.2.3


From 544130397f3b68808f74d98f8681a07448c25899 Mon Sep 17 00:00:00 2001
From: tsangho <ou4222@gmail.com>
Date: Mon, 5 Aug 2013 20:15:57 +0200
Subject: translation update

---
 lib/plugins/acl/lang/zh-tw/lang.php           | 4 ++--
 lib/plugins/authad/lang/zh-tw/settings.php    | 5 +++--
 lib/plugins/authldap/lang/zh-tw/settings.php  | 5 +++--
 lib/plugins/authmysql/lang/zh-tw/settings.php | 5 +++--
 lib/plugins/authpgsql/lang/zh-tw/settings.php | 5 +++--
 lib/plugins/plugin/lang/zh-tw/lang.php        | 5 +++--
 lib/plugins/popularity/lang/zh-tw/lang.php    | 5 +++--
 lib/plugins/revert/lang/zh-tw/lang.php        | 5 +++--
 lib/plugins/usermanager/lang/zh-tw/lang.php   | 9 +++++++--
 9 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php
index ff2c6a184..a56435318 100644
--- a/lib/plugins/acl/lang/zh-tw/lang.php
+++ b/lib/plugins/acl/lang/zh-tw/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Chinese(Traditional) language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author chinsan <chinsan@mail2000.com.tw>
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php
index c46e5f96f..bd5d9413a 100644
--- a/lib/plugins/authad/lang/zh-tw/settings.php
+++ b/lib/plugins/authad/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['account_suffix']        = '您的帳號後綴。如： <code>@my.domain.org</code>';
diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index e93190516..d2513eeff 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 LDAP 伺服器。填寫主機名稱 (<code>localhost</code>) 或完整的 URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authmysql/lang/zh-tw/settings.php b/lib/plugins/authmysql/lang/zh-tw/settings.php
index 95d068150..3fbee151c 100644
--- a/lib/plugins/authmysql/lang/zh-tw/settings.php
+++ b/lib/plugins/authmysql/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 MySQL 伺服器';
diff --git a/lib/plugins/authpgsql/lang/zh-tw/settings.php b/lib/plugins/authpgsql/lang/zh-tw/settings.php
index 6a04214ad..b7dd9c6d8 100644
--- a/lib/plugins/authpgsql/lang/zh-tw/settings.php
+++ b/lib/plugins/authpgsql/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 PostgreSQL 伺服器';
diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php
index 56149e79e..bc84059fd 100644
--- a/lib/plugins/plugin/lang/zh-tw/lang.php
+++ b/lib/plugins/plugin/lang/zh-tw/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php
index b34efe995..252c606a9 100644
--- a/lib/plugins/popularity/lang/zh-tw/lang.php
+++ b/lib/plugins/popularity/lang/zh-tw/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
diff --git a/lib/plugins/revert/lang/zh-tw/lang.php b/lib/plugins/revert/lang/zh-tw/lang.php
index 88a77f7a1..4ff1d102a 100644
--- a/lib/plugins/revert/lang/zh-tw/lang.php
+++ b/lib/plugins/revert/lang/zh-tw/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index 980d974cc..c7126bd1a 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * English language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author chinsan <chinsan.tw@gmail.com>
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
@@ -12,6 +13,7 @@
  * @author Shuo-Ting Jian <shoting@gmail.com>
  * @author syaoranhinata@gmail.com
  * @author Ichirou Uchiki <syaoranhinata@gmail.com>
+ * @author tsangho <ou4222@gmail.com>
  */
 $lang['menu']                  = '帳號管理器';
 $lang['noauth']                = '(帳號認證尚未開放)';
@@ -34,6 +36,8 @@ $lang['search']                = '搜尋';
 $lang['search_prompt']         = '開始搜尋';
 $lang['clear']                 = '重設篩選條件';
 $lang['filter']                = '篩選條件 (Filter)';
+$lang['import']                = '匯入新的用戶';
+$lang['error']                 = '錯誤訊息';
 $lang['summary']               = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。';
 $lang['nonefound']             = '找不到帳號。共有 %d 個帳號。';
 $lang['delete_ok']             = '已刪除 %d 個帳號';
@@ -54,3 +58,4 @@ $lang['add_ok']                = '已新增使用者';
 $lang['add_fail']              = '無法新增使用者';
 $lang['notify_ok']             = '通知信已寄出';
 $lang['notify_fail']           = '通知信無法寄出';
+$lang['import_error_readfail'] = '會入錯誤，無法讀取已經上傳的檔案';
-- 
cgit v1.2.3


From f829a311ed69ff8e4de0673517ca191be36dab4a Mon Sep 17 00:00:00 2001
From: Edmondo Di Tucci <snarchio@gmail.com>
Date: Mon, 5 Aug 2013 21:26:34 +0200
Subject: translation update

---
 lib/plugins/acl/lang/it/lang.php         | 4 ++--
 lib/plugins/authad/lang/it/settings.php  | 9 +++++++--
 lib/plugins/plugin/lang/it/lang.php      | 4 ++--
 lib/plugins/popularity/lang/it/lang.php  | 5 +++--
 lib/plugins/revert/lang/it/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/it/lang.php | 5 +++--
 6 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php
index 07e86697d..ba2d0fd32 100644
--- a/lib/plugins/acl/lang/it/lang.php
+++ b/lib/plugins/acl/lang/it/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Italian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Giorgio Vecchiocattivi <giorgio@vecchio.it>
  * @author Roberto Bolli <http://www.rbnet.it/>
  * @author Pietro Battiston toobaz@email.it
diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php
index 10ae72f87..48276af19 100644
--- a/lib/plugins/authad/lang/it/settings.php
+++ b/lib/plugins/authad/lang/it/settings.php
@@ -1,5 +1,10 @@
 <?php
+
 /**
- * Italian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Edmondo Di Tucci <snarchio@gmail.com>
  */
+$lang['domain_controllers']    = 'Elenco separato da virgole di Domain Controllers. Eg. <code>srv1.domain.org,srv2.domain.org</code>';
+$lang['admin_username']        = 'Utente privilegiato di Active Directory con accesso ai dati di tutti gli utenti. Opzionale ma necessario per alcune attività come mandare email di iscrizione.';
+$lang['admin_password']        = 'La password dell\'utente soprascritto.';
diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php
index 9ae55c5de..186bf976e 100644
--- a/lib/plugins/plugin/lang/it/lang.php
+++ b/lib/plugins/plugin/lang/it/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Italian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Christopher Smith <chris@jalakai.co.uk>
  * @author Silvia Sargentoni <polinnia@tin.it>
  * @author Pietro Battiston toobaz@email.it
diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php
index a0cf274aa..9edefba84 100644
--- a/lib/plugins/popularity/lang/it/lang.php
+++ b/lib/plugins/popularity/lang/it/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Italian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Diego Pierotto ita.translations@tiscali.it
  * @author ita.translations@tiscali.it
  * @author Lorenzo Breda <lbreda@gmail.com>
diff --git a/lib/plugins/revert/lang/it/lang.php b/lib/plugins/revert/lang/it/lang.php
index 9c092de99..d2f7b6d6a 100644
--- a/lib/plugins/revert/lang/it/lang.php
+++ b/lib/plugins/revert/lang/it/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Italian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Pietro Battiston toobaz@email.it
  * @author Diego Pierotto ita.translations@tiscali.it
  * @author ita.translations@tiscali.it
diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php
index 0222ff1e4..dfacc6545 100644
--- a/lib/plugins/usermanager/lang/it/lang.php
+++ b/lib/plugins/usermanager/lang/it/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Italian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Chris Smith <chris@jalakai.co.uk>
  * @author Silvia Sargentoni <polinnia@tin.it>
  * @author Pietro Battiston toobaz@email.it
-- 
cgit v1.2.3


From 7e45525650fd98a7cfd14c3484eb5add715c24a5 Mon Sep 17 00:00:00 2001
From: Rachel <rzhang0802@gmail.com>
Date: Tue, 6 Aug 2013 09:11:09 +0200
Subject: translation update

---
 lib/plugins/acl/lang/zh/lang.php           |  4 ++--
 lib/plugins/authad/lang/zh/settings.php    |  5 +++--
 lib/plugins/authldap/lang/zh/settings.php  |  5 +++--
 lib/plugins/authmysql/lang/zh/settings.php |  5 +++--
 lib/plugins/authpgsql/lang/zh/settings.php |  5 +++--
 lib/plugins/plugin/lang/zh/lang.php        |  4 ++--
 lib/plugins/popularity/lang/zh/lang.php    |  5 +++--
 lib/plugins/revert/lang/zh/lang.php        |  4 ++--
 lib/plugins/usermanager/lang/zh/lang.php   | 13 +++++++++++--
 9 files changed, 32 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php
index 983882eaf..029446cca 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/lang/zh/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Chinese(Simplified) language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php
index 0ad8d4e4f..84bdc1e5c 100644
--- a/lib/plugins/authad/lang/zh/settings.php
+++ b/lib/plugins/authad/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['account_suffix']        = '您的账户后缀。例如 <code>@my.domain.org</code>';
diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index 3f38deae9..b531c192a 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 LDAP 服务器。填写主机名 (<code>localhost</code>) 或者完整的 URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authmysql/lang/zh/settings.php b/lib/plugins/authmysql/lang/zh/settings.php
index 772f75ecd..b58159e85 100644
--- a/lib/plugins/authmysql/lang/zh/settings.php
+++ b/lib/plugins/authmysql/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 MySQL 服务器';
diff --git a/lib/plugins/authpgsql/lang/zh/settings.php b/lib/plugins/authpgsql/lang/zh/settings.php
index dc7223d89..32adb37d9 100644
--- a/lib/plugins/authpgsql/lang/zh/settings.php
+++ b/lib/plugins/authpgsql/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 PostgreSQL 服务器';
diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php
index 473d31ead..f69410503 100644
--- a/lib/plugins/plugin/lang/zh/lang.php
+++ b/lib/plugins/plugin/lang/zh/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * english language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php
index 9c916c2a5..532abb890 100644
--- a/lib/plugins/popularity/lang/zh/lang.php
+++ b/lib/plugins/popularity/lang/zh/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php
index d4d010f29..44a72f54b 100644
--- a/lib/plugins/revert/lang/zh/lang.php
+++ b/lib/plugins/revert/lang/zh/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Chinese(Simplified) language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index e7a228229..2674983b2 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * English language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
@@ -14,6 +15,7 @@
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author Rachel <rzhang0802@gmail.com>
  */
 $lang['menu']                  = '用户管理器';
 $lang['noauth']                = '（用户认证不可用）';
@@ -36,6 +38,9 @@ $lang['search']                = '搜索';
 $lang['search_prompt']         = '进行搜索';
 $lang['clear']                 = '重置搜索过滤器';
 $lang['filter']                = '过滤器';
+$lang['import']                = '请输入新用户名';
+$lang['line']                  = '行号';
+$lang['error']                 = '信息错误';
 $lang['summary']               = '找到 %3$d 名用户，显示其中第 %1$d 至 %2$d 位用户。数据库中共有 %4$d 名用户。';
 $lang['nonefound']             = '没有找到用户。数据库中共有 %d 名用户。';
 $lang['delete_ok']             = '用户 %d 已删除';
@@ -56,3 +61,7 @@ $lang['add_ok']                = '用户添加成功';
 $lang['add_fail']              = '用户添加失败';
 $lang['notify_ok']             = '通知邮件已发送';
 $lang['notify_fail']           = '通知邮件无法发送';
+$lang['import_error_baduserid'] = '用户ID丢失';
+$lang['import_error_badname']  = '名称错误';
+$lang['import_error_badmail']  = '邮件地址错误';
+$lang['import_error_create']   = '不能创建新用户';
-- 
cgit v1.2.3


From 557c665527de33680cac0b4f8d3af7952d51cec5 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 6 Aug 2013 10:36:50 +0100
Subject: changed style of `<file>` slightly to help tell it apart from
 `<code>`

For Ingo from the LinuxHotel
---
 lib/tpl/dokuwiki/css/content.less | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index 56551fe3b..a5ffbf2be 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -113,10 +113,6 @@
     text-decoration: underline;
 }
 
-/* for code in <file> */
-.dokuwiki pre.file {
-}
-
 /* filenames for downloadable file and code blocks */
 .dokuwiki dl.code,
 .dokuwiki dl.file {
@@ -163,6 +159,17 @@
     }
 }
 
+/* for code in <file> */
+.dokuwiki dl.file {
+    pre,
+    dt {
+        border-style: dashed;
+    }
+    dt {
+        border-bottom-style: solid;
+    }
+}
+
 /*____________ JS popup ____________*/
 
 .JSpopup {
-- 
cgit v1.2.3


From 9646a812f0f8451f1931e0fb702576c94560475e Mon Sep 17 00:00:00 2001
From: Edmondo Di Tucci <snarchio@gmail.com>
Date: Thu, 8 Aug 2013 15:10:56 +0200
Subject: translation update

---
 lib/plugins/authad/lang/it/settings.php   |  8 ++++++++
 lib/plugins/authldap/lang/it/settings.php | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php
index 48276af19..2d68dad68 100644
--- a/lib/plugins/authad/lang/it/settings.php
+++ b/lib/plugins/authad/lang/it/settings.php
@@ -5,6 +5,14 @@
  * 
  * @author Edmondo Di Tucci <snarchio@gmail.com>
  */
+$lang['account_suffix']        = 'Il suffisso del tuo account. Eg. <code>@my.domain.org</code>';
+$lang['base_dn']               = 'Il tuo DN. base Eg. <code>DC=my,DC=domain,DC=org</code>';
 $lang['domain_controllers']    = 'Elenco separato da virgole di Domain Controllers. Eg. <code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_username']        = 'Utente privilegiato di Active Directory con accesso ai dati di tutti gli utenti. Opzionale ma necessario per alcune attività come mandare email di iscrizione.';
 $lang['admin_password']        = 'La password dell\'utente soprascritto.';
+$lang['sso']                   = 'Deve essere usato Single-Sign-On via Kerberos oppure NTLM?';
+$lang['use_ssl']               = 'Usare la connessione SSL? Se usata, non abilitare TSL qui sotto.';
+$lang['use_tls']               = 'Usare la connessione TSL? Se usata, non abilitare SSL qui sopra.';
+$lang['debug']                 = 'Visualizzare output addizionale di debug per gli errori?';
+$lang['expirywarn']            = 'Giorni di preavviso per la scadenza della password dell\'utente. 0 per disabilitare.';
+$lang['additional']            = 'Valori separati da virgola di attributi AD addizionali da caricare dai dati utente. Usato da alcuni plugin.';
diff --git a/lib/plugins/authldap/lang/it/settings.php b/lib/plugins/authldap/lang/it/settings.php
index 10ae72f87..023159489 100644
--- a/lib/plugins/authldap/lang/it/settings.php
+++ b/lib/plugins/authldap/lang/it/settings.php
@@ -1,5 +1,15 @@
 <?php
+
 /**
- * Italian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Edmondo Di Tucci <snarchio@gmail.com>
  */
+$lang['server']                = 'Il tuo server LDAP. Inserire o l\'hostname (<code>localhost</code>) oppure un URL completo (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'Porta del server LDAP se non è stato fornito un URL completo più sopra.';
+$lang['usertree']              = 'Dove cercare l\'account utente. Eg. <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Dove cercare i gruppi utente. Eg. <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'Filtro per cercare l\'account utente LDAP. Eg. <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filtro per cercare i gruppi LDAP. Eg. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Versione protocollo da usare. Pu<code>3</code>';
+$lang['starttls']              = 'Usare la connessione TSL?';
-- 
cgit v1.2.3


From 5071f4ad75abec3609506f2363873f95ca71d111 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Thu, 8 Aug 2013 16:51:03 +0100
Subject: Revert "add html5 attributes to email fields of the config manager"

This reverts commit 0d21c87f31bb8931973f720c04346bf5f8612470.
---
 lib/plugins/config/settings/config.class.php | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 6d582ad30..6de560128 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -728,29 +728,6 @@ if (!class_exists('setting_email')) {
         $this->_local = $input;
         return true;
     }
-    function html(&$plugin, $echo=false) {
-        $value = '';
-        $disable = '';
-
-        if ($this->is_protected()) {
-          $value = $this->_protected;
-          $disable = 'disabled="disabled"';
-        } else {
-          if ($echo && $this->_error) {
-            $value = $this->_input;
-          } else {
-            $value = is_null($this->_local) ? $this->_default : $this->_local;
-          }
-        }
-
-        $multiple = $this->_multiple ? 'multiple="multiple"' : '';
-        $key = htmlspecialchars($this->_key);
-        $value = htmlspecialchars($value);
-
-        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
-        $input = '<input id="config___'.$key.'" name="config['.$key.']" type="email" class="edit" value="'.$value.'" '.$multiple.' '.$disable.'/>';
-        return array($label,$input);
-    }
   }
 }
 
-- 
cgit v1.2.3


From dba5f66fc1f3f8bd61cdda736dd1a2d00b628164 Mon Sep 17 00:00:00 2001
From: Emmanuel <seedfloyd@gmail.com>
Date: Thu, 8 Aug 2013 20:15:57 +0200
Subject: translation update

---
 lib/plugins/acl/lang/fr/lang.php           | 4 ++--
 lib/plugins/authad/lang/fr/settings.php    | 5 +++--
 lib/plugins/authldap/lang/fr/settings.php  | 5 +++--
 lib/plugins/authmysql/lang/fr/settings.php | 5 +++--
 lib/plugins/authpgsql/lang/fr/settings.php | 5 +++--
 lib/plugins/plugin/lang/fr/lang.php        | 4 ++--
 lib/plugins/popularity/lang/fr/lang.php    | 5 +++--
 lib/plugins/revert/lang/fr/lang.php        | 4 +++-
 lib/plugins/usermanager/lang/fr/lang.php   | 5 +++--
 9 files changed, 25 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index 538dd14d3..dc17cf79e 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * french language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Sébastien Bauer <sebastien.bauer@advalvas.be>
  * @author Antoine Fixary <antoine.fixary@freesbee.fr>
  * @author cumulus <pta-n56@myamail.com>
diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php
index 5480a3d44..d05390efc 100644
--- a/lib/plugins/authad/lang/fr/settings.php
+++ b/lib/plugins/authad/lang/fr/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $lang['account_suffix']        = 'Le suffixe de votre compte. Ex.: <code>@mon.domaine.org</code>';
diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php
index 3df09eb7c..607eed24d 100644
--- a/lib/plugins/authldap/lang/fr/settings.php
+++ b/lib/plugins/authldap/lang/fr/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $lang['server']                = 'Votre serveur LDAP. Soit le nom d\'hôte (<code>localhost</code>) ou l\'URL complète (<code>ldap://serveur.dom:389</code>)';
diff --git a/lib/plugins/authmysql/lang/fr/settings.php b/lib/plugins/authmysql/lang/fr/settings.php
index dfb79b545..d69c8d41c 100644
--- a/lib/plugins/authmysql/lang/fr/settings.php
+++ b/lib/plugins/authmysql/lang/fr/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $lang['server']                = 'Votre serveur MySQL';
diff --git a/lib/plugins/authpgsql/lang/fr/settings.php b/lib/plugins/authpgsql/lang/fr/settings.php
index ec425bd49..9e471075a 100644
--- a/lib/plugins/authpgsql/lang/fr/settings.php
+++ b/lib/plugins/authpgsql/lang/fr/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $lang['server']                = 'Votre serveur PostgreSQL';
diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php
index 2926225ed..0592f3c7d 100644
--- a/lib/plugins/plugin/lang/fr/lang.php
+++ b/lib/plugins/plugin/lang/fr/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * french language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Guy Brand <gb@unistra.fr>
  * @author Delassaux Julien <julien@delassaux.fr>
  * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php
index b7e053197..7603b2a08 100644
--- a/lib/plugins/popularity/lang/fr/lang.php
+++ b/lib/plugins/popularity/lang/fr/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Guy Brand <gb@unistra.fr>
  * @author stephane.gully@gmail.com
  * @author Guillaume Turri <guillaume.turri@gmail.com>
diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php
index a063c8996..4ba6c19a7 100644
--- a/lib/plugins/revert/lang/fr/lang.php
+++ b/lib/plugins/revert/lang/fr/lang.php
@@ -1,6 +1,8 @@
 <?php
+
 /**
- * french language file
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Delassaux Julien <julien@delassaux.fr>
  * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
  * @author Guy Brand <gb@unistra.fr>
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 40e878bbb..2ff1bd7a0 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * french language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Guy Brand <gb@unistra.fr>
  * @author Delassaux Julien <julien@delassaux.fr>
  * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
-- 
cgit v1.2.3


From 931cef44059fa4b9a596d9247048388310313009 Mon Sep 17 00:00:00 2001
From: Egor Smkv <egorsmkv@gmail.com>
Date: Thu, 8 Aug 2013 20:20:53 +0200
Subject: translation update

---
 lib/plugins/acl/lang/uk/lang.php         | 4 ++--
 lib/plugins/plugin/lang/uk/lang.php      | 4 ++--
 lib/plugins/popularity/lang/uk/lang.php  | 5 +++--
 lib/plugins/revert/lang/uk/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/uk/lang.php | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/uk/lang.php b/lib/plugins/acl/lang/uk/lang.php
index 99b4b2623..97c66d8a2 100644
--- a/lib/plugins/acl/lang/uk/lang.php
+++ b/lib/plugins/acl/lang/uk/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * ukrainian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Oleksiy Voronin <ovoronin@gmail.com>
  * @author serg_stetsuk@ukr.net
  * @author okunia@gmail.com
diff --git a/lib/plugins/plugin/lang/uk/lang.php b/lib/plugins/plugin/lang/uk/lang.php
index 036900f4e..c6d5990fc 100644
--- a/lib/plugins/plugin/lang/uk/lang.php
+++ b/lib/plugins/plugin/lang/uk/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * ukrainian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Oleksiy Voronin (ovoronin@gmail.com)
  * @author serg_stetsuk@ukr.net
  * @author okunia@gmail.com
diff --git a/lib/plugins/popularity/lang/uk/lang.php b/lib/plugins/popularity/lang/uk/lang.php
index 584641482..9d67c1151 100644
--- a/lib/plugins/popularity/lang/uk/lang.php
+++ b/lib/plugins/popularity/lang/uk/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Ukrainian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author serg_stetsuk@ukr.net
  * @author okunia@gmail.com
  * @author Oleksandr Kunytsia <okunia@gmail.com>
diff --git a/lib/plugins/revert/lang/uk/lang.php b/lib/plugins/revert/lang/uk/lang.php
index 310f8e8da..2c9774f0c 100644
--- a/lib/plugins/revert/lang/uk/lang.php
+++ b/lib/plugins/revert/lang/uk/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Ukrainian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author serg_stetsuk@ukr.net
  * @author okunia@gmail.com
  * @author Oleksandr Kunytsia <okunia@gmail.com>
diff --git a/lib/plugins/usermanager/lang/uk/lang.php b/lib/plugins/usermanager/lang/uk/lang.php
index 027c94b44..3afb7b7d6 100644
--- a/lib/plugins/usermanager/lang/uk/lang.php
+++ b/lib/plugins/usermanager/lang/uk/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * ukrainian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Oleksiy Voronin <ovoronin@gmail.com>
  * @author serg_stetsuk@ukr.net
  * @author okunia@gmail.com
-- 
cgit v1.2.3


From f4399459c78289d4e4d41039094596cd4fff893a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 10 Aug 2013 13:25:58 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/nl/settings.php  |  6 ++++++
 lib/plugins/usermanager/lang/nl/import.txt |  8 ++++++++
 lib/plugins/usermanager/lang/nl/lang.php   | 16 ++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/nl/import.txt

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index 958bd4d6f..b6eed6f38 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -3,6 +3,7 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
+ * @author Gerrit Uitslag <klapinklapin@gmail.com>
  */
 $lang['server']                = 'Je LDAP server. Ofwel servernaam (<code>localhost</code>) of volledige URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'LDAP server poort als hiervoor geen volledige URL is opgegeven';
@@ -13,9 +14,14 @@ $lang['groupfilter']           = 'LDAP groepsfilter. Bijv. <code>(&(objectCl
 $lang['version']               = 'Te gebruiken protocolversie. Je zou het moeten kunnen instellen op <code>3</code>';
 $lang['starttls']              = 'Gebruiken TLS verbindingen';
 $lang['referrals']             = 'Moeten verwijzingen worden gevolg';
+$lang['deref']                 = 'Hoe moeten de verwijzing van aliases worden bepaald?';
 $lang['binddn']                = 'DN van een optionele bind gebruiker als anonieme bind niet genoeg is. Bijv. <code>cn=beheer, dc=mijn, dc=thuis</code>';
 $lang['bindpw']                = 'Wachtwoord van bovenstaande gebruiker';
 $lang['userscope']             = 'Beperken scope van zoekfuncties voor gebruikers';
 $lang['groupscope']            = 'Beperken scope van zoekfuncties voor groepen';
 $lang['groupkey']              = 'Groepslidmaatschap van enig gebruikersattribuut (in plaats van standaard AD groepen), bijv. groep van afdeling of telefoonnummer';
 $lang['debug']                 = 'Tonen van aanvullende debuginformatie bij fouten';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/usermanager/lang/nl/import.txt b/lib/plugins/usermanager/lang/nl/import.txt
new file mode 100644
index 000000000..69d2c2306
--- /dev/null
+++ b/lib/plugins/usermanager/lang/nl/import.txt
@@ -0,0 +1,8 @@
+===== Massa-import van gebruikers =====
+
+Hiervoor is een CSV-bestand nodig van de gebruikers met minstens vier kolommen. De kolommen moeten bevatten, in deze volgorde: gebruikers-id, complete naam, e-mailadres en groepen.
+Het CSV-velden moeten worden gescheiden met komma's (,) en de teksten moeten worden omringt met dubbele aanhalingstekens (""). Backslash (\) kan worden gebruikt om te escapen.
+Voor een voorbeeld van een werkend bestand, probeer de "Exporteer Gebruikers" functie hierboven.
+Dubbele gebruikers-id's zullen worden genegeerd.
+
+Een wachtwoord zal worden gegenereerd en gemaild naar elke gebruiker die succesvol is geïmporteerd.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index e1bf126fb..7be10c16a 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -15,6 +15,7 @@
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
  * @author Gerrit <klapinklapin@gmail.com>
+ * @author Gerrit Uitslag <klapinklapin@gmail.com>
  */
 $lang['menu']                  = 'Gebruikersmanager';
 $lang['noauth']                = '(gebruikersauthenticatie niet beschikbaar)';
@@ -37,6 +38,11 @@ $lang['search']                = 'Zoek';
 $lang['search_prompt']         = 'Voer zoekopdracht uit';
 $lang['clear']                 = 'Verwijder zoekfilter';
 $lang['filter']                = 'Filter';
+$lang['export_all']            = 'Exporteer Alle Gebruikers (CSV)';
+$lang['export_filtered']       = 'Exporteer de lijst van Gefilterde Gebruikers (CSV)';
+$lang['import']                = 'Importeer Nieuwe Gebruikers';
+$lang['line']                  = 'Regelnummer';
+$lang['error']                 = 'Foutmelding';
 $lang['summary']               = 'Weergegeven gebruikers %1$d-%2$d van %3$d gevonden. %4$d gebruikers in totaal.';
 $lang['nonefound']             = 'Geen gebruikers gevonden. %d gebruikers in totaal.';
 $lang['delete_ok']             = '%d gebruikers verwijderd';
@@ -57,3 +63,13 @@ $lang['add_ok']                = 'Gebruiker succesvol toegevoegd';
 $lang['add_fail']              = 'Gebruiker kon niet worden toegevoegd';
 $lang['notify_ok']             = 'Notificatie-e-mail verzonden';
 $lang['notify_fail']           = 'Notificatie-e-mail kon niet worden verzonden';
+$lang['import_success_count']  = 'Gebruikers importeren: %d gebruikers gevonden, %d geïmporteerd';
+$lang['import_failure_count']  = 'Gebruikers importeren: %d mislukt. Fouten zijn hieronder weergegeven.';
+$lang['import_error_fields']   = 'Onvoldoende velden, gevonden %d, nodig 4.';
+$lang['import_error_baduserid'] = 'Gebruikers-id mist';
+$lang['import_error_badname']  = 'Verkeerde naam';
+$lang['import_error_badmail']  = 'Verkeerd e-mailadres';
+$lang['import_error_upload']   = 'Importeren mislukt. Het CSV bestand kon niet worden geüpload of is leeg.';
+$lang['import_error_readfail'] = 'Importeren mislukt. Lezen van het geüploade bestand is mislukt.';
+$lang['import_error_create']   = 'Aanmaken van de gebruiker was niet mogelijk.';
+$lang['import_notify_fail']    = 'Notificatiebericht kon niet naar de geïmporteerde gebruiker worden verstuurd, %s met e-mail %s.';
-- 
cgit v1.2.3


From 1306d063bc48af5df32e884a0a166dc34376b5b3 Mon Sep 17 00:00:00 2001
From: r0sk <r0sk10@gmail.com>
Date: Sun, 11 Aug 2013 04:15:54 +0200
Subject: translation update

---
 lib/plugins/acl/lang/es/lang.php         | 4 ++--
 lib/plugins/plugin/lang/es/lang.php      | 4 ++--
 lib/plugins/popularity/lang/es/lang.php  | 5 +++--
 lib/plugins/revert/lang/es/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/es/lang.php | 5 +++--
 5 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index b60033e0f..cf503d4d1 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Spanish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Miguel Pagano <miguel.pagano@gmail.com>
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php
index ded7d7369..0ec39285b 100644
--- a/lib/plugins/plugin/lang/es/lang.php
+++ b/lib/plugins/plugin/lang/es/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * spanish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Miguel Pagano <miguel.pagano@gmail.com>
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index e46735782..337a8ea3a 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Spanish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author oliver@samera.com.py
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Manuel Meco <manuel.meco@gmail.com>
diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php
index 129d71574..599ffe021 100644
--- a/lib/plugins/revert/lang/es/lang.php
+++ b/lib/plugins/revert/lang/es/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Spanish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
  * @author oliver@samera.com.py
diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index 521191701..26e4200e4 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Spanish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Miguel Pagano <miguel.pagano>
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
-- 
cgit v1.2.3


From fe37a6515e213f6a0f1302a5a0807033205ffee5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 12:28:16 +0200
Subject: improved bundled plugin descriptions

---
 lib/plugins/authad/plugin.info.txt      | 4 ++--
 lib/plugins/authldap/plugin.info.txt    | 4 ++--
 lib/plugins/authmysql/plugin.info.txt   | 4 ++--
 lib/plugins/authpgsql/plugin.info.txt   | 4 ++--
 lib/plugins/authplain/plugin.info.txt   | 4 ++--
 lib/plugins/popularity/plugin.info.txt  | 2 +-
 lib/plugins/revert/plugin.info.txt      | 2 +-
 lib/plugins/usermanager/plugin.info.txt | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt
index 996813bc5..3af1ddfbe 100644
--- a/lib/plugins/authad/plugin.info.txt
+++ b/lib/plugins/authad/plugin.info.txt
@@ -2,6 +2,6 @@ base   authad
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2013-04-25
-name   Active Directory auth plugin
-desc   Provides authentication against a Microsoft Active Directory
+name   Active Directory Auth Plugin
+desc   Provides user authentication against a Microsoft Active Directory
 url    http://www.dokuwiki.org/plugin:authad
diff --git a/lib/plugins/authldap/plugin.info.txt b/lib/plugins/authldap/plugin.info.txt
index 94809a75b..0d0b13f65 100644
--- a/lib/plugins/authldap/plugin.info.txt
+++ b/lib/plugins/authldap/plugin.info.txt
@@ -2,6 +2,6 @@ base   authldap
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2013-04-19
-name   ldap auth plugin
-desc   Provides authentication against am LDAP server
+name   LDAP Auth Plugin
+desc   Provides user authentication against an LDAP server
 url    http://www.dokuwiki.org/plugin:authldap
diff --git a/lib/plugins/authmysql/plugin.info.txt b/lib/plugins/authmysql/plugin.info.txt
index 16fe27e74..3e889d11e 100644
--- a/lib/plugins/authmysql/plugin.info.txt
+++ b/lib/plugins/authmysql/plugin.info.txt
@@ -2,6 +2,6 @@ base   authmysql
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2013-02-16
-name   mysql auth plugin
-desc   Provides authentication against a MySQL Server
+name   MYSQL Auth Plugin
+desc   Provides user authentication against a MySQL database
 url    http://www.dokuwiki.org/plugin:authmysql
diff --git a/lib/plugins/authpgsql/plugin.info.txt b/lib/plugins/authpgsql/plugin.info.txt
index af33cec3e..aecab914e 100644
--- a/lib/plugins/authpgsql/plugin.info.txt
+++ b/lib/plugins/authpgsql/plugin.info.txt
@@ -2,6 +2,6 @@ base   authpgsql
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2013-02-16
-name   PostgreSQL auth plugin
-desc   Provides authentication against a PostgreSQL database
+name   PostgreSQL Auth Plugin
+desc   Provides user authentication against a PostgreSQL database
 url    http://www.dokuwiki.org/plugin:authpgsql
diff --git a/lib/plugins/authplain/plugin.info.txt b/lib/plugins/authplain/plugin.info.txt
index 8d9d3a82d..b63ee53e4 100644
--- a/lib/plugins/authplain/plugin.info.txt
+++ b/lib/plugins/authplain/plugin.info.txt
@@ -2,6 +2,6 @@ base   authplain
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2012-11-09
-name   auth plugin
-desc   Provides authentication against local password storage
+name   Plain Auth Plugin
+desc   Provides user authentication against DokuWiki's local password storage
 url    http://www.dokuwiki.org/plugin:authplain
diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt
index 17f3110c4..4dc971d3a 100644
--- a/lib/plugins/popularity/plugin.info.txt
+++ b/lib/plugins/popularity/plugin.info.txt
@@ -3,5 +3,5 @@ author  Andreas Gohr
 email   andi@splitbrain.org
 date    2012-11-29
 name    Popularity Feedback Plugin
-desc    Send anonymous data about your wiki to the developers.
+desc    Send anonymous data about your wiki to the DokuWiki developers
 url     http://www.dokuwiki.org/plugin:popularity
diff --git a/lib/plugins/revert/plugin.info.txt b/lib/plugins/revert/plugin.info.txt
index 984a531b3..482b68dc4 100644
--- a/lib/plugins/revert/plugin.info.txt
+++ b/lib/plugins/revert/plugin.info.txt
@@ -3,5 +3,5 @@ author Andreas Gohr
 email  andi@splitbrain.org
 date   2013-03-09
 name   Revert Manager
-desc   Allows you to mass revert recent edits
+desc   Allows you to mass revert recent edits to remove Spam or vandalism
 url    http://dokuwiki.org/plugin:revert
diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt
index 1f8c2282b..315459122 100644
--- a/lib/plugins/usermanager/plugin.info.txt
+++ b/lib/plugins/usermanager/plugin.info.txt
@@ -3,5 +3,5 @@ author Chris Smith
 email  chris@jalakai.co.uk
 date   2013-02-20
 name   User Manager
-desc   Manage users
+desc   Manage DokuWiki user accounts
 url    http://dokuwiki.org/plugin:usermanager
-- 
cgit v1.2.3


From 5a8121ba0505fea1c4af1b9dbfcc2cc27e3c7888 Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Sun, 11 Aug 2013 19:40:56 +0200
Subject: translation update

---
 lib/plugins/plugin/lang/ru/lang.php      | 4 ++--
 lib/plugins/popularity/lang/ru/intro.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php
index fb53c321f..47e46c9c7 100644
--- a/lib/plugins/plugin/lang/ru/lang.php
+++ b/lib/plugins/plugin/lang/ru/lang.php
@@ -59,8 +59,8 @@ $lang['error_dircreate']       = 'Не могу создать временну
 $lang['error_decompress']      = 'Менеджеру плагинов не удалось распаковать скачанный файл. Это может быть результатом ошибки при скачивании, в этом случае вы можете попробовать снова, или же плагин упакован неизвестным архиватором, тогда вам необходимо скачать и установить плагин вручную.';
 $lang['error_copy']            = 'Произошла ошибка копирования при попытке установки файлов для плагина <em>%s</em>: переполнение диска или неправильные права доступа. Это могло привести к частичной установке плагина и неустойчивости вашей вики.';
 $lang['error_delete']          = 'Произошла ошибка при попытке удалить плагин <em>%s</em>.  Наиболее вероятно, что нет необходимых прав доступа к файлам или директориям';
-$lang['enabled']               = 'Плагин %s включён.';
+$lang['enabled']               = 'Плагин %s включен.';
 $lang['notenabled']            = 'Не удалось включить плагин %s. Проверьте системные права доступа к файлам.';
-$lang['disabled']              = 'Плагин %s отключён.';
+$lang['disabled']              = 'Плагин %s отключен.';
 $lang['notdisabled']           = 'Не удалось отключить плагин %s. Проверьте системные права доступа к файлам.';
 $lang['packageinstalled']      = 'Пакет (%d плагин(а): %s) успешно установлен.';
diff --git a/lib/plugins/popularity/lang/ru/intro.txt b/lib/plugins/popularity/lang/ru/intro.txt
index e8118e4eb..52f5a0ae2 100644
--- a/lib/plugins/popularity/lang/ru/intro.txt
+++ b/lib/plugins/popularity/lang/ru/intro.txt
@@ -1,6 +1,6 @@
 ====== Сбор информации о популярности ======
 
-Этот инструмент собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «ДокуВики». Эти данные помогут им понять, как именно используется «ДокуВики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям.
+Этот [[doku>popularity|инструмент]] собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «ДокуВики». Эти данные помогут им понять, как именно используется «ДокуВики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям.
 
 Отправляйте данные время от времени для того, чтобы сообщать разработчикам о том, что ваша вики «подросла». Отправленные вами данные будут идентифицированы по анонимному ID.
 
-- 
cgit v1.2.3


From b8e3002b530a50a44dab17129c5e750749a4de62 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 11 Aug 2013 21:35:34 +0100
Subject: removed unintentionally added sidebar classes from detail.php

---
 lib/tpl/dokuwiki/detail.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 7e46231d3..9c04ba8e7 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -28,8 +28,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 
 <body>
     <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
-    <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
-        echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
+    <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?>">
 
         <?php include('tpl_header.php') ?>
 
-- 
cgit v1.2.3


From 9b864f22ffb017242eb721f9b3de4fc1094ba8bc Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Mon, 12 Aug 2013 16:05:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ko/lang.php           |  6 +++---
 lib/plugins/authad/lang/ko/settings.php    |  5 +++--
 lib/plugins/authldap/lang/ko/settings.php  | 13 +++++++------
 lib/plugins/authmysql/lang/ko/settings.php |  5 +++--
 lib/plugins/authpgsql/lang/ko/settings.php |  5 +++--
 lib/plugins/plugin/lang/ko/lang.php        |  6 +++---
 lib/plugins/popularity/lang/ko/lang.php    |  5 +++--
 lib/plugins/revert/lang/ko/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/ko/import.txt |  9 +++++++++
 lib/plugins/usermanager/lang/ko/lang.php   | 20 ++++++++++++++++++--
 10 files changed, 55 insertions(+), 24 deletions(-)
 create mode 100644 lib/plugins/usermanager/lang/ko/import.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 7c1e9a43d..2f1ba2311 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
- * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Anika Henke <anika@selfthinker.org>
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
diff --git a/lib/plugins/authad/lang/ko/settings.php b/lib/plugins/authad/lang/ko/settings.php
index f2bf52681..2914bf47b 100644
--- a/lib/plugins/authad/lang/ko/settings.php
+++ b/lib/plugins/authad/lang/ko/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['account_suffix']        = '계정 접미어. 예를 들어 <code>@my.domain.org</code>';
diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 6200a03b9..898b8f37a 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['server']                = 'LDAP 서버. 호스트 이름(<code>localhost</code>)이나 전체 자격 URL(<code>ldap://server.tld:389</code>) 중 하나';
@@ -20,7 +21,7 @@ $lang['userscope']             = '사용자 찾기에 대한 찾기 범위 제
 $lang['groupscope']            = '그룹 찾기에 대한 찾기 범위 제한';
 $lang['groupkey']              = '(표준 AD 그룹 대신) 사용자 속성에서 그룹 구성원. 예를 들어 부서나 전화에서 그룹';
 $lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이기';
-$lang['deref_o_0']             = 'LDAP_DEREF_NEVER (없음)';
-$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING (검색)';
-$lang['deref_o_2']             = 'LDAP_DEREF_FINDING (발견)';
-$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS (항상)';
+$lang['deref_o_0']             = 'LDAP_DEREF_없음(NEVER)';
+$lang['deref_o_1']             = 'LDAP_DEREF_검색(SEARCHING)';
+$lang['deref_o_2']             = 'LDAP_DEREF_발견(FINDING)';
+$lang['deref_o_3']             = 'LDAP_DEREF_항상(ALWAYS)';
diff --git a/lib/plugins/authmysql/lang/ko/settings.php b/lib/plugins/authmysql/lang/ko/settings.php
index c5518b8cc..2175c1eea 100644
--- a/lib/plugins/authmysql/lang/ko/settings.php
+++ b/lib/plugins/authmysql/lang/ko/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['server']                = 'MySQL 서버';
diff --git a/lib/plugins/authpgsql/lang/ko/settings.php b/lib/plugins/authpgsql/lang/ko/settings.php
index d21e81cd6..bdd8c2718 100644
--- a/lib/plugins/authpgsql/lang/ko/settings.php
+++ b/lib/plugins/authpgsql/lang/ko/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['server']                = 'PostgreSQL 서버';
diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index 4e615b118..f4382dcfe 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
- * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php
index 3463f4f8e..e9bcc7dcc 100644
--- a/lib/plugins/popularity/lang/ko/lang.php
+++ b/lib/plugins/popularity/lang/ko/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index f944361b8..de304da5b 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
diff --git a/lib/plugins/usermanager/lang/ko/import.txt b/lib/plugins/usermanager/lang/ko/import.txt
new file mode 100644
index 000000000..44fe392d0
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ko/import.txt
@@ -0,0 +1,9 @@
+===== 대량 사용자 가져오기 =====
+
+적어도 열 네 개가 있는 사용자의 CSV 파일이 필요합니다.
+열은 다음과 같이 포함해야 합니다: 사용자 id, 실명, 이메일 주소와 그룹.
+CSV 필드는 인용 부호("")로 쉼표(,)와 구분된 문자열로 구분해야 합니다. 백슬래시(\)는 탈출에 사용할 수 있습니다.
+적절한 파일의 예를 들어, 위의 "사용자 목록 내보내기"를 시도하세요.
+중복된 사용자 id는 무시됩니다.
+
+비밀번호는 생성되고 각 성공적으로 가져온 사용자에게 이메일로 보내집니다.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index 57bfbc4a2..6d1ae86f4 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
@@ -30,6 +31,11 @@ $lang['search']                = '찾기';
 $lang['search_prompt']         = '찾기 실행';
 $lang['clear']                 = '찾기 필터 초기화';
 $lang['filter']                = '필터';
+$lang['export_all']            = '모든 사용자 목록 내보내기 (CSV)';
+$lang['export_filtered']       = '필터된 사용자 목록 내보내기 (CSV)';
+$lang['import']                = '새 사용자 목록 가져오기';
+$lang['line']                  = '줄 번호';
+$lang['error']                 = '오류 메시지';
 $lang['summary']               = '찾은 사용자 %3$d 중 %1$d-%2$d을(를) 봅니다. 전체 사용자는 %4$d명입니다.';
 $lang['nonefound']             = '찾은 사용자가 없습니다. 전체 사용자는 %d명입니다.';
 $lang['delete_ok']             = '사용자 %d명이 삭제되었습니다';
@@ -50,3 +56,13 @@ $lang['add_ok']                = '사용자를 성공적으로 추가했습니
 $lang['add_fail']              = '사용자 추가를 실패했습니다';
 $lang['notify_ok']             = '알림 이메일을 성공적으로 보냈습니다';
 $lang['notify_fail']           = '알림 이메일을 보낼 수 없습니다';
+$lang['import_success_count']  = '사용자 가져오기: 사용자 %d명을 찾았고, %d명을 성공적으로 가져왔습니다.';
+$lang['import_failure_count']  = '사용자 가져오기: %d명을 가져오지 못했습니다. 실패는 아래에 나타나 있습니다.';
+$lang['import_error_fields']   = '충분하지 않은 필드, %d개 찾았고, 4개가 필요합니다.';
+$lang['import_error_baduserid'] = '사용자 id 없음';
+$lang['import_error_badname']  = '잘못된 이름';
+$lang['import_error_badmail']  = '잘못된 이메일 주소';
+$lang['import_error_upload']   = '가져오기를 실패했습니다. csv 파일을 올릴 수 없거나 비어 있습니다.';
+$lang['import_error_readfail'] = '가져오기를 실패했습니다. 올린 파일을 읽을 수 없습니다.';
+$lang['import_error_create']   = '사용자를 만들 수 없습니다.';
+$lang['import_notify_fail']    = '알림 메시지를 가져온 %s (이메일: %s ) 사용자에게 보낼 수 없습니다.';
-- 
cgit v1.2.3


From 20cc9932c3634f2a576266e0e8f7442f9ff60dad Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Tue, 13 Aug 2013 09:05:59 +0200
Subject: translation update

---
 lib/plugins/plugin/lang/ko/admin_plugin.txt | 2 +-
 lib/plugins/plugin/lang/ko/lang.php         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/ko/admin_plugin.txt b/lib/plugins/plugin/lang/ko/admin_plugin.txt
index aeef5fedf..7315025b5 100644
--- a/lib/plugins/plugin/lang/ko/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/ko/admin_plugin.txt
@@ -1,3 +1,3 @@
 ====== 플러그인 관리 ======
 
-이 페이지에서 Dokuwiki [[doku>ko:plugins|플러그인]]에 관련된 모든 관리 작업을 합니다. 플러그인을 다운로드하거나 설치하기 위해서는 웹 서버가 플러그인 디렉토리에 대해 쓰기 권한을 가지고 있어야 합니다.
\ No newline at end of file
+이 페이지에서 도쿠위키 [[doku>ko:plugins|플러그인]]에 관련된 모든 관리 작업을 합니다. 플러그인을 다운로드하거나 설치하기 위해서는 웹 서버가 플러그인 디렉터리에 대해 쓰기 권한을 가지고 있어야 합니다.
\ No newline at end of file
diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index f4382dcfe..9cecaa278 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -46,10 +46,10 @@ $lang['www']                   = '웹:';
 $lang['error']                 = '알 수 없는 문제가 발생했습니다.';
 $lang['error_download']        = '플러그인 파일을 다운로드 할 수 없습니다: %s';
 $lang['error_badurl']          = '잘못된 URL 같습니다 - URL에서 파일 이름을 알 수 없습니다';
-$lang['error_dircreate']       = '다운로드를 받기 위한 임시 디렉토리를 만들 수 없습니다';
+$lang['error_dircreate']       = '다운로드를 받기 위한 임시 디렉터리를 만들 수 없습니다';
 $lang['error_decompress']      = '플러그인 관리자가 다운로드 받은 파일을 압축을 풀 수 없습니다. 잘못 다운로드 받았을 수도 있으니 다시 한번 시도하거나 압축 포맷을 알 수 없는 경우에는 다운로드한 후 수동으로 직접 설치하세요.';
 $lang['error_copy']            = '플러그인을 설치하는 동안 파일 복사하는 데 오류가 발생했습니다. <em>%s</em>: 디스크가 꽉 찼거나 파일 접근 권한이 잘못된 경우입니다. 플러그인 설치가 부분적으로만 이루어졌을 것입니다. 설치가 불완전합니다.';
-$lang['error_delete']          = '<em>%s</em> 플러그인을 삭제하는 동안 오류가 발생했습니다. 대부분의 경우 불완전한 파일이거나 디렉토리 접근 권한이 잘못된 경우입니다';
+$lang['error_delete']          = '<em>%s</em> 플러그인을 삭제하는 동안 오류가 발생했습니다. 대부분의 경우 불완전한 파일이거나 디렉터리 접근 권한이 잘못된 경우입니다';
 $lang['enabled']               = '%s 플러그인을 활성화했습니다.';
 $lang['notenabled']            = '%s 플러그인을 활성화할 수 없습니다. 파일 권한을 확인하세요.';
 $lang['disabled']              = '%s 플러그인을 비활성화했습니다.';
-- 
cgit v1.2.3


From 440b8f2e9d79442f105af80c0302c417b6a6a95e Mon Sep 17 00:00:00 2001
From: Antoine Turmel <geekshadow@gmail.com>
Date: Tue, 13 Aug 2013 11:51:32 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/fr/lang.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 2ff1bd7a0..940603ab6 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -21,6 +21,7 @@
  * @author Olivier DUVAL <zorky00@gmail.com>
  * @author Anael Mobilia <contrib@anael.eu>
  * @author Bruno Veilleux <bruno.vey@gmail.com>
+ * @author Antoine Turmel <geekshadow@gmail.com>
  */
 $lang['menu']                  = 'Gestion des utilisateurs';
 $lang['noauth']                = '(authentification de l\'utilisateur non disponible)';
@@ -43,6 +44,9 @@ $lang['search']                = 'Rechercher';
 $lang['search_prompt']         = 'Effectuer la recherche';
 $lang['clear']                 = 'Réinitialiser la recherche';
 $lang['filter']                = 'Filtre';
+$lang['import']                = 'Importer les nouveaux utilisateurs';
+$lang['line']                  = 'Ligne n°';
+$lang['error']                 = 'Message d\'erreur';
 $lang['summary']               = 'Affichage des utilisateurs %1$d-%2$d parmi %3$d trouvés. %4$d utilisateurs au total.';
 $lang['nonefound']             = 'Aucun utilisateur trouvé. %d utilisateurs au total.';
 $lang['delete_ok']             = '%d utilisateurs effacés';
@@ -63,3 +67,7 @@ $lang['add_ok']                = 'Utilisateur ajouté avec succès';
 $lang['add_fail']              = 'Échec de l\'ajout de l\'utilisateur';
 $lang['notify_ok']             = 'Courriel de notification expédié';
 $lang['notify_fail']           = 'Échec de l\'expédition du courriel de notification';
+$lang['import_error_baduserid'] = 'Identifiant de l\'utilisateur manquant';
+$lang['import_error_badname']  = 'Mauvais nom';
+$lang['import_error_badmail']  = 'Mauvaise adresse e-mail';
+$lang['import_error_create']   = 'Impossible de créer l\'utilisateur';
-- 
cgit v1.2.3


From 3199997341e3c54459d4ab0505d6a820536d3335 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Tue, 13 Aug 2013 18:26:22 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ko/help.txt         | 2 +-
 lib/plugins/popularity/lang/ko/intro.txt | 4 ++--
 lib/plugins/usermanager/lang/ko/lang.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index ba3dd6d9f..96aa80c10 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -5,4 +5,4 @@
 * 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
 * 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
 
-DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
+도쿠위키에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index 0c884546a..16475ce95 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,9 +1,9 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지  도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
-보내려는 데이터는 설치 DokuWiki 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
+보내려는 데이터는 설치 도쿠위키 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
 
 실제 보내질 자료는 아래와 같습니다. 정보를 보내려면 "자료 보내기" 버튼을 클릭하세요.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index 6d1ae86f4..a0db839e0 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -29,7 +29,7 @@ $lang['edit_prompt']           = '이 사용자 편집';
 $lang['modify']                = '바뀜 저장';
 $lang['search']                = '찾기';
 $lang['search_prompt']         = '찾기 실행';
-$lang['clear']                 = '찾기 필터 초기화';
+$lang['clear']                 = '찾기 필터 재설정';
 $lang['filter']                = '필터';
 $lang['export_all']            = '모든 사용자 목록 내보내기 (CSV)';
 $lang['export_filtered']       = '필터된 사용자 목록 내보내기 (CSV)';
-- 
cgit v1.2.3


From 90562fe4194ca0d5d1a5a7ca0fc0728ecd44c843 Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Wed, 14 Aug 2013 13:45:36 +0200
Subject: add pointer curser to mediafile

Added the pointer icon to the media manager pop-up to show users it is clickable.
---
 lib/tpl/dokuwiki/css/_media_popup.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css
index 1fefd68b6..20d669c14 100644
--- a/lib/tpl/dokuwiki/css/_media_popup.css
+++ b/lib/tpl/dokuwiki/css/_media_popup.css
@@ -154,6 +154,7 @@ html.popup {
 #media__content a.mediafile {
     margin-right: 1.5em;
     font-weight: bold;
+    cursor: pointer;
 }
 [dir=rtl] #media__content a.mediafile {
     margin-right: 0;
-- 
cgit v1.2.3


From ba35743ed47706bd330a9be6431a61b104b12fbb Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Wed, 14 Aug 2013 14:35:58 +0200
Subject: translation update

---
 lib/plugins/plugin/lang/ko/lang.php | 2 +-
 lib/plugins/revert/lang/ko/lang.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index 9cecaa278..0a1c5664d 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -41,7 +41,7 @@ $lang['name']                  = '이름:';
 $lang['date']                  = '날짜:';
 $lang['type']                  = '종류:';
 $lang['desc']                  = '설명:';
-$lang['author']                = '만든이:';
+$lang['author']                = '저자:';
 $lang['www']                   = '웹:';
 $lang['error']                 = '알 수 없는 문제가 발생했습니다.';
 $lang['error_download']        = '플러그인 파일을 다운로드 할 수 없습니다: %s';
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index de304da5b..299946721 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -14,7 +14,7 @@ $lang['menu']                  = '되돌리기 관리자';
 $lang['filter']                = '스팸 문서 찾기';
 $lang['revert']                = '선택한 문서 되돌리기';
 $lang['reverted']              = '%s 판을 %s 판으로 되돌림';
-$lang['removed']               = '%s 삭제함';
+$lang['removed']               = '%s 제거함';
 $lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 되돌리시기 바랍니다.';
 $lang['revstop']               = '되돌리기 작업이 성공적으로 끝났습니다.';
 $lang['note1']                 = '참고: 대소문자를 구별해 찾습니다';
-- 
cgit v1.2.3


From 25a7457ca09e648a58f9a5db5aa595253ce8a885 Mon Sep 17 00:00:00 2001
From: Saroj Dhakal <lotusnagarkot@gmail.com>
Date: Thu, 15 Aug 2013 05:36:08 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ne/lang.php         | 5 +++--
 lib/plugins/plugin/lang/ne/lang.php      | 5 +++--
 lib/plugins/popularity/lang/ne/lang.php  | 5 +++--
 lib/plugins/revert/lang/ne/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/ne/lang.php | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ne/lang.php b/lib/plugins/acl/lang/ne/lang.php
index 6a29a9fa8..5e6196a30 100644
--- a/lib/plugins/acl/lang/ne/lang.php
+++ b/lib/plugins/acl/lang/ne/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Nepali language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
  * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
diff --git a/lib/plugins/plugin/lang/ne/lang.php b/lib/plugins/plugin/lang/ne/lang.php
index 27c4f3b60..94e7b8089 100644
--- a/lib/plugins/plugin/lang/ne/lang.php
+++ b/lib/plugins/plugin/lang/ne/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Nepali language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
  * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
diff --git a/lib/plugins/popularity/lang/ne/lang.php b/lib/plugins/popularity/lang/ne/lang.php
index d6aa56eb7..c0d925a46 100644
--- a/lib/plugins/popularity/lang/ne/lang.php
+++ b/lib/plugins/popularity/lang/ne/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Nepali language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
  * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
diff --git a/lib/plugins/revert/lang/ne/lang.php b/lib/plugins/revert/lang/ne/lang.php
index 4fd337532..8bd7c3327 100644
--- a/lib/plugins/revert/lang/ne/lang.php
+++ b/lib/plugins/revert/lang/ne/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Nepali language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
  * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
diff --git a/lib/plugins/usermanager/lang/ne/lang.php b/lib/plugins/usermanager/lang/ne/lang.php
index f68ed2074..9a44d19ce 100644
--- a/lib/plugins/usermanager/lang/ne/lang.php
+++ b/lib/plugins/usermanager/lang/ne/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Nepali language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
  * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
-- 
cgit v1.2.3


From 198dcd63fcefa4e89209cc1a540057b0fe7138b3 Mon Sep 17 00:00:00 2001
From: christian studer <cstuder@existenz.ch>
Date: Thu, 15 Aug 2013 09:20:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/de/settings.php  | 6 ++++++
 lib/plugins/usermanager/lang/de/import.txt | 8 ++++++++
 lib/plugins/usermanager/lang/de/lang.php   | 2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/de/import.txt

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index b24c792f9..d788da876 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
+ * @author christian studer <cstuder@existenz.ch>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
 $lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
@@ -14,9 +15,14 @@ $lang['groupfilter']           = 'LDAP-Filter, um die Benutzergruppen zu suchen.
 $lang['version']               = 'Zu verwendende Protokollversion von LDAP.';
 $lang['starttls']              = 'Verbindung über TLS aufbauen?';
 $lang['referrals']             = 'Weiterverfolgen von LDAP-Referrals (Verweise)?';
+$lang['deref']                 = 'Wie sollen Aliase aufgelöst werden?';
 $lang['binddn']                = 'DN eines optionalen Benutzers, wenn der anonyme Zugriff nicht ausreichend ist. Zum Beispiel: <code>cn=admin, dc=my, dc=home</code>.';
 $lang['bindpw']                = 'Passwort des angegebenen Benutzers.';
 $lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
 $lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
 $lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
 $lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/usermanager/lang/de/import.txt b/lib/plugins/usermanager/lang/de/import.txt
new file mode 100644
index 000000000..bf0d2922e
--- /dev/null
+++ b/lib/plugins/usermanager/lang/de/import.txt
@@ -0,0 +1,8 @@
+===== Benutzer-Massenimport =====
+
+Um mehrere Benutzer gleichzeitig zu importieren, wird eine CSV-Datei mit den folgenden vier Spalten benötigt (In dieser Reihenfolge): Benutzer-ID, Voller Name, E-Mail-Adresse und Gruppen.
+Die CSV-Felder sind Kommata-separiert (,) und mit Anführungszeichen eingefasst ("). Mit Backslashes (\) können Sonderzeichen maskiert werden.
+Ein Beispiel für eine gültige Datei kann mit der Benutzer-Export-Funktion oben generiert werden.
+Doppelte Benutzer-IDs werden ignoriert.
+
+Für jeden importierten Benutzer wird ein Passwort generiert und dem Benutzer per Mail zugestellt.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php
index 68cdf359f..21be74f71 100644
--- a/lib/plugins/usermanager/lang/de/lang.php
+++ b/lib/plugins/usermanager/lang/de/lang.php
@@ -19,6 +19,7 @@
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Sven <Svenluecke48@gmx.d>
+ * @author christian studer <cstuder@existenz.ch>
  */
 $lang['menu']                  = 'Benutzerverwaltung';
 $lang['noauth']                = '(Authentifizierungssystem nicht verfügbar)';
@@ -75,3 +76,4 @@ $lang['import_error_badmail']  = 'Ungültige E-Mail';
 $lang['import_error_upload']   = 'Import fehlgeschlagen. Die CSV-Datei konnte nicht hochgeladen werden, oder ist leer.';
 $lang['import_error_readfail'] = 'Import fehlgeschlagen. Die hochgeladene Datei konnte nicht gelesen werden.';
 $lang['import_error_create']   = 'User konnte nicht angelegt werden';
+$lang['import_notify_fail']    = 'Notifikation konnte nicht an den importierten Benutzer %s (E-Mail: %s) gesendet werden.';
-- 
cgit v1.2.3


From 4fda05043a29f942b2e14d591bd1206a941b936c Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Thu, 15 Aug 2013 10:45:59 +0200
Subject: translation update

---
 lib/plugins/revert/lang/ko/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index 299946721..c350389dd 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -18,4 +18,4 @@ $lang['removed']               = '%s 제거함';
 $lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 되돌리시기 바랍니다.';
 $lang['revstop']               = '되돌리기 작업이 성공적으로 끝났습니다.';
 $lang['note1']                 = '참고: 대소문자를 구별해 찾습니다';
-$lang['note2']                 = '참고: 이 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최근 이전 판으로 되돌립니다. ';
+$lang['note2']                 = '참고: 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최근 이전 판으로 되돌립니다. ';
-- 
cgit v1.2.3


From c92968d1297188120d60b9de773b7c19915bc088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederico=20Gon=C3=A7alves=20Guimar=C3=A3es?=
 <frederico@teia.bio.br>
Date: Thu, 15 Aug 2013 11:36:04 +0200
Subject: translation update

---
 lib/plugins/acl/lang/pt-br/lang.php           | 4 ++--
 lib/plugins/authad/lang/pt-br/settings.php    | 5 +++--
 lib/plugins/authldap/lang/pt-br/settings.php  | 5 +++--
 lib/plugins/authmysql/lang/pt-br/settings.php | 5 +++--
 lib/plugins/authpgsql/lang/pt-br/settings.php | 5 +++--
 lib/plugins/plugin/lang/pt-br/lang.php        | 5 +++--
 lib/plugins/popularity/lang/pt-br/lang.php    | 5 +++--
 lib/plugins/revert/lang/pt-br/lang.php        | 5 +++--
 lib/plugins/usermanager/lang/pt-br/lang.php   | 5 +++--
 9 files changed, 26 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php
index c49b430f8..ef0ae6c8b 100644
--- a/lib/plugins/acl/lang/pt-br/lang.php
+++ b/lib/plugins/acl/lang/pt-br/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Brazilian Portuguese language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Luis Fernando Enciso <lfenciso@certto.com.br>
  * @author Alauton/Loug
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
diff --git a/lib/plugins/authad/lang/pt-br/settings.php b/lib/plugins/authad/lang/pt-br/settings.php
index 56f37b75f..76fb419a6 100644
--- a/lib/plugins/authad/lang/pt-br/settings.php
+++ b/lib/plugins/authad/lang/pt-br/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Brazilian Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Victor Westmann <victor.westmann@gmail.com>
  * @author Frederico Guimarães <frederico@teia.bio.br>
  */
diff --git a/lib/plugins/authldap/lang/pt-br/settings.php b/lib/plugins/authldap/lang/pt-br/settings.php
index d12a9cf36..6ad6b4862 100644
--- a/lib/plugins/authldap/lang/pt-br/settings.php
+++ b/lib/plugins/authldap/lang/pt-br/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Brazilian Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Victor Westmann <victor.westmann@gmail.com>
  * @author Frederico Guimarães <frederico@teia.bio.br>
  */
diff --git a/lib/plugins/authmysql/lang/pt-br/settings.php b/lib/plugins/authmysql/lang/pt-br/settings.php
index 8ac775b54..1181a0b27 100644
--- a/lib/plugins/authmysql/lang/pt-br/settings.php
+++ b/lib/plugins/authmysql/lang/pt-br/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Brazilian Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Victor Westmann <victor.westmann@gmail.com>
  * @author Frederico Guimarães <frederico@teia.bio.br>
  */
diff --git a/lib/plugins/authpgsql/lang/pt-br/settings.php b/lib/plugins/authpgsql/lang/pt-br/settings.php
index 5ffe13465..8d7725392 100644
--- a/lib/plugins/authpgsql/lang/pt-br/settings.php
+++ b/lib/plugins/authpgsql/lang/pt-br/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Brazilian Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Victor Westmann <victor.westmann@gmail.com>
  * @author Frederico Guimarães <frederico@teia.bio.br>
  */
diff --git a/lib/plugins/plugin/lang/pt-br/lang.php b/lib/plugins/plugin/lang/pt-br/lang.php
index 437b6ca57..c025188f3 100644
--- a/lib/plugins/plugin/lang/pt-br/lang.php
+++ b/lib/plugins/plugin/lang/pt-br/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Lucien Raven <lucienraven@yahoo.com.br>
diff --git a/lib/plugins/popularity/lang/pt-br/lang.php b/lib/plugins/popularity/lang/pt-br/lang.php
index c2ec36145..280f072b8 100644
--- a/lib/plugins/popularity/lang/pt-br/lang.php
+++ b/lib/plugins/popularity/lang/pt-br/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  * @author Lucien Raven <lucienraven@yahoo.com.br>
  * @author Enrico Nicoletto <liverig@gmail.com>
diff --git a/lib/plugins/revert/lang/pt-br/lang.php b/lib/plugins/revert/lang/pt-br/lang.php
index b74e0408f..103970484 100644
--- a/lib/plugins/revert/lang/pt-br/lang.php
+++ b/lib/plugins/revert/lang/pt-br/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Lucien Raven <lucienraven@yahoo.com.br>
diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php
index 637be8860..8beae392f 100644
--- a/lib/plugins/usermanager/lang/pt-br/lang.php
+++ b/lib/plugins/usermanager/lang/pt-br/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Lucien Raven <lucienraven@yahoo.com.br>
-- 
cgit v1.2.3


From ab090718d52f2360b769f039b1bf5f496f23097f Mon Sep 17 00:00:00 2001
From: Felipe Castro <fefcas@yahoo.com.br>
Date: Thu, 15 Aug 2013 13:56:24 +0200
Subject: translation update

---
 lib/plugins/acl/lang/eo/lang.php           |  5 +++--
 lib/plugins/authad/lang/eo/settings.php    |  5 +++--
 lib/plugins/authldap/lang/eo/settings.php  | 11 +++++++++--
 lib/plugins/authmysql/lang/eo/settings.php |  5 +++--
 lib/plugins/authpgsql/lang/eo/settings.php |  5 +++--
 lib/plugins/plugin/lang/eo/lang.php        |  5 +++--
 lib/plugins/popularity/lang/eo/lang.php    |  5 +++--
 lib/plugins/revert/lang/eo/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/eo/import.txt |  9 +++++++++
 lib/plugins/usermanager/lang/eo/lang.php   | 21 +++++++++++++++++++--
 10 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 lib/plugins/usermanager/lang/eo/import.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php
index de75c2dd7..a5f607341 100644
--- a/lib/plugins/acl/lang/eo/lang.php
+++ b/lib/plugins/acl/lang/eo/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Felipe Castro <fefcas@uol.com.br>
  * @author Felipo Kastro <fefcas@gmail.com>
  * @author Felipe Castro <fefcas@gmail.com>
diff --git a/lib/plugins/authad/lang/eo/settings.php b/lib/plugins/authad/lang/eo/settings.php
index 8bd34b439..ee672ecd3 100644
--- a/lib/plugins/authad/lang/eo/settings.php
+++ b/lib/plugins/authad/lang/eo/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['account_suffix']        = 'Via konto-aldonaĵo, ekz. <code>@mia.domajno.lando</code>';
 $lang['base_dn']               = 'Via baza DN, ekz. <code>DC=mia,DC=domajno,DC=lando</code>';
diff --git a/lib/plugins/authldap/lang/eo/settings.php b/lib/plugins/authldap/lang/eo/settings.php
index 2863a1125..07b46c84a 100644
--- a/lib/plugins/authldap/lang/eo/settings.php
+++ b/lib/plugins/authldap/lang/eo/settings.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Felipe Castro <fefcas@yahoo.com.br>
  */
 $lang['server']                = 'Via LDAP-servilo. Aŭ servila nomo (<code>localhost</code>) aŭ plene detala URL (<code>ldap://servilo.lando:389</code>)';
 $lang['port']                  = 'LDAP-servila pordego, se vi supre ne indikis la plenan URL';
@@ -12,9 +14,14 @@ $lang['groupfilter']           = 'LDAP-filtrilo por serĉi grupojn, ekz. <code>(
 $lang['version']               = 'La uzenda protokolversio. Eble necesas indiki <code>3</code>';
 $lang['starttls']              = 'Ĉu uzi TLS-konektojn?';
 $lang['referrals']             = 'Ĉu sekvi referencojn?';
+$lang['deref']                 = 'Kiel dereferencigi kromnomojn?';
 $lang['binddn']                = 'DN de opcie bindita uzanto, se anonima bindado ne sufiĉas, ekz. <code>cn=admin, dc=mia, dc=hejmo</code>';
 $lang['bindpw']                = 'Pasvorto de tiu uzanto';
 $lang['userscope']             = 'Limigi serĉospacon de uzantaj serĉoj';
 $lang['groupscope']            = 'Limigi serĉospacon por grupaj serĉoj';
 $lang['groupkey']              = 'Grupa membreco de iu uzanta atributo (anstataŭ standardaj AD-grupoj), ekz. grupo de departemento aŭ telefonnumero';
 $lang['debug']                 = 'Ĉu montri aldonajn erarinformojn?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authmysql/lang/eo/settings.php b/lib/plugins/authmysql/lang/eo/settings.php
index 907c761f8..92e973396 100644
--- a/lib/plugins/authmysql/lang/eo/settings.php
+++ b/lib/plugins/authmysql/lang/eo/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['server']                = 'Via MySQL-servilo';
 $lang['user']                  = 'MySQL uzantonomo';
diff --git a/lib/plugins/authpgsql/lang/eo/settings.php b/lib/plugins/authpgsql/lang/eo/settings.php
index dbdfdd41b..2f59c4914 100644
--- a/lib/plugins/authpgsql/lang/eo/settings.php
+++ b/lib/plugins/authpgsql/lang/eo/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['server']                = 'Via PostgreSQL-servilo';
 $lang['port']                  = 'Via PostgreSQL-servila pordego';
diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php
index 67553454c..624246a21 100644
--- a/lib/plugins/plugin/lang/eo/lang.php
+++ b/lib/plugins/plugin/lang/eo/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperantolanguage file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Felipe Castro <fefcas@uol.com.br>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Felipe Castro <fefcas (cxe) gmail (punkto) com>
diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php
index c2bca23b1..5e67e5bdb 100644
--- a/lib/plugins/popularity/lang/eo/lang.php
+++ b/lib/plugins/popularity/lang/eo/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Felipo Kastro <fefcas@gmail.com>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Robert Bogenschneider <robog@gmx.de>
diff --git a/lib/plugins/revert/lang/eo/lang.php b/lib/plugins/revert/lang/eo/lang.php
index 05eec26a8..2d0b0f267 100644
--- a/lib/plugins/revert/lang/eo/lang.php
+++ b/lib/plugins/revert/lang/eo/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperantolanguage file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Felipe Castro <fefcas@uol.com.br>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Felipe Castro <fefcas (cxe) gmail (punkto) com>
diff --git a/lib/plugins/usermanager/lang/eo/import.txt b/lib/plugins/usermanager/lang/eo/import.txt
new file mode 100644
index 000000000..61c2c74de
--- /dev/null
+++ b/lib/plugins/usermanager/lang/eo/import.txt
@@ -0,0 +1,9 @@
+===== Amasa importo de uzantoj =====
+
+Tio ĉi postulas CSV-dosiero de uzantoj kun minimume kvar kolumnoj.
+La kolumnoj devas enhavi, laŭorde: uzant-id, kompleta nomo, retadreso kaj grupoj.
+La CSV-kampoj devos esti apartitaj per komoj (,) kaj ĉenoj devas esti limigitaj per citiloj (""). Retroklino (\) povas esti uzata por eskapo.
+Por ekzemplo de taŭga dosiero, provu la funkcion "Eksporti uzantojn" supre.
+Duobligitaj uzant-id estos preteratentataj.
+
+Pasvorto estos generata kaj retsendata al ĉiu sukecse importita uzanto.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/eo/lang.php b/lib/plugins/usermanager/lang/eo/lang.php
index 75782fe23..4c4174339 100644
--- a/lib/plugins/usermanager/lang/eo/lang.php
+++ b/lib/plugins/usermanager/lang/eo/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperantolanguage file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Felipe Castro <fefcas@uol.com.br>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Felipe Castro <fefcas (cxe) gmail (punkto) com>
@@ -10,6 +11,7 @@
  * @author Erik Pedersen <erik pedersen@shaw.ca>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Robert Bogenschneider <bogi@uea.org>
+ * @author Felipe Castro <fefcas@yahoo.com.br>
  */
 $lang['menu']                  = 'Administrado de uzantoj';
 $lang['noauth']                = '(identiĝo de uzantoj ne disponeblas)';
@@ -32,6 +34,11 @@ $lang['search']                = 'Serĉi';
 $lang['search_prompt']         = 'Fari serĉon';
 $lang['clear']                 = 'Refari serĉan filtron';
 $lang['filter']                = 'Filtro';
+$lang['export_all']            = 'Eksporti ĉiujn uzantojn (CSV)';
+$lang['export_filtered']       = 'Eksporti filtritan uzant-liston (CSV)';
+$lang['import']                = 'Importi novajn uzantojn';
+$lang['line']                  = 'Lini-num.';
+$lang['error']                 = 'Erar-mesaĝo';
 $lang['summary']               = 'Montriĝas uzantoj %1$d-%2$d el %3$d trovitaj. %4$d uzantoj entute.';
 $lang['nonefound']             = 'Neniuj uzantoj troviĝas. %d uzantoj entute.';
 $lang['delete_ok']             = '%d uzantoj forigiĝis';
@@ -52,3 +59,13 @@ $lang['add_ok']                = 'La uzanto sukcese aldoniĝis';
 $lang['add_fail']              = 'Ne eblis aldoni uzanton';
 $lang['notify_ok']             = 'Avizanta mesaĝo sendiĝis';
 $lang['notify_fail']           = 'La avizanta mesaĝo ne povis esti sendita';
+$lang['import_success_count']  = 'Uzant-importo: %d uzantoj trovataj, %d sukcese importitaj.';
+$lang['import_failure_count']  = 'Uzant-importo: %d fiaskis. Fiaskoj estas sube listitaj.';
+$lang['import_error_fields']   = 'Nesufiĉe da kampoj, ni trovis %d, necesas 4.';
+$lang['import_error_baduserid'] = 'Mankas uzant-id';
+$lang['import_error_badname']  = 'Malĝusta nomo';
+$lang['import_error_badmail']  = 'Malĝusta retadreso';
+$lang['import_error_upload']   = 'Importo fiaskis. La csv-dosiero ne povis esti alŝutata aŭ ĝi estas malplena.';
+$lang['import_error_readfail'] = 'Importo fiaskis. Ne eblas legi alŝutitan dosieron.';
+$lang['import_error_create']   = 'Ne eblas krei la uzanton';
+$lang['import_notify_fail']    = 'Averta mesaĝo ne povis esti sendata al la importita uzanto %s, kun retdreso %s.';
-- 
cgit v1.2.3


From f0ee5aeb8e64276eee9beab496d611a28bb0a013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20K=C5=99ivka?= <krivka@fit.vutbr.cz>
Date: Thu, 15 Aug 2013 22:20:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/cs/lang.php           |  4 ++--
 lib/plugins/authad/lang/cs/settings.php    |  5 +++--
 lib/plugins/authldap/lang/cs/settings.php  |  5 +++--
 lib/plugins/authmysql/lang/cs/settings.php |  5 +++--
 lib/plugins/authpgsql/lang/cs/settings.php |  5 +++--
 lib/plugins/plugin/lang/cs/lang.php        |  5 +++--
 lib/plugins/popularity/lang/cs/lang.php    |  5 +++--
 lib/plugins/revert/lang/cs/lang.php        |  6 +++---
 lib/plugins/usermanager/lang/cs/import.txt |  9 +++++++++
 lib/plugins/usermanager/lang/cs/lang.php   | 23 ++++++++++++++++++++---
 10 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 lib/plugins/usermanager/lang/cs/import.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index a4e59287a..8031612f7 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
  * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
  * @author tomas@valenta.cz
diff --git a/lib/plugins/authad/lang/cs/settings.php b/lib/plugins/authad/lang/cs/settings.php
index 71f83afda..28222d332 100644
--- a/lib/plugins/authad/lang/cs/settings.php
+++ b/lib/plugins/authad/lang/cs/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author mkucera66@seznam.cz
  */
 $lang['account_suffix']        = 'Přípona vašeho účtu, tj. <code>@moje.domena.org</code>';
diff --git a/lib/plugins/authldap/lang/cs/settings.php b/lib/plugins/authldap/lang/cs/settings.php
index 783d2a3ae..b2b5b59dc 100644
--- a/lib/plugins/authldap/lang/cs/settings.php
+++ b/lib/plugins/authldap/lang/cs/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author mkucera66@seznam.cz
  */
 $lang['server']                = 'Váš server LDAP. Buď jméno hosta (<code>localhost</code>) nebo plně kvalifikovaný popis URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authmysql/lang/cs/settings.php b/lib/plugins/authmysql/lang/cs/settings.php
index 7fedefbbb..350c3236b 100644
--- a/lib/plugins/authmysql/lang/cs/settings.php
+++ b/lib/plugins/authmysql/lang/cs/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author mkucera66@seznam.cz
  */
 $lang['server']                = 'Váš server MySQL';
diff --git a/lib/plugins/authpgsql/lang/cs/settings.php b/lib/plugins/authpgsql/lang/cs/settings.php
index 06abe86f4..aec7eecf1 100644
--- a/lib/plugins/authpgsql/lang/cs/settings.php
+++ b/lib/plugins/authpgsql/lang/cs/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author mkucera66@seznam.cz
  */
 $lang['server']                = 'Váš server PostgreSQL';
diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php
index 98fae12c7..a92f8b1c2 100644
--- a/lib/plugins/plugin/lang/cs/lang.php
+++ b/lib/plugins/plugin/lang/cs/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Tomas Valenta <t.valenta@sh.cvut.cz>
  * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
@@ -14,6 +14,7 @@
  * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  * @author Jakub A. Těšínský (j@kub.cz)
  * @author mkucera66@seznam.cz
+ * @author Zbyněk Křivka <krivka@fit.vutbr.cz>
  */
 $lang['menu']                  = 'Správa pluginů';
 $lang['download']              = 'Stáhnout a instalovat plugin';
diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php
index ee090a131..4ab5916db 100644
--- a/lib/plugins/popularity/lang/cs/lang.php
+++ b/lib/plugins/popularity/lang/cs/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
  * @author tomas@valenta.cz
  * @author Marek Sacha <sachamar@fel.cvut.cz>
diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php
index eef3295ba..d918e2e69 100644
--- a/lib/plugins/revert/lang/cs/lang.php
+++ b/lib/plugins/revert/lang/cs/lang.php
@@ -1,9 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
  * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
  * @author tomas@valenta.cz
@@ -14,6 +13,7 @@
  * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  * @author Jakub A. Těšínský (j@kub.cz)
  * @author mkucera66@seznam.cz
+ * @author Zbyněk Křivka <krivka@fit.vutbr.cz>
  */
 $lang['menu']                  = 'Obnova zaspamovaných stránek';
 $lang['filter']                = 'Hledat zaspamované stránky';
diff --git a/lib/plugins/usermanager/lang/cs/import.txt b/lib/plugins/usermanager/lang/cs/import.txt
new file mode 100644
index 000000000..c264ae185
--- /dev/null
+++ b/lib/plugins/usermanager/lang/cs/import.txt
@@ -0,0 +1,9 @@
+===== Hromadný import uživatelů =====
+
+Vyžaduje CSV soubor s uživateli obsahující alespoň 4 sloupce.
+Sloupce obsahují (v daném pořadí): user-id, celé jméno, emailovou adresu, seznam skupin.
+Položky CSV musí být odděleny čárkou (,) a řetězce umístěny v uvozovkách (""). Zpětné lomítko (\) lze použít pro escapování.
+Pro získání příkladu takového souboru využijte funkci "Exportovat uživatele" výše.
+Záznamy s duplicitním user-id budou ignorovány.
+
+Hesla budou vygenerována a zaslána e-mailem všem úspěšně importovaným uživatelům.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index 9fc3a5e75..b2c736e09 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Tomas Valenta <t.valenta@sh.cvut.cz>
  * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
@@ -13,6 +14,7 @@
  * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  * @author Jakub A. Těšínský (j@kub.cz)
  * @author mkucera66@seznam.cz
+ * @author Zbyněk Křivka <krivka@fit.vutbr.cz>
  */
 $lang['menu']                  = 'Správa uživatelů';
 $lang['noauth']                = '(autentizace uživatelů není k dispozici)';
@@ -35,6 +37,11 @@ $lang['search']                = 'Hledání';
 $lang['search_prompt']         = 'Prohledat';
 $lang['clear']                 = 'Zrušit vyhledávací filtr';
 $lang['filter']                = 'Filtr';
+$lang['export_all']            = 'Exportovat všechny uživatele (CSV)';
+$lang['export_filtered']       = 'Exportovat filtrovaný seznam uživatelů (CSV)';
+$lang['import']                = 'Importovat nové uživatele';
+$lang['line']                  = 'Řádek č.';
+$lang['error']                 = 'Chybová zpráva';
 $lang['summary']               = 'Zobrazuji uživatele %1$d-%2$d z %3$d nalezených. Celkem %4$d uživatelů.';
 $lang['nonefound']             = 'Žadný uživatel nenalezen. Celkem %d uživatelů.';
 $lang['delete_ok']             = '%d uživatelů smazáno';
@@ -50,8 +57,18 @@ $lang['edit_usermissing']      = 'Vybraný uživatel nebyl nalezen, zadané uži
 $lang['user_notify']           = 'Upozornit uživatele';
 $lang['note_notify']           = 'Maily s upozorněním se budou posílat pouze, když uživatel dostává nové heslo.';
 $lang['note_group']            = 'Noví uživatelé budou přidáváni do této výchozí skupiny (%s), pokud pro ně není uvedena žádná skupina.';
-$lang['note_pass']             = 'Heslo bude automaticky vygenerováno pokud je pole ponecháno prázdné a je zapnutá notifikace uživatele.';
+$lang['note_pass']             = 'Heslo bude automaticky vygenerováno, pokud je pole ponecháno prázdné a je zapnuto upozornění uživatele.';
 $lang['add_ok']                = 'Uživatel úspěšně vytvořen';
 $lang['add_fail']              = 'Vytvoření uživatele selhalo';
 $lang['notify_ok']             = 'Odeslán mail s upozorněním';
 $lang['notify_fail']           = 'Mail s upozorněním nebylo možno odeslat';
+$lang['import_success_count']  = 'Import uživatelů: nalezeno %s uživatelů, %d úspěšně importováno.';
+$lang['import_failure_count']  = 'Import uživatelů: %d selhalo. Seznam chybných je níže.';
+$lang['import_error_fields']   = 'Nedostatek položek, nalezena/y %d, požadovány 4.';
+$lang['import_error_baduserid'] = 'Chybí User-id';
+$lang['import_error_badname']  = 'Špatné jméno';
+$lang['import_error_badmail']  = 'Špatná emailová adresa';
+$lang['import_error_upload']   = 'Import selhal. CSV soubor nemohl být nahrán nebo je prázdný.';
+$lang['import_error_readfail'] = 'Import selhal. Nelze číst nahraný soubor.';
+$lang['import_error_create']   = 'Nelze vytvořit uživatele';
+$lang['import_notify_fail']    = 'Importovanému uživateli %s s emailem %s nemohlo být zasláno upozornění.';
-- 
cgit v1.2.3


From 68389009e322909ba9f85af41320c4886ca27309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Neves?= <drakferion@gmail.com>
Date: Fri, 16 Aug 2013 04:11:01 +0200
Subject: translation update

---
 lib/plugins/acl/lang/pt/lang.php           |  4 ++--
 lib/plugins/authad/lang/pt/settings.php    | 12 ++++++++++++
 lib/plugins/authldap/lang/pt/settings.php  | 18 ++++++++++++++++++
 lib/plugins/authmysql/lang/pt/settings.php | 23 +++++++++++++++++++++++
 lib/plugins/authpgsql/lang/pt/settings.php | 22 ++++++++++++++++++++++
 lib/plugins/plugin/lang/pt/lang.php        |  5 +++--
 lib/plugins/popularity/lang/pt/lang.php    |  5 +++--
 lib/plugins/revert/lang/pt/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/pt/import.txt |  9 +++++++++
 lib/plugins/usermanager/lang/pt/lang.php   | 17 +++++++++++++++--
 10 files changed, 110 insertions(+), 10 deletions(-)
 create mode 100644 lib/plugins/authad/lang/pt/settings.php
 create mode 100644 lib/plugins/authldap/lang/pt/settings.php
 create mode 100644 lib/plugins/authmysql/lang/pt/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/pt/settings.php
 create mode 100644 lib/plugins/usermanager/lang/pt/import.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/pt/lang.php b/lib/plugins/acl/lang/pt/lang.php
index d90bab624..4c2114d67 100644
--- a/lib/plugins/acl/lang/pt/lang.php
+++ b/lib/plugins/acl/lang/pt/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
  * @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>
diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php
new file mode 100644
index 000000000..45eff5e96
--- /dev/null
+++ b/lib/plugins/authad/lang/pt/settings.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author André Neves <drakferion@gmail.com>
+ */
+$lang['admin_password']        = 'A senha para o utilizador acima.';
+$lang['sso']                   = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?';
+$lang['use_ssl']               = 'Usar ligação SSL? Se usada, não ative TLS abaixo.';
+$lang['use_tls']               = 'Usar ligação TLS? Se usada, não ative SSL abaixo.';
+$lang['expirywarn']            = 'Número de dias de avanço para avisar o utilizador da expiração da senha. 0 para desativar.';
diff --git a/lib/plugins/authldap/lang/pt/settings.php b/lib/plugins/authldap/lang/pt/settings.php
new file mode 100644
index 000000000..a2ccf87ad
--- /dev/null
+++ b/lib/plugins/authldap/lang/pt/settings.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author André Neves <drakferion@gmail.com>
+ */
+$lang['server']                = 'O seu servidor de LDAP. Ou hostname (<code>localhost</code>) ou URL qualificado completo (<code>ldap://servidor.tld:389</code>)';
+$lang['port']                  = 'Porta de servidor de LDAP se o URL completo não foi fornecido acima';
+$lang['usertree']              = 'Onde encontrar as contas de utilizador. Por exemplo <code>ou=Pessoas, dc=servidor, dc=tld</code>';
+$lang['grouptree']             = 'Onde encontrar os grupos de utilizadores. Por exemplo code>ou=Grupo, dc=servidor, dc=tld</code>';
+$lang['userfilter']            = 'Filtro LDAP para procurar por contas de utilizador. Por exemplo <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'Filtro LDAP para procurar por grupos. Por exemplo <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'A versão do protocolo a utilizar. Pode precisar de alterar isto para <code>3</code>';
+$lang['starttls']              = 'Usar ligações TLS?';
+$lang['referrals']             = 'Referrals devem ser seguidos?';
+$lang['bindpw']                = 'Senha do utilizador acima';
+$lang['debug']                 = 'Mostrar informação adicional de debug aquando de erros';
diff --git a/lib/plugins/authmysql/lang/pt/settings.php b/lib/plugins/authmysql/lang/pt/settings.php
new file mode 100644
index 000000000..0c7f303e7
--- /dev/null
+++ b/lib/plugins/authmysql/lang/pt/settings.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author André Neves <drakferion@gmail.com>
+ */
+$lang['server']                = 'O seu servidor de MySQL';
+$lang['user']                  = 'Utilizador MySQL';
+$lang['password']              = 'Senha para o utilizador acima';
+$lang['database']              = 'Base de dados a usar';
+$lang['debug']                 = 'Mostrar informação adicional de debug';
+$lang['FilterLogin']           = 'Cláusula SQL para filtrar utilizadores por tipo de login';
+$lang['FilterName']            = 'Cláusula SQL para filtrar utilizadores por nome completo';
+$lang['FilterEmail']           = 'Cláusula SQL para filtrar utilizadores por endereço de email';
+$lang['FilterGroup']           = 'Cláusula SQL para filtrar utilizadores por pertença a grupo';
+$lang['SortOrder']             = 'Cláusula SQL para ordenar utilizadores';
+$lang['UpdateLogin']           = 'Cláusula de atualização para atualizar o nome de login do utilizador';
+$lang['UpdatePass']            = 'Cláusula de atualização para atualizar a senha do utilizador';
+$lang['UpdateEmail']           = 'Cláusula de atualização para atualizar o endereço de email do utilizador';
+$lang['UpdateName']            = 'Cláusula de atualização para atualizar o nome completo do utilizador';
+$lang['debug_o_0']             = 'nenhum';
+$lang['debug_o_1']             = 'só aquando de erros';
diff --git a/lib/plugins/authpgsql/lang/pt/settings.php b/lib/plugins/authpgsql/lang/pt/settings.php
new file mode 100644
index 000000000..b33b81141
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/pt/settings.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author André Neves <drakferion@gmail.com>
+ */
+$lang['server']                = 'O seu servidor PostgreSQL';
+$lang['port']                  = 'A porta do seu servidor PostgreSQL';
+$lang['user']                  = 'Nome de utilizador PostgreSQL';
+$lang['password']              = 'Senha do utilizador acima';
+$lang['database']              = 'Base de dados a usar';
+$lang['debug']                 = 'Mostrar informação adicional de debug';
+$lang['FilterLogin']           = 'Cláusula SQL para filtrar utilizadores por nome de login';
+$lang['FilterName']            = 'Cláusula SQL para filtrar utilizadores por nome completo';
+$lang['FilterEmail']           = 'Cláusula SQL para filtrar utilizadores por endereço de email';
+$lang['FilterGroup']           = 'Cláusula SQL para filtrar utilizadores por pertença a grupo';
+$lang['SortOrder']             = 'Cláusula SQL para ordenar utilizadores';
+$lang['UpdateLogin']           = 'Cláusula de atualização para atualizar o nome de login do utilizador';
+$lang['UpdatePass']            = 'Cláusula de atualização para atualizar a senha do utilizador';
+$lang['UpdateEmail']           = 'Cláusula de atualização para atualizar o endereço de email do utilizador';
+$lang['UpdateName']            = 'Cláusula de atualização para atualizar o nome completo do utilizador';
diff --git a/lib/plugins/plugin/lang/pt/lang.php b/lib/plugins/plugin/lang/pt/lang.php
index dccd4f738..aa6b2e2ec 100644
--- a/lib/plugins/plugin/lang/pt/lang.php
+++ b/lib/plugins/plugin/lang/pt/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portugueselanguage file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Fil <fil@meteopt.com>
diff --git a/lib/plugins/popularity/lang/pt/lang.php b/lib/plugins/popularity/lang/pt/lang.php
index ac27dc8c0..e30b9d62b 100644
--- a/lib/plugins/popularity/lang/pt/lang.php
+++ b/lib/plugins/popularity/lang/pt/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Fil <fil@meteopt.com>
  * @author André Neves <drakferion@gmail.com>
diff --git a/lib/plugins/revert/lang/pt/lang.php b/lib/plugins/revert/lang/pt/lang.php
index 3b2850f41..f87f77db7 100644
--- a/lib/plugins/revert/lang/pt/lang.php
+++ b/lib/plugins/revert/lang/pt/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Fil <fil@meteopt.com>
diff --git a/lib/plugins/usermanager/lang/pt/import.txt b/lib/plugins/usermanager/lang/pt/import.txt
new file mode 100644
index 000000000..3a604030c
--- /dev/null
+++ b/lib/plugins/usermanager/lang/pt/import.txt
@@ -0,0 +1,9 @@
+===== Importação de Utilizadores em Massa =====
+
+Requer um ficheiro CSV de utilizadores com pelo menos quatro colunas.
+As colunas têm de conter, em ordem: id de utilizador, nome completo, endereço de email e grupos.
+Os campos CSV devem ser separados por vírgulas (,) e as strings delimitadas por aspas (""). A contra-barra (\) pode ser usada para escapar.
+Para um exemplo de um ficheiro adequado, tente a função "Exportar Utilizadores" acima.
+Ids de utilizador duplicados serão ignorados.
+
+Uma senha será gerada e enviada por email a cada utilizador importado com sucesso.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/pt/lang.php b/lib/plugins/usermanager/lang/pt/lang.php
index 6d0d85e38..b59649aa1 100644
--- a/lib/plugins/usermanager/lang/pt/lang.php
+++ b/lib/plugins/usermanager/lang/pt/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portugueselanguage file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Fil <fil@meteopt.com>
@@ -29,6 +30,10 @@ $lang['search']                = 'Pesquisar';
 $lang['search_prompt']         = 'Pesquisar';
 $lang['clear']                 = 'Limpar Filtro de Pesquisa';
 $lang['filter']                = 'Filtro';
+$lang['export_all']            = 'Exportar Todos os Utilizadores (CSV)';
+$lang['export_filtered']       = 'Exportar a lista de utilizadores filtrada (CSV)';
+$lang['import']                = 'Importar Novos Utilizadores';
+$lang['error']                 = 'Mensagem de erro';
 $lang['summary']               = 'Apresentar utilizadores %1$d-%2$d de %3$d encontrados. %4$d inscritos.';
 $lang['nonefound']             = 'Nenhum utilizador encontrado. %d inscritos.';
 $lang['delete_ok']             = '%d utilizadores removidos';
@@ -49,3 +54,11 @@ $lang['add_ok']                = 'Utilizador adicionado.';
 $lang['add_fail']              = 'Utilizador não adicionado.';
 $lang['notify_ok']             = 'Mensagem de notificação enviada.';
 $lang['notify_fail']           = 'Não foi possível enviar mensagem de notificação';
+$lang['import_success_count']  = 'Importar Utilizadores: %d utiliyadores encontrados, %d importados com sucesso.';
+$lang['import_failure_count']  = 'Importar Utilizadores: %d falharam. As falhas estão listadas abaixo.';
+$lang['import_error_fields']   = 'Campos insuficientes, encontrados %d mas requeridos 4.';
+$lang['import_error_baduserid'] = 'Falta id de utilizador';
+$lang['import_error_upload']   = 'Falhou a importação. O ficheiro csv não pôde ser importado ou está vazio.';
+$lang['import_error_readfail'] = 'Falhou a importação. Não foi possível ler o ficheiro submetido.';
+$lang['import_error_create']   = 'Não foi possível criar o utilizador.';
+$lang['import_notify_fail']    = 'A mensagem de notificação não pôde ser enviada para o utilizador importado, %s com email %s.';
-- 
cgit v1.2.3


From 02266f1f9c29ea0aba4384bbdf1271570c8847f5 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 17 Aug 2013 14:41:28 +0200
Subject: translation update

---
 lib/plugins/plugin/lang/ko/admin_plugin.txt | 2 +-
 lib/plugins/plugin/lang/ko/lang.php         | 6 +++---
 lib/plugins/revert/lang/ko/lang.php         | 4 ++--
 lib/plugins/usermanager/lang/ko/lang.php    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/ko/admin_plugin.txt b/lib/plugins/plugin/lang/ko/admin_plugin.txt
index 7315025b5..9390712dd 100644
--- a/lib/plugins/plugin/lang/ko/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/ko/admin_plugin.txt
@@ -1,3 +1,3 @@
 ====== 플러그인 관리 ======
 
-이 페이지에서 도쿠위키 [[doku>ko:plugins|플러그인]]에 관련된 모든 관리 작업을 합니다. 플러그인을 다운로드하거나 설치하기 위해서는 웹 서버가 플러그인 디렉터리에 대해 쓰기 권한을 가지고 있어야 합니다.
\ No newline at end of file
+이 페이지에서 도쿠위키 [[doku>ko:plugins|플러그인]]에 관련된 모든 관리를 할 수 있습니다. 플러그인을 다운로드하고 설치하기 위해서는 웹 서버가 플러그인 폴더에 대해 쓰기 권한이 있어야 합니다.
\ No newline at end of file
diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index 0a1c5664d..87eb65705 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -11,8 +11,8 @@
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['menu']                  = '플러그인 관리';
-$lang['download']              = '새 플러그인 다운로드 및 설치';
-$lang['manage']                = '이미 설치한 플러그인';
+$lang['download']              = '새 플러그인을 다운로드하고 설치';
+$lang['manage']                = '설치된 플러그인';
 $lang['btn_info']              = '정보';
 $lang['btn_update']            = '업데이트';
 $lang['btn_delete']            = '삭제';
@@ -21,7 +21,7 @@ $lang['btn_download']          = '다운로드';
 $lang['btn_enable']            = '저장';
 $lang['url']                   = 'URL';
 $lang['installed']             = '설치됨:';
-$lang['lastupdate']            = '가장 나중에 업데이트됨:';
+$lang['lastupdate']            = '마지막 업데이트:';
 $lang['source']                = '원본:';
 $lang['unknown']               = '알 수 없음';
 $lang['updating']              = '업데이트 중 ...';
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index c350389dd..e63706960 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -14,8 +14,8 @@ $lang['menu']                  = '되돌리기 관리자';
 $lang['filter']                = '스팸 문서 찾기';
 $lang['revert']                = '선택한 문서 되돌리기';
 $lang['reverted']              = '%s 판을 %s 판으로 되돌림';
-$lang['removed']               = '%s 제거함';
+$lang['removed']               = '%s 제거됨';
 $lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 되돌리시기 바랍니다.';
 $lang['revstop']               = '되돌리기 작업이 성공적으로 끝났습니다.';
 $lang['note1']                 = '참고: 대소문자를 구별해 찾습니다';
-$lang['note2']                 = '참고: 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최근 이전 판으로 되돌립니다. ';
+$lang['note2']                 = '참고: 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최신 판으로 되돌립니다. ';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index a0db839e0..d39f9eacf 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -39,7 +39,7 @@ $lang['error']                 = '오류 메시지';
 $lang['summary']               = '찾은 사용자 %3$d 중 %1$d-%2$d을(를) 봅니다. 전체 사용자는 %4$d명입니다.';
 $lang['nonefound']             = '찾은 사용자가 없습니다. 전체 사용자는 %d명입니다.';
 $lang['delete_ok']             = '사용자 %d명이 삭제되었습니다';
-$lang['delete_fail']           = '사용자 %d명의 삭제가 실패했습니다.';
+$lang['delete_fail']           = '사용자 %d명을 삭제하는 데 실패했습니다.';
 $lang['update_ok']             = '사용자 정보를 성공적으로 바꾸었습니다';
 $lang['update_fail']           = '사용자 정보를 바꾸는 데 실패했습니다';
 $lang['update_exists']         = '사용자 이름을 바꾸는 데 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)';
@@ -58,7 +58,7 @@ $lang['notify_ok']             = '알림 이메일을 성공적으로 보냈습
 $lang['notify_fail']           = '알림 이메일을 보낼 수 없습니다';
 $lang['import_success_count']  = '사용자 가져오기: 사용자 %d명을 찾았고, %d명을 성공적으로 가져왔습니다.';
 $lang['import_failure_count']  = '사용자 가져오기: %d명을 가져오지 못했습니다. 실패는 아래에 나타나 있습니다.';
-$lang['import_error_fields']   = '충분하지 않은 필드, %d개 찾았고, 4개가 필요합니다.';
+$lang['import_error_fields']   = '충분하지 않은 필드로, %d개를 찾았고, 4개가 필요합니다.';
 $lang['import_error_baduserid'] = '사용자 id 없음';
 $lang['import_error_badname']  = '잘못된 이름';
 $lang['import_error_badmail']  = '잘못된 이메일 주소';
-- 
cgit v1.2.3


From a08059e44c9e3e1da368455ccf56a2ad361613b3 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Mon, 19 Aug 2013 02:55:58 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ko/settings.php | 8 ++++----
 lib/plugins/plugin/lang/ko/lang.php       | 2 +-
 lib/plugins/usermanager/lang/ko/lang.php  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index 898b8f37a..5c5341b31 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -21,7 +21,7 @@ $lang['userscope']             = '사용자 찾기에 대한 찾기 범위 제
 $lang['groupscope']            = '그룹 찾기에 대한 찾기 범위 제한';
 $lang['groupkey']              = '(표준 AD 그룹 대신) 사용자 속성에서 그룹 구성원. 예를 들어 부서나 전화에서 그룹';
 $lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이기';
-$lang['deref_o_0']             = 'LDAP_DEREF_없음(NEVER)';
-$lang['deref_o_1']             = 'LDAP_DEREF_검색(SEARCHING)';
-$lang['deref_o_2']             = 'LDAP_DEREF_발견(FINDING)';
-$lang['deref_o_3']             = 'LDAP_DEREF_항상(ALWAYS)';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index 87eb65705..0caf93fcf 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -21,7 +21,7 @@ $lang['btn_download']          = '다운로드';
 $lang['btn_enable']            = '저장';
 $lang['url']                   = 'URL';
 $lang['installed']             = '설치됨:';
-$lang['lastupdate']            = '마지막 업데이트:';
+$lang['lastupdate']            = '마지막으로 업데이트됨:';
 $lang['source']                = '원본:';
 $lang['unknown']               = '알 수 없음';
 $lang['updating']              = '업데이트 중 ...';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index d39f9eacf..f2116f688 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -13,10 +13,10 @@
 $lang['menu']                  = '사용자 관리자';
 $lang['noauth']                = '(사용자 인증이 불가능합니다)';
 $lang['nosupport']             = '(사용자 관리가 지원되지 않습니다)';
-$lang['badauth']               = '인증 메카니즘이 잘못되었습니다';
+$lang['badauth']               = '인증 메커니즘이 잘못되었습니다';
 $lang['user_id']               = '사용자';
 $lang['user_pass']             = '비밀번호';
-$lang['user_name']             = '실제 이름';
+$lang['user_name']             = '실명';
 $lang['user_mail']             = '이메일 ';
 $lang['user_groups']           = '그룹';
 $lang['field']                 = '항목';
-- 
cgit v1.2.3


From 9fb553c08c19ca0ce9d63813af849413410a0b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Pl=C3=B6ger?= <develop@dieploegers.de>
Date: Mon, 19 Aug 2013 13:35:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/de-informal/lang.php           |  5 +++--
 lib/plugins/authad/lang/de-informal/settings.php    |  5 +++--
 lib/plugins/authldap/lang/de-informal/settings.php  |  4 ++--
 lib/plugins/authmysql/lang/de-informal/settings.php |  4 ++--
 lib/plugins/authpgsql/lang/de-informal/settings.php |  4 ++--
 lib/plugins/plugin/lang/de-informal/lang.php        |  5 +++--
 lib/plugins/popularity/lang/de-informal/lang.php    |  5 +++--
 lib/plugins/revert/lang/de-informal/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/de-informal/import.txt |  7 +++++++
 lib/plugins/usermanager/lang/de-informal/lang.php   | 21 +++++++++++++++++++--
 10 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 lib/plugins/usermanager/lang/de-informal/import.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index 3487f4257..35df13dc0 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php
index a458617b8..782cf7c0f 100644
--- a/lib/plugins/authad/lang/de-informal/settings.php
+++ b/lib/plugins/authad/lang/de-informal/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Volker Bödker <volker@boedker.de>
diff --git a/lib/plugins/authldap/lang/de-informal/settings.php b/lib/plugins/authldap/lang/de-informal/settings.php
index 15e4d8129..bdac7dd68 100644
--- a/lib/plugins/authldap/lang/de-informal/settings.php
+++ b/lib/plugins/authldap/lang/de-informal/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German informal language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Volker Bödker <volker@boedker.de>
  */
diff --git a/lib/plugins/authmysql/lang/de-informal/settings.php b/lib/plugins/authmysql/lang/de-informal/settings.php
index 540979cf4..d8d2778b9 100644
--- a/lib/plugins/authmysql/lang/de-informal/settings.php
+++ b/lib/plugins/authmysql/lang/de-informal/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German informal language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Volker Bödker <volker@boedker.de>
  */
diff --git a/lib/plugins/authpgsql/lang/de-informal/settings.php b/lib/plugins/authpgsql/lang/de-informal/settings.php
index d864d14d4..3e3a0dc4e 100644
--- a/lib/plugins/authpgsql/lang/de-informal/settings.php
+++ b/lib/plugins/authpgsql/lang/de-informal/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Volker Bödker <volker@boedker.de>
  */
diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php
index 5d1649434..8f1cea5e5 100644
--- a/lib/plugins/plugin/lang/de-informal/lang.php
+++ b/lib/plugins/plugin/lang/de-informal/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php
index 0abf90b0b..69efa7470 100644
--- a/lib/plugins/popularity/lang/de-informal/lang.php
+++ b/lib/plugins/popularity/lang/de-informal/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
diff --git a/lib/plugins/revert/lang/de-informal/lang.php b/lib/plugins/revert/lang/de-informal/lang.php
index 7ca141e3c..93a932945 100644
--- a/lib/plugins/revert/lang/de-informal/lang.php
+++ b/lib/plugins/revert/lang/de-informal/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
diff --git a/lib/plugins/usermanager/lang/de-informal/import.txt b/lib/plugins/usermanager/lang/de-informal/import.txt
new file mode 100644
index 000000000..6fd6b8d8c
--- /dev/null
+++ b/lib/plugins/usermanager/lang/de-informal/import.txt
@@ -0,0 +1,7 @@
+===== Massenimport von Benutzern =====
+
+Dieser Import benötigt eine CSV-Datei mit mindestens vier Spalten. Diese Spalten müssen die folgenden Daten (in dieser Reihenfolge) enthalten: Benutzername, Name, E-Mailadresse und Gruppenzugehörigkeit.
+Die CSV-Felder müssen durch ein Komma (,) getrennt sein. Die Zeichenfolgen müssen von Anführungszeichen ("") umgeben sein. Ein Backslash (\) kann zum Maskieren benutzt werden.
+Für eine Beispieldatei kannst Du die "Benutzer exportieren"-Funktion oben benutzen. Doppelte Benutzername werden ignoriert.
+
+Ein Passwort wird generiert und den einzelnen, erfolgreich importierten Benutzern zugemailt.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php
index 791cfa74f..bea4159d0 100644
--- a/lib/plugins/usermanager/lang/de-informal/lang.php
+++ b/lib/plugins/usermanager/lang/de-informal/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
@@ -10,6 +11,7 @@
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Volker Bödker <volker@boedker.de>
+ * @author Dennis Plöger <develop@dieploegers.de>
  */
 $lang['menu']                  = 'Benutzerverwaltung';
 $lang['noauth']                = '(Benutzeranmeldung ist nicht verfügbar)';
@@ -32,6 +34,11 @@ $lang['search']                = 'Suchen';
 $lang['search_prompt']         = 'Suche ausführen';
 $lang['clear']                 = 'Suchfilter zurücksetzen';
 $lang['filter']                = 'Filter';
+$lang['export_all']            = 'Alle Benutzer exportieren (CSV)';
+$lang['export_filtered']       = 'Gefilterte Benutzerliste exportieren (CSV)';
+$lang['import']                = 'Neue Benutzer importieren';
+$lang['line']                  = 'Zeile Nr.';
+$lang['error']                 = 'Fehlermeldung';
 $lang['summary']               = 'Zeige Benutzer %1$d-%2$d von %3$d gefundenen. %4$d Benutzer insgesamt.';
 $lang['nonefound']             = 'Keinen Benutzer gefunden. Insgesamt %d Benutzer.';
 $lang['delete_ok']             = '%d Benutzer wurden gelöscht';
@@ -52,3 +59,13 @@ $lang['add_ok']                = 'Benutzer erfolgreich hinzugefügt';
 $lang['add_fail']              = 'Hinzufügen des Benutzers fehlgeschlagen';
 $lang['notify_ok']             = 'Benachrichtigungsmail wurde versendet';
 $lang['notify_fail']           = 'Benachrichtigungsemail konnte nicht gesendet werden';
+$lang['import_success_count']  = 'Benutzerimport: %d Benutzer gefunden, %d erfolgreich importiert.';
+$lang['import_failure_count']  = 'Benutzerimport: %d Benutzerimporte fehlgeschalten. Alle Fehler werden unten angezeigt.';
+$lang['import_error_fields']   = 'Falsche Anzahl Felder. Gefunden: %d. Benötigt: 4.';
+$lang['import_error_baduserid'] = 'Benutzername fehlt';
+$lang['import_error_badname']  = 'Ungültiger Name';
+$lang['import_error_badmail']  = 'Ungültige E-Mailadresse';
+$lang['import_error_upload']   = 'Import fehlgeschlagen. Die CSV-Datei konnte nicht hochgeladen werden oder ist leer.';
+$lang['import_error_readfail'] = 'Import fehlgeschlagen. Konnte die hochgeladene Datei nicht lesen.';
+$lang['import_error_create']   = 'Konnte den Benutzer nicht erzeugen';
+$lang['import_notify_fail']    = 'Benachrichtigung konnte an Benutzer %s (%s) nicht geschickt werden.';
-- 
cgit v1.2.3


From bcc165558b4d58baab4ccc85d9066f0c4ba7de2a Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Tue, 20 Aug 2013 23:05:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ru/lang.php             | 2 +-
 lib/plugins/authad/lang/ru/settings.php      | 7 +++++--
 lib/plugins/authldap/lang/ru/settings.php    | 7 +++++--
 lib/plugins/authpgsql/lang/ru/settings.php   | 8 ++++++--
 lib/plugins/plugin/lang/ru/lang.php          | 2 +-
 lib/plugins/popularity/lang/ru/submitted.txt | 3 ++-
 lib/plugins/revert/lang/ru/lang.php          | 2 +-
 lib/plugins/usermanager/lang/ru/lang.php     | 4 ++--
 8 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index f042ab724..ff4740676 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -28,7 +28,7 @@ $lang['btn_select']            = 'Выбрать';
 $lang['p_user_id']             = 'Сейчас пользователь <b class="acluser">%s</b> имеет следующие права на доступ к странице <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'Сейчас пользователь <b class="acluser">%s</b> имеет следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Сейчас члены группы <b class="aclgroup">%s</b> имеют следующие права на доступ к странице <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns']            = 'Сейчас члены группы <b class="aclgroup">%s</b> cимеют следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Сейчас члены группы <b class="aclgroup">%s</b> имеют следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_choose_id']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к странице <b class="aclpage">%s</b>.';
 $lang['p_choose_ns']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к пространству имён <b class="aclns">%s</b>.';
 $lang['p_inherited']           = 'Замечание: эти права доступа не были заданы явно, а были унаследованы от других групп или пространств имён более высокого порядка.';
diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 4c394080e..f849c201a 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -1,6 +1,9 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  */
+$lang['admin_password']        = 'Пароль для указанного пользователя.';
diff --git a/lib/plugins/authldap/lang/ru/settings.php b/lib/plugins/authldap/lang/ru/settings.php
index 4c394080e..70ad7b6f4 100644
--- a/lib/plugins/authldap/lang/ru/settings.php
+++ b/lib/plugins/authldap/lang/ru/settings.php
@@ -1,6 +1,9 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  */
+$lang['bindpw']                = 'Пароль для указанного пользователя.';
diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php
index 4c394080e..f5d0a77ee 100644
--- a/lib/plugins/authpgsql/lang/ru/settings.php
+++ b/lib/plugins/authpgsql/lang/ru/settings.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  */
+$lang['server']                = 'Ваш PostgreSQL-сервер';
+$lang['password']              = 'Пароль для указанного пользователя.';
diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php
index 47e46c9c7..6af100bd3 100644
--- a/lib/plugins/plugin/lang/ru/lang.php
+++ b/lib/plugins/plugin/lang/ru/lang.php
@@ -51,7 +51,7 @@ $lang['date']                  = 'Дата:';
 $lang['type']                  = 'Тип:';
 $lang['desc']                  = 'Описание:';
 $lang['author']                = 'Автор:';
-$lang['www']                   = 'Странца:';
+$lang['www']                   = 'Страница:';
 $lang['error']                 = 'Произошла неизвестная ошибка.';
 $lang['error_download']        = 'Не могу скачать файл плагина: %s';
 $lang['error_badurl']          = 'Возможно неправильный адрес — не могу определить имя файла из адреса';
diff --git a/lib/plugins/popularity/lang/ru/submitted.txt b/lib/plugins/popularity/lang/ru/submitted.txt
index a239943a4..845410171 100644
--- a/lib/plugins/popularity/lang/ru/submitted.txt
+++ b/lib/plugins/popularity/lang/ru/submitted.txt
@@ -1,2 +1,3 @@
-====== Общественная обратная связь ======
+====== Сбор информации о популярности ======
+
 Данные были успешно отправлены.
\ No newline at end of file
diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php
index defd86de0..73d69b33e 100644
--- a/lib/plugins/revert/lang/ru/lang.php
+++ b/lib/plugins/revert/lang/ru/lang.php
@@ -22,7 +22,7 @@
 $lang['menu']                  = 'Менеджер откаток';
 $lang['filter']                = 'Поиск спам-страниц';
 $lang['revert']                = 'Откатить изменения для выбранных страниц';
-$lang['reverted']              = '%s откачена к версии %s';
+$lang['reverted']              = '%s возвращена к версии %s';
 $lang['removed']               = '%s удалена';
 $lang['revstart']              = 'Начат процесс откатки. Он может занять много времени. Если скрипт не успевает завершить работу и выдаёт ошибку, необходимо произвести откатку более маленькими частями.';
 $lang['revstop']               = 'Процесс откатки успешно завершён.';
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index f2029e58b..3102ac32a 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -44,9 +44,9 @@ $lang['filter']                = 'Фильтр';
 $lang['export_all']            = 'Экспорт всех пользователей (CSV)';
 $lang['export_filtered']       = 'Экспорт пользователей с фильтрацией списка (CSV)';
 $lang['import']                = 'Импорт новых пользователей';
-$lang['line']                  = 'Строка №.';
+$lang['line']                  = 'Строка №';
 $lang['error']                 = 'Ошибка';
-$lang['summary']               = 'Показаны пользователи %1$d-%2$d из %3$d найденных. Всего пользователей: %4$d.';
+$lang['summary']               = 'Показаны пользователи %1$d–%2$d из %3$d найденных. Всего пользователей: %4$d.';
 $lang['nonefound']             = 'Не найдено ни одного пользователя. Всего пользователей: %d.';
 $lang['delete_ok']             = 'Удалено пользователей: %d';
 $lang['delete_fail']           = 'Не удалось удалить %d.';
-- 
cgit v1.2.3


From b8983d3a45d16afc81d527fc2616f8c43bbf2c87 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 20 Aug 2013 21:18:30 -0700
Subject: Fix CodeSniffer violations

Remove whitespace from end of lines to reduce the number of CodeSniffer
violations.
---
 lib/exe/detail.php         | 4 ++--
 lib/plugins/acl/remote.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index 7008b126f..7aae08f76 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -11,8 +11,8 @@ $ID   = cleanID($INPUT->str('id'));
 $INFO = array_merge(pageinfo(),mediainfo());
 trigger_event('DETAIL_STARTED', $tmp=array());
 
-//close session
-session_write_close();
+//close session
+session_write_close();
 
 if($conf['allowdebug'] && $INPUT->has('debug')){
     print '<pre>';
diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 8f6dfbcd9..6d5201cf6 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -16,14 +16,14 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
             ),
         );
     }
-	
+
     function addAcl($scope, $user, $level){
-        $apa = plugin_load('admin', 'acl'); 
+        $apa = plugin_load('admin', 'acl');
         return $apa->_acl_add($scope, $user, $level);
     }
-	
+
     function delAcl($scope, $user){
-        $apa = plugin_load('admin', 'acl'); 
+        $apa = plugin_load('admin', 'acl');
         return $apa->_acl_del($scope, $user);
     }
 }
-- 
cgit v1.2.3


From 6c954d25e8444996a43caaca6b96040f02628dea Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Wed, 21 Aug 2013 09:50:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ko/help.txt         | 2 +-
 lib/plugins/plugin/lang/ko/lang.php      | 2 +-
 lib/plugins/popularity/lang/ko/intro.txt | 2 +-
 lib/plugins/popularity/lang/ko/lang.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index 96aa80c10..9baeedbb9 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -5,4 +5,4 @@
 * 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
 * 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
 
-도쿠위키에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
+도쿠위키에서 접근 제어가 어떻게 동작되는지 알아보려면 [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php
index 0caf93fcf..6ef9cd69a 100644
--- a/lib/plugins/plugin/lang/ko/lang.php
+++ b/lib/plugins/plugin/lang/ko/lang.php
@@ -47,7 +47,7 @@ $lang['error']                 = '알 수 없는 문제가 발생했습니다.';
 $lang['error_download']        = '플러그인 파일을 다운로드 할 수 없습니다: %s';
 $lang['error_badurl']          = '잘못된 URL 같습니다 - URL에서 파일 이름을 알 수 없습니다';
 $lang['error_dircreate']       = '다운로드를 받기 위한 임시 디렉터리를 만들 수 없습니다';
-$lang['error_decompress']      = '플러그인 관리자가 다운로드 받은 파일을 압축을 풀 수 없습니다. 잘못 다운로드 받았을 수도 있으니 다시 한번 시도하거나 압축 포맷을 알 수 없는 경우에는 다운로드한 후 수동으로 직접 설치하세요.';
+$lang['error_decompress']      = '플러그인 관리자가 다운로드 받은 파일을 압축을 풀 수 없습니다. 잘못 다운로드 받았을 수도 있으니 다시 한 번 시도하거나 압축 포맷을 알 수 없는 경우에는 다운로드한 후 수동으로 직접 설치하세요.';
 $lang['error_copy']            = '플러그인을 설치하는 동안 파일 복사하는 데 오류가 발생했습니다. <em>%s</em>: 디스크가 꽉 찼거나 파일 접근 권한이 잘못된 경우입니다. 플러그인 설치가 부분적으로만 이루어졌을 것입니다. 설치가 불완전합니다.';
 $lang['error_delete']          = '<em>%s</em> 플러그인을 삭제하는 동안 오류가 발생했습니다. 대부분의 경우 불완전한 파일이거나 디렉터리 접근 권한이 잘못된 경우입니다';
 $lang['enabled']               = '%s 플러그인을 활성화했습니다.';
diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index 16475ce95..bc9bb9dd0 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,6 +1,6 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지  도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지 도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php
index e9bcc7dcc..f52e0007a 100644
--- a/lib/plugins/popularity/lang/ko/lang.php
+++ b/lib/plugins/popularity/lang/ko/lang.php
@@ -12,7 +12,7 @@
  */
 $lang['name']                  = '인기도 조사 (불러오는 데 시간이 걸릴 수 있습니다)';
 $lang['submit']                = '자료 보내기';
-$lang['autosubmit']            = '자료를 자동으로 매달 한번씩 보내기';
+$lang['autosubmit']            = '자료를 자동으로 한 달에 한 번씩 보내기';
 $lang['submissionFailed']      = '다음과 같은 이유로 자료 보내기에 실패했습니다:';
 $lang['submitDirectly']        = '아래의 양식에 맞춰 수동으로 작성된 자료를 보낼 수 있습니다.';
 $lang['autosubmitError']       = '다음과 같은 이유로 자동 자료 보내기에 실패했습니다:';
-- 
cgit v1.2.3


From 7ef8e99fe605c5da36ab6b5d317b22fcd17f665b Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Thu, 22 Aug 2013 01:01:41 -0700
Subject: Fix CodeSniffer violations

Change indentation to ensure code confirms to CodeSniffer rules.
---
 lib/plugins/action.php                       |   10 +-
 lib/plugins/config/admin.php                 |  488 ++++-----
 lib/plugins/config/settings/config.class.php | 1478 +++++++++++++-------------
 lib/plugins/config/settings/extra.class.php  |  270 ++---
 lib/plugins/safefnrecode/action.php          |    2 +-
 lib/plugins/syntax.php                       |   48 +-
 lib/plugins/usermanager/admin.php            |  286 ++---
 7 files changed, 1291 insertions(+), 1291 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/action.php b/lib/plugins/action.php
index a2ad969d7..04b4f07a6 100644
--- a/lib/plugins/action.php
+++ b/lib/plugins/action.php
@@ -14,10 +14,10 @@ if(!defined('DOKU_INC')) die();
  */
 class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
 
-     /**
-      * Registers a callback function for a given event
-      */
-      function register(Doku_Event_Handler $controller) {
+    /**
+     * Registers a callback function for a given event
+     */
+    function register(Doku_Event_Handler $controller) {
         trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
-      }
+    }
 }
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 29529760c..404560548 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -38,168 +38,168 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
      * handle user request
      */
     function handle() {
-      global $ID, $INPUT;
+        global $ID, $INPUT;
 
-      if (!$this->_restore_session()) return $this->_close_session();
-      if ($INPUT->int('save') != 1) return $this->_close_session();
-      if (!checkSecurityToken()) return $this->_close_session();
+        if (!$this->_restore_session()) return $this->_close_session();
+        if ($INPUT->int('save') != 1) return $this->_close_session();
+        if (!checkSecurityToken()) return $this->_close_session();
 
-      if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
+        if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
 
-      // don't go any further if the configuration is locked
-      if ($this->_config->_locked) return $this->_close_session();
+        // don't go any further if the configuration is locked
+        if ($this->_config->_locked) return $this->_close_session();
 
-      $this->_input = $INPUT->arr('config');
+        $this->_input = $INPUT->arr('config');
 
-      while (list($key) = each($this->_config->setting)) {
-        $input = isset($this->_input[$key]) ? $this->_input[$key] : NULL;
-        if ($this->_config->setting[$key]->update($input)) {
-          $this->_changed = true;
+        while (list($key) = each($this->_config->setting)) {
+            $input = isset($this->_input[$key]) ? $this->_input[$key] : NULL;
+            if ($this->_config->setting[$key]->update($input)) {
+                $this->_changed = true;
+            }
+            if ($this->_config->setting[$key]->error()) $this->_error = true;
         }
-        if ($this->_config->setting[$key]->error()) $this->_error = true;
-      }
 
-      if ($this->_changed  && !$this->_error) {
-        $this->_config->save_settings($this->getPluginName());
+        if ($this->_changed  && !$this->_error) {
+            $this->_config->save_settings($this->getPluginName());
 
-        // save state & force a page reload to get the new settings to take effect
-        $_SESSION['PLUGIN_CONFIG'] = array('state' => 'updated', 'time' => time());
-        $this->_close_session();
-        send_redirect(wl($ID,array('do'=>'admin','page'=>'config'),true,'&'));
-        exit();
-      } elseif(!$this->_error) {
-          $this->_config->touch_settings(); // just touch to refresh cache
-      }
+            // save state & force a page reload to get the new settings to take effect
+            $_SESSION['PLUGIN_CONFIG'] = array('state' => 'updated', 'time' => time());
+            $this->_close_session();
+            send_redirect(wl($ID,array('do'=>'admin','page'=>'config'),true,'&'));
+            exit();
+        } elseif(!$this->_error) {
+            $this->_config->touch_settings(); // just touch to refresh cache
+        }
 
-      $this->_close_session();
+        $this->_close_session();
     }
 
     /**
      * output appropriate html
      */
     function html() {
-      $allow_debug = $GLOBALS['conf']['allowdebug']; // avoid global $conf; here.
-      global $lang;
-      global $ID;
-
-      if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
-      $this->setupLocale(true);
-
-      print $this->locale_xhtml('intro');
-
-      ptln('<div id="config__manager">');
-
-      if ($this->_config->locked)
-        ptln('<div class="info">'.$this->getLang('locked').'</div>');
-      elseif ($this->_error)
-        ptln('<div class="error">'.$this->getLang('error').'</div>');
-      elseif ($this->_changed)
-        ptln('<div class="success">'.$this->getLang('updated').'</div>');
-
-      // POST to script() instead of wl($ID) so config manager still works if
-      // rewrite config is broken. Add $ID as hidden field to remember
-      // current ID in most cases.
-      ptln('<form action="'.script().'" method="post">');
-      ptln('<div class="no"><input type="hidden" name="id" value="'.$ID.'" /></div>');
-      formSecurityToken();
-      $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));
-
-      $undefined_settings = array();
-      $in_fieldset = false;
-      $first_plugin_fieldset = true;
-      $first_template_fieldset = true;
-      foreach($this->_config->setting as $setting) {
-        if (is_a($setting, 'setting_hidden')) {
-          // skip hidden (and undefined) settings
-          if ($allow_debug && is_a($setting, 'setting_undefined')) {
-            $undefined_settings[] = $setting;
-          } else {
-            continue;
-          }
-        } else if (is_a($setting, 'setting_fieldset')) {
-          // config setting group
-          if ($in_fieldset) {
-            ptln('  </table>');
-            ptln('  </div>');
-            ptln('  </fieldset>');
-          } else {
-            $in_fieldset = true;
-          }
-          if ($first_plugin_fieldset && substr($setting->_key, 0, 10)=='plugin'.CM_KEYMARKER) {
-            $this->_print_h1('plugin_settings', $this->getLang('_header_plugin'));
-            $first_plugin_fieldset = false;
-          } else if ($first_template_fieldset && substr($setting->_key, 0, 7)=='tpl'.CM_KEYMARKER) {
-            $this->_print_h1('template_settings', $this->getLang('_header_template'));
-            $first_template_fieldset = false;
-          }
-          ptln('  <fieldset id="'.$setting->_key.'">');
-          ptln('  <legend>'.$setting->prompt($this).'</legend>');
-          ptln('  <div class="table">');
-          ptln('  <table class="inline">');
-        } else {
-          // config settings
-          list($label,$input) = $setting->html($this, $this->_error);
-
-          $class = $setting->is_default() ? ' class="default"' : ($setting->is_protected() ? ' class="protected"' : '');
-          $error = $setting->error() ? ' class="value error"' : ' class="value"';
-          $icon = $setting->caution() ? '<img src="'.DOKU_PLUGIN_IMAGES.$setting->caution().'.png" alt="'.$setting->caution().'" title="'.$this->getLang($setting->caution()).'" />' : '';
-
-          ptln('    <tr'.$class.'>');
-          ptln('      <td class="label">');
-          ptln('        <span class="outkey">'.$setting->_out_key(true, true).'</span>');
-          ptln('        '.$icon.$label);
-          ptln('      </td>');
-          ptln('      <td'.$error.'>'.$input.'</td>');
-          ptln('    </tr>');
+        $allow_debug = $GLOBALS['conf']['allowdebug']; // avoid global $conf; here.
+        global $lang;
+        global $ID;
+
+        if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
+        $this->setupLocale(true);
+
+        print $this->locale_xhtml('intro');
+
+        ptln('<div id="config__manager">');
+
+        if ($this->_config->locked)
+            ptln('<div class="info">'.$this->getLang('locked').'</div>');
+        elseif ($this->_error)
+            ptln('<div class="error">'.$this->getLang('error').'</div>');
+        elseif ($this->_changed)
+            ptln('<div class="success">'.$this->getLang('updated').'</div>');
+
+        // POST to script() instead of wl($ID) so config manager still works if
+        // rewrite config is broken. Add $ID as hidden field to remember
+        // current ID in most cases.
+        ptln('<form action="'.script().'" method="post">');
+        ptln('<div class="no"><input type="hidden" name="id" value="'.$ID.'" /></div>');
+        formSecurityToken();
+        $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));
+
+        $undefined_settings = array();
+        $in_fieldset = false;
+        $first_plugin_fieldset = true;
+        $first_template_fieldset = true;
+        foreach($this->_config->setting as $setting) {
+            if (is_a($setting, 'setting_hidden')) {
+                // skip hidden (and undefined) settings
+                if ($allow_debug && is_a($setting, 'setting_undefined')) {
+                    $undefined_settings[] = $setting;
+                } else {
+                    continue;
+                }
+            } else if (is_a($setting, 'setting_fieldset')) {
+                // config setting group
+                if ($in_fieldset) {
+                    ptln('  </table>');
+                    ptln('  </div>');
+                    ptln('  </fieldset>');
+                } else {
+                    $in_fieldset = true;
+                }
+                if ($first_plugin_fieldset && substr($setting->_key, 0, 10)=='plugin'.CM_KEYMARKER) {
+                    $this->_print_h1('plugin_settings', $this->getLang('_header_plugin'));
+                    $first_plugin_fieldset = false;
+                } else if ($first_template_fieldset && substr($setting->_key, 0, 7)=='tpl'.CM_KEYMARKER) {
+                    $this->_print_h1('template_settings', $this->getLang('_header_template'));
+                    $first_template_fieldset = false;
+                }
+                ptln('  <fieldset id="'.$setting->_key.'">');
+                ptln('  <legend>'.$setting->prompt($this).'</legend>');
+                ptln('  <div class="table">');
+                ptln('  <table class="inline">');
+            } else {
+                // config settings
+                list($label,$input) = $setting->html($this, $this->_error);
+
+                $class = $setting->is_default() ? ' class="default"' : ($setting->is_protected() ? ' class="protected"' : '');
+                $error = $setting->error() ? ' class="value error"' : ' class="value"';
+                $icon = $setting->caution() ? '<img src="'.DOKU_PLUGIN_IMAGES.$setting->caution().'.png" alt="'.$setting->caution().'" title="'.$this->getLang($setting->caution()).'" />' : '';
+
+                ptln('    <tr'.$class.'>');
+                ptln('      <td class="label">');
+                ptln('        <span class="outkey">'.$setting->_out_key(true, true).'</span>');
+                ptln('        '.$icon.$label);
+                ptln('      </td>');
+                ptln('      <td'.$error.'>'.$input.'</td>');
+                ptln('    </tr>');
+            }
         }
-      }
 
-      ptln('  </table>');
-      ptln('  </div>');
-      if ($in_fieldset) {
-        ptln('  </fieldset>');
-      }
+        ptln('  </table>');
+        ptln('  </div>');
+        if ($in_fieldset) {
+            ptln('  </fieldset>');
+        }
 
-      // show undefined settings list
-      if ($allow_debug && !empty($undefined_settings)) {
-        function _setting_natural_comparison($a, $b) { return strnatcmp($a->_key, $b->_key); }
-        usort($undefined_settings, '_setting_natural_comparison');
-        $this->_print_h1('undefined_settings', $this->getLang('_header_undefined'));
-        ptln('<fieldset>');
-        ptln('<div class="table">');
-        ptln('<table class="inline">');
-        $undefined_setting_match = array();
-        foreach($undefined_settings as $setting) {
-          if (preg_match('/^(?:plugin|tpl)'.CM_KEYMARKER.'.*?'.CM_KEYMARKER.'(.*)$/', $setting->_key, $undefined_setting_match)) {
-            $undefined_setting_key = $undefined_setting_match[1];
-          } else {
-            $undefined_setting_key = $setting->_key;
-          }
-          ptln('  <tr>');
-          ptln('    <td class="label"><span title="$meta[\''.$undefined_setting_key.'\']">$'.$this->_config->_name.'[\''.$setting->_out_key().'\']</span></td>');
-          ptln('    <td>'.$this->getLang('_msg_'.get_class($setting)).'</td>');
-          ptln('  </tr>');
+        // show undefined settings list
+        if ($allow_debug && !empty($undefined_settings)) {
+            function _setting_natural_comparison($a, $b) { return strnatcmp($a->_key, $b->_key); }
+            usort($undefined_settings, '_setting_natural_comparison');
+            $this->_print_h1('undefined_settings', $this->getLang('_header_undefined'));
+            ptln('<fieldset>');
+            ptln('<div class="table">');
+            ptln('<table class="inline">');
+            $undefined_setting_match = array();
+            foreach($undefined_settings as $setting) {
+                if (preg_match('/^(?:plugin|tpl)'.CM_KEYMARKER.'.*?'.CM_KEYMARKER.'(.*)$/', $setting->_key, $undefined_setting_match)) {
+                    $undefined_setting_key = $undefined_setting_match[1];
+                } else {
+                    $undefined_setting_key = $setting->_key;
+                }
+                ptln('  <tr>');
+                ptln('    <td class="label"><span title="$meta[\''.$undefined_setting_key.'\']">$'.$this->_config->_name.'[\''.$setting->_out_key().'\']</span></td>');
+                ptln('    <td>'.$this->getLang('_msg_'.get_class($setting)).'</td>');
+                ptln('  </tr>');
+            }
+            ptln('</table>');
+            ptln('</div>');
+            ptln('</fieldset>');
         }
-        ptln('</table>');
-        ptln('</div>');
-        ptln('</fieldset>');
-      }
 
-      // finish up form
-      ptln('<p>');
-      ptln('  <input type="hidden" name="do"     value="admin" />');
-      ptln('  <input type="hidden" name="page"   value="config" />');
+        // finish up form
+        ptln('<p>');
+        ptln('  <input type="hidden" name="do"     value="admin" />');
+        ptln('  <input type="hidden" name="page"   value="config" />');
 
-      if (!$this->_config->locked) {
-        ptln('  <input type="hidden" name="save"   value="1" />');
-        ptln('  <input type="submit" name="submit" class="button" value="'.$lang['btn_save'].'" accesskey="s" />');
-        ptln('  <input type="reset" class="button" value="'.$lang['btn_reset'].'" />');
-      }
+        if (!$this->_config->locked) {
+            ptln('  <input type="hidden" name="save"   value="1" />');
+            ptln('  <input type="submit" name="submit" class="button" value="'.$lang['btn_save'].'" accesskey="s" />');
+            ptln('  <input type="reset" class="button" value="'.$lang['btn_reset'].'" />');
+        }
 
-      ptln('</p>');
+        ptln('</p>');
 
-      ptln('</form>');
-      ptln('</div>');
+        ptln('</form>');
+        ptln('</div>');
     }
 
     /**
@@ -207,28 +207,28 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
      */
     function _restore_session() {
 
-      // dokuwiki closes the session before act_dispatch. $_SESSION variables are all set,
-      // however they can't be changed without starting the session again
-      if (!headers_sent()) {
-        session_start();
-        $this->_session_started = true;
-      }
+        // dokuwiki closes the session before act_dispatch. $_SESSION variables are all set,
+        // however they can't be changed without starting the session again
+        if (!headers_sent()) {
+            session_start();
+            $this->_session_started = true;
+        }
 
-      if (!isset($_SESSION['PLUGIN_CONFIG'])) return true;
+        if (!isset($_SESSION['PLUGIN_CONFIG'])) return true;
 
-      $session = $_SESSION['PLUGIN_CONFIG'];
-      unset($_SESSION['PLUGIN_CONFIG']);
+        $session = $_SESSION['PLUGIN_CONFIG'];
+        unset($_SESSION['PLUGIN_CONFIG']);
 
-      // still valid?
-      if (time() - $session['time'] > 120) return true;
+        // still valid?
+        if (time() - $session['time'] > 120) return true;
 
-      switch ($session['state']) {
-        case 'updated' :
-          $this->_changed = true;
-          return false;
-      }
+        switch ($session['state']) {
+            case 'updated' :
+                $this->_changed = true;
+                return false;
+        }
 
-      return true;
+        return true;
     }
 
     function _close_session() {
@@ -237,62 +237,62 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
 
     function setupLocale($prompts=false) {
 
-      parent::setupLocale();
-      if (!$prompts || $this->_localised_prompts) return;
+        parent::setupLocale();
+        if (!$prompts || $this->_localised_prompts) return;
 
-      $this->_setup_localised_plugin_prompts();
-      $this->_localised_prompts = true;
+        $this->_setup_localised_plugin_prompts();
+        $this->_localised_prompts = true;
 
     }
 
     function _setup_localised_plugin_prompts() {
-      global $conf;
-
-      $langfile   = '/lang/'.$conf['lang'].'/settings.php';
-      $enlangfile = '/lang/en/settings.php';
+        global $conf;
+
+        $langfile   = '/lang/'.$conf['lang'].'/settings.php';
+        $enlangfile = '/lang/en/settings.php';
+
+        if ($dh = opendir(DOKU_PLUGIN)) {
+            while (false !== ($plugin = readdir($dh))) {
+                if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp' || $plugin == 'config') continue;
+                if (is_file(DOKU_PLUGIN.$plugin)) continue;
+
+                if (@file_exists(DOKU_PLUGIN.$plugin.$enlangfile)){
+                    $lang = array();
+                    @include(DOKU_PLUGIN.$plugin.$enlangfile);
+                    if ($conf['lang'] != 'en') @include(DOKU_PLUGIN.$plugin.$langfile);
+                    foreach ($lang as $key => $value){
+                        $this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
+                    }
+                }
+
+                // fill in the plugin name if missing (should exist for plugins with settings)
+                if (!isset($this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'])) {
+                    $this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'] =
+                      ucwords(str_replace('_', ' ', $plugin));
+                }
+            }
+            closedir($dh);
+      }
 
-      if ($dh = opendir(DOKU_PLUGIN)) {
-        while (false !== ($plugin = readdir($dh))) {
-          if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp' || $plugin == 'config') continue;
-          if (is_file(DOKU_PLUGIN.$plugin)) continue;
+        // the same for the active template
+        $tpl = $conf['template'];
 
-          if (@file_exists(DOKU_PLUGIN.$plugin.$enlangfile)){
+        if (@file_exists(tpl_incdir().$enlangfile)){
             $lang = array();
-            @include(DOKU_PLUGIN.$plugin.$enlangfile);
-            if ($conf['lang'] != 'en') @include(DOKU_PLUGIN.$plugin.$langfile);
+            @include(tpl_incdir().$enlangfile);
+            if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile);
             foreach ($lang as $key => $value){
-              $this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
+                $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
             }
-          }
-
-          // fill in the plugin name if missing (should exist for plugins with settings)
-          if (!isset($this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'])) {
-            $this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'] =
-              ucwords(str_replace('_', ' ', $plugin));
-          }
         }
-        closedir($dh);
-      }
-
-      // the same for the active template
-      $tpl = $conf['template'];
 
-      if (@file_exists(tpl_incdir().$enlangfile)){
-        $lang = array();
-        @include(tpl_incdir().$enlangfile);
-        if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile);
-        foreach ($lang as $key => $value){
-          $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+        // fill in the template name if missing (should exist for templates with settings)
+        if (!isset($this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'])) {
+            $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] =
+              ucwords(str_replace('_', ' ', $tpl));
         }
-      }
-
-      // fill in the template name if missing (should exist for templates with settings)
-      if (!isset($this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'])) {
-        $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] =
-          ucwords(str_replace('_', ' ', $tpl));
-      }
 
-      return true;
+        return true;
     }
 
     /**
@@ -301,59 +301,59 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
      * @author Ben Coburn <btcoburn@silicodon.net>
      */
     function getTOC() {
-      if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
-      $this->setupLocale(true);
-
-      $allow_debug = $GLOBALS['conf']['allowdebug']; // avoid global $conf; here.
-
-      // gather toc data
-      $has_undefined = false;
-      $toc = array('conf'=>array(), 'plugin'=>array(), 'template'=>null);
-      foreach($this->_config->setting as $setting) {
-        if (is_a($setting, 'setting_fieldset')) {
-          if (substr($setting->_key, 0, 10)=='plugin'.CM_KEYMARKER) {
-            $toc['plugin'][] = $setting;
-          } else if (substr($setting->_key, 0, 7)=='tpl'.CM_KEYMARKER) {
-            $toc['template'] = $setting;
-          } else {
-            $toc['conf'][] = $setting;
-          }
-        } else if (!$has_undefined && is_a($setting, 'setting_undefined')) {
-          $has_undefined = true;
+        if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
+        $this->setupLocale(true);
+
+        $allow_debug = $GLOBALS['conf']['allowdebug']; // avoid global $conf; here.
+
+        // gather toc data
+        $has_undefined = false;
+        $toc = array('conf'=>array(), 'plugin'=>array(), 'template'=>null);
+        foreach($this->_config->setting as $setting) {
+            if (is_a($setting, 'setting_fieldset')) {
+                if (substr($setting->_key, 0, 10)=='plugin'.CM_KEYMARKER) {
+                    $toc['plugin'][] = $setting;
+                } else if (substr($setting->_key, 0, 7)=='tpl'.CM_KEYMARKER) {
+                    $toc['template'] = $setting;
+                } else {
+                    $toc['conf'][] = $setting;
+                }
+            } else if (!$has_undefined && is_a($setting, 'setting_undefined')) {
+                $has_undefined = true;
+            }
         }
-      }
 
-      // build toc
-      $t = array();
+        // build toc
+        $t = array();
 
-      $t[] = html_mktocitem('configuration_manager', $this->getLang('_configuration_manager'), 1);
-      $t[] = html_mktocitem('dokuwiki_settings', $this->getLang('_header_dokuwiki'), 1);
-      foreach($toc['conf'] as $setting) {
-        $name = $setting->prompt($this);
-        $t[] = html_mktocitem($setting->_key, $name, 2);
-      }
-      if (!empty($toc['plugin'])) {
-        $t[] = html_mktocitem('plugin_settings', $this->getLang('_header_plugin'), 1);
-      }
-      foreach($toc['plugin'] as $setting) {
-        $name = $setting->prompt($this);
-        $t[] = html_mktocitem($setting->_key, $name, 2);
-      }
-      if (isset($toc['template'])) {
-        $t[] = html_mktocitem('template_settings', $this->getLang('_header_template'), 1);
-        $setting = $toc['template'];
-        $name = $setting->prompt($this);
-        $t[] = html_mktocitem($setting->_key, $name, 2);
-      }
-      if ($has_undefined && $allow_debug) {
-        $t[] = html_mktocitem('undefined_settings', $this->getLang('_header_undefined'), 1);
-      }
+        $t[] = html_mktocitem('configuration_manager', $this->getLang('_configuration_manager'), 1);
+        $t[] = html_mktocitem('dokuwiki_settings', $this->getLang('_header_dokuwiki'), 1);
+        foreach($toc['conf'] as $setting) {
+            $name = $setting->prompt($this);
+            $t[] = html_mktocitem($setting->_key, $name, 2);
+        }
+        if (!empty($toc['plugin'])) {
+            $t[] = html_mktocitem('plugin_settings', $this->getLang('_header_plugin'), 1);
+        }
+        foreach($toc['plugin'] as $setting) {
+            $name = $setting->prompt($this);
+            $t[] = html_mktocitem($setting->_key, $name, 2);
+        }
+        if (isset($toc['template'])) {
+            $t[] = html_mktocitem('template_settings', $this->getLang('_header_template'), 1);
+            $setting = $toc['template'];
+            $name = $setting->prompt($this);
+            $t[] = html_mktocitem($setting->_key, $name, 2);
+        }
+        if ($has_undefined && $allow_debug) {
+            $t[] = html_mktocitem('undefined_settings', $this->getLang('_header_undefined'), 1);
+        }
 
-      return $t;
+        return $t;
     }
 
     function _print_h1($id, $text) {
-      ptln('<h1 id="'.$id.'">'.$text.'</h1>');
+        ptln('<h1 id="'.$id.'">'.$text.'</h1>');
     }
 
 
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 6de560128..0b9fa8103 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -11,500 +11,500 @@ if(!defined('CM_KEYMARKER')) define('CM_KEYMARKER','____');
 
 if (!class_exists('configuration')) {
 
-  class configuration {
-
-    var $_name = 'conf';           // name of the config variable found in the files (overridden by $config['varname'])
-    var $_format = 'php';          // format of the config file, supported formats - php (overridden by $config['format'])
-    var $_heading = '';            // heading string written at top of config file - don't include comment indicators
-    var $_loaded = false;          // set to true after configuration files are loaded
-    var $_metadata = array();      // holds metadata describing the settings
-    var $setting = array();        // array of setting objects
-    var $locked = false;           // configuration is considered locked if it can't be updated
-    var $show_disabled_plugins = false;
-
-    // configuration filenames
-    var $_default_files  = array();
-    var $_local_files = array();      // updated configuration is written to the first file
-    var $_protected_files = array();
-
-    var $_plugin_list = null;
-
-    /**
-     *  constructor
-     */
-    function configuration($datafile) {
-        global $conf, $config_cascade;
-
-        if (!@file_exists($datafile)) {
-          msg('No configuration metadata found at - '.htmlspecialchars($datafile),-1);
-          return;
-        }
-        $meta = array();
-        include($datafile);
+    class configuration {
 
-        if (isset($config['varname'])) $this->_name = $config['varname'];
-        if (isset($config['format'])) $this->_format = $config['format'];
-        if (isset($config['heading'])) $this->_heading = $config['heading'];
+        var $_name = 'conf';           // name of the config variable found in the files (overridden by $config['varname'])
+        var $_format = 'php';          // format of the config file, supported formats - php (overridden by $config['format'])
+        var $_heading = '';            // heading string written at top of config file - don't include comment indicators
+        var $_loaded = false;          // set to true after configuration files are loaded
+        var $_metadata = array();      // holds metadata describing the settings
+        var $setting = array();        // array of setting objects
+        var $locked = false;           // configuration is considered locked if it can't be updated
+        var $show_disabled_plugins = false;
 
-        $this->_default_files = $config_cascade['main']['default'];
-        $this->_local_files = $config_cascade['main']['local'];
-        $this->_protected_files = $config_cascade['main']['protected'];
+        // configuration filenames
+        var $_default_files  = array();
+        var $_local_files = array();      // updated configuration is written to the first file
+        var $_protected_files = array();
 
-        $this->locked = $this->_is_locked();
-        $this->_metadata = array_merge($meta, $this->get_plugintpl_metadata($conf['template']));
-        $this->retrieve_settings();
-    }
+        var $_plugin_list = null;
 
-    function retrieve_settings() {
-        global $conf;
-        $no_default_check = array('setting_fieldset', 'setting_undefined', 'setting_no_class');
+        /**
+         *  constructor
+         */
+        function configuration($datafile) {
+            global $conf, $config_cascade;
 
-        if (!$this->_loaded) {
-          $default = array_merge($this->get_plugintpl_default($conf['template']), $this->_read_config_group($this->_default_files));
-          $local = $this->_read_config_group($this->_local_files);
-          $protected = $this->_read_config_group($this->_protected_files);
+            if (!@file_exists($datafile)) {
+                msg('No configuration metadata found at - '.htmlspecialchars($datafile),-1);
+                return;
+            }
+            $meta = array();
+            include($datafile);
 
-          $keys = array_merge(array_keys($this->_metadata),array_keys($default), array_keys($local), array_keys($protected));
-          $keys = array_unique($keys);
+            if (isset($config['varname'])) $this->_name = $config['varname'];
+            if (isset($config['format'])) $this->_format = $config['format'];
+            if (isset($config['heading'])) $this->_heading = $config['heading'];
 
-          $param = null;
-          foreach ($keys as $key) {
-            if (isset($this->_metadata[$key])) {
-              $class = $this->_metadata[$key][0];
+            $this->_default_files = $config_cascade['main']['default'];
+            $this->_local_files = $config_cascade['main']['local'];
+            $this->_protected_files = $config_cascade['main']['protected'];
 
-              if($class && class_exists('setting_'.$class)){
-                $class = 'setting_'.$class;
-              } else {
-                if($class != '') {
-                  $this->setting[] = new setting_no_class($key,$param);
+            $this->locked = $this->_is_locked();
+            $this->_metadata = array_merge($meta, $this->get_plugintpl_metadata($conf['template']));
+            $this->retrieve_settings();
+        }
+
+        function retrieve_settings() {
+            global $conf;
+            $no_default_check = array('setting_fieldset', 'setting_undefined', 'setting_no_class');
+
+            if (!$this->_loaded) {
+                $default = array_merge($this->get_plugintpl_default($conf['template']), $this->_read_config_group($this->_default_files));
+                $local = $this->_read_config_group($this->_local_files);
+                $protected = $this->_read_config_group($this->_protected_files);
+
+                $keys = array_merge(array_keys($this->_metadata),array_keys($default), array_keys($local), array_keys($protected));
+                $keys = array_unique($keys);
+
+                $param = null;
+                foreach ($keys as $key) {
+                    if (isset($this->_metadata[$key])) {
+                        $class = $this->_metadata[$key][0];
+
+                        if($class && class_exists('setting_'.$class)){
+                            $class = 'setting_'.$class;
+                        } else {
+                            if($class != '') {
+                                $this->setting[] = new setting_no_class($key,$param);
+                            }
+                            $class = 'setting';
+                        }
+
+                        $param = $this->_metadata[$key];
+                        array_shift($param);
+                    } else {
+                        $class = 'setting_undefined';
+                        $param = null;
+                    }
+
+                    if (!in_array($class, $no_default_check) && !isset($default[$key])) {
+                        $this->setting[] = new setting_no_default($key,$param);
+                    }
+
+                    $this->setting[$key] = new $class($key,$param);
+                    $this->setting[$key]->initialize($default[$key],$local[$key],$protected[$key]);
                 }
-                $class = 'setting';
-              }
 
-              $param = $this->_metadata[$key];
-              array_shift($param);
-            } else {
-              $class = 'setting_undefined';
-              $param = null;
+                $this->_loaded = true;
             }
+        }
 
-            if (!in_array($class, $no_default_check) && !isset($default[$key])) {
-              $this->setting[] = new setting_no_default($key,$param);
-            }
+        function save_settings($id, $header='', $backup=true) {
+            global $conf;
 
-            $this->setting[$key] = new $class($key,$param);
-            $this->setting[$key]->initialize($default[$key],$local[$key],$protected[$key]);
-          }
+            if ($this->locked) return false;
 
-          $this->_loaded = true;
-        }
-    }
-
-    function save_settings($id, $header='', $backup=true) {
-      global $conf;
+            // write back to the last file in the local config cascade
+            $file = end($this->_local_files);
 
-      if ($this->locked) return false;
+            // backup current file (remove any existing backup)
+            if (@file_exists($file) && $backup) {
+                if (@file_exists($file.'.bak')) @unlink($file.'.bak');
+                if (!io_rename($file, $file.'.bak')) return false;
+            }
 
-      // write back to the last file in the local config cascade
-      $file = end($this->_local_files);
+            if (!$fh = @fopen($file, 'wb')) {
+                io_rename($file.'.bak', $file);     // problem opening, restore the backup
+                return false;
+            }
 
-      // backup current file (remove any existing backup)
-      if (@file_exists($file) && $backup) {
-        if (@file_exists($file.'.bak')) @unlink($file.'.bak');
-        if (!io_rename($file, $file.'.bak')) return false;
-      }
+            if (empty($header)) $header = $this->_heading;
 
-      if (!$fh = @fopen($file, 'wb')) {
-        io_rename($file.'.bak', $file);     // problem opening, restore the backup
-        return false;
-      }
+            $out = $this->_out_header($id,$header);
 
-      if (empty($header)) $header = $this->_heading;
+            foreach ($this->setting as $setting) {
+                $out .= $setting->out($this->_name, $this->_format);
+            }
 
-      $out = $this->_out_header($id,$header);
+            $out .= $this->_out_footer();
 
-      foreach ($this->setting as $setting) {
-        $out .= $setting->out($this->_name, $this->_format);
-      }
+            @fwrite($fh, $out);
+            fclose($fh);
+            if($conf['fperm']) chmod($file, $conf['fperm']);
+            return true;
+        }
 
-      $out .= $this->_out_footer();
+        /**
+         * Update last modified time stamp of the config file
+         */
+        function touch_settings(){
+            if ($this->locked) return false;
+            $file = end($this->_local_files);
+            return @touch($file);
+        }
 
-      @fwrite($fh, $out);
-      fclose($fh);
-      if($conf['fperm']) chmod($file, $conf['fperm']);
-      return true;
-    }
+        function _read_config_group($files) {
+            $config = array();
+            foreach ($files as $file) {
+                $config = array_merge($config, $this->_read_config($file));
+            }
 
-    /**
-     * Update last modified time stamp of the config file
-     */
-    function touch_settings(){
-        if ($this->locked) return false;
-        $file = end($this->_local_files);
-        return @touch($file);
-    }
+            return $config;
+        }
 
-    function _read_config_group($files) {
-      $config = array();
-      foreach ($files as $file) {
-        $config = array_merge($config, $this->_read_config($file));
-      }
+        /**
+         * return an array of config settings
+         */
+        function _read_config($file) {
 
-      return $config;
-    }
+            if (!$file) return array();
 
-    /**
-     * return an array of config settings
-     */
-    function _read_config($file) {
+            $config = array();
 
-      if (!$file) return array();
+            if ($this->_format == 'php') {
 
-      $config = array();
+                if(@file_exists($file)){
+                    $contents = @php_strip_whitespace($file);
+                }else{
+                    $contents = '';
+                }
+                $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|$))/s';
+                $matches=array();
+                preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER);
 
-      if ($this->_format == 'php') {
+                for ($i=0; $i<count($matches); $i++) {
+                    $value = $matches[$i][2];
 
-        if(@file_exists($file)){
-            $contents = @php_strip_whitespace($file);
-        }else{
-            $contents = '';
-        }
-        $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|$))/s';
-        $matches=array();
-        preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER);
 
-        for ($i=0; $i<count($matches); $i++) {
-          $value = $matches[$i][2];
+                    // correct issues with the incoming data
+                    // FIXME ... for now merge multi-dimensional array indices using ____
+                    $key = preg_replace('/.\]\[./',CM_KEYMARKER,$matches[$i][1]);
 
 
-          // correct issues with the incoming data
-          // FIXME ... for now merge multi-dimensional array indices using ____
-          $key = preg_replace('/.\]\[./',CM_KEYMARKER,$matches[$i][1]);
+                    // handle arrays
+                    if(preg_match('/^array ?\((.*)\)/', $value, $match)){
+                        $arr = explode(',', $match[1]);
 
+                        // remove quotes from quoted strings & unescape escaped data
+                        $len = count($arr);
+                        for($j=0; $j<$len; $j++){
+                            $arr[$j] = trim($arr[$j]);
+                            $arr[$j] = preg_replace('/^(\'|")(.*)(?<!\\\\)\1$/s','$2',$arr[$j]);
+                            $arr[$j] = strtr($arr[$j], array('\\\\'=>'\\','\\\''=>'\'','\\"'=>'"'));
+                        }
 
-          // handle arrays
-          if(preg_match('/^array ?\((.*)\)/', $value, $match)){
-            $arr = explode(',', $match[1]);
+                        $value = $arr;
+                    }else{
+                        // remove quotes from quoted strings & unescape escaped data
+                        $value = preg_replace('/^(\'|")(.*)(?<!\\\\)\1$/s','$2',$value);
+                        $value = strtr($value, array('\\\\'=>'\\','\\\''=>'\'','\\"'=>'"'));
+                    }
 
-            // remove quotes from quoted strings & unescape escaped data
-            $len = count($arr);
-            for($j=0; $j<$len; $j++){
-                $arr[$j] = trim($arr[$j]);
-                $arr[$j] = preg_replace('/^(\'|")(.*)(?<!\\\\)\1$/s','$2',$arr[$j]);
-                $arr[$j] = strtr($arr[$j], array('\\\\'=>'\\','\\\''=>'\'','\\"'=>'"'));
+                    $config[$key] = $value;
+                }
             }
 
-            $value = $arr;
-          }else{
-            // remove quotes from quoted strings & unescape escaped data
-            $value = preg_replace('/^(\'|")(.*)(?<!\\\\)\1$/s','$2',$value);
-            $value = strtr($value, array('\\\\'=>'\\','\\\''=>'\'','\\"'=>'"'));
-          }
-
-          $config[$key] = $value;
+            return $config;
         }
-      }
 
-      return $config;
-    }
+        function _out_header($id, $header) {
+            $out = '';
+            if ($this->_format == 'php') {
+                $out .= '<'.'?php'."\n".
+                      "/*\n".
+                      " * ".$header."\n".
+                      " * Auto-generated by ".$id." plugin\n".
+                      " * Run for user: ".$_SERVER['REMOTE_USER']."\n".
+                      " * Date: ".date('r')."\n".
+                      " */\n\n";
+            }
 
-    function _out_header($id, $header) {
-      $out = '';
-      if ($this->_format == 'php') {
-          $out .= '<'.'?php'."\n".
-                "/*\n".
-                " * ".$header."\n".
-                " * Auto-generated by ".$id." plugin\n".
-                " * Run for user: ".$_SERVER['REMOTE_USER']."\n".
-                " * Date: ".date('r')."\n".
-                " */\n\n";
-      }
-
-      return $out;
-    }
+            return $out;
+        }
 
-    function _out_footer() {
-      $out = '';
-      if ($this->_format == 'php') {
-          $out .= "\n// end auto-generated content\n";
-      }
+        function _out_footer() {
+            $out = '';
+            if ($this->_format == 'php') {
+                $out .= "\n// end auto-generated content\n";
+            }
 
-      return $out;
-    }
+            return $out;
+        }
 
-    // configuration is considered locked if there is no local settings filename
-    // or the directory its in is not writable or the file exists and is not writable
-    function _is_locked() {
-      if (!$this->_local_files) return true;
+        // configuration is considered locked if there is no local settings filename
+        // or the directory its in is not writable or the file exists and is not writable
+        function _is_locked() {
+            if (!$this->_local_files) return true;
 
-      $local = $this->_local_files[0];
+            $local = $this->_local_files[0];
 
-      if (!is_writable(dirname($local))) return true;
-      if (@file_exists($local) && !is_writable($local)) return true;
+            if (!is_writable(dirname($local))) return true;
+            if (@file_exists($local) && !is_writable($local)) return true;
 
-      return false;
-    }
+            return false;
+        }
 
-    /**
-     *  not used ... conf's contents are an array!
-     *  reduce any multidimensional settings to one dimension using CM_KEYMARKER
-     */
-    function _flatten($conf,$prefix='') {
+        /**
+         *  not used ... conf's contents are an array!
+         *  reduce any multidimensional settings to one dimension using CM_KEYMARKER
+         */
+        function _flatten($conf,$prefix='') {
 
-        $out = array();
+            $out = array();
 
-        foreach($conf as $key => $value) {
-          if (!is_array($value)) {
-            $out[$prefix.$key] = $value;
-            continue;
-          }
+            foreach($conf as $key => $value) {
+                if (!is_array($value)) {
+                    $out[$prefix.$key] = $value;
+                    continue;
+                }
+
+                $tmp = $this->_flatten($value,$prefix.$key.CM_KEYMARKER);
+                $out = array_merge($out,$tmp);
+            }
 
-          $tmp = $this->_flatten($value,$prefix.$key.CM_KEYMARKER);
-          $out = array_merge($out,$tmp);
+            return $out;
         }
 
-        return $out;
-    }
+        function get_plugin_list() {
+            if (is_null($this->_plugin_list)) {
+                $list = plugin_list('',$this->show_disabled_plugins);
 
-    function get_plugin_list() {
-      if (is_null($this->_plugin_list)) {
-        $list = plugin_list('',$this->show_disabled_plugins);
+                // remove this plugin from the list
+                $idx = array_search('config',$list);
+                unset($list[$idx]);
 
-        // remove this plugin from the list
-        $idx = array_search('config',$list);
-        unset($list[$idx]);
+                trigger_event('PLUGIN_CONFIG_PLUGINLIST',$list);
+                $this->_plugin_list = $list;
+            }
 
-        trigger_event('PLUGIN_CONFIG_PLUGINLIST',$list);
-        $this->_plugin_list = $list;
-      }
+            return $this->_plugin_list;
+        }
 
-      return $this->_plugin_list;
-    }
+        /**
+         * load metadata for plugin and template settings
+         */
+        function get_plugintpl_metadata($tpl){
+            $file     = '/conf/metadata.php';
+            $class    = '/conf/settings.class.php';
+            $metadata = array();
+
+            foreach ($this->get_plugin_list() as $plugin) {
+                $plugin_dir = plugin_directory($plugin);
+                if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
+                    $meta = array();
+                    @include(DOKU_PLUGIN.$plugin_dir.$file);
+                    @include(DOKU_PLUGIN.$plugin_dir.$class);
+                    if (!empty($meta)) {
+                        $metadata['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'] = array('fieldset');
+                    }
+                    foreach ($meta as $key => $value){
+                        if ($value[0]=='fieldset') { continue; } //plugins only get one fieldset
+                        $metadata['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
+                    }
+                }
+            }
 
-    /**
-     * load metadata for plugin and template settings
-     */
-    function get_plugintpl_metadata($tpl){
-      $file     = '/conf/metadata.php';
-      $class    = '/conf/settings.class.php';
-      $metadata = array();
-
-      foreach ($this->get_plugin_list() as $plugin) {
-        $plugin_dir = plugin_directory($plugin);
-        if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
-          $meta = array();
-          @include(DOKU_PLUGIN.$plugin_dir.$file);
-          @include(DOKU_PLUGIN.$plugin_dir.$class);
-          if (!empty($meta)) {
-             $metadata['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'] = array('fieldset');
-          }
-          foreach ($meta as $key => $value){
-            if ($value[0]=='fieldset') { continue; } //plugins only get one fieldset
-            $metadata['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
-          }
-        }
-      }
-
-      // the same for the active template
-      if (@file_exists(tpl_incdir().$file)){
-        $meta = array();
-        @include(tpl_incdir().$file);
-        @include(tpl_incdir().$class);
-        if (!empty($meta)) {
-          $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset');
-        }
-        foreach ($meta as $key => $value){
-          if ($value[0]=='fieldset') { continue; } //template only gets one fieldset
-          $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+            // the same for the active template
+            if (@file_exists(tpl_incdir().$file)){
+                $meta = array();
+                @include(tpl_incdir().$file);
+                @include(tpl_incdir().$class);
+                if (!empty($meta)) {
+                    $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset');
+                }
+                foreach ($meta as $key => $value){
+                    if ($value[0]=='fieldset') { continue; } //template only gets one fieldset
+                    $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+                }
+            }
+
+            return $metadata;
         }
-      }
 
-      return $metadata;
-    }
+        /**
+         * load default settings for plugins and templates
+         */
+        function get_plugintpl_default($tpl){
+            $file    = '/conf/default.php';
+            $default = array();
+
+            foreach ($this->get_plugin_list() as $plugin) {
+                $plugin_dir = plugin_directory($plugin);
+                if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
+                    $conf = array();
+                    @include(DOKU_PLUGIN.$plugin_dir.$file);
+                    foreach ($conf as $key => $value){
+                        $default['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
+                    }
+                }
+            }
 
-    /**
-     * load default settings for plugins and templates
-     */
-    function get_plugintpl_default($tpl){
-      $file    = '/conf/default.php';
-      $default = array();
-
-      foreach ($this->get_plugin_list() as $plugin) {
-        $plugin_dir = plugin_directory($plugin);
-        if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
-          $conf = array();
-          @include(DOKU_PLUGIN.$plugin_dir.$file);
-          foreach ($conf as $key => $value){
-            $default['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
-          }
-        }
-      }
-
-      // the same for the active template
-      if (@file_exists(tpl_incdir().$file)){
-        $conf = array();
-        @include(tpl_incdir().$file);
-        foreach ($conf as $key => $value){
-          $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+            // the same for the active template
+            if (@file_exists(tpl_incdir().$file)){
+                $conf = array();
+                @include(tpl_incdir().$file);
+                foreach ($conf as $key => $value){
+                    $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+                }
+            }
+
+            return $default;
         }
-      }
 
-      return $default;
     }
-
-  }
 }
 
 if (!class_exists('setting')) {
-  class setting {
+    class setting {
 
-    var $_key = '';
-    var $_default = null;
-    var $_local = null;
-    var $_protected = null;
+        var $_key = '';
+        var $_default = null;
+        var $_local = null;
+        var $_protected = null;
 
-    var $_pattern = '';
-    var $_error = false;            // only used by those classes which error check
-    var $_input = null;             // only used by those classes which error check
-    var $_caution = null;           // used by any setting to provide an alert along with the setting
-                                    // valid alerts, 'warning', 'danger', 'security'
-                                    // images matching the alerts are in the plugin's images directory
+        var $_pattern = '';
+        var $_error = false;            // only used by those classes which error check
+        var $_input = null;             // only used by those classes which error check
+        var $_caution = null;           // used by any setting to provide an alert along with the setting
+                                        // valid alerts, 'warning', 'danger', 'security'
+                                        // images matching the alerts are in the plugin's images directory
 
-    static protected $_validCautions = array('warning','danger','security');
+        static protected $_validCautions = array('warning','danger','security');
 
-    function setting($key, $params=null) {
-        $this->_key = $key;
+        function setting($key, $params=null) {
+            $this->_key = $key;
 
-        if (is_array($params)) {
-          foreach($params as $property => $value) {
-            $this->$property = $value;
-          }
+            if (is_array($params)) {
+                foreach($params as $property => $value) {
+                    $this->$property = $value;
+                }
+            }
         }
-    }
-
-    /**
-     *  receives current values for the setting $key
-     */
-    function initialize($default, $local, $protected) {
-        if (isset($default)) $this->_default = $default;
-        if (isset($local)) $this->_local = $local;
-        if (isset($protected)) $this->_protected = $protected;
-    }
 
-    /**
-     *  update changed setting with user provided value $input
-     *  - if changed value fails error check, save it to $this->_input (to allow echoing later)
-     *  - if changed value passes error check, set $this->_local to the new value
-     *
-     *  @param  mixed   $input   the new value
-     *  @return boolean          true if changed, false otherwise (incl. on error)
-     */
-    function update($input) {
-        if (is_null($input)) return false;
-        if ($this->is_protected()) return false;
-
-        $value = is_null($this->_local) ? $this->_default : $this->_local;
-        if ($value == $input) return false;
-
-        if ($this->_pattern && !preg_match($this->_pattern,$input)) {
-          $this->_error = true;
-          $this->_input = $input;
-          return false;
+        /**
+         *  receives current values for the setting $key
+         */
+        function initialize($default, $local, $protected) {
+            if (isset($default)) $this->_default = $default;
+            if (isset($local)) $this->_local = $local;
+            if (isset($protected)) $this->_protected = $protected;
         }
 
-        $this->_local = $input;
-        return true;
-    }
+        /**
+         *  update changed setting with user provided value $input
+         *  - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         *  - if changed value passes error check, set $this->_local to the new value
+         *
+         *  @param  mixed   $input   the new value
+         *  @return boolean          true if changed, false otherwise (incl. on error)
+         */
+        function update($input) {
+            if (is_null($input)) return false;
+            if ($this->is_protected()) return false;
 
-    /**
-     *  @return   array(string $label_html, string $input_html)
-     */
-    function html(&$plugin, $echo=false) {
-        $value = '';
-        $disable = '';
-
-        if ($this->is_protected()) {
-          $value = $this->_protected;
-          $disable = 'disabled="disabled"';
-        } else {
-          if ($echo && $this->_error) {
-            $value = $this->_input;
-          } else {
             $value = is_null($this->_local) ? $this->_default : $this->_local;
-          }
-        }
+            if ($value == $input) return false;
 
-        $key = htmlspecialchars($this->_key);
-        $value = formText($value);
+            if ($this->_pattern && !preg_match($this->_pattern,$input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
 
-        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
-        $input = '<textarea rows="3" cols="40" id="config___'.$key.'" name="config['.$key.']" class="edit" '.$disable.'>'.$value.'</textarea>';
-        return array($label,$input);
-    }
+            $this->_local = $input;
+            return true;
+        }
 
-    /**
-     *  generate string to save setting value to file according to $fmt
-     */
-    function out($var, $fmt='php') {
+        /**
+         *  @return   array(string $label_html, string $input_html)
+         */
+        function html(&$plugin, $echo=false) {
+            $value = '';
+            $disable = '';
 
-      if ($this->is_protected()) return '';
-      if (is_null($this->_local) || ($this->_default == $this->_local)) return '';
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = 'disabled="disabled"';
+            } else {
+                if ($echo && $this->_error) {
+                    $value = $this->_input;
+                } else {
+                    $value = is_null($this->_local) ? $this->_default : $this->_local;
+                }
+            }
 
-      $out = '';
+            $key = htmlspecialchars($this->_key);
+            $value = formText($value);
 
-      if ($fmt=='php') {
-        $tr = array("\\" => '\\\\', "'" => '\\\'');
+            $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
+            $input = '<textarea rows="3" cols="40" id="config___'.$key.'" name="config['.$key.']" class="edit" '.$disable.'>'.$value.'</textarea>';
+            return array($label,$input);
+        }
 
-        $out =  '$'.$var."['".$this->_out_key()."'] = '".strtr( cleanText($this->_local), $tr)."';\n";
-      }
+        /**
+         *  generate string to save setting value to file according to $fmt
+         */
+        function out($var, $fmt='php') {
 
-      return $out;
-    }
+            if ($this->is_protected()) return '';
+            if (is_null($this->_local) || ($this->_default == $this->_local)) return '';
 
-    function prompt(&$plugin) {
-      $prompt = $plugin->getLang($this->_key);
-      if (!$prompt) $prompt = htmlspecialchars(str_replace(array('____','_'),' ',$this->_key));
-      return $prompt;
-    }
+            $out = '';
 
-    function is_protected() { return !is_null($this->_protected); }
-    function is_default() { return !$this->is_protected() && is_null($this->_local); }
-    function error() { return $this->_error; }
+            if ($fmt=='php') {
+                $tr = array("\\" => '\\\\', "'" => '\\\'');
 
-    function caution() {
-        if (!empty($this->_caution)) {
-            if (!in_array($this->_caution, setting::$_validCautions)) {
-                trigger_error('Invalid caution string ('.$this->_caution.') in metadata for setting "'.$this->_key.'"', E_USER_WARNING);
-                return false;
+                $out =  '$'.$var."['".$this->_out_key()."'] = '".strtr( cleanText($this->_local), $tr)."';\n";
             }
-            return $this->_caution;
+
+            return $out;
         }
-        // compatibility with previous cautionList
-        // TODO: check if any plugins use; remove
-        if (!empty($this->_cautionList[$this->_key])) {
-            $this->_caution = $this->_cautionList[$this->_key];
-            unset($this->_cautionList);
 
-            return $this->caution();
+        function prompt(&$plugin) {
+            $prompt = $plugin->getLang($this->_key);
+            if (!$prompt) $prompt = htmlspecialchars(str_replace(array('____','_'),' ',$this->_key));
+            return $prompt;
         }
-        return false;
-    }
 
-    function _out_key($pretty=false,$url=false) {
-        if($pretty){
-            $out = str_replace(CM_KEYMARKER,"»",$this->_key);
-            if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc.
-                if ($out == 'start') //one exception
-                    return '<a href="http://www.dokuwiki.org/config:startpage">'.$out.'</a>';
-                else
-                    return '<a href="http://www.dokuwiki.org/config:'.$out.'">'.$out.'</a>';
+        function is_protected() { return !is_null($this->_protected); }
+        function is_default() { return !$this->is_protected() && is_null($this->_local); }
+        function error() { return $this->_error; }
+
+        function caution() {
+            if (!empty($this->_caution)) {
+                if (!in_array($this->_caution, setting::$_validCautions)) {
+                    trigger_error('Invalid caution string ('.$this->_caution.') in metadata for setting "'.$this->_key.'"', E_USER_WARNING);
+                    return false;
+                }
+                return $this->_caution;
+            }
+            // compatibility with previous cautionList
+            // TODO: check if any plugins use; remove
+            if (!empty($this->_cautionList[$this->_key])) {
+                $this->_caution = $this->_cautionList[$this->_key];
+                unset($this->_cautionList);
+
+                return $this->caution();
+            }
+            return false;
+        }
+
+        function _out_key($pretty=false,$url=false) {
+            if($pretty){
+                $out = str_replace(CM_KEYMARKER,"»",$this->_key);
+                if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc.
+                    if ($out == 'start') //one exception
+                        return '<a href="http://www.dokuwiki.org/config:startpage">'.$out.'</a>';
+                    else
+                        return '<a href="http://www.dokuwiki.org/config:'.$out.'">'.$out.'</a>';
+                }
+                return $out;
+            }else{
+                return str_replace(CM_KEYMARKER,"']['",$this->_key);
             }
-            return $out;
-        }else{
-            return str_replace(CM_KEYMARKER,"']['",$this->_key);
         }
     }
-  }
 }
 
 
@@ -612,178 +612,178 @@ if (!class_exists('setting_array')) {
 }
 
 if (!class_exists('setting_string')) {
-  class setting_string extends setting {
-    function html(&$plugin, $echo=false) {
-        $value = '';
-        $disable = '';
-
-        if ($this->is_protected()) {
-          $value = $this->_protected;
-          $disable = 'disabled="disabled"';
-        } else {
-          if ($echo && $this->_error) {
-            $value = $this->_input;
-          } else {
-            $value = is_null($this->_local) ? $this->_default : $this->_local;
-          }
-        }
+    class setting_string extends setting {
+        function html(&$plugin, $echo=false) {
+            $value = '';
+            $disable = '';
+
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = 'disabled="disabled"';
+            } else {
+                if ($echo && $this->_error) {
+                    $value = $this->_input;
+                } else {
+                    $value = is_null($this->_local) ? $this->_default : $this->_local;
+                }
+            }
 
-        $key = htmlspecialchars($this->_key);
-        $value = htmlspecialchars($value);
+            $key = htmlspecialchars($this->_key);
+            $value = htmlspecialchars($value);
 
-        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
-        $input = '<input id="config___'.$key.'" name="config['.$key.']" type="text" class="edit" value="'.$value.'" '.$disable.'/>';
-        return array($label,$input);
+            $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
+            $input = '<input id="config___'.$key.'" name="config['.$key.']" type="text" class="edit" value="'.$value.'" '.$disable.'/>';
+            return array($label,$input);
+        }
     }
-  }
 }
 
 if (!class_exists('setting_password')) {
-  class setting_password extends setting_string {
+    class setting_password extends setting_string {
 
-    var $_code = 'plain';  // mechanism to be used to obscure passwords
+        var $_code = 'plain';  // mechanism to be used to obscure passwords
 
-    function update($input) {
-        if ($this->is_protected()) return false;
-        if (!$input) return false;
+        function update($input) {
+            if ($this->is_protected()) return false;
+            if (!$input) return false;
 
-        if ($this->_pattern && !preg_match($this->_pattern,$input)) {
-          $this->_error = true;
-          $this->_input = $input;
-          return false;
-        }
+            if ($this->_pattern && !preg_match($this->_pattern,$input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
 
-        $this->_local = conf_encodeString($input,$this->_code);
-        return true;
-    }
+            $this->_local = conf_encodeString($input,$this->_code);
+            return true;
+        }
 
-    function html(&$plugin, $echo=false) {
+        function html(&$plugin, $echo=false) {
 
-        $value = '';
-        $disable = $this->is_protected() ? 'disabled="disabled"' : '';
+            $value = '';
+            $disable = $this->is_protected() ? 'disabled="disabled"' : '';
 
-        $key = htmlspecialchars($this->_key);
+            $key = htmlspecialchars($this->_key);
 
-        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
-        $input = '<input id="config___'.$key.'" name="config['.$key.']" autocomplete="off" type="password" class="edit" value="" '.$disable.' />';
-        return array($label,$input);
+            $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
+            $input = '<input id="config___'.$key.'" name="config['.$key.']" autocomplete="off" type="password" class="edit" value="" '.$disable.' />';
+            return array($label,$input);
+        }
     }
-  }
 }
 
 if (!class_exists('setting_email')) {
 
-  class setting_email extends setting_string {
-    var $_multiple = false;
-    var $_placeholders = false;
-
-    /**
-     *  update setting with user provided value $input
-     *  if value fails error check, save it
-     *
-     *  @return boolean true if changed, false otherwise (incl. on error)
-     */
-    function update($input) {
-        if (is_null($input)) return false;
-        if ($this->is_protected()) return false;
-
-        $value = is_null($this->_local) ? $this->_default : $this->_local;
-        if ($value == $input) return false;
-        if($input === ''){
-            $this->_local = $input;
-            return true;
-        }
-        $mail = $input;
+    class setting_email extends setting_string {
+        var $_multiple = false;
+        var $_placeholders = false;
 
-        if($this->_placeholders){
-            // replace variables with pseudo values
-            $mail = str_replace('@USER@','joe',$mail);
-            $mail = str_replace('@NAME@','Joe Schmoe',$mail);
-            $mail = str_replace('@MAIL@','joe@example.com',$mail);
-        }
+        /**
+         *  update setting with user provided value $input
+         *  if value fails error check, save it
+         *
+         *  @return boolean true if changed, false otherwise (incl. on error)
+         */
+        function update($input) {
+            if (is_null($input)) return false;
+            if ($this->is_protected()) return false;
 
-        // multiple mail addresses?
-        if ($this->_multiple) {
-            $mails = array_filter(array_map('trim', explode(',', $mail)));
-        } else {
-            $mails = array($mail);
-        }
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
+            if($input === ''){
+                $this->_local = $input;
+                return true;
+            }
+            $mail = $input;
 
-        // check them all
-        foreach ($mails as $mail) {
-            // only check the address part
-            if(preg_match('#(.*?)<(.*?)>#', $mail, $matches)){
-                $addr = $matches[2];
-            }else{
-                $addr = $mail;
+            if($this->_placeholders){
+                // replace variables with pseudo values
+                $mail = str_replace('@USER@','joe',$mail);
+                $mail = str_replace('@NAME@','Joe Schmoe',$mail);
+                $mail = str_replace('@MAIL@','joe@example.com',$mail);
             }
 
-            if (!mail_isvalid($addr)) {
-              $this->_error = true;
-              $this->_input = $input;
-              return false;
+            // multiple mail addresses?
+            if ($this->_multiple) {
+                $mails = array_filter(array_map('trim', explode(',', $mail)));
+            } else {
+                $mails = array($mail);
             }
-        }
 
-        $this->_local = $input;
-        return true;
+            // check them all
+            foreach ($mails as $mail) {
+                // only check the address part
+                if(preg_match('#(.*?)<(.*?)>#', $mail, $matches)){
+                    $addr = $matches[2];
+                }else{
+                    $addr = $mail;
+                }
+
+                if (!mail_isvalid($addr)) {
+                    $this->_error = true;
+                    $this->_input = $input;
+                    return false;
+                }
+            }
+
+            $this->_local = $input;
+            return true;
+        }
     }
-  }
 }
 
 /**
  * @deprecated 2013-02-16
  */
 if (!class_exists('setting_richemail')) {
-  class setting_richemail extends setting_email {
-      function update($input) {
-          $this->_placeholders = true;
-          return parent::update($input);
-      }
-  }
+    class setting_richemail extends setting_email {
+        function update($input) {
+            $this->_placeholders = true;
+            return parent::update($input);
+        }
+    }
 }
 
 
 if (!class_exists('setting_numeric')) {
-  class setting_numeric extends setting_string {
-    // This allows for many PHP syntax errors...
-    // var $_pattern = '/^[-+\/*0-9 ]*$/';
-    // much more restrictive, but should eliminate syntax errors.
-    var $_pattern = '/^[-+]? *[0-9]+ *(?:[-+*] *[0-9]+ *)*$/';
-    var $_min = null;
-    var $_max = null;
-
-    function update($input) {
-        $local = $this->_local;
-        $valid = parent::update($input);
-        if ($valid && !(is_null($this->_min) && is_null($this->_max))) {
-            $numeric_local = (int) eval('return '.$this->_local.';');
-            if ((!is_null($this->_min) && $numeric_local < $this->_min) ||
-                (!is_null($this->_max) && $numeric_local > $this->_max)) {
-                $this->_error = true;
-                $this->_input = $input;
-                $this->_local = $local;
-                $valid = false;
+    class setting_numeric extends setting_string {
+        // This allows for many PHP syntax errors...
+        // var $_pattern = '/^[-+\/*0-9 ]*$/';
+        // much more restrictive, but should eliminate syntax errors.
+        var $_pattern = '/^[-+]? *[0-9]+ *(?:[-+*] *[0-9]+ *)*$/';
+        var $_min = null;
+        var $_max = null;
+
+        function update($input) {
+            $local = $this->_local;
+            $valid = parent::update($input);
+            if ($valid && !(is_null($this->_min) && is_null($this->_max))) {
+                $numeric_local = (int) eval('return '.$this->_local.';');
+                if ((!is_null($this->_min) && $numeric_local < $this->_min) ||
+                    (!is_null($this->_max) && $numeric_local > $this->_max)) {
+                    $this->_error = true;
+                    $this->_input = $input;
+                    $this->_local = $local;
+                    $valid = false;
+                }
             }
+            return $valid;
         }
-        return $valid;
-    }
 
-    function out($var, $fmt='php') {
+        function out($var, $fmt='php') {
 
-      if ($this->is_protected()) return '';
-      if (is_null($this->_local) || ($this->_default == $this->_local)) return '';
+            if ($this->is_protected()) return '';
+            if (is_null($this->_local) || ($this->_default == $this->_local)) return '';
 
-      $out = '';
+            $out = '';
 
-      if ($fmt=='php') {
-        $local = $this->_local === '' ? "''" : $this->_local;
-        $out .=  '$'.$var."['".$this->_out_key()."'] = ".$local.";\n";
-      }
+            if ($fmt=='php') {
+                $local = $this->_local === '' ? "''" : $this->_local;
+                $out .=  '$'.$var."['".$this->_out_key()."'] = ".$local.";\n";
+            }
 
-    return $out;
+            return $out;
+        }
     }
-  }
 }
 
 if (!class_exists('setting_numericopt')) {
@@ -794,309 +794,309 @@ if (!class_exists('setting_numericopt')) {
 }
 
 if (!class_exists('setting_onoff')) {
-  class setting_onoff extends setting_numeric {
+    class setting_onoff extends setting_numeric {
 
-    function html(&$plugin) {
-        $value = '';
-        $disable = '';
+        function html(&$plugin) {
+            $value = '';
+            $disable = '';
 
-        if ($this->is_protected()) {
-          $value = $this->_protected;
-          $disable = ' disabled="disabled"';
-        } else {
-          $value = is_null($this->_local) ? $this->_default : $this->_local;
-        }
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = ' disabled="disabled"';
+            } else {
+                $value = is_null($this->_local) ? $this->_default : $this->_local;
+            }
 
-        $key = htmlspecialchars($this->_key);
-        $checked = ($value) ? ' checked="checked"' : '';
+            $key = htmlspecialchars($this->_key);
+            $checked = ($value) ? ' checked="checked"' : '';
 
-        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
-        $input = '<div class="input"><input id="config___'.$key.'" name="config['.$key.']" type="checkbox" class="checkbox" value="1"'.$checked.$disable.'/></div>';
-        return array($label,$input);
-    }
+            $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
+            $input = '<div class="input"><input id="config___'.$key.'" name="config['.$key.']" type="checkbox" class="checkbox" value="1"'.$checked.$disable.'/></div>';
+            return array($label,$input);
+        }
 
-    function update($input) {
-        if ($this->is_protected()) return false;
+        function update($input) {
+            if ($this->is_protected()) return false;
 
-        $input = ($input) ? 1 : 0;
-        $value = is_null($this->_local) ? $this->_default : $this->_local;
-        if ($value == $input) return false;
+            $input = ($input) ? 1 : 0;
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
 
-        $this->_local = $input;
-        return true;
+            $this->_local = $input;
+            return true;
+        }
     }
-  }
 }
 
 if (!class_exists('setting_multichoice')) {
-  class setting_multichoice extends setting_string {
-    var $_choices = array();
-
-    function html(&$plugin) {
-        $value = '';
-        $disable = '';
-        $nochoice = '';
-
-        if ($this->is_protected()) {
-          $value = $this->_protected;
-          $disable = ' disabled="disabled"';
-        } else {
-          $value = is_null($this->_local) ? $this->_default : $this->_local;
-        }
+    class setting_multichoice extends setting_string {
+        var $_choices = array();
 
-        // ensure current value is included
-        if (!in_array($value, $this->_choices)) {
-            $this->_choices[] = $value;
-        }
-        // disable if no other choices
-        if (!$this->is_protected() && count($this->_choices) <= 1) {
-          $disable = ' disabled="disabled"';
-          $nochoice = $plugin->getLang('nochoice');
-        }
+        function html(&$plugin) {
+            $value = '';
+            $disable = '';
+            $nochoice = '';
 
-        $key = htmlspecialchars($this->_key);
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = ' disabled="disabled"';
+            } else {
+                $value = is_null($this->_local) ? $this->_default : $this->_local;
+            }
 
-        $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
+            // ensure current value is included
+            if (!in_array($value, $this->_choices)) {
+                $this->_choices[] = $value;
+            }
+            // disable if no other choices
+            if (!$this->is_protected() && count($this->_choices) <= 1) {
+                $disable = ' disabled="disabled"';
+                $nochoice = $plugin->getLang('nochoice');
+            }
 
-        $input = "<div class=\"input\">\n";
-        $input .= '<select class="edit" id="config___'.$key.'" name="config['.$key.']"'.$disable.'>'."\n";
-        foreach ($this->_choices as $choice) {
-            $selected = ($value == $choice) ? ' selected="selected"' : '';
-            $option = $plugin->getLang($this->_key.'_o_'.$choice);
-            if (!$option && isset($this->lang[$this->_key.'_o_'.$choice])) $option = $this->lang[$this->_key.'_o_'.$choice];
-            if (!$option) $option = $choice;
+            $key = htmlspecialchars($this->_key);
 
-            $choice = htmlspecialchars($choice);
-            $option = htmlspecialchars($option);
-            $input .= '  <option value="'.$choice.'"'.$selected.' >'.$option.'</option>'."\n";
-        }
-        $input .= "</select> $nochoice \n";
-        $input .= "</div>\n";
+            $label = '<label for="config___'.$key.'">'.$this->prompt($plugin).'</label>';
 
-        return array($label,$input);
-    }
+            $input = "<div class=\"input\">\n";
+            $input .= '<select class="edit" id="config___'.$key.'" name="config['.$key.']"'.$disable.'>'."\n";
+            foreach ($this->_choices as $choice) {
+                $selected = ($value == $choice) ? ' selected="selected"' : '';
+                $option = $plugin->getLang($this->_key.'_o_'.$choice);
+                if (!$option && isset($this->lang[$this->_key.'_o_'.$choice])) $option = $this->lang[$this->_key.'_o_'.$choice];
+                if (!$option) $option = $choice;
+
+                $choice = htmlspecialchars($choice);
+                $option = htmlspecialchars($option);
+                $input .= '  <option value="'.$choice.'"'.$selected.' >'.$option.'</option>'."\n";
+            }
+            $input .= "</select> $nochoice \n";
+            $input .= "</div>\n";
+
+            return array($label,$input);
+        }
 
-    function update($input) {
-        if (is_null($input)) return false;
-        if ($this->is_protected()) return false;
+        function update($input) {
+            if (is_null($input)) return false;
+            if ($this->is_protected()) return false;
 
-        $value = is_null($this->_local) ? $this->_default : $this->_local;
-        if ($value == $input) return false;
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
 
-        if (!in_array($input, $this->_choices)) return false;
+            if (!in_array($input, $this->_choices)) return false;
 
-        $this->_local = $input;
-        return true;
+            $this->_local = $input;
+            return true;
+        }
     }
-  }
 }
 
 
 if (!class_exists('setting_dirchoice')) {
-  class setting_dirchoice extends setting_multichoice {
+    class setting_dirchoice extends setting_multichoice {
 
-    var $_dir = '';
+        var $_dir = '';
 
-    function initialize($default,$local,$protected) {
+        function initialize($default,$local,$protected) {
 
-      // populate $this->_choices with a list of directories
-      $list = array();
+            // populate $this->_choices with a list of directories
+            $list = array();
 
-      if ($dh = @opendir($this->_dir)) {
-        while (false !== ($entry = readdir($dh))) {
-          if ($entry == '.' || $entry == '..') continue;
-          if ($this->_pattern && !preg_match($this->_pattern,$entry)) continue;
+            if ($dh = @opendir($this->_dir)) {
+                while (false !== ($entry = readdir($dh))) {
+                    if ($entry == '.' || $entry == '..') continue;
+                    if ($this->_pattern && !preg_match($this->_pattern,$entry)) continue;
 
-          $file = (is_link($this->_dir.$entry)) ? readlink($this->_dir.$entry) : $this->_dir.$entry;
-          if (is_dir($file)) $list[] = $entry;
-        }
-        closedir($dh);
-      }
-      sort($list);
-      $this->_choices = $list;
+                    $file = (is_link($this->_dir.$entry)) ? readlink($this->_dir.$entry) : $this->_dir.$entry;
+                    if (is_dir($file)) $list[] = $entry;
+                }
+                closedir($dh);
+            }
+            sort($list);
+            $this->_choices = $list;
 
-      parent::initialize($default,$local,$protected);
+            parent::initialize($default,$local,$protected);
+        }
     }
-  }
 }
 
 
 if (!class_exists('setting_hidden')) {
-  class setting_hidden extends setting {
-      // Used to explicitly ignore a setting in the configuration manager.
-  }
+    class setting_hidden extends setting {
+        // Used to explicitly ignore a setting in the configuration manager.
+    }
 }
 
 if (!class_exists('setting_fieldset')) {
-  class setting_fieldset extends setting {
-      // A do-nothing class used to detect the 'fieldset' type.
-      // Used to start a new settings "display-group".
-  }
+    class setting_fieldset extends setting {
+        // A do-nothing class used to detect the 'fieldset' type.
+        // Used to start a new settings "display-group".
+    }
 }
 
 if (!class_exists('setting_undefined')) {
-  class setting_undefined extends setting_hidden {
-      // A do-nothing class used to detect settings with no metadata entry.
-      // Used internaly to hide undefined settings, and generate the undefined settings list.
-  }
+    class setting_undefined extends setting_hidden {
+        // A do-nothing class used to detect settings with no metadata entry.
+        // Used internaly to hide undefined settings, and generate the undefined settings list.
+    }
 }
 
 if (!class_exists('setting_no_class')) {
-  class setting_no_class extends setting_undefined {
-      // A do-nothing class used to detect settings with a missing setting class.
-      // Used internaly to hide undefined settings, and generate the undefined settings list.
-  }
+    class setting_no_class extends setting_undefined {
+        // A do-nothing class used to detect settings with a missing setting class.
+        // Used internaly to hide undefined settings, and generate the undefined settings list.
+    }
 }
 
 if (!class_exists('setting_no_default')) {
-  class setting_no_default extends setting_undefined {
-      // A do-nothing class used to detect settings with no default value.
-      // Used internaly to hide undefined settings, and generate the undefined settings list.
-  }
+    class setting_no_default extends setting_undefined {
+        // A do-nothing class used to detect settings with no default value.
+        // Used internaly to hide undefined settings, and generate the undefined settings list.
+    }
 }
 
 if (!class_exists('setting_multicheckbox')) {
-  class setting_multicheckbox extends setting_string {
+    class setting_multicheckbox extends setting_string {
 
-    var $_choices = array();
-    var $_combine = array();
+        var $_choices = array();
+        var $_combine = array();
 
-    function update($input) {
-        if ($this->is_protected()) return false;
+        function update($input) {
+            if ($this->is_protected()) return false;
 
-        // split any combined values + convert from array to comma separated string
-        $input = ($input) ? $input : array();
-        $input = $this->_array2str($input);
+            // split any combined values + convert from array to comma separated string
+            $input = ($input) ? $input : array();
+            $input = $this->_array2str($input);
 
-        $value = is_null($this->_local) ? $this->_default : $this->_local;
-        if ($value == $input) return false;
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
+
+            if ($this->_pattern && !preg_match($this->_pattern,$input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
 
-        if ($this->_pattern && !preg_match($this->_pattern,$input)) {
-          $this->_error = true;
-          $this->_input = $input;
-          return false;
+            $this->_local = $input;
+            return true;
         }
 
-        $this->_local = $input;
-        return true;
-    }
+        function html(&$plugin, $echo=false) {
 
-    function html(&$plugin, $echo=false) {
+            $value = '';
+            $disable = '';
 
-        $value = '';
-        $disable = '';
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = 'disabled="disabled"';
+            } else {
+                if ($echo && $this->_error) {
+                    $value = $this->_input;
+                } else {
+                    $value = is_null($this->_local) ? $this->_default : $this->_local;
+                }
+            }
 
-        if ($this->is_protected()) {
-          $value = $this->_protected;
-          $disable = 'disabled="disabled"';
-        } else {
-          if ($echo && $this->_error) {
-            $value = $this->_input;
-          } else {
-            $value = is_null($this->_local) ? $this->_default : $this->_local;
-          }
-        }
+            $key = htmlspecialchars($this->_key);
 
-        $key = htmlspecialchars($this->_key);
+            // convert from comma separated list into array + combine complimentary actions
+            $value = $this->_str2array($value);
+            $default = $this->_str2array($this->_default);
 
-        // convert from comma separated list into array + combine complimentary actions
-        $value = $this->_str2array($value);
-        $default = $this->_str2array($this->_default);
+            $input = '';
+            foreach ($this->_choices as $choice) {
+                $idx = array_search($choice, $value);
+                $idx_default = array_search($choice,$default);
 
-        $input = '';
-        foreach ($this->_choices as $choice) {
-          $idx = array_search($choice, $value);
-          $idx_default = array_search($choice,$default);
+                $checked = ($idx !== false) ? 'checked="checked"' : '';
 
-          $checked = ($idx !== false) ? 'checked="checked"' : '';
+                // ideally this would be handled using a second class of "default", however IE6 does not
+                // correctly support CSS selectors referencing multiple class names on the same element
+                // (e.g. .default.selection).
+                $class = (($idx !== false) == (false !== $idx_default)) ? " selectiondefault" : "";
 
-          // ideally this would be handled using a second class of "default", however IE6 does not
-          // correctly support CSS selectors referencing multiple class names on the same element
-          // (e.g. .default.selection).
-          $class = (($idx !== false) == (false !== $idx_default)) ? " selectiondefault" : "";
+                $prompt = ($plugin->getLang($this->_key.'_'.$choice) ?
+                                $plugin->getLang($this->_key.'_'.$choice) : htmlspecialchars($choice));
 
-          $prompt = ($plugin->getLang($this->_key.'_'.$choice) ?
-                          $plugin->getLang($this->_key.'_'.$choice) : htmlspecialchars($choice));
+                $input .= '<div class="selection'.$class.'">'."\n";
+                $input .= '<label for="config___'.$key.'_'.$choice.'">'.$prompt."</label>\n";
+                $input .= '<input id="config___'.$key.'_'.$choice.'" name="config['.$key.'][]" type="checkbox" class="checkbox" value="'.$choice.'" '.$disable.' '.$checked."/>\n";
+                $input .= "</div>\n";
 
-          $input .= '<div class="selection'.$class.'">'."\n";
-          $input .= '<label for="config___'.$key.'_'.$choice.'">'.$prompt."</label>\n";
-          $input .= '<input id="config___'.$key.'_'.$choice.'" name="config['.$key.'][]" type="checkbox" class="checkbox" value="'.$choice.'" '.$disable.' '.$checked."/>\n";
-          $input .= "</div>\n";
+                // remove this action from the disabledactions array
+                if ($idx !== false) unset($value[$idx]);
+                if ($idx_default !== false) unset($default[$idx_default]);
+            }
 
-          // remove this action from the disabledactions array
-          if ($idx !== false) unset($value[$idx]);
-          if ($idx_default !== false) unset($default[$idx_default]);
-        }
+            // handle any remaining values
+            $other = join(',',$value);
 
-        // handle any remaining values
-        $other = join(',',$value);
+            $class = (count($default == count($value)) && (count($value) == count(array_intersect($value,$default)))) ?
+                            " selectiondefault" : "";
 
-        $class = (count($default == count($value)) && (count($value) == count(array_intersect($value,$default)))) ?
-                        " selectiondefault" : "";
+            $input .= '<div class="other'.$class.'">'."\n";
+            $input .= '<label for="config___'.$key.'_other">'.$plugin->getLang($key.'_other')."</label>\n";
+            $input .= '<input id="config___'.$key.'_other" name="config['.$key.'][other]" type="text" class="edit" value="'.htmlspecialchars($other).'" '.$disable." />\n";
+            $input .= "</div>\n";
 
-        $input .= '<div class="other'.$class.'">'."\n";
-        $input .= '<label for="config___'.$key.'_other">'.$plugin->getLang($key.'_other')."</label>\n";
-        $input .= '<input id="config___'.$key.'_other" name="config['.$key.'][other]" type="text" class="edit" value="'.htmlspecialchars($other).'" '.$disable." />\n";
-        $input .= "</div>\n";
+            $label = '<label>'.$this->prompt($plugin).'</label>';
+            return array($label,$input);
+        }
 
-        $label = '<label>'.$this->prompt($plugin).'</label>';
-        return array($label,$input);
-    }
+        /**
+         * convert comma separated list to an array and combine any complimentary values
+         */
+        function _str2array($str) {
+            $array = explode(',',$str);
+
+            if (!empty($this->_combine)) {
+                foreach ($this->_combine as $key => $combinators) {
+                    $idx = array();
+                    foreach ($combinators as $val) {
+                        if  (($idx[] = array_search($val, $array)) === false) break;
+                    }
+
+                    if (count($idx) && $idx[count($idx)-1] !== false) {
+                        foreach ($idx as $i) unset($array[$i]);
+                        $array[] = $key;
+                    }
+                }
+            }
 
-    /**
-     * convert comma separated list to an array and combine any complimentary values
-     */
-    function _str2array($str) {
-      $array = explode(',',$str);
-
-      if (!empty($this->_combine)) {
-        foreach ($this->_combine as $key => $combinators) {
-          $idx = array();
-          foreach ($combinators as $val) {
-            if  (($idx[] = array_search($val, $array)) === false) break;
-          }
-
-          if (count($idx) && $idx[count($idx)-1] !== false) {
-            foreach ($idx as $i) unset($array[$i]);
-            $array[] = $key;
-          }
+            return $array;
         }
-      }
 
-      return $array;
-    }
+        /**
+         * convert array of values + other back to a comma separated list, incl. splitting any combined values
+         */
+        function _array2str($input) {
 
-    /**
-     * convert array of values + other back to a comma separated list, incl. splitting any combined values
-     */
-    function _array2str($input) {
+            // handle other
+            $other = trim($input['other']);
+            $other = !empty($other) ? explode(',',str_replace(' ','',$input['other'])) : array();
+            unset($input['other']);
 
-      // handle other
-      $other = trim($input['other']);
-      $other = !empty($other) ? explode(',',str_replace(' ','',$input['other'])) : array();
-      unset($input['other']);
+            $array = array_unique(array_merge($input, $other));
 
-      $array = array_unique(array_merge($input, $other));
+            // deconstruct any combinations
+            if (!empty($this->_combine)) {
+                foreach ($this->_combine as $key => $combinators) {
 
-      // deconstruct any combinations
-      if (!empty($this->_combine)) {
-       foreach ($this->_combine as $key => $combinators) {
+                    $idx = array_search($key,$array);
+                    if ($idx !== false) {
+                        unset($array[$idx]);
+                        $array = array_merge($array, $combinators);
+                    }
+                }
+            }
 
-          $idx = array_search($key,$array);
-          if ($idx !== false) {
-            unset($array[$idx]);
-            $array = array_merge($array, $combinators);
-          }
+            return join(',',array_unique($array));
         }
-      }
-
-      return join(',',array_unique($array));
     }
-  }
 }
 
 if (!class_exists('setting_regex')){
-   class setting_regex extends setting_string {
+    class setting_regex extends setting_string {
 
         var $_delimiter = '/';    // regex delimiter to be used in testing input
         var $_pregflags = 'ui';   // regex pattern modifiers to be used in testing input
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index e4b97eb01..954178bc1 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -6,204 +6,204 @@
  */
 
 if (!class_exists('setting_sepchar')) {
-  class setting_sepchar extends setting_multichoice {
+    class setting_sepchar extends setting_multichoice {
 
-    function setting_sepchar($key,$param=NULL) {
-        $str = '_-.';
-        for ($i=0;$i<strlen($str);$i++) $this->_choices[] = $str{$i};
+        function setting_sepchar($key,$param=NULL) {
+            $str = '_-.';
+            for ($i=0;$i<strlen($str);$i++) $this->_choices[] = $str{$i};
 
-        // call foundation class constructor
-        $this->setting($key,$param);
+            // call foundation class constructor
+            $this->setting($key,$param);
+        }
     }
-  }
 }
 
 if (!class_exists('setting_savedir')) {
-  class setting_savedir extends setting_string {
+    class setting_savedir extends setting_string {
 
-    function update($input) {
-        if ($this->is_protected()) return false;
+        function update($input) {
+            if ($this->is_protected()) return false;
 
-        $value = is_null($this->_local) ? $this->_default : $this->_local;
-        if ($value == $input) return false;
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
 
-        if (!init_path($input)) {
-          $this->_error = true;
-          $this->_input = $input;
-          return false;
-        }
+            if (!init_path($input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
 
-        $this->_local = $input;
-        return true;
+            $this->_local = $input;
+            return true;
+        }
     }
-  }
 }
 
 if (!class_exists('setting_authtype')) {
-  class setting_authtype extends setting_multichoice {
+    class setting_authtype extends setting_multichoice {
 
-    function initialize($default,$local,$protected) {
-        global $plugin_controller;
+        function initialize($default,$local,$protected) {
+            global $plugin_controller;
 
-        // retrieve auth types provided by plugins
-        foreach ($plugin_controller->getList('auth') as $plugin) {
-            $this->_choices[] = $plugin;
-        }
-
-        parent::initialize($default,$local,$protected);
-    }
-
-    function update($input) {
-        global $plugin_controller;
-
-        // is an update possible/requested?
-        $local = $this->_local;                       // save this, parent::update() may change it
-        if (!parent::update($input)) return false;    // nothing changed or an error caught by parent
-        $this->_local = $local;                       // restore original, more error checking to come
-
-        // attempt to load the plugin
-        $auth_plugin = $plugin_controller->load('auth', $input);
-
-        // @TODO: throw an error in plugin controller instead of returning null
-        if (is_null($auth_plugin)) {
-            $this->_error = true;
-            msg('Cannot load Auth Plugin "' . $input . '"', -1);
-            return false;
-        }
+            // retrieve auth types provided by plugins
+            foreach ($plugin_controller->getList('auth') as $plugin) {
+                $this->_choices[] = $plugin;
+            }
 
-        // verify proper instantiation (is this really a plugin?) @TODO use instanceof? implement interface?
-        if (is_object($auth_plugin) && !method_exists($auth_plugin, 'getPluginName')) {
-            $this->_error = true;
-            msg('Cannot create Auth Plugin "' . $input . '"', -1);
-            return false;
+            parent::initialize($default,$local,$protected);
         }
 
-        // did we change the auth type? logout
-        global $conf;
-        if($conf['authtype'] != $input) {
-            msg('Authentication system changed. Please re-login.');
-            auth_logoff();
+        function update($input) {
+            global $plugin_controller;
+
+            // is an update possible/requested?
+            $local = $this->_local;                       // save this, parent::update() may change it
+            if (!parent::update($input)) return false;    // nothing changed or an error caught by parent
+            $this->_local = $local;                       // restore original, more error checking to come
+
+            // attempt to load the plugin
+            $auth_plugin = $plugin_controller->load('auth', $input);
+
+            // @TODO: throw an error in plugin controller instead of returning null
+            if (is_null($auth_plugin)) {
+                $this->_error = true;
+                msg('Cannot load Auth Plugin "' . $input . '"', -1);
+                return false;
+            }
+
+            // verify proper instantiation (is this really a plugin?) @TODO use instanceof? implement interface?
+            if (is_object($auth_plugin) && !method_exists($auth_plugin, 'getPluginName')) {
+                $this->_error = true;
+                msg('Cannot create Auth Plugin "' . $input . '"', -1);
+                return false;
+            }
+
+            // did we change the auth type? logout
+            global $conf;
+            if($conf['authtype'] != $input) {
+                msg('Authentication system changed. Please re-login.');
+                auth_logoff();
+            }
+
+            $this->_local = $input;
+            return true;
         }
-
-        $this->_local = $input;
-        return true;
     }
-  }
 }
 
 if (!class_exists('setting_im_convert')) {
-  class setting_im_convert extends setting_string {
+    class setting_im_convert extends setting_string {
 
-    function update($input) {
-        if ($this->is_protected()) return false;
+        function update($input) {
+            if ($this->is_protected()) return false;
 
-        $input = trim($input);
+            $input = trim($input);
 
-        $value = is_null($this->_local) ? $this->_default : $this->_local;
-        if ($value == $input) return false;
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
 
-        if ($input && !@file_exists($input)) {
-          $this->_error = true;
-          $this->_input = $input;
-          return false;
-        }
+            if ($input && !@file_exists($input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
 
-        $this->_local = $input;
-        return true;
+            $this->_local = $input;
+            return true;
+        }
     }
-  }
 }
 
 if (!class_exists('setting_disableactions')) {
-  class setting_disableactions extends setting_multicheckbox {
+    class setting_disableactions extends setting_multicheckbox {
 
-    function html(&$plugin, $echo=false) {
-        global $lang;
+        function html(&$plugin, $echo=false) {
+            global $lang;
 
-        // make some language adjustments (there must be a better way)
-        // transfer some DokuWiki language strings to the plugin
-        if (!$plugin->localised) $this->setupLocale();
-        $plugin->lang[$this->_key.'_revisions'] = $lang['btn_revs'];
+            // make some language adjustments (there must be a better way)
+            // transfer some DokuWiki language strings to the plugin
+            if (!$plugin->localised) $this->setupLocale();
+            $plugin->lang[$this->_key.'_revisions'] = $lang['btn_revs'];
 
-        foreach ($this->_choices as $choice)
-          if (isset($lang['btn_'.$choice])) $plugin->lang[$this->_key.'_'.$choice] = $lang['btn_'.$choice];
+            foreach ($this->_choices as $choice)
+              if (isset($lang['btn_'.$choice])) $plugin->lang[$this->_key.'_'.$choice] = $lang['btn_'.$choice];
 
-        return parent::html($plugin, $echo);
+            return parent::html($plugin, $echo);
+        }
     }
-  }
 }
 
 if (!class_exists('setting_compression')) {
-  class setting_compression extends setting_multichoice {
+    class setting_compression extends setting_multichoice {
 
-    var $_choices = array('0');      // 0 = no compression, always supported
+        var $_choices = array('0');      // 0 = no compression, always supported
 
-    function initialize($default,$local,$protected) {
+        function initialize($default,$local,$protected) {
 
-      // populate _choices with the compression methods supported by this php installation
-      if (function_exists('gzopen')) $this->_choices[] = 'gz';
-      if (function_exists('bzopen')) $this->_choices[] = 'bz2';
+            // populate _choices with the compression methods supported by this php installation
+            if (function_exists('gzopen')) $this->_choices[] = 'gz';
+            if (function_exists('bzopen')) $this->_choices[] = 'bz2';
 
-      parent::initialize($default,$local,$protected);
+            parent::initialize($default,$local,$protected);
+        }
     }
-  }
 }
 
 if (!class_exists('setting_license')) {
-  class setting_license extends setting_multichoice {
+    class setting_license extends setting_multichoice {
 
-    var $_choices = array('');      // none choosen
+        var $_choices = array('');      // none choosen
 
-    function initialize($default,$local,$protected) {
-      global $license;
+        function initialize($default,$local,$protected) {
+            global $license;
 
-      foreach($license as $key => $data){
-        $this->_choices[] = $key;
-        $this->lang[$this->_key.'_o_'.$key] = $data['name'];
-      }
+            foreach($license as $key => $data){
+                $this->_choices[] = $key;
+                $this->lang[$this->_key.'_o_'.$key] = $data['name'];
+            }
 
-      parent::initialize($default,$local,$protected);
+            parent::initialize($default,$local,$protected);
+        }
     }
-  }
 }
 
 
 if (!class_exists('setting_renderer')) {
-  class setting_renderer extends setting_multichoice {
-    var $_prompts = array();
+    class setting_renderer extends setting_multichoice {
+        var $_prompts = array();
 
-    function initialize($default,$local,$protected) {
-      $format = $this->_format;
+        function initialize($default,$local,$protected) {
+            $format = $this->_format;
 
-      foreach (plugin_list('renderer') as $plugin) {
-        $renderer =& plugin_load('renderer',$plugin);
-        if (method_exists($renderer,'canRender') && $renderer->canRender($format)) {
-          $this->_choices[] = $plugin;
+            foreach (plugin_list('renderer') as $plugin) {
+                $renderer =& plugin_load('renderer',$plugin);
+                if (method_exists($renderer,'canRender') && $renderer->canRender($format)) {
+                    $this->_choices[] = $plugin;
 
-          $info = $renderer->getInfo();
-          $this->_prompts[$plugin] = $info['name'];
-        }
-      }
-
-      parent::initialize($default,$local,$protected);
-    }
+                    $info = $renderer->getInfo();
+                    $this->_prompts[$plugin] = $info['name'];
+                }
+            }
 
-    function html(&$plugin, $echo=false) {
-
-      // make some language adjustments (there must be a better way)
-      // transfer some plugin names to the config plugin
-      if (!$plugin->localised) $this->setupLocale();
+            parent::initialize($default,$local,$protected);
+        }
 
-      foreach ($this->_choices as $choice) {
-        if (!isset($plugin->lang[$this->_key.'_o_'.$choice])) {
-          if (!isset($this->_prompts[$choice])) {
-            $plugin->lang[$this->_key.'_o_'.$choice] = sprintf($plugin->lang['renderer__core'],$choice);
-          } else {
-            $plugin->lang[$this->_key.'_o_'.$choice] = sprintf($plugin->lang['renderer__plugin'],$this->_prompts[$choice]);
-          }
+        function html(&$plugin, $echo=false) {
+
+            // make some language adjustments (there must be a better way)
+            // transfer some plugin names to the config plugin
+            if (!$plugin->localised) $this->setupLocale();
+
+            foreach ($this->_choices as $choice) {
+                if (!isset($plugin->lang[$this->_key.'_o_'.$choice])) {
+                    if (!isset($this->_prompts[$choice])) {
+                        $plugin->lang[$this->_key.'_o_'.$choice] = sprintf($plugin->lang['renderer__core'],$choice);
+                    } else {
+                        $plugin->lang[$this->_key.'_o_'.$choice] = sprintf($plugin->lang['renderer__plugin'],$this->_prompts[$choice]);
+                    }
+                }
+            }
+            return parent::html($plugin, $echo);
         }
-      }
-      return parent::html($plugin, $echo);
     }
-  }
 }
diff --git a/lib/plugins/safefnrecode/action.php b/lib/plugins/safefnrecode/action.php
index aae11c437..9127f8df2 100644
--- a/lib/plugins/safefnrecode/action.php
+++ b/lib/plugins/safefnrecode/action.php
@@ -15,7 +15,7 @@ class action_plugin_safefnrecode extends DokuWiki_Action_Plugin {
 
     public function register(Doku_Event_Handler $controller) {
 
-       $controller->register_hook('INDEXER_TASKS_RUN', 'BEFORE', $this, 'handle_indexer_tasks_run');
+        $controller->register_hook('INDEXER_TASKS_RUN', 'BEFORE', $this, 'handle_indexer_tasks_run');
 
     }
 
diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
index b7839b2b2..6aa403b61 100644
--- a/lib/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -137,7 +137,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
 
             $idx = array_search(substr(get_class($this), 7), (array) $this->allowedModes);
             if ($idx !== false) {
-              unset($this->allowedModes[$idx]);
+                unset($this->allowedModes[$idx]);
             }
             $this->allowedModesSetup = true;
         }
@@ -169,9 +169,9 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
      * @return  string  string in appropriate language or english if not available
      */
     function getLang($id) {
-      if (!$this->localised) $this->setupLocale();
+        if (!$this->localised) $this->setupLocale();
 
-      return (isset($this->lang[$id]) ? $this->lang[$id] : '');
+        return (isset($this->lang[$id]) ? $this->lang[$id] : '');
     }
 
     /**
@@ -184,7 +184,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
      * @return  string  parsed contents of the wiki page in xhtml format
      */
     function locale_xhtml($id) {
-      return p_cached_output($this->localFN($id));
+        return p_cached_output($this->localFN($id));
     }
 
     /**
@@ -193,17 +193,17 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
      * plugin equivalent of localFN()
      */
     function localFN($id) {
-      global $conf;
-      $plugin = $this->getPluginName();
-      $file = DOKU_CONF.'/plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt';
-      if (!@file_exists($file)){
-        $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt';
-        if(!@file_exists($file)){
-          //fall back to english
-          $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt';
+        global $conf;
+        $plugin = $this->getPluginName();
+        $file = DOKU_CONF.'/plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt';
+        if (!@file_exists($file)){
+            $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt';
+            if(!@file_exists($file)){
+                //fall back to english
+                $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt';
+            }
         }
-      }
-      return $file;
+        return $file;
     }
 
     /**
@@ -214,16 +214,16 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
     function setupLocale() {
         if ($this->localised) return;
 
-      global $conf;            // definitely don't invoke "global $lang"
-      $path = DOKU_PLUGIN.$this->getPluginName().'/lang/';
-
-      $lang = array();
-      // don't include once, in case several plugin components require the same language file
-      @include($path.'en/lang.php');
-      if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
-
-      $this->lang = $lang;
-      $this->localised = true;
+        global $conf;            // definitely don't invoke "global $lang"
+        $path = DOKU_PLUGIN.$this->getPluginName().'/lang/';
+ 
+        $lang = array();
+        // don't include once, in case several plugin components require the same language file
+        @include($path.'en/lang.php');
+        if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
+ 
+        $this->lang = $lang;
+        $this->localised = true;
     }
 
     // configuration methods
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 762daa6b9..a0e77065e 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -41,13 +41,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $this->setupLocale();
 
         if (!isset($auth)) {
-          $this->disabled = $this->lang['noauth'];
+            $this->disabled = $this->lang['noauth'];
         } else if (!$auth->canDo('getUsers')) {
-          $this->disabled = $this->lang['nosupport'];
+            $this->disabled = $this->lang['nosupport'];
         } else {
 
-          // we're good to go
-          $this->_auth = & $auth;
+            // we're good to go
+            $this->_auth = & $auth;
 
         }
 
@@ -95,31 +95,31 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
 
         if ($cmd != "search") {
-          $this->_start = $INPUT->int('start', 0);
-          $this->_filter = $this->_retrieveFilter();
+            $this->_start = $INPUT->int('start', 0);
+            $this->_filter = $this->_retrieveFilter();
         }
 
         switch($cmd){
-          case "add"    : $this->_addUser(); break;
-          case "delete" : $this->_deleteUser(); break;
-          case "modify" : $this->_modifyUser(); break;
-          case "edit"   : $this->_editUser($param); break;
-          case "search" : $this->_setFilter($param);
-                          $this->_start = 0;
-                          break;
-          case "export" : $this->_export(); break;
-          case "import" : $this->_import(); break;
-          case "importfails" : $this->_downloadImportFailures(); break;
+            case "add"    : $this->_addUser(); break;
+            case "delete" : $this->_deleteUser(); break;
+            case "modify" : $this->_modifyUser(); break;
+            case "edit"   : $this->_editUser($param); break;
+            case "search" : $this->_setFilter($param);
+                            $this->_start = 0;
+                            break;
+            case "export" : $this->_export(); break;
+            case "import" : $this->_import(); break;
+            case "importfails" : $this->_downloadImportFailures(); break;
         }
 
         $this->_user_total = $this->_auth->canDo('getUserCount') ? $this->_auth->getUserCount($this->_filter) : -1;
 
         // page handling
         switch($cmd){
-          case 'start' : $this->_start = 0; break;
-          case 'prev'  : $this->_start -= $this->_pagesize; break;
-          case 'next'  : $this->_start += $this->_pagesize; break;
-          case 'last'  : $this->_start = $this->_user_total; break;
+            case 'start' : $this->_start = 0; break;
+            case 'prev'  : $this->_start -= $this->_pagesize; break;
+            case 'next'  : $this->_start += $this->_pagesize; break;
+            case 'last'  : $this->_start = $this->_user_total; break;
         }
         $this->_validatePagination();
     }
@@ -151,9 +151,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("<div class=\"level2\">");
 
         if ($this->_user_total > 0) {
-          ptln("<p>".sprintf($this->lang['summary'],$this->_start+1,$this->_last,$this->_user_total,$this->_auth->getUserCount())."</p>");
+            ptln("<p>".sprintf($this->lang['summary'],$this->_start+1,$this->_last,$this->_user_total,$this->_auth->getUserCount())."</p>");
         } else {
-          ptln("<p>".sprintf($this->lang['nonefound'],$this->_auth->getUserCount())."</p>");
+            ptln("<p>".sprintf($this->lang['nonefound'],$this->_auth->getUserCount())."</p>");
         }
         ptln("<form action=\"".wl($ID)."\" method=\"post\">");
         formSecurityToken();
@@ -174,25 +174,25 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("    </thead>");
 
         if ($this->_user_total) {
-          ptln("    <tbody>");
-          foreach ($user_list as $user => $userinfo) {
-            extract($userinfo);
-            $groups = join(', ',$grps);
-            ptln("    <tr class=\"user_info\">");
-            ptln("      <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".$user."]\" ".$delete_disable." /></td>");
-            if ($editable) {
-              ptln("    <td><a href=\"".wl($ID,array('fn[edit]['.hsc($user).']' => 1,
-                                                     'do' => 'admin',
-                                                     'page' => 'usermanager',
-                                                     'sectok' => getSecurityToken())).
-                   "\" title=\"".$this->lang['edit_prompt']."\">".hsc($user)."</a></td>");
-            } else {
-              ptln("    <td>".hsc($user)."</td>");
+            ptln("    <tbody>");
+            foreach ($user_list as $user => $userinfo) {
+                extract($userinfo);
+                $groups = join(', ',$grps);
+                ptln("    <tr class=\"user_info\">");
+                ptln("      <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".$user."]\" ".$delete_disable." /></td>");
+                if ($editable) {
+                    ptln("    <td><a href=\"".wl($ID,array('fn[edit]['.hsc($user).']' => 1,
+                                                           'do' => 'admin',
+                                                           'page' => 'usermanager',
+                                                           'sectok' => getSecurityToken())).
+                         "\" title=\"".$this->lang['edit_prompt']."\">".hsc($user)."</a></td>");
+                } else {
+                    ptln("    <td>".hsc($user)."</td>");
+                }
+                ptln("      <td>".hsc($name)."</td><td>".hsc($mail)."</td><td>".hsc($groups)."</td>");
+                ptln("    </tr>");
             }
-            ptln("      <td>".hsc($name)."</td><td>".hsc($mail)."</td><td>".hsc($groups)."</td>");
-            ptln("    </tr>");
-          }
-          ptln("    </tbody>");
+            ptln("    </tbody>");
         }
 
         ptln("    <tbody>");
@@ -226,29 +226,29 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $style = $this->_edit_user ? " class=\"edit_user\"" : "";
 
         if ($this->_auth->canDo('addUser')) {
-          ptln("<div".$style.">");
-          print $this->locale_xhtml('add');
-          ptln("  <div class=\"level2\">");
+            ptln("<div".$style.">");
+            print $this->locale_xhtml('add');
+            ptln("  <div class=\"level2\">");
 
-          $this->_htmlUserForm('add',null,array(),4);
+            $this->_htmlUserForm('add',null,array(),4);
 
-          ptln("  </div>");
-          ptln("</div>");
+            ptln("  </div>");
+            ptln("</div>");
         }
 
         if($this->_edit_user  && $this->_auth->canDo('UserMod')){
-          ptln("<div".$style." id=\"scroll__here\">");
-          print $this->locale_xhtml('edit');
-          ptln("  <div class=\"level2\">");
+            ptln("<div".$style." id=\"scroll__here\">");
+            print $this->locale_xhtml('edit');
+            ptln("  <div class=\"level2\">");
 
-          $this->_htmlUserForm('modify',$this->_edit_user,$this->_edit_userdata,4);
+            $this->_htmlUserForm('modify',$this->_edit_user,$this->_edit_userdata,4);
 
-          ptln("  </div>");
-          ptln("</div>");
+            ptln("  </div>");
+            ptln("</div>");
         }
 
         if ($this->_auth->canDo('addUser')) {
-          $this->_htmlImportForm();
+            $this->_htmlImportForm();
         }
         ptln("</div>");
     }
@@ -265,10 +265,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $notes = array();
 
         if ($user) {
-          extract($userdata);
-          if (!empty($grps)) $groups = join(',',$grps);
+            extract($userdata);
+            if (!empty($grps)) $groups = join(',',$grps);
         } else {
-          $notes[] = sprintf($this->lang['note_group'],$conf['defaultgroup']);
+            $notes[] = sprintf($this->lang['note_group'],$conf['defaultgroup']);
         }
 
         ptln("<form action=\"".wl($ID)."\" method=\"post\">",$indent);
@@ -287,14 +287,14 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6);
 
         if ($this->_auth->canDo("modPass")) {
-          if ($cmd == 'add') {
-            $notes[] = $this->lang['note_pass'];
-          }
-          if ($user) {
-            $notes[] = $this->lang['note_notify'];
-          }
+            if ($cmd == 'add') {
+                $notes[] = $this->lang['note_pass'];
+            }
+            if ($user) {
+                $notes[] = $this->lang['note_notify'];
+            }
 
-          ptln("<tr><td><label for=\"".$cmd."_usernotify\" >".$this->lang["user_notify"].": </label></td><td><input type=\"checkbox\" id=\"".$cmd."_usernotify\" name=\"usernotify\" value=\"1\" /></td></tr>", $indent);
+            ptln("<tr><td><label for=\"".$cmd."_usernotify\" >".$this->lang["user_notify"].": </label></td><td><input type=\"checkbox\" id=\"".$cmd."_usernotify\" name=\"usernotify\" value=\"1\" /></td></tr>", $indent);
         }
 
         ptln("    </tbody>",$indent);
@@ -317,11 +317,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("  </table>",$indent);
 
         if ($notes) {
-          ptln("    <ul class=\"notes\">");
-          foreach ($notes as $note) {
-            ptln("      <li><span class=\"li\">".$note."</span></li>",$indent);
-          }
-          ptln("    </ul>");
+            ptln("    <ul class=\"notes\">");
+            foreach ($notes as $note) {
+                ptln("      <li><span class=\"li\">".$note."</span></li>",$indent);
+            }
+            ptln("    </ul>");
         }
         ptln("  </div>",$indent);
         ptln("</form>",$indent);
@@ -366,7 +366,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("<input type=\"hidden\" name=\"start\" value=\"".$this->_start."\" />",$indent);
 
         foreach ($this->_filter as $key => $filter) {
-          ptln("<input type=\"hidden\" name=\"filter[".$key."]\" value=\"".hsc($filter)."\" />",$indent);
+            ptln("<input type=\"hidden\" name=\"filter[".$key."]\" value=\"".hsc($filter)."\" />",$indent);
         }
     }
 
@@ -432,52 +432,52 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if (empty($user)) return false;
 
         if ($this->_auth->canDo('modPass')){
-          if (empty($pass)){
-            if($INPUT->has('usernotify')){
-              $pass = auth_pwgen($user);
-            } else {
-              msg($this->lang['add_fail'], -1);
-              return false;
+            if (empty($pass)){
+                if($INPUT->has('usernotify')){
+                    $pass = auth_pwgen($user);
+                } else {
+                    msg($this->lang['add_fail'], -1);
+                    return false;
+                }
             }
-          }
         } else {
-          if (!empty($pass)){
-            msg($this->lang['add_fail'], -1);
-            return false;
-          }
+            if (!empty($pass)){
+                msg($this->lang['add_fail'], -1);
+                return false;
+            }
         }
 
         if ($this->_auth->canDo('modName')){
-          if (empty($name)){
-            msg($this->lang['add_fail'], -1);
-            return false;
-          }
+            if (empty($name)){
+                msg($this->lang['add_fail'], -1);
+                return false;
+            }
         } else {
-          if (!empty($name)){
-            return false;
-          }
+            if (!empty($name)){
+                return false;
+            }
         }
 
         if ($this->_auth->canDo('modMail')){
-          if (empty($mail)){
-            msg($this->lang['add_fail'], -1);
-            return false;
-          }
+            if (empty($mail)){
+                msg($this->lang['add_fail'], -1);
+                return false;
+            }
         } else {
-          if (!empty($mail)){
-            return false;
-          }
+            if (!empty($mail)){
+                return false;
+            }
         }
 
         if ($ok = $this->_auth->triggerUserMod('create', array($user,$pass,$name,$mail,$grps))) {
 
-          msg($this->lang['add_ok'], 1);
+            msg($this->lang['add_ok'], 1);
 
-          if ($INPUT->has('usernotify') && $pass) {
-            $this->_notifyUser($user,$pass);
-          }
+            if ($INPUT->has('usernotify') && $pass) {
+                $this->_notifyUser($user,$pass);
+            }
         } else {
-          msg($this->lang['add_fail'], -1);
+            msg($this->lang['add_fail'], -1);
         }
 
         return $ok;
@@ -503,12 +503,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         $count = $this->_auth->triggerUserMod('delete', array($selected));
         if ($count == count($selected)) {
-          $text = str_replace('%d', $count, $this->lang['delete_ok']);
-          msg("$text.", 1);
+            $text = str_replace('%d', $count, $this->lang['delete_ok']);
+            msg("$text.", 1);
         } else {
-          $part1 = str_replace('%d', $count, $this->lang['delete_ok']);
-          $part2 = str_replace('%d', (count($selected)-$count), $this->lang['delete_fail']);
-          msg("$part1, $part2",-1);
+            $part1 = str_replace('%d', $count, $this->lang['delete_ok']);
+            $part2 = str_replace('%d', (count($selected)-$count), $this->lang['delete_fail']);
+            msg("$part1, $part2",-1);
         }
 
         // invalidate all sessions
@@ -529,8 +529,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         // no user found?
         if (!$userdata) {
-          msg($this->lang['edit_usermissing'],-1);
-          return false;
+            msg($this->lang['edit_usermissing'],-1);
+            return false;
         }
 
         $this->_edit_user = $user;
@@ -559,18 +559,18 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $changes = array();
         if ($newuser != $olduser) {
 
-          if (!$this->_auth->canDo('modLogin')) {        // sanity check, shouldn't be possible
-            msg($this->lang['update_fail'],-1);
-            return false;
-          }
+            if (!$this->_auth->canDo('modLogin')) {        // sanity check, shouldn't be possible
+                msg($this->lang['update_fail'],-1);
+                return false;
+            }
 
-          // check if $newuser already exists
-          if ($this->_auth->getUserData($newuser)) {
-            msg(sprintf($this->lang['update_exists'],$newuser),-1);
-            $re_edit = true;
-          } else {
-            $changes['user'] = $newuser;
-          }
+            // check if $newuser already exists
+            if ($this->_auth->getUserData($newuser)) {
+                msg(sprintf($this->lang['update_exists'],$newuser),-1);
+                $re_edit = true;
+            } else {
+                $changes['user'] = $newuser;
+            }
         }
 
         // generate password if left empty and notification is on
@@ -588,18 +588,18 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
           $changes['grps'] = $newgrps;
 
         if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) {
-          msg($this->lang['update_ok'],1);
+            msg($this->lang['update_ok'],1);
 
-          if ($INPUT->has('usernotify') && $newpass) {
-            $notify = empty($changes['user']) ? $olduser : $newuser;
-            $this->_notifyUser($notify,$newpass);
-          }
+            if ($INPUT->has('usernotify') && $newpass) {
+                $notify = empty($changes['user']) ? $olduser : $newuser;
+                $this->_notifyUser($notify,$newpass);
+            }
 
-          // invalidate all sessions
-          io_saveFile($conf['cachedir'].'/sessionpurge',time());
+            // invalidate all sessions
+            io_saveFile($conf['cachedir'].'/sessionpurge',time());
 
         } else {
-          msg($this->lang['update_fail'],-1);
+            msg($this->lang['update_fail'],-1);
         }
 
         if (!empty($re_edit)) {
@@ -615,13 +615,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     function _notifyUser($user, $password, $status_alert=true) {
 
         if ($sent = auth_sendPassword($user,$password)) {
-          if ($status_alert) {
-            msg($this->lang['notify_ok'], 1);
-          }
+            if ($status_alert) {
+                msg($this->lang['notify_ok'], 1);
+            }
         } else {
-          if ($status_alert) {
-            msg($this->lang['notify_fail'], -1);
-          }
+            if ($status_alert) {
+                msg($this->lang['notify_fail'], -1);
+            }
         }
 
         return $sent;
@@ -656,12 +656,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $this->_filter = array();
 
         if ($op == 'new') {
-          list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser(false);
+            list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser(false);
 
-          if (!empty($user)) $this->_filter['user'] = $user;
-          if (!empty($name)) $this->_filter['name'] = $name;
-          if (!empty($mail)) $this->_filter['mail'] = $mail;
-          if (!empty($grps)) $this->_filter['grps'] = join('|',$grps);
+            if (!empty($user)) $this->_filter['user'] = $user;
+            if (!empty($name)) $this->_filter['name'] = $name;
+            if (!empty($mail)) $this->_filter['mail'] = $mail;
+            if (!empty($grps)) $this->_filter['grps'] = join('|',$grps);
         }
     }
 
@@ -684,7 +684,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     function _validatePagination() {
 
         if ($this->_start >= $this->_user_total) {
-          $this->_start = $this->_user_total - $this->_pagesize;
+            $this->_start = $this->_user_total - $this->_pagesize;
         }
         if ($this->_start < 0) $this->_start = 0;
 
@@ -701,10 +701,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $buttons['start'] = $buttons['prev'] = ($this->_start == 0) ? $disabled : '';
 
         if ($this->_user_total == -1) {
-          $buttons['last'] = $disabled;
-          $buttons['next'] = '';
+            $buttons['last'] = $disabled;
+            $buttons['next'] = '';
         } else {
-          $buttons['last'] = $buttons['next'] = (($this->_start + $this->_pagesize) >= $this->_user_total) ? $disabled : '';
+            $buttons['last'] = $buttons['next'] = (($this->_start + $this->_pagesize) >= $this->_user_total) ? $disabled : '';
         }
 
         return $buttons;
@@ -803,9 +803,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         // save import failures into the session
         if (!headers_sent()) {
-          session_start();
-          $_SESSION['import_failures'] = $this->_import_failures;
-          session_write_close();
+            session_start();
+            $_SESSION['import_failures'] = $this->_import_failures;
+            session_write_close();
         }
     }
 
-- 
cgit v1.2.3


From 0ea51e63908793de4c5d5fa2b4d82c2769fec559 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Fri, 23 Aug 2013 02:41:39 -0700
Subject: Fix CodeSniffer violations for PHP files

Fix violations for Generic.PHP.LowerCaseConstant.Found
---
 lib/plugins/config/admin.php                   | 2 +-
 lib/plugins/config/settings/extra.class.php    | 2 +-
 lib/plugins/plugin/admin.php                   | 4 ++--
 lib/plugins/plugin/classes/ap_info.class.php   | 2 +-
 lib/plugins/plugin/classes/ap_manage.class.php | 2 +-
 lib/plugins/revert/admin.php                   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 404560548..835d27775 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -52,7 +52,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         $this->_input = $INPUT->arr('config');
 
         while (list($key) = each($this->_config->setting)) {
-            $input = isset($this->_input[$key]) ? $this->_input[$key] : NULL;
+            $input = isset($this->_input[$key]) ? $this->_input[$key] : null;
             if ($this->_config->setting[$key]->update($input)) {
                 $this->_changed = true;
             }
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 954178bc1..d0f99fa8f 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -8,7 +8,7 @@
 if (!class_exists('setting_sepchar')) {
     class setting_sepchar extends setting_multichoice {
 
-        function setting_sepchar($key,$param=NULL) {
+        function setting_sepchar($key,$param=null) {
             $str = '_-.';
             for ($i=0;$i<strlen($str);$i++) $this->_choices[] = $str{$i};
 
diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php
index de4de6aef..72c58620d 100644
--- a/lib/plugins/plugin/admin.php
+++ b/lib/plugins/plugin/admin.php
@@ -37,7 +37,7 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin {
     /**
      * @var ap_manage
      */
-    var $handler = NULL;
+    var $handler = null;
 
     var $functions = array('delete','update',/*'settings',*/'info');  // require a plugin name
     var $commands = array('manage','download','enable');              // don't require a plugin name
@@ -109,7 +109,7 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin {
         $this->setupLocale();
         $this->_get_plugin_list();
 
-        if ($this->handler === NULL) $this->handler = new ap_manage($this, $this->plugin);
+        if ($this->handler === null) $this->handler = new ap_manage($this, $this->plugin);
 
         ptln('<div id="plugin__manager">');
         $this->handler->html();
diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php
index 44926c035..dfeb52b9d 100644
--- a/lib/plugins/plugin/classes/ap_info.class.php
+++ b/lib/plugins/plugin/classes/ap_info.class.php
@@ -15,7 +15,7 @@ class ap_info extends ap_manage {
 
 
         foreach ($component_list as $component) {
-            if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === NULL) continue;
+            if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === null) continue;
 
             $compname = explode('_',$component['name']);
             if($compname[1]){
diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 3ec740dae..48be63050 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -2,7 +2,7 @@
 
 class ap_manage {
 
-    var $manager = NULL;
+    var $manager = null;
     var $lang = array();
     var $plugin = '';
     var $downloaded = array();
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index beff10ced..b65472e4c 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -157,7 +157,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
             echo "<img $att />";
             echo '</a> ';
 
-            echo html_wikilink(':'.$recent['id'],(useHeading('navigation'))?NULL:$recent['id']);
+            echo html_wikilink(':'.$recent['id'],(useHeading('navigation'))?null:$recent['id']);
             echo ' – '.htmlspecialchars($recent['sum']);
 
             echo ' <span class="user">';
-- 
cgit v1.2.3


From 089c81d581a43ab1cdf04ea3e7b22ce76e47ad48 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Fri, 23 Aug 2013 02:48:25 -0700
Subject: Fix CodeSniffer violations for PHP files

Fix violations for Zend.Files.ClosingTag.NotAllowed
---
 lib/tpl/dokuwiki/tpl_footer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index b7dc9c631..00417de9c 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -29,4 +29,5 @@ if (!defined('DOKU_INC')) die();
     </div>
 </div></div><!-- /footer -->
 
-<?php tpl_includeFile('footer.html') ?>
+<?php
+tpl_includeFile('footer.html');
-- 
cgit v1.2.3


From 7a61cb659a1fbceafeef058ac903f54f2e51dcf6 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Fri, 23 Aug 2013 04:33:28 -0700
Subject: Fix grammar for the hidepages description

---
 lib/plugins/config/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 67d3ce51f..5031e84ca 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -83,7 +83,7 @@ $lang['camelcase']   = 'Use CamelCase for links';
 $lang['deaccent']    = 'How to clean pagenames';
 $lang['useheading']  = 'Use first heading for pagenames';
 $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the sitemap. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces which may make the index unusable with certain ACL setups.';
-$lang['hidepages']   = 'Hide pages matching this regular expressions from search, the sitemap and other automatic indexes';
+$lang['hidepages']   = 'Hide pages matching this regular expression from search, the sitemap and other automatic indexes';
 
 /* Authentication Settings */
 $lang['useacl']      = 'Use access control lists';
-- 
cgit v1.2.3


From 919c95be775e8c990f35db235aa8323021548b5a Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Fri, 23 Aug 2013 04:34:49 -0700
Subject: Fix grammar for allowdebug description

Add a full stop between sentences for the allowdebug description.
---
 lib/plugins/config/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 5031e84ca..3302b5bd1 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -63,7 +63,7 @@ $lang['baseurl']     = 'Server URL (eg. <code>http://www.yourserver.com</code>).
 $lang['cookiedir']   = 'Cookie path. Leave blank for using baseurl.';
 $lang['dmode']       = 'Directory creation mode';
 $lang['fmode']       = 'File creation mode';
-$lang['allowdebug']  = 'Allow debug <b>disable if not needed!</b>';
+$lang['allowdebug']  = 'Allow debug. <b>Disable if not needed!</b>';
 
 /* Display Settings */
 $lang['recent']      = 'Number of entries per page in the recent changes';
-- 
cgit v1.2.3


From a44e6f809d50d76fb4bb76b483d3022d2481eee6 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Fri, 23 Aug 2013 04:37:02 -0700
Subject: Fix grammar in proxy_except description

Remove trailing preposition.
---
 lib/plugins/config/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 3302b5bd1..cdef85a85 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -181,7 +181,7 @@ $lang['proxy____port']    = 'Proxy port';
 $lang['proxy____user']    = 'Proxy user name';
 $lang['proxy____pass']    = 'Proxy password';
 $lang['proxy____ssl']     = 'Use SSL to connect to proxy';
-$lang['proxy____except']  = 'Regular expression to match URLs for which the proxy should be skipped for.';
+$lang['proxy____except']  = 'Regular expression to match URLs for which the proxy should be skipped.';
 
 /* Safemode Hack */
 $lang['safemodehack'] = 'Enable safemode hack';
-- 
cgit v1.2.3


From c404cb3b0b4946f6308f66b6324a24489b2ef5b8 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Fri, 23 Aug 2013 03:08:41 -0700
Subject: Fix CodeSniffer violations for PHP files

Fix violations for Squiz.Commenting.DocCommentAlignment.SpaceBeforeTag

Conflicts:
	inc/parser/xhtml.php
---
 lib/plugins/config/settings/config.class.php | 44 ++++++++++++++--------------
 lib/plugins/usermanager/admin.php            |  4 +--
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 0b9fa8103..182a4c65f 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -1,9 +1,9 @@
 <?php
 /**
- *  Configuration Class and generic setting classes
+ * Configuration Class and generic setting classes
  *
- *  @author  Chris Smith <chris@jalakai.co.uk>
- *  @author  Ben Coburn <btcoburn@silicodon.net>
+ * @author  Chris Smith <chris@jalakai.co.uk>
+ * @author  Ben Coburn <btcoburn@silicodon.net>
  */
 
 
@@ -30,7 +30,7 @@ if (!class_exists('configuration')) {
         var $_plugin_list = null;
 
         /**
-         *  constructor
+         * constructor
          */
         function configuration($datafile) {
             global $conf, $config_cascade;
@@ -246,8 +246,8 @@ if (!class_exists('configuration')) {
         }
 
         /**
-         *  not used ... conf's contents are an array!
-         *  reduce any multidimensional settings to one dimension using CM_KEYMARKER
+         * not used ... conf's contents are an array!
+         * reduce any multidimensional settings to one dimension using CM_KEYMARKER
          */
         function _flatten($conf,$prefix='') {
 
@@ -383,7 +383,7 @@ if (!class_exists('setting')) {
         }
 
         /**
-         *  receives current values for the setting $key
+         * receives current values for the setting $key
          */
         function initialize($default, $local, $protected) {
             if (isset($default)) $this->_default = $default;
@@ -392,12 +392,12 @@ if (!class_exists('setting')) {
         }
 
         /**
-         *  update changed setting with user provided value $input
-         *  - if changed value fails error check, save it to $this->_input (to allow echoing later)
-         *  - if changed value passes error check, set $this->_local to the new value
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
          *
-         *  @param  mixed   $input   the new value
-         *  @return boolean          true if changed, false otherwise (incl. on error)
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (incl. on error)
          */
         function update($input) {
             if (is_null($input)) return false;
@@ -417,7 +417,7 @@ if (!class_exists('setting')) {
         }
 
         /**
-         *  @return   array(string $label_html, string $input_html)
+         * @return   array(string $label_html, string $input_html)
          */
         function html(&$plugin, $echo=false) {
             $value = '';
@@ -443,7 +443,7 @@ if (!class_exists('setting')) {
         }
 
         /**
-         *  generate string to save setting value to file according to $fmt
+         * generate string to save setting value to file according to $fmt
          */
         function out($var, $fmt='php') {
 
@@ -678,10 +678,10 @@ if (!class_exists('setting_email')) {
         var $_placeholders = false;
 
         /**
-         *  update setting with user provided value $input
-         *  if value fails error check, save it
+         * update setting with user provided value $input
+         * if value fails error check, save it
          *
-         *  @return boolean true if changed, false otherwise (incl. on error)
+         * @return boolean true if changed, false otherwise (incl. on error)
          */
         function update($input) {
             if (is_null($input)) return false;
@@ -1102,12 +1102,12 @@ if (!class_exists('setting_regex')){
         var $_pregflags = 'ui';   // regex pattern modifiers to be used in testing input
 
         /**
-         *  update changed setting with user provided value $input
-         *  - if changed value fails error check, save it to $this->_input (to allow echoing later)
-         *  - if changed value passes error check, set $this->_local to the new value
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
          *
-         *  @param  mixed   $input   the new value
-         *  @return boolean          true if changed, false otherwise (incl. on error)
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (incl. on error)
          */
         function update($input) {
 
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index a0e77065e..3dba5a86e 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -58,8 +58,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
      /**
-     * return prompt for admin menu
-     */
+      * return prompt for admin menu
+      */
     function getMenuText($language) {
 
         if (!is_null($this->_auth))
-- 
cgit v1.2.3


From f9f54ce2bb33d8bd5881929e1dea07520f704600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= <mateju@svn.gnome.org>
Date: Mon, 26 Aug 2013 23:31:40 +0200
Subject: translation update

---
 lib/plugins/acl/lang/sl/lang.php           |  5 +++--
 lib/plugins/authmysql/lang/sl/settings.php | 11 +++++++++++
 lib/plugins/authpgsql/lang/sl/settings.php |  8 ++++++++
 lib/plugins/plugin/lang/sl/lang.php        |  5 +++--
 lib/plugins/popularity/lang/sl/lang.php    |  5 +++--
 lib/plugins/revert/lang/sl/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/sl/lang.php   | 17 +++++++++++++++--
 7 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 lib/plugins/authmysql/lang/sl/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/sl/settings.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php
index 44e45e491..303b18cff 100644
--- a/lib/plugins/acl/lang/sl/lang.php
+++ b/lib/plugins/acl/lang/sl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Slovenian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Dejan Levec <webphp@gmail.com>
  * @author Boštjan Seničar <senicar@gmail.com>
  * @author Gregor Skumavc (grega.skumavc@gmail.com)
diff --git a/lib/plugins/authmysql/lang/sl/settings.php b/lib/plugins/authmysql/lang/sl/settings.php
new file mode 100644
index 000000000..5e82816df
--- /dev/null
+++ b/lib/plugins/authmysql/lang/sl/settings.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Matej Urbančič <mateju@svn.gnome.org>
+ */
+$lang['database']              = 'Podatkovna zbirka za uporabo';
+$lang['debug_o_0']             = 'brez';
+$lang['debug_o_1']             = 'le ob napakah';
+$lang['debug_o_2']             = 'vse poizvedbe SQL';
diff --git a/lib/plugins/authpgsql/lang/sl/settings.php b/lib/plugins/authpgsql/lang/sl/settings.php
new file mode 100644
index 000000000..4c369abc0
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/sl/settings.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Matej Urbančič <mateju@svn.gnome.org>
+ */
+$lang['database']              = 'Podatkovna zbirka za uporabo';
diff --git a/lib/plugins/plugin/lang/sl/lang.php b/lib/plugins/plugin/lang/sl/lang.php
index 3e5f8c8af..e205c57f5 100644
--- a/lib/plugins/plugin/lang/sl/lang.php
+++ b/lib/plugins/plugin/lang/sl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Slovenian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Dejan Levec <webphp@gmail.com>
  * @author Boštjan Seničar <senicar@gmail.com>
  * @author Gregor Skumavc (grega.skumavc@gmail.com)
diff --git a/lib/plugins/popularity/lang/sl/lang.php b/lib/plugins/popularity/lang/sl/lang.php
index 5c92dd7c4..abde6555b 100644
--- a/lib/plugins/popularity/lang/sl/lang.php
+++ b/lib/plugins/popularity/lang/sl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Slovenian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matej Urbančič (mateju@svn.gnome.org)
  */
 $lang['name']                  = 'Poročilo o uporabi (nalaganje strani je lahko dolgotrajno)';
diff --git a/lib/plugins/revert/lang/sl/lang.php b/lib/plugins/revert/lang/sl/lang.php
index 92b0427ce..df778fd26 100644
--- a/lib/plugins/revert/lang/sl/lang.php
+++ b/lib/plugins/revert/lang/sl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Slovenian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matej Urbančič (mateju@svn.gnome.org)
  */
 $lang['menu']                  = 'Povrnitev okvarjene vsebine';
diff --git a/lib/plugins/usermanager/lang/sl/lang.php b/lib/plugins/usermanager/lang/sl/lang.php
index 96acfd0af..dc2de375e 100644
--- a/lib/plugins/usermanager/lang/sl/lang.php
+++ b/lib/plugins/usermanager/lang/sl/lang.php
@@ -1,11 +1,13 @@
 <?php
+
 /**
- * Slovenian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Dejan Levec <webphp@gmail.com>
  * @author Boštjan Seničar <senicar@gmail.com>
  * @author Gregor Skumavc (grega.skumavc@gmail.com)
  * @author Matej Urbančič (mateju@svn.gnome.org)
+ * @author Matej Urbančič <mateju@svn.gnome.org>
  */
 $lang['menu']                  = 'Upravljanje uporabnikov';
 $lang['noauth']                = '(overjanje istovetnosti uporabnikov ni na voljo)';
@@ -28,6 +30,9 @@ $lang['search']                = 'Iskanje';
 $lang['search_prompt']         = 'Poišči';
 $lang['clear']                 = 'Počisti filter iskanja';
 $lang['filter']                = 'Filter';
+$lang['import']                = 'Uvozi nove uporabnike';
+$lang['line']                  = 'Številka vrstice';
+$lang['error']                 = 'Sporočilo napake';
 $lang['summary']               = 'Izpisani so uporabniki %1$d-%2$d od skupno %3$d. Vseh uporabnikov je %4$d.';
 $lang['nonefound']             = 'Ni najdenih uporabnikov. Vseh uporabnikov je %d.';
 $lang['delete_ok']             = '%d uporabnikov je izbrisanih';
@@ -48,3 +53,11 @@ $lang['add_ok']                = 'Uporabnik je uspešno dodan';
 $lang['add_fail']              = 'Dodajanje uporabnika je spodletelo';
 $lang['notify_ok']             = 'Obvestilno sporočilo je poslano.';
 $lang['notify_fail']           = 'Obvestilnega sporočila ni mogoče poslati.';
+$lang['import_error_fields']   = 'Neustrezno število polj; najdenih je %d, zahtevana pa so 4.';
+$lang['import_error_baduserid'] = 'Manjka ID uporabnika';
+$lang['import_error_badname']  = 'Napačno navedeno ime';
+$lang['import_error_badmail']  = 'Napačno naveden elektronski naslov';
+$lang['import_error_upload']   = 'Uvoz je spodletel. Datoteke CSV ni mogoče naložiti ali pa je prazna.';
+$lang['import_error_readfail'] = 'Uvoz je spodletel. Ni mogoče prebrati vsebine datoteke.';
+$lang['import_error_create']   = 'Ni mogoče ustvariti računa uporabnika';
+$lang['import_notify_fail']    = 'Obvestilnega sporočila za uvoženega uporabnika %s z elektronskim naslovom %s ni mogoče poslati.';
-- 
cgit v1.2.3


From d91ab76f52f59d264301e18c28a0d3bae996fab8 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 27 Aug 2013 01:18:10 -0700
Subject: Fix CodeSniffer violations

Fix violations for the following sniff
DokuWiki.Functions.OpeningFunctionBrace

Also removed an extraneous semicolon.
---
 lib/exe/css.php | 3 +--
 lib/exe/js.php  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 9e1e22e1a..60e17ae82 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -465,8 +465,7 @@ function css_pluginstyles($mediatype='screen'){
  *
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function css_moveimports($css)
-{
+function css_moveimports($css) {
     if(!preg_match_all('/@import\s+(?:url\([^)]+\)|"[^"]+")\s*[^;]*;\s*/', $css, $matches, PREG_OFFSET_CAPTURE)) {
         return $css;
     }
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 4b4b598de..76238a81b 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -194,8 +194,7 @@ function js_pluginscripts(){
  *
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function js_pluginstrings()
-{
+function js_pluginstrings() {
     global $conf;
     $pluginstrings = array();
     $plugins = plugin_list();
-- 
cgit v1.2.3


From f591e7b075b936baf7357625ef7edb37fe4feaa3 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 27 Aug 2013 01:45:47 -0700
Subject: Fix CodeSniffer violations

Fix violations for the following sniff
DokuWiki.WhiteSpace.ScopeIndent
---
 lib/exe/indexer.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 57bee8925..3ab117736 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -31,12 +31,12 @@ else header('Content-Type: text/plain');
 $tmp = array(); // No event data
 $evt = new Doku_Event('INDEXER_TASKS_RUN', $tmp);
 if ($evt->advise_before()) {
-  runIndexer() or
-  runSitemapper() or
-  sendDigest() or
-  runTrimRecentChanges() or
-  runTrimRecentChanges(true) or
-  $evt->advise_after();
+    runIndexer() or
+    runSitemapper() or
+    sendDigest() or
+    runTrimRecentChanges() or
+    runTrimRecentChanges(true) or
+    $evt->advise_after();
 }
 
 if(!$output) {
@@ -85,13 +85,13 @@ function runTrimRecentChanges($media_changes = false) {
             $out_lines = array();
 
             for ($i=0; $i<count($lines); $i++) {
-              $log = parseChangelogLine($lines[$i]);
-              if ($log === false) continue;                      // discard junk
-              if ($log['date'] < $trim_time) {
-                $old_lines[$log['date'].".$i"] = $lines[$i];     // keep old lines for now (append .$i to prevent key collisions)
-              } else {
-                $out_lines[$log['date'].".$i"] = $lines[$i];     // definitely keep these lines
-              }
+                $log = parseChangelogLine($lines[$i]);
+                if ($log === false) continue;                      // discard junk
+                if ($log['date'] < $trim_time) {
+                    $old_lines[$log['date'].".$i"] = $lines[$i];     // keep old lines for now (append .$i to prevent key collisions)
+                } else {
+                    $out_lines[$log['date'].".$i"] = $lines[$i];     // definitely keep these lines
+                }
             }
 
             if (count($lines)==count($out_lines)) {
-- 
cgit v1.2.3


From 5fdb3847c799fe15ec53e1b13ce618fe31ca4b9b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 1 Sep 2013 20:24:53 +0100
Subject: Removed old default template

The old 'default' template was deprecated with the release of the new
'dokuwiki' template (2012-10-13). It is still available in a separate
repository here: https://github.com/dokufreaks/template-default

But no-one in the core development team intends to maintain this template
anymore. So, anyone willing to adopt it is welcome to clone it and make it
your own.
---
 lib/tpl/default/_admin.css                  |  48 --
 lib/tpl/default/_fileuploader.css           | 111 ----
 lib/tpl/default/_linkwiz.css                |  40 --
 lib/tpl/default/_mediamanager.css           | 475 ---------------
 lib/tpl/default/_mediaoptions.css           |  18 -
 lib/tpl/default/_subscription.css           |  21 -
 lib/tpl/default/_tabs.css                   |  50 --
 lib/tpl/default/design.css                  | 863 ----------------------------
 lib/tpl/default/detail.php                  |  86 ---
 lib/tpl/default/footer.html                 |  41 --
 lib/tpl/default/images/UWEB.png             | Bin 462 -> 0 bytes
 lib/tpl/default/images/UWEBshadow.png       | Bin 900 -> 0 bytes
 lib/tpl/default/images/apple-touch-icon.png | Bin 17728 -> 0 bytes
 lib/tpl/default/images/bullet.gif           | Bin 50 -> 0 bytes
 lib/tpl/default/images/button-cc.gif        | Bin 359 -> 0 bytes
 lib/tpl/default/images/button-css.png       | Bin 299 -> 0 bytes
 lib/tpl/default/images/button-donate.gif    | Bin 187 -> 0 bytes
 lib/tpl/default/images/button-dw.png        | Bin 404 -> 0 bytes
 lib/tpl/default/images/button-php.gif       | Bin 207 -> 0 bytes
 lib/tpl/default/images/button-rss.png       | Bin 191 -> 0 bytes
 lib/tpl/default/images/button-xhtml.png     | Bin 321 -> 0 bytes
 lib/tpl/default/images/buttonshadow.png     | Bin 218 -> 0 bytes
 lib/tpl/default/images/closed.gif           | Bin 54 -> 0 bytes
 lib/tpl/default/images/favicon.ico          | Bin 7406 -> 0 bytes
 lib/tpl/default/images/inputshadow.png      | Bin 93 -> 0 bytes
 lib/tpl/default/images/link_icon.gif        | Bin 168 -> 0 bytes
 lib/tpl/default/images/mail_icon.gif        | Bin 151 -> 0 bytes
 lib/tpl/default/images/open.gif             | Bin 54 -> 0 bytes
 lib/tpl/default/images/resizecol.png        | Bin 225 -> 0 bytes
 lib/tpl/default/images/tocdot2.gif          | Bin 50 -> 0 bytes
 lib/tpl/default/images/windows.gif          | Bin 170 -> 0 bytes
 lib/tpl/default/layout.css                  |  79 ---
 lib/tpl/default/main.php                    | 135 -----
 lib/tpl/default/media.css                   | 224 --------
 lib/tpl/default/mediamanager.php            |  45 --
 lib/tpl/default/print.css                   | 228 --------
 lib/tpl/default/rtl.css                     | 162 ------
 lib/tpl/default/style.ini                   |  77 ---
 lib/tpl/default/template.info.txt           |   7 -
 39 files changed, 2710 deletions(-)
 delete mode 100644 lib/tpl/default/_admin.css
 delete mode 100644 lib/tpl/default/_fileuploader.css
 delete mode 100644 lib/tpl/default/_linkwiz.css
 delete mode 100644 lib/tpl/default/_mediamanager.css
 delete mode 100644 lib/tpl/default/_mediaoptions.css
 delete mode 100644 lib/tpl/default/_subscription.css
 delete mode 100644 lib/tpl/default/_tabs.css
 delete mode 100644 lib/tpl/default/design.css
 delete mode 100644 lib/tpl/default/detail.php
 delete mode 100644 lib/tpl/default/footer.html
 delete mode 100644 lib/tpl/default/images/UWEB.png
 delete mode 100644 lib/tpl/default/images/UWEBshadow.png
 delete mode 100644 lib/tpl/default/images/apple-touch-icon.png
 delete mode 100644 lib/tpl/default/images/bullet.gif
 delete mode 100644 lib/tpl/default/images/button-cc.gif
 delete mode 100644 lib/tpl/default/images/button-css.png
 delete mode 100644 lib/tpl/default/images/button-donate.gif
 delete mode 100644 lib/tpl/default/images/button-dw.png
 delete mode 100644 lib/tpl/default/images/button-php.gif
 delete mode 100644 lib/tpl/default/images/button-rss.png
 delete mode 100644 lib/tpl/default/images/button-xhtml.png
 delete mode 100644 lib/tpl/default/images/buttonshadow.png
 delete mode 100644 lib/tpl/default/images/closed.gif
 delete mode 100644 lib/tpl/default/images/favicon.ico
 delete mode 100644 lib/tpl/default/images/inputshadow.png
 delete mode 100644 lib/tpl/default/images/link_icon.gif
 delete mode 100644 lib/tpl/default/images/mail_icon.gif
 delete mode 100644 lib/tpl/default/images/open.gif
 delete mode 100644 lib/tpl/default/images/resizecol.png
 delete mode 100644 lib/tpl/default/images/tocdot2.gif
 delete mode 100644 lib/tpl/default/images/windows.gif
 delete mode 100644 lib/tpl/default/layout.css
 delete mode 100644 lib/tpl/default/main.php
 delete mode 100644 lib/tpl/default/media.css
 delete mode 100644 lib/tpl/default/mediamanager.php
 delete mode 100644 lib/tpl/default/print.css
 delete mode 100644 lib/tpl/default/rtl.css
 delete mode 100644 lib/tpl/default/style.ini
 delete mode 100644 lib/tpl/default/template.info.txt

(limited to 'lib')

diff --git a/lib/tpl/default/_admin.css b/lib/tpl/default/_admin.css
deleted file mode 100644
index 6c8066ba6..000000000
--- a/lib/tpl/default/_admin.css
+++ /dev/null
@@ -1,48 +0,0 @@
-#admin__version {
-    clear:left;
-    float: right;
-    color: __text_neu__;
-}
-
-.dokuwiki ul.admin_tasks {
-    font-size: 115%;
-    float: left;
-    width: 40%;
-    list-style-type: none;
-}
-
-.dokuwiki ul.admin_tasks li {
-    line-height: 22px;
-    padding-left: 35px;
-    margin: 1em 0;
-    background: transparent none no-repeat scroll 0 0;
-    text-align: left;
-}
-
-.dokuwiki ul.admin_tasks li div.li {
-    font-weight: bold;
-}
-
-.dokuwiki ul.admin_tasks li.admin_acl {
-    background-image: url(../../images/admin/acl.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_usermanager {
-    background-image: url(../../images/admin/usermanager.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_plugin {
-    background-image: url(../../images/admin/plugin.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_config {
-    background-image: url(../../images/admin/config.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_revert {
-    background-image: url(../../images/admin/revert.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_popularity {
-    background-image: url(../../images/admin/popularity.png);
-}
diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
deleted file mode 100644
index d06bfd519..000000000
--- a/lib/tpl/default/_fileuploader.css
+++ /dev/null
@@ -1,111 +0,0 @@
-
-.qq-uploader {
-    position: relative;
-    width: 100%;
-}
-
-.qq-uploader .error {
-    color: #f00;
-    background-color: #fff;
-}
-
-/* select file button */
-
-.qq-upload-button {
-    display: inline-block;
-    border: 1px solid __border__;
-    color: __text__;
-    background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
-    text-decoration: none;
-    font-size: 100%;
-    cursor: pointer;
-    margin: 1px 1px 5px;
-    padding: 0.125em 0.4em;
-}
-
-* html .qq-upload-button,
-*+html .qq-upload-button {
-    display: inline;
-}
-
-.qq-upload-button-focus {
-    outline: 1px dotted;
-}
-
-/* drop area */
-
-.qq-upload-drop-area {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    min-height: 70px;
-    z-index: 2;
-    background: __background_neu__;
-    color: __text__;
-    text-align: center;
-}
-
-.qq-upload-drop-area span {
-    display: block;
-    position: absolute;
-    top: 50%;
-    width: 100%;
-    margin-top: -8px;
-    font-size: 120%;
-}
-
-.qq-upload-drop-area-active {
-    background: __background_alt__;
-}
-
-/* list of files to upload */
-
-div.qq-uploader ul {
-    margin: 0;
-    list-style: none;
-}
-
-.qq-uploader li {
-    margin-bottom: 5px;
-    color: __text__;
-}
-
-.qq-uploader li span,
-.qq-uploader li input,
-.qq-uploader li a {
-    margin-right: 5px;
-}
-
-.qq-upload-file {
-    display: block;
-    font-weight: bold;
-}
-
-.qq-upload-spinner {
-    display: inline-block;
-    background: url("../../images/throbber.gif");
-    width: 15px;
-    height: 15px;
-    vertical-align: text-bottom;
-}
-
-.qq-upload-size,
-.qq-upload-cancel {
-    font-size: 85%;
-}
-
-.qq-upload-failed-text {
-    display: none;
-}
-.qq-upload-fail .qq-upload-failed-text {
-    display: inline;
-}
-
-.qq-action-container * {
-    vertical-align: middle;
-}
-.qq-overwrite-check input {
-    margin-left: 10px;
-}
diff --git a/lib/tpl/default/_linkwiz.css b/lib/tpl/default/_linkwiz.css
deleted file mode 100644
index ca8812867..000000000
--- a/lib/tpl/default/_linkwiz.css
+++ /dev/null
@@ -1,40 +0,0 @@
-#link__wiz {
-}
-
-#link__wiz_result {
-    background-color: __background__;
-    width:  293px;
-    height: 193px;
-    overflow: auto;
-    border: 1px solid __border__;
-    margin: 3px auto;
-    text-align: left;
-}
-
-#link__wiz_result div.type_u {
-    padding: 3px 3px 3px 22px;
-    background: transparent url(../../images/up.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.type_f {
-    padding: 3px 3px 3px 22px;
-    background: transparent url(../../images/page.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.type_d {
-    padding: 3px 3px 3px 22px;
-    background: transparent url(../../images/ns.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.even {
-    background-color: __background_neu__;
-}
-
-#link__wiz_result div.selected {
-    background-color: __background_alt__;
-}
-
-#link__wiz_result span {
-    display: block;
-    color: __text_neu__;
-}
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
deleted file mode 100644
index 2ce345e40..000000000
--- a/lib/tpl/default/_mediamanager.css
+++ /dev/null
@@ -1,475 +0,0 @@
-
-/*____________ Layout ____________*/
-
-#mediamanager__page h1 {
-    margin: 0 0 .5em;
-}
-
-#mediamanager__page {
-    min-width: 800px;
-    width: 100%;
-    text-align: left;
-}
-
-#mediamanager__page .panel {
-    float: left;
-}
-
-#mediamanager__page .namespaces {
-    width: 15%;
-    min-width: 120px;
-}
-#mediamanager__page .filelist {
-    width: 50%;
-    min-width: 400px;
-}
-#mediamanager__page .file {
-    width: 35%;
-    min-width: 280px;
-}
-
-#mediamanager__page .panelHeader {
-    background-color: __background_alt__;
-    margin: 0 10px 10px 0;
-    padding: 10px 10px 8px;
-    text-align: left;
-    min-height: 20px;
-    overflow: hidden;
-}
-[dir=rtl] #mediamanager__page .panelContent {
-    text-align: right;
-}
-
-
-#mediamanager__page .panelContent {
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 0;
-    margin: 0 10px 10px 0;
-    position: relative;
-}
-
-#mediamanager__page .file .panelHeader,
-#mediamanager__page .file .panelContent {
-    margin-right: 0;
-}
-
-#mediamanager__page .ui-resizable-e {
-    width: 6px;
-    right: 2px;
-    background: transparent url(images/resizecol.png) center center no-repeat;
-}
-#mediamanager__page .ui-resizable-e:hover {
-    background-color: __background_alt__;
-}
-
-
-/*____________ Namespaces tree ____________*/
-
-[dir=rtl] #mediamanager__page .namespaces {
-    text-align: right;
-}
-
-#mediamanager__page .namespaces h2 {
-    font-size: 1em;
-    display: inline-block;
-    border-width: 0;
-    padding: .3em .8em;
-    margin: 0 .3em 0 0;
-    border-radius: .5em .5em 0 0;
-    font-weight: normal;
-    background-color: __background_alt__;
-    color: __text__;
-    line-height: 1.5em;
-}
-* html #mediamanager__page .namespaces h2,
-*+html #mediamanager__page .namespaces h2 {
-    display: inline;
-}
-[dir=rtl] #mediamanager__page .namespaces h2 {
-    margin-right: 10px;
-}
-
-#mediamanager__page .namespaces ul {
-    margin-left: .2em;
-    margin-bottom: 0;
-    padding: 0;
-    list-style: none;
-}
-[dir=rtl] #mediamanager__page .namespaces ul {
-    margin-left: 0;
-    margin-right: .2em;
-}
-
-#mediamanager__page .namespaces ul ul {
-    margin-left: 1em;
-}
-[dir=rtl] #mediamanager__page .namespaces ul ul {
-    margin-left: 0;
-    margin-right: 1em;
-}
-#mediamanager__page .namespaces ul ul li {
-    margin: 0;
-}
-
-
-#mediamanager__page .namespaces ul .selected {
-    background-color: __highlight__;
-    font-weight: bold;
-}
-
-/*____________ Panel header ____________*/
-
-#mediamanager__page .panelHeader h3 {
-    float: left;
-    font-weight: normal;
-    font-size: 1em;
-    padding: 0;
-    margin: 0 0 3px;
-}
-
-#mediamanager__page .panelHeader form.options {
-    float: right;
-    margin-top: -3px;
-}
-
-#mediamanager__page .panelHeader ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-#mediamanager__page .panelHeader ul li {
-    color: __text__;
-    float: left;
-    line-height: 1;
-    padding-left: 3px;
-}
-
-#mediamanager__page .panelHeader ul li.listType {
-    padding-left: 30px;
-    background: url('../../images/icon-list.png') 3px 1px no-repeat;
-}
-#mediamanager__page .panelHeader ul li.sortBy {
-    padding-left: 30px;
-    background: url('../../images/icon-sort.png') 3px 1px no-repeat;
-}
-
-#mediamanager__page .panelHeader form.options .ui-buttonset label{
-    font-size: 90%;
-    margin-right: -0.4em;
-}
-#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
-    padding: .4em .7em;
-    line-height: 1;
-}
-
-/*____________ File list ____________*/
-
-#mediamanager__page .filelist ul {
-    padding: 0;
-    margin: 0;
-}
-[dir=rtl] #mediamanager__page .filelist ul.tabs {
-    margin-right: 10px;
-}
-
-#mediamanager__page .filelist .panelContent ul li:hover {
-    background-color: __background_alt__;
-}
-
-#mediamanager__page .filelist li dt a {
-    vertical-align: middle;
-    display: table-cell;
-    overflow: hidden;
-}
-* html #mediamanager__page .filelist .thumbs li dt a,
-*+html #mediamanager__page .filelist .thumbs li dt a {
-    display: block;
-}
-* html #mediamanager__page .filelist .rows li dt a,
-*+html #mediamanager__page .filelist .rows li dt a {
-    display: inline;
-}
-
-/* thumbs */
-
-#mediamanager__page .filelist .thumbs li {
-    width: 100px;
-    min-height: 130px;
-    display: inline-block;
-    display: -moz-inline-stack;
-    /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
-    margin: 0 6px 10px 0;
-    background-color: __background_neu__;
-    color: __text__;
-    padding: 5px;
-    vertical-align: top;
-    text-align: center;
-    position: relative;
-    line-height: 1.2;
-}
-[dir=rtl] #mediamanager__page .filelist .thumbs li {
-    margin-right: 0;
-    margin-left: 6px;
-}
-* html #mediamanager__page .filelist .thumbs li,
-*+html #mediamanager__page .filelist .thumbs li {
-    display: inline;
-    zoom: 1;
-}
-
-#mediamanager__page .filelist .thumbs li dt a {
-    width: 100px;
-    height: 90px;
-}
-
-#mediamanager__page .filelist .thumbs li dt a img {
-    max-width: 90px;
-    max-height: 90px;
-}
-
-#mediamanager__page .filelist .thumbs li .name,
-#mediamanager__page .filelist .thumbs li .size,
-#mediamanager__page .filelist .thumbs li .filesize,
-#mediamanager__page .filelist .thumbs li .date {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: 90px;
-    white-space: nowrap;
-}
-#mediamanager__page .filelist .thumbs li .name {
-    padding: 5px 0;
-    font-weight: bold;
-}
-#mediamanager__page .filelist .thumbs li .date {
-    font-style: italic;
-    white-space: normal;
-}
-
-/* rows */
-
-#mediamanager__page .filelist .rows li {
-    list-style: none;
-    display: block;
-    position: relative;
-    max-height: 50px;
-    margin: 0;
-    margin-bottom: 3px;
-    background-color: __background__;
-    color: __text__;
-    overflow: hidden;
-}
-
-#mediamanager__page .filelist .rows li:nth-child(2n+1) {
-    background-color: __background_neu__;
-}
-
-#mediamanager__page .filelist .rows li dt {
-    float: left;
-    width: 10%;
-    height: 40px;
-    text-align: center;
-}
-
-#mediamanager__page .filelist .rows li dt a {
-    width: 100px;
-    height: 40px;
-}
-
-#mediamanager__page .filelist .rows li dt a img {
-    max-width: 40px;
-    max-height: 40px;
-}
-
-#mediamanager__page .filelist .rows li .name,
-#mediamanager__page .filelist .rows li .size,
-#mediamanager__page .filelist .rows li .filesize,
-#mediamanager__page .filelist .rows li .date {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    float: left;
-    margin-left: 1%;
-    white-space: nowrap;
-}
-
-#mediamanager__page .filelist .rows li .name {
-    width: 30%;
-    font-weight: bold;
-}
-#mediamanager__page .filelist .rows li .size,
-#mediamanager__page .filelist .rows li .filesize {
-    width: 15%;
-}
-#mediamanager__page .filelist .rows li .date {
-    width: 20%;
-    font-style: italic;
-    white-space: normal;
-}
-
-/*____________ Upload panel ____________*/
-
-#mediamanager__page div.upload {
-    padding-bottom: 0.5em;
-}
-
-#media__content #mediamanager__uploader {
-    border-bottom: 1px solid __border__;
-    padding-bottom: 0.5em;
-}
-
-/*____________ File preview ____________*/
-
-#mediamanager__page .file ul.actions {
-    text-align: center;
-    margin: 0 0 5px;
-    list-style: none;
-}
-#mediamanager__page .file ul.actions li {
-    display: inline;
-}
-
-#mediamanager__page .file div.image {
-    margin-bottom: 5px;
-    text-align: center;
-}
-
-#mediamanager__page .file div.image img {
-    width: 100%;
-}
-
-#mediamanager__page .file dl {
-}
-#mediamanager__page .file dl dt {
-    font-weight: bold;
-    display: block;
-    background-color: __background_alt__;
-}
-#mediamanager__page .file dl dd {
-    display: block;
-    background-color: __background_neu__;
-}
-
-
-/*____________ Meta data edit form ____________*/
-
-#mediamanager__page form.meta div.row {
-    margin-bottom: 5px;
-}
-
-#mediamanager__page form.meta label span {
-    display: block;
-}
-[dir=rtl] #mediamanager__page form.meta label span {
-    text-align: right;
-}
-
-#mediamanager__page form.meta input {
-    width: 50%;
-}
-
-#mediamanager__page form.meta input.button {
-    width: auto;
-}
-
-#mediamanager__page form.meta textarea.edit {
-    height: 6em;
-    width: 95%;
-    min-width: 95%;
-    max-width: 95%;
-}
-
-/*____________ Revisions form ____________*/
-
-#mediamanager__page form.changes ul {
-    margin-left: 10px;
-    list-style-type: none;
-}
-
-#mediamanager__page form.changes ul li div.li div {
-    font-size: 90%;
-    color: __text_neu__;
-    padding-left: 18px;
-}
-
-#mediamanager__page form.changes ul li div.li input {
-    position: relative;
-    top: 1px;
-}
-
-/* File diff */
-
-#mediamanager__diff table {
-    table-layout: fixed;
-}
-
-#mediamanager__diff td,
-#mediamanager__diff th {
-    width: 48%;
-    margin: 0 5px 10px 0;
-    padding: 0;
-    vertical-align: top;
-    text-align: left;
-}
-[dir=rtl] #mediamanager__diff td,
-[dir=rtl] #mediamanager__diff th {
-    text-align: right;
-}
-
-#mediamanager__diff th {
-    font-weight: normal;
-}
-#mediamanager__diff th a {
-    font-weight: bold;
-}
-#mediamanager__diff th span {
-    font-size: 90%;
-}
-
-#mediamanager__diff dl dd strong{
-    background-color: __highlight__;
-    color: __text__;
-    font-weight: normal;
-}
-
-/* Image diff */
-
-#mediamanager__page .file form.diffView {
-    margin-bottom: 10px;
-    display: block;
-}
-
-#mediamanager__diff div.slider {
-    margin: 10px;
-    width: 95%;
-}
-
-#mediamanager__diff .imageDiff {
-    position: relative;
-}
-#mediamanager__diff .imageDiff .image2 {
-    position: absolute;
-    top: 0;
-    left: 0;
-}
-
-#mediamanager__diff .imageDiff.opacity .image2 {
-    -moz-opacity: 0.5;
-    -khtml-opacity: 0.5;
-    opacity: 0.5;
-}
-
-#mediamanager__diff .imageDiff.portions .image2 {
-    border-right: 1px solid red;
-    overflow: hidden;
-}
-
-#mediamanager__diff .imageDiff.portions img {
-    float: left;
-}
-
-#mediamanager__diff .imageDiff img {
-    width: 100%;
-    max-width: none;
-}
-
diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
deleted file mode 100644
index 81e87aa8e..000000000
--- a/lib/tpl/default/_mediaoptions.css
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#media__popup_content p {
-    margin: 0 0 .5em;
-}
-
-#media__popup_content label {
-    float: left;
-    width: 9em;
-}
-
-#media__popup_content .button {
-    margin-right: 1px;
-    cursor: pointer;
-}
-
-#media__popup_content input.button {
-    margin-left: 9em;
-}
diff --git a/lib/tpl/default/_subscription.css b/lib/tpl/default/_subscription.css
deleted file mode 100644
index 0792c8c21..000000000
--- a/lib/tpl/default/_subscription.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Styles for the subscription page
- */
-
-form#subscribe__form {
-    display: block;
-    width: 300px;
-    text-align: center;
-}
-
-form#subscribe__form fieldset {
-    text-align: left;
-    margin: 0.5em 0;
-}
-
-form#subscribe__form label {
-    display:block;
-    margin: 0 0.5em 0.5em;
-}
-
-
diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css
deleted file mode 100644
index a39b43441..000000000
--- a/lib/tpl/default/_tabs.css
+++ /dev/null
@@ -1,50 +0,0 @@
-
-.dokuwiki ul.tabs {
-    padding: 0;
-    margin: 0;
-    overflow: hidden;
-}
-.dokuwiki ul.tabs li {
-    float: left;
-    padding: 0;
-    margin: 0;
-    list-style: none;
-}
-[dir=rtl] .dokuwiki ul.tabs li {
-    float: right;
-}
-
-.dokuwiki ul.tabs li strong,
-.dokuwiki ul.tabs li a {
-    float: left;
-    padding: .3em .8em;
-    margin: 0 .3em 0 0;
-    background-color: __background_neu__;
-    color: __text__;
-    border-radius: .5em .5em 0 0;
-}
-[dir=rtl] .dokuwiki ul.tabs li strong,
-[dir=rtl] .dokuwiki ul.tabs li a {
-    float: right;
-    margin: 0 0 0 .3em;
-}
-*+html[dir=rtl] .dokuwiki ul.tabs li strong,
-*+html[dir=rtl] .dokuwiki ul.tabs li a {
-    float: none;
-    display: inline-block;
-}
-.dokuwiki ul.tabs li strong {
-    font-weight: normal;
-}
-
-.dokuwiki ul.tabs li a:link,
-.dokuwiki ul.tabs li a:visited {
-}
-.dokuwiki ul.tabs li a:hover,
-.dokuwiki ul.tabs li a:active,
-.dokuwiki ul.tabs li a:focus,
-.dokuwiki ul.tabs li strong {
-    background-color: __background_alt__;
-    color: __text__;
-    text-decoration: none;
-}
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
deleted file mode 100644
index 4772fd2a5..000000000
--- a/lib/tpl/default/design.css
+++ /dev/null
@@ -1,863 +0,0 @@
-/**
- * Design elements for default Template
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-/* -------------- general elements --------------- */
-
-* { padding: 0; margin: 0; }
-
-body {
-  font: 80% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-  background-color: __background__;
-  color: __text__;
-}
-
-/* the document */
-div.dokuwiki div.page {
-  margin: 4px 2em 0 1em;
-  text-align: justify;
-}
-
-div.dokuwiki table {
-  font-size: 100%;
-}
-
-div.dokuwiki tr,
-div.dokuwiki td,
-div.dokuwiki th {
-}
-
-div.dokuwiki img {
-  border: 0;
-}
-
-div.dokuwiki p,
-div.dokuwiki blockquote,
-div.dokuwiki table,
-div.dokuwiki pre {
-  margin: 0 0 1.0em 0;
-}
-
-div.dokuwiki hr {
-  border: 0px;
-  border-top: 1px solid __border__;
-  text-align: center;
-  height: 0px;
-}
-
-div.dokuwiki div.nothing {
-  text-align: center;
-  margin: 2em;
-}
-
-/* ---------------- forms ------------------------ */
-
-div.dokuwiki form {
-  border: none;
-  display: inline;
-}
-
-div.dokuwiki label.block {
-  display: block;
-  text-align: right;
-  font-weight: bold;
-}
-
-div.dokuwiki label.simple {
-  display: block;
-  text-align: left;
-  font-weight: normal;
-}
-
-div.dokuwiki label.block input.edit {
-  width: 50%;
-}
-
-div.dokuwiki fieldset {
-  width: 300px;
-  text-align: center;
-  border: 1px solid __border__;
-  padding: 0.5em;
-  margin: auto;
-}
-
-div.dokuwiki textarea.edit {
-  font-family: monospace, serif;
-  /* second generic font fixes problem with font-size, see
-     http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */
-  font-size: 100%;
-  color: __text__;
-  background-color: __background__;
-  border: 1px solid __border__;
-  padding: 0.3em 0 0 0.3em;
-  /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */
-  width: 700px;
-  min-width: 100%;
-  max-width: 100%;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body div.dokuwiki textarea.edit {
-  background:  __background__ url(images/inputshadow.png) repeat-x top;
-}
-
-div.dokuwiki input.edit,
-div.dokuwiki select.edit {
-  font-size: 100%;
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
-  vertical-align: middle;
-  margin: 1px;
-  padding: 0.20em 0.3em;
-  display: inline;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body div.dokuwiki input.edit,
-html>body div.dokuwiki select.edit {
-  background:  __background__ url(images/inputshadow.png) repeat-x top;
-}
-
-div.dokuwiki select.edit {
-  padding: 0.1em 0;
-}
-
-div.dokuwiki input.missing {
-  font-size: 100%;
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: #ffcccc;
-  vertical-align: middle;
-  margin: 1px;
-  padding: 0.20em 0.3em;
-  display: inline;
-}
-
-/* disabled style - not understood by IE */
-div.dokuwiki textarea.edit[disabled],
-div.dokuwiki textarea.edit[readonly],
-div.dokuwiki input.edit[disabled],
-div.dokuwiki input.edit[readonly],
-div.dokuwiki input.button[disabled],
-div.dokuwiki select.edit[disabled] {
-  background-color: __background_neu__!important;
-  color: __text_neu__!important;
-}
-
-/* edit form */
-div.dokuwiki div.toolbar,
-div.dokuwiki div#wiki__editbar {
-   margin: 2px 0;
-   text-align: left;
-}
-div.dokuwiki div#size__ctl {
-   float: right;
-   width: 60px;
-   height: 2.7em;
-}
-div.dokuwiki #size__ctl img {
-   cursor: pointer;
-}
-div.dokuwiki div#wiki__editbar div.editButtons {
-   float: left;
-   padding: 0 1.0em 0.7em 0;
-}
-div.dokuwiki div#wiki__editbar div.summary {
-   float: left;
-}
-div.dokuwiki .nowrap {
-   white-space: nowrap;
-}
-div.dokuwiki div#draft__status {
-  float: right;
-  color: __text_alt__;
-}
-
-div.dokuwiki div.license {
-  padding: 0.5em;
-  font-size: 90%;
-  text-align: center;
-}
-
-div.dokuwiki form#dw__editform div.license {
-  clear: left;
-  font-size: 90%;
-}
-
-/* --------- buttons ------------------- */
-
-div.dokuwiki input.button,
-div.dokuwiki button.button {
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
-  vertical-align: middle;
-  text-decoration: none;
-  font-size: 100%;
-  cursor: pointer;
-  margin: 1px;
-  padding: 0.125em 0.4em;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body div.dokuwiki input.button,
-html>body div.dokuwiki button.button {
-  background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
-}
-
-* html div.dokuwiki input.button,
-* html div.dokuwiki button.button {
-  height: 1.8em;
-}
-
-div.dokuwiki div.secedit input.button {
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
-  vertical-align: middle;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  font-size: 10px;
-  cursor: pointer;
-  float: right;
-  display: inline;
-}
-
-/* ----------- page navigator ------------- */
-
-div.dokuwiki div.pagenav {
-    margin: 1em 0 0 0;
-}
-
-div.dokuwiki div.pagenav-prev {
-    text-align: right;
-    float: left;
-    width: 49%
-}
-
-div.dokuwiki div.pagenav-next {
-    text-align: left;
-    float: right;
-    width: 49%
-}
-
-/* ----------- type of recent changes select -------- */
-
-div.dokuwiki form#dw__recent select {
-    margin-bottom: 10px;
-}
-
-/* --------------- Links ------------------ */
-
-div.dokuwiki a:link,
-div.dokuwiki a:visited {
-  color: __extern__;
-  text-decoration: none;
-}
-div.dokuwiki a:hover,
-div.dokuwiki a:active {
-  color: __text__;
-  text-decoration: underline;
-}
-
-div.dokuwiki a.nolink {
-  color: __text__ !important;
-  text-decoration: none !important;
-}
-
-/* external link */
-div.dokuwiki a.urlextern {
-  background: transparent url(images/link_icon.gif) 0px 1px no-repeat;
-  padding: 1px 0px 1px 16px;
-}
-
-/* windows share */
-div.dokuwiki a.windows {
-  background: transparent url(images/windows.gif) 0px 1px no-repeat;
-  padding: 1px 0px 1px 16px;
-}
-
-/* interwiki link (icon are set by dokuwiki) */
-div.dokuwiki a.interwiki {
-}
-
-/* link to some embedded media */
-div.dokuwiki a.media {
-}
-
-div.dokuwiki a.urlextern:link,
-div.dokuwiki a.windows:link,
-div.dokuwiki a.interwiki:link {
-  color: __extern__;
-}
-
-div.dokuwiki a.urlextern:visited,
-div.dokuwiki a.windows:visited,
-div.dokuwiki a.interwiki:visited {
-  color: purple;
-}
-div.dokuwiki a.urlextern:hover,
-div.dokuwiki a.urlextern:active,
-div.dokuwiki a.windows:hover,
-div.dokuwiki a.windows:active,
-div.dokuwiki a.interwiki:hover,
-div.dokuwiki a.interwiki:active {
-  color: __text__;
-}
-
-/* email link */
-div.dokuwiki a.mail {
-  background: transparent url(images/mail_icon.gif) 0px 1px no-repeat;
-  padding: 1px 0px 1px 16px;
-}
-
-/* existing wikipage */
-div.dokuwiki a.wikilink1 {
-  color: __existing__ !important;
-}
-
-/* not existing wikipage */
-div.dokuwiki a.wikilink2 {
-  color: __missing__ !important;
-  text-decoration: none !important;
-  border-bottom: dashed 1px __missing__ !important;
-}
-
-/* ------------- Page elements ----------------- */
-
-div.dokuwiki div.preview {
-  background-color: __background_neu__;
-  margin: 0 0 0 2em;
-  padding: 4px;
-  border: 1px dashed __text__;
-}
-
-div.dokuwiki div.breadcrumbs {
-  background-color: __background_neu__;
-  color: __text_neu__;
-  font-size: 80%;
-  padding: 0 0 0 4px;
-}
-
-div.dokuwiki span.user {
-  color: __text_other__;
-  font-size: 90%;
-}
-
-div.dokuwiki li.minor {
-  color: __text_neu__;
-  font-style: italic;
-}
-
-/* embedded images */
-div.dokuwiki img.media {
-  margin: 3px;
-}
-
-div.dokuwiki img.medialeft {
-  border: 0;
-  float: left;
-  margin: 0 1.5em 0 0;
-}
-
-div.dokuwiki img.mediaright {
-  border: 0;
-  float: right;
-  margin: 0 0 0 1.5em;
-}
-
-div.dokuwiki img.mediacenter {
-  border: 0;
-  display: block;
-  margin: 0 auto;
-}
-
-/* smileys */
-div.dokuwiki img.icon {
-  vertical-align: middle;
-}
-
-div.dokuwiki abbr {
-  cursor: help;
-  border-bottom: 1px dotted __text__;
-}
-
-/* general headline setup */
-div.dokuwiki h1,
-div.dokuwiki h2,
-div.dokuwiki h3,
-div.dokuwiki h4,
-div.dokuwiki h5 {
-    color: __text__;
-    background-color: inherit;
-    font-size: 100%;
-    font-weight: normal;
-    margin: 0 0 1em 0;
-    padding: 0.5em 0 0 0;
-    border-bottom: 1px solid __border__;
-    clear: left;
-}
-
-/* special headlines */
-div.dokuwiki h1 {font-size: 160%; margin-left: 0px; font-weight: bold;}
-div.dokuwiki h2 {font-size: 150%; margin-left: 20px;}
-div.dokuwiki h3 {font-size: 140%; margin-left: 40px; border-bottom: none; font-weight: bold;}
-div.dokuwiki h4 {font-size: 120%; margin-left: 60px; border-bottom: none; font-weight: bold;}
-div.dokuwiki h5 {font-size: 100%; margin-left: 80px; border-bottom: none; font-weight: bold;}
-
-/* indent different sections */
-div.dokuwiki div.level1 { margin-left: 3px; }
-div.dokuwiki div.level2 { margin-left: 23px; }
-div.dokuwiki div.level3 { margin-left: 43px; }
-div.dokuwiki div.level4 { margin-left: 63px; }
-div.dokuwiki div.level5 { margin-left: 83px; }
-
-/* unordered lists */
-div.dokuwiki ul {
-  line-height: 1.5em;
-  list-style-type: square;
-  list-style-image: none;
-  margin: 0 0 1em 3.5em;
-  color: __text_alt__;
-}
-
-/* ordered lists */
-div.dokuwiki ol {
-  line-height: 1.5em;
-  list-style-image: none;
-  margin: 0 0 1em 3.5em;
-  color: __text_alt__;
-  font-weight: bold;
-}
-
-/* no bottom gap in between and smaller left margin for nested lists */
-div.dokuwiki li ul,
-div.dokuwiki li ol {
-  margin: 0 0 0 1.5em;
-}
-
-/* the list items overriding the ul/ol definition */
-div.dokuwiki .li {
-  color: __text__;
-  font-weight: normal;
-}
-
-div.dokuwiki ol { list-style-type: decimal; }
-div.dokuwiki ol ol { list-style-type: upper-roman; }
-div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
-div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
-
-div.dokuwiki li.open {
-  list-style-image: url(images/open.gif);
-    /*list-style-type: circle;*/
-}
-
-div.dokuwiki li.closed {
-  list-style-image: url(images/closed.gif);
-    /*list-style-type: disc;*/
-}
-
-div.dokuwiki blockquote {
-  border-left: 2px solid __border__;
-  padding-left: 3px;
-}
-
-div.dokuwiki pre,
-div.dokuwiki code {
-  font-family: monospace, serif;
-  /* second generic font fixes problem with font-size, see
-     http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */
-  font-size: 100%;
-}
-div.dokuwiki pre {
-  padding: 0.5em;
-  border: 1px dashed __border__;
-  color: __text__;
-  overflow: auto;
-}
-
-/* code blocks by indention */
-div.dokuwiki pre.pre {
-  background-color: __background_other__;
-}
-
-/* code blocks by code tag */
-div.dokuwiki pre.code {
-  background-color: __background_other__;
-}
-
-/* code blocks by file tag */
-div.dokuwiki pre.file {
-  background-color: __background_alt__;
-}
-
-/* filenames for file and code blocks */
-div.dokuwiki dl.file,
-div.dokuwiki dl.code {
-    margin-top: 2em;
-    margin-bottom: 2.5em;
-}
-
-div.dokuwiki dl.file dt,
-div.dokuwiki dl.code dt {
-    border: 1px dashed __border__;
-    display: inline;
-    padding: 0.1em 1em;
-    margin-left: 2em;
-}
-
-div.dokuwiki dl.code dt a,
-div.dokuwiki dl.file dt a {
-    color: __text__;
-}
-
-div.dokuwiki dl.code dt {
-    background-color: __background_other__;
-    border-bottom: 1px solid __background_other__;
-}
-
-div.dokuwiki dl.file dt {
-    background-color: __background_alt__;
-    border-bottom: 1px solid __background_alt__;
-}
-
-
-/* inline tables */
-div.dokuwiki table.inline {
-  background-color: __background__;
-  border-spacing: 0px;
-  border-collapse: collapse;
-}
-
-div.dokuwiki table.inline th {
-  padding: 3px;
-  border: 1px solid __border__;
-  background-color: __background_alt__;
-}
-
-div.dokuwiki table.inline td {
-  padding: 3px;
-  border: 1px solid __border__;
-}
-
-/* ---------- table of contents ------------------- */
-
-div.dokuwiki #dw__toc {
-  margin: 1.2em 0 0 2em;
-  float: right;
-  width: 200px;
-  font-size: 80%;
-  clear: both;
-}
-
-div.dokuwiki #dw__toc h3 {
-  border: 1px solid __border__;
-  background-color: __background_alt__;
-  text-align: left;
-  font-weight: bold;
-  padding: 3px;
-  margin: 0 0 2px 0;
-  font-size: 1em;
-}
-
-div.dokuwiki .toggle strong {
-    border: 0.4em solid __background_alt__;
-    float: right;
-    display: block;
-    margin: 0.4em 3px 0 0;
-}
-
-div.dokuwiki .toggle span {
-    display: none;
-}
-
-div.dokuwiki .toggle.closed strong {
-    margin-top: 0.4em;
-    border-top: 0.4em solid __text__;
-}
-
-div.dokuwiki .toggle.open strong {
-    margin-top: 0;
-    border-bottom: 0.4em solid __text__;
-}
-
-div.dokuwiki #dw__toc > div {
-  border: 1px solid __border__;
-  background-color: __background__;
-  text-align: left;
-  padding: 0.5em 0 0.7em 0;
-}
-
-div.dokuwiki #dw__toc ul {
-  list-style-type: none;
-  list-style-image: none;
-  line-height: 1.2em;
-  padding-left: 1em;
-  margin: 0;
-}
-
-div.dokuwiki #dw__toc ul li {
-  background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat;
-  padding-left: 0.4em;
-}
-
-div.dokuwiki #dw__toc ul li.clear {
-  background-image: none;
-  padding-left: 0.4em;
-}
-
-div.dokuwiki #dw__toc a:link,
-div.dokuwiki #dw__toc a:visited {
-  color: __extern__;
-}
-
-div.dokuwiki #dw__toc a:hover,
-div.dokuwiki #dw__toc a:active {
-  color: __text__;
-}
-
-/* ---------------------------- Diff rendering --------------------------*/
-div.dokuwiki table.diff {
-  background-color: __background__;
-  width: 100%;
-}
-div.dokuwiki td.diff-blockheader {
-  font-weight: bold;
-}
-div.dokuwiki table.diff th {
-  border-bottom: 1px solid __border__;
-  font-size: 110%;
-  font-weight: normal;
-  text-align: left;
-}
-div.dokuwiki table.diff th a {
-    font-weight: bold;
-}
-div.dokuwiki table.diff th span.user {
-    color: __text__;
-    font-size: 80%;
-}
-div.dokuwiki table.diff th span.sum {
-    font-size: 80%;
-    font-weight: bold;
-}
-div.dokuwiki table.diff th.minor {
-  font-style: italic;
-}
-.dokuwiki table.diff_sidebyside th {
-    width: 50%;
-}
-.dokuwiki table.diff .diff-lineheader {
-    width: .7em;
-    text-align: right;
-}
-[dir=rtl] .dokuwiki table.diff .diff-lineheader {
-    text-align: left;
-}
-.dokuwiki table.diff .diff-lineheader,
-div.dokuwiki table.diff td {
-  font-family: monospace;
-  font-size: 100%;
-}
-div.dokuwiki td.diff-addedline,
-div.dokuwiki span.diff-addedline {
-  background-color: #ddffdd;
-}
-div.dokuwiki td.diff-deletedline,
-div.dokuwiki span.diff-deletedline {
-    background-color: #ffffbb;
-}
-div.dokuwiki td.diff-context {
-    background-color: __background_neu__;
-}
-div.dokuwiki table.diff td.diff-addedline strong,
-div.dokuwiki table.diff td.diff-deletedline strong {
-    color: red;
-}
-
-/* --------------------- footnotes -------------------------------- */
-
-div.dokuwiki div.footnotes {
-  clear: both;
-  border-top: 1px solid __border__;
-  padding-left: 1em;
-  margin-top: 1em;
-}
-
-div.dokuwiki div.fn {
-  font-size: 90%;
-}
-
-div.dokuwiki a.fn_bot {
-  font-weight: bold;
-}
-
-/* insitu-footnotes */
-div.insitu-footnote {
-  font-size: 80%;
-  line-height: 1.2em;
-  border: 1px solid __border__;
-  background-color: __background_other__;
-  text-align: left;
-  padding: 4px;
-  max-width: 40%;    /* IE's width is handled in javascript */
-  min-width: 5em;
-}
-
-/* overcome IE issue with one line code or file boxes which require h. scrolling */
-* html .insitu-footnote pre.code,
-* html .insitu-footnote pre.file {
-  padding-bottom: 18px;
-}
-
-/* --------------- search result formating --------------- */
-#dw__loading {
-    text-align: center;
-    margin-bottom: 1em;
-}
-
-div.dokuwiki .search_results {
-  padding: 0 10px 0 30px;
-}
-
-div.dokuwiki .search_results dt {
-  margin-bottom: 3px;
-}
-div.dokuwiki .search_results dd {
-  margin-bottom: 6px;
-  color: __text_other__;
-  font-size: 12px;
-  margin-left: 20px;
-}
-
-div.dokuwiki .search_sep {
-  color: __text__;
-}
-
-div.dokuwiki .search_hit {
-  color: __text__;
-  background-color: __highlight__;
-}
-div.dokuwiki strong.search_hit {
-  font-weight: normal;
-}
-
-div.dokuwiki div.search_quickresult {
-  margin: 0 0 15px 30px;
-  padding: 0 10px 10px 0;
-  border-bottom: 1px dashed __border__;
-}
-div.dokuwiki div.search_quickresult h3 {
-  margin: 0 0 1.0em 0;
-  font-size: 1em;
-  font-weight: bold;
-}
-
-div.dokuwiki ul.search_quickhits {
-  margin: 0 0 0.5em 1.0em;
-}
-
-div.dokuwiki ul.search_quickhits li {
-  margin: 0 1.0em 0 1.0em;
-  float: left;
-  width: 30%;
-}
-
-div.dokuwiki .section_highlight {
-  background-color: __background_alt__ !important;
-}
-
-/* ------------------ Additional ---------------------- */
-
-div.footerinc {
-    text-align: center;
-}
-.footerinc a img {
-    opacity: 0.5;
-    border: 0;
-}
-
-.footerinc a:hover img {
-    opacity: 1;
-}
-
-/* ---------- AJAX quicksearch ----------- */
-
-div.dokuwiki div.ajax_qsearch {
-  position: absolute;
-  right: 237px;;
-  width: 200px;
-  opacity: 0.9;
-  display: none;
-  font-size: 80%;
-  line-height: 1.2em;
-  border: 1px solid __border__;
-  background-color: __background_other__;
-  text-align: left;
-  padding: 4px;
-}
-
-/* --------- Toolbar -------------------- */
-button.toolbutton {
-  background-color: __background__;
-  padding: 0px;
-  margin: 0 1px 0 0;
-  border: 1px solid __border__;
-  cursor: pointer;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body button.toolbutton {
-  background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
-}
-
-div.picker {
-  width: 250px;
-  border: 1px solid __border__;
-  background-color: __background_alt__;
-}
-
-div.pk_hl {
-  width: 125px;
-}
-
-button.pickerbutton {
-  padding: 0px;
-  margin: 0 1px 1px 0;
-  border: 0;
-  background-color: transparent;
-  font-size: 80%;
-  cursor: pointer;
-}
-
-/* ---------------  Image Details  ----------------- */
-
-div.dokuwiki div.img_big {
-  float: left;
-  margin-right: 0.5em;
-}
-
-div.dokuwiki dl.img_tags dt {
-  font-weight: bold;
-  background-color: __background_alt__;
-}
-div.dokuwiki dl.img_tags dd {
-  background-color: __background_neu__;
-}
-
-div.dokuwiki div.imagemeta {
-  color: __text_neu__;
-  font-size: 70%;
-  line-height: 95%;
-}
-
-div.dokuwiki div.imagemeta img.thumb {
-  float: left;
-  margin-right: 0.1em;
-}
-
diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
deleted file mode 100644
index 1c8042e15..000000000
--- a/lib/tpl/default/detail.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * DokuWiki Image Detail Template
- *
- * This is the template for displaying image details
- *
- * @link   http://dokuwiki.org/templates
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-
-// must be run from within DokuWiki
-if (!defined('DOKU_INC')) die();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-     <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
-    [<?php echo strip_tags($conf['title'])?>]
-  
-
-  
-
-  
-
-
-
-

-  
-
-  

-    
-
-    

-
-    

-      
-    

-
-    

-      

-        
-      

-
-      
←  

-      = AUTH_UPLOAD) {
-                echo '
'.$lang['img_manager'].'
';
-            }
-      ?>
-
-      

-         $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) {
-                    echo '
'.$lang[$tag[1]].':
';
-                    if ($tag[2] == 'date') echo dformat($value);
-                    else echo hsc($value);
-                    echo '
';
-                }
-            }
-        ?>
-      

-      
-    

-
-  
-  

-

-
-
-
diff --git a/lib/tpl/default/footer.html b/lib/tpl/default/footer.html
deleted file mode 100644
index 38aab7216..000000000
--- a/lib/tpl/default/footer.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-

-
-   href="feed.php" title="Recent changes RSS feed">Recent changes RSS feed
-
-  
-       href="" rel="license" title="">
-  
-
-   href="http://www.dokuwiki.org/donate" title="Donate">Donate
-
-   href="http://www.php.net" title="Powered by PHP">Powered by PHP
-
-   href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0">Valid XHTML 1.0
-
-   href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS">Valid CSS
-
-   href="http://dokuwiki.org/" title="Driven by DokuWiki">Driven by DokuWiki
-
-';
-}
-?>
-
-
-

-
diff --git a/lib/tpl/default/images/UWEB.png b/lib/tpl/default/images/UWEB.png
deleted file mode 100644
index 292ade4ed..000000000
Binary files a/lib/tpl/default/images/UWEB.png and /dev/null differ
diff --git a/lib/tpl/default/images/UWEBshadow.png b/lib/tpl/default/images/UWEBshadow.png
deleted file mode 100644
index 8c4e5f829..000000000
Binary files a/lib/tpl/default/images/UWEBshadow.png and /dev/null differ
diff --git a/lib/tpl/default/images/apple-touch-icon.png b/lib/tpl/default/images/apple-touch-icon.png
deleted file mode 100644
index 45fa4e7b0..000000000
Binary files a/lib/tpl/default/images/apple-touch-icon.png and /dev/null differ
diff --git a/lib/tpl/default/images/bullet.gif b/lib/tpl/default/images/bullet.gif
deleted file mode 100644
index b43de48a4..000000000
Binary files a/lib/tpl/default/images/bullet.gif and /dev/null differ
diff --git a/lib/tpl/default/images/button-cc.gif b/lib/tpl/default/images/button-cc.gif
deleted file mode 100644
index c7a403a9e..000000000
Binary files a/lib/tpl/default/images/button-cc.gif and /dev/null differ
diff --git a/lib/tpl/default/images/button-css.png b/lib/tpl/default/images/button-css.png
deleted file mode 100644
index 706325e1c..000000000
Binary files a/lib/tpl/default/images/button-css.png and /dev/null differ
diff --git a/lib/tpl/default/images/button-donate.gif b/lib/tpl/default/images/button-donate.gif
deleted file mode 100644
index bba284e21..000000000
Binary files a/lib/tpl/default/images/button-donate.gif and /dev/null differ
diff --git a/lib/tpl/default/images/button-dw.png b/lib/tpl/default/images/button-dw.png
deleted file mode 100644
index 97272d968..000000000
Binary files a/lib/tpl/default/images/button-dw.png and /dev/null differ
diff --git a/lib/tpl/default/images/button-php.gif b/lib/tpl/default/images/button-php.gif
deleted file mode 100644
index 19aefb08f..000000000
Binary files a/lib/tpl/default/images/button-php.gif and /dev/null differ
diff --git a/lib/tpl/default/images/button-rss.png b/lib/tpl/default/images/button-rss.png
deleted file mode 100644
index f2438043f..000000000
Binary files a/lib/tpl/default/images/button-rss.png and /dev/null differ
diff --git a/lib/tpl/default/images/button-xhtml.png b/lib/tpl/default/images/button-xhtml.png
deleted file mode 100644
index ec686442c..000000000
Binary files a/lib/tpl/default/images/button-xhtml.png and /dev/null differ
diff --git a/lib/tpl/default/images/buttonshadow.png b/lib/tpl/default/images/buttonshadow.png
deleted file mode 100644
index b96ebf759..000000000
Binary files a/lib/tpl/default/images/buttonshadow.png and /dev/null differ
diff --git a/lib/tpl/default/images/closed.gif b/lib/tpl/default/images/closed.gif
deleted file mode 100644
index 8414d4d69..000000000
Binary files a/lib/tpl/default/images/closed.gif and /dev/null differ
diff --git a/lib/tpl/default/images/favicon.ico b/lib/tpl/default/images/favicon.ico
deleted file mode 100644
index 8b9616abb..000000000
Binary files a/lib/tpl/default/images/favicon.ico and /dev/null differ
diff --git a/lib/tpl/default/images/inputshadow.png b/lib/tpl/default/images/inputshadow.png
deleted file mode 100644
index 480044986..000000000
Binary files a/lib/tpl/default/images/inputshadow.png and /dev/null differ
diff --git a/lib/tpl/default/images/link_icon.gif b/lib/tpl/default/images/link_icon.gif
deleted file mode 100644
index d0a92f2fa..000000000
Binary files a/lib/tpl/default/images/link_icon.gif and /dev/null differ
diff --git a/lib/tpl/default/images/mail_icon.gif b/lib/tpl/default/images/mail_icon.gif
deleted file mode 100644
index 437d28fe1..000000000
Binary files a/lib/tpl/default/images/mail_icon.gif and /dev/null differ
diff --git a/lib/tpl/default/images/open.gif b/lib/tpl/default/images/open.gif
deleted file mode 100644
index f5d5c7e56..000000000
Binary files a/lib/tpl/default/images/open.gif and /dev/null differ
diff --git a/lib/tpl/default/images/resizecol.png b/lib/tpl/default/images/resizecol.png
deleted file mode 100644
index f0111507c..000000000
Binary files a/lib/tpl/default/images/resizecol.png and /dev/null differ
diff --git a/lib/tpl/default/images/tocdot2.gif b/lib/tpl/default/images/tocdot2.gif
deleted file mode 100644
index e2b5f15cb..000000000
Binary files a/lib/tpl/default/images/tocdot2.gif and /dev/null differ
diff --git a/lib/tpl/default/images/windows.gif b/lib/tpl/default/images/windows.gif
deleted file mode 100644
index 64dfeb6fb..000000000
Binary files a/lib/tpl/default/images/windows.gif and /dev/null differ
diff --git a/lib/tpl/default/layout.css b/lib/tpl/default/layout.css
deleted file mode 100644
index ded2d87a2..000000000
--- a/lib/tpl/default/layout.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Tableless Layout for default template
- *
- * @author Andreas Gohr 
- * @author moraes 
- */
-
-/* -------------- top row --------------- */
-div.dokuwiki .header {
-  padding: 3px 0 0 2px;
-}
-
-div.dokuwiki .pagename {
-  float: left;
-  font-size: 200%;
-  font-weight: bolder;
-  color: __background_alt__;
-  text-align: left;
-  vertical-align: middle;
-}
-
-div.dokuwiki .pagename a {
-  color: __extern__ !important;
-  text-decoration: none !important;
-}
-
-div.dokuwiki .logo {
-  float: right;
-  font-size: 220%;
-  font-weight: bolder;
-  text-align: right;
-  vertical-align: middle;
-}
-
-div.dokuwiki .logo a {
-  color: __background_alt__ !important;
-  text-decoration: none !important;
-  font-variant: small-caps;
-  letter-spacing: 2pt;
-}
-
-/* ---------------  top and bottom bar ---------------- */
-div.dokuwiki .bar {
-  border-top: 1px solid __border__;
-  border-bottom: 1px solid __border__;
-  background: __background_alt__;
-  padding: 0.1em 0.15em;
-  clear: both;
-}
-
-div.dokuwiki .bar-left {
-  float: left;
-}
-
-div.dokuwiki .bar-right {
-  float: right;
-  text-align: right;
-}
-
-div.dokuwiki #bar__bottom {
-  margin-bottom: 3px;
-}
-
-/* ------------- File Metadata ----------------------- */
-
-div.dokuwiki div.meta {
-  clear: both;
-  margin-top: 1em;
-  color: __text_alt__;
-  font-size: 70%;
-}
-
-div.dokuwiki div.meta div.user {
-  float: left;
-}
-
-div.dokuwiki div.meta div.doc {
-  text-align: right;
-}
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
deleted file mode 100644
index 851afde6c..000000000
--- a/lib/tpl/default/main.php
+++ /dev/null
@@ -1,135 +0,0 @@
-
- */
-
-// must be run from within DokuWiki
-if (!defined('DOKU_INC')) die();
-
-?>
-
-
-
-  
-  
-    <?php tpl_pagetitle()?>
-    [<?php echo strip_tags($conf['title'])?>]
-  
-
-  
-  
-
-  
-
-
-
-
-

-  
-
-  

-
-    

-      

-        [[]]
-      

-      
-
-      

-    

-
-    
-
-    

-      

-        
-        
-      

-
-      

-        
-         
-      

-
-      

-    

-
-    
-    

-      
-      
-    

-    
-
-    
-    

-      
-    

-    
-
-  

-  
-
-  
-
-  

-    
-    
-    
-  

-
-  

-
-  
-
-  

-
-    

-      

-        
-      

-      

-        
-      

-    

-
-   
-
-    

-      

-        
-        
-        
-      

-      

-        
-        
-        
-        
-        
-        
-         
-      

-      

-    

-
-  

-
-  
-
-

-
-
-

-
-
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
deleted file mode 100644
index 640ad3162..000000000
--- a/lib/tpl/default/media.css
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * The CSS in here controls the appearance of the media manager
- */
-
-#media__manager {
-    height: 100%;
-    overflow: hidden;
-}
-
-#media__left {
-    width: 30%;
-    border-right: solid 1px __border__;
-
-    height: 100%;
-    overflow: auto;
-    position: absolute;
-    left: 0;
-}
-
-#media__right {
-    width: 69.7%;
-
-    height: 100%;
-    overflow: auto;
-    position: absolute;
-    right: 0;
-}
-
-#media__manager h1 {
-    margin: 0;
-    padding: 0;
-    margin-bottom: 0.5em;
-}
-
-#media__manager a.select {
-    cursor: pointer;
-}
-
-/* --- Tree formatting --- */
-
-#media__tree img {
-    float: left;
-    padding: 0.5em 0.3em 0 0;
-}
-[dir=rtl] #media__tree img {
-    float: right;
-    padding: 0.5em 0 0 0.3em;
-}
-
-#media__tree ul {
-    list-style-type: none;
-    list-style-image: none;
-    margin-left: 1.5em;
-}
-[dir=rtl] #media__tree ul {
-    margin-left: 0;
-    margin-right: 1.5em;
-}
-
-#media__tree li {
-    clear: left;
-    list-style-type: none;
-    list-style-image: none;
-}
-[dir=rtl] #media__tree li {
-    clear: right;
-}
-*+html #media__tree li,
-* html #media__tree li {
-    border: 1px solid __background__;
-}/* I don't understand this, but this fixes a style bug in IE;
-it's dirty, so any "real" fixes are welcome */
-
-/* --- options --- */
-
-#media__opts {
-    padding-left: 1em;
-    margin-bottom: 0.5em;
-}
-
-#media__opts input {
-    float: left;
-    display: block;
-    margin-top: 4px;
-    position: absolute;
-}
-*+html #media__opts input,
-* html #media__opts input {
-    position: static;
-}
-
-#media__opts label {
-    display: block;
-    float: left;
-    margin-left: 20px;
-    margin-bottom: 4px;
-}
-*+html #media__opts label,
-* html #media__opts label {
-    margin-left: 10px;
-}
-
-#media__opts br {
-    clear: left;
-}
-
-/* --- file list --- */
-
-#media__content img.load {
-    margin: 1em auto;
-}
-
-#media__content #scroll__here {
-    border: 1px dashed __border__;
-}
-
-#media__content .odd {
-    background-color: __background_other__;
-    padding: 0.4em;
-}
-
-#media__content .even {
-    padding: 0.4em;
-}
-
-#media__content a.mediafile {
-    margin-right: 1.5em;
-    font-weight: bold;
-}
-
-#media__content div.detail {
-    padding: 0.3em 0 0.3em 2em;
-}
-
-#media__content div.detail div.thumb {
-    float: left;
-    width: 130px;
-    text-align: center;
-    margin-right: 0.4em;
-}
-
-
-#media__content img.btn {
-    vertical-align: text-bottom;
-}
-
-#media__content div.example {
-    color: __text_neu__;
-    margin-left: 1em;
-}
-
-/* --- upload form --- */
-
-#media__content div.upload {
-    font-size: 90%;
-    padding: 0 0.5em 0.5em 0.5em;
-}
-
-#media__content #mediamanager__uploader {
-    display: block;
-    border-bottom: solid 1px __border__;
-    padding: 0 0.5em 1em 0.5em;
-}
-
-#media__content form#dw__upload {
-    border-bottom: 0;
-}
-
-#media__content form#dw__upload fieldset {
-    padding: 0;
-    margin: 0;
-    border: none;
-    width: auto;
-}
-#media__content form#dw__upload p {
-    text-align: left;
-    padding: 0.25em 0;
-    margin: 0;
-    line-height: 1.0em;
-}
-#media__content form#dw__upload label.check {
-    float: none;
-    width: auto;
-    margin-left: 11.5em;
-}
-
-/* --- meta edit form --- */
-
-#media__content form.meta {
-    display: block;
-    padding: 0 0 1em 0;
-}
-
-#media__content form.meta label {
-    display: block;
-    width: 25%;
-    float: left;
-    font-weight: bold;
-    margin-left: 1em;
-    clear: left;
-}
-
-#media__content form.meta .edit {
-    font: 100% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-    float: left;
-    width: 70%;
-    padding-right: 0;
-    padding-left: 0.2em;
-    margin: 2px;
-}
-
-#media__content form.meta textarea.edit {
-    height: 8em;
-}
-
-#media__content form.meta div.metafield {
-    clear: left;
-}
-
-#media__content form.meta div.buttons {
-    clear: left;
-    margin-left: 20%;
-    padding-left: 1em;
-}
diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php
deleted file mode 100644
index 35b526a32..000000000
--- a/lib/tpl/default/mediamanager.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- */
-
-// must be run from within DokuWiki
-if (!defined('DOKU_INC')) die();
-
-?>
-
-
-
-  
-  
-    <?php echo hsc($lang['mediaselect'])?>
-    [<?php echo strip_tags($conf['title'])?>]
-  
-  
-  
-
-
-
-

-    

-        
-        

-
-        
-        

-
-        
-    

-
-    

-        
-    

-

-
-
diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css
deleted file mode 100644
index f83e8c97c..000000000
--- a/lib/tpl/default/print.css
+++ /dev/null
@@ -1,228 +0,0 @@
-
-body {
-  font: 10pt "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-  background-color: White;
-  color: Black;
-}
-
-table {
-  font-size: 100%;
-  padding: 0;
-  margin: 0;
-}
-
-tr,td,th { padding: 0; margin: 0; }
-
-img { border: 0; }
-
-a {
-  color: #000000;
-  text-decoration: none;
-  background: none !important;
-}
-
-a.interwiki {
-  padding-left: 0px !important;
-}
-
-
-div.meta {
-  clear: both;
-  margin-top: 1em;
-  font-size: 70%;
-  text-align: right;
-}
-
-div.breadcrumbs {
-  display: none;
-}
-
-
-/* --------------------- Text formating -------------------------------- */
-
-/* external link */
-a.urlextern:after {
-   content: " [" attr(href) "]";
-   font-size: 90%;
-}
-
-/* interwiki link */
-a.interwiki:after {
-   content: " [" attr(href) "]";
-   font-size: 90%;
-}
-
-/* email link */
-a.mail:after {
-   content: " [" attr(href) "]";
-   font-size: 90%;
-}
-
-/* existing wikilink */
-a.wikilink1    { text-decoration: underline; }
-
-/* the document */
-div.page {
-  text-align: justify;
-}
-
-/* general headline setup */
-h1, h2, h3, h4, h5 {
-    color: Black;
-    background-color: transparent;
-    font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-    font-size: 100%;
-    font-weight: normal;
-    margin-left:    0;
-    margin-right:   0;
-    margin-top:     0;
-    margin-bottom:  1em;
-    padding-left:   0;
-    padding-right:  0;
-    padding-top:    0.5em;
-    padding-bottom: 0;
-    border-bottom: 1px solid #000000;
-    clear: left;
-}
-
-/* special headlines */
-h1 { font-size: 160%; font-weight: bold; }
-h2 { font-size: 150%; }
-h3 { font-size: 140%; border-bottom: none; }
-h4 { font-size: 120%; border-bottom: none; }
-h5 { font-size: 100%; border-bottom: none; }
-
-/* embedded images */
-img.media {
-  margin: 3px;
-}
-
-/* the styles for media images are already in
-   lib/styles/all.css, these are additional styles */
-img.medialeft {
-  margin: 0 1.5em 0 0;
-}
-img.mediaright {
-  margin: 0 0 0 1.5em;
-}
-img.mediacenter {
-}
-
-/* unordered lists */
-ul {
-    line-height: 1.5em;
-    list-style-type: square;
-    margin: 0 0 1em 3.5em;
-    padding: 0;
-}
-
-/* ordered lists */
-ol {
-    line-height: 1.5em;
-    margin: 0 0 1em 3.5em;
-    padding: 0;
-    font-weight: normal;
-}
-
-div.dokuwiki li ul {
-  margin-bottom: 0;
-}
-div.dokuwiki li ol {
-  margin-bottom: 0;
-}
-
-div.dokuwiki ol { list-style-type: decimal; }
-div.dokuwiki ol ol { list-style-type: upper-roman; }
-div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
-div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
-
-/* the list items overriding the ol definition */
-span.li {
-    font-weight: normal;
-}
-
-pre {
-  font-family: monospace;
-}
-
-/* code blocks by indention */
-pre.pre {
-  font-size: 8pt;
-  padding: 0.5em;
-  border: 1px dashed #000000;
-  color: Black;
-  overflow: visible;
-}
-
-/* code blocks by code tag */
-pre.code {
-  font-size: 8pt;
-  padding: 0.5em;
-  border: 1px dashed #000000;
-  color: Black;
-  overflow: visible;
-}
-
-/* inline code words */
-code {
-  font-size: 120%;
-}
-
-/* code blocks by file tag */
-pre.file {
-  font-size: 8pt;
-  padding: 0.5em;
-  border: 1px dotted #000000;
-  color: Black;
-  overflow: visible;
-}
-
-/* footnotes */
-div.footnotes {
-  clear: both;
-  border-top: 1px solid #000000;
-  padding-left: 1em;
-  margin-top: 1em;
-}
-
-div.fn {
-  font-size: 90%;
-}
-
-a.fn_top {
-  vertical-align: super;
-  font-size: 80%;
-}
-
-a.fn_bot {
-  vertical-align: super;
-  font-size: 80%;
-  font-weight: bold;
-}
-
-abbr {
-  border: 0;
-}
-
-/* ---------- inline tables ------------------- */
-
-table.inline {
-  font-size: 80%;
-  background-color: #ffffff;
-  border-spacing: 0px;
-  border-collapse: collapse;
-}
-
-table.inline th {
-  padding: 3px;
-  border: 1px solid #000000;
-  border-bottom: 2px solid #000000;
-}
-
-table.inline td {
-  padding: 3px;
-  border: 1px solid #000000;
-}
-
-#dw__toc, .footerinc, .header, .bar, .user { display: none; }
-
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
deleted file mode 100644
index f16ba101b..000000000
--- a/lib/tpl/default/rtl.css
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Layout and design corrections for right-to-left languages
- *
- * @author Andreas Gohr 
- * @author Dotan Kamber 
- */
-
-.bar-left {
-  float: right;
-  text-align: right;
-}
-
-.bar-right {
-  float: left;
-  text-align: left;
-}
-
-.pagename {
-  float: right;
-  text-align: right;
-}
-
-.logo {
-  float: left;
-  text-align: left;
-}
-
-label {
-  text-align: left;
-}
-
-label.simple {
-  text-align: right;
-}
-
-div.meta div.user {
-  float: right;
-}
-
-div.meta div.doc {
-  text-align: left;
-}
-
-/* ------------------  Design corrections  --------------------------------- */
-
-div.dokuwiki ul,
-div.dokuwiki ol {
-  margin: 0.5em 3.5em 0.5em 0;
-}
-div.dokuwiki li ul,
-div.dokuwiki li ol {
-  margin: 0.5em 1.5em 0.5em 0;
-}
-
-div.dokuwiki a.urlextern,
-div.dokuwiki a.interwiki,
-div.dokuwiki a.mediafile,
-div.dokuwiki a.windows,
-div.dokuwiki a.mail {
-  background-position: right 1px;
-  padding-right: 16px;
-  padding-left: 0;
-  display: inline-block; /* needed for IE7 */
-}
-
-div.dokuwiki a.mediafile {
-  padding-right: 18px;
-}
-
-div.dokuwiki div.secedit input.button {
-  float: left;
-}
-
-/* headlines */
-div.dokuwiki h1, div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki h5 {
-  clear: right;
-}
-
-/* special headlines */
-div.dokuwiki h1 { margin-left: 0px; margin-right: 0px; }
-div.dokuwiki h2 { margin-left: 0px; margin-right: 20px; }
-div.dokuwiki h3 { margin-left: 0px; margin-right: 40px; }
-div.dokuwiki h4 { margin-left: 0px; margin-right: 60px; }
-div.dokuwiki h5 { margin-left: 0px; margin-right: 80px; }
-
-/* indent different sections */
-div.dokuwiki div.level1 { margin-left: 0px; margin-right: 3px; }
-div.dokuwiki div.level2 { margin-left: 0px; margin-right: 23px; }
-div.dokuwiki div.level3 { margin-left: 0px; margin-right: 43px; }
-div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; }
-div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; }
-
-/* TOC control */
-div.dokuwiki #dw__toc {
-  float: left;
-  margin: 1.2em 2em 0 0;
-}
-
-div.dokuwiki #dw__toc h3 {
-  text-align: right;
-}
-
-div.dokuwiki .toggle strong {
-    float: left;
-    margin: 0.4em 0 0 3px;
-}
-
-div.dokuwiki #dw__toc > div {
-  text-align: right;
-}
-
-div.dokuwiki #dw__toc ul {
-  padding: 0;
-  padding-right: 1em;
-}
-
-div.dokuwiki #dw__toc ul li {
-  background-position: right 0.6em;
-  padding-right: 0.4em;
-  direction: rtl;
-}
-
-div.dokuwiki #dw__toc ul li.clear {
-  padding-right: 0.4em;
-}
-
-div.dokuwiki .code {
-  direction: ltr;
-  text-align: left;
-}
-div.dokuwiki blockquote {
-  border-left: 0;
-  padding-left: 0;
-  border-right: 2px solid  __border__;
-  padding-right: 3px;
-}
-
-/* Admin corrections */
-#admin__version {
-    clear: right;
-    float: left;
-}
-
-.dokuwiki ul.admin_tasks {
-    float: right;
-}
-
-.dokuwiki ul.admin_tasks li {
-    padding-left: 0px;
-    padding-right: 35px;
-    background: transparent none no-repeat scroll right 0;
-    text-align: right;
-}
-
-/* Search corrections */
-div.dokuwiki ul.search_quickhits li {
-    float: right;
-}
-
-div#qsearch__out {
-    text-align: right;
-}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
deleted file mode 100644
index 0706303d0..000000000
--- a/lib/tpl/default/style.ini
+++ /dev/null
@@ -1,77 +0,0 @@
-; Please see http://www.php.net/manual/en/function.parse-ini-file.php
-; for limitations of the ini format used here
-
-; To extend this file or make changes to it, it is recommended to create
-; a style.local.ini file to prevent losing any changes after an upgrade.
-; Please don't forget to copy the section your changes should be under
-; (i.e. [stylesheets] or [replacements]) into that file as well.
-
-; Define the stylesheets your template uses here. The second value
-; defines for which output media the style should be loaded. Currently
-; print, screen and rtl are supported. rtl styles are loaded additionally
-; to screen styles if a right-to-left language is selected (eg. hebrew)
-[stylesheets]
-layout.css     = screen
-design.css     = screen
-style.css      = screen
-
-media.css         = screen
-_mediaoptions.css = screen
-_admin.css        = screen
-_linkwiz.css      = screen
-_subscription.css = screen
-_mediamanager.css  = screen
-_tabs.css         = screen
-_fileuploader.css = screen
-
-rtl.css        = rtl
-print.css      = print
-
-; This section is used to configure some placeholder values used in
-; the stylesheets. Changing this file is the simplest method to
-; give your wiki a new look.
-[replacements]
-
-;--------------------------------------------------------------------------
-;------ guaranteed dokuwiki color placeholders that every plugin can use
-; main text and background colors
-__text__           = "#000"
-__background__     = "#fff"
-; alternative text and background colors
-__text_alt__       = "#638c9c"
-__background_alt__ = "#dee7ec"
-; neutral text and background colors
-__text_neu__       = "#666"
-__background_neu__ = "#f5f5f5"
-; border color
-__border__         = "#8cacbb"
-;--------------------------------------------------------------------------
-
-; other text and background colors
-__text_other__       = "#ccc"
-__background_other__ = "#f7f9fa"
-
-; these are used for links
-__extern__    = "#436976"
-__existing__  = "#090"
-__missing__   = "#f30"
-
-; highlighting search snippets
-__highlight__ = "#ff9"
-
-
-;--------------------------------------------------------------------------
-;------ for keeping old templates and plugins compatible to the old pattern
-; (to be deleted at the next or after next release)
-__white__      = "#fff"
-__lightgray__  = "#f5f5f5"
-__mediumgray__ = "#ccc"
-__darkgray__   = "#666"
-__black__      = "#000"
-
-; these are the shades of blue
-__lighter__   = "#f7f9fa"
-__light__     = "#eef3f8"
-__medium__    = "#dee7ec"
-__dark__      = "#8cacbb"
-__darker__    = "#638c9c"
diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt
deleted file mode 100644
index e0dbf54ba..000000000
--- a/lib/tpl/default/template.info.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-base     default
-author   Andreas Gohr
-email    andi@splitbrain.org
-date     2013-02-16
-name     DokuWiki Default Template
-desc     DokuWiki's default template until 2012
-url      http://www.dokuwiki.org/template:default
-- 
cgit v1.2.3


From e6ce96e7985e48b36d3e78907a536becd7ee7a85 Mon Sep 17 00:00:00 2001
From: Vincent Feltz 
Date: Wed, 4 Sep 2013 09:45:59 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/fr/lang.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 940603ab6..5612d3660 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -44,6 +44,8 @@ $lang['search']                = 'Rechercher';
 $lang['search_prompt']         = 'Effectuer la recherche';
 $lang['clear']                 = 'Réinitialiser la recherche';
 $lang['filter']                = 'Filtre';
+$lang['export_all']            = 'Exporter tous les utilisateurs (CSV)';
+$lang['export_filtered']       = 'Exporter la liste d\'utilisateurs filtrée (CSV)';
 $lang['import']                = 'Importer les nouveaux utilisateurs';
 $lang['line']                  = 'Ligne n°';
 $lang['error']                 = 'Message d\'erreur';
@@ -67,7 +69,12 @@ $lang['add_ok']                = 'Utilisateur ajouté avec succès';
 $lang['add_fail']              = 'Échec de l\'ajout de l\'utilisateur';
 $lang['notify_ok']             = 'Courriel de notification expédié';
 $lang['notify_fail']           = 'Échec de l\'expédition du courriel de notification';
+$lang['import_success_count']  = 'Import d’utilisateurs : %d utilisateurs trouvés, %d utilisateurs importés avec succès.';
+$lang['import_failure_count']  = 'Import d\'utilisateurs : %d ont échoué. Les erreurs sont listées ci-dessous.';
+$lang['import_error_fields']   = 'Nombre de champs insuffisant, %d trouvé, 4 requis.';
 $lang['import_error_baduserid'] = 'Identifiant de l\'utilisateur manquant';
 $lang['import_error_badname']  = 'Mauvais nom';
 $lang['import_error_badmail']  = 'Mauvaise adresse e-mail';
+$lang['import_error_upload']   = 'L\'import a échoué. Le fichier csv n\'a pas pu être téléchargé ou bien il est vide.';
+$lang['import_error_readfail'] = 'L\'import a échoué. Impossible de lire le fichier téléchargé.';
 $lang['import_error_create']   = 'Impossible de créer l\'utilisateur';
-- 
cgit v1.2.3


From 836030cf1c5473170acc7a38b431d965859636a4 Mon Sep 17 00:00:00 2001
From: Myeongjin 
Date: Sun, 8 Sep 2013 14:07:55 +0900
Subject: Translation update in Korean

---
 lib/plugins/config/lang/ko/intro.txt |  16 +-
 lib/plugins/config/lang/ko/lang.php  | 398 +++++++++++++++++------------------
 2 files changed, 208 insertions(+), 206 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt
index c8b146930..a3ed58e17 100644
--- a/lib/plugins/config/lang/ko/intro.txt
+++ b/lib/plugins/config/lang/ko/intro.txt
@@ -1,7 +1,9 @@
-====== 환경 설정 관리자 ======
-
-DokuWiki 설치할 때 설정을 바꾸기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정]] 문서를 참고하세요. 플러그인에 대한 자세한 정보가 필요하다면 [[doku>ko:plugin:config|플러그인 설정]] 문서를 참고하세요.
-
-빨간 배경색으로 보이는 설정은 이 플러그인에서 바꾸지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
-
-이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀐 값은 적용되지 않습니다.
\ No newline at end of file
+====== 환경 설정 관리자 ======
+
+도쿠위키를 설치할 때 설정을 바꾸려면 이 페이지를 사용하세요. 개별 설정에 대한 도움말은 [[doku>ko:config]]를 참고하세요. 이 플러그인에 대한 자세한 내용은 [[doku>ko:plugin:config]]를 참고하세요.
+
+밝은 빨간색 배경으로 보이는 설정은 이 플러그인에서 바꿀 수 없도록 보호되어 있습니다. 파란색 배경으로 보이는 설정은 기본값이며 하얀색 배경으로 보이는 설정은 특수한 설치를 위해 로컬로 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
+
+이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀜이 사라지는 것에 주의하세요.
+
+
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 1aab4731a..843993c2b 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -1,199 +1,199 @@
-
- * @author Seung-Chul Yoo 
- * @author erial2@gmail.com
- * @author Myeongjin 
- */
-$lang['menu']                  = '환경 설정';
-$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 바뀜을 검토하고 확인을 누르세요.
-
잘못된 값은 빨간 선으로 둘러싸여 있습니다.';
-$lang['updated']               = '설정이 성공적으로 바뀌었습니다.';
-$lang['nochoice']              = '(다른 선택이 불가능합니다)';
-$lang['locked']                = '환경 설정 파일을 바꿀 수 없습니다. 의도한 행동이 아니라면,

-파일 이름과 권한이 맞는지 확인하세요.';
-$lang['danger']                = '위험: 이 옵션을 잘못 바꾸면 환경 설정 메뉴를 사용할 수 없을 수도 있습니다.';
-$lang['warning']               = '경고: 이 옵션을 잘못 바꾸면 잘못 동작할 수 있습니다.';
-$lang['security']              = '보안 경고: 이 옵션은 보안에 위험이 있을 수 있습니다.';
-$lang['_configuration_manager'] = '환경 설정 관리자';
-$lang['_header_dokuwiki']      = 'DokuWiki 설정';
-$lang['_header_plugin']        = '플러그인 설정';
-$lang['_header_template']      = '템플릿 설정';
-$lang['_header_undefined']     = '정의되지 않은 설정';
-$lang['_basic']                = '기본 설정';
-$lang['_display']              = '화면 표시 설정';
-$lang['_authentication']       = '인증 설정';
-$lang['_anti_spam']            = '스팸 방지 설정';
-$lang['_editing']              = '편집 설정';
-$lang['_links']                = '링크 설정';
-$lang['_media']                = '미디어 설정';
-$lang['_notifications']        = '알림 설정';
-$lang['_syndication']          = '신디케이션 설정';
-$lang['_advanced']             = '고급 설정';
-$lang['_network']              = '네트워크 설정';
-$lang['_msg_setting_undefined'] = '설정된 메타데이터가 없습니다.';
-$lang['_msg_setting_no_class'] = '설정된 클래스가 없습니다.';
-$lang['_msg_setting_no_default'] = '기본값이 없습니다.';
-$lang['title']                 = '위키 제목 (위키 이름)';
-$lang['start']                 = '각 이름공간에서 사용할 시작 문서 이름';
-$lang['lang']                  = '인터페이스 언어';
-$lang['template']              = '템플릿 (위키 디자인)';
-$lang['tagline']               = '태그 라인 (템플릿이 지원할 때에 한함)';
-$lang['sidebar']               = '사이드바 문서 이름 (템플릿이 지원할 때에 한함), 비워두면 사이드바를 비활성화';
-$lang['license']               = '콘텐츠에 어떤 라이선스를 적용하겠습니까?';
-$lang['savedir']               = '데이터 저장 디렉토리';
-$lang['basedir']               = '서버 경로 (예를 들어 /dokuwiki/). 자동 감지를 하려면 비우세요.';
-$lang['baseurl']               = '서버 URL (예를 들어 http://www.yourserver.com). 자동 감지를 하려면 비우세요.';
-$lang['cookiedir']             = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.';
-$lang['dmode']                 = '디렉토리 만들기 모드';
-$lang['fmode']                 = '파일 만들기 모드';
-$lang['allowdebug']            = '디버그 허용 필요하지 않으면 비활성화하세요!';
-$lang['recent']                = '최근 바뀐 문서당 항목 수';
-$lang['recent_days']           = '최근 바뀐 문서 기준 시간 (일)';
-$lang['breadcrumbs']           = '위치 "추적" 수. 0으로 설정하면 비활성화합니다.';
-$lang['youarehere']            = '계층형 위치 추적 (다음 위의 옵션을 비활성화하게 됩니다)';
-$lang['fullpath']              = '문서 하단에 전체 경로 보여주기';
-$lang['typography']            = '기호 대체';
-$lang['dformat']               = '날짜 형식 (PHP strftime 기능 참고)';
-$lang['signature']             = '편집기에서 서명 버튼을 누를 때 넣을 내용';
-$lang['showuseras']            = '마지막에 문서를 편집한 사용자를 보여줄지 여부';
-$lang['toptoclevel']           = '목차 최상위 항목';
-$lang['tocminheads']           = '목차 표시 여부를 결정할 최소한의 문단 제목 항목의 수';
-$lang['maxtoclevel']           = '목차 최대 단계';
-$lang['maxseclevel']           = '문단 최대 편집 단계';
-$lang['camelcase']             = '링크에 CamelCase 사용';
-$lang['deaccent']              = '문서 이름을 지우는 방법';
-$lang['useheading']            = '문서 이름으로 첫 문단 제목 사용';
-$lang['sneaky_index']          = '기본적으로 DokuWiki는 색인 목록에 모든 이름공간을 보여줍니다.
-이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 이름공간은 보여주지 않습니다. 접근 가능한 하위 이름공간을 보이지 않게 설정하면 자동으로 설정됩니다. 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.';
-$lang['hidepages']             = '사이트맵과 기타 자동 색인과 같은 찾기에서 정규 표현식과 일치하는 문서 숨기기';
-$lang['useacl']                = '접근 제어 목록 (ACL) 사용';
-$lang['autopasswd']            = '자동으로 만들어진 비밀번호';
-$lang['authtype']              = '인증 백-엔드';
-$lang['passcrypt']             = '비밀번호 암호화 방법';
-$lang['defaultgroup']          = '기본 그룹, 모든 새 사용자는 이 그룹에 속합니다';
-$lang['superuser']             = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
-$lang['manager']               = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
-$lang['profileconfirm']        = '개인 정보를 바꿀 때 비밀번호 다시 확인';
-$lang['rememberme']            = '항상 로그인 정보 저장 허용 (기억하기)';
-$lang['disableactions']        = 'DokuWiki 활동 비활성화';
-$lang['disableactions_check']  = '검사';
-$lang['disableactions_subscription'] = '구독 신청/구독 취소';
-$lang['disableactions_wikicode'] = '원본 보기/원본 내보내기';
-$lang['disableactions_other']  = '다른 활동 (쉼표로 구분)';
-$lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)';
-$lang['securecookie']          = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.';
-$lang['remote']                = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근 가능합니다.';
-$lang['remoteuser']            = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.';
-$lang['usewordblock']          = '금지 단어를 사용해 스팸 막기';
-$lang['relnofollow']           = '바깥 링크에 rel="nofollow" 사용';
-$lang['indexdelay']            = '색인 연기 시간 (초)';
-$lang['mailguard']             = '이메일 주소를 알아볼 수 없게 하기';
-$lang['iexssprotect']          = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사';
-$lang['usedraft']              = '편집하는 동안 자동으로 문서 초안 저장';
-$lang['htmlok']                = 'HTML 내장 허용';
-$lang['phpok']                 = 'PHP 내장 허용';
-$lang['locktime']              = '최대 파일 잠금 시간(초)';
-$lang['cachetime']             = '최대 캐시 생존 시간 (초)';
-$lang['target____wiki']        = '안쪽 링크에 대한 타겟 창';
-$lang['target____interwiki']   = '인터위키 링크에 대한 타겟 창';
-$lang['target____extern']      = '바깥 링크에 대한 타겟 창';
-$lang['target____media']       = '미디어 링크에 대한 타겟 창';
-$lang['target____windows']     = '창 링크에 대한 타겟 창';
-$lang['mediarevisions']        = '미디어 판 관리를 사용하겠습니까?';
-$lang['refcheck']              = '미디어 파일을 삭제하기 전에 사용하고 있는지 검사';
-$lang['gdlib']                 = 'GD 라이브러리 버전';
-$lang['im_convert']            = 'ImageMagick 변환 도구 위치';
-$lang['jpg_quality']           = 'JPG 압축 품질 (0-100)';
-$lang['fetchsize']             = 'fetch.php가 바깥에서 다운로드할 수도 있는 최대 크기 (바이트)';
-$lang['subscribers']           = '사용자가 이메일로 문서 바뀜에 구독하도록 허용';
-$lang['subscribe_time']        = '구독 목록과 요약이 보내질 경과 시간 (초); recent_days에서 설정된 시간보다 작아야 합니다.';
-$lang['notify']                = '항상 이 이메일 주소로 바뀜 알림을 보냄';
-$lang['registernotify']        = '항상 새 사용자한테 이 이메일 주소로 정보를 보냄';
-$lang['mailfrom']              = '자동으로 보내지는 메일 발신자';
-$lang['mailprefix']            = '자동으로 보내지는 메일의 제목 말머리 내용. 비웠을 경우 위키 제목 사용';
-$lang['htmlmail']              = '용량은 조금 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 보냅니다. 텍스트만의 메일을 보내고자하면 비활성화하세요.';
-$lang['sitemap']               = '구글 사이트맵 생성 날짜 빈도. 0일 경우 비활성화합니다';
-$lang['rss_type']              = 'XML 피드 타입';
-$lang['rss_linkto']            = 'XML 피드 링크 정보';
-$lang['rss_content']           = 'XML 피드 항목에 표시되는 내용은 무엇입니까?';
-$lang['rss_update']            = 'XML 피드 업데이트 주기 (초)';
-$lang['rss_show_summary']      = 'XML 피드 제목에서 요약 보여주기';
-$lang['rss_media']             = '어떤 규격으로 XML 피드를 받아보시겠습니까?';
-$lang['updatecheck']           = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 DokuWiki를 update.dokuwiki.org에 연결해야 합니다.';
-$lang['userewrite']            = '멋진 URL 사용';
-$lang['useslash']              = 'URL에서 이름 구분자로 슬래시 문자 사용';
-$lang['sepchar']               = '문서 이름 단어 구분자';
-$lang['canonical']             = '완전한 canonical URL 사용';
-$lang['fnencode']              = 'ASCII가 아닌 파일 이름을 인코딩 하는 방법.';
-$lang['autoplural']            = '링크 연결시 복수 양식 검사';
-$lang['compression']           = '첨부 파일 압축 방법 선택';
-$lang['gzip_output']           = 'xhml 내용 gzip 압축 사용';
-$lang['compress']              = '최적화된 CSS, 자바스크립트 출력';
-$lang['cssdatauri']            = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! 400에서 600 정도면 좋은 효율을 가져옵니다. 0로 지정할 경우 비활성화 됩니다.';
-$lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답';
-$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 버그 852를 참고하시기 바랍니다.';
-$lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
-$lang['renderer_xhtml']        = '주 (xhtml) 위키 출력 처리기';
-$lang['renderer__core']        = '%s (DokuWiki 내부)';
-$lang['renderer__plugin']      = '%s (플러그인)';
-$lang['dnslookups']            = '이 옵션을 활성화하면 DokuWiki가 문서를 편집하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화하세요';
-$lang['proxy____host']         = '프록시 서버 이름';
-$lang['proxy____port']         = '프록시 서버 포트';
-$lang['proxy____user']         = '프록시 사용자 이름';
-$lang['proxy____pass']         = '프록시 비밀번호';
-$lang['proxy____ssl']          = '프록시 연결시 SSL 사용';
-$lang['proxy____except']       = '프록시 설정이 무시될 URL주소의 정규 표현식';
-$lang['safemodehack']          = 'safemode hack기능 사용';
-$lang['ftp____host']           = 'safemode hack의 FTP 서버';
-$lang['ftp____port']           = 'safemode hack의 FTP 포트';
-$lang['ftp____user']           = 'safemode hack의 FTP 사용자 이름';
-$lang['ftp____pass']           = 'safemode hack의 FTP 비밀번호';
-$lang['ftp____root']           = 'safemode hack의 FTP 루트 디렉토리';
-$lang['license_o_']            = '선택하지 않음';
-$lang['typography_o_0']        = '사용 안함';
-$lang['typography_o_1']        = '이중 인용부호("")만 지원';
-$lang['typography_o_2']        = '모든 가능한 인용 부호 (동작 안될 수도 있음)';
-$lang['userewrite_o_0']        = '사용 안함';
-$lang['userewrite_o_1']        = '.htaccess';
-$lang['userewrite_o_2']        = 'DokuWiki 내부 기능';
-$lang['deaccent_o_0']          = '끄기';
-$lang['deaccent_o_1']          = '악센트 제거';
-$lang['deaccent_o_2']          = '라틴문자화';
-$lang['gdlib_o_0']             = 'GD 라이브러리 사용 불가';
-$lang['gdlib_o_1']             = '버전 1.x';
-$lang['gdlib_o_2']             = '자동 인식';
-$lang['rss_type_o_rss']        = 'RSS 0.91';
-$lang['rss_type_o_rss1']       = 'RSS 1.0';
-$lang['rss_type_o_rss2']       = 'RSS 2.0';
-$lang['rss_type_o_atom']       = 'Atom 0.3';
-$lang['rss_type_o_atom1']      = 'Atom 1.0';
-$lang['rss_content_o_abstract'] = '개요';
-$lang['rss_content_o_diff']    = '통합 차이 목록';
-$lang['rss_content_o_htmldiff'] = 'HTML 차이 목록 형식';
-$lang['rss_content_o_html']    = '최대 HTML 페이지 내용';
-$lang['rss_linkto_o_diff']     = '차이 보기';
-$lang['rss_linkto_o_page']     = '바뀐 문서 보기';
-$lang['rss_linkto_o_rev']      = '바뀐 목록 보기';
-$lang['rss_linkto_o_current']  = '현재 문서 보기';
-$lang['compression_o_0']       = '없음';
-$lang['compression_o_gz']      = 'gzip';
-$lang['compression_o_bz2']     = 'bz2';
-$lang['xsendfile_o_0']         = '사용 불가';
-$lang['xsendfile_o_1']         = '비공개 lighttpd 헤더 (1.5 이전 버전)';
-$lang['xsendfile_o_2']         = '표준 X-Sendfile 헤더';
-$lang['xsendfile_o_3']         = '비공개 Nginx X-Accel-Redirect 헤더';
-$lang['showuseras_o_loginname'] = '로그인 이름';
-$lang['showuseras_o_username'] = '사용자의 전체 이름';
-$lang['showuseras_o_email']    = '사용자의 이메일 주소 (메일 주소 보호 설정에 따라 안보일 수 있음)';
-$lang['showuseras_o_email_link'] = 'mailto: link로 표현될 사용자 이메일 주소';
-$lang['useheading_o_0']        = '아니오';
-$lang['useheading_o_navigation'] = '둘러보기에만';
-$lang['useheading_o_content']  = '위키 내용에만';
-$lang['useheading_o_1']        = '항상';
-$lang['readdircache']          = 'readdir 캐시를 위한 최대 시간 (초)';
+
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ */
+$lang['menu']                  = '환경 설정';
+$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 바뀜을 검토하고 확인을 누르세요.
+
잘못된 값은 빨간 선으로 둘러싸여 있습니다.';
+$lang['updated']               = '설정이 성공적으로 바뀌었습니다.';
+$lang['nochoice']              = '(다른 선택이 불가능합니다)';
+$lang['locked']                = '환경 설정 파일을 바꿀 수 없습니다. 의도한 행동이 아니라면,

+파일 이름과 권한이 맞는지 확인하세요.';
+$lang['danger']                = '위험: 이 옵션을 잘못 바꾸면 환경 설정 메뉴를 사용할 수 없을 수도 있습니다.';
+$lang['warning']               = '경고: 이 옵션을 잘못 바꾸면 잘못 동작할 수 있습니다.';
+$lang['security']              = '보안 경고: 이 옵션은 보안에 위험이 있을 수 있습니다.';
+$lang['_configuration_manager'] = '환경 설정 관리자';
+$lang['_header_dokuwiki']      = '도쿠위키 설정';
+$lang['_header_plugin']        = '플러그인 설정';
+$lang['_header_template']      = '템플릿 설정';
+$lang['_header_undefined']     = '정의되지 않은 설정';
+$lang['_basic']                = '기본 설정';
+$lang['_display']              = '화면 표시 설정';
+$lang['_authentication']       = '인증 설정';
+$lang['_anti_spam']            = '스팸 방지 설정';
+$lang['_editing']              = '편집 설정';
+$lang['_links']                = '링크 설정';
+$lang['_media']                = '미디어 설정';
+$lang['_notifications']        = '알림 설정';
+$lang['_syndication']          = '신디케이션 설정';
+$lang['_advanced']             = '고급 설정';
+$lang['_network']              = '네트워크 설정';
+$lang['_msg_setting_undefined'] = '설정된 메타데이터가 없습니다.';
+$lang['_msg_setting_no_class'] = '설정된 클래스가 없습니다.';
+$lang['_msg_setting_no_default'] = '기본값이 없습니다.';
+$lang['title']                 = '위키 제목 (위키 이름)';
+$lang['start']                 = '각 이름공간에서 사용할 시작 문서 이름';
+$lang['lang']                  = '인터페이스 언어';
+$lang['template']              = '템플릿 (위키 디자인)';
+$lang['tagline']               = '태그 라인 (템플릿이 지원할 때에 한함)';
+$lang['sidebar']               = '사이드바 문서 이름 (템플릿이 지원할 때에 한함), 비워두면 사이드바를 비활성화';
+$lang['license']               = '내용에 어떤 라이선스를 적용하겠습니까?';
+$lang['savedir']               = '데이터 저장 디렉터리';
+$lang['basedir']               = '서버 경로 (예를 들어 /dokuwiki/). 자동 감지를 하려면 비우세요.';
+$lang['baseurl']               = '서버 URL (예를 들어 http://www.yourserver.com). 자동 감지를 하려면 비우세요.';
+$lang['cookiedir']             = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.';
+$lang['dmode']                 = '디렉터리 만들기 모드';
+$lang['fmode']                 = '파일 만들기 모드';
+$lang['allowdebug']            = '디버그 허용 필요하지 않으면 비활성화하세요!';
+$lang['recent']                = '최근 바뀐 문서당 항목 수';
+$lang['recent_days']           = '최근 바뀐 문서 기준 시간 (일)';
+$lang['breadcrumbs']           = '위치 "추적" 수. 0으로 설정하면 비활성화합니다.';
+$lang['youarehere']            = '계층형 위치 추적 (다음 위의 옵션을 비활성화하게 됩니다)';
+$lang['fullpath']              = '문서 하단에 전체 경로 보여주기';
+$lang['typography']            = '기호 대체';
+$lang['dformat']               = '날짜 형식 (PHP strftime 기능 참고)';
+$lang['signature']             = '편집기에서 서명 버튼을 누를 때 넣을 내용';
+$lang['showuseras']            = '마지막에 문서를 편집한 사용자를 보여줄지 여부';
+$lang['toptoclevel']           = '목차 최상위 항목';
+$lang['tocminheads']           = '목차 표시 여부를 결정할 최소한의 문단 제목 항목의 수';
+$lang['maxtoclevel']           = '목차 최대 단계';
+$lang['maxseclevel']           = '문단 최대 편집 단계';
+$lang['camelcase']             = '링크에 CamelCase 사용';
+$lang['deaccent']              = '문서 이름을 지우는 방법';
+$lang['useheading']            = '문서 이름으로 첫 문단 제목 사용';
+$lang['sneaky_index']          = '기본적으로 도쿠위키는 색인 목록에 모든 이름공간을 보여줍니다.
+이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 이름공간은 보여주지 않습니다. 접근 가능한 하위 이름공간을 보이지 않게 설정하면 자동으로 설정됩니다. 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.';
+$lang['hidepages']             = '사이트맵과 기타 자동 색인과 같은 찾기에서 정규 표현식과 일치하는 문서 숨기기';
+$lang['useacl']                = '접근 제어 목록 (ACL) 사용';
+$lang['autopasswd']            = '자동으로 만들어진 비밀번호';
+$lang['authtype']              = '인증 백-엔드';
+$lang['passcrypt']             = '비밀번호 암호화 방법';
+$lang['defaultgroup']          = '기본 그룹, 모든 새 사용자는 이 그룹에 속합니다';
+$lang['superuser']             = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
+$lang['manager']               = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
+$lang['profileconfirm']        = '개인 정보를 바꿀 때 비밀번호 다시 확인';
+$lang['rememberme']            = '항상 로그인 정보 저장 허용 (기억하기)';
+$lang['disableactions']        = '도쿠위키 활동 비활성화';
+$lang['disableactions_check']  = '검사';
+$lang['disableactions_subscription'] = '구독 신청/구독 취소';
+$lang['disableactions_wikicode'] = '원본 보기/원본 내보내기';
+$lang['disableactions_other']  = '다른 활동 (쉼표로 구분)';
+$lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)';
+$lang['securecookie']          = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.';
+$lang['remote']                = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메커니즘을 통해 다른 어플리케이션으로 접근 가능합니다.';
+$lang['remoteuser']            = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.';
+$lang['usewordblock']          = '금지 단어를 사용해 스팸 막기';
+$lang['relnofollow']           = '바깥 링크에 rel="nofollow" 사용';
+$lang['indexdelay']            = '색인 연기 시간 (초)';
+$lang['mailguard']             = '이메일 주소를 알아볼 수 없게 하기';
+$lang['iexssprotect']          = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사';
+$lang['usedraft']              = '편집하는 동안 자동으로 문서 초안 저장';
+$lang['htmlok']                = 'HTML 내장 허용';
+$lang['phpok']                 = 'PHP 내장 허용';
+$lang['locktime']              = '최대 파일 잠금 시간(초)';
+$lang['cachetime']             = '최대 캐시 생존 시간 (초)';
+$lang['target____wiki']        = '안쪽 링크에 대한 타겟 창';
+$lang['target____interwiki']   = '인터위키 링크에 대한 타겟 창';
+$lang['target____extern']      = '바깥 링크에 대한 타겟 창';
+$lang['target____media']       = '미디어 링크에 대한 타겟 창';
+$lang['target____windows']     = '창 링크에 대한 타겟 창';
+$lang['mediarevisions']        = '미디어 판 관리를 사용하겠습니까?';
+$lang['refcheck']              = '미디어 파일을 삭제하기 전에 사용하고 있는지 검사';
+$lang['gdlib']                 = 'GD 라이브러리 버전';
+$lang['im_convert']            = 'ImageMagick 변환 도구 위치';
+$lang['jpg_quality']           = 'JPG 압축 품질 (0-100)';
+$lang['fetchsize']             = 'fetch.php가 바깥에서 다운로드할 수도 있는 최대 크기 (바이트)';
+$lang['subscribers']           = '사용자가 이메일로 문서 바뀜에 구독하도록 허용';
+$lang['subscribe_time']        = '구독 목록과 요약이 보내질 경과 시간 (초); recent_days에서 설정된 시간보다 작아야 합니다.';
+$lang['notify']                = '항상 이 이메일 주소로 바뀜 알림을 보냄';
+$lang['registernotify']        = '항상 새 사용자한테 이 이메일 주소로 정보를 보냄';
+$lang['mailfrom']              = '자동으로 보내지는 메일 발신자';
+$lang['mailprefix']            = '자동으로 보내지는 메일의 제목 말머리 내용. 비웠을 경우 위키 제목 사용';
+$lang['htmlmail']              = '용량은 조금 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 보냅니다. 텍스트만의 메일을 보내려면 비활성화하세요.';
+$lang['sitemap']               = '구글 사이트맵 생성 날짜 빈도. 0일 경우 비활성화합니다';
+$lang['rss_type']              = 'XML 피드 타입';
+$lang['rss_linkto']            = 'XML 피드 링크 정보';
+$lang['rss_content']           = 'XML 피드 항목에 표시되는 내용은 무엇입니까?';
+$lang['rss_update']            = 'XML 피드 업데이트 주기 (초)';
+$lang['rss_show_summary']      = 'XML 피드 제목에서 요약 보여주기';
+$lang['rss_media']             = '어떤 규격으로 XML 피드를 받아보시겠습니까?';
+$lang['updatecheck']           = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 도쿠위키를 update.dokuwiki.org에 연결해야 합니다.';
+$lang['userewrite']            = '멋진 URL 사용';
+$lang['useslash']              = 'URL에서 이름 구분자로 슬래시 문자 사용';
+$lang['sepchar']               = '문서 이름 단어 구분자';
+$lang['canonical']             = '완전한 canonical URL 사용';
+$lang['fnencode']              = 'ASCII가 아닌 파일 이름을 인코딩 하는 방법.';
+$lang['autoplural']            = '링크 연결시 복수 양식 검사';
+$lang['compression']           = '첨부 파일 압축 방법 선택';
+$lang['gzip_output']           = 'xhml 내용 gzip 압축 사용';
+$lang['compress']              = '최적화된 CSS, 자바스크립트 출력';
+$lang['cssdatauri']            = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! 400에서 600 정도면 좋은 효율을 가져옵니다. 0로 지정할 경우 비활성화 됩니다.';
+$lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP 404/페이지를 찾을 수 없습니다" 응답';
+$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 버그 852를 참고하시기 바랍니다.';
+$lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
+$lang['renderer_xhtml']        = '주 (xhtml) 위키 출력 처리기';
+$lang['renderer__core']        = '%s (도쿠위키 내부)';
+$lang['renderer__plugin']      = '%s (플러그인)';
+$lang['dnslookups']            = '이 옵션을 활성화하면 도쿠위키가 문서를 편집하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화하세요';
+$lang['proxy____host']         = '프록시 서버 이름';
+$lang['proxy____port']         = '프록시 서버 포트';
+$lang['proxy____user']         = '프록시 사용자 이름';
+$lang['proxy____pass']         = '프록시 비밀번호';
+$lang['proxy____ssl']          = '프록시 연결시 SSL 사용';
+$lang['proxy____except']       = '프록시 설정이 무시될 URL주소의 정규 표현식';
+$lang['safemodehack']          = 'safemode hack기능 사용';
+$lang['ftp____host']           = 'safemode hack의 FTP 서버';
+$lang['ftp____port']           = 'safemode hack의 FTP 포트';
+$lang['ftp____user']           = 'safemode hack의 FTP 사용자 이름';
+$lang['ftp____pass']           = 'safemode hack의 FTP 비밀번호';
+$lang['ftp____root']           = 'safemode hack의 FTP 루트 디렉터리';
+$lang['license_o_']            = '선택하지 않음';
+$lang['typography_o_0']        = '사용 안함';
+$lang['typography_o_1']        = '이중 인용부호("")만 지원';
+$lang['typography_o_2']        = '모든 가능한 인용 부호 (동작 안될 수도 있음)';
+$lang['userewrite_o_0']        = '사용 안함';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = '도쿠위키 내부 기능';
+$lang['deaccent_o_0']          = '끄기';
+$lang['deaccent_o_1']          = '악센트 제거';
+$lang['deaccent_o_2']          = '라틴문자화';
+$lang['gdlib_o_0']             = 'GD 라이브러리 사용 불가';
+$lang['gdlib_o_1']             = '버전 1.x';
+$lang['gdlib_o_2']             = '자동 인식';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = 'Atom 0.3';
+$lang['rss_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = '개요';
+$lang['rss_content_o_diff']    = '통합 차이 목록';
+$lang['rss_content_o_htmldiff'] = 'HTML 차이 목록 형식';
+$lang['rss_content_o_html']    = '최대 HTML 페이지 내용';
+$lang['rss_linkto_o_diff']     = '차이 보기';
+$lang['rss_linkto_o_page']     = '바뀐 문서 보기';
+$lang['rss_linkto_o_rev']      = '바뀐 목록 보기';
+$lang['rss_linkto_o_current']  = '현재 문서 보기';
+$lang['compression_o_0']       = '없음';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = '사용 불가';
+$lang['xsendfile_o_1']         = '비공개 lighttpd 헤더 (1.5 이전 버전)';
+$lang['xsendfile_o_2']         = '표준 X-Sendfile 헤더';
+$lang['xsendfile_o_3']         = '비공개 Nginx X-Accel-Redirect 헤더';
+$lang['showuseras_o_loginname'] = '로그인 이름';
+$lang['showuseras_o_username'] = '사용자의 전체 이름';
+$lang['showuseras_o_email']    = '사용자의 이메일 주소 (메일 주소 설정에 따라 안보일 수 있음)';
+$lang['showuseras_o_email_link'] = 'mailto: link로 표현될 사용자 이메일 주소';
+$lang['useheading_o_0']        = '아니오';
+$lang['useheading_o_navigation'] = '둘러보기에만';
+$lang['useheading_o_content']  = '위키 내용에만';
+$lang['useheading_o_1']        = '항상';
+$lang['readdircache']          = 'readdir 캐시를 위한 최대 시간 (초)';
-- 
cgit v1.2.3


From df2df443ae3c298d604bfc769fa173b02651ef7a Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov 
Date: Sun, 8 Sep 2013 19:05:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ru/help.txt           |  9 +++++----
 lib/plugins/authmysql/lang/ru/settings.php |  5 +++--
 lib/plugins/authpgsql/lang/ru/settings.php | 22 ++++++++++++++++++++++
 lib/plugins/plugin/lang/ru/lang.php        |  2 +-
 lib/plugins/usermanager/lang/ru/import.txt |  6 +++---
 5 files changed, 34 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt
index 7807105a8..ecb2fe3d0 100644
--- a/lib/plugins/acl/lang/ru/help.txt
+++ b/lib/plugins/acl/lang/ru/help.txt
@@ -1,7 +1,8 @@
 === Краткая справка ===
 
-На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам своей вики.\\ 
-На панели слева отображены доступные пространства имён и страницы.\\ 
-Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.\\ 
-Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.\\ 
+На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам своей вики.
+  * На панели слева отображены доступные пространства имён и страницы.
+  * Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.
+  * Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.
+
 Прочтение  [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики».
diff --git a/lib/plugins/authmysql/lang/ru/settings.php b/lib/plugins/authmysql/lang/ru/settings.php
index 23fd349af..2d8f4788e 100644
--- a/lib/plugins/authmysql/lang/ru/settings.php
+++ b/lib/plugins/authmysql/lang/ru/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Aleksandr Selivanov 
  */
 $lang['server']                = 'Ваш MySQL-сервер';
 $lang['user']                  = 'Имя пользователя MySQL';
@@ -17,12 +18,12 @@ $lang['checkPass']             = 'Выражение SQL, осуществляю
 $lang['getUserInfo']           = 'Выражение SQL, осуществляющее извлечение информации о пользователе';
 $lang['getGroups']             = 'Выражение SQL, осуществляющее извлечение информации о членстве пользователе в группах';
 $lang['getUsers']              = 'Выражение SQL, осуществляющее извлечение полного списка пользователей';
-$lang['FilterLogin']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по пользовательскому имени';
+$lang['FilterLogin']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по логину';
 $lang['FilterName']            = 'Выражение SQL, осуществляющее фильтрацию пользователей по полному имени';
 $lang['FilterEmail']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по адресу электронной почты';
 $lang['FilterGroup']           = 'Выражение SQL, осуществляющее фильтрацию пользователей согласно членству в группе';
 $lang['SortOrder']             = 'Выражение SQL, осуществляющее сортировку пользователей';
-$lang['addUser']               = 'Выражение SQL, осуществляющее добавление нового опльзователя';
+$lang['addUser']               = 'Выражение SQL, осуществляющее добавление нового пользователя';
 $lang['addGroup']              = 'Выражение SQL, осуществляющее добавление новой группы';
 $lang['addUserGroup']          = 'Выражение SQL, осуществляющее добавление пользователя в существующую группу';
 $lang['delGroup']              = 'Выражение SQL, осуществляющее удаление группы';
diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php
index f5d0a77ee..48dd2a87c 100644
--- a/lib/plugins/authpgsql/lang/ru/settings.php
+++ b/lib/plugins/authpgsql/lang/ru/settings.php
@@ -7,4 +7,26 @@
  * @author Aleksandr Selivanov 
  */
 $lang['server']                = 'Ваш PostgreSQL-сервер';
+$lang['port']                  = 'Порт вашего PostgreSQL-сервера';
+$lang['user']                  = 'Имя пользователя PostgreSQL';
 $lang['password']              = 'Пароль для указанного пользователя.';
+$lang['database']              = 'Имя базы данных';
+$lang['checkPass']             = 'Выражение SQL, осуществляющее проверку пароля';
+$lang['getUserInfo']           = 'Выражение SQL, осуществляющее извлечение информации о пользователе';
+$lang['getGroups']             = 'Выражение SQL, осуществляющее извлечение информации о членстве пользователе в группах';
+$lang['getUsers']              = 'Выражение SQL, осуществляющее извлечение полного списка пользователей';
+$lang['FilterLogin']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по логину';
+$lang['FilterName']            = 'Выражение SQL, осуществляющее фильтрацию пользователей по полному имени';
+$lang['FilterEmail']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по адресу электронной почты';
+$lang['FilterGroup']           = 'Выражение SQL, осуществляющее фильтрацию пользователей согласно членству в группе';
+$lang['SortOrder']             = 'Выражение SQL, осуществляющее сортировку пользователей';
+$lang['addUser']               = 'Выражение SQL, осуществляющее добавление нового пользователя';
+$lang['addGroup']              = 'Выражение SQL, осуществляющее добавление новой группы';
+$lang['addUserGroup']          = 'Выражение SQL, осуществляющее добавление пользователя в существующую группу';
+$lang['delGroup']              = 'Выражение SQL, осуществляющее удаление группы';
+$lang['getUserID']             = 'Выражение SQL, обеспечивающее получение первичного ключа пользователя';
+$lang['delUser']               = 'Выражение SQL, осуществляющее удаление пользователя';
+$lang['delUserRefs']           = 'Выражение SQL, осуществляющее удаление пользователя из всех группы';
+$lang['updateUser']            = 'Выражение SQL, осуществляющее обновление профиля пользователя';
+$lang['delUserGroup']          = 'Выражение SQL, осуществляющее удаление пользователя из указанной группы';
+$lang['getGroupID']            = 'Выражение SQL, обеспечивающее получение первичного ключа указанной группы';
diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php
index 6af100bd3..b933f7754 100644
--- a/lib/plugins/plugin/lang/ru/lang.php
+++ b/lib/plugins/plugin/lang/ru/lang.php
@@ -57,7 +57,7 @@ $lang['error_download']        = 'Не могу скачать файл плаг
 $lang['error_badurl']          = 'Возможно неправильный адрес — не могу определить имя файла из адреса';
 $lang['error_dircreate']       = 'Не могу создать временную директорию для скачивания';
 $lang['error_decompress']      = 'Менеджеру плагинов не удалось распаковать скачанный файл. Это может быть результатом ошибки при скачивании, в этом случае вы можете попробовать снова, или же плагин упакован неизвестным архиватором, тогда вам необходимо скачать и установить плагин вручную.';
-$lang['error_copy']            = 'Произошла ошибка копирования при попытке установки файлов для плагина %s: переполнение диска или неправильные права доступа. Это могло привести к частичной установке плагина и неустойчивости вашей вики.';
+$lang['error_copy']            = 'Произошла ошибка копирования при попытке установки файлов для плагина %s: переполнение диска или неправильные права доступа. Это могло привести к частичной установке плагина и неустойчивости работы вашей вики.';
 $lang['error_delete']          = 'Произошла ошибка при попытке удалить плагин %s.  Наиболее вероятно, что нет необходимых прав доступа к файлам или директориям';
 $lang['enabled']               = 'Плагин %s включен.';
 $lang['notenabled']            = 'Не удалось включить плагин %s. Проверьте системные права доступа к файлам.';
diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt
index 271a9b177..3a25f34ce 100644
--- a/lib/plugins/usermanager/lang/ru/import.txt
+++ b/lib/plugins/usermanager/lang/ru/import.txt
@@ -2,8 +2,8 @@
 
 Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
 Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы.
-Поля CSV должны быть отделены запятой (,) а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание.
-В качестве примера можете взять список пользователей, экспортированный через "Экспорт пользователей".
+Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание.
+В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей».
 Повторяющиеся идентификаторы user-id будут игнорироваться.
 
-Парол доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file
+Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file
-- 
cgit v1.2.3


From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001
From: Matt Perry 
Date: Tue, 10 Sep 2013 22:17:43 -0700
Subject: Fix CodeSniffer whitespace violoations

Removed extraneous whitespace to eliminate errors reported by the
Squiz.WhiteSpace.SuperfluousWhitespace sniff.
---
 lib/plugins/acl/admin.php                    | 4 ----
 lib/plugins/acl/style.css                    | 2 --
 lib/plugins/config/settings/config.class.php | 2 --
 lib/plugins/plugin/admin.php                 | 1 -
 lib/plugins/plugin/classes/ap_info.class.php | 1 -
 lib/plugins/popularity/action.php            | 1 -
 lib/plugins/revert/admin.php                 | 1 -
 lib/plugins/syntax.php                       | 4 ++--
 lib/plugins/usermanager/admin.php            | 1 -
 lib/scripts/linkwiz.js                       | 1 -
 lib/scripts/textselection.js                 | 2 --
 lib/tpl/dokuwiki/css/_forms.css              | 1 -
 lib/tpl/dokuwiki/css/_media_fullscreen.css   | 1 -
 13 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 50377da81..5ab73670d 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -61,7 +61,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         // fresh 1:1 copy without replacements
         $AUTH_ACL = file($config_cascade['acl']['default']);
 
-
         // namespace given?
         if($INPUT->str('ns') == '*'){
             $this->ns = '*';
@@ -386,7 +385,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             echo ''.$this->getLang('acl_mod').'';
         }
 
-
         echo $this->_html_checkboxes($current,empty($this->ns),'acl');
 
         if(is_null($current)){
@@ -686,7 +684,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             if($acl_level > AUTH_EDIT) $acl_level = AUTH_EDIT;
         }
 
-
         $new_acl = "$acl_scope\t$acl_user\t$acl_level\n";
 
         $new_config = $acl_config.$new_acl;
@@ -775,7 +772,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             $inlist = true;
         }
 
-
         echo '");
@@ -256,13 +263,18 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             $this->_htmlImportForm();
         }
         ptln("
");
+        return true;
     }
 
-
     /**
-     * @todo disable fields which the backend can't change
+     * Display form to add or modify a user
+     *
+     * @param string $cmd 'add' or 'modify'
+     * @param string $user id of user
+     * @param array  $userdata array with name, mail, pass and grps
+     * @param int    $indent
      */
-    function _htmlUserForm($cmd,$user='',$userdata=array(),$indent=0) {
+    private function _htmlUserForm($cmd,$user='',$userdata=array(),$indent=0) {
         global $conf;
         global $ID;
 
@@ -332,7 +344,17 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("",$indent);
     }
 
-    function _htmlInputField($id, $name, $label, $value, $cando, $indent=0) {
+    /**
+     * Prints a inputfield
+     *
+     * @param string $id
+     * @param string $name
+     * @param string $label
+     * @param string $value
+     * @param bool   $cando whether auth backend is capable to do this action
+     * @param int $indent
+     */
+    private function _htmlInputField($id, $name, $label, $value, $cando, $indent=0) {
         $class = $cando ? '' : ' class="disabled"';
         echo str_pad('',$indent);
 
@@ -361,12 +383,23 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         echo "";
     }
 
-    function _htmlFilter($key) {
+    /**
+     * Returns htmlescaped filter value
+     *
+     * @param string $key name of search field
+     * @return string html escaped value
+     */
+    private function _htmlFilter($key) {
         if (empty($this->_filter)) return '';
         return (isset($this->_filter[$key]) ? hsc($this->_filter[$key]) : '');
     }
 
-    function _htmlFilterSettings($indent=0) {
+    /**
+     * Print hidden inputs with the current filter values
+     *
+     * @param int $indent
+     */
+    private function _htmlFilterSettings($indent=0) {
 
         ptln("_start."\" />",$indent);
 
@@ -375,7 +408,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
     }
 
-    function _htmlImportForm($indent=0) {
+    /**
+     * Print import form and summary of previous import
+     *
+     * @param int $indent
+     */
+    private function _htmlImportForm($indent=0) {
         global $ID;
 
         $failure_download_link = wl($ID,array('do'=>'admin','page'=>'usermanager','fn[importfails]'=>1));
@@ -428,7 +466,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
     }
 
-    function _addUser(){
+    /**
+     * Add an user to auth backend
+     *
+     * @return bool whether succesful
+     */
+    private function _addUser(){
         global $INPUT;
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('addUser')) return false;
@@ -489,9 +532,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * Delete user
+     * Delete user from auth backend
+     *
+     * @return bool whether succesful
      */
-    function _deleteUser(){
+    private function _deleteUser(){
         global $conf, $INPUT;
 
         if (!checkSecurityToken()) return false;
@@ -524,8 +569,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
     /**
      * Edit user (a user has been selected for editing)
+     *
+     * @param string $param id of the user
+     * @return bool whether succesful
      */
-    function _editUser($param) {
+    private function _editUser($param) {
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('UserMod')) return false;
 
@@ -545,9 +593,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * Modify user (modified user data has been recieved)
+     * Modify user in the auth backend (modified user data has been recieved)
+     *
+     * @return bool whether succesful
      */
-    function _modifyUser(){
+    private function _modifyUser(){
         global $conf, $INPUT;
 
         if (!checkSecurityToken()) return false;
@@ -615,9 +665,14 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * send password change notification email
+     * Send password change notification email
+     *
+     * @param string $user         id of user
+     * @param string $password     plain text
+     * @param bool   $status_alert whether status alert should be shown
+     * @return bool whether succesful
      */
-    function _notifyUser($user, $password, $status_alert=true) {
+    private function _notifyUser($user, $password, $status_alert=true) {
 
         if ($sent = auth_sendPassword($user,$password)) {
             if ($status_alert) {
@@ -633,11 +688,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * retrieve & clean user data from the form
+     * Retrieve & clean user data from the form
      *
+     * @param bool $clean whether the cleanUser method of the authentication backend is applied
      * @return array (user, password, full name, email, array(groups))
      */
-    function _retrieveUser($clean=true) {
+    private function _retrieveUser($clean=true) {
+        /** @var DokuWiki_Auth_Plugin $auth */
         global $auth;
         global $INPUT;
 
@@ -656,7 +713,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return $user;
     }
 
-    function _setFilter($op) {
+    /**
+     * Set the filter with the current search terms or clear the filter
+     *
+     * @param string $op 'new' or 'clear'
+     */
+    private function _setFilter($op) {
 
         $this->_filter = array();
 
@@ -670,7 +732,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
     }
 
-    function _retrieveFilter() {
+    /**
+     * Get the current search terms
+     *
+     * @return array
+     */
+    private function _retrieveFilter() {
         global $INPUT;
 
         $t_filter = $INPUT->arr('filter');
@@ -686,7 +753,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return $filter;
     }
 
-    function _validatePagination() {
+    /**
+     * Validate and improve the pagination values
+     */
+    private function _validatePagination() {
 
         if ($this->_start >= $this->_user_total) {
             $this->_start = $this->_user_total - $this->_pagesize;
@@ -696,10 +766,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $this->_last = min($this->_user_total, $this->_start + $this->_pagesize);
     }
 
-    /*
-     *  return an array of strings to enable/disable pagination buttons
+    /**
+     * Return an array of strings to enable/disable pagination buttons
+     *
+     * @return array with enable/disable attributes
      */
-    function _pagination() {
+    private function _pagination() {
 
         $disabled = 'disabled="disabled"';
 
@@ -715,10 +787,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return $buttons;
     }
 
-    /*
-     *  export a list of users in csv format using the current filter criteria
+    /**
+     * Export a list of users in csv format using the current filter criteria
      */
-    function _export() {
+    private function _export() {
         // list of users for export - based on current filter criteria
         $user_list = $this->_auth->retrieveUsers(0, 0, $this->_filter);
         $column_headings = array(
@@ -747,12 +819,14 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         die;
     }
 
-    /*
-     * import a file of users in csv format
+    /**
+     * Import a file of users in csv format
      *
      * csv file should have 4 columns, user_id, full name, email, groups (comma separated)
+     *
+     * @return bool whether succesful
      */
-    function _import() {
+    private function _import() {
         // check we are allowed to add users
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('addUser')) return false;
@@ -812,9 +886,17 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             $_SESSION['import_failures'] = $this->_import_failures;
             session_write_close();
         }
+        return true;
     }
 
-    function _cleanImportUser($candidate, & $error){
+    /**
+     * Returns cleaned row data
+     *
+     * @param array $candidate raw values of line from input file
+     * @param $error
+     * @return array|bool cleaned data or false
+     */
+    private function _cleanImportUser($candidate, & $error){
         global $INPUT;
 
         // kludgy ....
@@ -853,7 +935,16 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return $cleaned;
     }
 
-    function _addImportUser($user, & $error){
+    /**
+     * Adds imported user to auth backend
+     *
+     * Required a check of canDo('addUser') before
+     *
+     * @param array  $user   data of user
+     * @param string &$error reference catched error message
+     * @return bool whether succesful
+     */
+    private function _addImportUser($user, & $error){
         if (!$this->_auth->triggerUserMod('create', $user)) {
             $error = $this->lang['import_error_create'];
             return false;
@@ -862,7 +953,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return true;
     }
 
-    function _downloadImportFailures(){
+    /**
+     * Downloads failures as csv file
+     */
+    private function _downloadImportFailures(){
 
         // ==============================================================================================
         // GENERATE OUTPUT
@@ -874,7 +968,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         // output the csv
         $fd = fopen('php://output','w');
-        foreach ($this->_import_failures as $line => $fail) {
+        foreach ($this->_import_failures as $fail) {
             fputs($fd, $fail['orig']);
         }
         fclose($fd);
-- 
cgit v1.2.3


From b59cff8b714aa11b5b1afd209e9d73f6803883cd Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Sat, 21 Sep 2013 02:15:39 +0200
Subject: Move strings to language files. Fix lang key

---
 lib/plugins/usermanager/admin.php        | 8 ++++----
 lib/plugins/usermanager/lang/en/lang.php | 5 ++++-
 lib/plugins/usermanager/lang/nl/lang.php | 3 +--
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index bea5de177..4abef37ff 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -143,7 +143,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $delete_disable = $this->_auth->canDo('delUser') ? '' : 'disabled="disabled"';
 
         $editable = $this->_auth->canDo('UserMod');
-        $export_label = empty($this->_filter) ? $this->lang['export_all'] : $this->lang[export_filtered];
+        $export_label = empty($this->_filter) ? $this->lang['export_all'] : $this->lang['export_filtered'];
 
         print $this->locale_xhtml('intro');
         print $this->locale_xhtml('list');
@@ -422,7 +422,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         print $this->locale_xhtml('import');
         ptln('  
',$indent);
         formSecurityToken();
-        ptln('    ',$indent);
+        ptln('    ',$indent);
         ptln('    ',$indent);
         ptln('    ',$indent);
         ptln('    ',$indent);
@@ -435,7 +435,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if ($this->_import_failures) {
             $digits = strlen(count($this->_import_failures));
             ptln('
',$indent);
-            ptln('  
Most Recent Import - Failures
');
+            ptln('  
'.$this->lang['import_header'].'
');
             ptln('  ',$indent);
             ptln('    ',$indent);
             ptln('      ',$indent);
@@ -460,7 +460,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             }
             ptln('    ',$indent);
             ptln('  
',$indent);
-            ptln('  
Download Failures as CSV for correction
');
+            ptln('  
'.$this->lang['import_downloadfailures'].'
');
             ptln('
');
         }
 
diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php
index 69119e196..f87c77afb 100644
--- a/lib/plugins/usermanager/lang/en/lang.php
+++ b/lib/plugins/usermanager/lang/en/lang.php
@@ -61,7 +61,9 @@ $lang['add_fail'] = 'User addition failed';
 $lang['notify_ok'] = 'Notification email sent';
 $lang['notify_fail'] = 'Notification email could not be sent';
 
-// import errors
+// import & errors
+$lang['import_userlistcsv'] = 'User list file (CSV):  ';
+$lang['import_header'] = 'Most Recent Import - Failures';
 $lang['import_success_count'] = 'User Import: %d users found, %d imported successfully.';
 $lang['import_failure_count'] = 'User Import: %d failed. Failures are listed below.';
 $lang['import_error_fields']  = "Insufficient fields, found %d, require 4.";
@@ -72,5 +74,6 @@ $lang['import_error_upload']  = 'Import Failed. The csv file could not be upload
 $lang['import_error_readfail'] = 'Import Failed. Unable to read uploaded file.';
 $lang['import_error_create']  = 'Unable to create the user';
 $lang['import_notify_fail']   = 'Notification message could not be sent for imported user, %s with email %s.';
+$lang['import_downloadfailures'] = 'Download Failures as CSV for correction';
 
 
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index 7be10c16a..da628903d 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -14,7 +14,6 @@
  * @author Timon Van Overveldt 
  * @author Jeroen
  * @author Ricardo Guijt 
- * @author Gerrit 
  * @author Gerrit Uitslag 
  */
 $lang['menu']                  = 'Gebruikersmanager';
@@ -39,7 +38,7 @@ $lang['search_prompt']         = 'Voer zoekopdracht uit';
 $lang['clear']                 = 'Verwijder zoekfilter';
 $lang['filter']                = 'Filter';
 $lang['export_all']            = 'Exporteer Alle Gebruikers (CSV)';
-$lang['export_filtered']       = 'Exporteer de lijst van Gefilterde Gebruikers (CSV)';
+$lang['export_filtered']       = 'Exporteer Gefilterde Gebruikers (CSV)';
 $lang['import']                = 'Importeer Nieuwe Gebruikers';
 $lang['line']                  = 'Regelnummer';
 $lang['error']                 = 'Foutmelding';
-- 
cgit v1.2.3


From 786dfb0e75bc29b381ce487ba9564fcc0f0fbed0 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Sat, 21 Sep 2013 16:05:16 +0200
Subject: Use ->cleanUser everywhere in usermanager. Fixes FS#2849 Some auth
 backend have bad cleaning, but that is responsibility of these.

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 4abef37ff..74eaee721 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -576,8 +576,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     private function _editUser($param) {
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('UserMod')) return false;
-
-        $user = cleanID(preg_replace('/.*:/','',$param));
+        $user = $this->_auth->cleanUser(preg_replace('/.*[:\/]/','',$param));
         $userdata = $this->_auth->getUserData($user);
 
         // no user found?
@@ -604,7 +603,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if (!$this->_auth->canDo('UserMod')) return false;
 
         // get currently valid  user data
-        $olduser = cleanID(preg_replace('/.*:/','',$INPUT->str('userid_old')));
+        $olduser = $this->_auth->cleanUser(preg_replace('/.*[:\/]/','',$INPUT->str('userid_old')));
         $oldinfo = $this->_auth->getUserData($olduser);
 
         // get new user data subject to change
@@ -890,7 +889,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * Returns cleaned row data
+     * Returns cleaned user data
      *
      * @param array $candidate raw values of line from input file
      * @param $error
-- 
cgit v1.2.3


From 911d14c2d98b8c3c12425014a581e58d748cb214 Mon Sep 17 00:00:00 2001
From: Leone Lisboa Magevski 
Date: Sun, 22 Sep 2013 18:46:02 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/pt-br/lang.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php
index 8beae392f..dc53337ba 100644
--- a/lib/plugins/usermanager/lang/pt-br/lang.php
+++ b/lib/plugins/usermanager/lang/pt-br/lang.php
@@ -18,6 +18,7 @@
  * @author Isaias Masiero Filho 
  * @author Balaco Baco 
  * @author Victor Westmann 
+ * @author Leone Lisboa Magevski 
  */
 $lang['menu']                  = 'Gerenciamento de Usuários';
 $lang['noauth']                = '(o gerenciamento de usuários não está disponível)';
@@ -40,6 +41,8 @@ $lang['search']                = 'Pesquisar';
 $lang['search_prompt']         = 'Executar a pesquisa';
 $lang['clear']                 = 'Limpar o filtro de pesquisa';
 $lang['filter']                = 'Filtro';
+$lang['export_all']            = 'Exportar Todos Usuários (CSV)';
+$lang['import']                = 'Importar Novos Usuários';
 $lang['summary']               = 'Exibindo usuários %1$d-%2$d de %3$d encontrados. %4$d usuários no total.';
 $lang['nonefound']             = 'Nenhum usuário encontrado. %d usuários no total.';
 $lang['delete_ok']             = '%d usuários excluídos';
-- 
cgit v1.2.3


From 3712ca9a1625d41832dda690dcf98bd75f955502 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Sun, 22 Sep 2013 23:34:44 +0200
Subject: change visibility of private to protected

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 74eaee721..0e677e394 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -21,16 +21,16 @@ if(!defined('DOKU_PLUGIN_IMAGES')) define('DOKU_PLUGIN_IMAGES',DOKU_BASE.'lib/pl
  */
 class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
-    private $_auth = null;        // auth object
-    private $_user_total = 0;     // number of registered users
-    private $_filter = array();   // user selection filter(s)
-    private $_start = 0;          // index of first user to be displayed
-    private $_last = 0;           // index of the last user to be displayed
-    private $_pagesize = 20;      // number of users to list on one page
-    private $_edit_user = '';     // set to user selected for editing
-    private $_edit_userdata = array();
-    private $_disabled = '';      // if disabled set to explanatory string
-    private $_import_failures = array();
+    protected $_auth = null;        // auth object
+    protected $_user_total = 0;     // number of registered users
+    protected $_filter = array();   // user selection filter(s)
+    protected $_start = 0;          // index of first user to be displayed
+    protected $_last = 0;           // index of the last user to be displayed
+    protected $_pagesize = 20;      // number of users to list on one page
+    protected $_edit_user = '';     // set to user selected for editing
+    protected $_edit_userdata = array();
+    protected $_disabled = '';      // if disabled set to explanatory string
+    protected $_import_failures = array();
 
     /**
      * Constructor
@@ -274,7 +274,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param array  $userdata array with name, mail, pass and grps
      * @param int    $indent
      */
-    private function _htmlUserForm($cmd,$user='',$userdata=array(),$indent=0) {
+    protected function _htmlUserForm($cmd,$user='',$userdata=array(),$indent=0) {
         global $conf;
         global $ID;
 
@@ -354,7 +354,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param bool   $cando whether auth backend is capable to do this action
      * @param int $indent
      */
-    private function _htmlInputField($id, $name, $label, $value, $cando, $indent=0) {
+    protected function _htmlInputField($id, $name, $label, $value, $cando, $indent=0) {
         $class = $cando ? '' : ' class="disabled"';
         echo str_pad('',$indent);
 
@@ -389,7 +389,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param string $key name of search field
      * @return string html escaped value
      */
-    private function _htmlFilter($key) {
+    protected function _htmlFilter($key) {
         if (empty($this->_filter)) return '';
         return (isset($this->_filter[$key]) ? hsc($this->_filter[$key]) : '');
     }
@@ -399,7 +399,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @param int $indent
      */
-    private function _htmlFilterSettings($indent=0) {
+    protected function _htmlFilterSettings($indent=0) {
 
         ptln("_start."\" />",$indent);
 
@@ -413,7 +413,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @param int $indent
      */
-    private function _htmlImportForm($indent=0) {
+    protected function _htmlImportForm($indent=0) {
         global $ID;
 
         $failure_download_link = wl($ID,array('do'=>'admin','page'=>'usermanager','fn[importfails]'=>1));
@@ -471,7 +471,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @return bool whether succesful
      */
-    private function _addUser(){
+    protected function _addUser(){
         global $INPUT;
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('addUser')) return false;
@@ -536,7 +536,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @return bool whether succesful
      */
-    private function _deleteUser(){
+    protected function _deleteUser(){
         global $conf, $INPUT;
 
         if (!checkSecurityToken()) return false;
@@ -573,7 +573,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param string $param id of the user
      * @return bool whether succesful
      */
-    private function _editUser($param) {
+    protected function _editUser($param) {
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('UserMod')) return false;
         $user = $this->_auth->cleanUser(preg_replace('/.*[:\/]/','',$param));
@@ -596,7 +596,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @return bool whether succesful
      */
-    private function _modifyUser(){
+    protected function _modifyUser(){
         global $conf, $INPUT;
 
         if (!checkSecurityToken()) return false;
@@ -671,7 +671,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param bool   $status_alert whether status alert should be shown
      * @return bool whether succesful
      */
-    private function _notifyUser($user, $password, $status_alert=true) {
+    protected function _notifyUser($user, $password, $status_alert=true) {
 
         if ($sent = auth_sendPassword($user,$password)) {
             if ($status_alert) {
@@ -692,7 +692,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param bool $clean whether the cleanUser method of the authentication backend is applied
      * @return array (user, password, full name, email, array(groups))
      */
-    private function _retrieveUser($clean=true) {
+    protected function _retrieveUser($clean=true) {
         /** @var DokuWiki_Auth_Plugin $auth */
         global $auth;
         global $INPUT;
@@ -717,7 +717,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @param string $op 'new' or 'clear'
      */
-    private function _setFilter($op) {
+    protected function _setFilter($op) {
 
         $this->_filter = array();
 
@@ -736,7 +736,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @return array
      */
-    private function _retrieveFilter() {
+    protected function _retrieveFilter() {
         global $INPUT;
 
         $t_filter = $INPUT->arr('filter');
@@ -755,7 +755,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     /**
      * Validate and improve the pagination values
      */
-    private function _validatePagination() {
+    protected function _validatePagination() {
 
         if ($this->_start >= $this->_user_total) {
             $this->_start = $this->_user_total - $this->_pagesize;
@@ -770,7 +770,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @return array with enable/disable attributes
      */
-    private function _pagination() {
+    protected function _pagination() {
 
         $disabled = 'disabled="disabled"';
 
@@ -789,7 +789,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     /**
      * Export a list of users in csv format using the current filter criteria
      */
-    private function _export() {
+    protected function _export() {
         // list of users for export - based on current filter criteria
         $user_list = $this->_auth->retrieveUsers(0, 0, $this->_filter);
         $column_headings = array(
@@ -825,7 +825,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @return bool whether succesful
      */
-    private function _import() {
+    protected function _import() {
         // check we are allowed to add users
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('addUser')) return false;
@@ -895,7 +895,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param $error
      * @return array|bool cleaned data or false
      */
-    private function _cleanImportUser($candidate, & $error){
+    protected function _cleanImportUser($candidate, & $error){
         global $INPUT;
 
         // kludgy ....
@@ -943,7 +943,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * @param string &$error reference catched error message
      * @return bool whether succesful
      */
-    private function _addImportUser($user, & $error){
+    protected function _addImportUser($user, & $error){
         if (!$this->_auth->triggerUserMod('create', $user)) {
             $error = $this->lang['import_error_create'];
             return false;
@@ -955,7 +955,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     /**
      * Downloads failures as csv file
      */
-    private function _downloadImportFailures(){
+    protected function _downloadImportFailures(){
 
         // ==============================================================================================
         // GENERATE OUTPUT
-- 
cgit v1.2.3


From 61ccb1b0fb80338913b12ed9336ca5142456fb6b Mon Sep 17 00:00:00 2001
From: monica 
Date: Tue, 24 Sep 2013 21:15:54 +0200
Subject: translation update

---
 lib/plugins/authad/lang/es/settings.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 lib/plugins/authad/lang/es/settings.php

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php
new file mode 100644
index 000000000..9d0aa80ac
--- /dev/null
+++ b/lib/plugins/authad/lang/es/settings.php
@@ -0,0 +1,13 @@
+
+ */
+$lang['account_suffix']        = 'Su cuenta, sufijo. Ejem.  @ my.domain.org ';
+$lang['base_dn']               = 'Su base DN. Ejem. DC=my,DC=dominio,DC=org';
+$lang['domain_controllers']    = 'Una lista separada por coma de los controladores de dominios. Ejem. srv1.dominio.org,srv2.dominio.org';
+$lang['admin_username']        = 'Un usuario con privilegios de Active Directory con acceso a los datos de cualquier otro usuario. Opcional, pero es necesario para determinadas acciones como el envío de suscripciones de correos electrónicos.';
+$lang['admin_password']        = 'La contraseña del usuario anterior.';
+$lang['sso']                   = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?';
-- 
cgit v1.2.3


From 0da02e4da30749eeeec74b09658d8aac595a4fb7 Mon Sep 17 00:00:00 2001
From: Martin Michalek 
Date: Tue, 1 Oct 2013 23:45:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/sk/lang.php           |  4 ++--
 lib/plugins/authad/lang/sk/settings.php    | 11 +++++++++++
 lib/plugins/authldap/lang/sk/settings.php  | 10 ++++++++++
 lib/plugins/authmysql/lang/sk/settings.php |  9 +++++++++
 lib/plugins/authpgsql/lang/sk/settings.php |  9 +++++++++
 lib/plugins/plugin/lang/sk/lang.php        |  5 +++--
 lib/plugins/popularity/lang/sk/lang.php    |  5 +++--
 lib/plugins/revert/lang/sk/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/sk/lang.php   |  5 +++--
 9 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 lib/plugins/authad/lang/sk/settings.php
 create mode 100644 lib/plugins/authldap/lang/sk/settings.php
 create mode 100644 lib/plugins/authmysql/lang/sk/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/sk/settings.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/sk/lang.php b/lib/plugins/acl/lang/sk/lang.php
index 398f8c63d..51837d4b4 100644
--- a/lib/plugins/acl/lang/sk/lang.php
+++ b/lib/plugins/acl/lang/sk/lang.php
@@ -1,8 +1,8 @@
 
  * @author Michal Mesko 
  * @author exusik@gmail.com
diff --git a/lib/plugins/authad/lang/sk/settings.php b/lib/plugins/authad/lang/sk/settings.php
new file mode 100644
index 000000000..0cc9b9b10
--- /dev/null
+++ b/lib/plugins/authad/lang/sk/settings.php
@@ -0,0 +1,11 @@
+
+ */
+$lang['admin_password']        = 'Heslo vyššie uvedeného používateľa.';
+$lang['use_ssl']               = 'Použiť SSL pripojenie? Ak áno, nepovoľte TLS nižšie.';
+$lang['use_tls']               = 'Použiť TLS pripojenie? Ak áno, nepovoľte SSL vyššie.';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe?';
diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
new file mode 100644
index 000000000..759c92304
--- /dev/null
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -0,0 +1,10 @@
+
+ */
+$lang['starttls']              = 'Použiť TLS pripojenie?';
+$lang['bindpw']                = 'Heslo vyššie uvedeného používateľa';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe';
diff --git a/lib/plugins/authmysql/lang/sk/settings.php b/lib/plugins/authmysql/lang/sk/settings.php
new file mode 100644
index 000000000..4dfdfbf29
--- /dev/null
+++ b/lib/plugins/authmysql/lang/sk/settings.php
@@ -0,0 +1,9 @@
+
+ */
+$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
diff --git a/lib/plugins/authpgsql/lang/sk/settings.php b/lib/plugins/authpgsql/lang/sk/settings.php
new file mode 100644
index 000000000..4dfdfbf29
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/sk/settings.php
@@ -0,0 +1,9 @@
+
+ */
+$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php
index 5024872f1..35c07cf80 100644
--- a/lib/plugins/plugin/lang/sk/lang.php
+++ b/lib/plugins/plugin/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author Michal Mesko 
  * @author exusik@gmail.com
diff --git a/lib/plugins/popularity/lang/sk/lang.php b/lib/plugins/popularity/lang/sk/lang.php
index bc46b03c5..ab7accf0c 100644
--- a/lib/plugins/popularity/lang/sk/lang.php
+++ b/lib/plugins/popularity/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author exusik@gmail.com
  * @author Martin Michalek 
diff --git a/lib/plugins/revert/lang/sk/lang.php b/lib/plugins/revert/lang/sk/lang.php
index 368d2d929..6a2cb119d 100644
--- a/lib/plugins/revert/lang/sk/lang.php
+++ b/lib/plugins/revert/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author exusik@gmail.com
  * @author Martin Michalek 
diff --git a/lib/plugins/usermanager/lang/sk/lang.php b/lib/plugins/usermanager/lang/sk/lang.php
index 54ed374c6..aea2712ef 100644
--- a/lib/plugins/usermanager/lang/sk/lang.php
+++ b/lib/plugins/usermanager/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author Michal Mesko 
  * @author exusik@gmail.com
-- 
cgit v1.2.3


From c312f2806002b060e8bd2b6e69e3749020d56fb5 Mon Sep 17 00:00:00 2001
From: Martin Michalek 
Date: Wed, 2 Oct 2013 07:46:31 +0200
Subject: translation update

---
 lib/plugins/acl/lang/sk/lang.php           |  4 ++--
 lib/plugins/authmysql/lang/sk/settings.php | 11 +++++++++++
 lib/plugins/authpgsql/lang/sk/settings.php | 11 +++++++++++
 lib/plugins/plugin/lang/sk/lang.php        |  5 +++--
 lib/plugins/popularity/lang/sk/lang.php    |  5 +++--
 lib/plugins/revert/lang/sk/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/sk/lang.php   |  5 +++--
 7 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 lib/plugins/authmysql/lang/sk/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/sk/settings.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/sk/lang.php b/lib/plugins/acl/lang/sk/lang.php
index 398f8c63d..51837d4b4 100644
--- a/lib/plugins/acl/lang/sk/lang.php
+++ b/lib/plugins/acl/lang/sk/lang.php
@@ -1,8 +1,8 @@
 
  * @author Michal Mesko 
  * @author exusik@gmail.com
diff --git a/lib/plugins/authmysql/lang/sk/settings.php b/lib/plugins/authmysql/lang/sk/settings.php
new file mode 100644
index 000000000..1b7ef66a9
--- /dev/null
+++ b/lib/plugins/authmysql/lang/sk/settings.php
@@ -0,0 +1,11 @@
+
+ */
+$lang['server']                = 'MySQL server';
+$lang['user']                  = 'MySQL meno používateľa';
+$lang['database']              = 'Použiť databázu';
+$lang['charset']               = 'Znaková sada databázy';
diff --git a/lib/plugins/authpgsql/lang/sk/settings.php b/lib/plugins/authpgsql/lang/sk/settings.php
new file mode 100644
index 000000000..7a4756f71
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/sk/settings.php
@@ -0,0 +1,11 @@
+
+ */
+$lang['server']                = 'PostgreSQL server';
+$lang['port']                  = 'Port PostgreSQL servera';
+$lang['user']                  = 'Meno používateľa PostgreSQL';
+$lang['database']              = 'Použiť databázu';
diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php
index 5024872f1..35c07cf80 100644
--- a/lib/plugins/plugin/lang/sk/lang.php
+++ b/lib/plugins/plugin/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author Michal Mesko 
  * @author exusik@gmail.com
diff --git a/lib/plugins/popularity/lang/sk/lang.php b/lib/plugins/popularity/lang/sk/lang.php
index bc46b03c5..ab7accf0c 100644
--- a/lib/plugins/popularity/lang/sk/lang.php
+++ b/lib/plugins/popularity/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author exusik@gmail.com
  * @author Martin Michalek 
diff --git a/lib/plugins/revert/lang/sk/lang.php b/lib/plugins/revert/lang/sk/lang.php
index 368d2d929..6a2cb119d 100644
--- a/lib/plugins/revert/lang/sk/lang.php
+++ b/lib/plugins/revert/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author exusik@gmail.com
  * @author Martin Michalek 
diff --git a/lib/plugins/usermanager/lang/sk/lang.php b/lib/plugins/usermanager/lang/sk/lang.php
index 54ed374c6..aea2712ef 100644
--- a/lib/plugins/usermanager/lang/sk/lang.php
+++ b/lib/plugins/usermanager/lang/sk/lang.php
@@ -1,7 +1,8 @@
 
  * @author Michal Mesko 
  * @author exusik@gmail.com
-- 
cgit v1.2.3


From c1862b04665a6741f91092145066e46f5152804d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1rio=20Estev=C3=A3o?= 
Date: Thu, 3 Oct 2013 18:15:58 +0200
Subject: translation update

---
 lib/plugins/usermanager/lang/pt-br/lang.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php
index dc53337ba..9bb37742a 100644
--- a/lib/plugins/usermanager/lang/pt-br/lang.php
+++ b/lib/plugins/usermanager/lang/pt-br/lang.php
@@ -19,6 +19,7 @@
  * @author Balaco Baco 
  * @author Victor Westmann 
  * @author Leone Lisboa Magevski 
+ * @author Dário Estevão 
  */
 $lang['menu']                  = 'Gerenciamento de Usuários';
 $lang['noauth']                = '(o gerenciamento de usuários não está disponível)';
@@ -43,6 +44,8 @@ $lang['clear']                 = 'Limpar o filtro de pesquisa';
 $lang['filter']                = 'Filtro';
 $lang['export_all']            = 'Exportar Todos Usuários (CSV)';
 $lang['import']                = 'Importar Novos Usuários';
+$lang['line']                  = 'Linha Nº.';
+$lang['error']                 = 'Mensagem de Erro';
 $lang['summary']               = 'Exibindo usuários %1$d-%2$d de %3$d encontrados. %4$d usuários no total.';
 $lang['nonefound']             = 'Nenhum usuário encontrado. %d usuários no total.';
 $lang['delete_ok']             = '%d usuários excluídos';
@@ -63,3 +66,12 @@ $lang['add_ok']                = 'O usuário foi adicionado com sucesso';
 $lang['add_fail']              = 'O usuário não foi adicionado';
 $lang['notify_ok']             = 'O e-mail de notificação foi enviado';
 $lang['notify_fail']           = 'Não foi possível enviar o e-mail de notificação';
+$lang['import_success_count']  = 'Importação de Usuário: %d usuário (s) encontrado (s), %d importado (s) com sucesso.';
+$lang['import_failure_count']  = 'Importação de Usuário: %d falhou. As falhas estão listadas abaixo.';
+$lang['import_error_fields']   = 'Campos insuficientes, encontrado (s) %d, necessário 4.';
+$lang['import_error_baduserid'] = 'Id do usuário não encontrado.';
+$lang['import_error_badname']  = 'Nome errado';
+$lang['import_error_badmail']  = 'Endereço de email errado';
+$lang['import_error_upload']   = 'Falha na Importação: O arquivo csv não pode ser carregado ou está vazio.';
+$lang['import_error_readfail'] = 'Falha na Importação: Habilitar para ler o arquivo a ser carregado.';
+$lang['import_error_create']   = 'Habilitar para criar o usuário.';
-- 
cgit v1.2.3


From 844d8067502e44b64cfc7120b159fbb5f5f9b3e2 Mon Sep 17 00:00:00 2001
From: mehrdad 
Date: Fri, 4 Oct 2013 09:55:56 +0200
Subject: translation update

---
 lib/plugins/acl/lang/fa/lang.php         | 5 +++--
 lib/plugins/plugin/lang/fa/lang.php      | 5 +++--
 lib/plugins/popularity/lang/fa/lang.php  | 5 +++--
 lib/plugins/revert/lang/fa/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/fa/lang.php | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/fa/lang.php b/lib/plugins/acl/lang/fa/lang.php
index 7fe0f2c43..24bebaeaf 100644
--- a/lib/plugins/acl/lang/fa/lang.php
+++ b/lib/plugins/acl/lang/fa/lang.php
@@ -1,7 +1,8 @@
 
  * @author omidmr@gmail.com
diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php
index bc43ee3ef..0a8fadb3c 100644
--- a/lib/plugins/plugin/lang/fa/lang.php
+++ b/lib/plugins/plugin/lang/fa/lang.php
@@ -1,7 +1,8 @@
 
  * @author omidmr@gmail.com
diff --git a/lib/plugins/popularity/lang/fa/lang.php b/lib/plugins/popularity/lang/fa/lang.php
index 6a0529891..d2f071b07 100644
--- a/lib/plugins/popularity/lang/fa/lang.php
+++ b/lib/plugins/popularity/lang/fa/lang.php
@@ -1,7 +1,8 @@
 
  * @author omidmr@gmail.com
diff --git a/lib/plugins/revert/lang/fa/lang.php b/lib/plugins/revert/lang/fa/lang.php
index ba20313a3..c6ce6176f 100644
--- a/lib/plugins/revert/lang/fa/lang.php
+++ b/lib/plugins/revert/lang/fa/lang.php
@@ -1,7 +1,8 @@
 
  * @author omidmr@gmail.com
diff --git a/lib/plugins/usermanager/lang/fa/lang.php b/lib/plugins/usermanager/lang/fa/lang.php
index 8176b776b..a6a484411 100644
--- a/lib/plugins/usermanager/lang/fa/lang.php
+++ b/lib/plugins/usermanager/lang/fa/lang.php
@@ -1,7 +1,8 @@
 
  * @author omidmr@gmail.com
-- 
cgit v1.2.3


From b0a59c40fabfe5c49e2bf40c1f9456ae31873b78 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Fri, 4 Oct 2013 16:45:59 +0200
Subject: translation update

---
 lib/plugins/plugin/lang/cs/lang.php | 1 +
 lib/plugins/revert/lang/cs/lang.php | 1 +
 2 files changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php
index a92f8b1c2..fb8b6cc4e 100644
--- a/lib/plugins/plugin/lang/cs/lang.php
+++ b/lib/plugins/plugin/lang/cs/lang.php
@@ -15,6 +15,7 @@
  * @author Jakub A. Těšínský (j@kub.cz)
  * @author mkucera66@seznam.cz
  * @author Zbyněk Křivka 
+ * @author Gerrit Uitslag 
  */
 $lang['menu']                  = 'Správa pluginů';
 $lang['download']              = 'Stáhnout a instalovat plugin';
diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php
index d918e2e69..b9e7284d4 100644
--- a/lib/plugins/revert/lang/cs/lang.php
+++ b/lib/plugins/revert/lang/cs/lang.php
@@ -14,6 +14,7 @@
  * @author Jakub A. Těšínský (j@kub.cz)
  * @author mkucera66@seznam.cz
  * @author Zbyněk Křivka 
+ * @author Gerrit Uitslag 
  */
 $lang['menu']                  = 'Obnova zaspamovaných stránek';
 $lang['filter']                = 'Hledat zaspamované stránky';
-- 
cgit v1.2.3


From 4432749ab2140ede94ac1c724ab39b7219fdb406 Mon Sep 17 00:00:00 2001
From: Christopher Smith 
Date: Fri, 4 Oct 2013 17:59:13 +0100
Subject: RS#2860 fix configuration option key to 'template'

---
 lib/tpl/dokuwiki/detail.php | 6 +++---
 lib/tpl/dokuwiki/main.php   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 9c04ba8e7..c602830f7 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -122,11 +122,11 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                                 // Back to [ID]; @todo: transfer logic to backend
                                 $data['img_backto'] = '
  • '.$lang['img_backto'].' '.$ID.'
    • ';
 
-                                // the page tools can be ammended through a custom plugin hook
+                                // the page tools can be amended through a custom plugin hook
                                 // if you're deriving from this template and your design is close enough to
                                 // the dokuwiki template you might want to trigger a DOKUWIKI event instead
-                                // of using $conf['tpl'] here
-                                $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+                                // of using $conf['template'] here
+                                $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
                                 $evt = new Doku_Event($hook, $data);
                                 if($evt->advise_before()){
                                     foreach($evt->data as $k => $html) echo $html;
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 9e507d86d..f6ca4ed86 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -83,11 +83,11 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                                 'top'       => tpl_action('top',       1, 'li', 1, '', '')
                             );
 
-                            // the page tools can be ammended through a custom plugin hook
+                            // the page tools can be amended through a custom plugin hook
                             // if you're deriving from this template and your design is close enough to
                             // the dokuwiki template you might want to trigger a DOKUWIKI event instead
-                            // of using $conf['tpl'] here
-                            $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+                            // of using $conf['template'] here
+                            $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
                             $evt = new Doku_Event($hook, $data);
                             if($evt->advise_before()){
                                 foreach($evt->data as $k => $html) echo $html;
-- 
cgit v1.2.3


From 8d761d98c3f60eea7b8a37355e516bced5a27a25 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA 
Date: Fri, 4 Oct 2013 19:00:59 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ja/settings.php  | 16 ++++++++++++++--
 lib/plugins/usermanager/lang/ja/import.txt | 10 ++++++++++
 lib/plugins/usermanager/lang/ja/lang.php   |  6 ++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 lib/plugins/usermanager/lang/ja/import.txt

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php
index fdc6fc434..cee7b059c 100644
--- a/lib/plugins/authldap/lang/ja/settings.php
+++ b/lib/plugins/authldap/lang/ja/settings.php
@@ -1,6 +1,18 @@
 
+ * @author Hideaki SAWADA 
  */
+$lang['server']                = 'LDAPサーバー。ホスト名（localhostldap://server.tld:389）';
+$lang['port']                  = '上記が完全修飾URLでない場合、LDAPサーバーポート';
+$lang['usertree']              = 'ユーザーアカウントを探す場所。例：ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'ユーザーグループを探す場所。例：ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = 'ユーザーアカウントを探すためのLDAP抽出条件。例：(&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'グループを探すLDAP抽出条件。例：(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = '使用するプロトコルのバージョン。3を設定する必要がある場合があります。';
+$lang['binddn']                = '匿名バインドでは不十分な場合、オプションバインドユーザーのDN。例：cn=admin, dc=my, dc=home';
+$lang['bindpw']                = '上記ユーザーのパスワード';
+$lang['debug']                 = 'エラーに関して追加のデバッグ情報を表示する。';
diff --git a/lib/plugins/usermanager/lang/ja/import.txt b/lib/plugins/usermanager/lang/ja/import.txt
new file mode 100644
index 000000000..d4f7d08bf
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ja/import.txt
@@ -0,0 +1,10 @@
+===== 一括ユーザーインポート =====
+
+少なくとも４列のユーザーCSVファイルが必要です。
+列の順序：ユーザーID、氏名、電子メールアドレス、グループ。
+CSVフィールドはカンマ（,）区切り、文字列は引用符（""）区切りです。
+エスケープにバックスラッシュ（\）を使用できます。
+適切なファイル例は、上記の"エクスポートユーザー"機能で試して下さい。
+重複するユーザーIDは無視されます。
+
+正常にインポートされたユーザー毎に、パスワードを作成し、電子メールで送付します。
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ja/lang.php b/lib/plugins/usermanager/lang/ja/lang.php
index 8b85ee9fd..75c2f13ed 100644
--- a/lib/plugins/usermanager/lang/ja/lang.php
+++ b/lib/plugins/usermanager/lang/ja/lang.php
@@ -10,6 +10,7 @@
  * @author Kazutaka Miyasaka 
  * @author Taisuke Shimamoto 
  * @author Satoshi Sahara 
+ * @author Hideaki SAWADA 
  */
 $lang['menu']                  = 'ユーザー管理';
 $lang['noauth']                = '（ユーザー認証が無効です）';
@@ -32,6 +33,11 @@ $lang['search']                = '検索';
 $lang['search_prompt']         = '検索を実行';
 $lang['clear']                 = '検索フィルターをリセット';
 $lang['filter']                = 'フィルター';
+$lang['export_all']            = '全ユーザーのエクスポート（CSV）';
+$lang['export_filtered']       = '抽出したユーザー一覧のエクスポート（CSV）';
+$lang['import']                = '新規ユーザーのインポート';
+$lang['line']                  = '行番号';
+$lang['error']                 = 'エラーメッセージ';
 $lang['summary']               = 'ユーザー %1$d-%2$d / %3$d, 総ユーザー数 %4$d';
 $lang['nonefound']             = 'ユーザーが見つかりません, 総ユーザー数 %d';
 $lang['delete_ok']             = '%d ユーザーが削除されました';
-- 
cgit v1.2.3


From e12412a22fc56a88b5c40cfc0d15a718dbba425e Mon Sep 17 00:00:00 2001
From: Santosh Joshi 
Date: Sun, 6 Oct 2013 19:05:08 +0200
Subject: translation update

---
 lib/plugins/plugin/lang/hi/lang.php     | 5 +++--
 lib/plugins/popularity/lang/hi/lang.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/hi/lang.php b/lib/plugins/plugin/lang/hi/lang.php
index 67b177256..89d27cee1 100644
--- a/lib/plugins/plugin/lang/hi/lang.php
+++ b/lib/plugins/plugin/lang/hi/lang.php
@@ -1,7 +1,8 @@
 
  * @author yndesai@gmail.com
  */
diff --git a/lib/plugins/popularity/lang/hi/lang.php b/lib/plugins/popularity/lang/hi/lang.php
index c0085d72a..c818c7a1e 100644
--- a/lib/plugins/popularity/lang/hi/lang.php
+++ b/lib/plugins/popularity/lang/hi/lang.php
@@ -1,7 +1,8 @@
 
  * @author yndesai@gmail.com
  */
-- 
cgit v1.2.3


From 8b04378a95bd7af3561056ed65b5f460b2ce4da9 Mon Sep 17 00:00:00 2001
From: Myeongjin 
Date: Mon, 7 Oct 2013 07:15:59 +0200
Subject: translation update

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index c9e54741f..1905fadc2 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -57,6 +57,8 @@ $lang['add_ok']                = '사용자를 성공적으로 추가했습니
 $lang['add_fail']              = '사용자 추가를 실패했습니다';
 $lang['notify_ok']             = '알림 이메일을 성공적으로 보냈습니다';
 $lang['notify_fail']           = '알림 이메일을 보낼 수 없습니다';
+$lang['import_userlistcsv']    = '사용자 목록 파일 (CSV):';
+$lang['import_header']         = '가장 최근 가져오기 - 실패';
 $lang['import_success_count']  = '사용자 가져오기: 사용자 %d명을 찾았고, %d명을 성공적으로 가져왔습니다.';
 $lang['import_failure_count']  = '사용자 가져오기: %d명을 가져오지 못했습니다. 실패는 아래에 나타나 있습니다.';
 $lang['import_error_fields']   = '충분하지 않은 필드로, %d개를 찾았고, 4개가 필요합니다.';
@@ -67,3 +69,4 @@ $lang['import_error_upload']   = '가져오기를 실패했습니다. csv 파일
 $lang['import_error_readfail'] = '가져오기를 실패했습니다. 올린 파일을 읽을 수 없습니다.';
 $lang['import_error_create']   = '사용자를 만들 수 없습니다.';
 $lang['import_notify_fail']    = '알림 메시지를 가져온 %2$s (이메일: %1$s ) 사용자에게 보낼 수 없습니다.';
+$lang['import_downloadfailures'] = '교정을 위한 CSV로 다운로드 실패';
-- 
cgit v1.2.3


From 076f6bc9dcc5655fc64d3629879b1095407caae2 Mon Sep 17 00:00:00 2001
From: Martin Michalek 
Date: Mon, 7 Oct 2013 09:25:57 +0200
Subject: translation update

---
 lib/plugins/authmysql/lang/sk/settings.php | 29 ++++++++++++++++++++++++++---
 lib/plugins/authpgsql/lang/sk/settings.php | 29 ++++++++++++++++++++++++++---
 2 files changed, 52 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authmysql/lang/sk/settings.php b/lib/plugins/authmysql/lang/sk/settings.php
index d0df4aeef..17fc7977c 100644
--- a/lib/plugins/authmysql/lang/sk/settings.php
+++ b/lib/plugins/authmysql/lang/sk/settings.php
@@ -5,9 +5,32 @@
  * 
  * @author Martin Michalek 
  */
-$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
-$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
 $lang['server']                = 'MySQL server';
 $lang['user']                  = 'MySQL meno používateľa';
+$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
 $lang['database']              = 'Použiť databázu';
-$lang['charset']               = 'Znaková sada databázy';
\ No newline at end of file
+$lang['charset']               = 'Znaková sada databázy';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
+$lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
+$lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
+$lang['getGroups']             = 'SQL príkaz pre získanie informácií o skupinách používateľa';
+$lang['getUsers']              = 'SQL príkaz pre získanie zoznamu používateľov';
+$lang['FilterLogin']           = 'SQL podmienka pre filtrovanie používateľov podľa prihlasovacieho mena';
+$lang['FilterName']            = 'SQL podmienka pre filtrovanie používateľov podľa mena a priezviska';
+$lang['FilterEmail']           = 'SQL podmienka pre filtrovanie používateľov podľa emailovej adresy';
+$lang['FilterGroup']           = 'SQL podmienka pre filtrovanie používateľov podľa skupiny';
+$lang['SortOrder']             = 'SQL podmienka pre usporiadenia používateľov';
+$lang['addUser']               = 'SQL príkaz pre pridanie nového používateľa';
+$lang['addGroup']              = 'SQL príkaz pre pridanie novej skupiny';
+$lang['addUserGroup']          = 'SQL príkaz pre pridanie používateľa do existujúcej skupiny';
+$lang['delGroup']              = 'SQL príkaz pre zrušenie skupiny';
+$lang['getUserID']             = 'SQL príkaz pre získanie primárneho klúča používateľa';
+$lang['delUser']               = 'SQL príkaz pre zrušenie používateľa';
+$lang['delUserRefs']           = 'SQL príkaz pre vyradenie používateľa zo všetkých skupín';
+$lang['updateUser']            = 'SQL príkaz pre aktualizáciu informácií o používateľovi';
+$lang['UpdateLogin']           = 'SQL podmienka pre aktualizáciu prihlasovacieho mena používateľa';
+$lang['UpdatePass']            = 'SQL podmienka pre aktualizáciu hesla používateľa';
+$lang['UpdateEmail']           = 'SQL podmienka pre aktualizáciu emailovej adresy používateľa';
+$lang['UpdateName']            = 'SQL podmienka pre aktualizáciu mena a priezviska používateľa';
+$lang['delUserGroup']          = 'SQL príkaz pre vyradenie používateľa z danej skupiny';
+$lang['getGroupID']            = 'SQL príkaz pre získanie primárneho kľúča skupiny';
diff --git a/lib/plugins/authpgsql/lang/sk/settings.php b/lib/plugins/authpgsql/lang/sk/settings.php
index 1a80c7409..dafe5e83d 100644
--- a/lib/plugins/authpgsql/lang/sk/settings.php
+++ b/lib/plugins/authpgsql/lang/sk/settings.php
@@ -5,9 +5,32 @@
  * 
  * @author Martin Michalek 
  */
-$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
-$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
 $lang['server']                = 'PostgreSQL server';
 $lang['port']                  = 'Port PostgreSQL servera';
 $lang['user']                  = 'Meno používateľa PostgreSQL';
-$lang['database']              = 'Použiť databázu';
\ No newline at end of file
+$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
+$lang['database']              = 'Použiť databázu';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
+$lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
+$lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
+$lang['getGroups']             = 'SQL príkaz pre získanie informácií o skupinách používateľa';
+$lang['getUsers']              = 'SQL príkaz pre získanie zoznamu používateľov';
+$lang['FilterLogin']           = 'SQL podmienka pre filtrovanie používateľov podľa prihlasovacieho mena';
+$lang['FilterName']            = 'SQL podmienka pre filtrovanie používateľov podľa mena a priezviska';
+$lang['FilterEmail']           = 'SQL podmienka pre filtrovanie používateľov podľa emailovej adresy';
+$lang['FilterGroup']           = 'SQL podmienka pre filtrovanie používateľov podľa skupiny';
+$lang['SortOrder']             = 'SQL podmienka pre usporiadenia používateľov';
+$lang['addUser']               = 'SQL príkaz pre pridanie nového používateľa';
+$lang['addGroup']              = 'SQL príkaz pre pridanie novej skupiny';
+$lang['addUserGroup']          = 'SQL príkaz pre pridanie používateľa do existujúcej skupiny';
+$lang['delGroup']              = 'SQL príkaz pre zrušenie skupiny';
+$lang['getUserID']             = 'SQL príkaz pre získanie primárneho klúča používateľa';
+$lang['delUser']               = 'SQL príkaz pre zrušenie používateľa';
+$lang['delUserRefs']           = 'SQL príkaz pre vyradenie používateľa zo všetkých skupín';
+$lang['updateUser']            = 'SQL príkaz pre aktualizáciu informácií o používateľovi';
+$lang['UpdateLogin']           = 'SQL podmienka pre aktualizáciu prihlasovacieho mena používateľa';
+$lang['UpdatePass']            = 'SQL podmienka pre aktualizáciu hesla používateľa';
+$lang['UpdateEmail']           = 'SQL podmienka pre aktualizáciu emailovej adresy používateľa';
+$lang['UpdateName']            = 'SQL podmienka pre aktualizáciu mena a priezviska používateľa';
+$lang['delUserGroup']          = 'SQL príkaz pre vyradenie používateľa z danej skupiny';
+$lang['getGroupID']            = 'SQL príkaz pre získanie primárneho kľúča skupiny';
-- 
cgit v1.2.3


From c37f0c23e2e6de68df1185a401beca8d73627d8f Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 7 Oct 2013 14:46:14 +0200
Subject: translation update

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index da628903d..5cebede89 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -62,6 +62,8 @@ $lang['add_ok']                = 'Gebruiker succesvol toegevoegd';
 $lang['add_fail']              = 'Gebruiker kon niet worden toegevoegd';
 $lang['notify_ok']             = 'Notificatie-e-mail verzonden';
 $lang['notify_fail']           = 'Notificatie-e-mail kon niet worden verzonden';
+$lang['import_userlistcsv']    = 'Gebruikerslijst (CSV-bestand):';
+$lang['import_header']         = 'Meest recente import - Gevonden fouten';
 $lang['import_success_count']  = 'Gebruikers importeren: %d gebruikers gevonden, %d geïmporteerd';
 $lang['import_failure_count']  = 'Gebruikers importeren: %d mislukt. Fouten zijn hieronder weergegeven.';
 $lang['import_error_fields']   = 'Onvoldoende velden, gevonden %d, nodig 4.';
@@ -72,3 +74,4 @@ $lang['import_error_upload']   = 'Importeren mislukt. Het CSV bestand kon niet w
 $lang['import_error_readfail'] = 'Importeren mislukt. Lezen van het geüploade bestand is mislukt.';
 $lang['import_error_create']   = 'Aanmaken van de gebruiker was niet mogelijk.';
 $lang['import_notify_fail']    = 'Notificatiebericht kon niet naar de geïmporteerde gebruiker worden verstuurd, %s met e-mail %s.';
+$lang['import_downloadfailures'] = 'Download de gevonden fouten als CSV voor correctie';
-- 
cgit v1.2.3


From 30d21b979563135c12048a582ef5877368ef3d95 Mon Sep 17 00:00:00 2001
From: Serenity87HUN 
Date: Mon, 7 Oct 2013 15:16:34 +0200
Subject: translation update

---
 lib/plugins/acl/lang/hu/lang.php           |  5 +++--
 lib/plugins/authad/lang/hu/settings.php    |  5 +++--
 lib/plugins/authldap/lang/hu/settings.php  |  5 +++--
 lib/plugins/authmysql/lang/hu/settings.php |  5 +++--
 lib/plugins/authpgsql/lang/hu/settings.php |  5 +++--
 lib/plugins/plugin/lang/hu/lang.php        |  5 +++--
 lib/plugins/popularity/lang/hu/lang.php    |  5 +++--
 lib/plugins/revert/lang/hu/lang.php        |  5 +++--
 lib/plugins/usermanager/lang/hu/import.txt |  9 +++++++++
 lib/plugins/usermanager/lang/hu/lang.php   | 24 ++++++++++++++++++++++--
 10 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 lib/plugins/usermanager/lang/hu/import.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php
index 9565eddc3..cc35243e1 100644
--- a/lib/plugins/acl/lang/hu/lang.php
+++ b/lib/plugins/acl/lang/hu/lang.php
@@ -1,7 +1,8 @@
 
  * @author Siaynoq Mage 
  * @author schilling.janos@gmail.com
diff --git a/lib/plugins/authad/lang/hu/settings.php b/lib/plugins/authad/lang/hu/settings.php
index c2cab410f..1510e1756 100644
--- a/lib/plugins/authad/lang/hu/settings.php
+++ b/lib/plugins/authad/lang/hu/settings.php
@@ -1,7 +1,8 @@
 
  */
 $lang['account_suffix']        = 'Felhasználói azonosító végződése, pl. @my.domain.org.';
diff --git a/lib/plugins/authldap/lang/hu/settings.php b/lib/plugins/authldap/lang/hu/settings.php
index b4b28d0a0..041f82755 100644
--- a/lib/plugins/authldap/lang/hu/settings.php
+++ b/lib/plugins/authldap/lang/hu/settings.php
@@ -1,7 +1,8 @@
 
  */
 $lang['server']                = 'LDAP-szerver. Hosztnév (localhost) vagy abszolút URL portszámmal (ldap://server.tld:389)';
diff --git a/lib/plugins/authmysql/lang/hu/settings.php b/lib/plugins/authmysql/lang/hu/settings.php
index 9489c73f9..4edceae1e 100644
--- a/lib/plugins/authmysql/lang/hu/settings.php
+++ b/lib/plugins/authmysql/lang/hu/settings.php
@@ -1,7 +1,8 @@
 
  */
 $lang['server']                = 'MySQL-szerver';
diff --git a/lib/plugins/authpgsql/lang/hu/settings.php b/lib/plugins/authpgsql/lang/hu/settings.php
index 7b9393256..ff62a7016 100644
--- a/lib/plugins/authpgsql/lang/hu/settings.php
+++ b/lib/plugins/authpgsql/lang/hu/settings.php
@@ -1,7 +1,8 @@
 
  */
 $lang['server']                = 'PostgreSQL-szerver';
diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php
index 235d33a0e..b8fa2cdbe 100644
--- a/lib/plugins/plugin/lang/hu/lang.php
+++ b/lib/plugins/plugin/lang/hu/lang.php
@@ -1,7 +1,8 @@
 
  * @author Siaynoq Mage 
  * @author schilling.janos@gmail.com
diff --git a/lib/plugins/popularity/lang/hu/lang.php b/lib/plugins/popularity/lang/hu/lang.php
index 5ee40eacc..213d22655 100644
--- a/lib/plugins/popularity/lang/hu/lang.php
+++ b/lib/plugins/popularity/lang/hu/lang.php
@@ -1,7 +1,8 @@
 
  * @author Siaynoq Mage 
  * @author schilling.janos@gmail.com
diff --git a/lib/plugins/revert/lang/hu/lang.php b/lib/plugins/revert/lang/hu/lang.php
index 051e7b7d7..d16764a35 100644
--- a/lib/plugins/revert/lang/hu/lang.php
+++ b/lib/plugins/revert/lang/hu/lang.php
@@ -1,7 +1,8 @@
 
  * @author Siaynoq Mage 
  * @author schilling.janos@gmail.com
diff --git a/lib/plugins/usermanager/lang/hu/import.txt b/lib/plugins/usermanager/lang/hu/import.txt
new file mode 100644
index 000000000..5a4bc8b1c
--- /dev/null
+++ b/lib/plugins/usermanager/lang/hu/import.txt
@@ -0,0 +1,9 @@
+==== Felhasználók tömeges importálása ====
+
+Egy, legalább 4 oszlopot tartalmazó, felhasználóikat tartalmazó fájl szükséges hozzá.
+Az oszlopok kötelező tartalma, megfelelő sorrendben: felhasználói azonosító, teljes név, e-mailcím és csoportjai.
+A CSV mezőit vesszővel (,) kell elválasztani, a szövegeket idézőjelek ("") közé kell foglalni. 
+Mintafájl megtekintéséhez próbáld ki a fenti, "Felhasználók exportálása" funkciót. A fordított törtvonallal (\) lehet kilépni.
+Megegyező felhasználói azonosítók esetén, nem kerülnek feldolgozásra.
+
+Minden sikeresen importált felhasználó kap egy e-mailt, amiben megtalálja a generált jelszavát.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/hu/lang.php b/lib/plugins/usermanager/lang/hu/lang.php
index 71a5b4bc9..dd76bfd50 100644
--- a/lib/plugins/usermanager/lang/hu/lang.php
+++ b/lib/plugins/usermanager/lang/hu/lang.php
@@ -1,7 +1,8 @@
 
  * @author Siaynoq Mage 
  * @author schilling.janos@gmail.com
@@ -9,6 +10,7 @@
  * @author Sándor TIHANYI 
  * @author David Szabo 
  * @author Marton Sebok 
+ * @author Serenity87HUN 
  */
 $lang['menu']                  = 'Felhasználók kezelése';
 $lang['noauth']                = '(A felhasználói azonosítás nem működik.)';
@@ -31,6 +33,11 @@ $lang['search']                = 'Keresés';
 $lang['search_prompt']         = 'Keresés';
 $lang['clear']                 = 'Keresési szűrés törlése';
 $lang['filter']                = 'Szűrés';
+$lang['export_all']            = 'Összes felhasználó exportálása (CSV)';
+$lang['export_filtered']       = 'Kiválasztott felhasználók exportálása (CSV)';
+$lang['import']                = 'Új felhasználók importálása';
+$lang['line']                  = 'Sor száma';
+$lang['error']                 = 'Hibaüzenet';
 $lang['summary']               = '%1$d-%2$d. felhasználók megjelenítése a(z) %3$d megtalált felhasználóból. %4$d felhasználó van összesen.';
 $lang['nonefound']             = 'Nincs ilyen felhasználó. %d felhasználó van összesen.';
 $lang['delete_ok']             = '%d felhasználó törölve.';
@@ -51,3 +58,16 @@ $lang['add_ok']                = 'A felhasználó sikeresen hozzáadva.';
 $lang['add_fail']              = 'A felhasználó hozzáadása nem sikerült.';
 $lang['notify_ok']             = 'Értesítő levél elküldve.';
 $lang['notify_fail']           = 'Nem sikerült az értesítő levelet elküldeni.';
+$lang['import_userlistcsv']    = 'Felhasználók listája fájl (CSV)';
+$lang['import_header']         = 'Legutóbbi importálás - Hibák';
+$lang['import_success_count']  = 'Felhasználók importálása: %d felhasználót találtunk, ebből %d sikeresen importálva.';
+$lang['import_failure_count']  = 'Felhasználók importálása: %d sikertelen. A sikertelenség okait lejjebb találod.';
+$lang['import_error_fields']   = 'Túl kevés mezőt adtál meg, %d darabot találtunk, legalább 4-re van szükség.';
+$lang['import_error_baduserid'] = 'Felhasználói azonosító hiányzik';
+$lang['import_error_badname']  = 'Nem megfelelő név';
+$lang['import_error_badmail']  = 'Nem megfelelő e-mailcím';
+$lang['import_error_upload']   = 'Sikertelen importálás. A csv fájl nem feltölthető vagy üres.';
+$lang['import_error_readfail'] = 'Sikertelen importálás. A feltöltött fájl nem olvasható.';
+$lang['import_error_create']   = 'Ez a felhasználó nem hozható létre';
+$lang['import_notify_fail']    = 'Az értesítő e-mail nem küldhető el az alábbi importált felhasználónak: %s e-mailcíme: %s.';
+$lang['import_downloadfailures'] = 'Töltsd le a hibákat tartalmazó fájlt CSV formátumban, hogy ki tudd javítani a hibákat';
-- 
cgit v1.2.3


From 75e4dd8a2ec6c181e99877919b5a2b529407752a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Tue, 8 Oct 2013 00:06:46 +0200
Subject: Use in cookie a correct path, added DOKU_COOKIEPATH to js constants
 Fixes FS#2837

---
 lib/exe/js.php        | 1 +
 lib/scripts/cookie.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 76238a81b..fc7a869c2 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -89,6 +89,7 @@ function js_out(){
     // add some global variables
     print "var DOKU_BASE   = '".DOKU_BASE."';";
     print "var DOKU_TPL    = '".tpl_basedir()."';";
+    print "var DOKU_COOKIEPATH = '" . (empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']) . "';";
     // FIXME: Move those to JSINFO
     print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
     print "var DOKU_UHC    = ".((int) useHeading('content')).";";
diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js
index 3ad67bfa4..4cb527f26 100644
--- a/lib/scripts/cookie.js
+++ b/lib/scripts/cookie.js
@@ -30,7 +30,7 @@ var DokuCookie = {
                 text.push(encodeURIComponent(key)+'#'+encodeURIComponent(val));
             }
         });
-        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_BASE});
+        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIEPATH});
     },
 
     /**
-- 
cgit v1.2.3


From d0cc235eb123037228447ba88c28d616a6b62169 Mon Sep 17 00:00:00 2001
From: Martin Michalek 
Date: Tue, 8 Oct 2013 12:20:56 +0200
Subject: translation update

---
 lib/plugins/authmysql/lang/sk/settings.php |  2 +-
 lib/plugins/usermanager/lang/sk/lang.php   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/authmysql/lang/sk/settings.php b/lib/plugins/authmysql/lang/sk/settings.php
index 17fc7977c..477f2f10b 100644
--- a/lib/plugins/authmysql/lang/sk/settings.php
+++ b/lib/plugins/authmysql/lang/sk/settings.php
@@ -6,7 +6,7 @@
  * @author Martin Michalek 
  */
 $lang['server']                = 'MySQL server';
-$lang['user']                  = 'MySQL meno používateľa';
+$lang['user']                  = 'Meno používateľa MySQL';
 $lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
 $lang['database']              = 'Použiť databázu';
 $lang['charset']               = 'Znaková sada databázy';
diff --git a/lib/plugins/usermanager/lang/sk/lang.php b/lib/plugins/usermanager/lang/sk/lang.php
index aea2712ef..9aadbb53a 100644
--- a/lib/plugins/usermanager/lang/sk/lang.php
+++ b/lib/plugins/usermanager/lang/sk/lang.php
@@ -29,6 +29,11 @@ $lang['search']                = 'Hľadať';
 $lang['search_prompt']         = 'Vykonať vyhľadávanie';
 $lang['clear']                 = 'Vynulovať vyhľadávací filter';
 $lang['filter']                = 'Filter';
+$lang['export_all']            = 'Export všetkých používateľov (CSV)';
+$lang['export_filtered']       = 'Export zoznamu používateľov na základe filtra (CSV)';
+$lang['import']                = 'Import nových používateľov';
+$lang['line']                  = 'Riadok č.';
+$lang['error']                 = 'Chybová správa';
 $lang['summary']               = 'Zobrazenie užívateľov %1$d-%2$d z %3$d nájdených. %4$d užívateľov celkom.';
 $lang['nonefound']             = 'Žiadni užívatelia nenájdení. %d užívateľov celkom.';
 $lang['delete_ok']             = '%d užívateľov zmazaných';
@@ -49,3 +54,16 @@ $lang['add_ok']                = 'Používateľ úspešne pridaný';
 $lang['add_fail']              = 'Pridávanie užívateľa nebolo úspešné';
 $lang['notify_ok']             = 'Notifikačný e-mail bol poslaný';
 $lang['notify_fail']           = 'Notifikačný e-mail nemohol byť poslaný';
+$lang['import_userlistcsv']    = 'Súbor so zoznamov používateľov (CSV):';
+$lang['import_header']         = 'Chyby pri poslednom importe';
+$lang['import_success_count']  = 'Import používateľov: %d nájdených, %d úspešne importovaných.';
+$lang['import_failure_count']  = 'Import používateľov: %d neúspešných. Problámy  vypísané nižšie.';
+$lang['import_error_fields']   = 'Neúplné záznamy, %d nájdené, 4 požadované.';
+$lang['import_error_baduserid'] = 'Chýba ID používateľa';
+$lang['import_error_badname']  = 'Nesprávne meno';
+$lang['import_error_badmail']  = 'Nesprávna emailová adresa';
+$lang['import_error_upload']   = 'Import neúspešný. CSV súbor nemohol byť nahraný alebo je prázdny.';
+$lang['import_error_readfail'] = 'Import neúspešný. Nie je možné prečítať nahraný súbor.';
+$lang['import_error_create']   = 'Nie je možné vytvoriť pouzívateľa';
+$lang['import_notify_fail']    = 'Správa nemohla byť zaslaná importovanému používatelovi, %s s emailom %s.';
+$lang['import_downloadfailures'] = 'Stiahnuť chyby vo formáte CSV za účelom opravy';
-- 
cgit v1.2.3


From 88f4ee239da1f6158c3adc8549bdd688e3d9b2a3 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA 
Date: Tue, 8 Oct 2013 20:16:36 +0200
Subject: translation update

---
 lib/plugins/authad/lang/ja/settings.php   |  4 ++++
 lib/plugins/authldap/lang/ja/settings.php |  6 ++++++
 lib/plugins/usermanager/lang/ja/lang.php  | 14 ++++++++++++++
 3 files changed, 24 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/ja/settings.php b/lib/plugins/authad/lang/ja/settings.php
index 72e5cc76e..f308249ef 100644
--- a/lib/plugins/authad/lang/ja/settings.php
+++ b/lib/plugins/authad/lang/ja/settings.php
@@ -11,6 +11,10 @@ $lang['base_dn']               = 'ベースDN。例：DC=my,DC=domain,DC=o
 $lang['domain_controllers']    = 'ドメインコントローラのカンマ区切り一覧。例：srv1.domain.org,srv2.domain.org';
 $lang['admin_username']        = '全ユーザーデータへのアクセス権のある特権Active Directoryユーザー。任意ですが、メール通知の登録等の特定の動作に必要。';
 $lang['admin_password']        = '上記ユーザーのパスワード';
+$lang['sso']                   = 'Kerberos か NTLM を使ったシングルサインオン（SSO）をしますか？';
+$lang['real_primarygroup']     = '"Domain Users" を仮定する代わりに本当のプライマリグループを解決する（低速）';
+$lang['use_ssl']               = 'SSL接続を使用しますか？使用した場合、下のSSLを有効にしないでください。';
+$lang['use_tls']               = 'TLS接続を使用しますか？使用した場合、上のSSLを有効にしないでください。';
 $lang['debug']                 = 'エラー時に追加のデバッグ出力を表示する？';
 $lang['expirywarn']            = '何日前からパスワードの有効期限をユーザーに警告する。0 の場合は無効';
 $lang['additional']            = 'ユーザデータから取得する追加AD属性のカンマ区切り一覧。いくつかのプラグインが使用する。';
diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php
index cee7b059c..6dec9a576 100644
--- a/lib/plugins/authldap/lang/ja/settings.php
+++ b/lib/plugins/authldap/lang/ja/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Satoshi Sahara 
  * @author Hideaki SAWADA 
+ * @author Hideaki SAWADA 
  */
 $lang['server']                = 'LDAPサーバー。ホスト名（localhostldap://server.tld:389）';
 $lang['port']                  = '上記が完全修飾URLでない場合、LDAPサーバーポート';
@@ -13,6 +14,11 @@ $lang['grouptree']             = 'ユーザーグループを探す場所。例
 $lang['userfilter']            = 'ユーザーアカウントを探すためのLDAP抽出条件。例：(&(uid=%{user})(objectClass=posixAccount))';
 $lang['groupfilter']           = 'グループを探すLDAP抽出条件。例：(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
 $lang['version']               = '使用するプロトコルのバージョン。3を設定する必要がある場合があります。';
+$lang['starttls']              = 'TLS接続を使用しますか？';
 $lang['binddn']                = '匿名バインドでは不十分な場合、オプションバインドユーザーのDN。例：cn=admin, dc=my, dc=home';
 $lang['bindpw']                = '上記ユーザーのパスワード';
 $lang['debug']                 = 'エラーに関して追加のデバッグ情報を表示する。';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/usermanager/lang/ja/lang.php b/lib/plugins/usermanager/lang/ja/lang.php
index 75c2f13ed..0830416f3 100644
--- a/lib/plugins/usermanager/lang/ja/lang.php
+++ b/lib/plugins/usermanager/lang/ja/lang.php
@@ -11,6 +11,7 @@
  * @author Taisuke Shimamoto 
  * @author Satoshi Sahara 
  * @author Hideaki SAWADA 
+ * @author Hideaki SAWADA 
  */
 $lang['menu']                  = 'ユーザー管理';
 $lang['noauth']                = '（ユーザー認証が無効です）';
@@ -58,3 +59,16 @@ $lang['add_ok']                = 'ユーザーを登録しました';
 $lang['add_fail']              = 'ユーザーの登録に失敗しました';
 $lang['notify_ok']             = '通知メールを送信しました';
 $lang['notify_fail']           = '通知メールを送信できませんでした';
+$lang['import_userlistcsv']    = 'ユーザー一覧ファイル（CSV）：';
+$lang['import_header']         = '最新インポート - 失敗';
+$lang['import_success_count']  = 'ユーザーインポート：ユーザーが%d件あり、%d件正常にインポートされました。';
+$lang['import_failure_count']  = 'ユーザーインポート：%d件が失敗しました。失敗は次のとおりです。';
+$lang['import_error_fields']   = '列の不足（４列必要）が%d件ありました。';
+$lang['import_error_baduserid'] = '欠落したユーザーID';
+$lang['import_error_badname']  = '不正な氏名';
+$lang['import_error_badmail']  = '不正な電子メールアドレス';
+$lang['import_error_upload']   = 'インポートが失敗しました。CSVファイルをアップロードできなかったか、ファイルが空です。';
+$lang['import_error_readfail'] = 'インポートが失敗しました。アップロードされたファイルが読込できません。';
+$lang['import_error_create']   = 'ユーザーが作成できません。';
+$lang['import_notify_fail']    = '通知メッセージがインポートされたユーザー（%s）・電子メールアドレス（%s）に送信できませんでした。';
+$lang['import_downloadfailures'] = '修正用に失敗を CSVファイルとしてダウンロードする。';
-- 
cgit v1.2.3


From 8fd5faebc6501c1fd7ef719de47f639d097912c9 Mon Sep 17 00:00:00 2001
From: Martin Michalek 
Date: Thu, 10 Oct 2013 08:45:59 +0200
Subject: translation update

---
 lib/plugins/authad/lang/sk/settings.php    |  3 +++
 lib/plugins/authldap/lang/sk/settings.php  | 11 +++++++++++
 lib/plugins/authmysql/lang/sk/settings.php |  2 ++
 lib/plugins/authpgsql/lang/sk/settings.php |  1 +
 lib/plugins/revert/lang/sk/intro.txt       |  3 +++
 lib/plugins/revert/lang/sk/lang.php        |  2 +-
 lib/plugins/usermanager/lang/sk/import.txt |  9 +++++++++
 7 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/usermanager/lang/sk/import.txt

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/sk/settings.php b/lib/plugins/authad/lang/sk/settings.php
index 0cc9b9b10..b709b50f8 100644
--- a/lib/plugins/authad/lang/sk/settings.php
+++ b/lib/plugins/authad/lang/sk/settings.php
@@ -5,7 +5,10 @@
  * 
  * @author Martin Michalek 
  */
+$lang['admin_username']        = 'Privilegovaný používateľ Active Directory s prístupom ku všetkým dátam ostatných používateľov. Nepovinné nastavenie ale potrebné pre určité akcie ako napríklad zasielanie mailov o zmenách.';
 $lang['admin_password']        = 'Heslo vyššie uvedeného používateľa.';
+$lang['sso']                   = 'Použiť Single-Sign-On cez Kerberos alebo NTLM?';
 $lang['use_ssl']               = 'Použiť SSL pripojenie? Ak áno, nepovoľte TLS nižšie.';
 $lang['use_tls']               = 'Použiť TLS pripojenie? Ak áno, nepovoľte SSL vyššie.';
 $lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe?';
+$lang['additional']            = 'Zoznam dodatočných AD atribútov oddelených čiarkou získaných z údajov používateľa. Používané niektorými pluginmi.';
diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
index 759c92304..8dd087a22 100644
--- a/lib/plugins/authldap/lang/sk/settings.php
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -5,6 +5,17 @@
  * 
  * @author Martin Michalek 
  */
+$lang['server']                = 'LDAP server. Adresa (localhost) alebo úplné URL (ldap://server.tld:389)';
+$lang['port']                  = 'Port LDAP servera, ak nebola vyššie zadané úplné URL';
+$lang['usertree']              = 'Kde je možné nájsť účty používateľov. Napr. ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'Kde je možné nájsť skupiny používateľov. Napr. ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = 'LDAP filter pre vyhľadávanie používateľských účtov. Napr. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'LDAP filter pre vyhľadávanie skupín. Napr. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'Použitá verzia protokolu. Možno bude potrebné nastaviť na hodnotu 3';
 $lang['starttls']              = 'Použiť TLS pripojenie?';
 $lang['bindpw']                = 'Heslo vyššie uvedeného používateľa';
 $lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authmysql/lang/sk/settings.php b/lib/plugins/authmysql/lang/sk/settings.php
index 477f2f10b..650490684 100644
--- a/lib/plugins/authmysql/lang/sk/settings.php
+++ b/lib/plugins/authmysql/lang/sk/settings.php
@@ -11,6 +11,8 @@ $lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
 $lang['database']              = 'Použiť databázu';
 $lang['charset']               = 'Znaková sada databázy';
 $lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
+$lang['forwardClearPass']      = 'Posielať heslo ako nezakókovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
+$lang['TablesToLock']          = 'Zoznam tabuliek oddelených čiarkou, ktoré by mali byť uzamknuté pri operáciách zápisu';
 $lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
 $lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
 $lang['getGroups']             = 'SQL príkaz pre získanie informácií o skupinách používateľa';
diff --git a/lib/plugins/authpgsql/lang/sk/settings.php b/lib/plugins/authpgsql/lang/sk/settings.php
index dafe5e83d..2179b90b7 100644
--- a/lib/plugins/authpgsql/lang/sk/settings.php
+++ b/lib/plugins/authpgsql/lang/sk/settings.php
@@ -11,6 +11,7 @@ $lang['user']                  = 'Meno používateľa PostgreSQL';
 $lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
 $lang['database']              = 'Použiť databázu';
 $lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
+$lang['forwardClearPass']      = 'Posielať heslo ako nezakókovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
 $lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
 $lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
 $lang['getGroups']             = 'SQL príkaz pre získanie informácií o skupinách používateľa';
diff --git a/lib/plugins/revert/lang/sk/intro.txt b/lib/plugins/revert/lang/sk/intro.txt
index e69de29bb..aa75a2c10 100644
--- a/lib/plugins/revert/lang/sk/intro.txt
+++ b/lib/plugins/revert/lang/sk/intro.txt
@@ -0,0 +1,3 @@
+====== Obnova dát ======
+
+Táto stránka slúži na automatické obnovenie obsahu stránok po útoku spamom. Pre identifikáciu napadnutých stránok zadajte vyhľadávací reťazec (napr. spam URL), potom potvrďte, že nájdené stránky sú skutočne napadnuté, a zrušte posledné zmeny.
\ No newline at end of file
diff --git a/lib/plugins/revert/lang/sk/lang.php b/lib/plugins/revert/lang/sk/lang.php
index 6a2cb119d..7ab21f287 100644
--- a/lib/plugins/revert/lang/sk/lang.php
+++ b/lib/plugins/revert/lang/sk/lang.php
@@ -7,7 +7,7 @@
  * @author exusik@gmail.com
  * @author Martin Michalek 
  */
-$lang['menu']                  = 'Reverzný manažér';
+$lang['menu']                  = 'Obnova dát';
 $lang['filter']                = 'Hľadať spamerské stránky';
 $lang['revert']                = 'Vrátiť vybrané stránky';
 $lang['reverted']              = '%s vrátená na revíziu %s';
diff --git a/lib/plugins/usermanager/lang/sk/import.txt b/lib/plugins/usermanager/lang/sk/import.txt
new file mode 100644
index 000000000..7f57461f9
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sk/import.txt
@@ -0,0 +1,9 @@
+===== Hromadný import používateľov =====
+
+Vyžaduje CSV súbor používateľov s minimálne 4 stĺpcami.
+Stĺpce musia obsahovať postupne: ID používateľa, meno a priezvisko, emailová adresa a skupiny.
+CVS záznamy by mali byť oddelené čiarkou (,) a reťazce uzavreté úvodzovkami (""). Znak (\) sa používa v spojení s špeciálnymi znakmi.
+Príklad vhodného súboru je možné získať funkciou "Export používateľov".
+Duplicitné ID používateľov budú ignorované.
+
+Každému úspešne importovanému používateľovi bude vygenerované heslo a zaslaný email.
\ No newline at end of file
-- 
cgit v1.2.3


From df5d307ea8bac1f5030d42af363ae9f7469a63f2 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Thu, 10 Oct 2013 15:53:03 +0200
Subject: add cookie secure parameter to cookies set by javascript

---
 lib/exe/js.php        | 8 ++++++--
 lib/scripts/cookie.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index fc7a869c2..040b8874d 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -86,16 +86,20 @@ function js_out(){
     // start output buffering and build the script
     ob_start();
 
+    $json = new JSON();
     // add some global variables
     print "var DOKU_BASE   = '".DOKU_BASE."';";
     print "var DOKU_TPL    = '".tpl_basedir()."';";
-    print "var DOKU_COOKIEPATH = '" . (empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']) . "';";
+    print "var DOKU_COOKIE_PARAM = " . $json->encode(
+            array(
+                 'path' => empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'],
+                 'secure' => $conf['securecookie'] && is_ssl()
+            )).";";
     // FIXME: Move those to JSINFO
     print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
     print "var DOKU_UHC    = ".((int) useHeading('content')).";";
 
     // load JS specific translations
-    $json = new JSON();
     $lang['js']['plugins'] = js_pluginstrings();
     $templatestrings = js_templatestrings();
     if(!empty($templatestrings)) {
diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js
index 4cb527f26..8417d2064 100644
--- a/lib/scripts/cookie.js
+++ b/lib/scripts/cookie.js
@@ -30,7 +30,7 @@ var DokuCookie = {
                 text.push(encodeURIComponent(key)+'#'+encodeURIComponent(val));
             }
         });
-        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIEPATH});
+        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIE_PARAM.path, secure: DOKU_COOKIE_PARAM.secure});
     },
 
     /**
-- 
cgit v1.2.3


From 9c7a681b5de7bebb468569a1a416000935b3b3d7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sat, 12 Oct 2013 18:56:40 +0200
Subject: removed css_moveimports() this is now done by lessphp

---
 lib/exe/css.php | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 60e17ae82..afba5fc02 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -148,9 +148,6 @@ function css_out(){
     // parse less
     $css = css_parseless($css);
 
-    // place all remaining @import statements at the top of the file
-    $css = css_moveimports($css);
-
     // compress whitespace and comments
     if($conf['compress']){
         $css = css_compress($css);
@@ -459,28 +456,6 @@ function css_pluginstyles($mediatype='screen'){
     return $list;
 }
 
-/**
- * Move all @import statements in a combined stylesheet to the top so they
- * aren't ignored by the browser.
- *
- * @author Gabriel Birke 
- */
-function css_moveimports($css) {
-    if(!preg_match_all('/@import\s+(?:url\([^)]+\)|"[^"]+")\s*[^;]*;\s*/', $css, $matches, PREG_OFFSET_CAPTURE)) {
-        return $css;
-    }
-    $newCss  = "";
-    $imports = "";
-    $offset  = 0;
-    foreach($matches[0] as $match) {
-        $newCss  .= substr($css, $offset, $match[1] - $offset);
-        $imports .= $match[0];
-        $offset   = $match[1] + strlen($match[0]);
-    }
-    $newCss .= substr($css, $offset);
-    return $imports.$newCss;
-}
-
 /**
  * Very simple CSS optimizer
  *
-- 
cgit v1.2.3


From 34b78ec618303a5dcfec12acc6f54ab1a6f5886f Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sun, 13 Oct 2013 10:40:24 +0200
Subject: typo fix PR #368

---
 lib/plugins/authmysql/lang/en/settings.php | 4 ++--
 lib/plugins/authpgsql/lang/en/settings.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authmysql/lang/en/settings.php b/lib/plugins/authmysql/lang/en/settings.php
index 77e4806b9..b95f39701 100644
--- a/lib/plugins/authmysql/lang/en/settings.php
+++ b/lib/plugins/authmysql/lang/en/settings.php
@@ -19,7 +19,7 @@ $lang['FilterGroup']      = 'SQL clause for filtering users by group membership'
 $lang['SortOrder']        = 'SQL clause to sort users';
 $lang['addUser']          = 'SQL statement to add a new user';
 $lang['addGroup']         = 'SQL statement to add a new group';
-$lang['addUserGroup']     = 'SQL statment to add a user to an existing group';
+$lang['addUserGroup']     = 'SQL statement to add a user to an existing group';
 $lang['delGroup']         = 'SQL statement to remove a group';
 $lang['getUserID']        = 'SQL statement to get the primary key of a user';
 $lang['delUser']          = 'SQL statement to delete a user';
@@ -36,4 +36,4 @@ $lang['getGroupID']       = 'SQL statement to get the primary key of a given gro
 
 $lang['debug_o_0'] = 'none';
 $lang['debug_o_1'] = 'on errors only';
-$lang['debug_o_2'] = 'all SQL queries';
\ No newline at end of file
+$lang['debug_o_2'] = 'all SQL queries';
diff --git a/lib/plugins/authpgsql/lang/en/settings.php b/lib/plugins/authpgsql/lang/en/settings.php
index e67235cfa..cfb2686cb 100644
--- a/lib/plugins/authpgsql/lang/en/settings.php
+++ b/lib/plugins/authpgsql/lang/en/settings.php
@@ -18,7 +18,7 @@ $lang['FilterGroup']      = 'SQL clause for filtering users by group membership'
 $lang['SortOrder']        = 'SQL clause to sort users';
 $lang['addUser']          = 'SQL statement to add a new user';
 $lang['addGroup']         = 'SQL statement to add a new group';
-$lang['addUserGroup']     = 'SQL statment to add a user to an existing group';
+$lang['addUserGroup']     = 'SQL statement to add a user to an existing group';
 $lang['delGroup']         = 'SQL statement to remove a group';
 $lang['getUserID']        = 'SQL statement to get the primary key of a user';
 $lang['delUser']          = 'SQL statement to delete a user';
-- 
cgit v1.2.3


From 1da2eb6fdf5ffff04e1bb6153a89d033a4b2c7f2 Mon Sep 17 00:00:00 2001
From: Martin Michalek 
Date: Mon, 14 Oct 2013 02:01:01 +0200
Subject: translation update

---
 lib/plugins/authad/lang/sk/settings.php    | 3 ++-
 lib/plugins/authldap/lang/sk/settings.php  | 6 +++---
 lib/plugins/authmysql/lang/sk/settings.php | 2 +-
 lib/plugins/authpgsql/lang/sk/settings.php | 2 +-
 lib/plugins/usermanager/lang/sk/import.txt | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/sk/settings.php b/lib/plugins/authad/lang/sk/settings.php
index b709b50f8..55f266dd6 100644
--- a/lib/plugins/authad/lang/sk/settings.php
+++ b/lib/plugins/authad/lang/sk/settings.php
@@ -5,7 +5,8 @@
  * 
  * @author Martin Michalek 
  */
-$lang['admin_username']        = 'Privilegovaný používateľ Active Directory s prístupom ku všetkým dátam ostatných používateľov. Nepovinné nastavenie ale potrebné pre určité akcie ako napríklad zasielanie mailov o zmenách.';
+$lang['account_suffix']        = 'Prípona používateľského účtu. Napr. @my.domain.org';
+$lang['admin_username']        = 'Privilegovaný používateľ Active Directory s prístupom ku všetkým dátam ostatných používateľov. Nepovinné nastavenie, ale potrebné pre určité akcie ako napríklad zasielanie mailov o zmenách.';
 $lang['admin_password']        = 'Heslo vyššie uvedeného používateľa.';
 $lang['sso']                   = 'Použiť Single-Sign-On cez Kerberos alebo NTLM?';
 $lang['use_ssl']               = 'Použiť SSL pripojenie? Ak áno, nepovoľte TLS nižšie.';
diff --git a/lib/plugins/authldap/lang/sk/settings.php b/lib/plugins/authldap/lang/sk/settings.php
index 8dd087a22..48bd37395 100644
--- a/lib/plugins/authldap/lang/sk/settings.php
+++ b/lib/plugins/authldap/lang/sk/settings.php
@@ -6,9 +6,9 @@
  * @author Martin Michalek 
  */
 $lang['server']                = 'LDAP server. Adresa (localhost) alebo úplné URL (ldap://server.tld:389)';
-$lang['port']                  = 'Port LDAP servera, ak nebola vyššie zadané úplné URL';
-$lang['usertree']              = 'Kde je možné nájsť účty používateľov. Napr. ou=People, dc=server, dc=tld';
-$lang['grouptree']             = 'Kde je možné nájsť skupiny používateľov. Napr. ou=Group, dc=server, dc=tld';
+$lang['port']                  = 'Port LDAP servera, ak nebolo vyššie zadané úplné URL';
+$lang['usertree']              = 'Umiestnenie účtov používateľov. Napr. ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'Umiestnenie skupín používateľov. Napr. ou=Group, dc=server, dc=tld';
 $lang['userfilter']            = 'LDAP filter pre vyhľadávanie používateľských účtov. Napr. (&(uid=%{user})(objectClass=posixAccount))';
 $lang['groupfilter']           = 'LDAP filter pre vyhľadávanie skupín. Napr. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
 $lang['version']               = 'Použitá verzia protokolu. Možno bude potrebné nastaviť na hodnotu 3';
diff --git a/lib/plugins/authmysql/lang/sk/settings.php b/lib/plugins/authmysql/lang/sk/settings.php
index 650490684..8c52f905e 100644
--- a/lib/plugins/authmysql/lang/sk/settings.php
+++ b/lib/plugins/authmysql/lang/sk/settings.php
@@ -11,7 +11,7 @@ $lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
 $lang['database']              = 'Použiť databázu';
 $lang['charset']               = 'Znaková sada databázy';
 $lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
-$lang['forwardClearPass']      = 'Posielať heslo ako nezakókovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
+$lang['forwardClearPass']      = 'Posielať heslo ako nezakódovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
 $lang['TablesToLock']          = 'Zoznam tabuliek oddelených čiarkou, ktoré by mali byť uzamknuté pri operáciách zápisu';
 $lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
 $lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
diff --git a/lib/plugins/authpgsql/lang/sk/settings.php b/lib/plugins/authpgsql/lang/sk/settings.php
index 2179b90b7..9d656415d 100644
--- a/lib/plugins/authpgsql/lang/sk/settings.php
+++ b/lib/plugins/authpgsql/lang/sk/settings.php
@@ -11,7 +11,7 @@ $lang['user']                  = 'Meno používateľa PostgreSQL';
 $lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
 $lang['database']              = 'Použiť databázu';
 $lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
-$lang['forwardClearPass']      = 'Posielať heslo ako nezakókovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
+$lang['forwardClearPass']      = 'Posielať heslo ako nezakódovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
 $lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
 $lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
 $lang['getGroups']             = 'SQL príkaz pre získanie informácií o skupinách používateľa';
diff --git a/lib/plugins/usermanager/lang/sk/import.txt b/lib/plugins/usermanager/lang/sk/import.txt
index 7f57461f9..91fa3e370 100644
--- a/lib/plugins/usermanager/lang/sk/import.txt
+++ b/lib/plugins/usermanager/lang/sk/import.txt
@@ -2,7 +2,7 @@
 
 Vyžaduje CSV súbor používateľov s minimálne 4 stĺpcami.
 Stĺpce musia obsahovať postupne: ID používateľa, meno a priezvisko, emailová adresa a skupiny.
-CVS záznamy by mali byť oddelené čiarkou (,) a reťazce uzavreté úvodzovkami (""). Znak (\) sa používa v spojení s špeciálnymi znakmi.
+CVS záznamy by mali byť oddelené čiarkou (,) a reťazce uzavreté úvodzovkami (""). Znak (\) sa používa v spojení so špeciálnymi znakmi.
 Príklad vhodného súboru je možné získať funkciou "Export používateľov".
 Duplicitné ID používateľov budú ignorované.
 
-- 
cgit v1.2.3


From 8265594d98708c1c993489099402d9ee27d2a289 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 15:55:16 +0200
Subject: move ajax.php to action.php. Fixes FS#2233

---
 lib/plugins/acl/action.php | 92 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/plugins/acl/script.js  |  9 +++--
 2 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 lib/plugins/acl/action.php

(limited to 'lib')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
new file mode 100644
index 000000000..92a93865c
--- /dev/null
+++ b/lib/plugins/acl/action.php
@@ -0,0 +1,92 @@
+
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Register handler
+ */
+class action_plugin_acl extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller DokuWiki's event controller object
+     * @return void
+     */
+    public function register(Doku_Event_Handler &$controller) {
+
+        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax_call_acl');
+
+    }
+
+    /**
+     * AJAX call handler for ACL plugin
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  empty
+     * @return void
+     */
+
+    public function handle_ajax_call_acl(Doku_Event &$event, $param) {
+        if ($event->data !== 'plugin_acl') {
+            return;
+        }
+        $event->stopPropagation();
+        $event->preventDefault();
+
+
+        //close session
+        session_write_close();
+
+        global $conf;
+        global $ID;
+        global $INPUT;
+
+        //fix for Opera XMLHttpRequests
+        $postData = http_get_raw_post_data();
+        if(!count($_POST) && !empty($postData)){
+            parse_str($postData, $_POST);
+        }
+
+        if(!auth_isadmin()) die('for admins only');
+        if(!checkSecurityToken()) die('CRSF Attack');
+
+        $ID    = getID();
+
+        /** @var $acl admin_plugin_acl */
+        $acl = plugin_load('admin','acl');
+        $acl->handle();
+
+        $ajax = $INPUT->str('ajax');
+        header('Content-Type: text/html; charset=utf-8');
+
+        if($ajax == 'info'){
+            $acl->_html_info();
+        }elseif($ajax == 'tree'){
+
+            $dir = $conf['datadir'];
+            $ns  = $INPUT->str('ns');
+            if($ns == '*'){
+                $ns ='';
+            }
+            $ns  = cleanID($ns);
+            $lvl = count(explode(':',$ns));
+            $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+            $data = $acl->_get_tree($ns,$ns);
+
+            foreach(array_keys($data) as $item){
+                $data[$item]['level'] = $lvl+1;
+            }
+            echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'),
+                                array($acl, '_html_li_acl'));
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index 0abb80d67..58598b1e0 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -25,9 +25,10 @@ var dw_acl = {
                            var $frm = jQuery('#acl__detail form');
 
                            jQuery.post(
-                               DOKU_BASE + 'lib/plugins/acl/ajax.php',
+                               DOKU_BASE + 'lib/exe/ajax.php',
                                jQuery.extend(dw_acl.parseatt($clicky.parent().find('a')[0].search),
-                                             {ajax: 'tree',
+                                             {call: 'plugin_acl',
+                                              ajax: 'tree',
                                               current_ns: $frm.find('input[name=ns]').val(),
                                               current_id: $frm.find('input[name=id]').val()}),
                                show_sublist,
@@ -64,8 +65,8 @@ var dw_acl = {
             .attr('role', 'alert')
             .html('...')
             .load(
-                DOKU_BASE + 'lib/plugins/acl/ajax.php',
-                jQuery('#acl__detail form').serialize() + '&ajax=info'
+                DOKU_BASE + 'lib/exe/ajax.php',
+                jQuery('#acl__detail form').serialize() + '&call=plugin_acl&ajax=info'
             );
         return false;
     },
-- 
cgit v1.2.3


From d4e2226677c742531e589ebd2b45fdd4553322ad Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 15:56:52 +0200
Subject: remove unused variable

---
 lib/plugins/acl/action.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 92a93865c..373d6cbb0 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -71,7 +71,6 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             $acl->_html_info();
         }elseif($ajax == 'tree'){
 
-            $dir = $conf['datadir'];
             $ns  = $INPUT->str('ns');
             if($ns == '*'){
                 $ns ='';
-- 
cgit v1.2.3


From 219fe1dcb7250b332a77278fd31f20e5da10846c Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 16:00:45 +0200
Subject: Code reformatting and remove unused global conf

---
 lib/plugins/acl/action.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 373d6cbb0..01842250e 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -30,62 +30,62 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
      * AJAX call handler for ACL plugin
      *
      * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  empty
+     * @param mixed $param  empty
      * @return void
      */
 
     public function handle_ajax_call_acl(Doku_Event &$event, $param) {
-        if ($event->data !== 'plugin_acl') {
+        if($event->data !== 'plugin_acl') {
             return;
         }
         $event->stopPropagation();
         $event->preventDefault();
 
-
         //close session
         session_write_close();
 
-        global $conf;
         global $ID;
         global $INPUT;
 
         //fix for Opera XMLHttpRequests
         $postData = http_get_raw_post_data();
-        if(!count($_POST) && !empty($postData)){
+        if(!count($_POST) && !empty($postData)) {
             parse_str($postData, $_POST);
         }
 
         if(!auth_isadmin()) die('for admins only');
         if(!checkSecurityToken()) die('CRSF Attack');
 
-        $ID    = getID();
+        $ID = getID();
 
         /** @var $acl admin_plugin_acl */
-        $acl = plugin_load('admin','acl');
+        $acl = plugin_load('admin', 'acl');
         $acl->handle();
 
         $ajax = $INPUT->str('ajax');
         header('Content-Type: text/html; charset=utf-8');
 
-        if($ajax == 'info'){
+        if($ajax == 'info') {
             $acl->_html_info();
-        }elseif($ajax == 'tree'){
+        } elseif($ajax == 'tree') {
 
-            $ns  = $INPUT->str('ns');
-            if($ns == '*'){
-                $ns ='';
+            $ns = $INPUT->str('ns');
+            if($ns == '*') {
+                $ns = '';
             }
-            $ns  = cleanID($ns);
-            $lvl = count(explode(':',$ns));
-            $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+            $ns = cleanID($ns);
+            $lvl = count(explode(':', $ns));
+            $ns = utf8_encodeFN(str_replace(':', '/', $ns));
 
-            $data = $acl->_get_tree($ns,$ns);
+            $data = $acl->_get_tree($ns, $ns);
 
-            foreach(array_keys($data) as $item){
-                $data[$item]['level'] = $lvl+1;
+            foreach(array_keys($data) as $item) {
+                $data[$item]['level'] = $lvl + 1;
             }
-            echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'),
-                                array($acl, '_html_li_acl'));
+            echo html_buildlist(
+                $data, 'acl', array($acl, '_html_list_acl'),
+                array($acl, '_html_li_acl')
+            );
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 07be12a51cc4c7850e57b25c6c1bd86ca0004a00 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 16:04:31 +0200
Subject: acl ajax: replace die() by return

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

(limited to 'lib')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 01842250e..bac518fcd 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -53,8 +53,8 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             parse_str($postData, $_POST);
         }
 
-        if(!auth_isadmin()) die('for admins only');
-        if(!checkSecurityToken()) die('CRSF Attack');
+        if(!auth_isadmin()) return;
+        if(!checkSecurityToken()) return;
 
         $ID = getID();
 
-- 
cgit v1.2.3


From 00dd0e7e7ab5bc29658e4be85336841af70b6b97 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 16:12:01 +0200
Subject: acl ajax: add messages to returns

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

(limited to 'lib')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index bac518fcd..6111aca42 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -53,8 +53,14 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             parse_str($postData, $_POST);
         }
 
-        if(!auth_isadmin()) return;
-        if(!checkSecurityToken()) return;
+        if(!auth_isadmin()) {
+            echo 'for admins only';
+            return;
+        }
+        if(!checkSecurityToken()) {
+            echo 'CRSF Attack';
+            return;
+        }
 
         $ID = getID();
 
-- 
cgit v1.2.3


From f119fb202b56acf8966f17b1ae4525c678b34865 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 16:32:35 +0200
Subject: get version popularity plugin direct from plugin info

---
 lib/plugins/popularity/admin.php  |  3 ---
 lib/plugins/popularity/helper.php | 14 ++------------
 2 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index f90f844e1..bd2d090e1 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -22,9 +22,6 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
 
     function admin_plugin_popularity(){
         $this->helper = $this->loadHelper('popularity', false);
-
-        $pluginInfo = $this->getInfo();
-        $this->helper->setVersion($pluginInfo['date']);
     }
 
     /**
diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 9220d6b6d..9b092f2be 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -29,8 +29,6 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
      */
     var $popularityLastSubmitFile;
 
-    var $version;
-
 
     function helper_plugin_popularity(){
         global $conf;
@@ -69,15 +67,6 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     }
 
-    /**
-     * Sets plugin version
-     *
-     * @param string $pluginversion
-     */
-    public function setVersion($pluginversion) {
-        $this->version = $pluginversion;
-    }
-
     /**
      * Check if autosubmit is enabled
      * @return boolean TRUE if we should send data once a month, FALSE otherwise
@@ -138,11 +127,12 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
         $data = array();
         $phptime = ini_get('max_execution_time');
         @set_time_limit(0);
+        $pluginInfo = $this->getInfo();
 
         // version
         $data['anon_id'] = md5(auth_cookiesalt());
         $data['version'] = getVersion();
-        $data['popversion'] = $this->version;
+        $data['popversion'] = $pluginInfo['date'];
         $data['language'] = $conf['lang'];
         $data['now']      = time();
         $data['popauto']  = (int) $this->isAutoSubmitEnabled();
-- 
cgit v1.2.3


From 36013a6f5c54847cc4a474853d502ad99ae84be6 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 16:44:41 +0200
Subject: add PHPDocs to popularity plugin helper

---
 lib/plugins/popularity/helper.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 9b092f2be..eacde06d0 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -37,6 +37,11 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
         $this->popularityLastSubmitFile = $conf['cachedir'].'/lastSubmitTime.txt';
     }
 
+    /**
+     * Return methods of this helper
+     *
+     * @return array with methods description
+     */
     function getMethods(){
         $result = array();
         $result[] = array(
@@ -123,6 +128,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
      */
     function _gather(){
         global $conf;
+        /** @var $auth DokuWiki_Auth_Plugin */
         global $auth;
         $data = array();
         $phptime = ini_get('max_execution_time');
@@ -244,6 +250,17 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
         return $data;
     }
 
+    /**
+     * Callback to search and count the content of directories in DokuWiki
+     *
+     * @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
+     * @param int    $lvl   Current recursion depht
+     * @param array  $opts  option array as given to search()
+     * @return bool
+     */
     function _search_count(&$data,$base,$file,$type,$lvl,$opts){
         // traverse
         if($type == 'd'){
-- 
cgit v1.2.3


From a27c9d6f6c03a5b93871dd414021317c2bb9eac8 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Mon, 14 Oct 2013 20:35:17 +0200
Subject: Put syntax modes in a table layout, sort numbers in rowspans.
 Implements FS#2516

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

(limited to 'lib')

diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 5e7543603..da32a6f32 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -215,11 +215,36 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      */
     function _syntaxmodes_xhtml(){
         $modes = p_get_parsermodes();
+
+        $compactmodes = array();
+        foreach($modes as $mode){
+            $compactmodes[$mode['sort']][] = $mode['mode'];
+        }
         $doc  = '';
+        $doc .= '
    ';
+
+        foreach($compactmodes as $sort => $modes){
+            $rowspan = '';
+            if(count($modes) > 1) {
+                $rowspan = ' rowspan="'.count($modes).'"';
+            }
 
-        foreach ($modes as $mode){
-            $doc .= $mode['mode'].' ('.$mode['sort'].'), ';
+            foreach($modes as $index => $mode) {
+                $doc .= '';
+                $doc .= '';
+
+                if($index === 0) {
+                    $doc .= '';
+                }
+                $doc .= '';
+            }
         }
+
+        $doc .= '
    ';
+                $doc .= $mode;
+                $doc .= '';
+                    $doc .= $sort;
+                    $doc .= '
    ';
         return $doc;
     }
 
-- 
cgit v1.2.3


From 9b3b9e8e02000edb4c6359d9ad50fbeeab0a4612 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Tue, 15 Oct 2013 10:30:54 +0200
Subject: Fix PHP strict messages

---
 lib/plugins/info/syntax.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index da32a6f32..5d969d7a2 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -48,7 +48,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
     /**
      * Handle the match
      */
-    function handle($match, $state, $pos, &$handler){
+    function handle($match, $state, $pos, Doku_Handler &$handler){
         $match = substr($match,7,-2); //strip ~~INFO: from start and ~~ from end
         return array(strtolower($match));
     }
@@ -56,7 +56,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
     /**
      * Create output
      */
-    function render($format, &$renderer, $data) {
+    function render($format, Doku_Renderer &$renderer, $data) {
         if($format == 'xhtml'){
             //handle various info stuff
             switch ($data[0]){
@@ -112,7 +112,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
 
         // remove subparts
         foreach($plugins as $p){
-            if (!$po =& plugin_load($type,$p)) continue;
+            if (!$po = plugin_load($type,$p)) continue;
             list($name,$part) = explode('_',$p,2);
             $plginfo[$name] = $po->getInfo();
         }
@@ -146,7 +146,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
 
         $plugins = plugin_list('helper');
         foreach($plugins as $p){
-            if (!$po =& plugin_load('helper',$p)) continue;
+            if (!$po = plugin_load('helper',$p)) continue;
 
             if (!method_exists($po, 'getMethods')) continue;
             $methods = $po->getMethods();
@@ -156,7 +156,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
             $doc = '
    '.hsc($info['name']).'
    ';
             $doc .= '
    ';
             $doc .= '
    '.strtr(hsc($info['desc']), array("\n"=>"
    ")).'
    ';
-            $doc .= '
    $'.$p." =& plugin_load('helper', '".$p."');
    ";
+            $doc .= '
    $'.$p." = plugin_load('helper', '".$p."');
    ";
             $doc .= '
    ';
             foreach ($methods as $method){
                 $title = '$'.$p.'->'.$method['name'].'()';
-- 
cgit v1.2.3


From 205907a73eaf15c53de98f153e90890706e79cbe Mon Sep 17 00:00:00 2001
From: furun 
Date: Tue, 15 Oct 2013 11:34:31 +0200
Subject: compact some CSS styles to their shorthand syntax FS#2509

---
 lib/exe/css.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index afba5fc02..6dfdf06e8 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -473,8 +473,19 @@ function css_compress($css){
     $css = preg_replace('/ ?([;,{}\/]) ?/','\\1',$css);
     $css = preg_replace('/ ?: /',':',$css);
 
+    // number compression
+    $css = preg_replace('/([: ])0+(\.\d+?)0*((?:pt|pc|in|mm|cm|em|ex|px)\b|%)(?=[^\{]*[;\}])/', '$1$2$3', $css); // "0.1em" to ".1em", "1.10em" to "1.1em"
+    $css = preg_replace('/([: ])\.(0)+((?:pt|pc|in|mm|cm|em|ex|px)\b|%)(?=[^\{]*[;\}])/', '$1$2', $css); // ".0em" to "0"
+    $css = preg_replace('/([: ]0)0*(\.0*)?((?:pt|pc|in|mm|cm|em|ex|px)(?=[^\{]*[;\}])\b|%)/', '$1', $css); // "0.0em" to "0"
+    $css = preg_replace('/([: ]\d+)(\.0*)((?:pt|pc|in|mm|cm|em|ex|px)(?=[^\{]*[;\}])\b|%)/', '$1$3', $css); // "1.0em" to "1em"
+    $css = preg_replace('/([: ])0+(\d+|\d*\.\d+)((?:pt|pc|in|mm|cm|em|ex|px)(?=[^\{]*[;\}])\b|%)/', '$1$2$3', $css); // "001em" to "1em"
+
+    // shorten attributes (1em 1em 1em 1em -> 1em)
+    $css = preg_replace('/(?
Date: Tue, 15 Oct 2013 13:03:30 +0200
Subject: fix php strict notices

---
 lib/plugins/action.php                       | 2 +-
 lib/plugins/config/settings/extra.class.php  | 2 +-
 lib/plugins/plugin/classes/ap_info.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/action.php b/lib/plugins/action.php
index 04b4f07a6..4b5eef60a 100644
--- a/lib/plugins/action.php
+++ b/lib/plugins/action.php
@@ -17,7 +17,7 @@ class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
     /**
      * Registers a callback function for a given event
      */
-    function register(Doku_Event_Handler $controller) {
+    public function register(Doku_Event_Handler $controller) {
         trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
     }
 }
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index d0f99fa8f..83de802a3 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -176,7 +176,7 @@ if (!class_exists('setting_renderer')) {
             $format = $this->_format;
 
             foreach (plugin_list('renderer') as $plugin) {
-                $renderer =& plugin_load('renderer',$plugin);
+                $renderer = plugin_load('renderer',$plugin);
                 if (method_exists($renderer,'canRender') && $renderer->canRender($format)) {
                     $this->_choices[] = $plugin;
 
diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php
index b3826b944..89b78fa2d 100644
--- a/lib/plugins/plugin/classes/ap_info.class.php
+++ b/lib/plugins/plugin/classes/ap_info.class.php
@@ -14,7 +14,7 @@ class ap_info extends ap_manage {
         usort($component_list, array($this,'component_sort'));
 
         foreach ($component_list as $component) {
-            if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === null) continue;
+            if (($obj = plugin_load($component['type'],$component['name'],false,true)) === null) continue;
 
             $compname = explode('_',$component['name']);
             if($compname[1]){
-- 
cgit v1.2.3


From 5da403f17a007f1b202f1c5ea2dbc80ab19d26e8 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Tue, 15 Oct 2013 16:26:25 +0200
Subject: fix signatures and old by references

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

(limited to 'lib')

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 1d2173706..a5a11cda1 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -794,7 +794,7 @@ if (!class_exists('setting_numericopt')) {
 if (!class_exists('setting_onoff')) {
     class setting_onoff extends setting_numeric {
 
-        function html(&$plugin) {
+        function html(&$plugin, $echo = false) {
             $value = '';
             $disable = '';
 
@@ -830,7 +830,7 @@ if (!class_exists('setting_multichoice')) {
     class setting_multichoice extends setting_string {
         var $_choices = array();
 
-        function html(&$plugin) {
+        function html(&$plugin, $echo = false) {
             $value = '';
             $disable = '';
             $nochoice = '';
-- 
cgit v1.2.3


From ab4d3f3b70150d4b7c2622bd5fa6079c49b8d32f Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Tue, 15 Oct 2013 16:36:56 +0200
Subject: fix expression passed by reference

---
 lib/exe/detail.php       | 4 +++-
 lib/exe/mediamanager.php | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index 7aae08f76..e3c81d877 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -9,7 +9,9 @@ $ID   = cleanID($INPUT->str('id'));
 // this makes some general infos available as well as the info about the
 // "parent" page
 $INFO = array_merge(pageinfo(),mediainfo());
-trigger_event('DETAIL_STARTED', $tmp=array());
+
+$tmp = array();
+trigger_event('DETAIL_STARTED', $tmp);
 
 //close session
 session_write_close();
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index d9e4a6b04..d94a24c74 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -34,7 +34,8 @@
     $JSINFO = array('id' => '', 'namespace' => '');
     $AUTH = $INFO['perm'];    // shortcut for historical reasons
 
-    trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
+    $tmp = array();
+    trigger_event('MEDIAMANAGER_STARTED', $tmp);
     session_write_close();  //close session
 
     // do not display the manager if user does not have read access
-- 
cgit v1.2.3


From 74ed54d4f9a7c9796916f33f649ef94619a31704 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Wed, 16 Oct 2013 11:29:27 +0200
Subject: fix signature mail unittest, and improve some signatures info plugin

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

(limited to 'lib')

diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 5d969d7a2..e68061e5d 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -58,6 +58,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      */
     function render($format, Doku_Renderer &$renderer, $data) {
         if($format == 'xhtml'){
+            /** @var Doku_Renderer_xhtml $renderer */
             //handle various info stuff
             switch ($data[0]){
                 case 'syntaxmodes':
@@ -103,7 +104,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      *
      * uses some of the original renderer methods
      */
-    function _plugins_xhtml($type, Doku_Renderer &$renderer){
+    function _plugins_xhtml($type, Doku_Renderer_xhtml &$renderer){
         global $lang;
         $renderer->doc .= '
      ';
 
@@ -141,9 +142,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      *
      * uses some of the original renderer methods
      */
-    function _helpermethods_xhtml(Doku_Renderer &$renderer){
-        global $lang;
-
+    function _helpermethods_xhtml(Doku_Renderer_xhtml &$renderer){
         $plugins = plugin_list('helper');
         foreach($plugins as $p){
             if (!$po = plugin_load('helper',$p)) continue;
-- 
cgit v1.2.3


From b288bdefdcc243374f385a3adaea329256016e4c Mon Sep 17 00:00:00 2001
From: Yangyu Huang 
Date: Wed, 16 Oct 2013 17:01:02 +0200
Subject: translation update

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

(limited to 'lib')

diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index 2674983b2..06656110f 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -16,6 +16,7 @@
  * @author lainme993@gmail.com
  * @author Shuo-Ting Jian 
  * @author Rachel 
+ * @author Yangyu Huang 
  */
 $lang['menu']                  = '用户管理器';
 $lang['noauth']                = '（用户认证不可用）';
@@ -38,6 +39,8 @@ $lang['search']                = '搜索';
 $lang['search_prompt']         = '进行搜索';
 $lang['clear']                 = '重置搜索过滤器';
 $lang['filter']                = '过滤器';
+$lang['export_all']            = '导出所有用户（CSV）';
+$lang['export_filtered']       = '导出已筛选的用户列表（CSV）';
 $lang['import']                = '请输入新用户名';
 $lang['line']                  = '行号';
 $lang['error']                 = '信息错误';
@@ -61,6 +64,10 @@ $lang['add_ok']                = '用户添加成功';
 $lang['add_fail']              = '用户添加失败';
 $lang['notify_ok']             = '通知邮件已发送';
 $lang['notify_fail']           = '通知邮件无法发送';
+$lang['import_userlistcsv']    = '用户列表文件（CSV）';
+$lang['import_header']         = '最近一次导入 - 失败';
+$lang['import_success_count']  = '用户导入：找到了 %d 个用户，%d 个用户被成功导入。';
+$lang['import_failure_count']  = '用户导入：%d 个用户导入失败。下面列出了失败的用户。';
 $lang['import_error_baduserid'] = '用户ID丢失';
 $lang['import_error_badname']  = '名称错误';
 $lang['import_error_badmail']  = '邮件地址错误';
-- 
cgit v1.2.3


From 443e135d59e9d227eec818dabf9ee64d7a73d474 Mon Sep 17 00:00:00 2001
From: Christopher Smith 
Date: Wed, 16 Oct 2013 22:04:01 +0100
Subject: replace boolean conditional checks on possibly uninitialized vars
 with \!empty/empty/isset as appropriate

---
 lib/tpl/dokuwiki/tpl_header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 19d165059..a2bfd4346 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -41,7 +41,7 @@ if (!defined('DOKU_INC')) die();
                 
      
                 
        
                     ';
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '';
-- 
cgit v1.2.3


From 7b4ce9b0b6af9a1faa35049f96663febad344302 Mon Sep 17 00:00:00 2001
From: Soren Birk 
Date: Thu, 17 Oct 2013 13:30:54 +0200
Subject: translation update

---
 lib/plugins/acl/lang/da/lang.php         |  4 ++--
 lib/plugins/authad/lang/da/settings.php  | 10 ++++++++++
 lib/plugins/plugin/lang/da/lang.php      |  4 ++--
 lib/plugins/popularity/lang/da/lang.php  |  5 +++--
 lib/plugins/revert/lang/da/lang.php      |  5 +++--
 lib/plugins/usermanager/lang/da/lang.php |  5 +++--
 6 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 lib/plugins/authad/lang/da/settings.php

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php
index 4a9d11448..2558795fd 100644
--- a/lib/plugins/acl/lang/da/lang.php
+++ b/lib/plugins/acl/lang/da/lang.php
@@ -1,8 +1,8 @@
 
  * @author Jon Bendtsen 
  * @author Lars Næsbye Christensen 
diff --git a/lib/plugins/authad/lang/da/settings.php b/lib/plugins/authad/lang/da/settings.php
new file mode 100644
index 000000000..958c41cf5
--- /dev/null
+++ b/lib/plugins/authad/lang/da/settings.php
@@ -0,0 +1,10 @@
+
+ */
+$lang['admin_password']        = 'Kodeordet til den ovenstående bruger.';
+$lang['use_ssl']               = 'Benyt SSL forbindelse? hvis ja, vælg ikke TLS herunder.';
+$lang['use_tls']               = 'Benyt TLS forbindelse? hvis ja, vælg ikke SSL herover.';
diff --git a/lib/plugins/plugin/lang/da/lang.php b/lib/plugins/plugin/lang/da/lang.php
index d1deb6310..d2751fa1b 100644
--- a/lib/plugins/plugin/lang/da/lang.php
+++ b/lib/plugins/plugin/lang/da/lang.php
@@ -1,8 +1,8 @@
 
  * @author Kalle Sommer Nielsen 
  * @author Esben Laursen 
diff --git a/lib/plugins/popularity/lang/da/lang.php b/lib/plugins/popularity/lang/da/lang.php
index bbf2a1ab4..78c447197 100644
--- a/lib/plugins/popularity/lang/da/lang.php
+++ b/lib/plugins/popularity/lang/da/lang.php
@@ -1,7 +1,8 @@
 
  * @author Esben Laursen 
  * @author Harith 
diff --git a/lib/plugins/revert/lang/da/lang.php b/lib/plugins/revert/lang/da/lang.php
index a76541a78..bb311f18f 100644
--- a/lib/plugins/revert/lang/da/lang.php
+++ b/lib/plugins/revert/lang/da/lang.php
@@ -1,7 +1,8 @@
 
  * @author Esben Laursen 
  * @author Harith 
diff --git a/lib/plugins/usermanager/lang/da/lang.php b/lib/plugins/usermanager/lang/da/lang.php
index 845457f7e..6b615b51d 100644
--- a/lib/plugins/usermanager/lang/da/lang.php
+++ b/lib/plugins/usermanager/lang/da/lang.php
@@ -1,7 +1,8 @@
 
  * @author Kalle Sommer Nielsen 
  * @author Esben Laursen 
-- 
cgit v1.2.3


From 61e0b2f8bbbac3ec582aa287e110b304a3986229 Mon Sep 17 00:00:00 2001
From: Christopher Smith 
Date: Fri, 18 Oct 2013 12:47:55 +0100
Subject: comment improvements

---
 lib/plugins/config/settings/config.metadata.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index f4c2ed265..f9dabfeb0 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -48,6 +48,7 @@
  *   'compression' - no additional parameters. checks php installation supports possible compression alternatives
  *   'licence'     - as multichoice, selection constructed from licence strings in language files
  *   'renderer'    - as multichoice, selection constructed from enabled renderer plugins which canRender()
+ *   'authtype'    - as multichoice, selection constructed from the enabled auth plugins
  *
  *  Any setting commented or missing will use 'setting' class - text input, minimal validation, quoted output
  *
-- 
cgit v1.2.3


From e07886c01389351f28a254ef6f7c9611453508fb Mon Sep 17 00:00:00 2001
From: Michael Hamann 
Date: Sun, 20 Oct 2013 20:21:42 +0200
Subject: Info plugin: allow xhtml renders to not to be an xhtml renderer

Renderers that set the format to xhtml don't necessarily inherit from
Doku_Renderer_xhtml, this reverts a prior change that introduced the
stricter parameter type.
---
 lib/plugins/info/syntax.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index e68061e5d..f8c6eb484 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -104,7 +104,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      *
      * uses some of the original renderer methods
      */
-    function _plugins_xhtml($type, Doku_Renderer_xhtml &$renderer){
+    function _plugins_xhtml($type, Doku_Renderer &$renderer){
         global $lang;
         $renderer->doc .= '
          ';
 
@@ -142,7 +142,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      *
      * uses some of the original renderer methods
      */
-    function _helpermethods_xhtml(Doku_Renderer_xhtml &$renderer){
+    function _helpermethods_xhtml(Doku_Renderer &$renderer){
         $plugins = plugin_list('helper');
         foreach($plugins as $p){
             if (!$po = plugin_load('helper',$p)) continue;
@@ -250,10 +250,11 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
     /**
      * Adds a TOC item
      */
-    function _addToTOC($text, $level, Doku_Renderer_xhtml &$renderer){
+    function _addToTOC($text, $level, Doku_Renderer &$renderer){
         global $conf;
 
         if (($level >= $conf['toptoclevel']) && ($level <= $conf['maxtoclevel'])){
+            /** @var $renderer Doku_Renderer_xhtml */
             $hid  = $renderer->_headerToLink($text, 'true');
             $renderer->toc[] = array(
                 'hid'   => $hid,
-- 
cgit v1.2.3


From e979d184ca6fbad44ae1f33610c80b80d106e067 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sun, 20 Oct 2013 21:51:13 +0200
Subject: remove no longer used ajax.php

---
 lib/plugins/acl/ajax.php | 57 ------------------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 lib/plugins/acl/ajax.php

(limited to 'lib')

diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
deleted file mode 100644
index 10e18af97..000000000
--- a/lib/plugins/acl/ajax.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- */
-
-if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
-require_once(DOKU_INC.'inc/init.php');
-//close session
-session_write_close();
-
-global $conf;
-global $ID;
-global $INPUT;
-
-//fix for Opera XMLHttpRequests
-$postData = http_get_raw_post_data();
-if(!count($_POST) && !empty($postData)){
-    parse_str($postData, $_POST);
-}
-
-if(!auth_isadmin()) die('for admins only');
-if(!checkSecurityToken()) die('CRSF Attack');
-
-$ID    = getID();
-
-/** @var $acl admin_plugin_acl */
-$acl = plugin_load('admin','acl');
-$acl->handle();
-
-$ajax = $INPUT->str('ajax');
-header('Content-Type: text/html; charset=utf-8');
-
-if($ajax == 'info'){
-    $acl->_html_info();
-}elseif($ajax == 'tree'){
-
-    $dir = $conf['datadir'];
-    $ns  = $INPUT->str('ns');
-    if($ns == '*'){
-        $ns ='';
-    }
-    $ns  = cleanID($ns);
-    $lvl = count(explode(':',$ns));
-    $ns  = utf8_encodeFN(str_replace(':','/',$ns));
-
-    $data = $acl->_get_tree($ns,$ns);
-
-    foreach(array_keys($data) as $item){
-        $data[$item]['level'] = $lvl+1;
-    }
-    echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'),
-                        array($acl, '_html_li_acl'));
-}
-
-- 
cgit v1.2.3


From 4d13d89c45c088d6070c4e2da6d5b702f13c77ab Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sun, 20 Oct 2013 21:52:19 +0200
Subject: remove obsolete opera handling and session closing

---
 lib/plugins/acl/action.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 6111aca42..5e186fb61 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -41,18 +41,9 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
         $event->stopPropagation();
         $event->preventDefault();
 
-        //close session
-        session_write_close();
-
         global $ID;
         global $INPUT;
 
-        //fix for Opera XMLHttpRequests
-        $postData = http_get_raw_post_data();
-        if(!count($_POST) && !empty($postData)) {
-            parse_str($postData, $_POST);
-        }
-
         if(!auth_isadmin()) {
             echo 'for admins only';
             return;
@@ -94,4 +85,4 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             );
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 214eb73e2e4c60dc992d61d8736dd9391178d170 Mon Sep 17 00:00:00 2001
From: Jens Hyllegaard 
Date: Mon, 21 Oct 2013 14:20:59 +0200
Subject: translation update

---
 lib/plugins/plugin/lang/da/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/da/lang.php b/lib/plugins/plugin/lang/da/lang.php
index d2751fa1b..07077eaa1 100644
--- a/lib/plugins/plugin/lang/da/lang.php
+++ b/lib/plugins/plugin/lang/da/lang.php
@@ -12,6 +12,7 @@
  * @author rasmus@kinnerup.com
  * @author Michael Pedersen subben@gmail.com
  * @author Mikael Lyngvig 
+ * @author Jens Hyllegaard 
  */
 $lang['menu']                  = 'Håndter udvidelser';
 $lang['download']              = 'Hent og tilføj ny udvidelse';
@@ -23,7 +24,7 @@ $lang['btn_settings']          = 'indstillinger';
 $lang['btn_download']          = 'Hent';
 $lang['btn_enable']            = 'Gem';
 $lang['url']                   = 'URL-adresse';
-$lang['installed']             = 'Tliføjet:';
+$lang['installed']             = 'Tilføjet:';
 $lang['lastupdate']            = 'Sidst opdateret:';
 $lang['source']                = 'Kilde:';
 $lang['unknown']               = 'ukendt';
-- 
cgit v1.2.3


From e4e504c4188ebbe344ed3b6b316137e99f98f642 Mon Sep 17 00:00:00 2001
From: Roy Zahor 
Date: Mon, 21 Oct 2013 14:30:49 +0200
Subject: translation update

---
 lib/plugins/acl/lang/he/lang.php         | 4 ++--
 lib/plugins/plugin/lang/he/lang.php      | 4 ++--
 lib/plugins/popularity/lang/he/lang.php  | 5 +++--
 lib/plugins/revert/lang/he/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/he/lang.php | 5 +++--
 5 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/he/lang.php b/lib/plugins/acl/lang/he/lang.php
index 91025f4b8..6716081eb 100644
--- a/lib/plugins/acl/lang/he/lang.php
+++ b/lib/plugins/acl/lang/he/lang.php
@@ -1,8 +1,8 @@
 
  * @author Dotan Kamber 
  * @author Moshe Kaplan 
diff --git a/lib/plugins/plugin/lang/he/lang.php b/lib/plugins/plugin/lang/he/lang.php
index 47253e335..7753c23cf 100644
--- a/lib/plugins/plugin/lang/he/lang.php
+++ b/lib/plugins/plugin/lang/he/lang.php
@@ -1,8 +1,8 @@
 
  * @author Dotan Kamber 
  * @author Moshe Kaplan 
diff --git a/lib/plugins/popularity/lang/he/lang.php b/lib/plugins/popularity/lang/he/lang.php
index f619127cd..54341636b 100644
--- a/lib/plugins/popularity/lang/he/lang.php
+++ b/lib/plugins/popularity/lang/he/lang.php
@@ -1,7 +1,8 @@
 
  * @author Moshe Kaplan 
  * @author Yaron Yogev 
diff --git a/lib/plugins/revert/lang/he/lang.php b/lib/plugins/revert/lang/he/lang.php
index ac3c3412e..2f49856f5 100644
--- a/lib/plugins/revert/lang/he/lang.php
+++ b/lib/plugins/revert/lang/he/lang.php
@@ -1,7 +1,8 @@
 
  * @author Moshe Kaplan 
  * @author Yaron Yogev 
diff --git a/lib/plugins/usermanager/lang/he/lang.php b/lib/plugins/usermanager/lang/he/lang.php
index 601163013..18202584e 100644
--- a/lib/plugins/usermanager/lang/he/lang.php
+++ b/lib/plugins/usermanager/lang/he/lang.php
@@ -1,7 +1,8 @@
 
  * @author Dotan Kamber 
  * @author Moshe Kaplan 
-- 
cgit v1.2.3


From 48e49553b3ae1dc9624cdd96b34ffe0175ba8ae3 Mon Sep 17 00:00:00 2001
From: Jens Hyllegaard 
Date: Mon, 21 Oct 2013 14:36:35 +0200
Subject: translation update

---
 lib/plugins/authad/lang/da/settings.php    | 10 ++++++++++
 lib/plugins/authldap/lang/da/settings.php  |  9 +++++++++
 lib/plugins/authmysql/lang/da/settings.php | 12 ++++++++++++
 lib/plugins/authpgsql/lang/da/settings.php | 10 ++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/da/settings.php
 create mode 100644 lib/plugins/authmysql/lang/da/settings.php
 create mode 100644 lib/plugins/authpgsql/lang/da/settings.php

(limited to 'lib')

diff --git a/lib/plugins/authad/lang/da/settings.php b/lib/plugins/authad/lang/da/settings.php
index 958c41cf5..f50abf1ce 100644
--- a/lib/plugins/authad/lang/da/settings.php
+++ b/lib/plugins/authad/lang/da/settings.php
@@ -4,7 +4,17 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Soren Birk 
+ * @author Jens Hyllegaard 
  */
+$lang['account_suffix']        = 'Dit konto suffiks. F.eks. @mit.domæne.dk';
+$lang['base_dn']               = 'Dit grund DN. F.eks. DC=mit,DC=domæne,DC=dk';
+$lang['domain_controllers']    = 'En kommasepareret liste over domænecontrollere. F.eks. srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = 'En privilegeret Active Directory bruger med adgang til alle andre brugeres data. Valgfri, men skal bruges til forskellige handlinger såsom at sende abonnement e-mails.';
 $lang['admin_password']        = 'Kodeordet til den ovenstående bruger.';
+$lang['sso']                   = 'Bør Single-Sign-On via Kerberos eller NTLM bruges?';
+$lang['real_primarygroup']     = 'Bør den korrekte primære gruppe findes i stedet for at antage "Domain Users" (langsommere)';
 $lang['use_ssl']               = 'Benyt SSL forbindelse? hvis ja, vælg ikke TLS herunder.';
 $lang['use_tls']               = 'Benyt TLS forbindelse? hvis ja, vælg ikke SSL herover.';
+$lang['debug']                 = 'Vis yderligere debug output ved fejl?';
+$lang['expirywarn']            = 'Dage før brugere skal advares om udløben adgangskode. 0 for at deaktivere.';
+$lang['additional']            = 'En kommasepareret liste over yderligere AD attributter der skal hentes fra brugerdata. Brug af nogen udvidelser.';
diff --git a/lib/plugins/authldap/lang/da/settings.php b/lib/plugins/authldap/lang/da/settings.php
new file mode 100644
index 000000000..a3558aa5c
--- /dev/null
+++ b/lib/plugins/authldap/lang/da/settings.php
@@ -0,0 +1,9 @@
+
+ */
+$lang['server']                = 'Din LDAP server. Enten værtsnavn (localhost) eller fuld kvalificeret URL (ldap://server.tld:389)';
+$lang['debug']                 = 'Vis yderligere debug output ved fejl';
diff --git a/lib/plugins/authmysql/lang/da/settings.php b/lib/plugins/authmysql/lang/da/settings.php
new file mode 100644
index 000000000..207d0ff60
--- /dev/null
+++ b/lib/plugins/authmysql/lang/da/settings.php
@@ -0,0 +1,12 @@
+
+ */
+$lang['server']                = 'Din MySQL server';
+$lang['debug']                 = 'Vis yderligere debug output';
+$lang['debug_o_0']             = 'ingen';
+$lang['debug_o_1']             = 'kun ved fejl';
+$lang['debug_o_2']             = 'alle SQL forespørgsler';
diff --git a/lib/plugins/authpgsql/lang/da/settings.php b/lib/plugins/authpgsql/lang/da/settings.php
new file mode 100644
index 000000000..76c08a734
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/da/settings.php
@@ -0,0 +1,10 @@
+
+ */
+$lang['server']                = 'Din PostgresSQL server';
+$lang['port']                  = 'Din PostgresSQL servers port';
+$lang['debug']                 = 'Vis yderligere debug output';
-- 
cgit v1.2.3


From bbae9436b433e627e9b4f68fdc946357d214b40f Mon Sep 17 00:00:00 2001
From: Jens Hyllegaard 
Date: Mon, 21 Oct 2013 15:00:55 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/da/submitted.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/popularity/lang/da/submitted.txt b/lib/plugins/popularity/lang/da/submitted.txt
index 7d7d5429c..88e9ba060 100644
--- a/lib/plugins/popularity/lang/da/submitted.txt
+++ b/lib/plugins/popularity/lang/da/submitted.txt
@@ -1,3 +1,3 @@
-====== Popularitetsfeeback ======
+====== Popularitetsfeedback ======
 
 Dataene er blevet sendt.
\ No newline at end of file
-- 
cgit v1.2.3


From 21c3090a76ebde3117ae1dcb9f503fe3a61c1c02 Mon Sep 17 00:00:00 2001
From: Christopher Smith 
Date: Mon, 21 Oct 2013 23:32:15 +0100
Subject: replace \s, \S with [ \t], [^ \t] in regexs used with acls

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

(limited to 'lib')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 5ab73670d..b24981d91 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -554,7 +554,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             $line = trim(preg_replace('/#.*$/','',$line)); //ignore comments
             if(!$line) continue;
 
-            $acl = preg_split('/\s+/',$line);
+            $acl = preg_split('/[ \t]+/',$line);
             //0 is pagename, 1 is user, 2 is acl
 
             $acl[1] = rawurldecode($acl[1]);
@@ -701,7 +701,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         $acl_config = file($config_cascade['acl']['default']);
         $acl_user = auth_nameencode($acl_user,true);
 
-        $acl_pattern = '^'.preg_quote($acl_scope,'/').'\s+'.$acl_user.'\s+[0-8].*$';
+        $acl_pattern = '^'.preg_quote($acl_scope,'/').'[ \t]+'.$acl_user.'[ \t]+[0-8].*$';
 
         // save all non!-matching
         $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT);
-- 
cgit v1.2.3


From af2e0360182d7eae880fe2d8804044043e5b8b46 Mon Sep 17 00:00:00 2001
From: Mustafa Aslan 
Date: Tue, 22 Oct 2013 14:25:48 +0200
Subject: translation update

---
 lib/plugins/acl/lang/tr/lang.php         | 4 ++--
 lib/plugins/plugin/lang/tr/lang.php      | 5 +++--
 lib/plugins/popularity/lang/tr/lang.php  | 5 +++--
 lib/plugins/revert/lang/tr/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/tr/lang.php | 5 +++--
 5 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/tr/lang.php b/lib/plugins/acl/lang/tr/lang.php
index 629ca546b..a9699a5f9 100644
--- a/lib/plugins/acl/lang/tr/lang.php
+++ b/lib/plugins/acl/lang/tr/lang.php
@@ -1,8 +1,8 @@
 
  * @author Aydın Coşkuner 
  * @author Cihan Kahveci 
diff --git a/lib/plugins/plugin/lang/tr/lang.php b/lib/plugins/plugin/lang/tr/lang.php
index 9598ade7d..a4feea8cd 100644
--- a/lib/plugins/plugin/lang/tr/lang.php
+++ b/lib/plugins/plugin/lang/tr/lang.php
@@ -1,7 +1,8 @@
 
  * @author Cihan Kahveci 
  * @author Yavuz Selim 
diff --git a/lib/plugins/popularity/lang/tr/lang.php b/lib/plugins/popularity/lang/tr/lang.php
index 5339176bc..696ee38dc 100644
--- a/lib/plugins/popularity/lang/tr/lang.php
+++ b/lib/plugins/popularity/lang/tr/lang.php
@@ -1,7 +1,8 @@
 
  * @author Cihan Kahveci 
  * @author Yavuz Selim 
diff --git a/lib/plugins/revert/lang/tr/lang.php b/lib/plugins/revert/lang/tr/lang.php
index 9030c31e3..52d28c6fa 100644
--- a/lib/plugins/revert/lang/tr/lang.php
+++ b/lib/plugins/revert/lang/tr/lang.php
@@ -1,7 +1,8 @@
 
  * @author Cihan Kahveci 
  * @author Yavuz Selim 
diff --git a/lib/plugins/usermanager/lang/tr/lang.php b/lib/plugins/usermanager/lang/tr/lang.php
index 7ddb7dd5d..6329803a8 100644
--- a/lib/plugins/usermanager/lang/tr/lang.php
+++ b/lib/plugins/usermanager/lang/tr/lang.php
@@ -1,7 +1,8 @@
 
  * @author Cihan Kahveci 
  * @author Yavuz Selim 
-- 
cgit v1.2.3


From 57b3faf82ad2686f1ecd0678266a38a24fd23736 Mon Sep 17 00:00:00 2001
From: lainme 
Date: Tue, 22 Oct 2013 14:31:02 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/zh/settings.php  | 4 ++++
 lib/plugins/usermanager/lang/zh/import.txt | 7 +++++++
 lib/plugins/usermanager/lang/zh/lang.php   | 4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/zh/import.txt

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index b531c192a..77c2c6952 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -20,3 +20,7 @@ $lang['userscope']             = '限制用户搜索的范围';
 $lang['groupscope']            = '限制组搜索的范围';
 $lang['groupkey']              = '根据任何用户属性得来的组成员(而不是标准的 AD 组)，例如根据部门或者电话号码得到的组。';
 $lang['debug']                 = '有错误时显示额外的调试信息';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/usermanager/lang/zh/import.txt b/lib/plugins/usermanager/lang/zh/import.txt
new file mode 100644
index 000000000..eacce5a77
--- /dev/null
+++ b/lib/plugins/usermanager/lang/zh/import.txt
@@ -0,0 +1,7 @@
+===== 批量导入用户 =====
+
+需要至少有 4 列的 CSV 格式用户列表文件。列必须按顺序包括：用户ID、全名、电子邮件地址和组。
+CSV 域需要用逗号 (,) 分隔，字符串用英文双引号 ("") 分开。反斜杠可以用来转义。
+可以尝试上面的“导入用户”功能来查看示例文件。重复的用户ID将被忽略。
+
+密码生成后会通过电子邮件发送给每个成功导入的用户。
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index 06656110f..25eb1a294 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -68,7 +68,11 @@ $lang['import_userlistcsv']    = '用户列表文件（CSV）';
 $lang['import_header']         = '最近一次导入 - 失败';
 $lang['import_success_count']  = '用户导入：找到了 %d 个用户，%d 个用户被成功导入。';
 $lang['import_failure_count']  = '用户导入：%d 个用户导入失败。下面列出了失败的用户。';
+$lang['import_error_fields']   = '域的数目不足，发现 %d 个，需要 4 个。';
 $lang['import_error_baduserid'] = '用户ID丢失';
 $lang['import_error_badname']  = '名称错误';
 $lang['import_error_badmail']  = '邮件地址错误';
+$lang['import_error_upload']   = '导入失败。CSV 文件无法上传或是空的。';
+$lang['import_error_readfail'] = '导入失败。无法读取上传的文件。';
 $lang['import_error_create']   = '不能创建新用户';
+$lang['import_notify_fail']    = '通知消息无法发送到导入的用户 %s，电子邮件地址是 %s。';
-- 
cgit v1.2.3


From d34a2a38603431bc5caa74b726a6f58d86a70530 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Tue, 22 Oct 2013 21:45:37 +0200
Subject: allow charset for SSO to be configured FS#2148

---
 lib/plugins/authad/auth.php             | 26 +++++++++++++++++---------
 lib/plugins/authad/conf/default.php     |  1 +
 lib/plugins/authad/conf/metadata.php    |  1 +
 lib/plugins/authad/lang/en/settings.php |  3 ++-
 4 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index fcbd2eeef..e1d758fb8 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -92,16 +92,24 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         }
 
         // Prepare SSO
-        if(!utf8_check($_SERVER['REMOTE_USER'])) {
-            $_SERVER['REMOTE_USER'] = utf8_encode($_SERVER['REMOTE_USER']);
-        }
-        if($_SERVER['REMOTE_USER'] && $this->conf['sso']) {
-            $_SERVER['REMOTE_USER'] = $this->cleanUser($_SERVER['REMOTE_USER']);
+        if(!empty($_SERVER['REMOTE_USER'])) {
+
+            // make sure the right encoding is used
+            if($this->getConf('sso_charset')) {
+                $_SERVER['REMOTE_USER'] = iconv($this->getConf('sso_charset'), 'UTF-8', $_SERVER['REMOTE_USER']);
+            } elseif(!utf8_check($_SERVER['REMOTE_USER'])) {
+                $_SERVER['REMOTE_USER'] = utf8_encode($_SERVER['REMOTE_USER']);
+            }
 
-            // we need to simulate a login
-            if(empty($_COOKIE[DOKU_COOKIE])) {
-                $INPUT->set('u', $_SERVER['REMOTE_USER']);
-                $INPUT->set('p', 'sso_only');
+            // trust the incoming user
+            if($this->conf['sso']) {
+                $_SERVER['REMOTE_USER'] = $this->cleanUser($_SERVER['REMOTE_USER']);
+
+                // we need to simulate a login
+                if(empty($_COOKIE[DOKU_COOKIE])) {
+                    $INPUT->set('u', $_SERVER['REMOTE_USER']);
+                    $INPUT->set('p', 'sso_only');
+                }
             }
         }
 
diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php
index f71202cfc..6fb4c9145 100644
--- a/lib/plugins/authad/conf/default.php
+++ b/lib/plugins/authad/conf/default.php
@@ -4,6 +4,7 @@ $conf['account_suffix']     = '';
 $conf['base_dn']            = '';
 $conf['domain_controllers'] = '';
 $conf['sso']                = 0;
+$conf['sso_charset']        = '';
 $conf['admin_username']     = '';
 $conf['admin_password']     = '';
 $conf['real_primarygroup']  = 0;
diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php
index 7b4f895d0..560d25315 100644
--- a/lib/plugins/authad/conf/metadata.php
+++ b/lib/plugins/authad/conf/metadata.php
@@ -4,6 +4,7 @@ $meta['account_suffix']     = array('string','_caution' => 'danger');
 $meta['base_dn']            = array('string','_caution' => 'danger');
 $meta['domain_controllers'] = array('string','_caution' => 'danger');
 $meta['sso']                = array('onoff','_caution' => 'danger');
+$meta['sso_charset']        = array('string','_caution' => 'danger');
 $meta['admin_username']     = array('string','_caution' => 'danger');
 $meta['admin_password']     = array('password','_caution' => 'danger');
 $meta['real_primarygroup']  = array('onoff','_caution' => 'danger');
diff --git a/lib/plugins/authad/lang/en/settings.php b/lib/plugins/authad/lang/en/settings.php
index aff49550b..92e9ac4e8 100644
--- a/lib/plugins/authad/lang/en/settings.php
+++ b/lib/plugins/authad/lang/en/settings.php
@@ -6,7 +6,8 @@ $lang['domain_controllers'] = 'A comma separated list of Domain controllers. Eg.
 $lang['admin_username']     = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.';
 $lang['admin_password']     = 'The password of the above user.';
 $lang['sso']                = 'Should Single-Sign-On via Kerberos or NTLM be used?';
-$lang['real_primarygroup']  = 'Should the real primary group be resolved instead of assuming "Domain Users" (slower)';
+$lang['sso_charset']        = 'The charset your webserver will pass the Kerberos or NTLM username in. Empty for UTF-8 or latin-1. Requires the iconv extension.';
+$lang['real_primarygroup']  = 'Should the real primary group be resolved instead of assuming "Domain Users" (slower).';
 $lang['use_ssl']            = 'Use SSL connection? If used, do not enable TLS below.';
 $lang['use_tls']            = 'Use TLS connection? If used, do not enable SSL above.';
 $lang['debug']              = 'Display additional debugging output on errors?';
-- 
cgit v1.2.3


From 269e961b5d395674d18eb2bd82814b2620c05c19 Mon Sep 17 00:00:00 2001
From: Remon 
Date: Fri, 25 Oct 2013 14:00:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/nl/lang.php           |  3 ++-
 lib/plugins/authad/lang/nl/settings.php    | 11 ++++----
 lib/plugins/authldap/lang/nl/settings.php  | 11 ++++----
 lib/plugins/authmysql/lang/nl/settings.php | 41 +++++++++++++++---------------
 lib/plugins/authpgsql/lang/nl/settings.php | 37 ++++++++++++++-------------
 lib/plugins/plugin/lang/nl/lang.php        |  7 ++---
 lib/plugins/popularity/lang/nl/lang.php    |  5 ++--
 lib/plugins/revert/lang/nl/lang.php        |  3 ++-
 lib/plugins/usermanager/lang/nl/import.txt |  2 +-
 9 files changed, 64 insertions(+), 56 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index c3850a86a..abb81ae06 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -20,6 +20,7 @@
  * @author Ricardo Guijt 
  * @author Gerrit 
  * @author Gerrit Uitslag 
+ * @author Remon 
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
@@ -38,7 +39,7 @@ $lang['p_inherited']           = 'Let op: Deze permissies zijn niet expliciet in
 $lang['p_isadmin']             = 'Let op: De geselecteerde groep of gebruiker heeft altijd volledige toegangsrechten omdat hij als superuser geconfigureerd is.';
 $lang['p_include']             = 'Hogere permissies bevatten ook de lagere. Aanmaken, uploaden en verwijderen gelden alleen voor namespaces, niet voor pagina\'s.';
 $lang['current']               = 'Huidige ACL regels';
-$lang['where']                 = 'Pagina/namespace';
+$lang['where']                 = 'Pagina/Namespace';
 $lang['who']                   = 'Gebruiker/Groep';
 $lang['perm']                  = 'Bevoegdheden';
 $lang['acl_perm0']             = 'Geen';
diff --git a/lib/plugins/authad/lang/nl/settings.php b/lib/plugins/authad/lang/nl/settings.php
index 8f5c84043..69d67be9a 100644
--- a/lib/plugins/authad/lang/nl/settings.php
+++ b/lib/plugins/authad/lang/nl/settings.php
@@ -3,16 +3,17 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
+ * @author Remon 
  */
 $lang['account_suffix']        = 'Je account domeinnaam. Bijv @mijn.domein.org';
 $lang['base_dn']               = 'Je basis DN. Bijv. DC=mijn,DC=domein,DC=org';
-$lang['domain_controllers']    = 'Eeen commagesepareerde lijst van domeinservers. Bijv. srv1.domein.org,srv2.domein.org';
-$lang['admin_username']        = 'Een geprivilegeerde Active Directory gebruiker die bij alle gebruikersgegevens kan komen. Optioneel, maar kan nodig zijn voor bepaalde acties, zoals het versturen van abonnementsmailtjes.';
-$lang['admin_password']        = 'Het wachtwoord van bovernvermelde gebruiker.';
+$lang['domain_controllers']    = 'Eeen kommagescheiden lijst van domeinservers. Bijv. srv1.domein.org,srv2.domein.org';
+$lang['admin_username']        = 'Een geprivilegeerde Active Directory gebruiker die bij alle gebruikersgegevens kan komen. Dit is optioneel maar kan nodig zijn voor bepaalde acties, zoals het versturen van abonnementsmailtjes.';
+$lang['admin_password']        = 'Het wachtwoord van bovenstaande gebruiker.';
 $lang['sso']                   = 'Wordt voor Single-Sign-on Kerberos of NTLM gebruikt?';
 $lang['real_primarygroup']     = 'Moet de echte primaire groep worden opgezocht in plaats van het aannemen van "Domeingebruikers" (langzamer)';
-$lang['use_ssl']               = 'SSL verbinding gebruiken? Zo ja, gebruik dan TLS hieronder niet.';
+$lang['use_ssl']               = 'SSL verbinding gebruiken? Zo ja, activeer dan niet de TLS optie hieronder.';
 $lang['use_tls']               = 'TLS verbinding gebruiken? Zo ja, activeer dan niet de SSL verbinding hierboven.';
 $lang['debug']                 = 'Aanvullende debug informatie tonen bij fouten?';
 $lang['expirywarn']            = 'Waarschuwingstermijn voor vervallen wachtwoord. 0 om te deactiveren.';
-$lang['additional']            = 'Commagesepareerde lijst van aanvullend uit AD op te halen attributen. Gebruikt door sommige plugins.';
+$lang['additional']            = 'Een kommagescheiden lijst van extra AD attributen van de gebruiker. Wordt gebruikt door sommige plugins.';
diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index b6eed6f38..193d1a386 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -4,16 +4,17 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Gerrit Uitslag 
+ * @author Remon 
  */
-$lang['server']                = 'Je LDAP server. Ofwel servernaam (localhost) of volledige URL (ldap://server.tld:389)';
-$lang['port']                  = 'LDAP server poort als hiervoor geen volledige URL is opgegeven';
+$lang['server']                = 'Je LDAP server. Of de servernaam (localhost) of de volledige URL (ldap://server.tld:389)';
+$lang['port']                  = 'LDAP server poort als bij de entry hierboven geen volledige URL is opgegeven';
 $lang['usertree']              = 'Locatie van de gebruikersaccounts. Bijv. ou=Personen,dc=server,dc=tld';
 $lang['grouptree']             = 'Locatie van de gebruikersgroepen. Bijv. ou=Group,dc=server,dc=tld';
 $lang['userfilter']            = 'LDAP gebruikersfilter. Bijv. (&(uid=%{user})(objectClass=posixAccount))';
 $lang['groupfilter']           = 'LDAP groepsfilter. Bijv. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
-$lang['version']               = 'Te gebruiken protocolversie. Je zou het moeten kunnen instellen op 3';
-$lang['starttls']              = 'Gebruiken TLS verbindingen';
-$lang['referrals']             = 'Moeten verwijzingen worden gevolg';
+$lang['version']               = 'Te gebruiken protocolversie. Mogelijk dat dit ingesteld moet worden op 3';
+$lang['starttls']              = 'Gebruik maken van TLS verbindingen?';
+$lang['referrals']             = 'Moeten verwijzingen worden gevolgd?';
 $lang['deref']                 = 'Hoe moeten de verwijzing van aliases worden bepaald?';
 $lang['binddn']                = 'DN van een optionele bind gebruiker als anonieme bind niet genoeg is. Bijv. cn=beheer, dc=mijn, dc=thuis';
 $lang['bindpw']                = 'Wachtwoord van bovenstaande gebruiker';
diff --git a/lib/plugins/authmysql/lang/nl/settings.php b/lib/plugins/authmysql/lang/nl/settings.php
index 39fa32112..9848f2019 100644
--- a/lib/plugins/authmysql/lang/nl/settings.php
+++ b/lib/plugins/authmysql/lang/nl/settings.php
@@ -3,38 +3,39 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
+ * @author Remon 
  */
-$lang['server']                = 'Je MySQL server';
+$lang['server']                = 'De MySQL server';
 $lang['user']                  = 'MySql gebruikersnaam';
 $lang['password']              = 'Wachtwoord van bovenstaande gebruiker';
 $lang['database']              = 'Te gebruiken database';
 $lang['charset']               = 'Tekenset voor database';
 $lang['debug']                 = 'Tonen aanvullende debuginformatie';
 $lang['forwardClearPass']      = 'Wachtwoorden als leesbare tekst in SQL commando\'s opnemen in plaats van versleutelde tekens';
-$lang['TablesToLock']          = 'Commagesepareerde lijst van tabellen die gelocked moeten worden bij schrijfacties';
-$lang['checkPass']             = 'SQL commando voor verifiëren van wachtwoorden';
-$lang['getUserInfo']           = 'SQL commando voor ophalen gebruikersinformatie';
-$lang['getGroups']             = 'SQL commando voor ophalen groepslidmaatschappen';
-$lang['getUsers']              = 'SQL commando voor tonen alle gebruikers';
-$lang['FilterLogin']           = 'SQL clausule voor filteren gebruikers op inlognaam';
-$lang['FilterName']            = 'SQL clausule voor filteren gebruikers op volledige naam';
-$lang['FilterEmail']           = 'SQL clausule voor filteren gebruikers op e-mailadres';
-$lang['FilterGroup']           = 'SQL clausule voor filteren gebruikers op groepslidmaatschap';
-$lang['SortOrder']             = 'SQL clausule voor sorteren gebruikers';
-$lang['addUser']               = 'SQL commando om een gebruiker toe te voegen';
-$lang['addGroup']              = 'SQL commando om een groep toe te voegen';
-$lang['addUserGroup']          = 'SQL commando om een gebruiker aan een groep toe te voegen';
+$lang['TablesToLock']          = 'Kommagescheiden lijst van tabellen die gelocked moeten worden bij schrijfacties';
+$lang['checkPass']             = 'SQL commando voor het verifiëren van wachtwoorden';
+$lang['getUserInfo']           = 'SQL commando voor het ophalen van gebruikersinformatie';
+$lang['getGroups']             = 'SQL commando voor het ophalen van groepslidmaatschappen';
+$lang['getUsers']              = 'SQL commando voor het tonen van alle gebruikers';
+$lang['FilterLogin']           = 'SQL clausule voor het filteren van gebruikers op inlognaam';
+$lang['FilterName']            = 'SQL clausule voor het filteren van gebruikers op volledige naam';
+$lang['FilterEmail']           = 'SQL clausule voor het filteren van gebruikers op e-mailadres';
+$lang['FilterGroup']           = 'SQL clausule voor het filteren van gebruikers op groepslidmaatschap';
+$lang['SortOrder']             = 'SQL clausule voor het sorteren van gebruikers';
+$lang['addUser']               = 'SQL commando om een nieuwe gebruiker toe te voegen';
+$lang['addGroup']              = 'SQL commando om een nieuwe groep toe te voegen';
+$lang['addUserGroup']          = 'SQL commando om een gebruiker aan een bestaande groep toe te voegen';
 $lang['delGroup']              = 'SQL commando om een groep te verwijderen';
 $lang['getUserID']             = 'SQL commando om de de primaire sleutel van een gebruiker op te halen';
 $lang['delUser']               = 'SQL commando om een gebruiker te verwijderen';
 $lang['delUserRefs']           = 'SQL commando om een gebruiker uit alle groepen te verwijderen';
 $lang['updateUser']            = 'SQL commando om een gebruikersprofiel bij te werken';
-$lang['UpdateLogin']           = 'Bijwerkcommando om een inlognaam bij te werken';
-$lang['UpdatePass']            = 'Bijwerkcommando om een wachtwoord bij te werken';
-$lang['UpdateEmail']           = 'Bijwerkcommando om een e-mailadres bij te werken';
-$lang['UpdateName']            = 'Bijwerkcommando om een volledige naam te werken';
-$lang['UpdateTarget']          = 'Beperkingsclausule om gebruiker te identificeren voor bijwerken';
-$lang['delUserGroup']          = 'SQL commando om een gebruiker uit een bepaalde te verwijderen';
+$lang['UpdateLogin']           = 'Bijwerkcommando om de inlognaam van de gebruiker bij te werken';
+$lang['UpdatePass']            = 'Bijwerkcommando om het wachtwoord van de gebruiker bij te werken';
+$lang['UpdateEmail']           = 'Bijwerkcommando om het e-mailadres van de gebruiker bij te werken';
+$lang['UpdateName']            = 'Bijwerkcommando om de volledige naam van de gebruiker bij te werken';
+$lang['UpdateTarget']          = 'Beperkingsclausule om de gebruiker te identificeren voor bijwerken';
+$lang['delUserGroup']          = 'SQL commando om een gebruiker uit een bepaalde groep te verwijderen';
 $lang['getGroupID']            = 'SQL commando om de primaire sletel van een bepaalde groep op te halen';
 $lang['debug_o_0']             = 'geen';
 $lang['debug_o_1']             = 'alleen bij fouten';
diff --git a/lib/plugins/authpgsql/lang/nl/settings.php b/lib/plugins/authpgsql/lang/nl/settings.php
index 496017f1c..3faa78705 100644
--- a/lib/plugins/authpgsql/lang/nl/settings.php
+++ b/lib/plugins/authpgsql/lang/nl/settings.php
@@ -3,35 +3,36 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
+ * @author Remon 
  */
-$lang['server']                = 'Je PostgrSQL server';
+$lang['server']                = 'Je PostgreSQL server';
 $lang['port']                  = 'Je PostgreSQL server poort';
-$lang['user']                  = 'PostgrSQL gebruikersnaam';
+$lang['user']                  = 'PostgreSQL gebruikersnaam';
 $lang['password']              = 'Wachtwoord voor bovenstaande gebruiker';
 $lang['database']              = 'Te gebruiken database';
 $lang['debug']                 = 'Tonen aanvullende debuginformatie';
-$lang['forwardClearPass']      = 'Wachtwoorden als leesbare tekst in SQL commando\'s opnemen in plaats van versleutelde tekens';
-$lang['checkPass']             = 'SQL commando voor verifiëren wachtwoorden';
-$lang['getUserInfo']           = 'SQL commando voor ophalen gebruikersinformatie';
-$lang['getGroups']             = 'SQL commando voor ophalen groepslidmaatschappen van gebruikers';
-$lang['getUsers']              = 'SQL commando voor tonen alle gebruikers';
-$lang['FilterLogin']           = 'SQL commando voor filteren gebruikers op inlognaam';
-$lang['FilterName']            = 'SQL commando voor filteren gebruikers op volledige naam';
-$lang['FilterEmail']           = 'SQL commando voor filteren gebruikers op e-mailadres';
-$lang['FilterGroup']           = 'SQL commando voor filteren gebruikers op groepslidmaatschap';
-$lang['SortOrder']             = 'SQL commando voor sorteren gebruikers';
-$lang['addUser']               = 'SQL commando voor toevoegen nieuwe gebruiker';
-$lang['addGroup']              = 'SQL commando voor toevoegen nieuwe groep';
-$lang['addUserGroup']          = 'SQL commando voor toevoegen gebruiker aan bestaande groep';
-$lang['delGroup']              = 'SQL commando voor verwijderen groep';
+$lang['forwardClearPass']      = 'Wachtwoorden als leesbare tekst in SQL commando\'s opnemen in plaats van versleuteld';
+$lang['checkPass']             = 'SQL commando voor het verifiëren van wachtwoorden';
+$lang['getUserInfo']           = 'SQL commando voor het ophalen van gebruikersinformatie';
+$lang['getGroups']             = 'SQL commando voor het ophalen van groepslidmaatschappen van gebruikers';
+$lang['getUsers']              = 'SQL commando voor het tonen van alle gebruikers';
+$lang['FilterLogin']           = 'SQL commando voor het filteren van gebruikers op inlognaam';
+$lang['FilterName']            = 'SQL commando voor het filteren van gebruikers op volledige naam';
+$lang['FilterEmail']           = 'SQL commando voor het filteren van gebruikers op e-mailadres';
+$lang['FilterGroup']           = 'SQL commando voor het filteren van gebruikers op groepslidmaatschap';
+$lang['SortOrder']             = 'SQL commando voor het sorteren van gebruikers';
+$lang['addUser']               = 'SQL commando voor het toevoegen van een nieuwe gebruiker';
+$lang['addGroup']              = 'SQL commando voor het toevoegen van een nieuwe groep';
+$lang['addUserGroup']          = 'SQL commando voor toevoegen van een gebruiker aan een bestaande groep';
+$lang['delGroup']              = 'SQL commando voor het verwijderen van een groep';
 $lang['getUserID']             = 'SQL commando om de primaire sleutel van een gebruiker op te halen';
-$lang['delUser']               = 'SQL commando voor verwijderen gebruiker';
+$lang['delUser']               = 'SQL commando voor het verwijderen van een gebruiker';
 $lang['delUserRefs']           = 'SQL commando om een gebruiker uit alle groepen te verwijderen';
 $lang['updateUser']            = 'SQL commando om een gebruikersprofiel bij te werken';
 $lang['UpdateLogin']           = 'SQL commando om een inlognaam bij te werken';
 $lang['UpdatePass']            = 'SQL commando om een wachtwoord bij te werken';
 $lang['UpdateEmail']           = 'SQL commando om een e-mailadres bij te werken';
 $lang['UpdateName']            = 'SQL commando om een volledige naam bij te werken';
-$lang['UpdateTarget']          = 'Beperkingsclausule om gebruiker te identificeren voor bijwerken';
+$lang['UpdateTarget']          = 'Beperkingsclausule om de gebruiker te identificeren bij het bijwerken';
 $lang['delUserGroup']          = 'SQL commando om een gebruiker uit een bepaalde groep te verwijderen';
 $lang['getGroupID']            = 'SQL commando om de primaire sleutel van een bepaalde groep op te halen';
diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php
index 1317e44f2..2836c7030 100644
--- a/lib/plugins/plugin/lang/nl/lang.php
+++ b/lib/plugins/plugin/lang/nl/lang.php
@@ -15,6 +15,7 @@
  * @author Jeroen
  * @author Ricardo Guijt 
  * @author Gerrit 
+ * @author Remon 
  */
 $lang['menu']                  = 'Plugins beheren';
 $lang['download']              = 'Download en installeer een nieuwe plugin';
@@ -36,7 +37,7 @@ $lang['updates']               = 'De volgende plugins zijn succesvol bijgewerkt'
 $lang['update_none']           = 'Geen updates gevonden.';
 $lang['deleting']              = 'Verwijderen ...';
 $lang['deleted']               = 'Plugin %s verwijderd.';
-$lang['downloading']           = 'Downloaden ...';
+$lang['downloading']           = 'Bezig met downloaden ...';
 $lang['downloaded']            = 'Plugin %s succesvol geïnstalleerd';
 $lang['downloads']             = 'De volgende plugins zijn succesvol geïnstalleerd:';
 $lang['download_none']         = 'Geen plugins gevonden, of er is een onbekende fout opgetreden tijdens het downloaden en installeren.';
@@ -51,10 +52,10 @@ $lang['author']                = 'Auteur:';
 $lang['www']                   = 'Weblocatie:';
 $lang['error']                 = 'Er is een onbekende fout opgetreden.';
 $lang['error_download']        = 'Kan het volgende plugin bestand niet downloaden: %s';
-$lang['error_badurl']          = 'Vermoedelijk onjuiste url - kan de filename niet uit de url afleiden';
+$lang['error_badurl']          = 'Vermoedelijk onjuiste url - kan de bestandsnaam niet uit de url afleiden';
 $lang['error_dircreate']       = 'Kan geen tijdelijke directory aanmaken voor de download';
 $lang['error_decompress']      = 'De pluginmanager kan het gedownloade bestand niet uitpakken. Dit kan het resultaat zijn van een mislukte download: probeer het opnieuw; of het compressieformaat is onbekend: in dat geval moet je de plugin handmatig downloaden en installeren.';
-$lang['error_copy']            = 'Er was een probleem met het kopiëren van een bestand tijdens de installatie van plugin %s: de schijf kan vol zijn of onjuiste toegangsrechten hebben. Dit kan tot gevolg hebben dat de plugin slechts gedeeltelijk geïnstalleerd is en kan uw wiki onstabiel maken.';
+$lang['error_copy']            = 'Er was een probleem met het kopiëren van een bestand tijdens de installatie van plugin %s: de schijf kan vol zijn of onjuiste toegangsrechten hebben. Dit kan tot gevolg hebben dat de plugin slechts gedeeltelijk geïnstalleerd is en kan de wiki onstabiel maken.';
 $lang['error_delete']          = 'Er is een probleem opgetreden tijdens het verwijderen van plugin %s. De meest voorkomende oorzaak is onjuiste toegangsrechten op bestanden of directory\'s.';
 $lang['enabled']               = 'Plugin %s ingeschakeld.';
 $lang['notenabled']            = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.';
diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php
index dda4a1d7f..6ffa71e82 100644
--- a/lib/plugins/popularity/lang/nl/lang.php
+++ b/lib/plugins/popularity/lang/nl/lang.php
@@ -14,11 +14,12 @@
  * @author Jeroen
  * @author Ricardo Guijt 
  * @author Gerrit 
+ * @author Remon 
  */
 $lang['name']                  = 'Populariteitsfeedback (kan even duren om in te laden)';
-$lang['submit']                = 'Verstuur';
+$lang['submit']                = 'Verstuur gegevens';
 $lang['autosubmit']            = 'Gegevens automatisch maandelijks verzenden';
-$lang['submissionFailed']      = 'De gegevens konden niet verstuurd worden vanwege de volgende fouten:';
+$lang['submissionFailed']      = 'De gegevens konden niet verstuurd worden vanwege de volgende fout:';
 $lang['submitDirectly']        = 'Je kan de gegevens handmatig sturen door het onderstaande formulier te verzenden.';
 $lang['autosubmitError']       = 'De laatste automatische verzending is mislukt vanwege de volgende fout:';
 $lang['lastSent']              = 'De gegevens zijn verstuurd.';
diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php
index 882675b81..ee8678e63 100644
--- a/lib/plugins/revert/lang/nl/lang.php
+++ b/lib/plugins/revert/lang/nl/lang.php
@@ -15,13 +15,14 @@
  * @author Jeroen
  * @author Ricardo Guijt 
  * @author Gerrit 
+ * @author Remon 
  */
 $lang['menu']                  = 'Herstelmanager';
 $lang['filter']                = 'Zoek naar bekladde pagina\'s';
 $lang['revert']                = 'Herstel geselecteerde pagina\'s';
 $lang['reverted']              = '%s hersteld naar revisie %s';
 $lang['removed']               = '%s verwijderd';
-$lang['revstart']              = 'Herstelproces begonnen. Dit kan een lange tijd duren. Als het script een timeout genereerd voor het klaar is, moet je in kleinere selecties herstellen.';
+$lang['revstart']              = 'Herstelproces is begonnen. Dit kan een lange tijd duren. Als het script een timeout genereert voor het klaar is, moet je in kleinere delen herstellen.';
 $lang['revstop']               = 'Herstelproces succesvol afgerond.';
 $lang['note1']                 = 'NB: deze zoekopdracht is hoofdlettergevoelig';
 $lang['note2']                 = 'NB: de pagina zal hersteld worden naar de laatste versie waar de opgegeven spam-term %s niet op voorkomt.';
diff --git a/lib/plugins/usermanager/lang/nl/import.txt b/lib/plugins/usermanager/lang/nl/import.txt
index 69d2c2306..267891098 100644
--- a/lib/plugins/usermanager/lang/nl/import.txt
+++ b/lib/plugins/usermanager/lang/nl/import.txt
@@ -1,7 +1,7 @@
 ===== Massa-import van gebruikers =====
 
 Hiervoor is een CSV-bestand nodig van de gebruikers met minstens vier kolommen. De kolommen moeten bevatten, in deze volgorde: gebruikers-id, complete naam, e-mailadres en groepen.
-Het CSV-velden moeten worden gescheiden met komma's (,) en de teksten moeten worden omringt met dubbele aanhalingstekens (""). Backslash (\) kan worden gebruikt om te escapen.
+Het CSV-velden moeten worden gescheiden met komma's (,) en de teksten moeten worden omringd met dubbele aanhalingstekens (""). Backslash (\) kan worden gebruikt om te escapen.
 Voor een voorbeeld van een werkend bestand, probeer de "Exporteer Gebruikers" functie hierboven.
 Dubbele gebruikers-id's zullen worden genegeerd.
 
-- 
cgit v1.2.3


From c3d02ebb91843d2fbaaea8acf3079add3fa77f8a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag 
Date: Sun, 27 Oct 2013 13:26:03 +0100
Subject: Fix issues from teams:i18n:translation-check in localizations

---
 lib/plugins/authldap/lang/cs/settings.php    | 2 +-
 lib/plugins/config/lang/de-informal/lang.php | 1 -
 lib/plugins/config/lang/de/lang.php          | 1 -
 lib/plugins/config/lang/pt-br/lang.php       | 1 -
 lib/plugins/usermanager/lang/cs/lang.php     | 2 +-
 5 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/authldap/lang/cs/settings.php b/lib/plugins/authldap/lang/cs/settings.php
index b2b5b59dc..20491f1fb 100644
--- a/lib/plugins/authldap/lang/cs/settings.php
+++ b/lib/plugins/authldap/lang/cs/settings.php
@@ -10,7 +10,7 @@ $lang['port']                  = 'Port serveru LDAP. Pokud není, bude využito
 $lang['usertree']              = 'Kde najít uživatelské účty, tj. ou=Lide, dc=server, dc=tld';
 $lang['grouptree']             = 'Kde najít uživatelské skupiny, tj. ou=Skupina, dc=server, dc=tld';
 $lang['userfilter']            = 'Filter LDAPu pro vyhledávání uživatelských účtů, tj. (&(uid=%{user})(objectClass=posixAccount))';
-$lang['groupfilter']           = 'Filter LDAPu pro vyhledávání uživatelských skupin, tj. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'Filter LDAPu pro vyhledávání uživatelských skupin, tj. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
 $lang['version']               = 'Verze použitého protokolu. Můžete potřebovat jej nastavit na 3';
 $lang['starttls']              = 'Využít spojení TLS?';
 $lang['referrals']             = 'Přeposílat odkazy?';
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 598c1a72d..7a17ace4a 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -108,7 +108,6 @@ $lang['target____media']       = 'Zielfenstername für Medienlinks';
 $lang['target____windows']     = 'Zielfenstername für Windows-Freigaben-Links';
 $lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
-$lang['refshow']               = 'Wie viele Verwendungsorte der Media-Datei zeigen';
 $lang['gdlib']                 = 'GD Lib Version';
 $lang['im_convert']            = 'Pfad zu ImageMagicks-Konvertierwerkzeug';
 $lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index 07eb4a750..e55081a91 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -76,7 +76,6 @@ $lang['camelcase']             = 'CamelCase-Verlinkungen verwenden';
 $lang['deaccent']              = 'Seitennamen bereinigen';
 $lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
 $lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
-$lang['refshow']               = 'Wie viele Verwendungsorte der Media-Datei zeigen';
 $lang['allowdebug']            = 'Debug-Ausgaben erlauben Abschalten wenn nicht benötigt!';
 $lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
 $lang['usewordblock']          = 'Spam-Blocking benutzen';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index ee1447b4e..795ee81c0 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -114,7 +114,6 @@ $lang['target____media']       = 'Parâmetro "target" para links de mídia';
 $lang['target____windows']     = 'Parâmetro "target" para links do Windows';
 $lang['mediarevisions']        = 'Habilitar revisões de mídias?';
 $lang['refcheck']              = 'Verificação de referência da mídia';
-$lang['refshow']               = 'Número de referências de mídia a exibir';
 $lang['gdlib']                 = 'Versão da biblioteca "GD Lib"';
 $lang['im_convert']            = 'Caminho para a ferramenta de conversão ImageMagick';
 $lang['jpg_quality']           = 'Qualidade de compressão do JPG (0-100)';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index b2c736e09..bbb560679 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -62,7 +62,7 @@ $lang['add_ok']                = 'Uživatel úspěšně vytvořen';
 $lang['add_fail']              = 'Vytvoření uživatele selhalo';
 $lang['notify_ok']             = 'Odeslán mail s upozorněním';
 $lang['notify_fail']           = 'Mail s upozorněním nebylo možno odeslat';
-$lang['import_success_count']  = 'Import uživatelů: nalezeno %s uživatelů, %d úspěšně importováno.';
+$lang['import_success_count']  = 'Import uživatelů: nalezeno %d uživatelů, %d úspěšně importováno.';
 $lang['import_failure_count']  = 'Import uživatelů: %d selhalo. Seznam chybných je níže.';
 $lang['import_error_fields']   = 'Nedostatek položek, nalezena/y %d, požadovány 4.';
 $lang['import_error_baduserid'] = 'Chybí User-id';
-- 
cgit v1.2.3


From e82704a003f35c4e6b6b94746e9c408b22d7d229 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Mon, 28 Oct 2013 20:04:59 +0100
Subject: fixed strict violation in ACL plugin

---
 lib/plugins/acl/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 5e186fb61..a7226f598 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -20,7 +20,7 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
      */
-    public function register(Doku_Event_Handler &$controller) {
+    public function register(Doku_Event_Handler $controller) {
 
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax_call_acl');
 
-- 
cgit v1.2.3