diff options
Diffstat (limited to 'lib')
117 files changed, 293 insertions, 152 deletions
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index f8d62cb57..3d1584244 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -6,11 +6,6 @@ * @author Andreas Gohr <andi@splitbrain.org> */ -//fix for Opera XMLHttpRequests -if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ - parse_str($HTTP_RAW_POST_DATA, $_POST); -} - if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); require_once(DOKU_INC.'inc/init.php'); //close session @@ -54,6 +49,8 @@ function ajax_qsearch(){ if(empty($query)) $query = $_GET['q']; if(empty($query)) return; + $query = urldecode($query); + $data = ft_pageLookup($query, true, useHeading('navigation')); if(!count($data)) return; @@ -257,7 +254,7 @@ function ajax_mediaupload(){ $id = $_GET['qqfile']; } - $id = cleanID($id, false, true); + $id = cleanID($id); $NS = $_REQUEST['ns']; $ns = $NS.':'.getNS($id); diff --git a/lib/exe/css.php b/lib/exe/css.php index d54e2e46c..69b512205 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -41,8 +41,8 @@ function css_out(){ $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/'; $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/'; }else{ - $tplinc = DOKU_TPLINC; - $tpldir = DOKU_TPL; + $tplinc = tpl_incdir(); + $tpldir = tpl_basedir(); } // The generated script depends on some dynamic options diff --git a/lib/exe/js.php b/lib/exe/js.php index b7f2fd222..4b72014b2 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -32,8 +32,8 @@ function js_out(){ global $config_cascade; // The generated script depends on some dynamic options - $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'], - '.js'); + $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); + $cache->_event = 'JS_CACHE_USE'; // load minified version for some files $min = $conf['compress'] ? '.min' : ''; @@ -65,7 +65,7 @@ function js_out(){ # disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js', DOKU_INC.'lib/scripts/behaviour.js', DOKU_INC.'lib/scripts/page.js', - DOKU_TPLINC.'script.js', + tpl_incdir().'script.js', ); // add possible plugin scripts and userscript @@ -79,15 +79,15 @@ function js_out(){ // check cache age & handle conditional request // This may exit if a cache can be used - http_cached($cache->cache, - $cache->useCache(array('files' => $cache_files))); + $cache_ok = $cache->useCache(array('files' => $cache_files)); + http_cached($cache->cache, $cache_ok); // start output buffering and build the script ob_start(); // add some global variables print "var DOKU_BASE = '".DOKU_BASE."';"; - print "var DOKU_TPL = '".DOKU_TPL."';"; + print "var DOKU_TPL = '".tpl_basedir()."';"; // FIXME: Move those to JSINFO print "var DOKU_UHN = ".((int) useHeading('navigation')).";"; print "var DOKU_UHC = ".((int) useHeading('content')).";"; diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php index 03a1632c4..73939c347 100644 --- a/lib/exe/opensearch.php +++ b/lib/exe/opensearch.php @@ -16,9 +16,9 @@ require_once(DOKU_INC.'inc/init.php'); // try to be clever about the favicon location if(file_exists(DOKU_INC.'favicon.ico')){ $ico = DOKU_URL.'favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){ +}elseif(file_exists(tpl_incdir().'images/favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){ +}elseif(file_exists(tpl_incdir().'favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico'; }else{ $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico'; diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index a48ac41b0..93086e891 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -4,11 +4,6 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); // fix when '< ?xml' isn't on the very first line if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); -/** - * Increased whenever the API is changed - */ -define('DOKU_XMLRPC_API_VERSION', 6); - require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/remote.php'); session_write_close(); //close session @@ -42,7 +37,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server { } else { header('HTTP/1.1 403 Forbidden'); } - return new IXR_Error(-32603, 'server error. not authorized to call method'); + return new IXR_Error(-32603, "server error. not authorized to call method $methodname"); } catch (RemoteException $e) { return new IXR_Error($e->getCode(), $e->getMessage()); } @@ -55,7 +50,6 @@ class dokuwiki_xmlrpc_server extends IXR_Server { function toFile($data) { return new IXR_Base64($data); } - } $server = new dokuwiki_xmlrpc_server(); diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a6b0624bc..c3461b78b 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -597,6 +597,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '<input type="hidden" name="do" value="admin" />'.NL; echo '<input type="hidden" name="page" value="acl" />'.NL; echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL; + echo '<div class="table">'; echo '<table class="inline">'; echo '<tr>'; echo '<th>'.$this->getLang('where').'</th>'; @@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '</th>'; echo '</tr>'; echo '</table>'; + echo '</div>'; echo '</div></form>'.NL; } diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index d704fa8c9..71a2eb03a 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -7,7 +7,7 @@ */ //fix for Opera XMLHttpRequests -if(!count($_POST) && $HTTP_RAW_POST_DATA){ +if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ parse_str($HTTP_RAW_POST_DATA, $_POST); } diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php index cc1d97023..a1dce0369 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Lefty <lefty@multihost.cz> * @author Vojta Beran <xmamut@email.cz> * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com> */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/acl/lang/fr/help.txt b/lib/plugins/acl/lang/fr/help.txt index f748f6b23..158ec92ed 100644 --- a/lib/plugins/acl/lang/fr/help.txt +++ b/lib/plugins/acl/lang/fr/help.txt @@ -2,8 +2,8 @@ Cette page vous permet d'ajouter ou de supprimer des permissions pour les catégories et les pages de votre wiki. Le panneau de gauche liste toutes les catégories et les pages disponibles. -Le formulaire au-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné. +Le formulaire ci-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné. Dans le tableau ci-dessous, toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACL. -La lecture de [[doku>acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki. +La lecture de [[doku>fr:acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki. diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index 86f493b52..a33a52bf0 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -21,6 +21,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php index 774bf207a..db57598e6 100644 --- a/lib/plugins/acl/lang/gl/lang.php +++ b/lib/plugins/acl/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio <medulio@ciberirmandade.org> + * @author Oscar M. Lage <r0sk10@gmail.com> */ $lang['admin_acl'] = 'Xestión da Lista de Control de Acceso (ACL)'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 6f4e991cb..6b1e77cf8 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -11,6 +11,7 @@ * @author Song Younghwan <purluno@gmail.com> * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> + * @author erial2@gmail.com */ $lang['admin_acl'] = '접근 제어 목록 관리'; $lang['acl_group'] = '그룹'; diff --git a/lib/plugins/acl/lang/ms/lang.php b/lib/plugins/acl/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/acl/lang/ms/lang.php @@ -0,0 +1,6 @@ +<?php +/** + * Malay language file + * + * @author Markos + */ diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index 686909644..cb0765505 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -17,6 +17,7 @@ * @author Marijn Hofstra <hofstra.m@gmail.com> * @author Timon Van Overveldt <timonvo@gmail.com> * @author Jeroen + * @author Ricardo Guijt <ricardoguijt@gmail.com> */ $lang['admin_acl'] = 'Toegangsrechten'; $lang['acl_group'] = 'Groep'; diff --git a/lib/plugins/acl/lang/no/help.txt b/lib/plugins/acl/lang/no/help.txt index f02b6bdbd..c3d3688a9 100644 --- a/lib/plugins/acl/lang/no/help.txt +++ b/lib/plugins/acl/lang/no/help.txt @@ -1,4 +1,4 @@ -===Lynhjelp=== +=== Hurtighjelp: === På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki. diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index 587f9c2fc..09d71937a 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -17,6 +17,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe <jonmagneboe@hotmail.com> + * @author Egil Hansen <egil@rosetta.no> */ $lang['admin_acl'] = 'Administrasjon av lister for adgangskontroll (ACL)'; $lang['acl_group'] = 'Gruppe'; @@ -34,10 +35,10 @@ $lang['p_choose_ns'] = '<b>Før inn en bruker eller gruppe</b> i skjem $lang['p_inherited'] = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.'; $lang['p_isadmin'] = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.'; $lang['p_include'] = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for å opprette, laste opp og slette gjelder bare for navnerom, ikke enkeltsider.'; -$lang['current'] = 'Någjeldende ACL-regler'; +$lang['current'] = 'Gjeldende ACL-regler'; $lang['where'] = 'Side/Navnerom'; $lang['who'] = 'Bruker/Gruppe'; -$lang['perm'] = 'Tillatelser'; +$lang['perm'] = 'Rettigheter'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Lese'; $lang['acl_perm2'] = 'Redigere'; @@ -45,4 +46,4 @@ $lang['acl_perm4'] = 'Opprette'; $lang['acl_perm8'] = 'Laste opp'; $lang['acl_perm16'] = 'Slette'; $lang['acl_new'] = 'Legg til ny oppføring'; -$lang['acl_mod'] = 'Modifiser oppføring'; +$lang['acl_mod'] = 'Endre oppføring'; diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index a72b6af11..1b10b5232 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -12,6 +12,7 @@ * @author maros <dobrimaros@yahoo.pl> * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> + * @author Begina Felicysym <begina.felicysym@wp.eu> */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index 0c13d7223..c278c918e 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Marius Olar <olarmariusalex@yahoo.com> */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 6d04dde21..15ba78ef6 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -15,6 +15,7 @@ * @author Aleksandr Selivanov <alexgearbox@gmail.com> * @author Ladyko Andrey <fylh@succexy.spb.ru> * @author Eugene <windy.wanderer@gmail.com> + * @author Johnny Utah <pcpa@cyberpunk.su> */ $lang['admin_acl'] = 'Управление списками контроля доступа'; $lang['acl_group'] = 'Группа'; diff --git a/lib/plugins/acl/lang/sl/help.txt b/lib/plugins/acl/lang/sl/help.txt index eada41c29..ff096ae0e 100644 --- a/lib/plugins/acl/lang/sl/help.txt +++ b/lib/plugins/acl/lang/sl/help.txt @@ -1,11 +1,11 @@ -=== Hitra pomo === +=== Hitra pomoč === -Na tej strani je mogoe dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. +Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. Na veli strani so izpisani vsi imenski prostori in strani. -Na obrazcu zgoraj je mogoe pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. +Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. -V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoe hitro spreminjati ali brisati. +V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati. -Ve podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoe najti v [[doku>acl|uradni dokumentaciji ACL]]. +Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]]. diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php index 3fb391570..44e45e491 100644 --- a/lib/plugins/acl/lang/sl/lang.php +++ b/lib/plugins/acl/lang/sl/lang.php @@ -5,7 +5,7 @@ * @author Dejan Levec <webphp@gmail.com> * @author Boštjan Seničar <senicar@gmail.com> * @author Gregor Skumavc (grega.skumavc@gmail.com) - * @author Matej Urbančič (mateju@svn.gnome.org) + * @author Matej Urbančič (mateju@svn.gnome.org) */ $lang['admin_acl'] = 'Upravljanje dostopa'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 986fa769a..983882eaf 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> * @author lainme993@gmail.com + * @author Shuo-Ting Jian <shoting@gmail.com> */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index d912a2407..0ba91cdc9 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -60,10 +60,12 @@ var dw_acl = { * Load the current permission info and edit form */ loadinfo: function () { - jQuery('#acl__info').load( - DOKU_BASE + 'lib/plugins/acl/ajax.php', - jQuery('#acl__detail form').serialize() + '&ajax=info' - ); + jQuery('#acl__info') + .html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="..." />') + .load( + DOKU_BASE + 'lib/plugins/acl/ajax.php', + jQuery('#acl__detail form').serialize() + '&ajax=info' + ); return false; }, diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 64906171d..9a9bb5329 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -131,6 +131,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln(' <fieldset id="'.$setting->_key.'">'); ptln(' <legend>'.$setting->prompt($this).'</legend>'); + ptln(' <div class="table">'); ptln(' <table class="inline">'); } else { // config settings @@ -151,6 +152,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln(' </table>'); + ptln(' </div>'); if ($in_fieldset) { ptln(' </fieldset>'); } @@ -161,6 +163,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { usort($undefined_settings, '_setting_natural_comparison'); $this->_print_h1('undefined_settings', $this->getLang('_header_undefined')); ptln('<fieldset>'); + ptln('<div class="table">'); ptln('<table class="inline">'); $undefined_setting_match = array(); foreach($undefined_settings as $setting) { @@ -175,6 +178,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { ptln(' </tr>'); } ptln('</table>'); + ptln('</div>'); ptln('</fieldset>'); } @@ -270,10 +274,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // the same for the active template $tpl = $conf['template']; - if (@file_exists(DOKU_TPLINC.$enlangfile)){ + if (@file_exists(tpl_incdir().$enlangfile)){ $lang = array(); - @include(DOKU_TPLINC.$enlangfile); - if ($conf['lang'] != 'en') @include(DOKU_TPLINC.$langfile); + @include(tpl_incdir().$enlangfile); + if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile); foreach ($lang as $key => $value){ $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index 8f61e96c0..25f1da91a 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -65,6 +65,7 @@ $lang['useheading'] = 'Ползване на първото загл $lang['refcheck'] = 'Проверка за препратка към медия, преди да бъде изтрита'; $lang['refshow'] = 'Брой на показваните медийни препратки'; $lang['allowdebug'] = 'Включване на режи debug - <b>изключете, ако не е нужен!</b>'; +$lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?'; $lang['usewordblock'] = 'Блокиране на SPAM въз основа на на списък от думи'; $lang['indexdelay'] = 'Забавяне преди индексиране (сек)'; $lang['relnofollow'] = 'Ползване на rel="nofollow" за външни препратки'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index b9e6049a5..091604aea 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Lefty <lefty@multihost.cz> * @author Vojta Beran <xmamut@email.cz> * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com> */ $lang['menu'] = 'Správa nastavení'; $lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce, diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index 505d71a40..52c705b4f 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -66,6 +66,7 @@ $lang['useheading'] = 'Erste Überschrift als Seitennamen verwenden'; $lang['refcheck'] = 'Auf Verwendung beim Löschen von Media-Dateien testen'; $lang['refshow'] = 'Wie viele Verwendungsorte der Media-Datei zeigen'; $lang['allowdebug'] = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>'; +$lang['mediarevisions'] = 'Media-Revisionen (ältere Versionen) aktivieren?'; $lang['usewordblock'] = 'Blockiere Spam basierend auf der Wortliste'; $lang['indexdelay'] = 'Zeit bevor Suchmaschinenindexierung erlaubt ist'; $lang['relnofollow'] = 'rel="nofollow" verwenden'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 79c6554e3..1cc4e0a8a 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -77,6 +77,7 @@ $lang['useheading'] = 'Erste Überschrift als Seitennamen verwenden'; $lang['refcheck'] = 'Auf Verwendung beim Löschen von Media-Dateien testen'; $lang['refshow'] = 'Wiev iele Verwendungsorte der Media-Datei zeigen'; $lang['allowdebug'] = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>'; +$lang['mediarevisions'] = 'Media-Revisionen (ältere Versionen) aktivieren?'; $lang['usewordblock'] = 'Spam-Blocking benutzen'; $lang['indexdelay'] = 'Zeit bevor Suchmaschinenindexierung erlaubt ist'; $lang['relnofollow'] = 'rel="nofollow" verwenden'; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 27f754c2c..fe9e5458b 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -62,6 +62,8 @@ $lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; $lang['start'] = 'Start page name'; $lang['title'] = 'Wiki title'; $lang['template'] = 'Template'; +$lang['tagline'] = 'Tagline (if template supports it)'; +$lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['recent'] = 'Recent changes'; @@ -82,6 +84,7 @@ $lang['useheading'] = 'Use first heading for pagenames'; $lang['refcheck'] = 'Media reference check'; $lang['refshow'] = 'Number of media references to show'; $lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>'; +$lang['mediarevisions'] = 'Enable Mediarevisions?'; $lang['usewordblock']= 'Block spam based on wordlist'; $lang['indexdelay'] = 'Time delay before indexing (sec)'; @@ -151,6 +154,7 @@ $lang['rss_content'] = 'What to display in the XML feed items?'; $lang['rss_update'] = 'XML feed update interval (sec)'; $lang['recent_days'] = 'How many recent changes to keep (days)'; $lang['rss_show_summary'] = 'XML feed show summary in title'; +$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; /* Target options */ $lang['target____wiki'] = 'Target window for internal links'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index fd911433c..66d075d6b 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -80,6 +80,7 @@ $lang['useheading'] = 'Usar el primer encabezado para nombres de pág $lang['refcheck'] = 'Control de referencia a medios'; $lang['refshow'] = 'Número de referencias a medios a mostrar'; $lang['allowdebug'] = 'Permitir debug <b>deshabilítelo si no lo necesita!</b>'; +$lang['mediarevisions'] = '¿Habilitar Mediarevisions?'; $lang['usewordblock'] = 'Bloquear spam usando una lista de palabras'; $lang['indexdelay'] = 'Intervalo de tiempo antes de indexar (segundos)'; $lang['relnofollow'] = 'Usar rel="nofollow" en enlaces externos'; @@ -130,14 +131,14 @@ $lang['hidepages'] = 'Ocultar páginas con coincidencias (expresione $lang['send404'] = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes'; $lang['sitemap'] = 'Generar sitemap de Google (días)'; $lang['broken_iua'] = '¿Se ha roto (broken) la función ignore_user_abort en su sistema? Esto puede causar que no funcione el index de búsqueda. Se sabe que IIS+PHP/CGI está roto. Vea <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a>para más información.'; -$lang['xsendfile'] = 'Utilice el X-Sendfile header para permitirle sl servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.'; +$lang['xsendfile'] = '¿Utilizar la cabecera X-Sendfile para permitirle al servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.'; $lang['renderer_xhtml'] = 'Visualizador a usar para salida (xhtml) principal del wiki'; $lang['renderer__core'] = '%s (núcleo dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; $lang['rememberme'] = 'Permitir cookies para acceso permanente (recordarme)'; $lang['rss_type'] = 'Tipo de resumen (feed) XML'; $lang['rss_linkto'] = 'Feed XML enlaza a'; -$lang['rss_content'] = 'Que mostrar en los itemes del archivo XML?'; +$lang['rss_content'] = '¿Qué mostrar en los items del archivo XML?'; $lang['rss_update'] = 'Intervalo de actualización de feed XML (segundos)'; $lang['recent_days'] = 'Cuántos cambios recientes mantener (días)'; $lang['rss_show_summary'] = 'Feed XML muestra el resumen en el título'; diff --git a/lib/plugins/config/lang/fr/intro.txt b/lib/plugins/config/lang/fr/intro.txt index de8a965d8..2a59b34d1 100644 --- a/lib/plugins/config/lang/fr/intro.txt +++ b/lib/plugins/config/lang/fr/intro.txt @@ -1,6 +1,6 @@ ====== Gestionnaire de configuration ====== -Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>plugin:config]]. +Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>fr:config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>fr:plugin:config]]. Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec ce module. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs affectées à votre installation sont affichées sur un fond blanc. Les paramètres bleus et blancs peuvent être modifiés. diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 42a7f8d07..4a67a0fc8 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -16,6 +16,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Paramètres de configuration'; $lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.'; @@ -62,7 +63,7 @@ $lang['youarehere'] = 'Traces hiérarchiques'; $lang['typography'] = 'Effectuer des améliorations typographiques'; $lang['htmlok'] = 'Permettre HTML dans les pages'; $lang['phpok'] = 'Permettre PHP dans les pages'; -$lang['dformat'] = 'Format de date (cf. fonction <a href="http://www.php.net/strftime">strftime</a> de PHP)'; +$lang['dformat'] = 'Format de date (cf. fonction <a href="http://fr.php.net/strftime">strftime</a> de PHP)'; $lang['signature'] = 'Signature'; $lang['toptoclevel'] = 'Niveau le plus haut à afficher dans la table des matières'; $lang['tocminheads'] = 'Nombre minimum de titres pour qu\'une table des matières soit construite'; @@ -74,6 +75,7 @@ $lang['useheading'] = 'Utiliser le titre de premier niveau'; $lang['refcheck'] = 'Vérifier les références de média'; $lang['refshow'] = 'Nombre de références de média à montrer'; $lang['allowdebug'] = 'Debug (<strong>Ne l\'activez que si vous en avez besoin !</strong>)'; +$lang['mediarevisions'] = 'Activer les révisions (gestion de versions) des médias'; $lang['usewordblock'] = 'Bloquer le spam selon les mots utilisés'; $lang['indexdelay'] = 'Délai avant l\'indexation (en secondes)'; $lang['relnofollow'] = 'Utiliser rel="nofollow" sur les liens extérieurs'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index 861336371..97b7ecdc8 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio <medulio@ciberirmandade.org> + * @author Oscar M. Lage <r0sk10@gmail.com> */ $lang['menu'] = 'Opcións de Configuración'; $lang['error'] = 'Configuración non actualizada debido a un valor inválido, por favor revisa os teus trocos e volta envialos de novo. @@ -39,6 +40,7 @@ $lang['lang'] = 'Idioma'; $lang['basedir'] = 'Directorio base'; $lang['baseurl'] = 'URL base'; $lang['savedir'] = 'Directorio no que se gardarán os datos'; +$lang['cookiedir'] = 'Ruta das cookies. Deixar en blanco para usar a url de base.'; $lang['start'] = 'Nome da páxina inicial'; $lang['title'] = 'Título do Wiki'; $lang['template'] = 'Sobreplanta'; @@ -62,6 +64,7 @@ $lang['useheading'] = 'Utilizar a primeira cabeceira para os nomes de $lang['refcheck'] = 'Comprobar a referencia media'; $lang['refshow'] = 'Número de referencias media a amosar'; $lang['allowdebug'] = 'Permitir o depurado <b>desactívao se non o precisas!</b>'; +$lang['mediarevisions'] = 'Habilitar revisións dos arquivos-media?'; $lang['usewordblock'] = 'Bloquear correo-lixo segundo unha lista de verbas'; $lang['indexdelay'] = 'Retardo denantes de indexar (seg)'; $lang['relnofollow'] = 'Utilizar rel="nofollow" nas ligazóns externas'; @@ -90,6 +93,7 @@ $lang['useslash'] = 'Utilizar a barra inclinada (/) como separador $lang['usedraft'] = 'Gardar un borrador automaticamente no tempo da edición'; $lang['sepchar'] = 'Verba separadora do nome de páxina'; $lang['canonical'] = 'Utilizar URLs completamente canónicos'; +$lang['fnencode'] = 'Método para codificar os nomes de arquivo non-ASCII.'; $lang['autoplural'] = 'Comprobar formas plurais nas ligazóns'; $lang['compression'] = 'Método de compresión para arquivos attic'; $lang['cachetime'] = 'Tempo máximo para a caché (seg.)'; @@ -98,6 +102,7 @@ $lang['fetchsize'] = 'Tamaño máximo (en bytes) que pode descargar $lang['notify'] = 'Enviar notificacións de trocos a este enderezo de correo-e'; $lang['registernotify'] = 'Enviar información de novos usuarios rexistrados a este enderezo de correo-e'; $lang['mailfrom'] = 'Enderezo de correo-e a usar para as mensaxes automáticas'; +$lang['mailprefix'] = 'Prefixo de asunto de correo-e para as mensaxes automáticas'; $lang['gzip_output'] = 'Utilizar Contido-Codificación gzip para o xhtml'; $lang['gdlib'] = 'Versión da Libraría GD'; $lang['im_convert'] = 'Ruta deica a ferramenta de conversión ImageMagick'; @@ -130,6 +135,7 @@ $lang['proxy____port'] = 'Porto do Proxy'; $lang['proxy____user'] = 'Nome de usuario do Proxy'; $lang['proxy____pass'] = 'Contrasinal do Proxy'; $lang['proxy____ssl'] = 'Utilizar ssl para conectar ao Proxy'; +$lang['proxy____except'] = 'Expresión regular para atopar URLs que deban ser omitidas polo Proxy.'; $lang['safemodehack'] = 'Activar hack de modo seguro (safemode)'; $lang['ftp____host'] = 'Servidor FTP para o hack de modo seguro (safemode)'; $lang['ftp____port'] = 'Porto FTP para o hack de modo seguro(safemode)'; @@ -177,3 +183,4 @@ $lang['useheading_o_0'] = 'Endexamais'; $lang['useheading_o_navigation'] = 'Só Navegación'; $lang['useheading_o_content'] = 'Só Contido do Wiki'; $lang['useheading_o_1'] = 'Sempre'; +$lang['readdircache'] = 'Edad máxima para o directorio de caché (seg)'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 61161290d..f1d2e3e8f 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -41,9 +41,10 @@ $lang['_msg_setting_no_default'] = '初期値が設定されていません。'; $lang['fmode'] = 'ファイル作成マスク'; $lang['dmode'] = 'フォルダ作成マスク'; $lang['lang'] = '使用言語'; -$lang['basedir'] = 'ベースディレクトリ'; -$lang['baseurl'] = 'ベースURL'; +$lang['basedir'] = 'サーバのパス (例: <code>/dokuwiki/</code>)。空欄にすると自動的に検出します。'; +$lang['baseurl'] = 'サーバの URL (例: <code>http://www.yourserver.com</code>)。空欄にすると自動的に検出します。'; $lang['savedir'] = '保存ディレクトリ'; +$lang['cookiedir'] = 'Cookie のパス。空欄にすると baseurl を使用します。'; $lang['start'] = 'スタートページ名'; $lang['title'] = 'WIKIタイトル'; $lang['template'] = 'テンプレート'; @@ -67,6 +68,7 @@ $lang['useheading'] = '最初の見出しをページ名とする'; $lang['refcheck'] = 'メディア参照元チェック'; $lang['refshow'] = 'メディア参照元表示数'; $lang['allowdebug'] = 'デバッグモード（<b>必要で無いときは無効にしてください</b>）'; +$lang['mediarevisions'] = 'メディアファイルの履歴を有効にしますか?'; $lang['usewordblock'] = '単語リストに基づくスパムブロック'; $lang['indexdelay'] = 'インデックスを許可（何秒後）'; $lang['relnofollow'] = 'rel="nofollow"を付加'; @@ -112,6 +114,7 @@ $lang['jpg_quality'] = 'JPG圧縮品質（0-100）'; $lang['subscribers'] = '更新通知機能'; $lang['subscribe_time'] = '購読リストと概要を送信する期間（秒）。「最近の変更とする期間」で指定した期間より小さくしてください。'; $lang['compress'] = 'CSSとJavaScriptを圧縮'; +$lang['cssdatauri'] = 'HTTP リクエスト数によるオーバーヘッドを減らすため、CSS ファイルから参照される画像ファイルのサイズがここで指定するバイト数以内の場合は CSS ファイル内に Data URI として埋め込みます。このテクニックは IE7 以下では動作しません! <code>400</code> から <code>600</code> バイトがちょうどよい値です。<code>0</code> を指定すると埋め込み処理は行われません。'; $lang['hidepages'] = '非公開ページ（Regex）'; $lang['send404'] = '文書が存在しないページに"HTTP404/Page Not Found"を使用'; $lang['sitemap'] = 'Googleサイトマップ作成頻度（日数）'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 1c929c25c..55207a37a 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author Song Younghwan <purluno@gmail.com> * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> + * @author erial2@gmail.com */ $lang['menu'] = '환경 설정'; $lang['error'] = '잘못된 값때문에 설정들을 변경할 수 없습니다. 수정한 값들을 검사하고 확인을 누르기 바랍니다. @@ -43,9 +44,12 @@ $lang['lang'] = '언어'; $lang['basedir'] = '기본 디렉토리'; $lang['baseurl'] = '기본 URL'; $lang['savedir'] = '데이타 저장 디렉토리'; +$lang['cookiedir'] = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.'; $lang['start'] = '시작 페이지 이름'; $lang['title'] = '위키 제목'; $lang['template'] = '템플릿'; +$lang['tagline'] = '태그 라인 (템플릿이 지원할 때에 한해)'; +$lang['sidebar'] = '사이드바 페이지 이름(템플릿이 지원할 때에 한해). 비워두면 사이드바를 비활성화함'; $lang['license'] = '컨텐트에 어떤 라이센스 정책을 적용하시겠습니까?'; $lang['fullpath'] = '페이지 하단에 전체 경로 보여주기'; $lang['recent'] = '최근에 바뀐 것'; @@ -66,6 +70,7 @@ $lang['useheading'] = '페이지 이름으로 첫 헤드라인 사용 $lang['refcheck'] = '미디어 참조 검사'; $lang['refshow'] = '보여줄 미디어 참조 수'; $lang['allowdebug'] = '디버그 허용 <b>필요하지 않으면 금지!</b>'; +$lang['mediarevisions'] = '미디어 버전 관리를 사용하시겠습니까?'; $lang['usewordblock'] = '금지단어를 사용해 스팸 막기'; $lang['indexdelay'] = '색인 연기 시간(초)'; $lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; @@ -113,6 +118,7 @@ $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; $lang['subscribers'] = '페이지 갱신 알람 기능'; $lang['subscribe_time'] = ' 구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; $lang['compress'] = '최적화된 CSS, javascript 출력'; +$lang['cssdatauri'] = '이미지가 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP request 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code> 에서 <code>600></code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.'; $lang['hidepages'] = '매칭된 페이지 숨기기(정규표현식)'; $lang['send404'] = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답'; $lang['sitemap'] = '구글 사이트맵 생성(날짜)'; diff --git a/lib/plugins/config/lang/ms/lang.php b/lib/plugins/config/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/config/lang/ms/lang.php @@ -0,0 +1,6 @@ +<?php +/** + * Malay language file + * + * @author Markos + */ diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index 6bde9eb4e..77b8d6a1a 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -14,6 +14,7 @@ * @author Marijn Hofstra <hofstra.m@gmail.com> * @author Timon Van Overveldt <timonvo@gmail.com> * @author Jeroen + * @author Ricardo Guijt <ricardoguijt@gmail.com> */ $lang['menu'] = 'Configuratie-instellingen'; $lang['error'] = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.<br />Je kunt de incorrecte waarde(s) herkennen aan de rode rand.'; @@ -72,6 +73,7 @@ $lang['useheading'] = 'Eerste kopje voor paginanaam gebruiken'; $lang['refcheck'] = 'Controleer verwijzingen naar media'; $lang['refshow'] = 'Aantal te tonen mediaverwijzingen'; $lang['allowdebug'] = 'Debug toestaan <b>uitzetten indien niet noodzakelijk!</b>'; +$lang['mediarevisions'] = 'Media revisies activeren?'; $lang['usewordblock'] = 'Blokkeer spam op basis van woordenlijst'; $lang['indexdelay'] = 'Uitstel voor indexeren (sec)'; $lang['relnofollow'] = 'Gebruik rel="nofollow" voor externe links'; @@ -117,6 +119,7 @@ $lang['jpg_quality'] = 'JPG compressiekwaliteit (0-100)'; $lang['subscribers'] = 'Ondersteuning pagina-inschrijving aanzetten'; $lang['subscribe_time'] = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"'; $lang['compress'] = 'Compacte CSS en javascript output'; +$lang['cssdatauri'] = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! <code>400</code> tot <code>600</code> is een geschikte omvang. Stel de omvang in op <code>0</code> om deze functionaliteit uit te schakelen.'; $lang['hidepages'] = 'Verberg deze pagina\'s (regular expressions)'; $lang['send404'] = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s'; $lang['sitemap'] = 'Genereer Google sitemap (dagen)'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 2245a8813..ec97fe966 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe <jonmagneboe@hotmail.com> + * @author Egil Hansen <egil@rosetta.no> */ $lang['menu'] = 'Konfigurasjonsinnstillinger'; $lang['error'] = 'Innstillingene ble ikke oppdatert på grunn av en eller flere ugyldig verdier. Vennligst se gjennom endringene og prøv på nytt. @@ -24,10 +25,10 @@ $lang['locked'] = 'Innstillingene kan ikke oppdateres. Hvis dette forsikre deg om at fila med de lokale innstillingene har korrekt filnavn<br/> og tillatelser.'; $lang['danger'] = 'Advarsel: Endrig av dette valget kan føre til at wiki og konfigurasjon menyen ikke blir tilgjengelig.'; -$lang['warning'] = 'Advarsel: Endring av dette valget kan føre til utilsiktede atferd. +$lang['warning'] = 'Advarsel: Endring av dette valget kan føre til utilsiktet atferd. '; -$lang['security'] = 'Sikkerhets Advarsel: Endring av dette valget kan føre til sikkerhetsrisiko.'; +$lang['security'] = 'Sikkerhetsadvarsel: Endring av dette valget kan innebære en sikkerhetsrisiko.'; $lang['_configuration_manager'] = 'Konfigurasjonsinnstillinger'; $lang['_header_dokuwiki'] = 'Innstillinger for DokuWiki'; $lang['_header_plugin'] = 'Innstillinger for tillegg'; @@ -36,10 +37,10 @@ $lang['_header_undefined'] = 'Udefinerte innstillinger'; $lang['_basic'] = 'Grunnleggende innstillinger'; $lang['_display'] = 'Innstillinger for visning av sider'; $lang['_authentication'] = 'Innstillinger for autentisering'; -$lang['_anti_spam'] = 'Motsøppel-innstillinger'; +$lang['_anti_spam'] = 'Anti-Spam innstillinger'; $lang['_editing'] = 'Innstillinger for redigering'; $lang['_links'] = 'Innstillinger for lenker'; -$lang['_media'] = 'Innstillinger for media-filer'; +$lang['_media'] = 'Innstillinger for mediafiler'; $lang['_advanced'] = 'Avanserte innstillinger'; $lang['_network'] = 'Nettverksinnstillinger'; $lang['_plugin_sufix'] = '– innstillinger for tillegg'; @@ -77,6 +78,7 @@ $lang['useheading'] = 'Bruk første overskrift som tittel'; $lang['refcheck'] = 'Sjekk referanser før mediafiler slettes'; $lang['refshow'] = 'Antall viste referanser til mediafiler'; $lang['allowdebug'] = 'Tillat feilsøking <b>skru av om det ikke behøves!</b>'; +$lang['mediarevisions'] = 'Slå på mediaversjonering?'; $lang['usewordblock'] = 'Blokker søppel basert på ordliste'; $lang['indexdelay'] = 'Forsinkelse før indeksering (sekunder)'; $lang['relnofollow'] = 'Bruk rel="nofollow" på eksterne lenker'; @@ -190,10 +192,10 @@ $lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Priprietær Nginx X-Accel-Redirect header'; $lang['showuseras_o_loginname'] = 'Brukernavn'; $lang['showuseras_o_username'] = 'Brukerens fulle navn'; -$lang['showuseras_o_email'] = 'Brukerens epostadresse (tilpasset i henhold til mailguar-instilling)'; +$lang['showuseras_o_email'] = 'Brukerens e-postadresse (tilpasset i henhold til mailguar-instilling)'; $lang['showuseras_o_email_link'] = 'Brukerens epost-addresse som "mailto:"-lenke'; $lang['useheading_o_0'] = 'Aldri'; $lang['useheading_o_navigation'] = 'Kun navigering'; $lang['useheading_o_content'] = 'Kun wiki-innhold'; $lang['useheading_o_1'] = 'Alltid'; -$lang['readdircache'] = 'Maksimal alder for mellomlagring av mappa med søkeindekser (sekunder)'; +$lang['readdircache'] = 'Maksimal alder for mellomlagring av mappen med søkeindekser (sekunder)'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 0e69cc8f1..7ebe5ba92 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author maros <dobrimaros@yahoo.pl> * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> + * @author Begina Felicysym <begina.felicysym@wp.eu> */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu. <br/> Niepoprawne wartości są wyróżnione kolorem czerwonym.'; @@ -47,9 +48,12 @@ $lang['lang'] = 'Język'; $lang['basedir'] = 'Katalog główny'; $lang['baseurl'] = 'Główny URL'; $lang['savedir'] = 'Katalog z danymi'; +$lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by użyć baseurl.'; $lang['start'] = 'Tytuł strony początkowej'; $lang['title'] = 'Tytuł wiki'; $lang['template'] = 'Motyw'; +$lang['tagline'] = 'Motto (jeśli szablon daje taką możliwość)'; +$lang['sidebar'] = 'Nazwa strony paska bocznego (jeśli szablon je obsługuje), puste pole wyłącza pasek boczny'; $lang['license'] = 'Pod jaką licencją publikować treści wiki?'; $lang['fullpath'] = 'Wyświetlanie pełnych ścieżek'; $lang['recent'] = 'Ilość ostatnich zmian'; @@ -70,6 +74,7 @@ $lang['useheading'] = 'Pierwszy nagłówek jako tytuł'; $lang['refcheck'] = 'Sprawdzanie odwołań przed usunięciem pliku'; $lang['refshow'] = 'Ilość pokazywanych odwołań do pliku'; $lang['allowdebug'] = 'Debugowanie (niebezpieczne!)'; +$lang['mediarevisions'] = 'Włączyć wersjonowanie multimediów?'; $lang['usewordblock'] = 'Blokowanie spamu na podstawie słów'; $lang['indexdelay'] = 'Okres indeksowania w sekundach'; $lang['relnofollow'] = 'Nagłówek rel="nofollow" dla odnośników zewnętrznych'; @@ -107,13 +112,15 @@ $lang['fetchsize'] = 'Maksymalny rozmiar pliku (w bajtach) jaki moż $lang['notify'] = 'Wysyłanie powiadomień na adres e-mail'; $lang['registernotify'] = 'Prześlij informacje o nowych użytkownikach na adres e-mail'; $lang['mailfrom'] = 'Adres e-mail tego wiki'; -$lang['gzip_output'] = 'Używaj GZIP dla XHTML'; +$lang['mailprefix'] = 'Prefiks tematu e-mail do automatycznych wiadomości'; +$lang['gzip_output'] = 'Używaj kodowania GZIP dla zawartości XHTML'; $lang['gdlib'] = 'Wersja biblioteki GDLib'; $lang['im_convert'] = 'Ścieżka do programu imagemagick'; $lang['jpg_quality'] = 'Jakość kompresji JPG (0-100)'; $lang['subscribers'] = 'Subskrypcja'; $lang['subscribe_time'] = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.'; $lang['compress'] = 'Kompresja arkuszy CSS i plików JavaScript'; +$lang['cssdatauri'] = 'Rozmiar w bajtach, poniżej którego odwołania do obrazów w plikach CSS powinny być osadzone bezpośrednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. Technika ta nie działa w IE 7 i poniżej! <code>400</code> do <code>600</code> bajtów jest dobrą wartością. Ustaw <code>0</code> aby wyłączyć.'; $lang['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)'; $lang['send404'] = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron'; $lang['sitemap'] = 'Okres generowania Google Sitemap (w dniach)'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 5b15ec3dc..d638e1eec 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Marius Olar <olarmariusalex@yahoo.com> */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou. <br /> Valorile incorecte vor apărea într-un chenar roşu.'; @@ -67,6 +68,7 @@ $lang['useheading'] = 'Foloseşte primul titlu pentru numele paginii' $lang['refcheck'] = 'Verificare referinţă media'; $lang['refshow'] = 'Numărul de referinţe media de arătat'; $lang['allowdebug'] = 'Permite depanarea <b>dezactivaţi dacă cu e necesar!</b>'; +$lang['mediarevisions'] = 'Activare Revizii Media?'; $lang['usewordblock'] = 'Blochează spam-ul pe baza listei de cuvinte'; $lang['indexdelay'] = 'Timpul de întârziere înainte de indexare (sec)'; $lang['relnofollow'] = 'Folosiţi rel="nofollow" pentru legăturile externe'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index cd93526e0..098cff534 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov <alexgearbox@gmail.com> * @author Ladyko Andrey <fylh@succexy.spb.ru> * @author Eugene <windy.wanderer@gmail.com> + * @author Johnny Utah <pcpa@cyberpunk.su> */ $lang['menu'] = 'Настройки вики'; $lang['error'] = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте свои изменения и попробуйте ещё раз.<br />Неправильные значения будут обведены красной рамкой.'; @@ -50,9 +51,12 @@ $lang['lang'] = 'Язык'; $lang['basedir'] = 'Корневая директория (например, <code>/dokuwiki/</code>). Оставьте пустым для автоопределения.'; $lang['baseurl'] = 'Корневой адрес (URL) (например, <code>http://www.yourserver.ru</code>). Оставьте пустым для автоопределения.'; $lang['savedir'] = 'Директория для данных'; +$lang['cookiedir'] = 'Cookie директория. Оставьте пустым для автоопределения.'; $lang['start'] = 'Имя стартовой страницы'; $lang['title'] = 'Название вики'; $lang['template'] = 'Шаблон'; +$lang['tagline'] = 'Слоган (если поддерживается шаблоном)'; +$lang['sidebar'] = 'Боковая панель, пустое поле отключает боковую панель.'; $lang['license'] = 'На условиях какой лицензии будет предоставляться содержимое вики?'; $lang['fullpath'] = 'Полный путь к документу'; $lang['recent'] = 'Недавние изменения (кол-во)'; @@ -73,6 +77,7 @@ $lang['useheading'] = 'Первый заголовок вместо $lang['refcheck'] = 'Проверять ссылки на медиафайлы'; $lang['refshow'] = 'Показывать ссылок на медиафайлы'; $lang['allowdebug'] = 'Включить отладку (отключите!)'; +$lang['mediarevisions'] = 'Включение версий медиафайлов'; $lang['usewordblock'] = 'Блокировать спам по ключевым словам'; $lang['indexdelay'] = 'Задержка перед индексированием'; $lang['relnofollow'] = 'rel="nofollow" для внешних ссылок'; @@ -118,6 +123,7 @@ $lang['jpg_quality'] = 'Качество сжатия JPG (0–100). $lang['subscribers'] = 'Разрешить подписку на изменения'; $lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек.). Должен быть меньше, чем значение, указанное в recent_days.'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; +$lang['cssdatauri'] = 'Размер в байтах до которого изображения, указанные в CSS-файлах, должны быть встроены прямо в таблицу стилей, для уменьшения избычтоных HTTP-запросов. Этот метод не будет работать в IE версии 7 и ниже! Установка от <code>400</code> до <code>600</code> байт является хорошим показателем. Установите <code>0</code>, чтобы отключить.'; $lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; $lang['send404'] = 'Посылать «HTTP404/Page Not Found»'; $lang['sitemap'] = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Гугл, Яндекс и др.)'; diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index d583c5d15..cbd69eb9e 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -64,6 +64,7 @@ $lang['useheading'] = 'Použiť nadpis pre názov stránky'; $lang['refcheck'] = 'Kontrolovať odkazy na médiá (pred vymazaním)'; $lang['refshow'] = 'Počet zobrazených odkazov na médiá'; $lang['allowdebug'] = 'Povoliť ladenie chýb <b>deaktivujte, ak nie je potrebné!</b>'; +$lang['mediarevisions'] = 'Povoliť verzie súborov?'; $lang['usewordblock'] = 'Blokovať spam na základe zoznamu známych slov'; $lang['indexdelay'] = 'Časové oneskorenie pred indexovaním (sek)'; $lang['relnofollow'] = 'Používať rel="nofollow" pre externé odkazy'; diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php index 03bae8e37..364e0fd7f 100644 --- a/lib/plugins/config/lang/sl/lang.php +++ b/lib/plugins/config/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Splošne nastavitve'; $lang['error'] = 'Nastavitve niso shranjene zaradi neveljavne vrednosti.<br />Neveljavna vrednost je označena z rdečim robom vnosnega polja.'; $lang['updated'] = 'Nastavitve so uspešno posodobljene.'; @@ -27,7 +26,7 @@ $lang['_authentication'] = 'Nastavitve overjanja'; $lang['_anti_spam'] = 'Nastavitve neželenih sporočil (Anti-Spam)'; $lang['_editing'] = 'Nastavitve urejanja'; $lang['_links'] = 'Nastavitve povezav'; -$lang['_media'] = 'Predstavnostne nastavitve'; +$lang['_media'] = 'Predstavne nastavitve'; $lang['_advanced'] = 'Napredne nastavitve'; $lang['_network'] = 'Omrežne nastavitve'; $lang['_plugin_sufix'] = 'nastavitve'; @@ -41,9 +40,12 @@ $lang['lang'] = 'Jezik vmesnika'; $lang['basedir'] = 'Pot do strežnika (npr. /dokuwiki/). Prazno polje določa samodejno zaznavanje'; $lang['baseurl'] = 'Naslov URL strežnika (npr. http://www.streznik.si). Prazno polje določa samodejno zaznavanje'; $lang['savedir'] = 'Mapa za shranjevanje podatkov'; +$lang['cookiedir'] = 'Pot do piškotka. Prazno polje določa uporabo osnovnega naslova (baseurl)'; $lang['start'] = 'Ime začetne strani wiki'; $lang['title'] = 'Naslov Wiki spletišča'; $lang['template'] = 'Predloga'; +$lang['tagline'] = 'Označna vrstica (ob podpori predloge)'; +$lang['sidebar'] = 'Ime strani stranske vrstice (ob podpori predloge); prazno polje onemogoči stransko vrstico.'; $lang['license'] = 'Pod pogoji katerega dovoljenja je objavljena vsebina?'; $lang['fullpath'] = 'Pokaži polno pot strani v nogi strani'; $lang['recent'] = 'Nedavne spremembe'; @@ -62,8 +64,9 @@ $lang['camelcase'] = 'Uporabi EnoBesedni zapisa za povezave'; $lang['deaccent'] = 'Počisti imena strani'; $lang['useheading'] = 'Uporabi prvi naslov za ime strani'; $lang['refcheck'] = 'Preverjanje sklica predstavnih datotek'; -$lang['refshow'] = 'Število predstavnostnih sklicev za prikaz'; +$lang['refshow'] = 'Število predstavih sklicev za prikaz'; $lang['allowdebug'] = 'Dovoli razhroščevanje (po potrebi!)'; +$lang['mediarevisions'] = 'Ali naj se omogočijo objave predstavnih vsebin?'; $lang['usewordblock'] = 'Zaustavi neželeno besedilo glede na seznam besed'; $lang['indexdelay'] = 'Časovni zamik pred ustvarjanjem kazala (v sekundah)'; $lang['relnofollow'] = 'Uporabni možnost rel="nofollow" pri zunanjih povezavah'; @@ -101,6 +104,7 @@ $lang['fetchsize'] = 'največja dovoljena velikost zunanjega prejema $lang['notify'] = 'Pošlji obvestila o spremembah na določen elektronski naslov'; $lang['registernotify'] = 'Pošlji obvestila o novih vpisanih uporabnikih na določen elektronski naslov'; $lang['mailfrom'] = 'Elektronski naslov za samodejno poslana sporočila'; +$lang['mailprefix'] = 'Predpona zadeve elektronskega sporočila za samodejna sporočila.'; $lang['gzip_output'] = 'Uporabi stiskanje gzip vsebine za xhtml'; $lang['gdlib'] = 'Različica GD Lib'; $lang['im_convert'] = 'Pot do orodja za pretvarjanje slik ImageMagick'; @@ -108,6 +112,7 @@ $lang['jpg_quality'] = 'Kakovost stiskanja datotek JPG (0-100)'; $lang['subscribers'] = 'Omogoči podporo naročanju na strani'; $lang['subscribe_time'] = 'Čas po katerem so poslani povzetki sprememb (v sekundah); Vrednost mora biti krajša od časa, ki je določen z nedavno_dni.'; $lang['compress'] = 'Združi odvod CSS in JavaScript v brskalniku'; +$lang['cssdatauri'] = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjšanje zahtev osveževanja strežnika HTTP. Ta možnost ni podprta v brskalniku MS IE 7 in nižjih različicah! Ustrezne vrednosti so <code>400</code> do <code>600</code> bajtov. Vrednost <code>0</code> onemogoči možnost.'; $lang['hidepages'] = 'Skrij skladne strani (logični izraz)'; $lang['send404'] = 'Pošlji "HTTP 404/Strani ni mogoče najti" pri dostopu do neobstoječih strani'; $lang['sitemap'] = 'Ustvari Google kazalo strani (v dnevih)'; @@ -170,9 +175,9 @@ $lang['compression_o_0'] = 'brez'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'ne uporabi'; -$lang['xsendfile_o_1'] = 'plačniška glava lighttpd (pred različico 1.5)'; +$lang['xsendfile_o_1'] = 'lastniška glava lighttpd (pred različico 1.5)'; $lang['xsendfile_o_2'] = 'običajna glava X-Sendfile'; -$lang['xsendfile_o_3'] = 'plačniška glava Nginx X-Accel-Redirect'; +$lang['xsendfile_o_3'] = 'lastniška glava Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Prijavno ime'; $lang['showuseras_o_username'] = 'Polno ime uporabnika'; $lang['showuseras_o_email'] = 'Elektronski naslov uporabnika (šifriran po določilih varovanja)'; diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php index 2919ec113..dd5f287b9 100644 --- a/lib/plugins/config/lang/zh-tw/lang.php +++ b/lib/plugins/config/lang/zh-tw/lang.php @@ -44,6 +44,7 @@ $lang['lang'] = '語系'; $lang['basedir'] = '根目錄'; $lang['baseurl'] = '根路徑 (URL)'; $lang['savedir'] = '儲存資料的目錄'; +$lang['cookiedir'] = 'Cookie 路徑。設定空白則使用 baseurl。'; $lang['start'] = '開始頁面的名稱'; $lang['title'] = '維基標題'; $lang['template'] = '樣板'; @@ -112,6 +113,7 @@ $lang['jpg_quality'] = 'JPG 壓縮品質(0-100)'; $lang['subscribers'] = '啟用頁面訂閱'; $lang['subscribe_time'] = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。'; $lang['compress'] = '壓縮 CSS 與 JavaScript 的輸出'; +$lang['cssdatauri'] = 'CSS 中所引用的圖片假如小於該數字大小(bytes)，將會被直接嵌入 CSS 中來減少 HTTP Request 的發送。此功能在 IE 7 及之下版本不支援。推薦使用 <code>400</code> 到 <code>600</code> 之間。設定為<code>0</code> 則停用。'; $lang['hidepages'] = '隱藏匹配的界面 (正規式)'; $lang['send404'] = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"'; $lang['sitemap'] = '產生 Google 站台地圖 (天)'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index fa51cb1ef..5b7229c62 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> * @author lainme993@gmail.com + * @author Shuo-Ting Jian <shoting@gmail.com> */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。 diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index adf7d217a..1cdab607f 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -279,10 +279,10 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $meta = array(); - @include(DOKU_TPLINC.$file); - @include(DOKU_TPLINC.$class); + @include(tpl_incdir().$file); + @include(tpl_incdir().$class); if (!empty($meta)) { $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset'); } @@ -314,9 +314,9 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $conf = array(); - @include(DOKU_TPLINC.$file); + @include(tpl_incdir().$file); foreach ($conf as $key => $value){ $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index b95c8d75c..a472a954b 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -91,6 +91,8 @@ $meta['title'] = array('string'); $meta['start'] = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces $meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/'); $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/'); +$meta['tagline'] = array('string'); +$meta['sidebar'] = array('string'); $meta['license'] = array('license'); $meta['savedir'] = array('savedir'); $meta['basedir'] = array('string'); @@ -123,7 +125,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); @@ -164,6 +166,7 @@ $meta['target____media'] = array('string'); $meta['target____windows'] = array('string'); $meta['_media'] = array('fieldset'); +$meta['mediarevisions'] = array('onoff'); $meta['gdlib'] = array('multichoice','_choices' => array(0,1,2)); $meta['im_convert'] = array('im_convert'); $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/'); //(0-100) @@ -189,9 +192,10 @@ $meta['sitemap'] = array('numeric'); $meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); $meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); $meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); +$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); $meta['rss_update'] = array('numeric'); -$meta['recent_days'] = array('numeric'); $meta['rss_show_summary'] = array('onoff'); +$meta['recent_days'] = array('numeric'); $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php index 026a438bb..9aedbf0aa 100644 --- a/lib/plugins/info/syntax.php +++ b/lib/plugins/info/syntax.php @@ -174,7 +174,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $hid = $this->_addToTOC($title, 3, $renderer); $doc .= '<h3><a name="'.$hid.'" id="'.$hid.'">'.hsc($title).'</a></h3>'; $doc .= '<div class="level3">'; - $doc .= '<table class="inline"><tbody>'; + $doc .= '<div class="table"><table class="inline"><tbody>'; $doc .= '<tr><th>Description</th><td colspan="2">'.$method['desc']. '</td></tr>'; if ($method['params']){ @@ -190,7 +190,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $doc .= '<tr><th>Return value</th><td>'.hsc(key($method['return'])). '</td><td>'.hsc(current($method['return'])).'</td></tr>'; } - $doc .= '</tbody></table>'; + $doc .= '</tbody></table></div>'; $doc .= '</div>'; } unset($po); @@ -206,7 +206,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { global $PARSER_MODES; $doc = ''; - $doc .= '<table class="inline"><tbody>'; + $doc .= '<div class="table"><table class="inline"><tbody>'; foreach($PARSER_MODES as $mode => $modes){ $doc .= '<tr>'; $doc .= '<td class="leftalign">'; @@ -217,7 +217,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $doc .= '</td>'; $doc .= '</tr>'; } - $doc .= '</tbody></table>'; + $doc .= '</tbody></table></div>'; return $doc; } diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index 6aab4ba3c..b2571f632 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -59,7 +59,7 @@ class ap_download extends ap_manage { return false; } - if (!$file = io_download($url, "$tmp/", true, $file)) { + if (!$file = io_download($url, "$tmp/", true, $file, 0)) { $this->manager->error = sprintf($this->lang['error_download'],$url)."\n"; } diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php index fb148f263..12480e922 100644 --- a/lib/plugins/plugin/classes/ap_manage.class.php +++ b/lib/plugins/plugin/classes/ap_manage.class.php @@ -90,8 +90,8 @@ class ap_manage { ptln(' <fieldset'.$class.'>'); ptln(' <legend>'.$plugin.'</legend>'); - ptln(' <input type="checkbox" class="enable" name="enabled[]" value="'.$plugin.'"'.$checked.$check_disabled.' />'); - ptln(' <h3 class="legend">'.$plugin.'</h3>'); + ptln(' <input type="checkbox" class="enable" name="enabled[]" id="dw__p_'.$plugin.'" value="'.$plugin.'"'.$checked.$check_disabled.' />'); + ptln(' <h3 class="legend"><label for="dw__p_'.$plugin.'">'.$plugin.'</label></h3>'); $this->html_button($plugin, 'info', false, 6); if (in_array('settings', $this->manager->functions)) { diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php index 0ccabf344..1fd360dca 100644 --- a/lib/plugins/plugin/lang/cs/lang.php +++ b/lib/plugins/plugin/lang/cs/lang.php @@ -11,6 +11,7 @@ * @author Lefty <lefty@multihost.cz> * @author Vojta Beran <xmamut@email.cz> * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com> */ $lang['menu'] = 'Správa pluginů'; $lang['download'] = 'Stáhnout a instalovat plugin'; diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt index c43e44684..f90b627f3 100644 --- a/lib/plugins/plugin/lang/fr/admin_plugin.txt +++ b/lib/plugins/plugin/lang/fr/admin_plugin.txt @@ -1,4 +1,4 @@ ====== Gestion des modules externes ====== -Cette page vous permet de gérer tout ce qui a trait aux [[doku>plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web. +Cette page vous permet de gérer tout ce qui a trait aux [[doku>fr:plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web. diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index b86c57b53..bb0b49872 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -16,6 +16,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestion des modules externes'; $lang['download'] = 'Télécharger et installer un nouveau module'; diff --git a/lib/plugins/plugin/lang/gl/lang.php b/lib/plugins/plugin/lang/gl/lang.php index 157911a62..a314b71b9 100644 --- a/lib/plugins/plugin/lang/gl/lang.php +++ b/lib/plugins/plugin/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio <medulio@ciberirmandade.org> + * @author Oscar M. Lage <r0sk10@gmail.com> */ $lang['menu'] = 'Xestionar Extensións'; $lang['download'] = 'Descargar e instalar unha nova extensión'; @@ -48,3 +49,4 @@ $lang['enabled'] = 'Extensión %s activado.'; $lang['notenabled'] = 'A extensión %s non puido ser activada, comproba os permisos de arquivo.'; $lang['disabled'] = 'Extensión %s desactivada.'; $lang['notdisabled'] = 'A extensión %s non puido ser desactivada, comproba os permisos de arquivo.'; +$lang['packageinstalled'] = 'Paquete de extensión (%d plugin(s): %s) instalado axeitadamente.'; diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php index c77c3259d..b15b377a6 100644 --- a/lib/plugins/plugin/lang/ko/lang.php +++ b/lib/plugins/plugin/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author Song Younghwan <purluno@gmail.com> * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> + * @author erial2@gmail.com */ $lang['menu'] = '플러그인 관리자'; $lang['download'] = '새로운 플러그인 다운로드 및 설치'; diff --git a/lib/plugins/plugin/lang/ms/lang.php b/lib/plugins/plugin/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/plugin/lang/ms/lang.php @@ -0,0 +1,6 @@ +<?php +/** + * Malay language file + * + * @author Markos + */ diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index 18662e15b..0599c3184 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra <hofstra.m@gmail.com> * @author Timon Van Overveldt <timonvo@gmail.com> * @author Jeroen + * @author Ricardo Guijt <ricardoguijt@gmail.com> */ $lang['menu'] = 'Plugins beheren'; $lang['download'] = 'Download en installeer een nieuwe plugin'; @@ -57,4 +58,4 @@ $lang['enabled'] = 'Plugin %s ingeschakeld.'; $lang['notenabled'] = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.'; $lang['disabled'] = 'Plugin %s uitgeschakeld.'; $lang['notdisabled'] = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.'; diff --git a/lib/plugins/plugin/lang/no/admin_plugin.txt b/lib/plugins/plugin/lang/no/admin_plugin.txt index f1b63b992..1765b671d 100644 --- a/lib/plugins/plugin/lang/no/admin_plugin.txt +++ b/lib/plugins/plugin/lang/no/admin_plugin.txt @@ -1,3 +1,3 @@ -====== Behandle tillegg ====== +====== Behandle programtillegg ====== På denne siden kan du behandle alt som har å gjøre med DokuWikis [[doku>plugins|tillegg]]. For å kunne laste ned og installere et tillegg må webserveren ha skrivetilgang til mappen for tillegg. diff --git a/lib/plugins/plugin/lang/no/lang.php b/lib/plugins/plugin/lang/no/lang.php index 41f6d1153..829d29387 100644 --- a/lib/plugins/plugin/lang/no/lang.php +++ b/lib/plugins/plugin/lang/no/lang.php @@ -14,10 +14,11 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe <jonmagneboe@hotmail.com> + * @author Egil Hansen <egil@rosetta.no> */ -$lang['menu'] = 'Behandle tillegg'; -$lang['download'] = 'Last ned og installer et tillegg'; -$lang['manage'] = 'Installerte tillegg'; +$lang['menu'] = 'Behandle programtillegg'; +$lang['download'] = 'Last ned og installer et programtillegg'; +$lang['manage'] = 'Installerte programtillegg'; $lang['btn_info'] = 'informasjon'; $lang['btn_update'] = 'oppdater'; $lang['btn_delete'] = 'slett'; @@ -31,7 +32,7 @@ $lang['source'] = 'Kilde:'; $lang['unknown'] = 'ukjent'; $lang['updating'] = 'Oppdaterer ...'; $lang['updated'] = 'Tillegget %s er oppdatert'; -$lang['updates'] = 'De følgende tilleggene har blitt oppdatert'; +$lang['updates'] = 'Følgende programtillegg har blitt oppdatert'; $lang['update_none'] = 'Ingen oppdateringer funnet.'; $lang['deleting'] = 'Sletter ...'; $lang['deleted'] = 'Tillegget %s ble slettet.'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index a84c55190..02459f1de 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author maros <dobrimaros@yahoo.pl> * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> + * @author Begina Felicysym <begina.felicysym@wp.eu> */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; @@ -58,3 +59,4 @@ $lang['enabled'] = 'Wtyczka %s włączona.'; $lang['notenabled'] = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.'; $lang['disabled'] = 'Wtyczka %s wyłączona.'; $lang['notdisabled'] = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.'; +$lang['packageinstalled'] = 'Pakiet wtyczek (%d wtyczki:% s) zainstalowany pomyślnie.'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 9c90f77a3..50f6ca6f6 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Marius Olar <olarmariusalex@yahoo.com> */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php index 757b607f5..f011c9954 100644 --- a/lib/plugins/plugin/lang/ru/lang.php +++ b/lib/plugins/plugin/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov <alexgearbox@gmail.com> * @author Ladyko Andrey <fylh@succexy.spb.ru> * @author Eugene <windy.wanderer@gmail.com> + * @author Johnny Utah <pcpa@cyberpunk.su> */ $lang['menu'] = 'Управление плагинами'; $lang['download'] = 'Скачать и установить новый плагин'; @@ -61,3 +62,4 @@ $lang['enabled'] = 'Плагин %s включён.'; $lang['notenabled'] = 'Не удалось включить плагин %s. Проверьте системные права доступа к файлам.'; $lang['disabled'] = 'Плагин %s отключён.'; $lang['notdisabled'] = 'Не удалось отключить плагин %s. Проверьте системные права доступа к файлам.'; +$lang['packageinstalled'] = 'Пакет (%d плагин(а): %s) успешно установлен.'; diff --git a/lib/plugins/plugin/lang/sl/admin_plugin.txt b/lib/plugins/plugin/lang/sl/admin_plugin.txt index 2e99c6297..5fd02e1ba 100644 --- a/lib/plugins/plugin/lang/sl/admin_plugin.txt +++ b/lib/plugins/plugin/lang/sl/admin_plugin.txt @@ -1,3 +1,3 @@ ====== Upravljanje vstavkov ====== -Na tej strani je mogoe spreminjati in prilagajati nastavitve Dokuwiki [[doku>plugins|vstavkov]]. Za prejemanje in nameanje vstavkov v ustrezne mape, morajo imeti te doloena ustrezna dovoljenja za pisanje spletnega strenika. +Na tej strani je mogoče spreminjati in prilagajati nastavitve DokuWiki [[doku>plugins|vstavkov]]. Za prejemanje in nameščanje vstavkov v ustrezne mape, morajo imeti te določena ustrezna dovoljenja za pisanje spletnega strežnika. diff --git a/lib/plugins/plugin/lang/sl/lang.php b/lib/plugins/plugin/lang/sl/lang.php index 39ba20139..3e5f8c8af 100644 --- a/lib/plugins/plugin/lang/sl/lang.php +++ b/lib/plugins/plugin/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Upravljanje vstavkov'; $lang['download'] = 'Prejmi in namesti nov vstavek'; $lang['manage'] = 'Nameščeni vstavki'; @@ -52,3 +51,4 @@ $lang['enabled'] = 'Vstavek %s je omogočen.'; $lang['notenabled'] = 'Vstavka %s ni mogoče omogočiti zaradi neustreznih dovoljen.'; $lang['disabled'] = 'Vstavek %s je onemogočen.'; $lang['notdisabled'] = 'Vstavka %s ni mogoče onemogočiti zaradi neustreznih dovoljen.'; +$lang['packageinstalled'] = 'Paket vstavka (%d vstavkov: %s) je uspešno nameščen.'; diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php index 3c4827000..54234212d 100644 --- a/lib/plugins/plugin/lang/zh-tw/lang.php +++ b/lib/plugins/plugin/lang/zh-tw/lang.php @@ -54,4 +54,4 @@ $lang['enabled'] = '插件 %s 已啟用。'; $lang['notenabled'] = '插件 %s 無法啟用，請檢查檔案權限。'; $lang['disabled'] = '插件 %s 已停用。'; $lang['notdisabled'] = '插件 %s 無法停用，請檢查檔案權限。'; -$lang['packageinstalled'] = '插件 (%d 插件: %s) 已成功地安裝。'; +$lang['packageinstalled'] = '插件 (%d 插件%s: %s) 已成功地安裝。'; diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 1263029e0..58f05fbd9 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> * @author lainme993@gmail.com + * @author Shuo-Ting Jian <shoting@gmail.com> */ $lang['menu'] = '插件管理器'; $lang['download'] = '下载并安装新的插件'; @@ -59,4 +60,4 @@ $lang['enabled'] = '%s 插件启用'; $lang['notenabled'] = '%s插件启用失败，请检查文件权限。'; $lang['disabled'] = '%s 插件禁用'; $lang['notdisabled'] = '%s插件禁用失败，请检查文件权限。'; -$lang['packageinstalled'] = '插件 (%d plugin(s): %s) 已成功安装。'; +$lang['packageinstalled'] = '插件 (%d plugin%s: %s) 已成功安装。'; diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php index 287bcf3b0..d7c58af2e 100644 --- a/lib/plugins/popularity/lang/cs/lang.php +++ b/lib/plugins/popularity/lang/cs/lang.php @@ -8,6 +8,7 @@ * @author Lefty <lefty@multihost.cz> * @author Vojta Beran <xmamut@email.cz> * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com> */ $lang['name'] = 'Průzkum používání (může chviličku trvat, než se natáhne)'; $lang['submit'] = 'Odeslat data'; diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index ae12c6683..9ff7a7e8b 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -13,11 +13,12 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)'; $lang['submit'] = 'Envoyer les données'; $lang['autosubmit'] = 'Envoyer les données automatiquement chaque mois'; $lang['submissionFailed'] = 'Les données ne peuvent pas être envoyées à cause des erreurs suivantes :'; -$lang['submitDirectly'] = 'Vous pouvez envoyer le données manuellement en soumettant ce formulaire.'; +$lang['submitDirectly'] = 'Vous pouvez envoyer le données manuellement en soumettant ce formulaire.'; $lang['autosubmitError'] = 'La dernière soumission automatique a échoué pour les raisons suivantes :'; -$lang['lastSent'] = 'Les données ont été envoyées'; +$lang['lastSent'] = 'Les données ont été envoyées '; diff --git a/lib/plugins/popularity/lang/gl/lang.php b/lib/plugins/popularity/lang/gl/lang.php index 3e7d9275b..34bd3935f 100644 --- a/lib/plugins/popularity/lang/gl/lang.php +++ b/lib/plugins/popularity/lang/gl/lang.php @@ -3,6 +3,12 @@ * Galician language file * * @author Medúlio <medulio@ciberirmandade.org> + * @author Oscar M. Lage <r0sk10@gmail.com> */ $lang['name'] = 'Resposta de Popularidade (pode demorar un tempo a cargar)'; $lang['submit'] = 'Enviar Datos'; +$lang['autosubmit'] = 'Enviar datos automáticamente unha vez por mes'; +$lang['submissionFailed'] = 'Os datos non se poden enviar debido ao seguinte erro:'; +$lang['submitDirectly'] = 'Podes enviar os datos de forma manual co seguinte formulario.'; +$lang['autosubmitError'] = 'O último envío automático fallou debido ao seguinte erro:'; +$lang['lastSent'] = 'Os datos foron enviados'; diff --git a/lib/plugins/popularity/lang/gl/submitted.txt b/lib/plugins/popularity/lang/gl/submitted.txt new file mode 100644 index 000000000..0dec55eef --- /dev/null +++ b/lib/plugins/popularity/lang/gl/submitted.txt @@ -0,0 +1,3 @@ +====== Resposta de Popularidade ====== + +Os datos foron enviados satisfactoriamente.
\ No newline at end of file diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php index 0f1442d53..01bc51044 100644 --- a/lib/plugins/popularity/lang/ko/lang.php +++ b/lib/plugins/popularity/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan <purluno@gmail.com> * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> + * @author erial2@gmail.com */ $lang['name'] = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)'; $lang['submit'] = '자료 보내기'; diff --git a/lib/plugins/popularity/lang/ms/lang.php b/lib/plugins/popularity/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/popularity/lang/ms/lang.php @@ -0,0 +1,6 @@ +<?php +/** + * Malay language file + * + * @author Markos + */ diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php index 75c13013b..e5e94aab4 100644 --- a/lib/plugins/popularity/lang/nl/lang.php +++ b/lib/plugins/popularity/lang/nl/lang.php @@ -11,6 +11,7 @@ * @author Marijn Hofstra <hofstra.m@gmail.com> * @author Timon Van Overveldt <timonvo@gmail.com> * @author Jeroen + * @author Ricardo Guijt <ricardoguijt@gmail.com> */ $lang['name'] = 'Populariteitsfeedback (kan even duren om in te laden)'; $lang['submit'] = 'Verstuur'; diff --git a/lib/plugins/popularity/lang/no/intro.txt b/lib/plugins/popularity/lang/no/intro.txt index 3e67d793c..a0f360157 100644 --- a/lib/plugins/popularity/lang/no/intro.txt +++ b/lib/plugins/popularity/lang/no/intro.txt @@ -1,9 +1,9 @@ ====== Popularitetsfeedback ====== -Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av dets brukere, og gjør at fremtidig beslutninger om videre utvikling kan tuftes på statistikk fra virkelig bruk. +Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av brukerne, og gjør at fremtidig beslutninger om videre utvikling kan baseres på statistikk fra virkelig bruk. Du oppfordres herved til å gjenta dette skrittet fra tid til annen for å holde utviklerne informert når din wiki vokser. Ditt gjentatte datasett blir identifisert vha en anonym ID. De data som samles inn inneholder informasjon som din DokuWiki-versjon, antallet og størrelsen på sider og filer, installerte plugins og informasjon om din installerte PHP. -Rådata som blir sendt vises nedenfor. Vennligst bruk knappen "Send data" for å overføre informasjonen.
\ No newline at end of file +Rådata som blir sendt vises nedenfor. Bruk knappen "Send data" for å overføre informasjonen.
\ No newline at end of file diff --git a/lib/plugins/popularity/lang/no/lang.php b/lib/plugins/popularity/lang/no/lang.php index e283fc371..df38f6e0e 100644 --- a/lib/plugins/popularity/lang/no/lang.php +++ b/lib/plugins/popularity/lang/no/lang.php @@ -12,11 +12,12 @@ * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Thomas Nygreen <nygreen@gmail.com> * @author Jon Bøe <jonmagneboe@hotmail.com> + * @author Egil Hansen <egil@rosetta.no> */ $lang['name'] = 'Popularitetsfeedback (kan ta litt tid å laste)'; $lang['submit'] = 'Send data'; $lang['autosubmit'] = 'Send data automatisk en gang i måneden'; $lang['submissionFailed'] = 'Kunne ikke sende dataene på grunn av følgende feil:'; $lang['submitDirectly'] = 'Du kan sende dataene manuelt ved å sende inn dette skjemaet.'; -$lang['autosubmitError'] = 'Den siste automatiske innsendinga feilet på grunn av følgende feil:'; +$lang['autosubmitError'] = 'Den siste automatiske innsendingen feilet på grunn av følgende feil:'; $lang['lastSent'] = 'Dataene er sendt'; diff --git a/lib/plugins/popularity/lang/no/submitted.txt b/lib/plugins/popularity/lang/no/submitted.txt index 239676a9d..ccec7674e 100644 --- a/lib/plugins/popularity/lang/no/submitted.txt +++ b/lib/plugins/popularity/lang/no/submitted.txt @@ -1,3 +1,3 @@ ====== Tilbakemelding om popularitet ====== -Innsending av dataene var vellykka.
\ No newline at end of file +Innsending av dataene var vellykket.
\ No newline at end of file diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index d96254fd8..64d772d54 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author maros <dobrimaros@yahoo.pl> * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> + * @author Begina Felicysym <begina.felicysym@wp.eu> */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 7f3508362..9e9086b0d 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -7,6 +7,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Marius Olar <olarmariusalex@yahoo.com> */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php index 79b3e224d..0e29c795d 100644 --- a/lib/plugins/popularity/lang/ru/lang.php +++ b/lib/plugins/popularity/lang/ru/lang.php @@ -13,6 +13,7 @@ * @author Aleksandr Selivanov <alexgearbox@gmail.com> * @author Ladyko Andrey <fylh@succexy.spb.ru> * @author Eugene <windy.wanderer@gmail.com> + * @author Johnny Utah <pcpa@cyberpunk.su> */ $lang['name'] = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)'; $lang['submit'] = 'Отправить данные'; diff --git a/lib/plugins/popularity/lang/sl/intro.txt b/lib/plugins/popularity/lang/sl/intro.txt index ceb0e61e6..2c029db63 100644 --- a/lib/plugins/popularity/lang/sl/intro.txt +++ b/lib/plugins/popularity/lang/sl/intro.txt @@ -1,9 +1,9 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni Dokuwiki strani in omogoa poiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo naine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statistinimi podatki vpliva tudi na nadaljnji razvoj sistema. +To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni DokuWiki strani in omogoča pošiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo načine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statističnimi podatki vpliva tudi na nadaljnji razvoj sistema. -Priporoeno je, da poroilo o uporabi poljete vsake toliko asa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletia in pogostosti uporabe. Vsi podatki so poslani oznaeni s posebno vpisno tevilko, ki omogoa brezimno sledenje. +Priporočeno je, da poročilo o uporabi pošljete vsake toliko časa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletišča in pogostosti uporabe. Vsi podatki so poslani označeni s posebno vpisno številko, ki omogoča brezimno sledenje. -Zbrani podatki vsebujejo podrobnosti o razliici uporabljenega sistema DokuWiki, tevilo in velikost wiki strani, datotekah, ki so naloene na sistem in podatke o vstavkih ter PHP namestitvi in razliici. +Zbrani podatki vsebujejo podrobnosti o različici uporabljenega sistema DokuWiki, število in velikost wiki strani, datotekah, ki so naložene na sistem in podatke o vstavkih ter PHP namestitvi in različici. -Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Polji podatke", bodo ti poslani na strenik razvijalcev. +Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Pošlji podatke", bodo ti poslani na strežnik razvijalcev. diff --git a/lib/plugins/popularity/lang/sl/submitted.txt b/lib/plugins/popularity/lang/sl/submitted.txt index 988afd837..11ae052f7 100644 --- a/lib/plugins/popularity/lang/sl/submitted.txt +++ b/lib/plugins/popularity/lang/sl/submitted.txt @@ -1,3 +1,3 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -Podatki so bili uspeno poslani. +Podatki so bili uspešno poslani. diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php index f45aaf4ff..9c916c2a5 100644 --- a/lib/plugins/popularity/lang/zh/lang.php +++ b/lib/plugins/popularity/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> * @author lainme993@gmail.com + * @author Shuo-Ting Jian <shoting@gmail.com> */ $lang['name'] = '人气反馈（载入可能需要一些时间）'; $lang['submit'] = '发送数据'; diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php index cf19381c8..5414ea1e5 100644 --- a/lib/plugins/revert/lang/cs/lang.php +++ b/lib/plugins/revert/lang/cs/lang.php @@ -11,6 +11,7 @@ * @author Lefty <lefty@multihost.cz> * @author Vojta Beran <xmamut@email.cz> * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com> */ $lang['menu'] = 'Obnova zaspamovaných stránek'; $lang['filter'] = 'Hledat zaspamované stránky'; diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 15d4d39c3..9c5194b31 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -14,6 +14,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; diff --git a/lib/plugins/revert/lang/gl/lang.php b/lib/plugins/revert/lang/gl/lang.php index 87bce32ba..a0c5a9785 100644 --- a/lib/plugins/revert/lang/gl/lang.php +++ b/lib/plugins/revert/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio <medulio@ciberirmandade.org> + * @author Oscar M. Lage <r0sk10@gmail.com> */ $lang['menu'] = 'Xestor de Reversión'; $lang['filter'] = 'Procurar páxinas con correo-lixo'; diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php index 0163d2754..da689c788 100644 --- a/lib/plugins/revert/lang/ko/lang.php +++ b/lib/plugins/revert/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan <purluno@gmail.com> * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> + * @author erial2@gmail.com */ $lang['menu'] = '복구 관리자'; $lang['filter'] = '스팸 페이지 검색 '; diff --git a/lib/plugins/revert/lang/ms/lang.php b/lib/plugins/revert/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/revert/lang/ms/lang.php @@ -0,0 +1,6 @@ +<?php +/** + * Malay language file + * + * @author Markos + */ diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php index 954bf1068..32e14c2c4 100644 --- a/lib/plugins/revert/lang/nl/lang.php +++ b/lib/plugins/revert/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra <hofstra.m@gmail.com> * @author Timon Van Overveldt <timonvo@gmail.com> * @author Jeroen + * @author Ricardo Guijt <ricardoguijt@gmail.com> */ $lang['menu'] = 'Herstelmanager'; $lang['filter'] = 'Zoek naar bekladde pagina\'s'; diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php index 2a6a2abd3..299b12ea7 100644 --- a/lib/plugins/revert/lang/no/lang.php +++ b/lib/plugins/revert/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe <jonmagneboe@hotmail.com> + * @author Egil Hansen <egil@rosetta.no> */ $lang['menu'] = 'Tilbakestillingsbehandler'; $lang['filter'] = 'Søk etter søppelmeldinger'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index f36dc591a..30ab60fda 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -10,6 +10,7 @@ * @author maros <dobrimaros@yahoo.pl> * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> + * @author Begina Felicysym <begina.felicysym@wp.eu> */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index 7397a1d74..f1fcf727c 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Marius Olar <olarmariusalex@yahoo.com> */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php index 9624d8fd6..4abe37e6a 100644 --- a/lib/plugins/revert/lang/ru/lang.php +++ b/lib/plugins/revert/lang/ru/lang.php @@ -14,6 +14,7 @@ * @author Aleksandr Selivanov <alexgearbox@gmail.com> * @author Ladyko Andrey <fylh@succexy.spb.ru> * @author Eugene <windy.wanderer@gmail.com> + * @author Johnny Utah <pcpa@cyberpunk.su> */ $lang['menu'] = 'Менеджер откаток'; $lang['filter'] = 'Поиск спам-страниц'; diff --git a/lib/plugins/revert/lang/sl/intro.txt b/lib/plugins/revert/lang/sl/intro.txt index c63f281ed..4e2cabf96 100644 --- a/lib/plugins/revert/lang/sl/intro.txt +++ b/lib/plugins/revert/lang/sl/intro.txt @@ -1,3 +1,3 @@ ====== Povrnitev okvarjene vsebine ====== -Na tej strani je mogoe povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neelenih vsebin. Za iskanje strani z neeleno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neeleno vsebino in nato povrnite stanje na zadnjo pravo razliico. +Na tej strani je mogoče povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neželenih vsebin. Za iskanje strani z neželeno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neželeno vsebino in nato povrnite stanje na zadnjo pravo različico. diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php index c3d1639ff..d4d010f29 100644 --- a/lib/plugins/revert/lang/zh/lang.php +++ b/lib/plugins/revert/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> * @author lainme993@gmail.com + * @author Shuo-Ting Jian <shoting@gmail.com> */ $lang['menu'] = '还原管理器'; $lang['filter'] = '搜索包含垃圾信息的页面'; diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 8e90be093..8b646b426 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -149,6 +149,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } ptln("<form action=\"".wl($ID)."\" method=\"post\">"); formSecurityToken(); + ptln(" <div class=\"table\">"); ptln(" <table class=\"inline\">"); ptln(" <thead>"); ptln(" <tr>"); @@ -206,6 +207,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" </td></tr>"); ptln(" </tbody>"); ptln(" </table>"); + ptln(" </div>"); ptln("</form>"); ptln("</div>"); @@ -256,6 +258,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln("<form action=\"".wl($ID)."\" method=\"post\">",$indent); formSecurityToken(); + ptln(" <div class=\"table\">",$indent); ptln(" <table class=\"inline\">",$indent); ptln(" <thead>",$indent); ptln(" <tr><th>".$this->lang["field"]."</th><th>".$this->lang["value"]."</th></tr>",$indent); @@ -295,6 +298,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" </tr>",$indent); ptln(" </tbody>",$indent); ptln(" </table>",$indent); + ptln(" </div>",$indent); foreach ($notes as $note) ptln("<div class=\"fn\">".$note."</div>",$indent); diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index fe54d4cce..8351c190b 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Lefty <lefty@multihost.cz> * @author Vojta Beran <xmamut@email.cz> * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com> */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 875b6d1a6..948262a8f 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -15,6 +15,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php index 0a01ef750..c9c633b39 100644 --- a/lib/plugins/usermanager/lang/gl/lang.php +++ b/lib/plugins/usermanager/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio <medulio@ciberirmandade.org> + * @author Oscar M. Lage <r0sk10@gmail.com> */ $lang['menu'] = 'Xestor de Usuarios'; $lang['noauth'] = '(autenticación de usuarios non dispoñible)'; diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index f2322414a..111267e5f 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan <purluno@gmail.com> * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> + * @author erial2@gmail.com */ $lang['menu'] = '사용자 관리자'; $lang['noauth'] = '(사용자 인증이 불가능합니다.)'; diff --git a/lib/plugins/usermanager/lang/ms/lang.php b/lib/plugins/usermanager/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/usermanager/lang/ms/lang.php @@ -0,0 +1,6 @@ +<?php +/** + * Malay language file + * + * @author Markos + */ diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index cac793386..b00ab22e0 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra <hofstra.m@gmail.com> * @author Timon Van Overveldt <timonvo@gmail.com> * @author Jeroen + * @author Ricardo Guijt <ricardoguijt@gmail.com> */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; diff --git a/lib/plugins/usermanager/lang/no/lang.php b/lib/plugins/usermanager/lang/no/lang.php index 668863ec2..7124e4811 100644 --- a/lib/plugins/usermanager/lang/no/lang.php +++ b/lib/plugins/usermanager/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe <jonmagneboe@hotmail.com> + * @author Egil Hansen <egil@rosetta.no> */ $lang['menu'] = 'Behandle brukere'; $lang['noauth'] = '(autentisering av brukere ikke tilgjengelig)'; @@ -28,7 +29,7 @@ $lang['field'] = 'Felt'; $lang['value'] = 'Verdi'; $lang['add'] = 'Legg til'; $lang['delete'] = 'Slett'; -$lang['delete_selected'] = 'Slett utvalgte'; +$lang['delete_selected'] = 'Slett valgte'; $lang['edit'] = 'Rediger'; $lang['edit_prompt'] = 'Rediger denne brukeren'; $lang['modify'] = 'Lagre endringer'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 7c79c5d1f..5bbf84370 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author maros <dobrimaros@yahoo.pl> * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> + * @author Begina Felicysym <begina.felicysym@wp.eu> */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 4c0afc896..7aac6cfb0 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Marius Olar <olarmariusalex@yahoo.com> */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 456ba5b29..eb9f26be6 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov <alexgearbox@gmail.com> * @author Ladyko Andrey <fylh@succexy.spb.ru> * @author Eugene <windy.wanderer@gmail.com> + * @author Johnny Utah <pcpa@cyberpunk.su> */ $lang['menu'] = 'Управление пользователями'; $lang['noauth'] = '(авторизация пользователей недоступна)'; diff --git a/lib/plugins/usermanager/lang/sl/delete.txt b/lib/plugins/usermanager/lang/sl/delete.txt index 7d9de54e6..1fd4fffe1 100644 --- a/lib/plugins/usermanager/lang/sl/delete.txt +++ b/lib/plugins/usermanager/lang/sl/delete.txt @@ -1 +1 @@ -===== Izbrisanje uporabnika =====
\ No newline at end of file +===== Izbris uporabnika =====
\ No newline at end of file diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php index c1cb0c91a..e7a228229 100644 --- a/lib/plugins/usermanager/lang/zh/lang.php +++ b/lib/plugins/usermanager/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> * @author lainme993@gmail.com + * @author Shuo-Ting Jian <shoting@gmail.com> */ $lang['menu'] = '用户管理器'; $lang['noauth'] = '（用户认证不可用）'; diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js index 20b408322..cffdde042 100644 --- a/lib/scripts/behaviour.js +++ b/lib/scripts/behaviour.js @@ -16,7 +16,7 @@ var dw_behaviour = { dw_behaviour.subscription(); dw_behaviour.revisionBoxHandler(); - jQuery('#page__revisions input[type=checkbox]').click( + jQuery('#page__revisions input[type=checkbox]').live('click', dw_behaviour.revisionBoxHandler ); }, diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js index ea52153c5..385e45854 100644 --- a/lib/scripts/compatibility.js +++ b/lib/scripts/compatibility.js @@ -49,7 +49,7 @@ function DEPRECATED_WRAP(func, context) { * @link http://prototype.conio.net/ */ function $() { - DEPRECATED('Please use the JQuery() function instead.'); + DEPRECATED('Please use the jQuery() function instead.'); var elements = new Array(); diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index 2009ce6af..042e34608 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -61,9 +61,9 @@ var dw_editor = { jQuery.each([ ['larger', function(){dw_editor.sizeCtl(editor,100);}], ['smaller', function(){dw_editor.sizeCtl(editor,-100);}], - ['wrap', function(){dw_editor.toggleWrap(editor);}], + ['wrap', function(){dw_editor.toggleWrap(editor);}] ], function (_, img) { - jQuery(document.createElement('img')) + jQuery(document.createElement('IMG')) .attr('src', DOKU_BASE+'lib/images/' + img[0] + '.gif') .click(img[1]) .appendTo($ctl); @@ -130,7 +130,7 @@ var dw_editor = { * @param event e - the key press event object */ keyHandler: function(e){ - if([8, 13, 32].indexOf(e.keyCode) === -1) { + if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) { return; } var selection = getSelection(this); diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index f92bdbc49..4abd63bef 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -55,9 +55,11 @@ qq.extend(qq.FileUploader.prototype, { qq.setText(fileElement, fileName); this._find(item, 'size').style.display = 'none'; + // name suggestion (simplified cleanID) var nameElement = this._find(item, 'nameInput'); fileName = fileName.toLowerCase(); - fileName = fileName.replace(/([^a-z0-9_\.\-]+)/g, '_'); + fileName = fileName.replace(/([ !"#$%&\'()+,\/;<=>?@[\]^`{|}~:]+)/g, '_'); + fileName = fileName.replace(/^_+/,''); nameElement.value = fileName; nameElement.id = 'mediamanager__upload_item'+id; diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index cc4c19e0d..5075a0ab8 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -35,14 +35,13 @@ var dw_linkwiz = { ) .parent() .attr('id','link__wiz') - .addClass('a11y') .css({ 'position': 'absolute', 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .show() - .appendTo('div.dokuwiki'); + .hide() + .appendTo('.dokuwiki:first'); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; @@ -186,7 +185,7 @@ var dw_linkwiz = { */ resultClick: function(a){ dw_linkwiz.$entry.val(a.title); - if(a.title == '' || a.title.substr(-1) == ':'){ + if(a.title == '' || a.title.substr(a.title.length-1) == ':'){ dw_linkwiz.autocomplete_exec(); }else{ if (jQuery(a.nextSibling).is('span')) { @@ -283,7 +282,7 @@ var dw_linkwiz = { */ show: function(){ dw_linkwiz.selection = getSelection(dw_linkwiz.textArea); - dw_linkwiz.$wiz.removeClass('a11y'); + dw_linkwiz.$wiz.show(); dw_linkwiz.$entry.focus(); dw_linkwiz.autocomplete(); }, @@ -292,7 +291,7 @@ var dw_linkwiz = { * Hide the link wizard */ hide: function(){ - dw_linkwiz.$wiz.addClass('a11y'); + dw_linkwiz.$wiz.hide(); dw_linkwiz.textArea.focus(); }, @@ -300,7 +299,7 @@ var dw_linkwiz = { * Toggle the link wizard */ toggle: function(){ - if(dw_linkwiz.$wiz.hasClass('a11y')){ + if(dw_linkwiz.$wiz.css('display') == 'none'){ dw_linkwiz.show(); }else{ dw_linkwiz.hide(); diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 7f5514f56..841baa93f 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -135,7 +135,7 @@ var dw_mediamanager = { }); $sortBy.children('input').change(function (event) { dw_mediamanager.set_fileview_sort(); - dw_mediamanager.list.call(this, event); + dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event); }); }, @@ -253,8 +253,10 @@ var dw_mediamanager = { } } } - alignleft = dw_mediamanager.align === '2' ? '' : ' '; - alignright = dw_mediamanager.align === '4' ? '' : ' '; + if (dw_mediamanager.align !== '1') { + alignleft = dw_mediamanager.align === '2' ? '' : ' '; + alignright = dw_mediamanager.align === '4' ? '' : ' '; + } } } edid = String.prototype.match.call(document.location, /&edid=([^&]+)/); @@ -371,6 +373,10 @@ var dw_mediamanager = { if (typeof new_val === 'undefined') { new_val = jQuery('form.options li.' + opt[1] + ' input') .filter(':checked').val(); + // if new_val is still undefined (because form.options is not in active tab), set to most spacious option + if (typeof new_val === 'undefined') { + new_val = 'thumbs'; + } } if (new_val !== dw_mediamanager.view_opts[opt[0]]) { diff --git a/lib/scripts/page.js b/lib/scripts/page.js index e4033b76d..5da4a9cc0 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -43,7 +43,7 @@ dw_page = { * * @param target - the DOM element at which the popup should be aligned at * @param popup_id - the ID of the (new) DOM popup - * @return the Popup JQuery object + * @return the Popup jQuery object */ insituPopup: function(target, popup_id) { // get or create the popup div @@ -55,7 +55,7 @@ dw_page = { .attr('id', popup_id) .addClass('insitu-footnote JSpopup') .mouseleave(function () {jQuery(this).hide();}); - jQuery('div.dokuwiki:first').append($fndiv); + jQuery('.dokuwiki:first').append($fndiv); } // position() does not support hidden elements diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js index c7128b9e3..a309f9e29 100644 --- a/lib/scripts/qsearch.js +++ b/lib/scripts/qsearch.js @@ -18,8 +18,8 @@ var dw_qsearch = { * * Attaches the event handlers * - * @param input element (JQuery selector/DOM obj) - * @param output element (JQuery selector/DOM obj) + * @param input element (jQuery selector/DOM obj) + * @param output element (jQuery selector/DOM obj) */ init: function (input, output) { var do_qsearch; diff --git a/lib/tpl/default/_linkwiz.css b/lib/tpl/default/_linkwiz.css index fd40a0019..ca8812867 100644 --- a/lib/tpl/default/_linkwiz.css +++ b/lib/tpl/default/_linkwiz.css @@ -1,27 +1,4 @@ #link__wiz { - position: absolute; - display: block; - z-index: 99; - width: 300px; - height: 250px; - padding: 0; - margin: 0; - overflow: hidden; - border: 1px solid __border__; - background-color: __background_neu__; - text-align: center; -} - -#link__wiz_header { - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; - cursor: move; -} - -#link__wiz_close { - cursor: pointer; - margin: 0; } #link__wiz_result { @@ -61,9 +38,3 @@ display: block; color: __text_neu__; } - -/*FIXME maybe move to a more general style sheet*/ -.ondrag { - cursor: move; - opacity: 0.8; -} diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 383a1597c..68fa2e97f 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -59,6 +59,7 @@ background-color: __background_alt__; } + /*____________ Namespaces tree ____________*/ #mediamanager__page .namespaces h2 { @@ -406,10 +407,12 @@ } #mediamanager__diff .imageDiff .image1, #mediamanager__diff .imageDiff .image2 { + width: 97%; +} +#mediamanager__diff .imageDiff .image2 { position: absolute; top: 0; left: 0; - width: 97%; } #mediamanager__diff .imageDiff.opacity .image2 { |