From 592ad5dc0c8fb710fc3c24e5b0007cd12b229cb6 Mon Sep 17 00:00:00 2001 From: Piotr JANKOWSKI Date: Tue, 5 Jan 2010 20:13:27 +0100 Subject: Polish language update --- lib/plugins/config/lang/pl/lang.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 976712f85..2d3b29db8 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -7,13 +7,14 @@ * @author Mariusz Kujawski * @author Maciej Kurczewski * @author Sławomir Boczek + * @author Piotr JANKOWSKI */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
Niepoprawne wartości są wyróżnione kolorem czerwonym.'; $lang['updated'] = 'Ustawienia zostały zmienione.'; $lang['nochoice'] = '(brak innych możliwości)'; $lang['locked'] = 'Plik ustawień nie mógł zostać zmieniony, upewnij się, czy uprawnienia do pliku są odpowiednie.'; -$lang['danger'] = 'Uwaga: Zmiana tej opcji może uniemożliwić dostęp do twojej wiki oraz konfogiracji.'; +$lang['danger'] = 'Uwaga: Zmiana tej opcji może uniemożliwić dostęp do twojej wiki oraz konfiguracji.'; $lang['warning'] = 'Ostrzeżenie: Zmiana tej opcji może spowodować nieporządane skutki.'; $lang['security'] = 'Alert bezpieczeństwa: Zmiana tej opcji może obniżyć bezpieczeństwo.'; $lang['_configuration_manager'] = 'Menadżer konfiguracji'; -- cgit v1.2.3 From c654938d56942c3166921564392e7d087ce06311 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 5 Jan 2010 20:19:09 +0100 Subject: Chinese language update --- lib/plugins/acl/lang/zh/lang.php | 1 + lib/plugins/config/lang/zh/lang.php | 3 ++- lib/plugins/plugin/lang/zh/lang.php | 1 + lib/plugins/popularity/lang/zh/lang.php | 1 + lib/plugins/revert/lang/zh/lang.php | 1 + lib/plugins/usermanager/lang/zh/lang.php | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 6ae32b01c..f9f924089 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -8,6 +8,7 @@ * @author George Sheraton guxd@163.com * @author Simon zhan * @author mr.jinyi@gmail.com + * @author ben */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index d5f8b653c..404cc706a 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -8,6 +8,7 @@ * @author George Sheraton guxd@163.com * @author Simon zhan * @author mr.jinyi@gmail.com + * @author ben */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。 @@ -90,6 +91,7 @@ $lang['disableactions_other'] = '其他功能（用英文逗号分隔）'; $lang['sneaky_index'] = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。'; $lang['auth_security_timeout'] = '认证安全超时（秒）'; $lang['securecookie'] = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗？请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。'; +$lang['xmlrpc'] = '启用/禁用 XML-RPC 交互界面。'; $lang['updatecheck'] = '自动检查更新并接收安全警告吗？开启该功能后 DokuWiki 将自动访问 splitbrain.org。'; $lang['userewrite'] = '使用更整洁的 URL'; $lang['useslash'] = '在 URL 中使用斜杠作为命名空间的分隔符'; @@ -115,7 +117,6 @@ $lang['send404'] = '发送 "HTTP 404/页面没有找到" 错误信 $lang['sitemap'] = '生成 Google sitemap（天）'; $lang['broken_iua'] = 'ignore_user_abort 功能失效了？这有可能导致搜索索引不可用。IIS+PHP/CGI 已损坏。请参阅 Bug 852 获取更多信息。'; $lang['xsendfile'] = '使用 X-Sendfile 头让服务器发送状态文件？您的服务器需要支持该功能。'; -$lang['xmlrpc'] = '启用/禁用 XML-RPC 交互界面。'; $lang['renderer_xhtml'] = '主维基页面 (xhtml) 输出使用的渲染'; $lang['renderer__core'] = '%s（DokuWiki 内核）'; $lang['renderer__plugin'] = '%s（插件）'; diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 3e269bb06..f53eca96a 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -8,6 +8,7 @@ * @author George Sheraton guxd@163.com * @author Simon zhan * @author mr.jinyi@gmail.com + * @author ben */ $lang['menu'] = '插件管理器'; $lang['download'] = '下载并安装新的插件'; diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php index 88c410970..22fad03b2 100644 --- a/lib/plugins/popularity/lang/zh/lang.php +++ b/lib/plugins/popularity/lang/zh/lang.php @@ -7,6 +7,7 @@ * @author George Sheraton guxd@163.com * @author Simon zhan * @author mr.jinyi@gmail.com + * @author ben */ $lang['name'] = '人气反馈（载入可能需要一些时间）'; $lang['submit'] = '发送数据'; diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php index 6241b712b..892cf2dbe 100644 --- a/lib/plugins/revert/lang/zh/lang.php +++ b/lib/plugins/revert/lang/zh/lang.php @@ -8,6 +8,7 @@ * @author George Sheraton guxd@163.com * @author Simon zhan * @author mr.jinyi@gmail.com + * @author ben */ $lang['menu'] = '还原管理器'; $lang['filter'] = '搜索包含垃圾信息的页面'; diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php index 55044ce65..613826329 100644 --- a/lib/plugins/usermanager/lang/zh/lang.php +++ b/lib/plugins/usermanager/lang/zh/lang.php @@ -7,6 +7,7 @@ * @author George Sheraton guxd@163.com * @author Simon zhan * @author mr.jinyi@gmail.com + * @author ben */ $lang['menu'] = '用户管理器'; $lang['noauth'] = '（用户认证不可用）'; -- cgit v1.2.3 From ca09b77d620896e202fa5eb4da4d30eed0c92ba3 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 9 Jan 2010 13:05:24 +0100 Subject: Avoid whitespace because of toolbar pickers FS#1841 --- lib/scripts/edit.js | 1 + lib/scripts/linkwiz.js | 3 +++ lib/scripts/toolbar.js | 3 +++ 3 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index ef0a9a106..a80c8a06e 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -68,6 +68,7 @@ function createPicker(id,props,edid){ picker.id = id; picker.style.position = 'absolute'; picker.style.marginLeft = '-10000px'; // no display:none, to keep access keys working + picker.style.marginTop = '-10000px'; for(var key in list){ if (!list.hasOwnProperty(key)) continue; diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index d687ebbeb..4528d9591 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -30,6 +30,7 @@ var linkwiz = { linkwiz.wiz.style.top = (findPosY(textArea)+20)+'px'; linkwiz.wiz.style.left = (findPosX(textArea)+80)+'px'; linkwiz.wiz.style.marginLeft = '-10000px'; + linkwiz.wiz.style.marginTop = '-10000px'; linkwiz.wiz.innerHTML = '
'+ @@ -256,6 +257,7 @@ var linkwiz = { show: function(){ linkwiz.selection = getSelection(linkwiz.textArea); linkwiz.wiz.style.marginLeft = '0px'; + linkwiz.wiz.style.marginTop = '0px'; linkwiz.entry.focus(); linkwiz.autocomplete(); }, @@ -265,6 +267,7 @@ var linkwiz = { */ hide: function(){ linkwiz.wiz.style.marginLeft = '-10000px'; + linkwiz.wiz.style.marginTop = '-10000px'; linkwiz.textArea.focus(); }, diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index eacfc7cad..1e4a91864 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -225,8 +225,10 @@ function pickerToggle(pickerid,btn){ picker.style.left = (x+3)+'px'; picker.style.top = (y+btn.offsetHeight+3)+'px'; picker.style.marginLeft = '0px'; + picker.style.marginTop = '0px'; }else{ picker.style.marginLeft = '-10000px'; + picker.style.marginTop = '-10000px'; } } @@ -239,6 +241,7 @@ function pickerClose(){ var pobjs = getElementsByClass('picker'); for(var i=0; i Date: Mon, 11 Jan 2010 18:19:48 +0100 Subject: German (informal) language update --- lib/plugins/acl/lang/de-informal/lang.php | 1 + lib/plugins/config/lang/de-informal/lang.php | 4 ++++ lib/plugins/plugin/lang/de-informal/lang.php | 1 + lib/plugins/popularity/lang/de-informal/lang.php | 1 + lib/plugins/revert/lang/de-informal/intro.txt | 3 +++ lib/plugins/revert/lang/de-informal/lang.php | 7 +++++-- lib/plugins/usermanager/lang/de-informal/lang.php | 1 + 7 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 lib/plugins/revert/lang/de-informal/intro.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index 56dedfc61..cd42fdedc 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -4,6 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer + * @author ste-re@web.de */ $lang['admin_acl'] = 'Zugriffskontrollsystem Management'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index 54694c511..3b509e12e 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -4,6 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer + * @author ste-re@web.de */ $lang['menu'] = 'Einstellungen'; $lang['error'] = 'Einstellungen wurden nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfen Sie Ihre Änderungen und versuchen Sie es erneut. @@ -30,11 +31,14 @@ $lang['_plugin_sufix'] = 'Ereiterungseinstellungen'; $lang['_template_sufix'] = 'Vorlageneinstellungen'; $lang['_msg_setting_no_default'] = 'Kein Standardwert.'; $lang['lang'] = 'Sprache'; +$lang['basedir'] = 'Installationsverzeichnis. Für automatische Erkennung frei lassen.'; +$lang['baseurl'] = 'Installationspfad (URL)'; $lang['savedir'] = 'Ordner zum Speichern von Daten'; $lang['start'] = 'Name der Startseite'; $lang['title'] = 'Wiki Titel'; $lang['template'] = 'Vorlage'; $lang['license'] = 'Unter welcher Lizenz sollte Ihr Inhalt veröffentlicht werden?'; +$lang['fullpath'] = 'Den kompletten Dateipfad im Footer anzeigen'; $lang['recent'] = 'letzte Änderungen'; $lang['typography'] = 'Mach drucktechnische Ersetzungen'; $lang['htmlok'] = 'Erlaube eingebettetes HTML'; diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php index 21172a179..5796eebf1 100644 --- a/lib/plugins/plugin/lang/de-informal/lang.php +++ b/lib/plugins/plugin/lang/de-informal/lang.php @@ -4,6 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer + * @author ste-re@web.de */ $lang['menu'] = 'Plugins verwalten'; $lang['download'] = 'Herunterladen und installieren eines neuen Plugins'; diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php index 4d2abd510..e6bd28f04 100644 --- a/lib/plugins/popularity/lang/de-informal/lang.php +++ b/lib/plugins/popularity/lang/de-informal/lang.php @@ -4,6 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer + * @author ste-re@web.de */ $lang['name'] = 'Polularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)'; $lang['submit'] = 'Sende Daten'; diff --git a/lib/plugins/revert/lang/de-informal/intro.txt b/lib/plugins/revert/lang/de-informal/intro.txt new file mode 100644 index 000000000..d5a092155 --- /dev/null +++ b/lib/plugins/revert/lang/de-informal/intro.txt @@ -0,0 +1,3 @@ +====== Seiten wieder herstellen ====== + +Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam-Angriff. Geben Sie zunächst einen Suchbegriff (z.B. eine Spam URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem Sie sich vergewissert haben, dass die gefundenen Seiten wirklich Spam enthalten, können Sie die Seiten wieder herstellen. diff --git a/lib/plugins/revert/lang/de-informal/lang.php b/lib/plugins/revert/lang/de-informal/lang.php index fd6e81c8a..974801bcb 100644 --- a/lib/plugins/revert/lang/de-informal/lang.php +++ b/lib/plugins/revert/lang/de-informal/lang.php @@ -4,9 +4,12 @@ * * @author Alexander Fischer * @author Juergen Schwarzer + * @author ste-re@web.de */ -$lang['menu'] = 'Zurückstellungsmanager'; -$lang['revert'] = 'Stelle ausgewählte Seiten zurück.'; +$lang['menu'] = 'Seiten wieder herstellen'; +$lang['filter'] = 'Nach betroffenen Seiten suchen'; +$lang['revert'] = 'Ausgewählte Seiten wieder herstellen'; +$lang['reverted'] = '%s wieder hergestellt zu Version %s'; $lang['removed'] = '%s entfernt'; $lang['revstart'] = 'Zurückstellungsprozess gestartet. Dies kann eine längere Zeit dauern. Wenn das Skript vor Fertigstellung stopt, sollten Sie es in kleineren Stücken versuchen.'; $lang['revstop'] = 'Zurückstellungsprozess erfolgreich beendet.'; diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php index d9011468b..780cc9e64 100644 --- a/lib/plugins/usermanager/lang/de-informal/lang.php +++ b/lib/plugins/usermanager/lang/de-informal/lang.php @@ -4,6 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer + * @author ste-re@web.de */ $lang['menu'] = 'Benutzerverwalter'; $lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)'; -- cgit v1.2.3 From 98dba5ad053f051c0291c9ac9b291c783ebed372 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 19 Nov 2009 15:28:45 +0100 Subject: Allow hyphens and underscores in javascript include filenames darcs-hash:20091119142845-e4919-5394617fd83d4de22673491b868f7040c25fb290.gz --- lib/exe/js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index ab67288cd..5be4d2b6b 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -151,7 +151,7 @@ function js_load($file){ static $loaded = array(); $data = io_readFile($file); - while(preg_match('#/\*\s*DOKUWIKI:include(_once)?\s+([\w\./]+)\s*\*/#',$data,$match)){ + while(preg_match('#/\*\s*DOKUWIKI:include(_once)?\s+([\w\.\-_/]+)\s*\*/#',$data,$match)){ $ifile = $match[2]; // is it a include_once? -- cgit v1.2.3 From 21ed602531cbceff3e92e4ac33484f44ed2b6848 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 1 Dec 2009 12:50:19 +0100 Subject: Factor out timer and delay management darcs-hash:20091201115019-e4919-fe83e3d69eb997d0c04064b46117690824fe4daf.gz --- lib/exe/js.php | 2 +- lib/scripts/ajax.js | 104 +++++++++++++++++++++------------------------------ lib/scripts/delay.js | 69 ++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 63 deletions(-) create mode 100644 lib/scripts/delay.js (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 5be4d2b6b..38fda1789 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -41,6 +41,7 @@ function js_out(){ $files = array( DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', + DOKU_INC.'lib/scripts/delay.js', DOKU_INC.'lib/scripts/cookie.js', DOKU_INC.'lib/scripts/script.js', DOKU_INC.'lib/scripts/tw-sack.js', @@ -106,7 +107,6 @@ function js_out(){ // init stuff - js_runonstart("ajax_qsearch.init('qsearch__in','qsearch__out')"); js_runonstart("addEvent(document,'click',closePopups)"); js_runonstart('addTocToggle()'); js_runonstart("initSizeCtl('size__ctl','wiki__text')"); diff --git a/lib/scripts/ajax.js b/lib/scripts/ajax.js index a2a48a996..de009d448 100644 --- a/lib/scripts/ajax.js +++ b/lib/scripts/ajax.js @@ -1,68 +1,48 @@ /** * AJAX functions for the pagename quicksearch * - * We're using a global object with self referencing methods - * here to make callbacks work - * * @license GPL2 (http://www.gnu.org/licenses/gpl.html) * @author Andreas Gohr + * @author Adrian Lang */ - -//prepare class -function ajax_qsearch_class(){ - this.sack = null; - this.inObj = null; - this.outObj = null; - this.timer = null; -} - -//create global object and add functions -var ajax_qsearch = new ajax_qsearch_class(); -ajax_qsearch.sack = new sack(DOKU_BASE + 'lib/exe/ajax.php'); -ajax_qsearch.sack.AjaxFailedAlert = ''; -ajax_qsearch.sack.encodeURIString = false; - -ajax_qsearch.init = function(inID,outID){ - ajax_qsearch.inObj = document.getElementById(inID); - ajax_qsearch.outObj = document.getElementById(outID); - - // objects found? - if(ajax_qsearch.inObj === null){ return; } - if(ajax_qsearch.outObj === null){ return; } - - // attach eventhandler to search field - addEvent(ajax_qsearch.inObj,'keyup',ajax_qsearch.call); - - // attach eventhandler to output field - addEvent(ajax_qsearch.outObj,'click',function(){ ajax_qsearch.outObj.style.display='none'; }); -}; - -ajax_qsearch.clear = function(){ - ajax_qsearch.outObj.style.display = 'none'; - ajax_qsearch.outObj.innerHTML = ''; - if(ajax_qsearch.timer !== null){ - window.clearTimeout(ajax_qsearch.timer); - ajax_qsearch.timer = null; - } -}; - -ajax_qsearch.exec = function(){ - ajax_qsearch.clear(); - var value = ajax_qsearch.inObj.value; - if(value === ''){ return; } - ajax_qsearch.sack.runAJAX('call=qsearch&q='+encodeURI(value)); -}; - -ajax_qsearch.sack.onCompletion = function(){ - var data = ajax_qsearch.sack.response; - if(data === ''){ return; } - - ajax_qsearch.outObj.innerHTML = data; - ajax_qsearch.outObj.style.display = 'block'; -}; - -ajax_qsearch.call = function(){ - ajax_qsearch.clear(); - ajax_qsearch.timer = window.setTimeout("ajax_qsearch.exec()",500); -}; - +addInitEvent(function () { + + var inID = 'qsearch__in'; + var outID = 'qsearch__out'; + + var inObj = document.getElementById(inID); + var outObj = document.getElementById(outID); + + // objects found? + if (inObj === null){ return; } + if (outObj === null){ return; } + + function clear_results(){ + outObj.style.display = 'none'; + outObj.innerHTML = ''; + } + + var sack_obj = new sack(DOKU_BASE + 'lib/exe/ajax.php'); + sack_obj.AjaxFailedAlert = ''; + sack_obj.encodeURIString = false; + sack_obj.onCompletion = function () { + var data = sack_obj.response; + if (data === '') { return; } + + outObj.innerHTML = data; + outObj.style.display = 'block'; + }; + + // attach eventhandler to search field + var delay = new Delay(function () { + clear_results(); + var value = inObj.value; + if(value === ''){ return; } + sack_obj.runAJAX('call=qsearch&q=' + encodeURI(value)); + }); + + addEvent(inObj, 'keyup', function () {clear_results(); delay.start(); }); + + // attach eventhandler to output field + addEvent(outObj, 'click', function () {outObj.style.display = 'none'; }); +}); diff --git a/lib/scripts/delay.js b/lib/scripts/delay.js new file mode 100644 index 000000000..2ef9f8846 --- /dev/null +++ b/lib/scripts/delay.js @@ -0,0 +1,69 @@ +/** + * Manage delayed and timed actions + * + * @license GPL2 (http://www.gnu.org/licenses/gpl.html) + * @author Adrian Lang + */ + +/** + * Provide a global callback for window.setTimeout + * + * To get a timeout for non-global functions, just call + * delay.add(func, timeout). + */ +var timer = { + _cur_id: 0, + _handlers: {}, + + execDispatch: function (id) { + timer._handlers[id](); + }, + + add: function (func, timeout) { + var id = ++timer._cur_id; + timer._handlers[id] = func; + return window.setTimeout('timer.execDispatch(' + id + ')', timeout); + } +}; + +/** + * Provide a delayed start + * + * To call a function with a delay, just create a new Delay(func, timeout) and + * call that object’s method “start”. + */ +function Delay (func, timeout) { + this.func = func; + if (timeout) { + this.timeout = timeout; + } +} + +Delay.prototype = { + func: null, + timeout: 500, + + delTimer: function () { + if (this.timer !== null) { + window.clearTimeout(this.timer); + this.timer = null; + } + }, + + start: function () { + this.delTimer(); + var _this = this; + this.timer = timer.add(function () { _this.exec.call(_this); }, + this.timeout); + + this._data = { + _this: arguments[0], + _params: Array.prototype.slice.call(arguments, 2) + }; + }, + + exec: function () { + this.delTimer(); + this.func.call(this._data._this, this._data._params); + } +}; -- cgit v1.2.3 From 96a47e5d480e6c5b3aab1884a8536ec4b8ca2fab Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 13 Jan 2010 09:20:36 +0100 Subject: fixed information leakage in ACL plugin FS#1847 --- lib/plugins/acl/ajax.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index 54eaa8dc7..97fae2ad1 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -16,9 +16,11 @@ require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/pageutils.php'); require_once(DOKU_INC.'inc/auth.php'); -//close sesseion +//close session session_write_close(); +if(!auth_ismanager()) die('forbidden'); + $ID = getID(); if(!auth_isadmin) die('for admins only'); @@ -42,6 +44,7 @@ if($ajax == 'info'){ if($ns == '*'){ $ns =''; } + $ns = cleanID($ns); $lvl = count(explode(':',$ns)); $ns = utf8_encodeFN(str_replace(':','/',$ns)); -- cgit v1.2.3 From 8c5215b744582107f352aa4ccea4182296674250 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 13 Jan 2010 09:40:30 +0100 Subject: another fix for FS#1847 + msg increased --- lib/plugins/acl/ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index 97fae2ad1..e383f0d35 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -19,7 +19,7 @@ require_once(DOKU_INC.'inc/auth.php'); //close session session_write_close(); -if(!auth_ismanager()) die('forbidden'); +if(!auth_isadmin()) die('forbidden'); $ID = getID(); -- cgit v1.2.3 From d7554c0bb25241c1299af28785878d31ad02dbad Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 17 Jan 2010 10:52:59 +0100 Subject: Added CRSF security token checks in ACL plugin --- lib/plugins/acl/admin.php | 12 ++++++++---- lib/plugins/acl/ajax.php | 4 ++-- lib/plugins/acl/script.js | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 59671a0cb..a3fb4636d 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -31,7 +31,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { return array( 'author' => 'Andreas Gohr', 'email' => 'andi@splitbrain.org', - 'date' => '2009-08-07', + 'date' => '2010-01-17', 'name' => 'ACL Manager', 'desc' => 'Manage Page Access Control Lists', 'url' => 'http://dokuwiki.org/plugin:acl', @@ -67,6 +67,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { // fresh 1:1 copy without replacements $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); + // namespace given? if($_REQUEST['ns'] == '*'){ $this->ns = '*'; @@ -89,7 +90,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } // handle modifications - if(isset($_REQUEST['cmd'])){ + if(isset($_REQUEST['cmd']) && checkSecurityToken()){ + // scope for modifications if($this->ns){ if($this->ns == '*'){ @@ -310,6 +312,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; echo ''.NL; echo ''.NL; + echo ''.NL; echo '
'.NL; } @@ -480,11 +483,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $alt = '+'; } $ret .= ''.$alt.''; - $ret .= ''; + $ret .= ''; $ret .= $base; $ret .= ''; }else{ - $ret .= ''; + $ret .= ''; $ret .= noNS($item['id']); $ret .= ''; } @@ -562,6 +565,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; echo ''.NL; echo ''.NL; + echo ''.NL; echo ''; echo ''; echo ''; diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index e383f0d35..d3e88d932 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -19,11 +19,11 @@ require_once(DOKU_INC.'inc/auth.php'); //close session session_write_close(); -if(!auth_isadmin()) die('forbidden'); +if(!auth_isadmin()) die('for admins only'); +if(!checkSecurityToken()) die('CRSF Attack'); $ID = getID(); -if(!auth_isadmin) die('for admins only'); require_once(DOKU_INC.'inc/pluginutils.php'); require_once(DOKU_INC.'inc/html.php'); $acl = plugin_load('admin','acl'); diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index 7ab83db58..449a3c16a 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -48,7 +48,8 @@ acl = { data[1] = ajax.encVar('id',frm.elements['id'].value); data[2] = ajax.encVar('acl_t',frm.elements['acl_t'].value); data[3] = ajax.encVar('acl_w',frm.elements['acl_w'].value); - data[4] = ajax.encVar('ajax','info'); + data[4] = ajax.encVar('sectok',frm.elements['sectok'].value); + data[5] = ajax.encVar('ajax','info'); ajax.elementObj = $('acl__info'); -- cgit v1.2.3 From fbb7e354f4aff3e38f01b228b843aa3ae91754ed Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 17 Jan 2010 13:48:00 +0100 Subject: more deprecated new by reference code fixed --- lib/plugins/plugin/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index 4f8cc01a2..198512a43 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -111,7 +111,7 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin { $class = 'ap_manage'; } - $this->handler = & new $class($this, $this->plugin); + $this->handler = new $class($this, $this->plugin); $this->msg = $this->handler->process(); } @@ -124,7 +124,7 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin { $this->setupLocale(); $this->_get_plugin_list(); - if ($this->handler === NULL) $this->handler = & new ap_manage($this, $this->plugin); + if ($this->handler === NULL) $this->handler = new ap_manage($this, $this->plugin); ptln('
'); $this->handler->html(); -- cgit v1.2.3 From be615a48b77032ed713b970521ed46503be853e7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 25 Nov 2009 15:47:59 +0100 Subject: Support for adding IDs and classes to toolbar buttons Ignore-this: 87db996b332355addacd81b1ac13b0ab darcs-hash:20091125144759-6e07b-601ea98a48d9d3c9dd3508cdb9cde9b86c83a5a3.gz --- lib/scripts/edit.js | 5 ++++- lib/scripts/toolbar.js | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index a80c8a06e..7b30ddca4 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -12,12 +12,15 @@ * * @author Andreas Gohr */ -function createToolButton(icon,label,key,id){ +function createToolButton(icon,label,key,id,classname){ var btn = document.createElement('button'); var ico = document.createElement('img'); // preapare the basic button stuff btn.className = 'toolbutton'; + if(classname){ + btn.className += ' '+classname; + } btn.title = label; if(key){ btn.title += ' ['+key.toUpperCase()+']'; diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 1e4a91864..99ad1bb9c 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -27,7 +27,9 @@ function initToolbar(tbid,edid,tb){ // create new button var btn = createToolButton(tb[i]['icon'], tb[i]['title'], - tb[i]['key']); + tb[i]['key'], + tb[i]['id'], + tb[i]['class']); // type is a tb function -> assign it as onclick -- cgit v1.2.3 From 0b0fbf677e031723a4a9c5b2d194d7d7fda5d7c6 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 27 Nov 2009 12:24:02 +0100 Subject: Make drag inheritable darcs-hash:20091127112402-e4919-dc8340c03ef2d3b242302dcc228d56539eaf9e28.gz --- lib/scripts/drag.js | 55 ++++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) (limited to 'lib') diff --git a/lib/scripts/drag.js b/lib/scripts/drag.js index 4726b77de..fa249a996 100644 --- a/lib/scripts/drag.js +++ b/lib/scripts/drag.js @@ -1,8 +1,9 @@ /** * Makes a DOM object draggable * - * This is currently for movable DOM dialogs only. If needed it could be - * extended to execute callbacks on special events... + * If you just want to move objects around, use drag.attach. For full + * customization, drag can be used as a javascript prototype, it is + * inheritance-aware. * * @link http://nofunc.org/Drag_Drop/ */ @@ -26,33 +27,36 @@ var drag = { attach: function (obj,handle) { if(handle){ handle.dragobject = obj; - addEvent($(handle),'mousedown',drag.start); }else{ - addEvent($(obj),'mousedown',drag.start); + handle = obj; } + var _this = this; + addEvent($(handle),'mousedown',function (e) {return _this.start(e); }); }, /** * Starts the dragging operation */ start: function (e){ - drag.handle = e.target; - if(drag.handle.dragobject){ - drag.obj = drag.handle.dragobject; + this.handle = e.target; + if(this.handle.dragobject){ + this.obj = this.handle.dragobject; }else{ - drag.obj = drag.handle; + this.obj = this.handle; } - drag.handle.className += ' ondrag'; - drag.obj.className += ' ondrag'; + this.handle.className += ' ondrag'; + this.obj.className += ' ondrag'; - drag.oX = parseInt(drag.obj.style.left); - drag.oY = parseInt(drag.obj.style.top); - drag.eX = drag.evX(e); - drag.eY = drag.evY(e); + this.oX = parseInt(this.obj.style.left); + this.oY = parseInt(this.obj.style.top); + this.eX = drag.evX(e); + this.eY = drag.evY(e); - addEvent(document,'mousemove',drag.drag); - addEvent(document,'mouseup',drag.stop); + var _this = this; + this.mousehandlers = [function (e) {return _this.drag(e);}, function (e) {return _this.stop(e);}]; + addEvent(document,'mousemove', this.mousehandlers[0]); + addEvent(document,'mouseup', this.mousehandlers[1]); e.preventDefault(); e.stopPropagation(); @@ -63,21 +67,21 @@ var drag = { * Ends the dragging operation */ stop: function(){ - drag.handle.className = drag.handle.className.replace(/ ?ondrag/,''); - drag.obj.className = drag.obj.className.replace(/ ?ondrag/,''); - removeEvent(document,'mousemove',drag.drag); - removeEvent(document,'mouseup',drag.stop); - drag.obj = null; - drag.handle = null; + this.handle.className = this.handle.className.replace(/ ?ondrag/,''); + this.obj.className = this.obj.className.replace(/ ?ondrag/,''); + removeEvent(document,'mousemove', this.mousehandlers[0]); + removeEvent(document,'mouseup', this.mousehandlers[1]); + this.obj = null; + this.handle = null; }, /** * Moves the object during the dragging operation */ drag: function(e) { - if(drag.obj) { - drag.obj.style.top = (drag.evY(e)+drag.oY-drag.eY+'px'); - drag.obj.style.left = (drag.evX(e)+drag.oX-drag.eX+'px'); + if(this.obj) { + this.obj.style.top = (this.evY(e)+this.oY-this.eY+'px'); + this.obj.style.left = (this.evX(e)+this.oX-this.eX+'px'); } }, @@ -96,4 +100,3 @@ var drag = { } }; - -- cgit v1.2.3 From 1c64eaeaa3295062b0a4e9b20b772274cd86ca42 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 2 Dec 2009 13:24:34 +0100 Subject: Fix section edit highlighting for tables darcs-hash:20091202122434-e4919-d7be5b868af742e2408091b48f0152153ff1acb1.gz --- lib/scripts/script.js | 41 +++++++++++++++++++++++++++++------------ lib/tpl/default/design.css | 4 ++-- 2 files changed, 31 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index ccba82144..b611f980a 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -538,24 +538,41 @@ addInitEvent(function(){ var break_classes = new RegExp('secedit|toc|page'); var btns = getElementsByClass('btn_secedit',document,'form'); for(var i=0; i Date: Tue, 5 Jan 2010 14:14:00 +0100 Subject: New mail subscription with digest --- lib/exe/indexer.php | 70 ++++++++++++++++++++++++++++++++++++++++++++ lib/exe/js.php | 1 + lib/scripts/subscriptions.js | 46 +++++++++++++++++++++++++++++ lib/tpl/default/design.css | 14 +++++++++ lib/tpl/default/main.php | 1 - 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 lib/scripts/subscriptions.js (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 1c4128eb7..eb1556e1d 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -37,6 +37,7 @@ if ($evt->advise_before()) { runIndexer() or metaUpdate() or runSitemapper() or + sendDigest() or runTrimRecentChanges() or runTrimRecentChanges(true) or $evt->advise_after(); @@ -334,6 +335,75 @@ function runSitemapper(){ return true; } +/** + * Send digest and list mails for all subscriptions which are in effect for the + * current page + * + * @author Adrian Lang + */ +function sendDigest() { + require_once DOKU_INC . 'inc/subscription.php'; + echo 'sendDigest(): start'.NL; + global $ID; + global $conf; + if (!$conf['subscribers']) { + return; + } + + $subscriptions = subscription_find($ID, array('style' => '(digest|list)', + 'escaped' => true)); + global $auth; + global $lang; + global $conf; + foreach($subscriptions as $id => $users) { + foreach($users as $data) { + list($user, $style, $lastupdate) = $data; + $lastupdate = (int) $lastupdate; + if ($lastupdate + $conf['subscribe_interval'] > time()) { + // Less than a day passed since last update. + continue; + } + // TODO: Does that suffice for namespaces? + $info = $auth->getUserData($user); + if ($info === false) { + continue; + } + $level = auth_aclcheck($id, $user, $info['grps']); + if ($level < AUTH_READ) { + continue; + } + + if (substr($id, -1, 1) === ':') { + // The subscription target is a namespace + $changes = getRecentsSince($lastupdate, null, getNS($id)); + if (count($changes) === 0) { + continue; + } + if ($style === 'digest') { + foreach($changes as $change) { + subscription_send_digest($info['mail'], $change, + $lastupdate); + } + } elseif ($style === 'list') { + subscription_send_list($info['mail'], $changes, $id); + } + // TODO: Handle duplicate subscriptions. + } else { + $meta = p_get_metadata($id); + $rev = $meta['last_change']['date']; + if ($rev < $lastupdate) { + // There is no new revision. + continue; + } + subscription_send_digest($info['mail'], $meta['last_change'], + $lastupdate); + } + // Update notification time. + subscription_set($id, $user, $style, true); + } + } +} + /** * Formats a timestamp as ISO 8601 date * diff --git a/lib/exe/js.php b/lib/exe/js.php index 38fda1789..8648bf18f 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -53,6 +53,7 @@ function js_out(){ DOKU_INC.'lib/scripts/edit.js', DOKU_INC.'lib/scripts/linkwiz.js', DOKU_INC.'lib/scripts/media.js', + DOKU_INC.'lib/scripts/subscriptions.js', DOKU_TPLINC.'script.js', ); diff --git a/lib/scripts/subscriptions.js b/lib/scripts/subscriptions.js new file mode 100644 index 000000000..9f602dde8 --- /dev/null +++ b/lib/scripts/subscriptions.js @@ -0,0 +1,46 @@ +/** + * Hide list subscription style if target is a page + * + * @author Adrian Lang + */ + +addInitEvent(function () { + var form = $('subscribe'); + if (!form) { + return; + } + + var styleradios = {}; + + function update_state() { + if (!this.checked) { + return; + } + if (this.value.match(/:$/)) { + styleradios.list.parentNode.style.display = ''; + } else { + styleradios.list.parentNode.style.display = 'none'; + if (styleradios.list.checked) { + styleradios.digest.checked = 'checked'; + } + } + } + + var cur_sel = null; + + var inputs = form.getElementsByTagName('input'); + for (var i = 0; i < inputs.length ; ++i) { + switch (inputs[i].name) { + case 'subscribe_target': + inputs[i].addEventListener('change', update_state, false); + if (inputs[i].checked) { + cur_sel = inputs[i]; + } + break; + case 'subscribe_style': + styleradios[inputs[i].value] = inputs[i]; + break; + } + } + update_state.call(cur_sel); +}); diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 4830a9e2c..02804256c 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -833,3 +833,17 @@ div.dokuwiki div.imagemeta img.thumb { float: left; margin-right: 0.1em; } + +form#subscribe p { + margin: 0.5em 0; +} + +form#subscribe label { + display:block; + margin: 0 0.5em 0.5em; +} + +form#subscribe fieldset, form#unsubscribe fieldset { + text-align:inherit; + margin: 0; +} diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 67c3a00ba..b5717c009 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -117,7 +117,6 @@ if (!defined('DOKU_INC')) die();
- -- cgit v1.2.3 From 8881fcc99a05f20da8fdd0f1c52f801fd84a8bb7 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 19 Nov 2009 15:25:25 +0100 Subject: Add events to subscription. --- lib/exe/indexer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index eb1556e1d..70aa607a9 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -399,7 +399,7 @@ function sendDigest() { $lastupdate); } // Update notification time. - subscription_set($id, $user, $style, true); + subscription_set($user, $id, $style, time(), true); } } } -- cgit v1.2.3 From 3a5a6f4fe4a9f768f5c6418ba0694d67594ed701 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 23 Nov 2009 17:16:03 +0100 Subject: correctly handle permissions in digest mailer Ignore-this: c34455078907459a846cf7f00e2b586b darcs-hash:20091123161603-6e07b-927477d6ca50e665228487eb0d3ce9787dbe455b.gz --- lib/exe/indexer.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 70aa607a9..1766c54f1 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -342,19 +342,24 @@ function runSitemapper(){ * @author Adrian Lang */ function sendDigest() { - require_once DOKU_INC . 'inc/subscription.php'; echo 'sendDigest(): start'.NL; global $ID; global $conf; if (!$conf['subscribers']) { return; } - + require_once DOKU_INC . 'inc/subscription.php'; $subscriptions = subscription_find($ID, array('style' => '(digest|list)', 'escaped' => true)); global $auth; global $lang; global $conf; + global $USERINFO; + + // remember current user info + $olduinfo = $USERINFO; + $olduser = $_SERVER['REMOTE_USER']; + foreach($subscriptions as $id => $users) { foreach($users as $data) { list($user, $style, $lastupdate) = $data; @@ -363,13 +368,11 @@ function sendDigest() { // Less than a day passed since last update. continue; } - // TODO: Does that suffice for namespaces? - $info = $auth->getUserData($user); - if ($info === false) { - continue; - } - $level = auth_aclcheck($id, $user, $info['grps']); - if ($level < AUTH_READ) { + + // Work as the user to make sure ACLs apply correctly + $USERINFO = $auth->getUserData($user); + $_SERVER['REMOTE_USER'] = $user; + if ($USERINFO === false) { continue; } @@ -389,6 +392,8 @@ function sendDigest() { } // TODO: Handle duplicate subscriptions. } else { + if(auth_quickacl($id) < AUTH_READ) continue; + $meta = p_get_metadata($id); $rev = $meta['last_change']['date']; if ($rev < $lastupdate) { @@ -402,6 +407,10 @@ function sendDigest() { subscription_set($user, $id, $style, time(), true); } } + + // restore current user info + $USERINFO = $olduinfo; + $_SERVER['REMOTE_USER'] = $olduser; } /** -- cgit v1.2.3 From 2f27189ab6f07352f435e91bab0c28dfc4899583 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 24 Nov 2009 12:58:05 +0100 Subject: wrong function name fixed Ignore-this: b74163181c2e41d3be022a6185f3e1c1 darcs-hash:20091124115805-6e07b-e808cf44a00a65ff8c70cc7e8de4dfedadf96cbd.gz --- lib/exe/indexer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 1766c54f1..53f2c129d 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -392,7 +392,7 @@ function sendDigest() { } // TODO: Handle duplicate subscriptions. } else { - if(auth_quickacl($id) < AUTH_READ) continue; + if(auth_quickaclcheck($id) < AUTH_READ) continue; $meta = p_get_metadata($id); $rev = $meta['last_change']['date']; -- cgit v1.2.3 From 056c20495937fe45fe0f7204b112dbfe6931a855 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 30 Nov 2009 14:03:11 +0100 Subject: nicer subscription styles Ignore-this: e1b3b815b5ebb0da320bff997c4fed4b darcs-hash:20091130130311-6e07b-03ccfc52abb3dcc0764eed5784d81f8416841328.gz --- lib/scripts/subscriptions.js | 6 +++--- lib/tpl/default/_subscription.css | 21 +++++++++++++++++++++ lib/tpl/default/design.css | 13 ------------- lib/tpl/default/style.ini | 7 ++++--- 4 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 lib/tpl/default/_subscription.css (limited to 'lib') diff --git a/lib/scripts/subscriptions.js b/lib/scripts/subscriptions.js index 9f602dde8..2af4ee8c4 100644 --- a/lib/scripts/subscriptions.js +++ b/lib/scripts/subscriptions.js @@ -5,7 +5,7 @@ */ addInitEvent(function () { - var form = $('subscribe'); + var form = $('subscribe__form'); if (!form) { return; } @@ -31,13 +31,13 @@ addInitEvent(function () { var inputs = form.getElementsByTagName('input'); for (var i = 0; i < inputs.length ; ++i) { switch (inputs[i].name) { - case 'subscribe_target': + case 'sub_target': inputs[i].addEventListener('change', update_state, false); if (inputs[i].checked) { cur_sel = inputs[i]; } break; - case 'subscribe_style': + case 'sub_style': styleradios[inputs[i].value] = inputs[i]; break; } diff --git a/lib/tpl/default/_subscription.css b/lib/tpl/default/_subscription.css new file mode 100644 index 000000000..0792c8c21 --- /dev/null +++ b/lib/tpl/default/_subscription.css @@ -0,0 +1,21 @@ +/** + * Styles for the subscription page + */ + +form#subscribe__form { + display: block; + width: 300px; + text-align: center; +} + +form#subscribe__form fieldset { + text-align: left; + margin: 0.5em 0; +} + +form#subscribe__form label { + display:block; + margin: 0 0.5em 0.5em; +} + + diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 02804256c..9c3e7b119 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -834,16 +834,3 @@ div.dokuwiki div.imagemeta img.thumb { margin-right: 0.1em; } -form#subscribe p { - margin: 0.5em 0; -} - -form#subscribe label { - display:block; - margin: 0 0.5em 0.5em; -} - -form#subscribe fieldset, form#unsubscribe fieldset { - text-align:inherit; - margin: 0; -} diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index dfd5500fa..84d04e743 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -10,9 +10,10 @@ layout.css = screen design.css = screen style.css = screen -media.css = screen -_admin.css = screen -_linkwiz.css = screen +media.css = screen +_admin.css = screen +_linkwiz.css = screen +_subscription.css = screen rtl.css = rtl print.css = print -- cgit v1.2.3 From 34240a5903c7499900c8ecf0a5592d28f67aaf46 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 30 Nov 2009 14:50:40 +0100 Subject: Fix $info var reference in digest send darcs-hash:20091130135040-e4919-40b6614fe28ea07dc5796661ddda6d005264ddbc.gz --- lib/exe/indexer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 53f2c129d..84eb9d482 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -384,11 +384,11 @@ function sendDigest() { } if ($style === 'digest') { foreach($changes as $change) { - subscription_send_digest($info['mail'], $change, + subscription_send_digest($USERINFO['mail'], $change, $lastupdate); } } elseif ($style === 'list') { - subscription_send_list($info['mail'], $changes, $id); + subscription_send_list($USERINFO['mail'], $changes, $id); } // TODO: Handle duplicate subscriptions. } else { @@ -400,7 +400,7 @@ function sendDigest() { // There is no new revision. continue; } - subscription_send_digest($info['mail'], $meta['last_change'], + subscription_send_digest($USERINFO['mail'], $meta['last_change'], $lastupdate); } // Update notification time. -- cgit v1.2.3 From e419596a1552d52670605ef4c380757d6fd0ffa7 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 2 Dec 2009 13:16:18 +0100 Subject: =?UTF-8?q?Use=20click=20event=20in=20subscription=20JS,=20use=20D?= =?UTF-8?q?W=E2=80=99s=20event=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit darcs-hash:20091202121618-e4919-e3c409aa3e6e24db89558a6e62b8c46df950f5b0.gz --- lib/scripts/subscriptions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/subscriptions.js b/lib/scripts/subscriptions.js index 2af4ee8c4..d701f258f 100644 --- a/lib/scripts/subscriptions.js +++ b/lib/scripts/subscriptions.js @@ -32,7 +32,7 @@ addInitEvent(function () { for (var i = 0; i < inputs.length ; ++i) { switch (inputs[i].name) { case 'sub_target': - inputs[i].addEventListener('change', update_state, false); + addEvent(inputs[i], 'click', update_state); if (inputs[i].checked) { cur_sel = inputs[i]; } -- cgit v1.2.3 From eee44352b2c73d56818600770b87f891b88a545f Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 12 Jan 2010 11:24:11 +0100 Subject: Add subscribe time to admin interface. --- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 1 + 2 files changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 25103278c..45b653680 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -130,6 +130,7 @@ $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compression quality (0-100)'; $lang['subscribers'] = 'Enable page subscription support'; +$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be larger than the time specified in recent_days.'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['hidepages'] = 'Hide matching pages (regular expressions)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 742faf387..da2ba4aef 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -148,6 +148,7 @@ $meta['htmlok'] = array('onoff'); $meta['phpok'] = array('onoff'); $meta['notify'] = array('email', '_multiple' => true); $meta['subscribers'] = array('onoff'); +$meta['subscribe_time'] = array('numeric'); $meta['locktime'] = array('numeric'); $meta['cachetime'] = array('numeric'); -- cgit v1.2.3 From d9c82eb63294032cf16e003122eeeca5a6c8454e Mon Sep 17 00:00:00 2001 From: Yaron Yogev Date: Thu, 21 Jan 2010 21:23:40 +0100 Subject: Hebrew Language Update --- lib/plugins/acl/lang/he/lang.php | 1 + lib/plugins/config/lang/he/lang.php | 3 +++ lib/plugins/plugin/lang/he/lang.php | 5 +++++ lib/plugins/popularity/lang/he/lang.php | 1 + lib/plugins/revert/lang/he/lang.php | 1 + lib/plugins/usermanager/lang/he/lang.php | 1 + 6 files changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/he/lang.php b/lib/plugins/acl/lang/he/lang.php index 7d73c63dd..ac00730dd 100644 --- a/lib/plugins/acl/lang/he/lang.php +++ b/lib/plugins/acl/lang/he/lang.php @@ -6,6 +6,7 @@ * @author DoK * @author Dotan Kamber * @author Moshe Kaplan + * @author Yaron Yogev */ $lang['admin_acl'] = 'ניהול רשימת בקרת גישות'; $lang['acl_group'] = 'קבוצה'; diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php index 8e5bf2fd1..c47c8d099 100644 --- a/lib/plugins/config/lang/he/lang.php +++ b/lib/plugins/config/lang/he/lang.php @@ -6,6 +6,7 @@ * @author DoK * @author Dotan Kamber * @author Moshe Kaplan + * @author Yaron Yogev */ $lang['menu'] = 'הגדרות תצורה'; $lang['error'] = 'ההגדרות לא עודכנו בגלל ערך לא תקף, נא לעיין בשינויים ולשלוח שנית. @@ -164,3 +165,5 @@ $lang['xsendfile_o_0'] = 'אל תשתמש'; $lang['xsendfile_o_1'] = 'כותר lighttpd קנייני (לפני גרסה 1.5)'; $lang['xsendfile_o_2'] = 'כותר X-Sendfile רגיל'; $lang['xsendfile_o_3'] = 'כותר Nginx X-Accel-Redirect קנייני'; +$lang['useheading_o_navigation'] = 'ניווט בלבד'; +$lang['useheading_o_1'] = 'תמיד'; diff --git a/lib/plugins/plugin/lang/he/lang.php b/lib/plugins/plugin/lang/he/lang.php index 7a68575a7..c6e462193 100644 --- a/lib/plugins/plugin/lang/he/lang.php +++ b/lib/plugins/plugin/lang/he/lang.php @@ -6,6 +6,7 @@ * @author DoK * @author Dotan Kamber * @author Moshe Kaplan + * @author Yaron Yogev */ $lang['menu'] = 'ניהול הרחבות'; $lang['download'] = 'הורדת והתקנת הרחבה חדשה'; @@ -47,3 +48,7 @@ $lang['error_dircreate'] = 'כשל ביצירת תיקיה זמנית לק $lang['error_decompress'] = 'מנהל ההרחבות כשל בפרישת הקובץ שהורד. יתכן כי זו תוצאה של הורדה תקולה ובמקרה זה עליך לנסות שנית; או שיתכן כי תסדיר הכיווץ אינו ידוע, במקרה זה יהיה עליך להוריד ולהתקין את ההרחבה ידנית.'; $lang['error_copy'] = 'חלה שגיאה בהעתקת הקובץ בניסיון להתקין קבצים להרחבה %s: ייתכן כי הדיסק מלא או שהרשאות הגישה לקבצים שגויות. יתכן כי בשל כך נוצרה התקנה חלקית של ההרחבה שתשאיר את התקנת הויקי שלך לא יציבה.'; $lang['error_delete'] = 'חלה שגיאה בעת ניסיון למחיקת ההרחבה %s. הסיבה הסבירה ביותר היא הרשאות גישה לקבצים ולספריות שאינן מספקות'; +$lang['enabled'] = 'תוסף %s מופעל.'; +$lang['notenabled'] = 'לא ניתן להפעיל את התוסף %s, בדוק הרשאות קבצים.'; +$lang['disabled'] = 'תוסף %s מושבת.'; +$lang['notdisabled'] = 'לא ניתן להשבית את התוסף %s, בדוק הרשאות קבצים.'; diff --git a/lib/plugins/popularity/lang/he/lang.php b/lib/plugins/popularity/lang/he/lang.php index 2cc82cff7..024f94ae8 100644 --- a/lib/plugins/popularity/lang/he/lang.php +++ b/lib/plugins/popularity/lang/he/lang.php @@ -4,6 +4,7 @@ * * @author Dotan Kamber * @author Moshe Kaplan + * @author Yaron Yogev */ $lang['name'] = 'משוב פופולריות (יתכן זמן טעינה ארוך)'; $lang['submit'] = 'שלח מידע'; diff --git a/lib/plugins/revert/lang/he/lang.php b/lib/plugins/revert/lang/he/lang.php index e09ffeaab..585487816 100644 --- a/lib/plugins/revert/lang/he/lang.php +++ b/lib/plugins/revert/lang/he/lang.php @@ -4,6 +4,7 @@ * * @author Dotan Kamber * @author Moshe Kaplan + * @author Yaron Yogev */ $lang['menu'] = 'מנהל שחזור'; $lang['filter'] = 'חפש דפים עם ספאם'; diff --git a/lib/plugins/usermanager/lang/he/lang.php b/lib/plugins/usermanager/lang/he/lang.php index 85f5274e8..b2b55c3b4 100644 --- a/lib/plugins/usermanager/lang/he/lang.php +++ b/lib/plugins/usermanager/lang/he/lang.php @@ -5,6 +5,7 @@ * @author DoK * @author Dotan Kamber * @author Moshe Kaplan + * @author Yaron Yogev */ $lang['menu'] = 'מנהל משתמשים'; $lang['noauth'] = '(אימות משתמשים אינו זמין)'; -- cgit v1.2.3 From 4db7791517d8ffb7c863e0ca5bb455dad32877f8 Mon Sep 17 00:00:00 2001 From: Christian Marg Date: Thu, 21 Jan 2010 22:12:17 +0100 Subject: Apply group/user cleaning on saving ACLs FS#1859 --- lib/plugins/acl/admin.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a3fb4636d..a7037047a 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -130,6 +130,13 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { // re-add all rules foreach((array) $_REQUEST['acl'] as $where => $opt){ foreach($opt as $who => $perm){ + if ($who[0]=='@') { + if ($who!='@ALL') { + $who = '@'.ltrim($auth->cleanGroup($who),'@'); + } + } else { + $who = $auth->cleanUser($who); + } $who = auth_nameencode($who,true); $lines[] = "$where\t$who\t$perm\n"; } -- cgit v1.2.3 From 912f066b170a7a39fbd7d19fd96c48f820c72926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Schwarzer?= Date: Mon, 25 Jan 2010 21:57:14 +0100 Subject: German (informal) language update --- lib/plugins/config/lang/de-informal/lang.php | 15 +++++++++++++++ lib/plugins/usermanager/lang/de-informal/lang.php | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index 3b509e12e..28850aaa3 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -11,6 +11,7 @@ $lang['error'] = 'Einstellungen wurden nicht aktualisiert auf Gr
Die/der inkorrekte(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.'; $lang['updated'] = 'Einstellungen erfolgreich hochgeladen.'; $lang['nochoice'] = '(keine andere Option möglich)'; +$lang['danger'] = 'Achtung: Änderungen dieser Option könnten dein Wiki und das Konfigurationsmenü unzugänglich machen.'; $lang['warning'] = 'Achtung: Änderungen dieser Option kann zu unbabsichtigtem Verhalten führen.'; $lang['security'] = 'Sicherheitswarnung: Änderungen dieser Option können eine Sicherheitsrisiko bedeuten.'; $lang['_configuration_manager'] = 'Einstellungen'; @@ -30,6 +31,8 @@ $lang['_network'] = 'Netzwerk-Einstellungen'; $lang['_plugin_sufix'] = 'Ereiterungseinstellungen'; $lang['_template_sufix'] = 'Vorlageneinstellungen'; $lang['_msg_setting_no_default'] = 'Kein Standardwert.'; +$lang['fmode'] = 'Dateierstellungsmodus'; +$lang['dmode'] = 'Ordnererstellungsmodus'; $lang['lang'] = 'Sprache'; $lang['basedir'] = 'Installationsverzeichnis. Für automatische Erkennung frei lassen.'; $lang['baseurl'] = 'Installationspfad (URL)'; @@ -48,13 +51,24 @@ $lang['signature'] = 'Signatur'; $lang['usewordblock'] = 'Blockier Spam basierend auf der Wortliste'; $lang['useacl'] = 'Benutze Zugangskontrollliste'; $lang['autopasswd'] = 'Automatisch erzeugte Passwörter'; +$lang['passcrypt'] = 'Passwortverschlüsselungsmethode'; $lang['defaultgroup'] = 'Standardgruppe'; +$lang['profileconfirm'] = 'Bestätige Profiländerungen mit dem Passwort'; $lang['disableactions'] = 'Deaktiviere DokuWiki\'s Zugriffe'; +$lang['disableactions_check'] = 'Prüfe'; $lang['disableactions_subscription'] = 'Bestellen/Abbestellen'; $lang['disableactions_nssubscription'] = 'Namensraum Bestellen/Abbestellen'; $lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten'; $lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; +$lang['userewrite'] = 'Benutze angenehme URLs'; +$lang['autoplural'] = 'Prüfe die Links auf Plural-Formen'; +$lang['notify'] = 'Sende eine Änderungsmitteilung an diese E-Mail-Adresse'; +$lang['mailfrom'] = 'E-Mail-Adresse zur Nutzung für automatische E-Mails'; $lang['renderer__plugin'] = '%s (Erweiterung)'; +$lang['proxy____host'] = 'Proxy-Servername'; +$lang['proxy____port'] = 'Proxy- Port'; +$lang['proxy____user'] = 'Proxy-Nutzername'; +$lang['proxy____pass'] = 'Proxy-Passwort'; $lang['license_o_'] = 'Nichts ausgewählt'; $lang['typography_o_0'] = 'nichts'; $lang['userewrite_o_0'] = 'nichts'; @@ -66,6 +80,7 @@ $lang['rss_type_o_rss1'] = 'RSS 1.0'; $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; +$lang['rss_content_o_abstract'] = 'Abstraktum'; $lang['compression_o_0'] = 'nichts'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php index 780cc9e64..b57f999db 100644 --- a/lib/plugins/usermanager/lang/de-informal/lang.php +++ b/lib/plugins/usermanager/lang/de-informal/lang.php @@ -45,5 +45,5 @@ $lang['note_group'] = 'Neue Benutzer werden zur Standardgruppe (%s) h $lang['note_pass'] = 'Das Passwort wird automatisch erzeugt, wenn das Feld freigelassen wird und der Benutzer Benachrichtigungen aktiviert hat.'; $lang['add_ok'] = 'Benutzer erfolgreich hinzugefügt'; $lang['add_fail'] = 'Hinzufügen des Benutzers fehlgeschlagen'; -$lang['notify_ok'] = 'Benachrichtigungsemail wurde versendet'; -$lang['notify_fail'] = 'Benachrichtigungsemail konnte nicht gesendet werden'; +$lang['notify_ok'] = 'Benachrichtigungsmail wurde versendet'; +$lang['notify_fail'] = 'Benachrichtigungsmail konnte nicht gesendet werden'; -- cgit v1.2.3 From 3c743051cd4555135bdbf55c27733a2281463b4c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 26 Jan 2010 10:23:46 +0100 Subject: do not use "editor cleverness" on selected text This patch disables all keyhandling (as used for automatic list indention) when some text is selected. This fixes unexpected behavior when selecting some text at the start of a list item and hitting backspace. --- lib/scripts/edit.js | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index a80c8a06e..d7391b7e7 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -152,6 +152,7 @@ function keyHandler(e){ e.keyCode != 32) return; var field = e.target; var selection = getSelection(field); + if(selection.getLength()) return; //there was text selected, keep standard behavior var search = "\n"+field.value.substr(0,selection.start); var linestart = Math.max(search.lastIndexOf("\n"), search.lastIndexOf("\r")); //IE workaround -- cgit v1.2.3 From efb07c4e8b07eb4c07287d1bd6c0297ced02e3c8 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 26 Jan 2010 12:37:59 +0100 Subject: Cancel list if the last item is empty (two enter) --- lib/scripts/edit.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 4d8ead858..483fcc3cc 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -166,8 +166,14 @@ function keyHandler(e){ // keep current indention for lists and code var match = search.match(/(\n +([\*-] ?)?)/); if(match){ + var match2 = search.match(/^\n +[\*-]\s*$/); + // Cancel list if the last item is empty (i. e. two times enter) + if (match2 && field.value.substr(selection.start).match(/^($|\n)/)) { + field.value = field.value.substr(0, linestart) + "\n"; + } else { + insertAtCarret(field.id,match[1]); + } var scroll = field.scrollHeight; - insertAtCarret(field.id,match[1]); field.scrollTop += (field.scrollHeight - scroll); e.preventDefault(); // prevent enter key return false; -- cgit v1.2.3 From f3718805c9a748b2e6e5c7010f77a4d01859934c Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 27 Jan 2010 14:49:39 +0100 Subject: Update translations for subscription --- lib/plugins/config/lang/bg/lang.php | 1 - lib/plugins/config/lang/ca-valencia/lang.php | 1 - lib/plugins/config/lang/ca/lang.php | 1 - lib/plugins/config/lang/cs/lang.php | 1 - lib/plugins/config/lang/da/lang.php | 1 - lib/plugins/config/lang/de-informal/lang.php | 1 - lib/plugins/config/lang/de/lang.php | 2 +- lib/plugins/config/lang/el/lang.php | 1 - lib/plugins/config/lang/en/lang.php | 1 - lib/plugins/config/lang/eo/lang.php | 1 - lib/plugins/config/lang/es/lang.php | 1 - lib/plugins/config/lang/eu/lang.php | 1 - lib/plugins/config/lang/fa/lang.php | 1 - lib/plugins/config/lang/fi/lang.php | 1 - lib/plugins/config/lang/fr/lang.php | 1 - lib/plugins/config/lang/gl/lang.php | 1 - lib/plugins/config/lang/he/lang.php | 1 - lib/plugins/config/lang/hu/lang.php | 1 - lib/plugins/config/lang/it/lang.php | 1 - lib/plugins/config/lang/ja/lang.php | 1 - lib/plugins/config/lang/ko/lang.php | 1 - lib/plugins/config/lang/lv/lang.php | 1 - lib/plugins/config/lang/mr/lang.php | 1 - lib/plugins/config/lang/nl/lang.php | 1 - lib/plugins/config/lang/no/lang.php | 1 - lib/plugins/config/lang/pl/lang.php | 1 - lib/plugins/config/lang/pt-br/lang.php | 1 - lib/plugins/config/lang/pt/lang.php | 1 - lib/plugins/config/lang/ro/lang.php | 1 - lib/plugins/config/lang/ru/lang.php | 1 - lib/plugins/config/lang/sk/lang.php | 1 - lib/plugins/config/lang/sr/lang.php | 1 - lib/plugins/config/lang/sv/lang.php | 1 - lib/plugins/config/lang/uk/lang.php | 1 - lib/plugins/config/lang/zh-tw/lang.php | 1 - lib/plugins/config/lang/zh/lang.php | 1 - lib/plugins/config/settings/config.metadata.php | 4 ++-- 37 files changed, 3 insertions(+), 38 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index 0dfa805a8..855f0b2c2 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -80,7 +80,6 @@ $lang['profileconfirm'] = 'Потвърждаване на промени $lang['disableactions'] = 'Изключване на DokuWiki функции'; $lang['disableactions_check'] = 'Проверка'; $lang['disableactions_subscription'] = 'Записване/Отписване'; -$lang['disableactions_nssubscription'] = 'Записване/Отписване относно именни пространства'; $lang['disableactions_wikicode'] = 'Преглед на кода/Експортиране на оригинална версия'; $lang['disableactions_other'] = 'Други действия (разделени със запетая)'; $lang['sneaky_index'] = 'По подразбиране DokuWiki ще показва всички именни пространства в индекса. Избирането на настройката ще доведе до скриване на тези, за които потребителят няма права за четене. Това може да означава и скриване на достъпните подименни пространства. Това може да направи индекса неизползваем при определени настрокйки на списъците за контрол на достъп (ACL). '; diff --git a/lib/plugins/config/lang/ca-valencia/lang.php b/lib/plugins/config/lang/ca-valencia/lang.php index 4fa47f956..239213433 100644 --- a/lib/plugins/config/lang/ca-valencia/lang.php +++ b/lib/plugins/config/lang/ca-valencia/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'Confirmar canvis al perfil en la contrasenya'; $lang['disableactions'] = 'Desactivar accions de DokuWiki'; $lang['disableactions_check'] = 'Comprovar'; $lang['disableactions_subscription'] = 'Subscriure\'s/Desubscriure\'s'; -$lang['disableactions_nssubscription'] = 'Subscriure\'s/desubscriure\'s a l\'espai de noms'; $lang['disableactions_wikicode'] = 'Vore font/exportar còdic'; $lang['disableactions_other'] = 'Atres accions (separades per comes)'; $lang['sneaky_index'] = 'Normalment, DokuWiki mostra tots els espais de noms en la vista d\'índex. Activant esta opció s\'ocultaran aquells per als que l\'usuari no tinga permís de llectura. Açò pot ocultar subespais accessibles i inutilisar l\'índex per a certes configuracions del ACL.'; diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php index 60db83266..f0d622d35 100644 --- a/lib/plugins/config/lang/ca/lang.php +++ b/lib/plugins/config/lang/ca/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'Confirma amb contrasenya els canvis en el perf $lang['disableactions'] = 'Inhabilita accions DokuWiki'; $lang['disableactions_check'] = 'Revisa'; $lang['disableactions_subscription'] = 'Subscripció/cancel·lació'; -$lang['disableactions_nssubscription'] = 'Subscripció/cancel·lació a espai'; $lang['disableactions_wikicode'] = 'Mostra/exporta font'; $lang['disableactions_other'] = 'Altres accions (separades per comes)'; $lang['sneaky_index'] = 'Per defecte, DokuWiki mostrarà tots els espai en la visualització d\'índex. Si activeu aquest paràmetre, s\'ocultaran aquells espais en els quals l\'usuari no té accés de lectura. Això pot fer que s\'ocultin subespais que sí que són accessibles. En algunes configuracions ACL pot fer que l\'índex resulti inutilitzable.'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index a91b8c7e7..e5114617b 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -84,7 +84,6 @@ $lang['profileconfirm'] = 'Potvrdit změny v profilu zadáním hesla'; $lang['disableactions'] = 'Vypnout DokuWiki akce'; $lang['disableactions_check'] = 'Zkontrolovat'; $lang['disableactions_subscription'] = 'Přihlásit se/Odhlásit se ze seznamu pro odběr změn'; -$lang['disableactions_nssubscription'] = 'Přihlásit se/Odhlásit se ze seznamu pro odběr změn ve jmenném prostoru'; $lang['disableactions_wikicode'] = 'Prohlížet zdrojové kódy/Export wiki textu'; $lang['disableactions_other'] = 'Další akce (oddělené čárkou)'; $lang['sneaky_index'] = 'Ve výchozím nastavení DokuWiki zobrazuje v indexu všechny diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index 3974b82c2..93eb5c3e3 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -85,7 +85,6 @@ $lang['profileconfirm'] = 'Bekræft profilændringer med kodeord'; $lang['disableactions'] = 'Slå DokuWiki-muligheder fra'; $lang['disableactions_check'] = 'Tjek'; $lang['disableactions_subscription'] = 'Tliføj/Fjern opskrivning'; -$lang['disableactions_nssubscription'] = 'Tilmelding / afmelding af navnerum'; $lang['disableactions_wikicode'] = 'Vis kilde/Eksporter grundkode'; $lang['disableactions_other'] = 'Andre muligheder (kommasepareret)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerum i indholdsfortegnelsen. Ved at slå denne valgmulighed til vil skjule de navnerum, hvor brugeren ikke har læsetilladelse. Dette kan føre til, at tilgængelige undernavnerum bliver skjult. Ligeledes kan det også gøre indholdsfortegnelsen ubrugelig med visse ACL-opsætninger.'; diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index 28850aaa3..68232d80b 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -57,7 +57,6 @@ $lang['profileconfirm'] = 'Bestätige Profiländerungen mit dem Passwort' $lang['disableactions'] = 'Deaktiviere DokuWiki\'s Zugriffe'; $lang['disableactions_check'] = 'Prüfe'; $lang['disableactions_subscription'] = 'Bestellen/Abbestellen'; -$lang['disableactions_nssubscription'] = 'Namensraum Bestellen/Abbestellen'; $lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten'; $lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; $lang['userewrite'] = 'Benutze angenehme URLs'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index a76e39102..2cb44ab17 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -88,7 +88,6 @@ $lang['profileconfirm'] = 'Profiländerung nur nach Passwortbestätigung' $lang['disableactions'] = 'DokuWiki-Aktionen deaktivieren'; $lang['disableactions_check'] = 'Check'; $lang['disableactions_subscription'] = 'Seiten-Abonnements'; -$lang['disableactions_nssubscription'] = 'Namensraum-Abonnements'; $lang['disableactions_wikicode'] = 'Quelltext betrachten/exportieren'; $lang['disableactions_other'] = 'Andere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.'; @@ -115,6 +114,7 @@ $lang['gdlib'] = 'GD Lib Version'; $lang['im_convert'] = 'Pfad zu ImageMagicks Konvertierwerkzeug'; $lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)'; $lang['subscribers'] = 'E-Mail-Abos zulassen'; +$lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte größer als recent_days sein.'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; $lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)'; $lang['send404'] = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten'; diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php index 6c1b5039c..f0434a096 100644 --- a/lib/plugins/config/lang/el/lang.php +++ b/lib/plugins/config/lang/el/lang.php @@ -85,7 +85,6 @@ $lang['profileconfirm'] = 'Να απαιτείται ο κωδικός χ $lang['disableactions'] = 'Απενεργοποίηση λειτουργιών DokuWiki'; $lang['disableactions_check'] = 'Έλεγχος'; $lang['disableactions_subscription'] = 'Εγγραφή/Διαγραφή χρήστη'; -$lang['disableactions_nssubscription'] = 'Εγγραφή/Διαγραφή σε φάκελο'; $lang['disableactions_wikicode'] = 'Προβολή κώδικα σελίδας'; $lang['disableactions_other'] = 'Άλλες λειτουργίες (διαχωρίστε τις με κόμμα)'; $lang['sneaky_index'] = 'Εξ ορισμού, η εφαρμογή DokuWiki δείχνει όλους τους φακέλους στην προβολή Καταλόγου. Ενεργοποιώντας αυτή την επιλογή, δεν θα εμφανίζονται οι φάκελοι για τους οποίους ο χρήστης δεν έχει δικαιώματα ανάγνωσης αλλά και οι υπο-φάκελοί τους ανεξαρτήτως δικαιωμάτων πρόσβασης.'; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 45b653680..cad1a0aad 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -101,7 +101,6 @@ $lang['profileconfirm'] = 'Confirm profile changes with password'; $lang['disableactions'] = 'Disable DokuWiki actions'; $lang['disableactions_check'] = 'Check'; $lang['disableactions_subscription'] = 'Subscribe/Unsubscribe'; -$lang['disableactions_nssubscription'] = 'Namespace Subscribe /Unsubscribe'; $lang['disableactions_wikicode'] = 'View source/Export Raw'; $lang['disableactions_other'] = 'Other actions (comma separated)'; $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index 4d589696b..f490248e5 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -85,7 +85,6 @@ $lang['profileconfirm'] = 'Konfirmi ŝanĝojn en la trajtaro per pasvorto $lang['disableactions'] = 'Malebligi DokuWiki-ajn agojn'; $lang['disableactions_check'] = 'Kontroli'; $lang['disableactions_subscription'] = 'Aliĝi/Malaliĝi'; -$lang['disableactions_nssubscription'] = 'Aliĝi/Malaliĝi al nomspaco'; $lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti krudaĵon'; $lang['disableactions_other'] = 'Aliaj agoj (apartite per komoj)'; $lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Kaj tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 3e791e51f..739ec6bbe 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -91,7 +91,6 @@ $lang['profileconfirm'] = 'Confirmar cambios en perfil con contraseña'; $lang['disableactions'] = 'Deshabilitar acciones DokuWiki'; $lang['disableactions_check'] = 'Controlar'; $lang['disableactions_subscription'] = 'Suscribirse/Cancelar suscripción'; -$lang['disableactions_nssubscription'] = 'Suscribirse/Cancelar suscripción (Espacio de nombres)'; $lang['disableactions_wikicode'] = 'Ver la fuente/Exportar en formato raw'; $lang['disableactions_other'] = 'Otras acciones (separadas por coma)'; $lang['sneaky_index'] = 'Por defecto, DokuWiki mostrará todos los namespaces en el index. Habilitando esta opción los ocultará si el usuario no tiene permisos de lectura. Los sub-namespaces pueden resultar inaccesibles. El index puede hacerse poco usable dependiendo de las configuraciones ACL.'; diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php index 3554abd42..380b00971 100644 --- a/lib/plugins/config/lang/eu/lang.php +++ b/lib/plugins/config/lang/eu/lang.php @@ -78,7 +78,6 @@ $lang['profileconfirm'] = 'Profil aldaketak pasahitzaz berretsi'; $lang['disableactions'] = 'DokuWiki ekintzak ezgaitu'; $lang['disableactions_check'] = 'Egiaztatu'; $lang['disableactions_subscription'] = 'Harpidetu/Harpidetza utzi'; -$lang['disableactions_nssubscription'] = 'Izen-espaziora Harpidetu/Harpidetza utzi'; $lang['disableactions_wikicode'] = 'Ikusi iturburua/Esportatu Raw'; $lang['disableactions_other'] = 'Beste ekintzak (komaz bereiztuak)'; $lang['sneaky_index'] = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.'; diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php index a1f902090..bccb36804 100644 --- a/lib/plugins/config/lang/fa/lang.php +++ b/lib/plugins/config/lang/fa/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'تغییرات پروفایل با وارد ک $lang['disableactions'] = 'غیرفعال کردن فعالیت‌های DokuWiki'; $lang['disableactions_check'] = 'بررسی'; $lang['disableactions_subscription'] = 'عضویت/عدم عضویت'; -$lang['disableactions_nssubscription'] = 'عضویت/عدم عضویت فضای‌نام'; $lang['disableactions_wikicode'] = 'نمایش سورس/برون‌بری خام'; $lang['disableactions_other'] = 'فعالیت‌های دیگر (با ویرگول انگلیسی «,» از هم جدا کنید)'; $lang['sneaky_index'] = 'به طور پیش‌فرض، DokuWiki در فهرست تمامی فضای‌نام‌ها را نمایش می‌دهد. فعال کردن این گزینه، مواردی را که کاربر حق خواندنشان را ندارد مخفی می‌کند. این گزینه ممکن است باعث دیده نشدن زیرفضای‌نام‌هایی شود که دسترسی خواندن به آن‌ها وجود دارد. و ممکن است باعث شود که فهرست در حالاتی از دسترسی‌ها، غیرقابل استفاده شود.'; diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index 79b4957eb..fccb055a2 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'Vahvista profiilin päivitys salasanan avulla' $lang['disableactions'] = 'Estä DokuWiki-toimintojen käyttö'; $lang['disableactions_check'] = 'Tarkista'; $lang['disableactions_subscription'] = 'Tilaa/Peruuta tilaus'; -$lang['disableactions_nssubscription'] = 'Nimiavaruuden tilaus/tilauksen poisto'; $lang['disableactions_wikicode'] = 'Näytä lähdekoodi/Vie raakana'; $lang['disableactions_other'] = 'Muut toiminnot (pilkulla erotettuna)'; $lang['sneaky_index'] = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 2de2fb159..f410291e7 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -86,7 +86,6 @@ $lang['profileconfirm'] = 'Confirmer par mot de passe les modifications d $lang['disableactions'] = 'Actions à désactiver dans DokuWiki'; $lang['disableactions_check'] = 'Vérifier'; $lang['disableactions_subscription'] = 'Abonnement aux pages'; -$lang['disableactions_nssubscription'] = 'Abonnement aux catégories'; $lang['disableactions_wikicode'] = 'Afficher source'; $lang['disableactions_other'] = 'Autres actions (séparées par des virgules)'; $lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index efc5a6280..eb7559e2f 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'Confirmar as modificacións de perfil mediante $lang['disableactions'] = 'Desactivar accións do DokuWiki'; $lang['disableactions_check'] = 'Comprobar'; $lang['disableactions_subscription'] = 'Subscribir/Desubscribir'; -$lang['disableactions_nssubscription'] = 'Subscribir/Desubscribir en nomes de espazo'; $lang['disableactions_wikicode'] = 'Ver o código/Exportar datos raw'; $lang['disableactions_other'] = 'Outras accións (separadas por vírgulas)'; $lang['sneaky_index'] = 'O DokuWiki mostrará por defecto todos os nomes de espazo na vista de índice. Se activa isto serán ocultados aqueles onde o usuario non teña permisos de lectura.'; diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php index c47c8d099..a39d0ab5c 100644 --- a/lib/plugins/config/lang/he/lang.php +++ b/lib/plugins/config/lang/he/lang.php @@ -77,7 +77,6 @@ $lang['profileconfirm'] = 'אשר שינוי פרופילים עם סיס $lang['disableactions'] = 'בטל פעולות DokuWiki'; $lang['disableactions_check'] = 'בדיקה'; $lang['disableactions_subscription'] = 'הרשמה/הסרה מרשימה'; -$lang['disableactions_nssubscription'] = 'הרשמה / הסרת הרשמה ממרחב שם'; $lang['disableactions_wikicode'] = 'הצגת המקור/יצוא גולמי'; $lang['disableactions_other'] = 'פעולות אחרות (מופרדות בפסיק)'; $lang['sneaky_index'] = 'כברירת מחדל, דוקוויקי יציג את כל מרחבי השמות בתצוגת תוכן הענינים. בחירה באפשרות זאת תסתיר את אלו שבהם למשתמש אין הרשאות קריאה. התוצאה עלולה להיות הסתרת תת מרחבי שמות אליהם יש למשתמש גישה. באופן זה תוכן הענינים עלול להפוך לחסר תועלת עם הגדרות ACL מסוימות'; diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php index 0207922d2..9e51305fd 100644 --- a/lib/plugins/config/lang/hu/lang.php +++ b/lib/plugins/config/lang/hu/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'Beállítások változtatásának megerősít $lang['disableactions'] = 'Bizonyos DokuWiki tevékenységek (action) tiltása'; $lang['disableactions_check'] = 'Ellenőrzés'; $lang['disableactions_subscription'] = 'Feliratkozás/Leiratkozás'; -$lang['disableactions_nssubscription'] = 'Névtér feliratkozás/Leiratkozás'; $lang['disableactions_wikicode'] = 'Forrás megtekintése/Nyers adat exportja'; $lang['disableactions_other'] = 'Egyéb tevékenységek (vesszővel elválasztva)'; $lang['sneaky_index'] = 'Alapértelmezetten minden névtér látszik a DokuWiki áttekintő (index) oldalán. Ezen opció bekapcsolása után azok nem jelennek meg, melyekhez a felhasználónak nincs olvasás joga. De ezzel eltakarhatunk egyébként elérhető al-névtereket is, így bizonyos ACL beállításoknál használhatatlan indexet eredményez ez a beállítás.'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index 4c8296767..2a9ba42f0 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -87,7 +87,6 @@ $lang['profileconfirm'] = 'Richiedi la password per modifiche al profilo' $lang['disableactions'] = 'Disabilita azioni DokuWiki'; $lang['disableactions_check'] = 'Controlla'; $lang['disableactions_subscription'] = 'Sottoscrivi/Rimuovi sottoscrizione'; -$lang['disableactions_nssubscription'] = 'Sottoscrivi/Rimuovi sottoscrizione della categoria'; $lang['disableactions_wikicode'] = 'Mostra sorgente/Esporta Raw'; $lang['disableactions_other'] = 'Altre azioni (separate da virgola)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 947ea3c1d..c3bca045d 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -84,7 +84,6 @@ $lang['profileconfirm'] = 'プロフィール変更時に現在のパス $lang['disableactions'] = 'DokuWiki の動作を無効にする'; $lang['disableactions_check'] = 'チェック'; $lang['disableactions_subscription'] = '登録 / 解除'; -$lang['disableactions_nssubscription'] = '名前空間の登録 / 解除'; $lang['disableactions_wikicode'] = 'ソース閲覧 / 生データ出力'; $lang['disableactions_other'] = 'その他の動作（カンマ区切り）'; $lang['sneaky_index'] = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 195b0d2a2..efac643ab 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -82,7 +82,6 @@ $lang['profileconfirm'] = '개인정보 변경시 암호 재확인'; $lang['disableactions'] = 'DokuWiki Action 금지'; $lang['disableactions_check'] = '검사'; $lang['disableactions_subscription'] = '구독 신청/해지'; -$lang['disableactions_nssubscription'] = '네임스페이스 구독 신청/해지'; $lang['disableactions_wikicode'] = '문서 소스 보기'; $lang['disableactions_other'] = '다른 Action(comma로 구분)'; $lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 모든 네임스페이스들을 보여줍니다. diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php index b392389bf..51cb6d89b 100644 --- a/lib/plugins/config/lang/lv/lang.php +++ b/lib/plugins/config/lang/lv/lang.php @@ -79,7 +79,6 @@ $lang['profileconfirm'] = 'Profila labošanai vajag paroli'; $lang['disableactions'] = 'Bloķēt Dokuwiki darbības'; $lang['disableactions_check'] = 'atzīmēt'; $lang['disableactions_subscription'] = 'abonēt/atteikties'; -$lang['disableactions_nssubscription'] = 'abonēt nodaļu/atteikties'; $lang['disableactions_wikicode'] = 'skatīt/eksportēt izejtekstu'; $lang['disableactions_other'] = 'citas darbības (atdalīt ar komatiem)'; $lang['sneaky_index'] = 'Pēc noklusētā DokuWiki lapu sarakstā parāda visu nodaļu lapas. Ieslēdzot šo parametru, noslēps tās nodaļas, kuras apmeklētājam nav tiesības lasīt. Bet tad tiks arī paslēptas dziļākas, bet atļautas nodaļas. Atsevišķos pieejas tiesību konfigurācijas gadījumos lapu saraksts var nedarboties.'; diff --git a/lib/plugins/config/lang/mr/lang.php b/lib/plugins/config/lang/mr/lang.php index e2d290db5..79e8ea426 100644 --- a/lib/plugins/config/lang/mr/lang.php +++ b/lib/plugins/config/lang/mr/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'प्रोफाइल मधील बद $lang['disableactions'] = 'डॉक्युविकीच्या क्रिया बंद ठेवा'; $lang['disableactions_check'] = 'तपासा'; $lang['disableactions_subscription'] = 'सब्सक्राईब / अन्-सब्सक्राईब'; -$lang['disableactions_nssubscription'] = 'नेमस्पेस सब्सक्राईब / अन्-सब्सक्राईब'; $lang['disableactions_wikicode'] = 'स्त्रोत पहा / कच्च्या स्वरूपात एक्सपोर्ट करा'; $lang['disableactions_other'] = 'इतर क्रिया ( स्वल्पविरामाने अलग केलेल्या )'; $lang['sneaky_index'] = 'सूची दृश्यामधे डिफॉल्ट स्वरूपात डॉक्युविकी सगळे नेमस्पेस दाखवते. हा पर्याय चालू केल्यास सदस्याला वाचण्याची परवानगी नसलेले नेमस्पेस दिसणार नाहीत. यामुळे परवानगी असलेले उप - नेमस्पेस न दिसण्याची शक्यता आहे. यामुळे काही विशिष्ठ ACL सेटिंगसाठी सूची वापरता येण्यासारखी राहणार नाही.'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index cda817ffe..781598cd8 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -85,7 +85,6 @@ $lang['profileconfirm'] = 'Bevestig profielwijzigingen met wachtwoord'; $lang['disableactions'] = 'Aangevinkte DokuWiki-akties uitschakelen'; $lang['disableactions_check'] = 'Controleer'; $lang['disableactions_subscription'] = 'Inschrijven/opzeggen'; -$lang['disableactions_nssubscription'] = 'Namespace inschrijven/opzeggen'; $lang['disableactions_wikicode'] = 'Bron bekijken/exporteer rauw'; $lang['disableactions_other'] = 'Andere akties (gescheiden door komma\'s)'; $lang['sneaky_index'] = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 08dd8507a..4529b55fe 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -91,7 +91,6 @@ $lang['profileconfirm'] = 'Bekreft profilendringer med passord'; $lang['disableactions'] = 'Skru av følgende DokuWiki-kommandoer'; $lang['disableactions_check'] = 'Sjekk'; $lang['disableactions_subscription'] = 'Meld på/av'; -$lang['disableactions_nssubscription'] = 'Navnerom Abonnere /Stoppe abonnement'; $lang['disableactions_wikicode'] = 'Vis kildekode/eksporter rådata'; $lang['disableactions_other'] = 'Andre kommandoer (kommaseparert)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerom i innholdsfortegnelsen. Hvis du skrur på dette alternativet vil brukere bare se de navnerommene der de har lesetilgang. Dette kan føre til at tilgjengelige undernavnerom skjules. Det kan gjøre innholdsfortegnelsen ubrukelig med enkelte ACL-oppsett.'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 2d3b29db8..4f3c2ddec 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -82,7 +82,6 @@ $lang['profileconfirm'] = 'Potwierdzanie zmiany profilu hasłem'; $lang['disableactions'] = 'Wyłącz akcje DokuWiki'; $lang['disableactions_check'] = 'Sprawdzanie'; $lang['disableactions_subscription'] = 'Subskrypcje'; -$lang['disableactions_nssubscription'] = 'Subskrypcje katalogów'; $lang['disableactions_wikicode'] = 'Pokazywanie źródeł'; $lang['disableactions_other'] = 'Inne akcje (oddzielone przecinkiem)'; $lang['sneaky_index'] = 'Domyślnie, Dokuwiki pokazuje wszystkie katalogi w indeksie. Włączenie tej opcji ukryje katalogi, do których użytkownik nie ma praw. Może to spowodować ukrycie podkatalogów, do których użytkownik ma prawa. Ta opcja może spowodować błędne działanie indeksu w połączeniu z pewnymi konfiguracjami praw dostępu.'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 0d482c938..14e5cfb19 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -89,7 +89,6 @@ $lang['profileconfirm'] = 'Confirmar mudanças no perfil com a senha'; $lang['disableactions'] = 'Desabilitar as ações do DokuWiki'; $lang['disableactions_check'] = 'Verificação'; $lang['disableactions_subscription'] = 'Monitoramento'; -$lang['disableactions_nssubscription'] = 'Monitoramento do espaços de nomes'; $lang['disableactions_wikicode'] = 'Visualização da fonte/Exportação sem processamento'; $lang['disableactions_other'] = 'Outras ações (separadas por vírgula)'; $lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.'; diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php index 8b6145480..5b88f4bfc 100644 --- a/lib/plugins/config/lang/pt/lang.php +++ b/lib/plugins/config/lang/pt/lang.php @@ -81,7 +81,6 @@ $lang['profileconfirm'] = 'Confirmar mudanças no perfil com a senha'; $lang['disableactions'] = 'Desactivar acções DokuWiki'; $lang['disableactions_check'] = 'Checar'; $lang['disableactions_subscription'] = 'Subscrever/Não Subscrver'; -$lang['disableactions_nssubscription'] = 'Subscrever / Dessubscrever Espaço de Nome'; $lang['disableactions_wikicode'] = 'Ver fonte/Exportar em bruto'; $lang['disableactions_other'] = 'Outras acções (separadas por vírgula)'; $lang['sneaky_index'] = 'Por norma, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles em que o utilizador não tenha permissão de leitura. Isto pode resultar na omissão de sub-ramos acessíveis, que poderá tornar o índice inútil para certas configurações de ACL.'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index b3d601ffd..9d931933a 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -82,7 +82,6 @@ $lang['profileconfirm'] = 'Confirmă schimbarea profilului cu parola'; $lang['disableactions'] = 'Dezactivează acţiunile DokuWiki'; $lang['disableactions_check'] = 'Verifică'; $lang['disableactions_subscription'] = 'Subscrie/Anulează subscrierea'; -$lang['disableactions_nssubscription'] = 'Subscrie/Anulează subscrierea Spaţiului de nume'; $lang['disableactions_wikicode'] = 'Vizualizează sursa/Export Raw'; $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index 55b10742b..1e9905d64 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -88,7 +88,6 @@ $lang['profileconfirm'] = 'Пароль для изменения про $lang['disableactions'] = 'Заблокировать операции DokuWiki'; $lang['disableactions_check'] = 'Проверка'; $lang['disableactions_subscription'] = 'Подписка/Отмена подписки'; -$lang['disableactions_nssubscription'] = 'Пространство имен Подписаться/Отказаться от подписки'; $lang['disableactions_wikicode'] = 'Показ/экспорт исходного текста'; $lang['disableactions_other'] = 'Другие операции (через запятую)'; $lang['sneaky_index'] = 'По умолчанию, DokuWiki показывает в индексе страниц все пространства имен. Включение этой опции скроет пространства имен, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имен и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index bd69e543c..b9490d49b 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -80,7 +80,6 @@ $lang['profileconfirm'] = 'Potvrdzovať zmeny profilu heslom'; $lang['disableactions'] = 'Zakázať DokuWiki akcie'; $lang['disableactions_check'] = 'Skontrolovať'; $lang['disableactions_subscription'] = 'Prihlásiť/Odhlásiť informovanie o zmenách stránky'; -$lang['disableactions_nssubscription'] = 'Prihlásiť/Odhlásiť informovanie o zmenách v mennom priestore'; $lang['disableactions_wikicode'] = 'Pozrieť zdroj/Exportovať zdroj'; $lang['disableactions_other'] = 'Iné akcie (oddelené čiarkou)'; $lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.'; diff --git a/lib/plugins/config/lang/sr/lang.php b/lib/plugins/config/lang/sr/lang.php index 40d3afce6..2ad2f03aa 100644 --- a/lib/plugins/config/lang/sr/lang.php +++ b/lib/plugins/config/lang/sr/lang.php @@ -78,7 +78,6 @@ $lang['profileconfirm'] = 'Потврди промене у профил $lang['disableactions'] = 'Искључи DokuWiki наредбе'; $lang['disableactions_check'] = 'Провера'; $lang['disableactions_subscription'] = 'Претплата'; -$lang['disableactions_nssubscription'] = 'Претплата за именски простор'; $lang['disableactions_wikicode'] = 'Прикажи извор/Извези сирово'; $lang['disableactions_other'] = 'Остале наредбе (раздвојене зарезом)'; $lang['sneaky_index'] = 'По инсталацији DokuWiki ће у индексу приказати све именске просторе. Укључивањем ове опције именски простори у којима корисник нема право читања ће бити сакривени. Консеквенца је да ће и доступни подпростори бити сакривени. Ово доводи до неупотребљивости Права приступа у неким поставкама.'; diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php index 79e827542..3b5752ea1 100644 --- a/lib/plugins/config/lang/sv/lang.php +++ b/lib/plugins/config/lang/sv/lang.php @@ -91,7 +91,6 @@ $lang['profileconfirm'] = 'Bekräfta ändringarna i profilen med lösenor $lang['disableactions'] = 'Stäng av funktioner i DokuWiki'; $lang['disableactions_check'] = 'Kontroll'; $lang['disableactions_subscription'] = 'Prenumerera/Säg upp prenumeration'; -$lang['disableactions_nssubscription'] = 'Namnrymd Prenumerera/Säg upp prenumeration'; $lang['disableactions_wikicode'] = 'Visa källkod/Exportera råtext'; $lang['disableactions_other'] = 'Andra funktioner (kommaseparerade)'; $lang['sneaky_index'] = 'Som standard visar DokuWiki alla namnrymder på indexsidan. Genom att aktivera det här valet döljer man namnrymder som användaren inte har behörighet att läsa. Det kan leda till att man döljer åtkomliga undernamnrymder, och gör indexet oanvändbart med vissa ACL-inställningar.'; diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php index 73f39ce79..be6ec9e7a 100644 --- a/lib/plugins/config/lang/uk/lang.php +++ b/lib/plugins/config/lang/uk/lang.php @@ -84,7 +84,6 @@ $lang['profileconfirm'] = 'Підтверджувати зміни про $lang['disableactions'] = 'Заборонити дії ДокуВікі'; $lang['disableactions_check'] = 'Перевірити'; $lang['disableactions_subscription'] = 'Підписатись/Відписатись'; -$lang['disableactions_nssubscription'] = 'Підписатися/Відписатися на простір імен'; $lang['disableactions_wikicode'] = 'Переглянути код/Експорт'; $lang['disableactions_other'] = 'Інші дії (розділені комами)'; $lang['sneaky_index'] = 'За замовчуванням, ДокуВікі показує всі простори імен в змісті. Активація цієї опції сховає ті простори, де користувач не має прав на читання. Результатом може бути неможливість доступу до певних відкритих просторів імен. Це зробить неможливим використання змісту при певних конфігураціях.'; diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php index 0bb3f5a73..c363fb709 100644 --- a/lib/plugins/config/lang/zh-tw/lang.php +++ b/lib/plugins/config/lang/zh-tw/lang.php @@ -83,7 +83,6 @@ $lang['profileconfirm'] = '修改個人資料時需要確認密碼'; $lang['disableactions'] = '停用DokuWiki功能'; $lang['disableactions_check'] = '檢查'; $lang['disableactions_subscription'] = '訂閱/取消訂閱'; -$lang['disableactions_nssubscription'] = '命名空間訂閱/退訂'; $lang['disableactions_wikicode'] = '查看源文件/導出源文件'; $lang['disableactions_other'] = '其他功能(以逗號分隔)'; $lang['sneaky_index'] = '默認情況下，DokuWiki 在索引頁會顯示所有 namespace。啟用該選項能隱藏那些用戶沒有權限閱讀的頁面。但也可能將用戶能夠閱讀的子頁面一並隱藏。這有可能導致在特定 ACL 設置下，索引功能不可用。'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 404cc706a..279d7c5b7 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -85,7 +85,6 @@ $lang['profileconfirm'] = '更新个人信息时需要输入当前密码' $lang['disableactions'] = '停用 DokuWiki 功能'; $lang['disableactions_check'] = '检查'; $lang['disableactions_subscription'] = '订阅/退订'; -$lang['disableactions_nssubscription'] = '命名空间订阅/退订'; $lang['disableactions_wikicode'] = '查看源文件/导出源文件'; $lang['disableactions_other'] = '其他功能（用英文逗号分隔）'; $lang['sneaky_index'] = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index da2ba4aef..2f91b0ad8 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -127,8 +127,8 @@ $meta['profileconfirm'] = array('onoff'); $meta['rememberme'] = array('onoff'); $meta['registernotify'] = array('email'); $meta['disableactions'] = array('disableactions', - '_choices' => array('backlink','index','recent','revisions','search','subscription','nssubscription','register','resendpwd','profile','edit','wikicode','check'), - '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'), 'nssubscription' => array('subscribens','unsubscribens'))); + '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','edit','wikicode','check'), + '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'))); $meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); -- cgit v1.2.3 From c2a6d81662045023bdf1617b6b49f71c274d55ca Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 1 Feb 2010 16:10:25 +0100 Subject: plugin related autoloading This patch moved the place where DOKU_PLUGIN is defined. It no longer can be set from a normal config (only via preload) --- lib/plugins/acl/admin.php | 4 ---- lib/plugins/acl/ajax.php | 6 ------ lib/plugins/action.php | 3 --- lib/plugins/admin.php | 3 --- lib/plugins/config/admin.php | 3 --- lib/plugins/config/settings/config.class.php | 2 -- lib/plugins/info/syntax.php | 3 --- lib/plugins/plugin/admin.php | 2 -- lib/plugins/plugin/classes/ap_download.class.php | 3 --- lib/plugins/popularity/admin.php | 6 ------ lib/plugins/revert/admin.php | 4 ---- lib/plugins/syntax.php | 3 --- lib/plugins/usermanager/admin.php | 2 -- 13 files changed, 44 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a7037047a..b38d2ac6e 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -10,9 +10,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'admin.php'); - /** * All DokuWiki plugins to extend the admin function * need to inherit from this class @@ -216,7 +213,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { * @author Andreas Gohr */ function _html_explorer(){ - require_once(DOKU_INC.'inc/search.php'); global $conf; global $ID; global $lang; diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index d3e88d932..d91586a5d 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -13,9 +13,6 @@ if(!count($_POST) && $HTTP_RAW_POST_DATA){ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../'); require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/common.php'); -require_once(DOKU_INC.'inc/pageutils.php'); -require_once(DOKU_INC.'inc/auth.php'); //close session session_write_close(); @@ -24,8 +21,6 @@ if(!checkSecurityToken()) die('CRSF Attack'); $ID = getID(); -require_once(DOKU_INC.'inc/pluginutils.php'); -require_once(DOKU_INC.'inc/html.php'); $acl = plugin_load('admin','acl'); $acl->handle(); @@ -35,7 +30,6 @@ header('Content-Type: text/html; charset=utf-8'); if($ajax == 'info'){ $acl->_html_info(); }elseif($ajax == 'tree'){ - require_once(DOKU_INC.'inc/search.php'); global $conf; global $ID; diff --git a/lib/plugins/action.php b/lib/plugins/action.php index a26bc654a..885bd7c96 100644 --- a/lib/plugins/action.php +++ b/lib/plugins/action.php @@ -8,9 +8,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_INC.'inc/plugin.php'); - /** * All DokuWiki plugins to interfere with the event system * need to inherit from this class diff --git a/lib/plugins/admin.php b/lib/plugins/admin.php index 2eeda3f7b..25f01b657 100644 --- a/lib/plugins/admin.php +++ b/lib/plugins/admin.php @@ -8,9 +8,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_INC.'inc/plugin.php'); - /** * All DokuWiki plugins to extend the admin function * need to inherit from this class diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index cbee3440a..7cc2918f4 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -9,9 +9,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'admin.php'); - define('CM_KEYMARKER','____'); // used for settings with multiple dimensions of array indices define('PLUGIN_SELF',dirname(__FILE__).'/'); diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index d995e8a30..f9867b8de 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -528,8 +528,6 @@ if (!class_exists('setting_password')) { } if (!class_exists('setting_email')) { - - require_once(DOKU_INC.'inc/mail.php'); if (!defined('SETTING_EMAIL_PATTERN')) define('SETTING_EMAIL_PATTERN','<^'.PREG_PATTERN_VALID_EMAIL.'$>'); class setting_email extends setting_string { diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php index dc0a7d2fc..ba2831a90 100644 --- a/lib/plugins/info/syntax.php +++ b/lib/plugins/info/syntax.php @@ -9,9 +9,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'syntax.php'); - /** * All DokuWiki plugins to extend the parser/rendering mechanism * need to inherit from this class diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index 198512a43..c662b565a 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -13,8 +13,6 @@ if(!defined('DOKU_INC')) die(); // - allow a plugin to contain extras to be copied to the current template (extra/tpl/) // - to images (lib/images/) [ not needed, should go in lib/plugin/images/ ] -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'admin.php'); require_once(DOKU_PLUGIN."/plugin/classes/ap_manage.class.php"); //--------------------------[ GLOBALS ]------------------------------------------------ diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index 90e5de53b..6ad048d72 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -197,8 +197,6 @@ class ap_download extends ap_manage { $ext = $this->guess_archive($file); if (in_array($ext, array('tar','bz','gz'))) { - require_once(DOKU_INC."inc/TarLib.class.php"); - switch($ext){ case 'bz': $compress_type = COMPRESS_BZIP; @@ -227,7 +225,6 @@ class ap_download extends ap_manage { } return true; } else if ($ext == 'zip') { - require_once(DOKU_INC."inc/ZipLib.class.php"); $zip = new ZipLib(); $ok = $zip->Extract($file, $target); diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php index d084f5b58..c72beafdb 100644 --- a/lib/plugins/popularity/admin.php +++ b/lib/plugins/popularity/admin.php @@ -8,12 +8,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'admin.php'); -require_once(DOKU_INC.'inc/infoutils.php'); -require_once(DOKU_INC.'inc/pluginutils.php'); -require_once(DOKU_INC.'inc/search.php'); - /** * All DokuWiki plugins to extend the admin function * need to inherit from this class diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php index b24b1ff6e..1a327ca8a 100644 --- a/lib/plugins/revert/admin.php +++ b/lib/plugins/revert/admin.php @@ -2,10 +2,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'admin.php'); -require_once(DOKU_INC.'inc/changelog.php'); - /** * All DokuWiki plugins to extend the admin function * need to inherit from this class diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 633e001d2..601b5591e 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -8,9 +8,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_INC.'inc/parser/parser.php'); - /** * All DokuWiki plugins to extend the parser/rendering mechanism * need to inherit from this class diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index da6029bbf..4eb923bb1 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -13,9 +13,7 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); if(!defined('DOKU_PLUGIN_IMAGES')) define('DOKU_PLUGIN_IMAGES',DOKU_BASE.'lib/plugins/usermanager/images/'); -require_once(DOKU_PLUGIN.'admin.php'); /** * All DokuWiki plugins to extend the admin function -- cgit v1.2.3 From 24b3cb1ac0784ffa2acabf021fdd06c6d49cc7b1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 1 Feb 2010 16:20:40 +0100 Subject: removed require's in lib/exe/* --- lib/exe/ajax.php | 23 +---------------------- lib/exe/css.php | 4 ---- lib/exe/detail.php | 7 ------- lib/exe/fetch.php | 10 ++-------- lib/exe/indexer.php | 8 -------- lib/exe/js.php | 5 ----- lib/exe/mediamanager.php | 7 ------- lib/exe/xmlrpc.php | 23 ----------------------- 8 files changed, 3 insertions(+), 84 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 4618abd71..22de2f0f0 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -13,10 +13,7 @@ if(!count($_POST) && $HTTP_RAW_POST_DATA){ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/common.php'); -require_once(DOKU_INC.'inc/pageutils.php'); -require_once(DOKU_INC.'inc/auth.php'); -//close sesseion +//close session session_write_close(); header('Content-Type: text/html; charset=utf-8'); @@ -57,9 +54,6 @@ function ajax_qsearch(){ if(empty($query)) $query = cleanID($_GET['q']); if(empty($query)) return; - require_once(DOKU_INC.'inc/html.php'); - require_once(DOKU_INC.'inc/fulltext.php'); - $data = array(); $data = ft_pageLookup($query); @@ -95,10 +89,6 @@ function ajax_suggestions() { if(empty($query)) $query = cleanID($_GET['q']); if(empty($query)) return; - require_once(DOKU_INC.'inc/html.php'); - require_once(DOKU_INC.'inc/fulltext.php'); - require_once(DOKU_INC.'inc/JSON.php'); - $data = array(); $data = ft_pageLookup($query); if(!count($data)) return; @@ -181,8 +171,6 @@ function ajax_draftdel(){ */ function ajax_medians(){ global $conf; - require_once(DOKU_INC.'inc/search.php'); - require_once(DOKU_INC.'inc/media.php'); // wanted namespace $ns = cleanID($_POST['ns']); @@ -208,8 +196,6 @@ function ajax_medians(){ function ajax_medialist(){ global $conf; global $NS; - require_once(DOKU_INC.'inc/media.php'); - require_once(DOKU_INC.'inc/template.php'); $NS = $_POST['ns']; tpl_mediaContent(true); @@ -222,7 +208,6 @@ function ajax_medialist(){ */ function ajax_mediasearchlist(){ global $conf; - require_once(DOKU_INC.'inc/media.php'); media_searchlist($_POST['ns']); } @@ -234,8 +219,6 @@ function ajax_mediasearchlist(){ */ function ajax_index(){ global $conf; - require_once(DOKU_INC.'inc/search.php'); - require_once(DOKU_INC.'inc/html.php'); // wanted namespace $ns = cleanID($_POST['idx']); @@ -263,7 +246,6 @@ function ajax_index(){ function ajax_linkwiz(){ global $conf; global $lang; - require_once(DOKU_INC.'inc/html.php'); $q = ltrim($_POST['q'],':'); $id = noNS($q); @@ -279,8 +261,6 @@ function ajax_linkwiz(){ if($q && !$ns){ // use index to lookup matching pages - require_once(DOKU_INC.'inc/fulltext.php'); - require_once(DOKU_INC.'inc/parserutils.php'); $pages = array(); $pages = ft_pageLookup($id,false); @@ -312,7 +292,6 @@ function ajax_linkwiz(){ }else{ - require_once(DOKU_INC.'inc/search.php'); $opts = array( 'depth' => 1, 'listfiles' => true, diff --git a/lib/exe/css.php b/lib/exe/css.php index cb689d015..38017af9d 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -10,10 +10,6 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching) if(!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT',1); // we gzip ourself here require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/pageutils.php'); -require_once(DOKU_INC.'inc/httputils.php'); -require_once(DOKU_INC.'inc/io.php'); -require_once(DOKU_INC.'inc/confutils.php'); // Main (don't run when UNIT test) if(!defined('SIMPLE_TEST')){ diff --git a/lib/exe/detail.php b/lib/exe/detail.php index f30e039d4..3a04b7b09 100644 --- a/lib/exe/detail.php +++ b/lib/exe/detail.php @@ -2,13 +2,6 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); define('DOKU_MEDIADETAIL',1); require_once(DOKU_INC.'inc/init.php'); - require_once(DOKU_INC.'inc/common.php'); - require_once(DOKU_INC.'inc/lang/en/lang.php'); - require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php'); - require_once(DOKU_INC.'inc/JpegMeta.php'); - require_once(DOKU_INC.'inc/html.php'); - require_once(DOKU_INC.'inc/template.php'); - require_once(DOKU_INC.'inc/auth.php'); //close session session_write_close(); diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 11877ef36..78de3188b 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -9,14 +9,8 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); define('DOKU_DISABLE_GZIP_OUTPUT', 1); require_once(DOKU_INC.'inc/init.php'); - require_once(DOKU_INC.'inc/common.php'); - require_once(DOKU_INC.'inc/media.php'); - require_once(DOKU_INC.'inc/pageutils.php'); - require_once(DOKU_INC.'inc/httputils.php'); - require_once(DOKU_INC.'inc/confutils.php'); - require_once(DOKU_INC.'inc/auth.php'); - - //close sesseion + + //close session session_write_close(); $mimetypes = getMimeTypes(); diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 84eb9d482..828834c86 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -8,8 +8,6 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); define('DOKU_DISABLE_GZIP_OUTPUT',1); require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/auth.php'); -require_once(DOKU_INC.'inc/events.php'); session_write_close(); //close session if(!defined('NL')) define('NL',"\n"); @@ -177,8 +175,6 @@ function runIndexer(){ } if($conf['dperm']) chmod($lock, $conf['dperm']); - require_once(DOKU_INC.'inc/indexer.php'); - // upgrade to version 2 if (!@file_exists($conf['indexdir'].'/pageword.idx')) idx_upgradePageWords(); @@ -211,11 +207,8 @@ function metaUpdate(){ if (@file_exists($file)) return false; if (!@file_exists(wikiFN($ID))) return false; - require_once(DOKU_INC.'inc/common.php'); - require_once(DOKU_INC.'inc/parserutils.php'); global $conf; - // gather some additional info from changelog $info = io_grep($conf['changelog'], '/^(\d+)\t(\d+\.\d+\.\d+\.\d+)\t'.preg_quote($ID,'/').'\t([^\t]+)\t([^\t\n]+)/', @@ -348,7 +341,6 @@ function sendDigest() { if (!$conf['subscribers']) { return; } - require_once DOKU_INC . 'inc/subscription.php'; $subscriptions = subscription_find($ID, array('style' => '(digest|list)', 'escaped' => true)); global $auth; diff --git a/lib/exe/js.php b/lib/exe/js.php index 8648bf18f..044342187 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -11,10 +11,6 @@ if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session o if(!defined('NL')) define('NL',"\n"); if(!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT',1); // we gzip ourself here require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/pageutils.php'); -require_once(DOKU_INC.'inc/httputils.php'); -require_once(DOKU_INC.'inc/io.php'); -require_once(DOKU_INC.'inc/JSON.php'); // Main (don't run when UNIT test) if(!defined('SIMPLE_TEST')){ @@ -96,7 +92,6 @@ function js_out(){ echo 'LANG = '.$json->encode($lang['js']).";\n"; // load toolbar - require_once(DOKU_INC.'inc/toolbar.php'); toolbar_JSdefines('toolbar'); // load files diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index f6e91b858..1fe363985 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -6,13 +6,6 @@ @ini_set('session.use_only_cookies',0); require_once(DOKU_INC.'inc/init.php'); - require_once(DOKU_INC.'inc/lang/en/lang.php'); - require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php'); - require_once(DOKU_INC.'inc/media.php'); - require_once(DOKU_INC.'inc/common.php'); - require_once(DOKU_INC.'inc/search.php'); - require_once(DOKU_INC.'inc/template.php'); - require_once(DOKU_INC.'inc/auth.php'); trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); session_write_close(); //close session diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index d3913482f..fb6b79cf3 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -10,15 +10,10 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); define('DOKU_XMLRPC_API_VERSION',2); require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/common.php'); -require_once(DOKU_INC.'inc/auth.php'); session_write_close(); //close session if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); -require_once(DOKU_INC.'inc/IXR_Library.php'); - - /** * Contains needed wrapper functions and registers all available * XMLRPC functions. @@ -378,7 +373,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $ns = cleanID($ns); $dir = utf8_encodeFN(str_replace(':', '/', $ns)); $data = array(); - require_once(DOKU_INC.'inc/search.php'); $opts['skipacl'] = 0; // no ACL skipping for XMLRPC search($data, $conf['datadir'], 'search_allpages', $opts, $dir); return $data; @@ -407,7 +401,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $dir = utf8_encodeFN(str_replace(':', '/', $ns)); $data = array(); - require_once(DOKU_INC.'inc/search.php'); search($data, $conf['mediadir'], 'search_media', $options, $dir); $len = count($data); if(!$len) return array(); @@ -426,7 +419,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Return a list of backlinks */ function listBackLinks($id){ - require_once(DOKU_INC.'inc/fulltext.php'); return ft_backlinks($id); } @@ -519,8 +511,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { } if($conf['dperm']) chmod($lock, $conf['dperm']); - require_once(DOKU_INC.'inc/indexer.php'); - // do the work idx_addPage($id); @@ -572,7 +562,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return new IXR_ERROR(1, $lang['uploadexist'].'1'); } // check for valid content - @require_once(DOKU_INC.'inc/media.php'); $ok = media_contentcheck($ftmp, $imime); if($ok == -1) { return new IXR_ERROR(1, sprintf($lang['uploadexist'].'2', ".$iext")); @@ -590,7 +579,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $data[4] = $overwrite; // trigger event - require_once(DOKU_INC.'inc/events.php'); return trigger_event('MEDIA_UPLOAD_FINISH', $data, array($this, '_media_upload_action'), true); } else { @@ -615,14 +603,12 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { // check for references if needed $mediareferences = array(); if($conf['refcheck']){ - require_once(DOKU_INC.'inc/fulltext.php'); $mediareferences = ft_mediause($id,$conf['refshow']); } if(!count($mediareferences)){ $file = mediaFN($id); if(@unlink($file)){ - require_once(DOKU_INC.'inc/changelog.php'); addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE); io_sweepNS($id,'mediadir'); return 0; @@ -648,7 +634,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { chmod($data[1], $conf['fmode']); media_notify($data[2], $data[1], $data[3]); // add a log entry to the media changelog - require_once(DOKU_INC.'inc/changelog.php'); if ($data[4]) { addMediaLogEntry(time(), $data[2], DOKU_CHANGE_TYPE_EDIT); } else { @@ -728,9 +713,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { if(strlen($timestamp) != 10) return new IXR_Error(20, 'The provided value is not a valid timestamp'); - require_once(DOKU_INC.'inc/changelog.php'); - require_once(DOKU_INC.'inc/pageutils.php'); - $recents = getRecentsSince($timestamp); $changes = array(); @@ -764,9 +746,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { if(strlen($timestamp) != 10) return new IXR_Error(20, 'The provided value is not a valid timestamp'); - require_once(DOKU_INC.'inc/changelog.php'); - require_once(DOKU_INC.'inc/pageutils.php'); - $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); $changes = array(); @@ -803,8 +782,6 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { if(empty($id)) return new IXR_Error(1, 'Empty page ID'); - require_once(DOKU_INC.'inc/changelog.php'); - $revisions = getRevisions($id, $first, $conf['recent']+1); if(count($revisions)==0 && $first!=0) { -- cgit v1.2.3 From c1b2e736c1da490219a060dd52104c4f88e70f7e Mon Sep 17 00:00:00 2001 From: Sergio Motta Date: Tue, 2 Feb 2010 21:02:48 +0100 Subject: Portuguese language update --- lib/plugins/acl/lang/pt-br/lang.php | 1 + lib/plugins/config/lang/pt-br/lang.php | 1 + lib/plugins/plugin/lang/pt-br/lang.php | 1 + lib/plugins/popularity/lang/pt-br/lang.php | 1 + lib/plugins/revert/lang/pt-br/lang.php | 1 + lib/plugins/usermanager/lang/pt-br/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php index 82a19b290..e199b773c 100644 --- a/lib/plugins/acl/lang/pt-br/lang.php +++ b/lib/plugins/acl/lang/pt-br/lang.php @@ -16,6 +16,7 @@ * @author Frederico Guimarães * @author Jair Henrique * @author Luis Dantas + * @author Sergio Motta sergio@cisne.com.br */ $lang['admin_acl'] = 'Administração da Lista de Controles de Acesso'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 14e5cfb19..2e6971e34 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -13,6 +13,7 @@ * @author Frederico Guimarães * @author Jair Henrique * @author Luis Dantas + * @author Sergio Motta sergio@cisne.com.br */ $lang['menu'] = 'Configurações do DokuWiki'; $lang['error'] = 'As configurações não foram atualizadas devido a um valor inválido. Por favor, reveja suas alterações e reenvie-as.
O(s) valor(es) incorreto(s) serão exibidos contornados por uma borda vermelha.'; diff --git a/lib/plugins/plugin/lang/pt-br/lang.php b/lib/plugins/plugin/lang/pt-br/lang.php index d0c14459a..57052706e 100644 --- a/lib/plugins/plugin/lang/pt-br/lang.php +++ b/lib/plugins/plugin/lang/pt-br/lang.php @@ -13,6 +13,7 @@ * @author Frederico Guimarães * @author Jair Henrique * @author Luis Dantas + * @author Sergio Motta sergio@cisne.com.br */ $lang['menu'] = 'Gerenciar Plug-ins'; $lang['download'] = 'Baixar e instalar um novo plug-in'; diff --git a/lib/plugins/popularity/lang/pt-br/lang.php b/lib/plugins/popularity/lang/pt-br/lang.php index 40e1797f3..67732e8ef 100644 --- a/lib/plugins/popularity/lang/pt-br/lang.php +++ b/lib/plugins/popularity/lang/pt-br/lang.php @@ -12,6 +12,7 @@ * @author Frederico Guimarães * @author Jair Henrique * @author Luis Dantas + * @author Sergio Motta sergio@cisne.com.br */ $lang['name'] = 'Retorno de popularidade (pode demorar um pouco para carregar)'; $lang['submit'] = 'Enviar dados'; diff --git a/lib/plugins/revert/lang/pt-br/lang.php b/lib/plugins/revert/lang/pt-br/lang.php index 93c8bf4e1..4ee4432ee 100644 --- a/lib/plugins/revert/lang/pt-br/lang.php +++ b/lib/plugins/revert/lang/pt-br/lang.php @@ -13,6 +13,7 @@ * @author Frederico Guimarães * @author Jair Henrique * @author Luis Dantas + * @author Sergio Motta sergio@cisne.com.br */ $lang['menu'] = 'Gerenciador de reversões'; $lang['filter'] = 'Procura por páginas com spam'; diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php index cf7e48ea7..2c9a281b9 100644 --- a/lib/plugins/usermanager/lang/pt-br/lang.php +++ b/lib/plugins/usermanager/lang/pt-br/lang.php @@ -13,6 +13,7 @@ * @author Frederico Guimarães * @author Jair Henrique * @author Luis Dantas + * @author Sergio Motta sergio@cisne.com.br */ $lang['menu'] = 'Gerenciamento de Usuários'; $lang['noauth'] = '(o gerenciamento de usuários não está disponível)'; -- cgit v1.2.3 From 358eb25cb317b9c77abe1976ae52f99a3da4c3a0 Mon Sep 17 00:00:00 2001 From: Kazutaka Miyasaka Date: Wed, 3 Feb 2010 00:55:19 +0900 Subject: fixed "numericopt" handling in plugin:config --- lib/plugins/config/settings/config.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index d995e8a30..a6f652d79 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -629,7 +629,8 @@ if (!class_exists('setting_numeric')) { $out = ''; if ($fmt=='php') { - $out .= '$'.$var."['".$this->_out_key()."'] = ".$this->_local.";\n"; + $local = $this->_local === '' ? "''" : $this->_local; + $out .= '$'.$var."['".$this->_out_key()."'] = ".$local.";\n"; } return $out; -- cgit v1.2.3 From 1807fcf5084f3bda9cef9580a624b9afed38b559 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Wed, 3 Feb 2010 21:28:59 +0100 Subject: French language fix FS#1875 --- lib/plugins/acl/lang/fr/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index efdc5f074..88a045ffe 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -42,7 +42,7 @@ $lang['acl_perm0'] = 'Aucune'; $lang['acl_perm1'] = 'Lecture'; $lang['acl_perm2'] = 'Écriture'; $lang['acl_perm4'] = 'Création'; -$lang['acl_perm8'] = 'Télécharger'; +$lang['acl_perm8'] = 'Téléverser (Upload)'; $lang['acl_perm16'] = 'Effacer'; $lang['acl_new'] = 'Ajouter une nouvelle entrée'; $lang['acl_mod'] = 'Modifier l\'entrée'; -- cgit v1.2.3 From 90df9a4d69a2e467433b419b94fe799d11590539 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 4 Feb 2010 14:50:10 +0100 Subject: Rewrite section edit handling according to #1860 --- lib/scripts/script.js | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index b611f980a..ef4ae95a2 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -535,38 +535,24 @@ addInitEvent(function(){ * @author Andreas Gohr */ addInitEvent(function(){ - var break_classes = new RegExp('secedit|toc|page'); var btns = getElementsByClass('btn_secedit',document,'form'); for(var i=0; i Date: Sat, 6 Feb 2010 12:25:26 +0100 Subject: Polish language update --- lib/plugins/acl/lang/pl/lang.php | 3 ++- lib/plugins/config/lang/pl/lang.php | 2 ++ lib/plugins/plugin/lang/pl/lang.php | 1 + lib/plugins/popularity/lang/pl/lang.php | 1 + lib/plugins/revert/lang/pl/lang.php | 1 + lib/plugins/usermanager/lang/pl/lang.php | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index 63a870c50..4105bb448 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -7,6 +7,7 @@ * @author Mariusz Kujawski * @author Maciej Kurczewski * @author Sławomir Boczek + * @author sleshek@wp.pl */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; @@ -18,7 +19,7 @@ $lang['btn_select'] = 'Wybierz'; $lang['p_user_id'] = 'Użytkownik %s posiada następujące uprawnienia do strony %s: %s.'; $lang['p_user_ns'] = 'Użytkownik %s posiada następujące uprawnienia do katalogów %s: %s.'; $lang['p_group_id'] = 'Członkowie grupy %s posiadają następujące uprawnienia do strony %s: %s.'; -$lang['p_group_ns'] = 'Członkowie grupy %s posiadają następujące uprawnienia do strony %s: %s.'; +$lang['p_group_ns'] = 'Członkowie grupy %s posiadają następujące uprawnienia do katalogu %s: %s.'; $lang['p_choose_id'] = 'Podaj nazwę użytkownika lub grupy w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do strony %s.'; $lang['p_choose_ns'] = 'Podaj nazwę użytkownika lub grupy w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do katalogu %s.'; $lang['p_inherited'] = 'Uwaga: Uprawnienia nie zostały nadane wprost ale są dziedziczone z grupy lub katalogu.'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 4f3c2ddec..7eb8a44f3 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -8,6 +8,7 @@ * @author Maciej Kurczewski * @author Sławomir Boczek * @author Piotr JANKOWSKI + * @author sleshek@wp.pl */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
Niepoprawne wartości są wyróżnione kolorem czerwonym.'; @@ -108,6 +109,7 @@ $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['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)'; $lang['send404'] = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index c9f74bd52..1c1fcc4e3 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -8,6 +8,7 @@ * @author Mariusz Kujawski * @author Maciej Kurczewski * @author Sławomir Boczek + * @author sleshek@wp.pl */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index 0f15863ae..b64dc07da 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -6,6 +6,7 @@ * @author Mariusz Kujawski * @author Maciej Kurczewski * @author Sławomir Boczek + * @author sleshek@wp.pl */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index 8ad68b5f8..845a18211 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -5,6 +5,7 @@ * @author Mariusz Kujawski * @author Maciej Kurczewski * @author Sławomir Boczek + * @author sleshek@wp.pl */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 3db83b9b3..6a0eca809 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -6,6 +6,7 @@ * @author Mariusz Kujawski * @author Maciej Kurczewski * @author Sławomir Boczek + * @author sleshek@wp.pl */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; -- cgit v1.2.3 From 25fabd1de0b6421edfdfb47904354a7b8bff16e0 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 5 Feb 2010 10:03:19 +0100 Subject: Fix documentation for subscribe_time --- lib/exe/indexer.php | 3 ++- lib/plugins/config/lang/de/lang.php | 2 +- lib/plugins/config/lang/en/lang.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 84eb9d482..35aa1beef 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -365,7 +365,8 @@ function sendDigest() { list($user, $style, $lastupdate) = $data; $lastupdate = (int) $lastupdate; if ($lastupdate + $conf['subscribe_interval'] > time()) { - // Less than a day passed since last update. + // Less than the configured time period passed since last + // update. continue; } diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 2cb44ab17..2075322d2 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -114,7 +114,7 @@ $lang['gdlib'] = 'GD Lib Version'; $lang['im_convert'] = 'Pfad zu ImageMagicks Konvertierwerkzeug'; $lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)'; $lang['subscribers'] = 'E-Mail-Abos zulassen'; -$lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte größer als recent_days sein.'; +$lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; $lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)'; $lang['send404'] = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten'; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index cad1a0aad..7198ca36d 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -129,7 +129,7 @@ $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compression quality (0-100)'; $lang['subscribers'] = 'Enable page subscription support'; -$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be larger than the time specified in recent_days.'; +$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['hidepages'] = 'Hide matching pages (regular expressions)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; -- cgit v1.2.3 From 70421c96f055e574aa6e9602492ca4b35a33b9f2 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 8 Feb 2010 15:44:26 +0100 Subject: Correct subscribe config parameter name --- lib/exe/indexer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 35aa1beef..821163473 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -364,7 +364,7 @@ function sendDigest() { foreach($users as $data) { list($user, $style, $lastupdate) = $data; $lastupdate = (int) $lastupdate; - if ($lastupdate + $conf['subscribe_interval'] > time()) { + if ($lastupdate + $conf['subscribe_time'] > time()) { // Less than the configured time period passed since last // update. continue; -- cgit v1.2.3 From 52b35d3ab15e4a042a2e1c5c8c5766fc76c534af Mon Sep 17 00:00:00 2001 From: Marcel Metz Date: Mon, 8 Feb 2010 20:11:06 +0100 Subject: Informal German language update --- lib/plugins/acl/lang/de-informal/lang.php | 6 +- lib/plugins/config/lang/de-informal/intro.txt | 4 +- lib/plugins/config/lang/de-informal/lang.php | 67 ++++++++++++++-------- .../plugin/lang/de-informal/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/de-informal/lang.php | 16 +++--- lib/plugins/popularity/lang/de-informal/intro.txt | 8 +-- lib/plugins/popularity/lang/de-informal/lang.php | 2 +- lib/plugins/revert/lang/de-informal/lang.php | 9 ++- lib/plugins/usermanager/lang/de-informal/lang.php | 10 ++-- 9 files changed, 70 insertions(+), 54 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index cd42fdedc..6cabe3f35 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -4,7 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer - * @author ste-re@web.de + * @author Marcel Metz */ $lang['admin_acl'] = 'Zugriffskontrollsystem Management'; $lang['acl_group'] = 'Gruppe'; @@ -21,14 +21,14 @@ $lang['p_choose_id'] = 'Bitte gib einen Nutzer oder eine Gruppe $lang['p_choose_ns'] = 'Bitte gib einen Nutzer oder eine Gruppe in das Formular ein, um die Berechtigungen des Namenraumes%s anzusehen oder zu bearbeiten.'; $lang['p_inherited'] = 'Hinweis: Diese Rechte wuredn nicht explizit gesetzt sondern geerbt von anderen Grupen oder übergeordneten Namensräumen.'; $lang['p_isadmin'] = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.'; -$lang['p_include'] = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Loeschrechte sind nur fuer Namensräume, nicht fuer Seiten.'; +$lang['p_include'] = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Löschrechte sind nur für Namensräume, nicht für Seiten.'; $lang['current'] = 'Momentane Zugriffsregeln'; $lang['where'] = 'Seite/Namensraum'; $lang['who'] = 'Benutzer/Gruppe'; $lang['perm'] = 'Rechte'; $lang['acl_perm0'] = 'Keine'; $lang['acl_perm1'] = 'Lesen'; -$lang['acl_perm2'] = 'Editieren'; +$lang['acl_perm2'] = 'Bearbeiten'; $lang['acl_perm4'] = 'Erstellen'; $lang['acl_perm8'] = 'Hochladen'; $lang['acl_perm16'] = 'Löschen'; diff --git a/lib/plugins/config/lang/de-informal/intro.txt b/lib/plugins/config/lang/de-informal/intro.txt index 45861dd00..7ac1b47d9 100644 --- a/lib/plugins/config/lang/de-informal/intro.txt +++ b/lib/plugins/config/lang/de-informal/intro.txt @@ -1,7 +1,7 @@ ===== Einstellungs-Manager ===== -Benutze diese Seite zur Kontrolle der Einstellungen deiner DokuWiki-Installation. Für Hilfe zu individuellen Einstellungen gehe zu [[doku>config]]. Für mehr Details über diese Erweiterunge siehe [[doku>plugin:config]]. +Benutze diese Seite zur Kontrolle der Einstellungen deiner DokuWiki-Installation. Für Hilfe zu individuellen Einstellungen gehe zu [[doku>config]]. Für mehr Details über diese Erweiterungen siehe [[doku>plugin:config]]. Einstellungen die mit einem hellroten Hintergrund angezeigt werden, können mit dieser Erweiterung nicht verändert werden. Einstellungen mit einem blauen Hintergrund sind Standardwerte und Einstellungen mit einem weißen Hintergrund wurden lokal gesetzt für diese Installation. Sowohl blaue als auch weiße Einstellungen können angepasst werden. -Denke dran **SAVE** zu drücken bevor du die Seite verläßt, andernfalls werden deine Änderungen nicht übernommen. \ No newline at end of file +Denke dran **Speichern** zu drücken bevor du die Seite verlässt, andernfalls werden deine Änderungen nicht übernommen. \ No newline at end of file diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index 68232d80b..69ad3e524 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -4,19 +4,20 @@ * * @author Alexander Fischer * @author Juergen Schwarzer - * @author ste-re@web.de + * @author Marcel Metz */ $lang['menu'] = 'Einstellungen'; $lang['error'] = 'Einstellungen wurden nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfen Sie Ihre Änderungen und versuchen Sie es erneut. -
Die/der inkorrekte(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.'; -$lang['updated'] = 'Einstellungen erfolgreich hochgeladen.'; +
Die/der ungültige(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.'; +$lang['updated'] = 'Einstellungen erfolgreich aktualisiert.'; $lang['nochoice'] = '(keine andere Option möglich)'; -$lang['danger'] = 'Achtung: Änderungen dieser Option könnten dein Wiki und das Konfigurationsmenü unzugänglich machen.'; -$lang['warning'] = 'Achtung: Änderungen dieser Option kann zu unbabsichtigtem Verhalten führen.'; -$lang['security'] = 'Sicherheitswarnung: Änderungen dieser Option können eine Sicherheitsrisiko bedeuten.'; +$lang['locked'] = 'Die Einstallungsdatei kann nicht aktualisiert werden. Wenn dies beunabsichtigt ist stelle sicher, dass der Name und die Zugriffsrechte der Einstellungsdatei richtig sind.'; +$lang['danger'] = '**Achtung**: Eine Änderung dieser Einstellung kann dein Wiki und das Einstellungsmenü unerreichbar machen.'; +$lang['warning'] = 'Achtung: Eine Änderungen dieser Option kann zu unbabsichtigtem Verhalten führen.'; +$lang['security'] = 'Sicherheitswarnung: Eine Änderungen dieser Option können ein Sicherheitsrisiko bedeuten.'; $lang['_configuration_manager'] = 'Einstellungen'; $lang['_header_dokuwiki'] = 'DokuWiki-Einstellungen'; -$lang['_header_plugin'] = 'Erweiterugs-Einstellungen'; +$lang['_header_plugin'] = 'Erweiterungs-Einstellungen'; $lang['_header_template'] = 'Vorlageneinstellungen'; $lang['_header_undefined'] = 'unbestimmte Einstellungen'; $lang['_basic'] = 'Grundeinstellungen'; @@ -31,47 +32,59 @@ $lang['_network'] = 'Netzwerk-Einstellungen'; $lang['_plugin_sufix'] = 'Ereiterungseinstellungen'; $lang['_template_sufix'] = 'Vorlageneinstellungen'; $lang['_msg_setting_no_default'] = 'Kein Standardwert.'; -$lang['fmode'] = 'Dateierstellungsmodus'; -$lang['dmode'] = 'Ordnererstellungsmodus'; +$lang['fmode'] = 'Zugriffsrechte bei Dateierstellung'; +$lang['dmode'] = 'Zugriffsrechte bei Verzeichniserstellung'; $lang['lang'] = 'Sprache'; -$lang['basedir'] = 'Installationsverzeichnis. Für automatische Erkennung frei lassen.'; -$lang['baseurl'] = 'Installationspfad (URL)'; $lang['savedir'] = 'Ordner zum Speichern von Daten'; $lang['start'] = 'Name der Startseite'; $lang['title'] = 'Wiki Titel'; $lang['template'] = 'Vorlage'; $lang['license'] = 'Unter welcher Lizenz sollte Ihr Inhalt veröffentlicht werden?'; -$lang['fullpath'] = 'Den kompletten Dateipfad im Footer anzeigen'; +$lang['fullpath'] = 'Zeige vollen Pfad der Datei in Fußzeile an'; $lang['recent'] = 'letzte Änderungen'; $lang['typography'] = 'Mach drucktechnische Ersetzungen'; $lang['htmlok'] = 'Erlaube eingebettetes HTML'; $lang['phpok'] = 'Erlaube eingebettetes PHP'; -$lang['dformat'] = 'Datumsformat (siehe PHP\'s strftime function)'; +$lang['dformat'] = 'Datumsformat (siehe PHPs strftime Funktion)'; $lang['signature'] = 'Signatur'; -$lang['usewordblock'] = 'Blockier Spam basierend auf der Wortliste'; +$lang['usewordblock'] = 'Blockiere Spam basierend auf der Wortliste'; $lang['useacl'] = 'Benutze Zugangskontrollliste'; $lang['autopasswd'] = 'Automatisch erzeugte Passwörter'; $lang['passcrypt'] = 'Passwortverschlüsselungsmethode'; $lang['defaultgroup'] = 'Standardgruppe'; -$lang['profileconfirm'] = 'Bestätige Profiländerungen mit dem Passwort'; +$lang['profileconfirm'] = 'Änderungen am Benutzerprofil mit Passwort bestätigen'; $lang['disableactions'] = 'Deaktiviere DokuWiki\'s Zugriffe'; -$lang['disableactions_check'] = 'Prüfe'; $lang['disableactions_subscription'] = 'Bestellen/Abbestellen'; +$lang['disableactions_nssubscription'] = 'Namensraum Bestellen/Abbestellen'; $lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten'; $lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; -$lang['userewrite'] = 'Benutze angenehme URLs'; -$lang['autoplural'] = 'Prüfe die Links auf Plural-Formen'; -$lang['notify'] = 'Sende eine Änderungsmitteilung an diese E-Mail-Adresse'; -$lang['mailfrom'] = 'E-Mail-Adresse zur Nutzung für automatische E-Mails'; +$lang['sneaky_index'] = 'Standardmäßig zeigt Dokuwiki alle Namensräume in der Indexansicht an. Bei Aktivierung dieser Einstellung werden alle Namensräume versteckt, in welchen der Benutzer keine Leserechte hat. Dies könnte dazu führen, dass lesbare Unternamensräume versteckt werden. Dies kann die Indexansicht bei bestimmten Zugangskontrolleinstellungen unbenutzbar machen.'; +$lang['userewrite'] = 'Benutze schöne URLs'; +$lang['useslash'] = 'Benutze Schrägstrich als Namensraumtrenner in URLs'; +$lang['usedraft'] = 'Speichere automatisch Entwürfe während der Bearbeitung'; +$lang['notify'] = 'Sende Änderungsbenachrichtigungen an diese eMail Adresse.'; +$lang['registernotify'] = 'Sende Information bei neu registrierten Benutzern an diese eMail Adresse.'; +$lang['gdlib'] = 'GD Lib Version'; +$lang['send404'] = 'Sende "HTTP 404/Seite nicht gefunden" für nicht existierende Seiten'; $lang['renderer__plugin'] = '%s (Erweiterung)'; -$lang['proxy____host'] = 'Proxy-Servername'; -$lang['proxy____port'] = 'Proxy- Port'; -$lang['proxy____user'] = 'Proxy-Nutzername'; -$lang['proxy____pass'] = 'Proxy-Passwort'; +$lang['target____wiki'] = 'Zielfenstername für interne Links'; +$lang['target____interwiki'] = 'Zielfenstername für interwiki Links'; +$lang['target____extern'] = 'Zielfenstername für externe Links'; +$lang['target____media'] = 'Zielfenstername für Medienlinks'; +$lang['target____windows'] = 'Zielfenstername für Windowslinks'; +$lang['safemodehack'] = 'Aktiviere safemode Hack'; +$lang['ftp____host'] = 'FTP Server für safemode Hack'; +$lang['ftp____port'] = 'FTP Port für safemode Hack'; +$lang['ftp____user'] = 'FTP Benutzername für safemode Hack'; +$lang['ftp____pass'] = 'FTP Passwort für safemode Hack'; $lang['license_o_'] = 'Nichts ausgewählt'; $lang['typography_o_0'] = 'nichts'; $lang['userewrite_o_0'] = 'nichts'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'DokuWiki intern'; $lang['deaccent_o_0'] = 'aus'; +$lang['deaccent_o_1'] = 'Entferne Akzente'; +$lang['gdlib_o_0'] = 'GD lib ist nicht verfügbar'; $lang['gdlib_o_1'] = 'Version 1.x'; $lang['gdlib_o_2'] = 'Autoerkennung'; $lang['rss_type_o_rss'] = 'RSS 0.91'; @@ -79,7 +92,11 @@ $lang['rss_type_o_rss1'] = 'RSS 1.0'; $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; -$lang['rss_content_o_abstract'] = 'Abstraktum'; +$lang['rss_content_o_abstract'] = 'Zusammenfassung'; +$lang['rss_content_o_diff'] = 'Unified Diff'; +$lang['rss_linkto_o_diff'] = 'Ansicht der Unterschiede'; +$lang['rss_linkto_o_rev'] = 'Liste der Revisionen'; +$lang['rss_linkto_o_current'] = 'Die aktuelle Seite'; $lang['compression_o_0'] = 'nichts'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; diff --git a/lib/plugins/plugin/lang/de-informal/admin_plugin.txt b/lib/plugins/plugin/lang/de-informal/admin_plugin.txt index 663313436..576797d57 100644 --- a/lib/plugins/plugin/lang/de-informal/admin_plugin.txt +++ b/lib/plugins/plugin/lang/de-informal/admin_plugin.txt @@ -1,3 +1,3 @@ ===== Erweiterungsmanagement ===== -Auf dieser Seite kannst du alles anpassen was mit DokuWiki zu tun hat [[doku>plugins|plugins]]. Der Ordner der Erweiterungen muss für den Webserver beschreibbar sein, um Erweiterungen herunterladen und installieren zu können. \ No newline at end of file +Auf dieser Seite kannst du alles anpassen was mit den DokuWiki [[doku>plugins|Erweiterungen]] zu tun hat. Der Ordner der Erweiterungen muss für den Webserver beschreibbar sein, um Erweiterungen herunterladen und installieren zu können. \ No newline at end of file diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php index 5796eebf1..f906bf6aa 100644 --- a/lib/plugins/plugin/lang/de-informal/lang.php +++ b/lib/plugins/plugin/lang/de-informal/lang.php @@ -4,11 +4,11 @@ * * @author Alexander Fischer * @author Juergen Schwarzer - * @author ste-re@web.de + * @author Marcel Metz */ $lang['menu'] = 'Plugins verwalten'; -$lang['download'] = 'Herunterladen und installieren eines neuen Plugins'; -$lang['manage'] = 'Installierte Plugins'; +$lang['download'] = 'Herunterladen und installieren einer neuen Erweiterung'; +$lang['manage'] = 'Installierte Erweiterungen'; $lang['btn_info'] = 'Information'; $lang['btn_update'] = 'aktualisieren'; $lang['btn_delete'] = 'löschen'; @@ -24,15 +24,15 @@ $lang['updating'] = 'Aktualisiere...'; $lang['updated'] = 'Erweiterung %s wurde erfolgreich aktualisiert.'; $lang['updates'] = 'Die folgenden Erweiterungen wurden erfolgreich aktualisiert.'; $lang['update_none'] = 'Keine Aktualisierungen gefunden.'; -$lang['deleting'] = 'Loesche...'; +$lang['deleting'] = 'Lösche...'; $lang['deleted'] = 'Erweiterung %s wurde gelöscht.'; $lang['downloading'] = 'Herunterladen...'; $lang['downloaded'] = 'Erweiterung %s wurde erfolgreich installiert'; $lang['downloads'] = 'Die folgenden Erweiterungen wurden erfolgreich installiert:'; $lang['download_none'] = 'Keine Erweiterungen gefunden oder es trat ein unbekanntest Problem beim Herunterladen und Installieren auf.'; -$lang['plugin'] = 'Plugin:'; +$lang['plugin'] = 'Erweiterung:'; $lang['components'] = 'Komponenten'; -$lang['noinfo'] = 'Diese Erweiterung gab keine Information zurück - es könnte ungültig sein.'; +$lang['noinfo'] = 'Diese Erweiterung gab keine Information zurück - sie könnte ungültig sein.'; $lang['name'] = 'Name:'; $lang['date'] = 'Datum:'; $lang['type'] = 'Typ:'; @@ -44,8 +44,8 @@ $lang['error_download'] = 'Nicht möglich die Erweiterung herunterzuladen $lang['error_badurl'] = 'Vermute schlechte URL - nicht möglich den Dateinamen aus der URL zu ermitteln'; $lang['error_dircreate'] = 'Nicht möglich einen temporären Ordner zu erstellen um den Download zu empfangen.'; $lang['error_decompress'] = 'Dem Erweiterungsmanager war es nicht möglich die heruntergeladene Datei zu dekomprimieren. Dies kann an einem defekten Download liegen, in diesem Fall sollten Sie es erneut versuchen; oder das Format mit dem die Datei komprimiert ist, ist unbekannt, da müssen Sie die Erweiterung manuell herunterladen und installieren. '; -$lang['error_copy'] = 'Es trat ein Dateifehler beim Kopieren der Installationsdateien für Plugn %s auf: Die Festplatte könnte voll oder die Zugriffsrechte verweigert worden sein. Dies führt zu einem teilweise installierten Plugin und belässt dein Wiki in einem instabilen Zustand.'; -$lang['error_delete'] = 'Es trat ein Fehler beim Löschen des Plugins %s auf. Die whrscheinlichste Ursache ist eine unzureichende Datei- oder Ordnerzugriffserlaubnis.'; +$lang['error_copy'] = 'Es trat ein Dateifehler beim Kopieren der Installationsdateien für die Erweiterung %s auf: Die Festplatte könnte voll oder die Zugriffsrechte verweigert worden sein. Dies führt zu einer teilweise installierten Erweiterung und belässt dein Wiki in einem instabilen Zustand.'; +$lang['error_delete'] = 'Es trat ein Fehler beim Löschen der Erweiterung %s auf. Die wahrscheinlichste Ursache ist eine unzureichende Datei- oder Ordnerzugriffserlaubnis.'; $lang['enabled'] = 'Erweiterung %s aktiviert.'; $lang['notenabled'] = 'Erweiterung %s konnte nicht aktiviert werden. Überprüfen sie die Zugriffsberechtigung der Datei.'; $lang['disabled'] = 'Erweiterung %s deaktiviert.'; diff --git a/lib/plugins/popularity/lang/de-informal/intro.txt b/lib/plugins/popularity/lang/de-informal/intro.txt index 1aa31a6b5..4dfbb9ea6 100644 --- a/lib/plugins/popularity/lang/de-informal/intro.txt +++ b/lib/plugins/popularity/lang/de-informal/intro.txt @@ -1,9 +1,9 @@ -===== Rückkopplung zur Zufriedenheit ===== +===== Rückmeldung zur Zufriedenheit ===== Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Nutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind. -Du wirst angehalten diesen Schritt von Zeit zu Zeit erneut zu machen um die Entwickler zu infomieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen ID zugeordnet. +Du wirst angehalten diesen Schritt von Zeit zu Zeit erneut zu machen um die Entwickler zu informieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen Identifikationsnummer zugeordnet. -Die gesammelten Daten enthalten Infomrationen über deine Version von DokuWiki, die Anzahl und Größe der Seiten und Dateien, installierte Erweiterungen und informationen über deine PHP-Version. +Die gesammelten Daten enthalten Informationen über deine Version von DokuWiki, die Anzahl und Größe der Seiten und Dateien, installierte Erweiterungen und Informationen über deine PHP-Version. -Die Rohdaten die gesendet werden, werden unten gezeigt. Bitte nutze den "Send Data" Knopf um die Informationen zu übermitteln. \ No newline at end of file +Die Rohdaten die gesendet werden, werden unten gezeigt. Bitte nutze den "Sende Daten" Knopf um die Informationen zu übermitteln. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php index e6bd28f04..004d028e0 100644 --- a/lib/plugins/popularity/lang/de-informal/lang.php +++ b/lib/plugins/popularity/lang/de-informal/lang.php @@ -4,7 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer - * @author ste-re@web.de + * @author Marcel Metz */ $lang['name'] = 'Polularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)'; $lang['submit'] = 'Sende Daten'; diff --git a/lib/plugins/revert/lang/de-informal/lang.php b/lib/plugins/revert/lang/de-informal/lang.php index 974801bcb..6ed87e82e 100644 --- a/lib/plugins/revert/lang/de-informal/lang.php +++ b/lib/plugins/revert/lang/de-informal/lang.php @@ -4,12 +4,11 @@ * * @author Alexander Fischer * @author Juergen Schwarzer - * @author ste-re@web.de + * @author Marcel Metz */ -$lang['menu'] = 'Seiten wieder herstellen'; -$lang['filter'] = 'Nach betroffenen Seiten suchen'; -$lang['revert'] = 'Ausgewählte Seiten wieder herstellen'; -$lang['reverted'] = '%s wieder hergestellt zu Version %s'; +$lang['menu'] = 'Zurückstellungsmanager'; +$lang['revert'] = 'Stelle ausgewählte Seiten zurück.'; +$lang['reverted'] = '%s zu Revision %s zurückgesetzt'; $lang['removed'] = '%s entfernt'; $lang['revstart'] = 'Zurückstellungsprozess gestartet. Dies kann eine längere Zeit dauern. Wenn das Skript vor Fertigstellung stopt, sollten Sie es in kleineren Stücken versuchen.'; $lang['revstop'] = 'Zurückstellungsprozess erfolgreich beendet.'; diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php index b57f999db..be745565d 100644 --- a/lib/plugins/usermanager/lang/de-informal/lang.php +++ b/lib/plugins/usermanager/lang/de-informal/lang.php @@ -4,7 +4,7 @@ * * @author Alexander Fischer * @author Juergen Schwarzer - * @author ste-re@web.de + * @author Marcel Metz */ $lang['menu'] = 'Benutzerverwalter'; $lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)'; @@ -20,8 +20,8 @@ $lang['value'] = 'Wert'; $lang['add'] = 'Zufügen'; $lang['delete'] = 'Löschen'; $lang['delete_selected'] = 'Lösche ausgewähltes'; -$lang['edit'] = 'Editieren'; -$lang['edit_prompt'] = 'Editiere den Benutzer'; +$lang['edit'] = 'Bearbeiten'; +$lang['edit_prompt'] = 'Bearbeite diesen Benutzer'; $lang['modify'] = 'Änderungen speichern'; $lang['search'] = 'Suchen'; $lang['search_prompt'] = 'Suche ausführen'; @@ -45,5 +45,5 @@ $lang['note_group'] = 'Neue Benutzer werden zur Standardgruppe (%s) h $lang['note_pass'] = 'Das Passwort wird automatisch erzeugt, wenn das Feld freigelassen wird und der Benutzer Benachrichtigungen aktiviert hat.'; $lang['add_ok'] = 'Benutzer erfolgreich hinzugefügt'; $lang['add_fail'] = 'Hinzufügen des Benutzers fehlgeschlagen'; -$lang['notify_ok'] = 'Benachrichtigungsmail wurde versendet'; -$lang['notify_fail'] = 'Benachrichtigungsmail konnte nicht gesendet werden'; +$lang['notify_ok'] = 'Benachrichtigungsemail wurde versendet'; +$lang['notify_fail'] = 'Benachrichtigungsemail konnte nicht gesendet werden'; -- cgit v1.2.3 From c4b04b7f874a6c3f7ab5296aed1c039757183eb7 Mon Sep 17 00:00:00 2001 From: Philippe Bajoit Date: Mon, 8 Feb 2010 20:22:17 +0100 Subject: French language update --- lib/plugins/acl/lang/fr/lang.php | 1 + lib/plugins/config/lang/fr/lang.php | 1 + lib/plugins/plugin/lang/fr/lang.php | 1 + lib/plugins/popularity/lang/fr/lang.php | 1 + lib/plugins/revert/lang/fr/lang.php | 1 + lib/plugins/usermanager/lang/fr/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index 88a045ffe..7973ab559 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -17,6 +17,7 @@ * @author Erik Pedersen * @author olivier duperray * @author Vincent Feltz + * @author Philippe Bajoit */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index f410291e7..e06a44c10 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -12,6 +12,7 @@ * @author Erik Pedersen * @author olivier duperray * @author Vincent Feltz + * @author Philippe Bajoit */ $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.
La valeur(s) erronée(s) est entourée d\'une bordure rouge.'; diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index 43c4e9c5f..eec17cdbb 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -12,6 +12,7 @@ * @author Erik Pedersen * @author olivier duperray * @author Vincent Feltz + * @author Philippe Bajoit */ $lang['menu'] = 'Gestion des module externes'; $lang['download'] = 'Télécharger et installer un nouveau module'; diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index fdba3ac98..48ecbd305 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -9,6 +9,7 @@ * @author Erik Pedersen * @author olivier duperray * @author Vincent Feltz + * @author Philippe Bajoit */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargé)'; $lang['submit'] = 'Envoyer les données'; diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 8d17280d4..0f58fad6e 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -10,6 +10,7 @@ * @author Erik Pedersen * @author olivier duperray * @author Vincent Feltz + * @author Philippe Bajoit */ $lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 9229ee8e8..d0fa09074 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -11,6 +11,7 @@ * @author Erik Pedersen * @author olivier duperray * @author Vincent Feltz + * @author Philippe Bajoit */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; -- cgit v1.2.3 From 9ee282d8dedfbb7ac2b6893de250d99f00ff544f Mon Sep 17 00:00:00 2001 From: Dimi T Date: Tue, 9 Feb 2010 21:52:03 +0100 Subject: Macedonian transaltion added --- lib/plugins/acl/lang/mk/lang.php | 22 +++++++++++++++ lib/plugins/config/lang/mk/lang.php | 6 +++++ lib/plugins/plugin/lang/mk/lang.php | 43 ++++++++++++++++++++++++++++++ lib/plugins/popularity/lang/mk/lang.php | 6 +++++ lib/plugins/revert/lang/mk/lang.php | 6 +++++ lib/plugins/usermanager/lang/mk/add.txt | 1 + lib/plugins/usermanager/lang/mk/delete.txt | 1 + lib/plugins/usermanager/lang/mk/edit.txt | 1 + lib/plugins/usermanager/lang/mk/intro.txt | 1 + lib/plugins/usermanager/lang/mk/lang.php | 38 ++++++++++++++++++++++++++ lib/plugins/usermanager/lang/mk/list.txt | 1 + 11 files changed, 126 insertions(+) create mode 100644 lib/plugins/acl/lang/mk/lang.php create mode 100644 lib/plugins/config/lang/mk/lang.php create mode 100644 lib/plugins/plugin/lang/mk/lang.php create mode 100644 lib/plugins/popularity/lang/mk/lang.php create mode 100644 lib/plugins/revert/lang/mk/lang.php create mode 100644 lib/plugins/usermanager/lang/mk/add.txt create mode 100644 lib/plugins/usermanager/lang/mk/delete.txt create mode 100644 lib/plugins/usermanager/lang/mk/edit.txt create mode 100644 lib/plugins/usermanager/lang/mk/intro.txt create mode 100644 lib/plugins/usermanager/lang/mk/lang.php create mode 100644 lib/plugins/usermanager/lang/mk/list.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/mk/lang.php b/lib/plugins/acl/lang/mk/lang.php new file mode 100644 index 000000000..d576c3d1d --- /dev/null +++ b/lib/plugins/acl/lang/mk/lang.php @@ -0,0 +1,22 @@ + + */ +$lang['acl_group'] = 'Група'; +$lang['acl_user'] = 'Корисник'; +$lang['acl_perms'] = 'Пермисии за'; +$lang['page'] = 'Страница'; +$lang['btn_select'] = 'Избери'; +$lang['current'] = 'Моментални ACL правила'; +$lang['who'] = 'Корисник/група'; +$lang['perm'] = 'Пермисии'; +$lang['acl_perm0'] = 'Ништо'; +$lang['acl_perm1'] = 'Читај'; +$lang['acl_perm2'] = 'Уреди'; +$lang['acl_perm4'] = 'Креирај'; +$lang['acl_perm8'] = 'Качи'; +$lang['acl_perm16'] = 'Избриши'; +$lang['acl_new'] = 'Додај нов запис'; +$lang['acl_mod'] = 'Измени запис'; diff --git a/lib/plugins/config/lang/mk/lang.php b/lib/plugins/config/lang/mk/lang.php new file mode 100644 index 000000000..6d4530f79 --- /dev/null +++ b/lib/plugins/config/lang/mk/lang.php @@ -0,0 +1,6 @@ + + */ diff --git a/lib/plugins/plugin/lang/mk/lang.php b/lib/plugins/plugin/lang/mk/lang.php new file mode 100644 index 000000000..85f73a09f --- /dev/null +++ b/lib/plugins/plugin/lang/mk/lang.php @@ -0,0 +1,43 @@ + + */ +$lang['menu'] = 'Уреди ги приклучоците'; +$lang['download'] = 'Симни и инсталирај нов приклучок'; +$lang['manage'] = 'Инсталирани приклучоци'; +$lang['btn_info'] = 'информации'; +$lang['btn_update'] = 'ажурирај'; +$lang['btn_delete'] = 'избриши'; +$lang['btn_settings'] = 'поставувања'; +$lang['btn_download'] = 'Симни'; +$lang['btn_enable'] = 'Зачувај'; +$lang['url'] = 'URL'; +$lang['installed'] = 'Инсталирани:'; +$lang['lastupdate'] = 'Последно ажурирани:'; +$lang['source'] = 'Извор:'; +$lang['unknown'] = 'непознат'; +$lang['updating'] = 'Ажурирам...'; +$lang['updated'] = 'Приклучокот % е успешно ажуриран'; +$lang['updates'] = 'Следниве приклучоци се успешно ажурирани'; +$lang['update_none'] = 'Нема потребни ажурирања.'; +$lang['deleting'] = 'Бришам...'; +$lang['deleted'] = 'Приклучокот %s е избришан.'; +$lang['downloading'] = 'Симнувам...'; +$lang['downloaded'] = 'Приклучокот % е успешно инсталиран'; +$lang['downloads'] = 'Следниве приклучоци се успешно инсталирани'; +$lang['download_none'] = 'Нема пронајдени приклучоци, или имаше непознат проблем при симнување и инсталирање.'; +$lang['plugin'] = 'Приклучок:'; +$lang['components'] = 'Компоненти'; +$lang['noinfo'] = 'Овој приклучок не врати информации, може да не е валиден.'; +$lang['name'] = 'Име:'; +$lang['date'] = 'Датум:'; +$lang['type'] = 'Тип:'; +$lang['desc'] = 'Опис:'; +$lang['author'] = 'Автор:'; +$lang['www'] = 'Веб:'; +$lang['error'] = 'Се појави непозната грешка.'; +$lang['error_download'] = 'Не сум во можност да ја симнам датотеката за приклучокот: %s'; +$lang['enabled'] = 'Приклучокот %s е овозможен.'; +$lang['disabled'] = 'Приклучокот %s е оневозможен.'; diff --git a/lib/plugins/popularity/lang/mk/lang.php b/lib/plugins/popularity/lang/mk/lang.php new file mode 100644 index 000000000..6d4530f79 --- /dev/null +++ b/lib/plugins/popularity/lang/mk/lang.php @@ -0,0 +1,6 @@ + + */ diff --git a/lib/plugins/revert/lang/mk/lang.php b/lib/plugins/revert/lang/mk/lang.php new file mode 100644 index 000000000..6d4530f79 --- /dev/null +++ b/lib/plugins/revert/lang/mk/lang.php @@ -0,0 +1,6 @@ + + */ diff --git a/lib/plugins/usermanager/lang/mk/add.txt b/lib/plugins/usermanager/lang/mk/add.txt new file mode 100644 index 000000000..c90121d1b --- /dev/null +++ b/lib/plugins/usermanager/lang/mk/add.txt @@ -0,0 +1 @@ +===== Додај корисник ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/mk/delete.txt b/lib/plugins/usermanager/lang/mk/delete.txt new file mode 100644 index 000000000..8a6b5e9b5 --- /dev/null +++ b/lib/plugins/usermanager/lang/mk/delete.txt @@ -0,0 +1 @@ +===== Избриши корисник ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/mk/edit.txt b/lib/plugins/usermanager/lang/mk/edit.txt new file mode 100644 index 000000000..da6306141 --- /dev/null +++ b/lib/plugins/usermanager/lang/mk/edit.txt @@ -0,0 +1 @@ +===== Уреди корисник ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/mk/intro.txt b/lib/plugins/usermanager/lang/mk/intro.txt new file mode 100644 index 000000000..747d00921 --- /dev/null +++ b/lib/plugins/usermanager/lang/mk/intro.txt @@ -0,0 +1 @@ +===== Менаџер за корисник ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/mk/lang.php b/lib/plugins/usermanager/lang/mk/lang.php new file mode 100644 index 000000000..97ef51369 --- /dev/null +++ b/lib/plugins/usermanager/lang/mk/lang.php @@ -0,0 +1,38 @@ + + */ +$lang['menu'] = 'Менаџер за корисник'; +$lang['noauth'] = '(автентикација на корисник не е достапна)'; +$lang['nosupport'] = '(менаџирање на корисник не е поддржано)'; +$lang['badauth'] = 'невалиден механизам за автентикација'; +$lang['user_id'] = 'Корисник'; +$lang['user_pass'] = 'Лозинка'; +$lang['user_name'] = 'Вистинско име'; +$lang['user_mail'] = 'Е-пошта'; +$lang['user_groups'] = 'Групи'; +$lang['field'] = 'Поле'; +$lang['value'] = 'Вредност'; +$lang['add'] = 'Додај'; +$lang['delete'] = 'Избриши'; +$lang['delete_selected'] = 'Избриши ги избраните'; +$lang['edit'] = 'Уреди'; +$lang['edit_prompt'] = 'Уреди го овој корисник'; +$lang['modify'] = 'Зачувај промени'; +$lang['search'] = 'Барај'; +$lang['search_prompt'] = 'Изврши пребарување'; +$lang['clear'] = 'Ресетирај го филтерот за пребарување'; +$lang['filter'] = 'Филтер'; +$lang['delete_ok'] = '%d корисници се избришани'; +$lang['delete_fail'] = '%d не успееја да се избришат.'; +$lang['update_ok'] = 'Корисникот е успешно ажуриран'; +$lang['update_fail'] = 'Корисникот не е успешно ажуриран'; +$lang['start'] = 'почеток'; +$lang['prev'] = 'претходна'; +$lang['next'] = 'следна'; +$lang['last'] = 'последна'; +$lang['user_notify'] = 'Извести го корисникот'; +$lang['add_ok'] = 'Корисникот е успешно додаден'; +$lang['add_fail'] = 'Додавањето на корисникот не е успешно'; diff --git a/lib/plugins/usermanager/lang/mk/list.txt b/lib/plugins/usermanager/lang/mk/list.txt new file mode 100644 index 000000000..651462e9d --- /dev/null +++ b/lib/plugins/usermanager/lang/mk/list.txt @@ -0,0 +1 @@ +===== Листа со корисници ===== \ No newline at end of file -- cgit v1.2.3 From fc5dbe994743ed593e3941015999ca08abc72686 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Wed, 10 Feb 2010 20:26:47 +0100 Subject: Interlingua Translation added --- lib/plugins/acl/lang/ia/lang.php | 7 +++++++ lib/plugins/config/lang/ia/intro.txt | 7 +++++++ lib/plugins/config/lang/ia/lang.php | 7 +++++++ lib/plugins/plugin/lang/ia/lang.php | 7 +++++++ lib/plugins/popularity/lang/ia/lang.php | 7 +++++++ lib/plugins/revert/lang/ia/lang.php | 7 +++++++ lib/plugins/usermanager/lang/ia/lang.php | 7 +++++++ 7 files changed, 49 insertions(+) create mode 100644 lib/plugins/acl/lang/ia/lang.php create mode 100644 lib/plugins/config/lang/ia/intro.txt create mode 100644 lib/plugins/config/lang/ia/lang.php create mode 100644 lib/plugins/plugin/lang/ia/lang.php create mode 100644 lib/plugins/popularity/lang/ia/lang.php create mode 100644 lib/plugins/revert/lang/ia/lang.php create mode 100644 lib/plugins/usermanager/lang/ia/lang.php (limited to 'lib') diff --git a/lib/plugins/acl/lang/ia/lang.php b/lib/plugins/acl/lang/ia/lang.php new file mode 100644 index 000000000..3f0ebb5d8 --- /dev/null +++ b/lib/plugins/acl/lang/ia/lang.php @@ -0,0 +1,7 @@ + + * @author Martijn Dekker + */ diff --git a/lib/plugins/config/lang/ia/intro.txt b/lib/plugins/config/lang/ia/intro.txt new file mode 100644 index 000000000..2d7960b87 --- /dev/null +++ b/lib/plugins/config/lang/ia/intro.txt @@ -0,0 +1,7 @@ +====== Administrator de Configuration ====== + +Usa iste pagina pro controlar le regulationes de tu installation de DokuWiki. Pro adjuta re singule regulationes, refere te a [[doku>config]]. Pro plus detalios re iste insertion, vide [[doku>plugin:config]]. + +Le regulationes monstrate sur un fundo rosa es protegite e non pote esser alterate con iste insertion. Le regulationes monstrate sur un fundo blau es le valores tacite e le regulationes monstrate sur un fundo blanc esseva definite localmente pro iste particular installation. Sia le regulationes blau que les blanc pote esser alterate. + +Rememora de pressar le button **SALVA** ante de lassar iste pagina, alteremente tu modificationes essera perdite. \ No newline at end of file diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php new file mode 100644 index 000000000..3f0ebb5d8 --- /dev/null +++ b/lib/plugins/config/lang/ia/lang.php @@ -0,0 +1,7 @@ + + * @author Martijn Dekker + */ diff --git a/lib/plugins/plugin/lang/ia/lang.php b/lib/plugins/plugin/lang/ia/lang.php new file mode 100644 index 000000000..3f0ebb5d8 --- /dev/null +++ b/lib/plugins/plugin/lang/ia/lang.php @@ -0,0 +1,7 @@ + + * @author Martijn Dekker + */ diff --git a/lib/plugins/popularity/lang/ia/lang.php b/lib/plugins/popularity/lang/ia/lang.php new file mode 100644 index 000000000..3f0ebb5d8 --- /dev/null +++ b/lib/plugins/popularity/lang/ia/lang.php @@ -0,0 +1,7 @@ + + * @author Martijn Dekker + */ diff --git a/lib/plugins/revert/lang/ia/lang.php b/lib/plugins/revert/lang/ia/lang.php new file mode 100644 index 000000000..3f0ebb5d8 --- /dev/null +++ b/lib/plugins/revert/lang/ia/lang.php @@ -0,0 +1,7 @@ + + * @author Martijn Dekker + */ diff --git a/lib/plugins/usermanager/lang/ia/lang.php b/lib/plugins/usermanager/lang/ia/lang.php new file mode 100644 index 000000000..3f0ebb5d8 --- /dev/null +++ b/lib/plugins/usermanager/lang/ia/lang.php @@ -0,0 +1,7 @@ + + * @author Martijn Dekker + */ -- cgit v1.2.3 From de5459f07034d89b2e370a95d13ab2cb4446cefb Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 11 Feb 2010 10:09:36 +0100 Subject: Do not delete content after list on two enters --- lib/scripts/edit.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 483fcc3cc..235a91cd6 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -169,7 +169,11 @@ function keyHandler(e){ var match2 = search.match(/^\n +[\*-]\s*$/); // Cancel list if the last item is empty (i. e. two times enter) if (match2 && field.value.substr(selection.start).match(/^($|\n)/)) { - field.value = field.value.substr(0, linestart) + "\n"; + field.value = field.value.substr(0, linestart) + "\n" + + field.value.substr(selection.start); + selection.start = linestart + 1; + selection.end = linestart + 1; + setSelection(selection); } else { insertAtCarret(field.id,match[1]); } -- cgit v1.2.3 From 2eb3414de1a76407ed3eae58fd42c3a5c342039b Mon Sep 17 00:00:00 2001 From: Traduzioni Date: Thu, 11 Feb 2010 18:37:26 +0100 Subject: Italian language update --- lib/plugins/acl/lang/it/help.txt | 4 +-- lib/plugins/acl/lang/it/lang.php | 20 ++++++------ lib/plugins/config/lang/it/lang.php | 49 +++++++++++++++-------------- lib/plugins/plugin/lang/it/admin_plugin.txt | 3 +- lib/plugins/plugin/lang/it/lang.php | 10 +++--- lib/plugins/popularity/lang/it/intro.txt | 4 +-- lib/plugins/revert/lang/it/intro.txt | 2 +- lib/plugins/usermanager/lang/it/delete.txt | 2 +- lib/plugins/usermanager/lang/it/lang.php | 20 ++++++------ 9 files changed, 57 insertions(+), 57 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/it/help.txt b/lib/plugins/acl/lang/it/help.txt index 5e4b08dd6..8bf68e8e7 100644 --- a/lib/plugins/acl/lang/it/help.txt +++ b/lib/plugins/acl/lang/it/help.txt @@ -6,6 +6,6 @@ Il pannello di sinistra mostra tutte le categorie e le pagine disponibili. Il campo sopra ti permette di vedere e modificare i permessi di un utente o gruppo selezionato. -Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per cancellare o cambiare al volo varie regole. +Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per eliminare o cambiare al volo varie regole. -Leggere la [[doku>acl|official documentation on ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki. +Leggere la [[doku>acl|documentazione ufficale delle ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki. diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php index 344987e8b..2f579afae 100644 --- a/lib/plugins/acl/lang/it/lang.php +++ b/lib/plugins/acl/lang/it/lang.php @@ -23,11 +23,11 @@ $lang['p_user_id'] = 'L\'utente %s attualment $lang['p_user_ns'] = 'L\'utente %s attualmente ha i seguenti permessi per la categoria %s: %s.'; $lang['p_group_id'] = 'I membri del gruppo%s attualmente hanno i seguenti permessi sulla pagina %s: %s.'; $lang['p_group_ns'] = 'I membri del gruppo%s attualmente hanno i seguenti permessi per la categoria %s: %s.'; -$lang['p_choose_id'] = 'Per favore inserisci un utente o gruppo nel campo sopra per modificare i permessi impostati per la pagina %s.'; -$lang['p_choose_ns'] = 'Per favore inserisci un utente o un gruppo nel campo sopra per modificare i permessi impostati per la categoria %s.'; -$lang['p_inherited'] = 'Nota: Questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.'; -$lang['p_isadmin'] = 'Nota: Il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.'; -$lang['p_include'] = 'I permessi più elevati includono i permessi inferiori. I permessi di Creazione, Upload e Cancellazione si applicano soltanto alle categorie e non alle pagine.'; +$lang['p_choose_id'] = 'Inserisci un utente o gruppo nel campo sopra per modificare i permessi impostati per la pagina %s.'; +$lang['p_choose_ns'] = 'Inserisci un utente o un gruppo nel campo sopra per modificare i permessi impostati per la categoria %s.'; +$lang['p_inherited'] = 'Nota: questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.'; +$lang['p_isadmin'] = 'Nota: il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.'; +$lang['p_include'] = 'I permessi più elevati includono i permessi inferiori. I permessi Crea, Carica ed Elimina si applicano soltanto alle categorie e non alle pagine.'; $lang['current'] = 'Regole ACL attuali'; $lang['where'] = 'Pagina/Categoria'; $lang['who'] = 'Utente/Gruppo'; @@ -35,8 +35,8 @@ $lang['perm'] = 'Permessi'; $lang['acl_perm0'] = 'Nessuno'; $lang['acl_perm1'] = 'Lettura'; $lang['acl_perm2'] = 'Modifica'; -$lang['acl_perm4'] = 'Creazione'; -$lang['acl_perm8'] = 'Upload'; -$lang['acl_perm16'] = 'Cancellazione'; -$lang['acl_new'] = 'Aggiungi nuovo record'; -$lang['acl_mod'] = 'Modifica record'; +$lang['acl_perm4'] = 'Crea'; +$lang['acl_perm8'] = 'Carica'; +$lang['acl_perm16'] = 'Elimina'; +$lang['acl_new'] = 'Aggiungi nuovo valore'; +$lang['acl_mod'] = 'Modifica valore'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index 2a9ba42f0..9b84bb79e 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -14,18 +14,18 @@ */ $lang['menu'] = 'Configurazione Wiki'; $lang['error'] = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo. -
I valori non corretti sono evidenziati da un riquadro rosso.'; +
I valori non corretti sono evidenziati da un riquadro rosso.'; $lang['updated'] = 'Aggiornamento impostazioni riuscito.'; $lang['nochoice'] = '(nessun\'altra scelta disponibile)'; $lang['locked'] = 'Il file di configurazione non può essere aggiornato, se questo non è intenzionale,
- assicurati che il nome e i permessi del file contenente la configurazione locale siano corretti.'; -$lang['danger'] = 'Attenzione: Cambiare questa opzione può rendere inaccessibile la tua wiki e il menu di configurazione.'; -$lang['warning'] = 'Avviso: Cambiare questa opzione può causare comportamenti indesiderati.'; -$lang['security'] = 'Avviso di sicurezza: Cambiare questa opzione può esporre a rischi di sicurezza.'; +assicurati che il nome e i permessi del file contenente la configurazione locale siano corretti.'; +$lang['danger'] = 'Attenzione: cambiare questa opzione può rendere inaccessibile il wiki e il menu di configurazione.'; +$lang['warning'] = 'Avviso: cambiare questa opzione può causare comportamenti indesiderati.'; +$lang['security'] = 'Avviso di sicurezza: vambiare questa opzione può esporre a rischi di sicurezza.'; $lang['_configuration_manager'] = 'Configurazione Wiki'; $lang['_header_dokuwiki'] = 'Impostazioni DokuWiki'; $lang['_header_plugin'] = 'Impostazioni Plugin'; -$lang['_header_template'] = 'Impostazioni Template'; +$lang['_header_template'] = 'Impostazioni Modello'; $lang['_header_undefined'] = 'Impostazioni non definite'; $lang['_basic'] = 'Impostazioni Base'; $lang['_display'] = 'Impostazioni Visualizzazione'; @@ -37,7 +37,7 @@ $lang['_media'] = 'Impostazioni File'; $lang['_advanced'] = 'Impostazioni Avanzate'; $lang['_network'] = 'Impostazioni Rete'; $lang['_plugin_sufix'] = 'Impostazioni Plugin'; -$lang['_template_sufix'] = 'Impostazioni Template'; +$lang['_template_sufix'] = 'Impostazioni Modello'; $lang['_msg_setting_undefined'] = 'Nessun metadato definito.'; $lang['_msg_setting_no_class'] = 'Nessuna classe definita.'; $lang['_msg_setting_no_default'] = 'Nessun valore predefinito.'; @@ -49,7 +49,7 @@ $lang['baseurl'] = 'URL di base'; $lang['savedir'] = 'Directory per il salvataggio dei dati'; $lang['start'] = 'Nome della pagina iniziale'; $lang['title'] = 'Titolo del wiki'; -$lang['template'] = 'Template'; +$lang['template'] = 'Modello'; $lang['license'] = 'Sotto quale licenza vorresti rilasciare il tuo contenuto?'; $lang['fullpath'] = 'Mostra il percorso completo delle pagine'; $lang['recent'] = 'Ultime modifiche'; @@ -58,7 +58,7 @@ $lang['youarehere'] = 'Breadcrumb gerarchici'; $lang['typography'] = 'Abilita la sostituzione tipografica'; $lang['htmlok'] = 'Consenti HTML incorporato'; $lang['phpok'] = 'Consenti PHP incorporato'; -$lang['dformat'] = 'Formato delle date (vedi la funzione data di PHP)'; +$lang['dformat'] = 'Formato delle date (vedi la funzione strftime di PHP)'; $lang['signature'] = 'Firma'; $lang['toptoclevel'] = 'Livello superiore per l\'indice'; $lang['tocminheads'] = 'Ammontare minimo di intestazioni che determinano la creazione del TOC'; @@ -72,8 +72,8 @@ $lang['refshow'] = 'Numero di riferimenti da visualizzare'; $lang['allowdebug'] = 'Abilita il debug (disabilitare se non serve!)'; $lang['usewordblock'] = 'Blocca lo spam in base alla blacklist'; $lang['indexdelay'] = 'Intervallo di tempo prima dell\'indicizzazione'; -$lang['relnofollow'] = 'Usa rel="nofollow"'; -$lang['mailguard'] = 'Oscuramento indirizzi e-mail'; +$lang['relnofollow'] = 'Usa rel="nofollow" nei collegamenti esterni'; +$lang['mailguard'] = 'Oscuramento indirizzi email'; $lang['iexssprotect'] = 'Controlla i file caricati in cerca di possibile codice JavaScript o HTML maligno.'; $lang['showuseras'] = 'Cosa visualizzare quando si mostra l\'ultimo utente che ha modificato una pagina'; $lang['useacl'] = 'Usa lista di controllo accessi (ACL)'; @@ -81,8 +81,8 @@ $lang['autopasswd'] = 'Genera password in automatico'; $lang['authtype'] = 'Sistema di autenticazione'; $lang['passcrypt'] = 'Metodo di cifratura password'; $lang['defaultgroup'] = 'Gruppo predefinito'; -$lang['superuser'] = 'Amministratore'; -$lang['manager'] = 'Gestore - un gruppo o un utente con accesso a determinate funzioni di gestione'; +$lang['superuser'] = 'Amministratore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso completo a tutte le pagine e le funzioni che riguardano le impostazioni ACL'; +$lang['manager'] = 'Gestore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso a determinate funzioni di gestione'; $lang['profileconfirm'] = 'Richiedi la password per modifiche al profilo'; $lang['disableactions'] = 'Disabilita azioni DokuWiki'; $lang['disableactions_check'] = 'Controlla'; @@ -90,13 +90,13 @@ $lang['disableactions_subscription'] = 'Sottoscrivi/Rimuovi sottoscrizione'; $lang['disableactions_wikicode'] = 'Mostra sorgente/Esporta Raw'; $lang['disableactions_other'] = 'Altre azioni (separate da virgola)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; -$lang['auth_security_timeout'] = 'Timeout di sicurezza per l\'autenticazione (secondi)'; +$lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)'; $lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.'; -$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC'; +$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC.'; $lang['xmlrpcuser'] = 'Limita l\'accesso XML-RPC ai gruppi o utenti indicati qui (separati da virgola). Lascia il campo vuoto per dare accesso a tutti.'; $lang['updatecheck'] = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare splitbrain.org per questa funzione.'; $lang['userewrite'] = 'Usa il rewrite delle URL'; -$lang['useslash'] = 'Usa lo slash come separatore nelle URL'; +$lang['useslash'] = 'Usa la barra rovescia (slash) come separatore nelle URL'; $lang['usedraft'] = 'Salva una bozza in automatico in fase di modifica'; $lang['sepchar'] = 'Separatore di parole nei nomi di pagina'; $lang['canonical'] = 'Usa URL canoniche'; @@ -113,13 +113,14 @@ $lang['gdlib'] = 'Versione GD Lib '; $lang['im_convert'] = 'Percorso per il convertitore di ImageMagick'; $lang['jpg_quality'] = 'Qualità di compressione JPG (0-100)'; $lang['subscribers'] = 'Abilita la sottoscrizione alle pagine'; +$lang['subscribe_time'] = 'Tempo dopo il quale le liste di sottoscrizione e i riassunti vengono inviati (sec); Dovrebbe essere inferiore al tempo specificato in recent_days.'; $lang['compress'] = 'Comprimi i file CSS e javascript'; $lang['hidepages'] = 'Nascondi le pagine che soddisfano la condizione (inserire un\'espressione regolare)'; $lang['send404'] = 'Invia "HTTP 404/Pagina non trovata" per le pagine inesistenti'; $lang['sitemap'] = 'Genera una sitemap Google (giorni)'; $lang['broken_iua'] = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi ilBug 852 per maggiori informazioni.'; $lang['xsendfile'] = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.'; -$lang['renderer_xhtml'] = 'Renderer da usare la visualizzazione del wiki (xhtml)'; +$lang['renderer_xhtml'] = 'Renderer da usare per la visualizzazione del wiki (xhtml)'; $lang['renderer__core'] = '%s (dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; $lang['rememberme'] = 'Permetti i cookies di accesso permanenti (ricordami)'; @@ -129,11 +130,11 @@ $lang['rss_content'] = 'Cosa mostrare negli elementi dei feed XML?'; $lang['rss_update'] = 'Intervallo di aggiornamento dei feed XML (sec)'; $lang['recent_days'] = 'Quante modifiche recenti tenere (giorni)'; $lang['rss_show_summary'] = 'I feed XML riportano un sommario nel titolo'; -$lang['target____wiki'] = 'Finestra target per i collegamenti interni'; -$lang['target____interwiki'] = 'Finestra target per i collegamenti interwiki'; -$lang['target____extern'] = 'Finestra target per i collegamenti esterni'; -$lang['target____media'] = 'Finestra target per i collegamenti ai file'; -$lang['target____windows'] = 'Finestra target per i collegamenti alle risorse condivise'; +$lang['target____wiki'] = 'Finestra di destinazione per i collegamenti interni'; +$lang['target____interwiki'] = 'Finestra di destinazione per i collegamenti interwiki'; +$lang['target____extern'] = 'Finestra di destinazione per i collegamenti esterni'; +$lang['target____media'] = 'Finestra di destinazione per i collegamenti ai file'; +$lang['target____windows'] = 'Finestra di destinazione per i collegamenti alle risorse condivise'; $lang['proxy____host'] = 'Nome server proxy'; $lang['proxy____port'] = 'Porta proxy'; $lang['proxy____user'] = 'Nome utente proxy'; @@ -144,7 +145,7 @@ $lang['ftp____host'] = 'Server FTP per safemode hack'; $lang['ftp____port'] = 'Porta FTP per safemode hack'; $lang['ftp____user'] = 'Nome utente FTP per safemode hack'; $lang['ftp____pass'] = 'Password FTP per safemode hack'; -$lang['ftp____root'] = 'Root directory FTP per safemode hack'; +$lang['ftp____root'] = 'Directory principale FTP per safemode hack'; $lang['license_o_'] = 'Nessuna scelta'; $lang['typography_o_0'] = 'nessuno'; $lang['typography_o_1'] = 'Solo virgolette'; @@ -170,7 +171,7 @@ $lang['rss_content_o_html'] = 'Tutto il contenuto della pagina in HTML'; $lang['rss_linkto_o_diff'] = 'vista differenze'; $lang['rss_linkto_o_page'] = 'pagina revisionata'; $lang['rss_linkto_o_rev'] = 'elenco revisioni'; -$lang['rss_linkto_o_current'] = 'pagina corrente'; +$lang['rss_linkto_o_current'] = 'pagina attuale'; $lang['compression_o_0'] = 'nessuna'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; diff --git a/lib/plugins/plugin/lang/it/admin_plugin.txt b/lib/plugins/plugin/lang/it/admin_plugin.txt index 1c0d5dc7b..5591f08fe 100644 --- a/lib/plugins/plugin/lang/it/admin_plugin.txt +++ b/lib/plugins/plugin/lang/it/admin_plugin.txt @@ -1,4 +1,3 @@ ====== Gestione Plugin ====== -Su questa pagina puoi gestire tutto ciò che riguarda i [[doku>plugins|plugin]] di DokuWiki. Per poter scaricare e installare un plugin, il webserver deve avere accesso in scrittura alla cartella dei plugin. - +In questa pagina puoi gestire tutto ciò che riguarda i [[doku>plugins|plugin]] di DokuWiki. Per poter scaricare e installare un plugin, il webserver deve avere accesso in scrittura alla directory dei plugin. \ No newline at end of file diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php index 909c5eacb..3e9d855ec 100644 --- a/lib/plugins/plugin/lang/it/lang.php +++ b/lib/plugins/plugin/lang/it/lang.php @@ -17,7 +17,7 @@ $lang['download'] = 'Scarica e installa un nuovo plugin'; $lang['manage'] = 'Plugin installati'; $lang['btn_info'] = 'info'; $lang['btn_update'] = 'aggiorna'; -$lang['btn_delete'] = 'cancella'; +$lang['btn_delete'] = 'elimina'; $lang['btn_settings'] = 'configurazione'; $lang['btn_download'] = 'Scarica'; $lang['btn_enable'] = 'Salva'; @@ -30,9 +30,9 @@ $lang['updating'] = 'Aggiornamento in corso ...'; $lang['updated'] = 'Aggiornamento plugin %s riuscito'; $lang['updates'] = 'Aggiornamento dei seguenti plugin riuscito:'; $lang['update_none'] = 'Nessun aggiornamento trovato.'; -$lang['deleting'] = 'Cancellazione in corso ...'; -$lang['deleted'] = 'Plugin %s cancellato.'; -$lang['downloading'] = 'Download in corso ...'; +$lang['deleting'] = 'Eliminazione in corso ...'; +$lang['deleted'] = 'Plugin %s eliminato.'; +$lang['downloading'] = 'Scaricamento in corso ...'; $lang['downloaded'] = 'Installazione plugin %s riuscita'; $lang['downloads'] = 'Installazione dei seguenti plugin riuscita:'; $lang['download_none'] = 'Nessun plugin trovato, oppure si è verificato un problema sconosciuto durante il download e l\'installazione.'; @@ -51,7 +51,7 @@ $lang['error_badurl'] = 'Possibile URL non corretta - impossibile deter $lang['error_dircreate'] = 'Impossibile creare la directory temporanea dove scaricare il file'; $lang['error_decompress'] = 'Impossibile decomprimere il file scaricato. Questo potrebbe essere il risultato di un download incompleto, in tal caso dovresti provare di nuovo; oppure il formato di compressione potrebbe essere sconosciuto, in questo caso è necessario scaricare e installare il plugin manualmente.'; $lang['error_copy'] = 'Si è verificato un errore nella copia di un file durante l\'installazione del plugin %s: il disco potrebbe essere pieno oppure i permessi di accesso al file potrebbero non essere corretti. Il plugin potrebbe essere stato installato solo parzialmente, questo potrebbe causare instabilità al sistema.'; -$lang['error_delete'] = 'Si è verificato un errore durante la cancellazione del plugin %s. Molto probabilmente i permessi di acesso ai file o alla directory non sono sufficienti'; +$lang['error_delete'] = 'Si è verificato un errore durante l\'eliminazione del plugin %s. Molto probabilmente i permessi di acesso ai file o alla directory non sono sufficienti'; $lang['enabled'] = 'Plugin %s abilitato.'; $lang['notenabled'] = 'Impossibile abilitare il plugin %s, verifica i permessi dei file.'; $lang['disabled'] = 'Plugin %s disabilitato.'; diff --git a/lib/plugins/popularity/lang/it/intro.txt b/lib/plugins/popularity/lang/it/intro.txt index c725110b7..62303eca7 100644 --- a/lib/plugins/popularity/lang/it/intro.txt +++ b/lib/plugins/popularity/lang/it/intro.txt @@ -1,8 +1,8 @@ ====== Raccolta dati sul wiki ====== -Questo strumento raccoglie dati anonimi sul tuo wiki e ti permette di inviarli agli sviluppatori di Dokuwiki. Questo aiuta loro a capire come Dokuwiki viene utilizzato dagli utenti e prendere decisioni future sullo sviluppo in base a quello che sono le reali statistiche di utilizzo da parte degli utenti. +Questo strumento raccoglie dati anonimi sul tuo wiki e ti permette di inviarli agli sviluppatori di Dokuwiki. Questo aiuta loro a capire come Dokuwiki viene utilizzato dagli utenti e prendere decisioni future sullo sviluppo in base a quelle che sono le reali statistiche di utilizzo da parte degli utenti. -Ti incoraggiamo a ripetere questa operazione più spesso per mantenere informati gli sviluppatori sulla crescita del tuo wiki. L'insieme dei dati raccolti saranno identificati tramite un ID anonimo. +Ti incoraggiamo a ripetere questa operazione al più spesso per mantenere informati gli sviluppatori sulla crescita del tuo wiki. L'insieme dei dati raccolti saranno identificati tramite un ID anonimo. I dati raccolti contengono informazioni come la versione di DokuWiki, il numero e le dimensioni delle pagine e dei files, i plugins installati e qualche informazione sulla versione di PHP presente nel sistema. diff --git a/lib/plugins/revert/lang/it/intro.txt b/lib/plugins/revert/lang/it/intro.txt index 1577af7ec..a5ef14680 100644 --- a/lib/plugins/revert/lang/it/intro.txt +++ b/lib/plugins/revert/lang/it/intro.txt @@ -1,3 +1,3 @@ ====== Gestore di ripristini ====== -Questa pagina aiuta il controllo automatico degli attacchi spam. Per cercare una lista delle pagine con spam, inserisci innanzitutto una stringa di ricerca (ad esempio l'URL di un sito di spam), quindi conferma che le pagine trovate contengono realmente spam e ripristinale ad una versione precedente. +Questa pagina aiuta il controllo automatico degli attacchi spam. Per cercare una lista delle pagine con spam, inserisci innanzitutto una stringa di ricerca (ad esempio l'URL di un sito di spam), quindi Verifica che le pagine trovate contengano realmente spam e ripristinale ad una versione precedente. diff --git a/lib/plugins/usermanager/lang/it/delete.txt b/lib/plugins/usermanager/lang/it/delete.txt index fc36212af..270061f0d 100644 --- a/lib/plugins/usermanager/lang/it/delete.txt +++ b/lib/plugins/usermanager/lang/it/delete.txt @@ -1 +1 @@ -===== Cancella utente ===== +===== Elimina utente ===== diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php index 67b17e9ec..d592fdf89 100644 --- a/lib/plugins/usermanager/lang/it/lang.php +++ b/lib/plugins/usermanager/lang/it/lang.php @@ -15,16 +15,16 @@ $lang['menu'] = 'Gestione Utenti'; $lang['noauth'] = '(autenticazione non disponibile)'; $lang['nosupport'] = '(gestione utenti non supportata)'; $lang['badauth'] = 'sistema di autenticazione non valido'; -$lang['user_id'] = 'User ID'; +$lang['user_id'] = 'ID utente'; $lang['user_pass'] = 'Password'; $lang['user_name'] = 'Nome completo'; -$lang['user_mail'] = 'E-mail'; +$lang['user_mail'] = 'Email'; $lang['user_groups'] = 'Gruppi'; $lang['field'] = 'Campo'; $lang['value'] = 'Valore'; $lang['add'] = 'Aggiungi'; -$lang['delete'] = 'Cancella'; -$lang['delete_selected'] = 'Cancella selezionati'; +$lang['delete'] = 'Elimina'; +$lang['delete_selected'] = 'Elimina selezionati'; $lang['edit'] = 'Modifica'; $lang['edit_prompt'] = 'Modifica questo utente'; $lang['modify'] = 'Salva modifiche'; @@ -34,20 +34,20 @@ $lang['clear'] = 'Azzera filtro di ricerca'; $lang['filter'] = 'Filtro'; $lang['summary'] = 'Visualizzazione utenti %1$d-%2$d di %3$d trovati. %4$d utenti totali.'; $lang['nonefound'] = 'Nessun utente trovato. %d utenti totali.'; -$lang['delete_ok'] = '%d utenti cancellati'; -$lang['delete_fail'] = 'Cancellazione %d fallita.'; +$lang['delete_ok'] = '%d utenti eliminati'; +$lang['delete_fail'] = 'Eliminazione %d fallita.'; $lang['update_ok'] = 'Aggiornamento utente riuscito'; $lang['update_fail'] = 'Aggiornamento utente fallito'; -$lang['update_exists'] = 'Modifica nome utente fallita, il nome utente specificato (%s) esiste già (qualunque altra modifica sarà applicata).'; +$lang['update_exists'] = 'Modifica nome utente fallita, il nome utente specificato (%s) esiste già (qualunque altra modifica sarà applicata).'; $lang['start'] = 'primo'; $lang['prev'] = 'precedente'; $lang['next'] = 'successivo'; $lang['last'] = 'ultimo'; -$lang['edit_usermissing'] = 'Utente selezionato non trovato, il nome utente specificato potrebbe essere stato cancellato o modificato altrove.'; +$lang['edit_usermissing'] = 'Utente selezionato non trovato, il nome utente specificato potrebbe essere stato eliminato o modificato altrove.'; $lang['user_notify'] = 'Notifica utente'; $lang['note_notify'] = 'Le email di notifica sono inviate soltanto se all\'utente è stata assegnata una nuova password.'; -$lang['note_group'] = 'Se non si specifica alcun gruppo, i nuovi utenti saranno aggiunti al gruppo di default (%s).'; -$lang['note_pass'] = 'La password verrà generata automaticamente qualora il campo di inserimento relatvivo venisse lasciato vuoto e le notifiche all\'utente fossero abilitate.'; +$lang['note_group'] = 'Se non si specifica alcun gruppo, i nuovi utenti saranno aggiunti al gruppo predefinito (%s).'; +$lang['note_pass'] = 'La password verrà generata automaticamente qualora il campo di inserimento relativo venisse lasciato vuoto e le notifiche all\'utente fossero abilitate.'; $lang['add_ok'] = 'Utente aggiunto correttamente'; $lang['add_fail'] = 'Aggiunta utente fallita'; $lang['notify_ok'] = 'Email di notifica inviata'; -- cgit v1.2.3 From c04912f6c4e1c1c8bda182a7dc03c86bcb415d90 Mon Sep 17 00:00:00 2001 From: Victor M Castelan Date: Fri, 12 Feb 2010 12:53:49 +0100 Subject: Spanish language update --- lib/plugins/acl/lang/es/lang.php | 1 + lib/plugins/config/lang/es/lang.php | 2 ++ lib/plugins/plugin/lang/es/lang.php | 1 + lib/plugins/popularity/lang/es/lang.php | 1 + lib/plugins/revert/lang/es/lang.php | 1 + lib/plugins/usermanager/lang/es/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index 3a23c71da..c908dc5a9 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -17,6 +17,7 @@ * @author Marvin Ortega * @author Daniel Castro Alvarado * @author Fernando J. Gómez + * @author Victor Castelan */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 739ec6bbe..9aed1f96c 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -17,6 +17,7 @@ * @author Marvin Ortega * @author Daniel Castro Alvarado * @author Fernando J. Gómez + * @author Victor Castelan */ $lang['menu'] = 'Parámetros de configuración'; $lang['error'] = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario.
Los valores incorrectos se mostrarán con un marco rojo alrededor.'; @@ -117,6 +118,7 @@ $lang['gdlib'] = 'Versión de GD Lib'; $lang['im_convert'] = 'Ruta a la herramienta de conversión de ImageMagick'; $lang['jpg_quality'] = 'Calidad de compresión de JPG (0-100)'; $lang['subscribers'] = 'Habilitar soporte para suscripción a páginas'; +$lang['subscribe_time'] = 'Tiempo después que alguna lista de suscripción fue enviada (seg); Debe ser menor que el tiempo especificado en días recientes.'; $lang['compress'] = 'Compactar la salida de CSS y javascript'; $lang['hidepages'] = 'Ocultar páginas con coincidencias (expresiones regulares)'; $lang['send404'] = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes'; diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php index 08ab38196..33264ddf3 100644 --- a/lib/plugins/plugin/lang/es/lang.php +++ b/lib/plugins/plugin/lang/es/lang.php @@ -17,6 +17,7 @@ * @author Marvin Ortega * @author Daniel Castro Alvarado * @author Fernando J. Gómez + * @author Victor Castelan */ $lang['menu'] = 'Administración de Plugins'; $lang['download'] = 'Descargar e instalar un nuevo plugin'; diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php index 8fedc329e..e349e5ea5 100644 --- a/lib/plugins/popularity/lang/es/lang.php +++ b/lib/plugins/popularity/lang/es/lang.php @@ -13,6 +13,7 @@ * @author Marvin Ortega * @author Daniel Castro Alvarado * @author Fernando J. Gómez + * @author Victor Castelan */ $lang['name'] = 'Retroinformación (Feedback) plugin Popularity'; $lang['submit'] = 'Enviar datos'; diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php index 2886528d6..fd3e2e0bf 100644 --- a/lib/plugins/revert/lang/es/lang.php +++ b/lib/plugins/revert/lang/es/lang.php @@ -15,6 +15,7 @@ * @author Marvin Ortega * @author Daniel Castro Alvarado * @author Fernando J. Gómez + * @author Victor Castelan */ $lang['menu'] = 'Restaurador'; $lang['filter'] = 'Buscar páginas con spam'; diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index c11ebcd93..c3b345642 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -16,6 +16,7 @@ * @author Marvin Ortega * @author Daniel Castro Alvarado * @author Fernando J. Gómez + * @author Victor Castelan */ $lang['menu'] = 'Administración de usuarios'; $lang['noauth'] = '(la autenticación de usuarios no está disponible)'; -- cgit v1.2.3 From 8e6d6cfde65cf5e68cf762424dc2a7048e6b2959 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Fri, 12 Feb 2010 23:37:21 +0100 Subject: Interlingua Language Update --- lib/plugins/acl/lang/ia/help.txt | 11 ++ lib/plugins/acl/lang/ia/lang.php | 28 +++++ lib/plugins/config/lang/ia/intro.txt | 8 +- lib/plugins/config/lang/ia/lang.php | 173 ++++++++++++++++++++++++++++ lib/plugins/plugin/lang/ia/admin_plugin.txt | 3 + lib/plugins/plugin/lang/ia/lang.php | 44 +++++++ lib/plugins/popularity/lang/ia/intro.txt | 9 ++ lib/plugins/popularity/lang/ia/lang.php | 2 + lib/plugins/revert/lang/ia/intro.txt | 3 + lib/plugins/revert/lang/ia/lang.php | 9 ++ lib/plugins/usermanager/lang/ia/add.txt | 1 + lib/plugins/usermanager/lang/ia/delete.txt | 1 + lib/plugins/usermanager/lang/ia/edit.txt | 1 + lib/plugins/usermanager/lang/ia/intro.txt | 1 + lib/plugins/usermanager/lang/ia/lang.php | 42 +++++++ lib/plugins/usermanager/lang/ia/list.txt | 1 + 16 files changed, 333 insertions(+), 4 deletions(-) create mode 100644 lib/plugins/acl/lang/ia/help.txt create mode 100644 lib/plugins/plugin/lang/ia/admin_plugin.txt create mode 100644 lib/plugins/popularity/lang/ia/intro.txt create mode 100644 lib/plugins/revert/lang/ia/intro.txt create mode 100644 lib/plugins/usermanager/lang/ia/add.txt create mode 100644 lib/plugins/usermanager/lang/ia/delete.txt create mode 100644 lib/plugins/usermanager/lang/ia/edit.txt create mode 100644 lib/plugins/usermanager/lang/ia/intro.txt create mode 100644 lib/plugins/usermanager/lang/ia/list.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/ia/help.txt b/lib/plugins/acl/lang/ia/help.txt new file mode 100644 index 000000000..59f5764eb --- /dev/null +++ b/lib/plugins/acl/lang/ia/help.txt @@ -0,0 +1,11 @@ +=== Adjuta rapide: === + +In iste pagina tu pote adder e remover permissiones pro spatios de nomines e paginas in tu wiki. + +Le columna sinistre presenta tote le spatios de nomines e paginas disponibile. + +Le formulario hic supra permitte vider e modificar le permissiones de un usator o gruppo seligite. + +In le tabella hic infra se monstra tote le regulas de controlo de accesso actualmente configurate. Tu pote usar lo pro rapidemente deler o modificar plure regulas. + +Es recommendate leger le [[doku>acl|documentation official super ACL]] pro comprender completemente como le controlo de accesso functiona in DokuWiki. diff --git a/lib/plugins/acl/lang/ia/lang.php b/lib/plugins/acl/lang/ia/lang.php index 3f0ebb5d8..f7d076539 100644 --- a/lib/plugins/acl/lang/ia/lang.php +++ b/lib/plugins/acl/lang/ia/lang.php @@ -5,3 +5,31 @@ * @author robocap * @author Martijn Dekker */ +$lang['admin_acl'] = 'Gestion de listas de controlo de accesso'; +$lang['acl_group'] = 'Gruppo'; +$lang['acl_user'] = 'Usator'; +$lang['acl_perms'] = 'Permissiones pro'; +$lang['page'] = 'Pagina'; +$lang['namespace'] = 'Spatio de nomines'; +$lang['btn_select'] = 'Seliger'; +$lang['p_user_id'] = 'Le usator %s ha actualmente le sequente permissiones in le pagina %s: %s.'; +$lang['p_user_ns'] = 'Le usator %s ha actualmente le sequente permissiones in le spatio de nomines %s: %s.'; +$lang['p_group_id'] = 'Le membros del gruppo %s a actualmente le sequente permissiones in le pagina %s: %s.'; +$lang['p_group_ns'] = 'Le membros del gruppo %s ha actualmente le sequente permissiones in le spatio de nomines %s: %s.'; +$lang['p_choose_id'] = 'Per favor entra un usator o gruppo in le formulario hic supra pro vider o modificar le permissiones configurate pro le pagina %s.'; +$lang['p_choose_ns'] = 'Per favor entra un usator o gruppo in le formulario hic supra pro vider o modificar le permissiones configurate pro le spatio de nomines %s.'; +$lang['p_inherited'] = 'Nota ben: Iste permissiones non ha essite configurate explicitemente ma ha essite hereditate de altere gruppos o de spatios de nomines superior.'; +$lang['p_isadmin'] = 'Nota ben: Le gruppo o usator seligite ha sempre permissiones integral proque es configurate como superusator.'; +$lang['p_include'] = 'Le permissiones superior include les inferior. Le permissiones de Crear, Incargar e Deler es solmente applicabile a spatios de nomines, non a paginas.'; +$lang['current'] = 'Regulas ACL actual'; +$lang['where'] = 'Pagina/Spatio de nomines'; +$lang['who'] = 'Usator/Gruppo'; +$lang['perm'] = 'Permissiones'; +$lang['acl_perm0'] = 'Nulle'; +$lang['acl_perm1'] = 'Leger'; +$lang['acl_perm2'] = 'Modificar'; +$lang['acl_perm4'] = 'Crear'; +$lang['acl_perm8'] = 'Incargar'; +$lang['acl_perm16'] = 'Deler'; +$lang['acl_new'] = 'Adder nove entrata'; +$lang['acl_mod'] = 'Modificar entrata'; diff --git a/lib/plugins/config/lang/ia/intro.txt b/lib/plugins/config/lang/ia/intro.txt index 2d7960b87..37b970c4f 100644 --- a/lib/plugins/config/lang/ia/intro.txt +++ b/lib/plugins/config/lang/ia/intro.txt @@ -1,7 +1,7 @@ -====== Administrator de Configuration ====== +====== Gestion de configurationes ====== -Usa iste pagina pro controlar le regulationes de tu installation de DokuWiki. Pro adjuta re singule regulationes, refere te a [[doku>config]]. Pro plus detalios re iste insertion, vide [[doku>plugin:config]]. +Usa iste pagina pro controlar le configurationes de tu installation de DokuWiki. Pro adjuta re configurationes individual, refere te a [[doku>config]]. -Le regulationes monstrate sur un fundo rosa es protegite e non pote esser alterate con iste insertion. Le regulationes monstrate sur un fundo blau es le valores tacite e le regulationes monstrate sur un fundo blanc esseva definite localmente pro iste particular installation. Sia le regulationes blau que les blanc pote esser alterate. +Le configurationes monstrate super un fundo rubie clar es protegite e non pote esser alterate con iste plug-in. Le configurationes monstrate super un fundo blau es le valores predefinite e le configurationes monstrate super un fundo blanc ha essite definite localmente pro iste particular installation. Le configurationes blau e blanc pote esser alterate. -Rememora de pressar le button **SALVA** ante de lassar iste pagina, alteremente tu modificationes essera perdite. \ No newline at end of file +Rememora de premer le button **SALVEGUARDAR** ante de quitar iste pagina, alteremente tu modificationes essera perdite. \ No newline at end of file diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php index 3f0ebb5d8..624b79485 100644 --- a/lib/plugins/config/lang/ia/lang.php +++ b/lib/plugins/config/lang/ia/lang.php @@ -5,3 +5,176 @@ * @author robocap * @author Martijn Dekker */ +$lang['menu'] = 'Configurationes'; +$lang['error'] = 'Le configurationes non poteva esser actualisate a causa de un valor invalide; per favor revide tu cambiamentos e resubmitte los.
Le valor(es) incorrecte essera monstrate circumferite per un bordo rubie.'; +$lang['updated'] = 'Actualisation del configurationes succedite.'; +$lang['nochoice'] = '(nulle altere option disponibile)'; +$lang['locked'] = 'Le file de configuration non pote esser actualisate; si isto non es intentional,
assecura te que le nomine e permissiones del file local de configuration es correcte.'; +$lang['danger'] = 'Periculo: Cambiar iste option pote render tu wiki e le menu de configuration inaccessibile!'; +$lang['warning'] = 'Attention: Cambiar iste option pote causar functionamento indesirate.'; +$lang['security'] = 'Advertimento de securitate: Cambiar iste option pote causar un risco de securitate.'; +$lang['_configuration_manager'] = 'Gestion de configurationes'; +$lang['_header_dokuwiki'] = 'Configurationes de DokuWiki'; +$lang['_header_plugin'] = 'Configurationes de plug-ins'; +$lang['_header_template'] = 'Configurationes de patronos'; +$lang['_header_undefined'] = 'Configurationes non definite'; +$lang['_basic'] = 'Configurationes de base'; +$lang['_display'] = 'Configurationes de visualisation'; +$lang['_authentication'] = 'Configurationes de authentication'; +$lang['_anti_spam'] = 'Configurationes anti-spam'; +$lang['_editing'] = 'Configurationes de modification'; +$lang['_links'] = 'Configurationes de ligamines'; +$lang['_media'] = 'Configurationes de multimedia'; +$lang['_advanced'] = 'Configurationes avantiate'; +$lang['_network'] = 'Configurationes de rete'; +$lang['_plugin_sufix'] = 'Configurationes de plug-ins'; +$lang['_template_sufix'] = 'Configurationes de patronos'; +$lang['_msg_setting_undefined'] = 'Nulle metadatos de configuration.'; +$lang['_msg_setting_no_class'] = 'Nulle classe de configuration.'; +$lang['_msg_setting_no_default'] = 'Nulle valor predefinite.'; +$lang['fmode'] = 'Permissiones al creation de files'; +$lang['dmode'] = 'Permissiones al creation de directorios'; +$lang['lang'] = 'Lingua del interfacie'; +$lang['basedir'] = 'Cammino al servitor (p.ex.. /dokuwiki/). Lassa vacue pro autodetection.'; +$lang['baseurl'] = 'URL del servitor (p.ex. http://www.yourserver.com). Lassa vacue pro autodetection.'; +$lang['savedir'] = 'Directorio pro salveguardar datos'; +$lang['start'] = 'Nomine del pagina initial'; +$lang['title'] = 'Titulo del wiki'; +$lang['template'] = 'Patrono'; +$lang['license'] = 'Sub qual licentia debe tu contento esser publicate?'; +$lang['fullpath'] = 'Revelar le cammino complete del paginas in le pede'; +$lang['recent'] = 'Modificationes recente'; +$lang['breadcrumbs'] = 'Numero de micas de pan'; +$lang['youarehere'] = 'Micas de pan hierarchic'; +$lang['typography'] = 'Face substitutiones typographic'; +$lang['htmlok'] = 'Permitter incorporation de HTML'; +$lang['phpok'] = 'Permitter incorporation de PHP'; +$lang['dformat'] = 'Formato del datas (vide le function strftime de PHP)'; +$lang['signature'] = 'Signatura'; +$lang['toptoclevel'] = 'Nivello principal pro tabula de contento'; +$lang['tocminheads'] = 'Numero minimal de titulos requirite pro inserer tabula de contento'; +$lang['maxtoclevel'] = 'Nivello maximal pro tabula de contento'; +$lang['maxseclevel'] = 'Nivello maximal pro modification de sectiones'; +$lang['camelcase'] = 'Usar CamelCase pro ligamines'; +$lang['deaccent'] = 'Nomines nette de paginas'; +$lang['useheading'] = 'Usar le prime titulo como nomine de pagina'; +$lang['refcheck'] = 'Verification de referentias multimedia'; +$lang['refshow'] = 'Numero de referentias multimedia a monstrar'; +$lang['allowdebug'] = 'Permitter debugging disactiva si non necessari!'; +$lang['usewordblock'] = 'Blocar spam a base de lista de parolas'; +$lang['indexdelay'] = 'Retardo ante generation de indice (secundas)'; +$lang['relnofollow'] = 'Usar rel="nofollow" pro ligamines externe'; +$lang['mailguard'] = 'Offuscar adresses de e-mail'; +$lang['iexssprotect'] = 'Verificar files incargate pro codice HTML o JavaScript possibilemente malitiose'; +$lang['showuseras'] = 'Como monstrar le usator que faceva le ultime modification de un pagina'; +$lang['useacl'] = 'Usar listas de controlo de accesso'; +$lang['autopasswd'] = 'Automaticamente generar contrasignos'; +$lang['authtype'] = 'Servicio de authentication'; +$lang['passcrypt'] = 'Methodo de cryptographia de contrasignos'; +$lang['defaultgroup'] = 'Gruppo predefinite'; +$lang['superuser'] = 'Superusator: le gruppo, usator o lista separate per commas ("usator1,@gruppo1,usator2") con accesso integral a tote le paginas e functiones sin reguardo del ACL'; +$lang['manager'] = 'Administrator: le gruppo, usator o lista separate per commas ("usator1,@gruppo1,usator2") con accesso a certe functiones administrative'; +$lang['profileconfirm'] = 'Confirmar modificationes del profilo con contrasigno'; +$lang['disableactions'] = 'Disactivar actiones DokuWiki'; +$lang['disableactions_check'] = 'Verificar'; +$lang['disableactions_subscription'] = 'Subscriber/Cancellar subscription'; +$lang['disableactions_wikicode'] = 'Vider codice-fonte/Exportar texto crude'; +$lang['disableactions_other'] = 'Altere actiones (separate per commas)'; +$lang['sneaky_index'] = 'Normalmente, DokuWiki monstra tote le spatios de nomines in le vista del indice. Si iste option es active, illos ubi le usator non ha le permission de lectura essera celate. Isto pote resultar in le celamento de subspatios de nomines accessibile. Isto pote render le indice inusabile con certe configurationes de ACL.'; +$lang['auth_security_timeout'] = 'Expiration pro securitate de authentication (secundas)'; +$lang['securecookie'] = 'Debe le cookies definite via HTTPS solmente esser inviate via HTTPS per le navigator? Disactiva iste option si solmente le apertura de sessiones a tu wiki es protegite con SSL ma le navigation del wiki es facite sin securitate.'; +$lang['xmlrpc'] = 'Activar/disactivar interfacie XML-RPC.'; +$lang['xmlrpcuser'] = 'Limitar le accesso a XML-RPC al gruppos o usatores date hic, separate per commas. Lassa isto vacue pro dar accesso a omnes.'; +$lang['updatecheck'] = 'Verificar si existe actualisationes e advertimentos de securitate? DokuWiki debe contactar splitbrain.org pro exequer iste function.'; +$lang['userewrite'] = 'Usar URLs nette'; +$lang['useslash'] = 'Usar le barra oblique ("/") como separator de spatios de nomines in URLs'; +$lang['usedraft'] = 'Automaticamente salveguardar un version provisori durante le modification'; +$lang['sepchar'] = 'Separator de parolas in nomines de paginas'; +$lang['canonical'] = 'Usar URLs completemente canonic'; +$lang['autoplural'] = 'Verificar si il ha formas plural in ligamines'; +$lang['compression'] = 'Methodo de compression pro files a mansarda'; +$lang['cachetime'] = 'Etate maximal pro le cache (secundas)'; +$lang['locktime'] = 'Etate maximal pro le files de serratura (secundas)'; +$lang['fetchsize'] = 'Numero maximal de bytes per file que fetch.php pote discargar de sitos externe'; +$lang['notify'] = 'Inviar notificationes de cambios a iste adresse de e-mail'; +$lang['registernotify'] = 'Inviar informationes super usatores novemente registrate a iste adresse de e-mail'; +$lang['mailfrom'] = 'Adresse de e-mail a usar pro messages automatic'; +$lang['gzip_output'] = 'Usar Content-Encoding gzip pro xhtml'; +$lang['gdlib'] = 'Version de GD Lib'; +$lang['im_convert'] = 'Cammino al programma "convert" de ImageMagick'; +$lang['jpg_quality'] = 'Qualitate del compression JPEG (0-100)'; +$lang['subscribers'] = 'Activar le possibilitate de subscriber se al paginas'; +$lang['subscribe_time'] = 'Tempore post le qual le listas de subscription e le digestos es inviate (in secundas); isto debe esser minor que le tempore specificate in recent_days.'; +$lang['compress'] = 'Compactar le output CSS e JavaScript'; +$lang['hidepages'] = 'Celar paginas correspondente (expressiones regular)'; +$lang['send404'] = 'Inviar "HTTP 404/Pagina non trovate" pro paginas non existente'; +$lang['sitemap'] = 'Generar mappa de sito Google (dies)'; +$lang['broken_iua'] = 'Es le function ignore_user_abort defectuose in tu systema? Isto pote resultar in un indice de recerca que non functiona. Vide Bug 852 pro plus info.'; +$lang['xsendfile'] = 'Usar le capite X-Sendfile pro lassar le servitor web livrar files static? Tu navigator del web debe supportar isto.'; +$lang['renderer_xhtml'] = 'Renditor a usar pro le output wiki principal (xhtml)'; +$lang['renderer__core'] = '%s (nucleo dokuwiki)'; +$lang['renderer__plugin'] = '%s (plug-in)'; +$lang['rememberme'] = 'Permitter cookies de session permanente (memorar me)'; +$lang['rss_type'] = 'Typo de syndication XML'; +$lang['rss_linkto'] = 'Syndication XML liga verso'; +$lang['rss_content'] = 'Que monstrar in le entratas de syndication XML?'; +$lang['rss_update'] = 'Intervallo de actualisation pro syndicationes XML (secundas)'; +$lang['recent_days'] = 'Retener quante modificationes recente? (dies)'; +$lang['rss_show_summary'] = 'Monstrar summario in titulo de syndication XML'; +$lang['target____wiki'] = 'Fenestra de destination pro ligamines interne'; +$lang['target____interwiki'] = 'Fenestra de destination pro ligamines interwiki'; +$lang['target____extern'] = 'Fenestra de destination pro ligamines externe'; +$lang['target____media'] = 'Fenestra de destination pro ligamines multimedia'; +$lang['target____windows'] = 'Fenestra de destination pro ligamines a fenestras'; +$lang['proxy____host'] = 'Nomine de servitor proxy'; +$lang['proxy____port'] = 'Porto del proxy'; +$lang['proxy____user'] = 'Nomine de usator pro le proxy'; +$lang['proxy____pass'] = 'Contrasigno pro le proxy'; +$lang['proxy____ssl'] = 'Usar SSL pro connecter al proxy'; +$lang['safemodehack'] = 'Permitter truco de modo secur'; +$lang['ftp____host'] = 'Servitor FTP pro truco de modo secur'; +$lang['ftp____port'] = 'Porto FTP pro truco de modo secur'; +$lang['ftp____user'] = 'Nomine de usator FTP pro truco de modo secur'; +$lang['ftp____pass'] = 'Contrasigno FTP pro truco de modo secur'; +$lang['ftp____root'] = 'Directorio radice FTP pro truco de modo securr'; +$lang['license_o_'] = 'Nihil seligite'; +$lang['typography_o_0'] = 'nulle'; +$lang['typography_o_1'] = 'excludente '; +$lang['typography_o_2'] = 'includente virgulettas singule (pote non sempre functionar)'; +$lang['userewrite_o_0'] = 'nulle'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'interne a DokuWIki'; +$lang['deaccent_o_0'] = 'disactivate'; +$lang['deaccent_o_1'] = 'remover accentos'; +$lang['deaccent_o_2'] = 'romanisar'; +$lang['gdlib_o_0'] = 'GD Lib non disponibile'; +$lang['gdlib_o_1'] = 'Version 1.x'; +$lang['gdlib_o_2'] = 'Autodetection'; +$lang['rss_type_o_rss'] = 'RSS 0.91'; +$lang['rss_type_o_rss1'] = 'RSS 1.0'; +$lang['rss_type_o_rss2'] = 'RSS 2.0'; +$lang['rss_type_o_atom'] = 'Atom 0.3'; +$lang['rss_type_o_atom1'] = 'Atom 1.0'; +$lang['rss_content_o_abstract'] = 'Abstracte'; +$lang['rss_content_o_diff'] = 'In formato Unified Diff'; +$lang['rss_content_o_htmldiff'] = 'Tabella de diff in formato HTML'; +$lang['rss_content_o_html'] = 'Contento complete del pagina in HTML'; +$lang['rss_linkto_o_diff'] = 'vista de differentias'; +$lang['rss_linkto_o_page'] = 'le pagina revidite'; +$lang['rss_linkto_o_rev'] = 'lista de versiones'; +$lang['rss_linkto_o_current'] = 'le pagina actual'; +$lang['compression_o_0'] = 'nulle'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'non usar'; +$lang['xsendfile_o_1'] = 'Capite proprietari "lighttpd" (ante version 1.5)'; +$lang['xsendfile_o_2'] = 'Capite standard "X-Sendfile"'; +$lang['xsendfile_o_3'] = 'Capite proprietari "X-Accel-Redirect" de Nginx'; +$lang['showuseras_o_loginname'] = 'Nomine de usator'; +$lang['showuseras_o_username'] = 'Nomine real del usator'; +$lang['showuseras_o_email'] = 'Adresse de e-mail del usator (offuscate secundo le configuration de Mailguard)'; +$lang['showuseras_o_email_link'] = 'Adresse de e-mail del usator como ligamine "mailto:"'; +$lang['useheading_o_0'] = 'Nunquam'; +$lang['useheading_o_navigation'] = 'Navigation solmente'; +$lang['useheading_o_content'] = 'Contento wiki solmente'; +$lang['useheading_o_1'] = 'Sempre'; diff --git a/lib/plugins/plugin/lang/ia/admin_plugin.txt b/lib/plugins/plugin/lang/ia/admin_plugin.txt new file mode 100644 index 000000000..c7f758c16 --- /dev/null +++ b/lib/plugins/plugin/lang/ia/admin_plugin.txt @@ -0,0 +1,3 @@ +====== Gestion de plug-ins ====== + +In iste pagina tu pote gerer omne cosas con relation al [[doku>plugins|plug-ins]] de DokuWiki. Pro poter discargar e installar un plug-in, le directorio de plug-ins debe permitter le accesso de scriptura al servitor web. \ No newline at end of file diff --git a/lib/plugins/plugin/lang/ia/lang.php b/lib/plugins/plugin/lang/ia/lang.php index 3f0ebb5d8..523f8581d 100644 --- a/lib/plugins/plugin/lang/ia/lang.php +++ b/lib/plugins/plugin/lang/ia/lang.php @@ -5,3 +5,47 @@ * @author robocap * @author Martijn Dekker */ +$lang['menu'] = 'Gestion de plug-ins'; +$lang['download'] = 'Discargar e installar un nove plug-in'; +$lang['manage'] = 'Plug-ins installate'; +$lang['btn_info'] = 'info'; +$lang['btn_update'] = 'actualisar'; +$lang['btn_delete'] = 'deler'; +$lang['btn_settings'] = 'configurationes'; +$lang['btn_download'] = 'Discargar'; +$lang['btn_enable'] = 'Salveguardar'; +$lang['url'] = 'URL'; +$lang['installed'] = 'Installate:'; +$lang['lastupdate'] = 'Ultime actualisation:'; +$lang['source'] = 'Origine:'; +$lang['unknown'] = 'incognite'; +$lang['updating'] = 'Actualisation…'; +$lang['updated'] = 'Actualisation del plug-in %s succedite'; +$lang['updates'] = 'Le sequente plug-ins ha essite actualisate con successo'; +$lang['update_none'] = 'Nulle actualisation trovate.'; +$lang['deleting'] = 'Deletion…'; +$lang['deleted'] = 'Le plug-in %s ha essite delite.'; +$lang['downloading'] = 'Discargamento…'; +$lang['downloaded'] = 'Installation del plug-in %s succedite.'; +$lang['downloads'] = 'Le sequente plug-ins ha essite installate con successo:'; +$lang['download_none'] = 'Nulle plug-in trovate, o il ha occurrite un problema incognite durante le discargamento e installation.'; +$lang['plugin'] = 'Plug-in:'; +$lang['components'] = 'Componentes'; +$lang['noinfo'] = 'Iste plug-in retornava nulle information; illo pote esser invalide.'; +$lang['name'] = 'Nomine:'; +$lang['date'] = 'Data:'; +$lang['type'] = 'Typo:'; +$lang['desc'] = 'Description:'; +$lang['author'] = 'Autor:'; +$lang['www'] = 'Web:'; +$lang['error'] = 'Un error incognite ha occurrite.'; +$lang['error_download'] = 'Impossibile discargar le file del plug-in: %s'; +$lang['error_badurl'] = 'URL probabilemente invalide; impossibile determinar le nomine del file ex le URL'; +$lang['error_dircreate'] = 'Impossibile crear le dossier temporari pro reciper le discargamento'; +$lang['error_decompress'] = 'Le gestor de plug-ins non poteva decomprimer le file discargate. Isto pote esser le resultato de un discargamento defectuose, in le qual caso tu deberea probar lo de novo; o le formato de compression pote esser incognite, in le qual caso tu debe discargar e installar le plug-in manualmente.'; +$lang['error_copy'] = 'Il occurreva un error durante le tentativa de installar files pro le plugin %s: le disco pote esser plen o le permissiones de accesso a files pote esser incorrecte. Isto pote haber resultate in un plug-in partialmente installate e lassar tu installation del wiki instabile.'; +$lang['error_delete'] = 'Il occurreva un error durante le tentativa de deler le plug-in %s. Le causa le plus probabile es insufficiente permissiones de files o directorios.'; +$lang['enabled'] = 'Plug-in %s activate.'; +$lang['notenabled'] = 'Le plug-in %s non poteva esser activate; verifica le permissiones de accesso a files.'; +$lang['disabled'] = 'Plug-in %s disactivate.'; +$lang['notdisabled'] = 'Le plug-in %s non poteva esser disactivate; verifica le permissiones de accesso a files.'; diff --git a/lib/plugins/popularity/lang/ia/intro.txt b/lib/plugins/popularity/lang/ia/intro.txt new file mode 100644 index 000000000..d31c3653f --- /dev/null +++ b/lib/plugins/popularity/lang/ia/intro.txt @@ -0,0 +1,9 @@ +====== Datos de popularitate ====== + +Iste instrumento collige datos anonyme super tu wiki e te permitte inviar los retro al disveloppatores de DokuWiki. Isto les adjuta de comprender como DokuWiki es usate per su usatores e assecura que le decisiones super le disveloppamento futur si basate super statisticas de uso ex le mundo real. + +Tu es incoragiate a repeter iste procedura de tempore a tempore pro continuar a informar le disveloppatores quando tu wiki cresce. Tu collectiones repetite de datos essera identificate per un ID anonyme. + +Le datos colligite contine informationes como tu version de DokuWiki, le numero e dimension de tu paginas e files, plug-ins installate e information super tu installation de PHP. + +Le datos crude que essera inviate es monstrate hic infra. Per favor usa le button "Inviar datos" pro transferer le informationes. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/ia/lang.php b/lib/plugins/popularity/lang/ia/lang.php index 3f0ebb5d8..4a45f04f3 100644 --- a/lib/plugins/popularity/lang/ia/lang.php +++ b/lib/plugins/popularity/lang/ia/lang.php @@ -5,3 +5,5 @@ * @author robocap * @author Martijn Dekker */ +$lang['name'] = 'Datos de popularitate (pote prender alcun tempore pro cargar)'; +$lang['submit'] = 'Inviar datos'; diff --git a/lib/plugins/revert/lang/ia/intro.txt b/lib/plugins/revert/lang/ia/intro.txt new file mode 100644 index 000000000..ae548e9df --- /dev/null +++ b/lib/plugins/revert/lang/ia/intro.txt @@ -0,0 +1,3 @@ +====== Gestion de reversiones ====== + +Iste pagina te adjuta con le reversion automatic de un attacco de spam. Pro cercar un lista de paginas spammose, primo entra un texto a cercar (p.ex. un URL de spam), postea confirma que le paginas trovate es realmente spam e reverte le modificationes. \ No newline at end of file diff --git a/lib/plugins/revert/lang/ia/lang.php b/lib/plugins/revert/lang/ia/lang.php index 3f0ebb5d8..bec2eca7b 100644 --- a/lib/plugins/revert/lang/ia/lang.php +++ b/lib/plugins/revert/lang/ia/lang.php @@ -5,3 +5,12 @@ * @author robocap * @author Martijn Dekker */ +$lang['menu'] = 'Gestion de reversiones'; +$lang['filter'] = 'Cercar paginas spammose'; +$lang['revert'] = 'Reverter le paginas seligite'; +$lang['reverted'] = '%s revertite al version %s'; +$lang['removed'] = '%s removite'; +$lang['revstart'] = 'Le processo de reversion ha comenciate. Isto pote durar multo. Si le script expira ante de finir, tu debe divider le reversiones in blocos minor.'; +$lang['revstop'] = 'Le processo de reversion ha succedite.'; +$lang['note1'] = 'Nota: iste recerca distingue inter majusculas e minusculas.'; +$lang['note2'] = 'Nota: le pagina essera revertite al ultime version que non contine le termino de spam specificate, %s.'; diff --git a/lib/plugins/usermanager/lang/ia/add.txt b/lib/plugins/usermanager/lang/ia/add.txt new file mode 100644 index 000000000..4695834f4 --- /dev/null +++ b/lib/plugins/usermanager/lang/ia/add.txt @@ -0,0 +1 @@ +===== Adder usator ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ia/delete.txt b/lib/plugins/usermanager/lang/ia/delete.txt new file mode 100644 index 000000000..db1b4c077 --- /dev/null +++ b/lib/plugins/usermanager/lang/ia/delete.txt @@ -0,0 +1 @@ +===== Deler usator ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ia/edit.txt b/lib/plugins/usermanager/lang/ia/edit.txt new file mode 100644 index 000000000..2fcf02378 --- /dev/null +++ b/lib/plugins/usermanager/lang/ia/edit.txt @@ -0,0 +1 @@ +===== Modificar usator ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ia/intro.txt b/lib/plugins/usermanager/lang/ia/intro.txt new file mode 100644 index 000000000..f4fafcb9b --- /dev/null +++ b/lib/plugins/usermanager/lang/ia/intro.txt @@ -0,0 +1 @@ +====== Gestion de usatores ====== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ia/lang.php b/lib/plugins/usermanager/lang/ia/lang.php index 3f0ebb5d8..a8b8f45c0 100644 --- a/lib/plugins/usermanager/lang/ia/lang.php +++ b/lib/plugins/usermanager/lang/ia/lang.php @@ -5,3 +5,45 @@ * @author robocap * @author Martijn Dekker */ +$lang['menu'] = 'Gestion de usatores'; +$lang['noauth'] = '(authentication de usatores non disponibile)'; +$lang['nosupport'] = '(gestion de usatores non supportate)'; +$lang['badauth'] = 'mechanismo de authentication invalide'; +$lang['user_id'] = 'Usator'; +$lang['user_pass'] = 'Contrasigno'; +$lang['user_name'] = 'Nomine real'; +$lang['user_mail'] = 'E-mail'; +$lang['user_groups'] = 'Gruppos'; +$lang['field'] = 'Campo'; +$lang['value'] = 'Valor'; +$lang['add'] = 'Adder'; +$lang['delete'] = 'Deler'; +$lang['delete_selected'] = 'Deler seligite'; +$lang['edit'] = 'Modificar'; +$lang['edit_prompt'] = 'Modificar iste usator'; +$lang['modify'] = 'Salveguardar cambios'; +$lang['search'] = 'Cercar'; +$lang['search_prompt'] = 'Executar recerca'; +$lang['clear'] = 'Reinitialisar filtro de recerca'; +$lang['filter'] = 'Filtro'; +$lang['summary'] = 'Presentation del usatores %1$d-%2$d de %3$d trovate. %4$d usatores in total.'; +$lang['nonefound'] = 'Nulle usator trovate. %d usatores in total.'; +$lang['delete_ok'] = '%d usatores delite'; +$lang['delete_fail'] = 'Deletion de %d usatores fallite.'; +$lang['update_ok'] = 'Actualisation del usator succedite'; +$lang['update_fail'] = 'Actualisation del usator fallite'; +$lang['update_exists'] = 'Le modification del nomine del usator ha fallite; le usator specificate (%s) ja existe. (Omne altere modificationes essera applicate.) +'; +$lang['start'] = 'initio'; +$lang['prev'] = 'precedente'; +$lang['next'] = 'sequente'; +$lang['last'] = 'fin'; +$lang['edit_usermissing'] = 'Le usator seligite non ha essite trovate. Es possibile que le nomine de usator specificate ha essite delite o cambiate alterubi.'; +$lang['user_notify'] = 'Notificar usator'; +$lang['note_notify'] = 'Le messages de notification es solmente inviate un nove contrasigno es date al usator.'; +$lang['note_group'] = 'Nove usatores essera addite al gruppo predefinite (%s) si nulle gruppo es specificate.'; +$lang['note_pass'] = 'Le contrasigno essera automaticamente generate si le campo es lassate vacue e le notification del usator es activate.'; +$lang['add_ok'] = 'Addition del usator succedite'; +$lang['add_fail'] = 'Addition del usator fallite'; +$lang['notify_ok'] = 'Message de notification inviate'; +$lang['notify_fail'] = 'Le message de notification non poteva esser inviate'; diff --git a/lib/plugins/usermanager/lang/ia/list.txt b/lib/plugins/usermanager/lang/ia/list.txt new file mode 100644 index 000000000..f545f06df --- /dev/null +++ b/lib/plugins/usermanager/lang/ia/list.txt @@ -0,0 +1 @@ +===== Lista de usatores ===== \ No newline at end of file -- cgit v1.2.3 From b04e9c2821040ceefeaf1953e47b5871f87a66a9 Mon Sep 17 00:00:00 2001 From: Leszek Stachowski Date: Sun, 14 Feb 2010 12:59:28 +0100 Subject: Polish language update --- lib/plugins/acl/lang/pl/lang.php | 1 + lib/plugins/config/lang/pl/lang.php | 1 + lib/plugins/plugin/lang/pl/lang.php | 1 + lib/plugins/popularity/lang/pl/lang.php | 1 + lib/plugins/revert/lang/pl/lang.php | 1 + lib/plugins/usermanager/lang/pl/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index 4105bb448..0f88fe477 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -8,6 +8,7 @@ * @author Maciej Kurczewski * @author Sławomir Boczek * @author sleshek@wp.pl + * @author Leszek Stachowski */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 7eb8a44f3..b722f7b4d 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -9,6 +9,7 @@ * @author Sławomir Boczek * @author Piotr JANKOWSKI * @author sleshek@wp.pl + * @author Leszek Stachowski */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
Niepoprawne wartości są wyróżnione kolorem czerwonym.'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index 1c1fcc4e3..b5f813f03 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -9,6 +9,7 @@ * @author Maciej Kurczewski * @author Sławomir Boczek * @author sleshek@wp.pl + * @author Leszek Stachowski */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index b64dc07da..02a1f21b6 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -7,6 +7,7 @@ * @author Maciej Kurczewski * @author Sławomir Boczek * @author sleshek@wp.pl + * @author Leszek Stachowski */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index 845a18211..437daf3d7 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -6,6 +6,7 @@ * @author Maciej Kurczewski * @author Sławomir Boczek * @author sleshek@wp.pl + * @author Leszek Stachowski */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 6a0eca809..56add77f4 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -7,6 +7,7 @@ * @author Maciej Kurczewski * @author Sławomir Boczek * @author sleshek@wp.pl + * @author Leszek Stachowski */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; -- cgit v1.2.3 From 01eab857bc060f72f5a8355cecd5affce6f70a31 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 14 Feb 2010 20:26:02 +0100 Subject: added new mime types and file icons FS#1888 --- lib/images/fileicons/7z.png | Bin 0 -> 651 bytes lib/images/fileicons/audio.png | Bin 0 -> 727 bytes lib/images/fileicons/csv.png | Bin 0 -> 480 bytes lib/images/fileicons/docx.png | Bin 0 -> 659 bytes lib/images/fileicons/mp3.png | Bin 0 -> 885 bytes lib/images/fileicons/ogg.png | Bin 0 -> 865 bytes lib/images/fileicons/pptx.png | Bin 0 -> 762 bytes lib/images/fileicons/sql.png | Bin 0 -> 865 bytes lib/images/fileicons/wav.png | Bin 0 -> 881 bytes lib/images/fileicons/xlsx.png | Bin 0 -> 731 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/images/fileicons/7z.png create mode 100644 lib/images/fileicons/audio.png create mode 100644 lib/images/fileicons/csv.png create mode 100644 lib/images/fileicons/docx.png create mode 100644 lib/images/fileicons/mp3.png create mode 100644 lib/images/fileicons/ogg.png create mode 100644 lib/images/fileicons/pptx.png create mode 100644 lib/images/fileicons/sql.png create mode 100644 lib/images/fileicons/wav.png create mode 100644 lib/images/fileicons/xlsx.png (limited to 'lib') diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png new file mode 100644 index 000000000..52f7d5d72 Binary files /dev/null and b/lib/images/fileicons/7z.png differ diff --git a/lib/images/fileicons/audio.png b/lib/images/fileicons/audio.png new file mode 100644 index 000000000..98883256d Binary files /dev/null and b/lib/images/fileicons/audio.png differ diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png new file mode 100644 index 000000000..3a8835360 Binary files /dev/null and b/lib/images/fileicons/csv.png differ diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png new file mode 100644 index 000000000..932567f8a Binary files /dev/null and b/lib/images/fileicons/docx.png differ diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png new file mode 100644 index 000000000..928705d7a Binary files /dev/null and b/lib/images/fileicons/mp3.png differ diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png new file mode 100644 index 000000000..62cea6aaa Binary files /dev/null and b/lib/images/fileicons/ogg.png differ diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png new file mode 100644 index 000000000..adaefc602 Binary files /dev/null and b/lib/images/fileicons/pptx.png differ diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png new file mode 100644 index 000000000..f60054a3a Binary files /dev/null and b/lib/images/fileicons/sql.png differ diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png new file mode 100644 index 000000000..79e80760e Binary files /dev/null and b/lib/images/fileicons/wav.png differ diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png new file mode 100644 index 000000000..e8cd58dc0 Binary files /dev/null and b/lib/images/fileicons/xlsx.png differ -- cgit v1.2.3 From 544ed901ab29fc8b73d559c5cc89b7c57f643fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Mon, 15 Feb 2010 21:04:13 +0100 Subject: Disable locking when locktime is zero --- lib/exe/js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 8648bf18f..5d93a69a4 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -113,7 +113,9 @@ function js_out(){ js_runonstart("initSizeCtl('size__ctl','wiki__text')"); js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)"); js_runonstart("initChangeCheck('".js_escape($lang['notsavedyet'])."')"); - js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); + if($conf['locktime'] != 0){ + js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); + } js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); -- cgit v1.2.3 From f77ccdf72d9702956edd4917d261b908636fd690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Schintgen?= Date: Mon, 22 Feb 2010 21:11:55 +0100 Subject: Luxembourgish translation added --- lib/plugins/acl/lang/lb/help.txt | 11 +++++++++++ lib/plugins/acl/lang/lb/lang.php | 6 ++++++ lib/plugins/config/lang/lb/intro.txt | 7 +++++++ lib/plugins/config/lang/lb/lang.php | 6 ++++++ lib/plugins/plugin/lang/lb/admin_plugin.txt | 4 ++++ lib/plugins/plugin/lang/lb/lang.php | 6 ++++++ lib/plugins/popularity/lang/lb/lang.php | 6 ++++++ lib/plugins/revert/lang/lb/intro.txt | 3 +++ lib/plugins/revert/lang/lb/lang.php | 6 ++++++ lib/plugins/usermanager/lang/lb/lang.php | 6 ++++++ lib/plugins/usermanager/lang/lb/list.txt | 1 + 11 files changed, 62 insertions(+) create mode 100644 lib/plugins/acl/lang/lb/help.txt create mode 100644 lib/plugins/acl/lang/lb/lang.php create mode 100644 lib/plugins/config/lang/lb/intro.txt create mode 100644 lib/plugins/config/lang/lb/lang.php create mode 100644 lib/plugins/plugin/lang/lb/admin_plugin.txt create mode 100644 lib/plugins/plugin/lang/lb/lang.php create mode 100644 lib/plugins/popularity/lang/lb/lang.php create mode 100644 lib/plugins/revert/lang/lb/intro.txt create mode 100644 lib/plugins/revert/lang/lb/lang.php create mode 100644 lib/plugins/usermanager/lang/lb/lang.php create mode 100644 lib/plugins/usermanager/lang/lb/list.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/lb/help.txt b/lib/plugins/acl/lang/lb/help.txt new file mode 100644 index 000000000..e36ed373f --- /dev/null +++ b/lib/plugins/acl/lang/lb/help.txt @@ -0,0 +1,11 @@ +=== Séier Hëllef: === + +Op dëser Säit kanns de Rechter fir Namespacen a Säiten an dengem Wiki setzen. + +Op der lénkser Säit hues de all d'Namespacen a Säiten. + +Am Formulär hei uewendriwwer kanns de d'Rechter vun dem ausgewielte Benotzer oder Grupp änneren + +An der Tabell hei ënnendrënner kanns de all d'Reegele gesinn déi de Moment gesat sinn. Du kanns se huelen fir Reegelen ze änneren oder ze läschen. + +Déi [[doku>acl|offiziell Dokumentatioun iwwert ACL]] hëlleft der besser ze verstoen wéi déi Reegelen am Dokuwiki funktionéieren. diff --git a/lib/plugins/acl/lang/lb/lang.php b/lib/plugins/acl/lang/lb/lang.php new file mode 100644 index 000000000..59acdf7a8 --- /dev/null +++ b/lib/plugins/acl/lang/lb/lang.php @@ -0,0 +1,6 @@ +config]]. Méi Informatiounen zu dësem Plugin kriss de ënner [[doku>plugin:config]]. + +Astellungen mat engem hellrouden Hannergrond si geséchert a kënnen net mat dësem Plugin verännert ginn. Astellungen mat hellbloem Hannergrond si Virastellungen, wäiss hannerluechte Felder weisen lokal verännert Werter un. Souwuel dié blo wéi och déi wäiss Felder kënne verännert ginn. + +Vergiess w.e.g. net **Späicheren** ze drécken iers de d'Säit verléiss, anescht ginn all deng Ännerungen verluer. diff --git a/lib/plugins/config/lang/lb/lang.php b/lib/plugins/config/lang/lb/lang.php new file mode 100644 index 000000000..59acdf7a8 --- /dev/null +++ b/lib/plugins/config/lang/lb/lang.php @@ -0,0 +1,6 @@ +plugins|Pluginen]] ze dinn huet. Fir e Plugin kënnen z'installéieren, muss däi Pluginverzeechnës vum Webserver schreiwbar sinn. + diff --git a/lib/plugins/plugin/lang/lb/lang.php b/lib/plugins/plugin/lang/lb/lang.php new file mode 100644 index 000000000..59acdf7a8 --- /dev/null +++ b/lib/plugins/plugin/lang/lb/lang.php @@ -0,0 +1,6 @@ + Date: Tue, 23 Feb 2010 15:02:49 +0100 Subject: Fix textarea scrolling for list editing --- lib/scripts/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 235a91cd6..58433f25c 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -166,6 +166,7 @@ function keyHandler(e){ // keep current indention for lists and code var match = search.match(/(\n +([\*-] ?)?)/); if(match){ + var scroll = field.scrollHeight; var match2 = search.match(/^\n +[\*-]\s*$/); // Cancel list if the last item is empty (i. e. two times enter) if (match2 && field.value.substr(selection.start).match(/^($|\n)/)) { @@ -177,7 +178,6 @@ function keyHandler(e){ } else { insertAtCarret(field.id,match[1]); } - var scroll = field.scrollHeight; field.scrollTop += (field.scrollHeight - scroll); e.preventDefault(); // prevent enter key return false; -- cgit v1.2.3 From cd98d9c31101cdf9637104f6d1b31ff8c27c1d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= Date: Tue, 23 Feb 2010 21:51:54 +0100 Subject: Added FETCH_MEDIA_4XERROR event --- lib/exe/fetch.php | 132 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 53 deletions(-) (limited to 'lib') diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 11877ef36..100b0cc37 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -32,73 +32,49 @@ $MIME = 'application/octet-stream'; $DL = true; } - - //media to local file - if(preg_match('#^(https?)://#i',$MEDIA)){ - //check hash - if(substr(md5(auth_cookiesalt().$MEDIA),0,6) != $_REQUEST['hash']){ - header("HTTP/1.0 412 Precondition Failed"); - print 'Precondition Failed'; - exit; - } - //handle external images - if(strncmp($MIME,'image/',6) == 0) $FILE = media_get_from_URL($MEDIA,$EXT,$CACHE); - if(!$FILE){ - //download failed - redirect to original URL - header('Location: '.$MEDIA); - exit; - } - }else{ - $MEDIA = cleanID($MEDIA); - if(empty($MEDIA)){ - header("HTTP/1.0 400 Bad Request"); - print 'Bad request'; + + // prepare data for error handling / clean download handling + list($STATUS, $STATUSMESSAGE) = check4XErrors($MEDIA, $FILE); // here goes the old 4X error checking + $data = array('media' => $MEDIA, + 'file' => $FILE, + 'orig' => $FILE, + 'mime' => $MIME, + 'download' => $DL, + 'cache' => $CACHE, + 'ext' => $EXT, + 'width' => $WIDTH, + 'height' => $HEIGHT, + 'status' => $STATUS, + 'statusmessage' => $STATUSMESSAGE, + ); + + // handle any 4XX status messages + if ( $STATUS >= 400 && $STATUSMESSAGE < 500 ) { + $evt = new Doku_Event('FETCH_MEDIA_4XERROR', $data); + if ( $evt->advise_before() ) { + header('HTTP/1.0 ' . $data['status'] . ' ' . $data['statusmessage']); + print $data['statusmessage']; exit; - } - - //check permissions (namespace only) - if(auth_quickaclcheck(getNS($MEDIA).':X') < AUTH_READ){ - header("HTTP/1.0 401 Unauthorized"); - //fixme add some image for imagefiles - print 'Unauthorized'; - exit; - } - $FILE = mediaFN($MEDIA); + } + unset($evt); } - //check file existance - if(!@file_exists($FILE)){ - header("HTTP/1.0 404 Not Found"); - //FIXME add some default broken image - print 'Not Found'; - exit; - } - - $ORIG = $FILE; - //handle image resizing/cropping if((substr($MIME,0,5) == 'image') && $WIDTH){ if($HEIGHT){ - $FILE = media_crop_image($FILE,$EXT,$WIDTH,$HEIGHT); + $data['file'] = $FILE = media_crop_image($data['file'],$EXT,$WIDTH,$HEIGHT); }else{ - $FILE = media_resize_image($FILE,$EXT,$WIDTH,$HEIGHT); + $data['file'] = $FILE = media_resize_image($data['file'],$EXT,$WIDTH,$HEIGHT); } } - + // finally send the file to the client - $data = array('file' => $FILE, - 'mime' => $MIME, - 'download' => $DL, - 'cache' => $CACHE, - 'orig' => $ORIG, - 'ext' => $EXT, - 'width' => $WIDTH, - 'height' => $HEIGHT); - $evt = new Doku_Event('MEDIA_SENDFILE', $data); if ($evt->advise_before()) { sendFile($data['file'],$data['mime'],$data['download'],$data['cache']); } + // Do something after the download finished. + $evt->advise_after(); /* ------------------------------------------------------------------------ */ @@ -155,6 +131,56 @@ function sendFile($file,$mime,$dl,$cache){ } } +/* + * File fetch 4XX error checker + * + * Check for preconditions and return 4XX errors if needed + * READ: MEDIA, MIME, EXT, CACHE + * WRITE: MEDIA, FILE, array( STATUS, STATUSMESSAGE ) + * + * @author Gerry Weissbach + * @param $media reference to the media id + * @param $file reference to the file variable + * @returns array(STATUS, STATUSMESSAGE) + */ +function check4XErrors(&$media, &$file) { + global $MIME, $EXT, $CACHE; + + //media to local file + if(preg_match('#^(https?)://#i',$media)){ + //check hash + if(substr(md5(auth_cookiesalt().$media),0,6) != $_REQUEST['hash']){ + return array( 412, 'Precondition Failed'); + } + //handle external images + if(strncmp($MIME,'image/',6) == 0) $file = media_get_from_URL($media,$EXT,$CACHE); + if(!$file){ + //download failed - redirect to original URL + header('Location: '.$media); + exit; + } + }else{ + $media = cleanID($media); + if(empty($media)){ + return array( 400, 'Bad request' ); + } + + //check permissions (namespace only) + if(auth_quickaclcheck(getNS($media).':X') < AUTH_READ){ + return array( 401, 'Unauthorized' ); + } + $file = mediaFN($media); + } + + //check file existance + if(!@file_exists($file)){ + // FIXME add some default broken image + return array( 404, 'Not Found' ); + } + + return array(null, null); +} + /** * Returns the wanted cachetime in seconds * -- cgit v1.2.3 From 032933052326cab7864caafa674a9253814e1a17 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 23 Feb 2010 22:20:10 +0100 Subject: Changed FETCH_MEDIA_4XERROR to FETCH_MEDIA_STATUS --- lib/exe/fetch.php | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) (limited to 'lib') diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 100b0cc37..81a8903c9 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -32,9 +32,11 @@ $MIME = 'application/octet-stream'; $DL = true; } - - // prepare data for error handling / clean download handling - list($STATUS, $STATUSMESSAGE) = check4XErrors($MEDIA, $FILE); // here goes the old 4X error checking + + // check for permissions, preconditions and cache external files + list($STATUS, $STATUSMESSAGE) = checkFileStatus($MEDIA, $FILE); + + // prepare data for plugin events $data = array('media' => $MEDIA, 'file' => $FILE, 'orig' => $FILE, @@ -47,17 +49,26 @@ 'status' => $STATUS, 'statusmessage' => $STATUSMESSAGE, ); - - // handle any 4XX status messages - if ( $STATUS >= 400 && $STATUSMESSAGE < 500 ) { - $evt = new Doku_Event('FETCH_MEDIA_4XERROR', $data); - if ( $evt->advise_before() ) { + + // handle the file status + $evt = new Doku_Event('FETCH_MEDIA_STATUS', $data); + if ( $evt->advise_before() ) { + // redirects + if($data['status'] > 300 && $data['status'] <= 304){ + send_redirect($data['statusmessage']); + } + // send any non 200 status + if($data['status'] != 200){ header('HTTP/1.0 ' . $data['status'] . ' ' . $data['statusmessage']); + } + // die on errors + if($data['status'] > 203){ print $data['statusmessage']; exit; - } - unset($evt); + } } + $evt->advise_after(); + unset($evt); //handle image resizing/cropping if((substr($MIME,0,5) == 'image') && $WIDTH){ @@ -67,7 +78,7 @@ $data['file'] = $FILE = media_resize_image($data['file'],$EXT,$WIDTH,$HEIGHT); } } - + // finally send the file to the client $evt = new Doku_Event('MEDIA_SENDFILE', $data); if ($evt->advise_before()) { @@ -131,21 +142,20 @@ function sendFile($file,$mime,$dl,$cache){ } } -/* - * File fetch 4XX error checker - * - * Check for preconditions and return 4XX errors if needed +/** + * Check for media for preconditions and return correct status code + * * READ: MEDIA, MIME, EXT, CACHE * WRITE: MEDIA, FILE, array( STATUS, STATUSMESSAGE ) - * + * * @author Gerry Weissbach * @param $media reference to the media id * @param $file reference to the file variable * @returns array(STATUS, STATUSMESSAGE) */ -function check4XErrors(&$media, &$file) { +function checkFileStatus(&$media, &$file) { global $MIME, $EXT, $CACHE; - + //media to local file if(preg_match('#^(https?)://#i',$media)){ //check hash @@ -156,8 +166,7 @@ function check4XErrors(&$media, &$file) { if(strncmp($MIME,'image/',6) == 0) $file = media_get_from_URL($media,$EXT,$CACHE); if(!$file){ //download failed - redirect to original URL - header('Location: '.$media); - exit; + return array( 302, $media ); } }else{ $media = cleanID($media); @@ -174,11 +183,10 @@ function check4XErrors(&$media, &$file) { //check file existance if(!@file_exists($file)){ - // FIXME add some default broken image return array( 404, 'Not Found' ); } - - return array(null, null); + + return array(200, null); } /** -- cgit v1.2.3 From c6f610ef3c4f586d8f535f2a30e29c310bb9b125 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 24 Feb 2010 20:34:32 +0100 Subject: Send 403 instead of 401 in fetch.php FS#1904 --- lib/exe/fetch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 81a8903c9..968ee9436 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -176,7 +176,7 @@ function checkFileStatus(&$media, &$file) { //check permissions (namespace only) if(auth_quickaclcheck(getNS($media).':X') < AUTH_READ){ - return array( 401, 'Unauthorized' ); + return array( 403, 'Forbidden' ); } $file = mediaFN($media); } -- cgit v1.2.3 From 5720205600a0cee530082745d00d41625ffed404 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Sun, 28 Feb 2010 10:33:00 +0100 Subject: Esperanto language update --- lib/plugins/config/lang/eo/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index f490248e5..2b3dd6657 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -111,6 +111,7 @@ $lang['gdlib'] = 'Versio de GD Lib'; $lang['im_convert'] = 'Pado al la konvertilo de ImageMagick'; $lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; $lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj'; +$lang['subscribe_time'] = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; $lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)'; $lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Ne Trovita Paĝo" por ne ekzistantaj paĝoj'; -- cgit v1.2.3 From 516582b3ae1e8d76bc5dbca074cb8bac4fa9cb48 Mon Sep 17 00:00:00 2001 From: Aleksey Osadchiy Date: Sun, 28 Feb 2010 10:34:24 +0100 Subject: Russian language update --- lib/plugins/acl/lang/ru/lang.php | 1 + lib/plugins/config/lang/ru/lang.php | 2 ++ lib/plugins/plugin/lang/ru/lang.php | 1 + lib/plugins/popularity/lang/ru/lang.php | 1 + lib/plugins/revert/lang/ru/lang.php | 1 + lib/plugins/usermanager/lang/ru/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 496e67510..911ae72da 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -11,6 +11,7 @@ * @author Alexander Sorkin * @author Kirill Krasnov * @author Vlad Tsybenko + * @author Aleksey Osadchiy */ $lang['admin_acl'] = 'Управление списками контроля доступа'; $lang['acl_group'] = 'Группа'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index 1e9905d64..515485afb 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -12,6 +12,7 @@ * @author Alexander Sorkin * @author Kirill Krasnov * @author Vlad Tsybenko + * @author Aleksey Osadchiy */ $lang['menu'] = 'Настройки Вики'; $lang['error'] = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте ваши изменения и попробуйте еще раз. @@ -114,6 +115,7 @@ $lang['gdlib'] = 'Версия GD Lib'; $lang['im_convert'] = 'Путь к imagemagick'; $lang['jpg_quality'] = 'Качество сжатия JPG (0-100)'; $lang['subscribers'] = 'Разрешить подписку на изменения'; +$lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек); Должен быть меньше, чем значение указанное в recent_days.'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; $lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; $lang['send404'] = 'Посылать "HTTP404/Page Not Found"'; diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php index 0bcddaa70..514b38bc2 100644 --- a/lib/plugins/plugin/lang/ru/lang.php +++ b/lib/plugins/plugin/lang/ru/lang.php @@ -12,6 +12,7 @@ * @author Alexander Sorkin * @author Kirill Krasnov * @author Vlad Tsybenko + * @author Aleksey Osadchiy */ $lang['menu'] = 'Управление плагинами'; $lang['download'] = 'Скачать и установить новый плагин'; diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php index 3caa4d27c..d6c5964db 100644 --- a/lib/plugins/popularity/lang/ru/lang.php +++ b/lib/plugins/popularity/lang/ru/lang.php @@ -9,6 +9,7 @@ * @author Alexander Sorkin * @author Kirill Krasnov * @author Vlad Tsybenko + * @author Aleksey Osadchiy */ $lang['name'] = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)'; $lang['submit'] = 'Отправить данные'; diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php index a78210777..3ac43bc89 100644 --- a/lib/plugins/revert/lang/ru/lang.php +++ b/lib/plugins/revert/lang/ru/lang.php @@ -10,6 +10,7 @@ * @author Alexander Sorkin * @author Kirill Krasnov * @author Vlad Tsybenko + * @author Aleksey Osadchiy */ $lang['menu'] = 'Менеджер откаток'; $lang['filter'] = 'Поиск спам-страниц'; diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 7bfe3410d..5b48c6ba6 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -12,6 +12,7 @@ * @author Alexander Sorkin * @author Kirill Krasnov * @author Vlad Tsybenko + * @author Aleksey Osadchiy */ $lang['menu'] = 'Управление пользователями'; $lang['noauth'] = '(авторизация пользователей недоступна)'; -- cgit v1.2.3 From 003d21aecc68351b4dc919e47c6d89614c60ca4a Mon Sep 17 00:00:00 2001 From: Tanguy Ortolo Date: Sat, 27 Feb 2010 19:57:11 +0100 Subject: Update license GFDL and added CC0 --- lib/images/license/badge/cc-zero.png | Bin 0 -> 1266 bytes lib/images/license/button/cc-by-nc-nd.png | Bin 678 -> 688 bytes lib/images/license/button/cc-by-nc-sa.png | Bin 686 -> 697 bytes lib/images/license/button/cc-by-nc.png | Bin 663 -> 672 bytes lib/images/license/button/cc-by-nd.png | Bin 658 -> 665 bytes lib/images/license/button/cc-by-sa.png | Bin 661 -> 672 bytes lib/images/license/button/cc-by.png | Bin 629 -> 640 bytes lib/images/license/button/cc-zero.png | Bin 0 -> 865 bytes lib/images/license/button/cc.png | Bin 728 -> 801 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/images/license/badge/cc-zero.png create mode 100644 lib/images/license/button/cc-zero.png (limited to 'lib') diff --git a/lib/images/license/badge/cc-zero.png b/lib/images/license/badge/cc-zero.png new file mode 100644 index 000000000..8a0ef3e3b Binary files /dev/null and b/lib/images/license/badge/cc-zero.png differ diff --git a/lib/images/license/button/cc-by-nc-nd.png b/lib/images/license/button/cc-by-nc-nd.png index b27ead2f6..072f8cda0 100644 Binary files a/lib/images/license/button/cc-by-nc-nd.png and b/lib/images/license/button/cc-by-nc-nd.png differ diff --git a/lib/images/license/button/cc-by-nc-sa.png b/lib/images/license/button/cc-by-nc-sa.png index 1c54f994d..ed028fed9 100644 Binary files a/lib/images/license/button/cc-by-nc-sa.png and b/lib/images/license/button/cc-by-nc-sa.png differ diff --git a/lib/images/license/button/cc-by-nc.png b/lib/images/license/button/cc-by-nc.png index 33c7b1fa4..54ebdfbd8 100644 Binary files a/lib/images/license/button/cc-by-nc.png and b/lib/images/license/button/cc-by-nc.png differ diff --git a/lib/images/license/button/cc-by-nd.png b/lib/images/license/button/cc-by-nd.png index 52073c043..35eca20cc 100644 Binary files a/lib/images/license/button/cc-by-nd.png and b/lib/images/license/button/cc-by-nd.png differ diff --git a/lib/images/license/button/cc-by-sa.png b/lib/images/license/button/cc-by-sa.png index 0b1880f91..c67509f12 100644 Binary files a/lib/images/license/button/cc-by-sa.png and b/lib/images/license/button/cc-by-sa.png differ diff --git a/lib/images/license/button/cc-by.png b/lib/images/license/button/cc-by.png index 99d8efd35..ecd2abc73 100644 Binary files a/lib/images/license/button/cc-by.png and b/lib/images/license/button/cc-by.png differ diff --git a/lib/images/license/button/cc-zero.png b/lib/images/license/button/cc-zero.png new file mode 100644 index 000000000..27d413464 Binary files /dev/null and b/lib/images/license/button/cc-zero.png differ diff --git a/lib/images/license/button/cc.png b/lib/images/license/button/cc.png index adfa085bd..f640586c9 100644 Binary files a/lib/images/license/button/cc.png and b/lib/images/license/button/cc.png differ -- cgit v1.2.3 From 8d7fb8212341e6f1e33555853f94799f24fc1d98 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 28 Feb 2010 10:46:08 +0100 Subject: adjusted CC-PD and GFDL buttons to match other CC buttons --- lib/images/license/button/gnufdl.png | Bin 839 -> 826 bytes lib/images/license/button/publicdomain.png | Bin 621 -> 600 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/license/button/gnufdl.png b/lib/images/license/button/gnufdl.png index cb815ac13..52abafcb9 100644 Binary files a/lib/images/license/button/gnufdl.png and b/lib/images/license/button/gnufdl.png differ diff --git a/lib/images/license/button/publicdomain.png b/lib/images/license/button/publicdomain.png index f78e73d02..351bd7010 100644 Binary files a/lib/images/license/button/publicdomain.png and b/lib/images/license/button/publicdomain.png differ -- cgit v1.2.3 From 9dde1138fb3e544fd2614b77833a76f7ed9f7f81 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 28 Feb 2010 12:03:57 +0100 Subject: honor sneaky_index config in link manager FS#1907 --- lib/exe/ajax.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 4618abd71..465bd1846 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -319,6 +319,7 @@ function ajax_linkwiz(){ 'listdirs' => true, 'pagesonly' => true, 'firsthead' => true, + 'sneakyacl' => $conf['sneaky_index'], ); if($id) $opts['filematch'] = '^.*\/'.$id; if($id) $opts['dirmatch'] = '^.*\/'.$id; -- cgit v1.2.3 From f71f4f5359fe234960829868bf22081bf1f2d947 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 28 Feb 2010 12:32:01 +0100 Subject: added dokuwiki.search XMLRPC call FS#1882 --- lib/exe/xmlrpc.php | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index d3913482f..a29a40612 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -7,7 +7,7 @@ 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',2); +define('DOKU_XMLRPC_API_VERSION',3); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); @@ -118,6 +118,13 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { 'List all pages within the given namespace.' ); + $this->addCallback( + 'dokuwiki.search', + 'this:search', + array('struct','string'), + 'Perform a fulltext search and return a list of matching pages' + ); + $this->addCallback( 'dokuwiki.getTime', 'time', @@ -384,6 +391,41 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $data; } + /** + * List all pages in the given namespace (and below) + */ + function search($query){ + require_once(DOKU_INC.'inc/fulltext.php'); + + $regex = ''; + $data = ft_pageSearch($query,$regex); + $pages = array(); + + // prepare additional data + $idx = 0; + foreach($data as $id => $score){ + $file = wikiFN($id); + + if($idx < FT_SNIPPET_NUMBER){ + $snippet = ft_snippet($id,$regex); + $idx++; + }else{ + $snippet = ''; + } + + $pages[] = array( + 'id' => $id, + 'score' => $score, + 'rev' => filemtime($file), + 'mtime' => filemtime($file), + 'size' => filesize($file), + 'snippet' => $snippet, + ); + } + return $data; + } + + /** * List all media files. * -- cgit v1.2.3 From 7ec82fe2c0b2e1ddf4558410e18e3161a8f8b22b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 28 Feb 2010 12:53:04 +0100 Subject: changed license button colors again partly reverts previous patches to keep matching styles with other DokuWiki buttons --- lib/images/license/button/cc-by-nc-nd.png | Bin 688 -> 678 bytes lib/images/license/button/cc-by-nc-sa.png | Bin 697 -> 686 bytes lib/images/license/button/cc-by-nc.png | Bin 672 -> 663 bytes lib/images/license/button/cc-by-nd.png | Bin 665 -> 658 bytes lib/images/license/button/cc-by-sa.png | Bin 672 -> 661 bytes lib/images/license/button/cc-by.png | Bin 640 -> 629 bytes lib/images/license/button/cc-zero.png | Bin 865 -> 706 bytes lib/images/license/button/cc.png | Bin 801 -> 728 bytes lib/images/license/button/gnufdl.png | Bin 826 -> 839 bytes lib/images/license/button/publicdomain.png | Bin 600 -> 621 bytes 10 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/license/button/cc-by-nc-nd.png b/lib/images/license/button/cc-by-nc-nd.png index 072f8cda0..b27ead2f6 100644 Binary files a/lib/images/license/button/cc-by-nc-nd.png and b/lib/images/license/button/cc-by-nc-nd.png differ diff --git a/lib/images/license/button/cc-by-nc-sa.png b/lib/images/license/button/cc-by-nc-sa.png index ed028fed9..1c54f994d 100644 Binary files a/lib/images/license/button/cc-by-nc-sa.png and b/lib/images/license/button/cc-by-nc-sa.png differ diff --git a/lib/images/license/button/cc-by-nc.png b/lib/images/license/button/cc-by-nc.png index 54ebdfbd8..33c7b1fa4 100644 Binary files a/lib/images/license/button/cc-by-nc.png and b/lib/images/license/button/cc-by-nc.png differ diff --git a/lib/images/license/button/cc-by-nd.png b/lib/images/license/button/cc-by-nd.png index 35eca20cc..52073c043 100644 Binary files a/lib/images/license/button/cc-by-nd.png and b/lib/images/license/button/cc-by-nd.png differ diff --git a/lib/images/license/button/cc-by-sa.png b/lib/images/license/button/cc-by-sa.png index c67509f12..0b1880f91 100644 Binary files a/lib/images/license/button/cc-by-sa.png and b/lib/images/license/button/cc-by-sa.png differ diff --git a/lib/images/license/button/cc-by.png b/lib/images/license/button/cc-by.png index ecd2abc73..99d8efd35 100644 Binary files a/lib/images/license/button/cc-by.png and b/lib/images/license/button/cc-by.png differ diff --git a/lib/images/license/button/cc-zero.png b/lib/images/license/button/cc-zero.png index 27d413464..fc99eff61 100644 Binary files a/lib/images/license/button/cc-zero.png and b/lib/images/license/button/cc-zero.png differ diff --git a/lib/images/license/button/cc.png b/lib/images/license/button/cc.png index f640586c9..adfa085bd 100644 Binary files a/lib/images/license/button/cc.png and b/lib/images/license/button/cc.png differ diff --git a/lib/images/license/button/gnufdl.png b/lib/images/license/button/gnufdl.png index 52abafcb9..cb815ac13 100644 Binary files a/lib/images/license/button/gnufdl.png and b/lib/images/license/button/gnufdl.png differ diff --git a/lib/images/license/button/publicdomain.png b/lib/images/license/button/publicdomain.png index 351bd7010..f78e73d02 100644 Binary files a/lib/images/license/button/publicdomain.png and b/lib/images/license/button/publicdomain.png differ -- cgit v1.2.3 From 149e5f262e67264b1612d6c62a67b30341186dd8 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 18 Feb 2010 11:59:28 +0100 Subject: extended mediamanager options --- lib/scripts/media.js | 572 +++++++++++++++++++++++++++++++++++++++++++++- lib/tpl/default/media.css | 93 ++++++++ 2 files changed, 660 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 3e4213f19..3f0a8fb65 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -6,6 +6,13 @@ var media_manager = { keepopen: false, hide: false, + align: false, + popup: false, + id: false, + display: false, + link: false, + size: false, + ext: false, /** * Attach event handlers to all "folders" below the given element @@ -218,24 +225,466 @@ var media_manager = { }, /** - * Insert the clicked image into the opener's textarea - * - * @author Andreas Gohr + * shows the popup for a image link */ select: function(event,link){ var id = link.name.substr(2); + media_manager.id = id; if(!opener){ // if we don't run in popup display example var ex = $('ex_'+id.replace(/:/g,'_')); if(ex.style.display == ''){ ex.style.display = 'none'; - }else{ + } else { ex.style.display = ''; } return false; } - opener.insertTags('wiki__text','{{'+id+'|','}}',''); + + media_manager.ext = false; + var dot = id.lastIndexOf("."); + if (dot != -1) { + var ext = id.substr(dot,id.length); + + if (ext != '.jpg' && ext != '.jpeg' && ext != '.png' && ext != '.gif' && ext != '.swf') { + media_manager.insert(null); + return false; + } + } else { + media_manager.insert(null); + return false; + } + + media_manager.popup.style.display = 'inline'; + media_manager.popup.style.left = event.pageX + 'px'; + media_manager.popup.style.top = event.pageY + 'px'; + + // set all buttons to outset + media_manager.outSet('media__linkbtn1'); + media_manager.outSet('media__linkbtn2'); + media_manager.outSet('media__linkbtn3'); + media_manager.outSet('media__linkbtn4'); + + media_manager.outSet('media__alignbtn0'); + media_manager.outSet('media__alignbtn1'); + media_manager.outSet('media__alignbtn2'); + media_manager.outSet('media__alignbtn3'); + + media_manager.outSet('media__sizebtn1'); + media_manager.outSet('media__sizebtn2'); + media_manager.outSet('media__sizebtn3'); + media_manager.outSet('media__sizebtn4'); + + + if (ext == '.swf') { + media_manager.ext = 'swf'; + + // disable display buttons for detail and linked image + $('media__linkbtn1').style.display = 'none'; + $('media__linkbtn2').style.display = 'none'; + + // set the link button to default + if (media_manager.link != false) { + if ( media_manager.link == '2' || media_manager.link == '1') { + media_manager.inSet('media__linkbtn3'); + media_manager.link = '3'; + DokuCookie.setValue('link','3'); + } else { + media_manager.inSet('media__linkbtn'+media_manager.link); + } + } else if (DokuCookie.getValue('link')) { + if ( DokuCookie.getValue('link') == '2' || DokuCookie.getValue('link') == '1') { + // this options are not availible + media_manager.inSet('media__linkbtn3'); + media_manager.link = '3'; + DokuCookie.setValue('link','3'); + } else { + media_manager.inSet('media__linkbtn'+DokuCookie.getValue('link')); + media_manager.link = DokuCookie.getValue('link'); + } + } else { + // default case + media_manager.link = '3'; + media_manager.inSet('media__linkbtn3'); + DokuCookie.setValue('link','3'); + } + + } else { + media_manager.ext = 'img'; + + // ensure that the display buttens are there + $('media__linkbtn1').style.display = 'inline'; + $('media__linkbtn2').style.display = 'inline'; + + // set the link button to default + if (media_manager.link != false) { + media_manager.inSet('media__linkbtn'+media_manager.link); + } else if (DokuCookie.getValue('link')) { + media_manager.inSet('media__linkbtn'+DokuCookie.getValue('link')); + media_manager.link = DokuCookie.getValue('link'); + } else { + // default case + media_manager.link = '1'; + media_manager.inSet('media__linkbtn1'); + DokuCookie.setValue('link','1'); + } + } + + if (media_manager.link == '4') { + media_manager.align = false; + media_manager.size = false; + $('media__align').style.display = 'none'; + $('media__size').style.display = 'none'; + } else { + $('media__align').style.display = 'block'; + $('media__size').style.display = 'block'; + + // set the align button to default + if (media_manager.align != false) { + media_manager.inSet('media__alignbtn'+media_manager.align); + } else if (DokuCookie.getValue('align')) { + media_manager.inSet('media__alignbtn'+DokuCookie.getValue('align')); + media_manager.align = DokuCookie.getValue('align'); + } else { + // default case + media_manager.align = '0'; + media_manager.inSet('media__alignbtn0'); + DokuCookie.setValue('align','0'); + } + + // set the size button to default + if (media_manager.size != false) { + media_manager.inSet('media__sizebtn'+media_manager.size); + } else if (DokuCookie.getValue('size')) { + media_manager.inSet('media__sizebtn'+DokuCookie.getValue('size')); + media_manager.size = DokuCookie.getValue('size'); + } else { + // default case + media_manager.size = '2'; + media_manager.inSet('media__sizebtn2'); + DokuCookie.setValue('size','2'); + } + + + $('media__sendbtn').focus(); + } + + return false; + }, + + /** + * build the popup window + * + * @author Dominik Eckelmann + */ + initpopup: function() { + + media_manager.popup = document.createElement('div'); + media_manager.popup.setAttribute('id','media__popup'); + + var root = document.getElementById('media__manager'); + if (root == null) return; + root.appendChild(media_manager.popup); + + var headline = document.createElement('h1'); + var headlineimg = document.createElement('img'); + var headtext = document.createElement('span'); + headlineimg.src = '/lib/images/close.png'; + headlineimg.id = 'media__closeimg'; + addEvent(headlineimg,'click',function(event){ return media_manager.closePopup(event,this); }); + headline.appendChild(headlineimg); + headtext.textContent = LANG['mediatitle']; + headline.appendChild(headtext); + media_manager.popup.appendChild(headline); + drag.attach(media_manager.popup,headline); + + // link + + var linkp = document.createElement('p'); + var linkl = document.createElement('label'); + var linkbtn1 = document.createElement('button'); + var linkbtn2 = document.createElement('button'); + var linkbtn3 = document.createElement('button'); + var linkbtn4 = document.createElement('button'); + var linkimg1 = document.createElement('img'); + var linkimg2 = document.createElement('img'); + var linkimg3 = document.createElement('img'); + var linkimg4 = document.createElement('img'); + + linkp.id = "media__linkstyle"; + if (media_manager.display == "2") { + linkp.style.display = "none"; + } + + linkp.appendChild(linkl); + linkp.appendChild(linkbtn1); + linkp.appendChild(linkbtn2); + linkp.appendChild(linkbtn3); + linkp.appendChild(linkbtn4); + + linkl.innerHTML = LANG['mediatarget']; + + linkimg1.src = '/lib/images/image_info.png'; + linkimg2.src = '/lib/images/image_link.png'; + linkimg3.src = '/lib/images/image.png'; + linkimg4.src = '/lib/images/link.png'; + + linkbtn1.setAttribute('class','button'); + linkbtn1.appendChild(linkimg1); + linkbtn1.value = '1'; + linkbtn1.id = "media__linkbtn1"; + linkbtn1.title = LANG['medialnk']; + linkbtn1.style.borderStyle = 'outset'; + addEvent(linkbtn1,'click',function(event){ return media_manager.setlink(event,this); }); + + linkbtn2.setAttribute('class','button'); + linkbtn2.appendChild(linkimg2); + linkbtn2.value = '2'; + linkbtn2.id = "media__linkbtn2"; + linkbtn2.title = LANG['mediadirect']; + linkbtn2.style.borderStyle = 'outset'; + addEvent(linkbtn2,'click',function(event){ return media_manager.setlink(event,this); }); + + linkbtn3.setAttribute('class','button'); + linkbtn3.appendChild(linkimg3); + linkbtn3.value = '3'; + linkbtn3.id = "media__linkbtn3"; + linkbtn3.title = LANG['medianolnk']; + linkbtn3.style.borderStyle = 'outset'; + addEvent(linkbtn3,'click',function(event){ return media_manager.setlink(event,this); }); + + linkbtn4.setAttribute('class','button'); + linkbtn4.appendChild(linkimg4); + linkbtn4.value = '4'; + linkbtn4.id = "media__linkbtn4"; + linkbtn4.title = LANG['mediadisplaylnk']; + linkbtn4.style.borderStyle = 'outset'; + addEvent(linkbtn4,'click',function(event){ return media_manager.setlink(event,this); }); + + media_manager.popup.appendChild(linkp); + + // align + + var alignp = document.createElement('p'); + var alignl = document.createElement('label'); + var alignbtn0 = document.createElement('button'); + var alignbtn1 = document.createElement('button'); + var alignbtn2 = document.createElement('button'); + var alignbtn3 = document.createElement('button'); + var alignimg0 = document.createElement('img'); + var alignimg1 = document.createElement('img'); + var alignimg2 = document.createElement('img'); + var alignimg3 = document.createElement('img'); + alignp.appendChild(alignl); + alignp.id = 'media__align'; + if (media_manager.display == "2") { + alignp.style.display = "none"; + } + + alignp.appendChild(alignbtn0); + alignp.appendChild(alignbtn1); + alignp.appendChild(alignbtn2); + alignp.appendChild(alignbtn3); + + alignl.innerHTML = LANG['mediaalign']; + + alignimg0.src = '/lib/images/text_align_left.png'; + alignimg1.src = '/lib/images/text_align_left.png'; + alignimg2.src = '/lib/images/text_align_center.png'; + alignimg3.src = '/lib/images/text_align_right.png'; + + alignbtn0.id = "media__alignbtn0"; + alignbtn0.value = '0'; + alignbtn0.title = LANG['medianoalign']; + alignbtn0.setAttribute('class','button'); + alignbtn0.appendChild(alignimg0); + alignbtn0.style.borderStyle = 'outset'; + addEvent(alignbtn0,'click',function(event){ return media_manager.setalign(event,this); }); + + alignbtn1.id = "media__alignbtn1"; + alignbtn1.value = '1'; + alignbtn1.title = LANG['medialeft']; + alignbtn1.setAttribute('class','button'); + alignbtn1.appendChild(alignimg1); + alignbtn1.style.borderStyle = 'outset'; + addEvent(alignbtn1,'click',function(event){ return media_manager.setalign(event,this); }); + + alignbtn2.value = '2'; + alignbtn2.id = "media__alignbtn2"; + alignbtn2.title = LANG['mediacenter']; + alignbtn2.setAttribute('class','button'); + alignbtn2.appendChild(alignimg2); + alignbtn2.style.borderStyle = 'outset'; + addEvent(alignbtn2,'click',function(event){ return media_manager.setalign(event,this); }); + + alignbtn3.value = '3'; + alignbtn3.id = "media__alignbtn3"; + alignbtn3.title = LANG['mediaright']; + alignbtn3.setAttribute('class','button'); + alignbtn3.appendChild(alignimg3); + alignbtn3.style.borderStyle = 'outset'; + addEvent(alignbtn3,'click',function(event){ return media_manager.setalign(event,this); }); + + media_manager.popup.appendChild(alignp); + + // size + + var sizep = document.createElement('p'); + var sizel = document.createElement('label'); + var sizebtn1 = document.createElement('button'); + var sizebtn2 = document.createElement('button'); + var sizebtn3 = document.createElement('button'); + var sizebtn4 = document.createElement('button'); + var sizeimg1 = document.createElement('img'); + var sizeimg2 = document.createElement('img'); + var sizeimg3 = document.createElement('img'); + var sizeimg4 = document.createElement('img'); + sizep.id = 'media__size'; + if (media_manager.display == "2") { + sizep.style.display = "none"; + } + + sizep.appendChild(sizel); + sizep.appendChild(sizebtn1); + sizep.appendChild(sizebtn2); + sizep.appendChild(sizebtn3); + sizep.appendChild(sizebtn4); + + sizel.innerHTML = LANG['mediasize']; + + sizeimg1.src = '/lib/images/magifier_zoom_out.png'; + sizeimg2.src = '/lib/images/magnifier.png'; + sizeimg3.src = '/lib/images/magnifier_zoom_in.png'; + sizeimg4.src = '/lib/images/magnifier_zoom_in.png'; + + sizebtn1.setAttribute('class','button'); + sizebtn1.appendChild(sizeimg1); + sizebtn1.value = '1'; + sizebtn1.id = 'media__sizebtn1'; + sizebtn1.title = LANG['mediasmall']; + sizebtn1.style.borderStyle = 'outset'; + addEvent(sizebtn1,'click',function(event){ return media_manager.setsize(event,this); }); + + sizebtn2.setAttribute('class','button'); + sizebtn2.appendChild(sizeimg2); + sizebtn2.value = '2'; + sizebtn2.id = 'media__sizebtn2'; + sizebtn2.title = LANG['mediamedium']; + sizebtn2.style.borderStyle = 'outset'; + addEvent(sizebtn2,'click',function(event){ return media_manager.setsize(event,this); }); + + sizebtn3.setAttribute('class','button'); + sizebtn3.appendChild(sizeimg3); + sizebtn3.value = '3'; + sizebtn3.id = 'media__sizebtn3'; + sizebtn3.title = LANG['medialarge']; + sizebtn3.style.borderStyle = 'outset'; + addEvent(sizebtn3,'click',function(event){ return media_manager.setsize(event,this); }); + + sizebtn4.setAttribute('class','button'); + sizebtn4.appendChild(sizeimg4); + sizebtn4.value = '4'; + sizebtn4.id = 'media__sizebtn4'; + sizebtn4.title = LANG['mediaextralarge']; + sizebtn4.style.borderStyle = 'outset'; + addEvent(sizebtn4,'click',function(event){ return media_manager.setsize(event,this); }); + + media_manager.popup.appendChild(sizep); + + // send and close button + + var btnp = document.createElement('p'); + media_manager.popup.appendChild(btnp); + btnp.setAttribute('class','btnlbl'); + + var cls = document.createElement('input'); + cls.type = 'button'; + cls.setAttribute('class','button'); + cls.value = LANG['mediaclose']; + btnp.appendChild(cls); + addEvent(cls,'click',function(event){ return media_manager.closePopup(event,this); }); + + var btn = document.createElement('input'); + btn.type = 'button'; + btn.id = 'media__sendbtn'; + btn.setAttribute('class','button'); + btn.value = LANG['mediainsert']; + btnp.appendChild(btn); + addEvent(btn,'click',function(event){ return media_manager.insert(event); }); + }, + + /** + * Insert the clicked image into the opener's textarea + * + * @author Andreas Gohr + * @author Dominik Eckelmann + */ + insert: function(event){ + var id = media_manager.id; + // set syntax options + $('media__popup').style.display = 'none'; + + var opts = ''; + var optsstart = ''; + var alignleft = ''; + var alignright = ''; + + if (media_manager.ext == 'img' || media_manager.ext == 'swf') { + + if (media_manager.link == '4') { + opts = '?linkonly'; + } else { + + if (media_manager.link == "3" && media_manager.ext == 'img') { + opts = '?nolink'; + optsstart = true; + } else if (media_manager.link == "2" && media_manager.ext == 'img') { + opts = '?direct'; + optsstart = true; + } + + var s = parseInt(media_manager.size); + + if (s && s >= 1) { + opts += (optsstart)?'&':'?'; + if (s=="1") { + opts += '100'; + if (media_manager.ext == 'swf') { + opts += 'x62'; + } + } else if (s=="2") { + opts += '200'; + if (media_manager.ext == 'swf') { + opts += 'x123'; + } + } else if (s=="3"){ + opts += '300'; + if (media_manager.ext == 'swf') { + opts += 'x185'; + } + } else if (s=="4") { + opts += '400'; + if (media_manager.ext == 'swf') { + opts += 'x247'; + } + } + } + if (media_manager.align == '1') { + alignleft = ''; + alignright = ' '; + } + if (media_manager.align == '2') { + alignleft = ' '; + alignright = ' '; + } + if (media_manager.align == '3') { + alignleft = ' '; + alignright = ''; + } + } + } + opener.insertTags('wiki__text','{{'+alignleft+id+opts+alignright+'|','}}',''); if(!media_manager.keepopen) window.close(); opener.focus(); @@ -340,6 +789,116 @@ var media_manager = { oflash.style.display = ''; }; oform.appendChild(clicky); + }, + + /** + * closes the link type popup + */ + closePopup: function(event) { + $('media__popup').style.display = 'none'; + }, + + /** + * set the align + * + * @author Dominik Eckelmann + */ + setalign: function(event,cb){ + if(cb.value){ + DokuCookie.setValue('align',cb.value); + media_manager.align = cb.value; + media_manager.outSet("media__alignbtn0"); + media_manager.outSet("media__alignbtn1"); + media_manager.outSet("media__alignbtn2"); + media_manager.outSet("media__alignbtn3"); + media_manager.inSet("media__alignbtn"+cb.value); + }else{ + DokuCookie.setValue('align',''); + media_manager.align = false; + } + }, + /** + * set the link type + * + * @author Dominik Eckelmann + */ + setlink: function(event,cb){ + if(cb.value){ + DokuCookie.setValue('link',cb.value); + media_manager.link = cb.value; + media_manager.outSet("media__linkbtn1"); + media_manager.outSet("media__linkbtn2"); + media_manager.outSet("media__linkbtn3"); + media_manager.outSet("media__linkbtn4"); + media_manager.inSet("media__linkbtn"+cb.value); + var size = document.getElementById("media__size"); + var align = document.getElementById("media__align"); + if (cb.value != '4') { + size.style.display = "block"; + align.style.display = "block"; + } else { + size.style.display = "none"; + align.style.display = "none"; + } + }else{ + DokuCookie.setValue('link',''); + media_manager.link = false; + } + }, + + /** + * set the display type + * + * @author Dominik Eckelmann + */ + setdisplay: function(event,cb){ + if(cb.value){ + DokuCookie.setValue('display',cb.value); + media_manager.display = cb.value; + media_manager.outSet("media__displaybtn1"); + media_manager.outSet("media__displaybtn2"); + media_manager.inSet("media__displaybtn"+cb.value); + + }else{ + DokuCookie.setValue('display',''); + media_manager.align = false; + } + }, + + /** + * sets the border to outset + */ + outSet: function(id) { + var ele = document.getElementById(id); + if (ele == null) return; + ele.style.borderStyle = "outset"; + }, + /** + * sets the border to inset + */ + inSet: function(id) { + var ele = document.getElementById(id); + if (ele == null) return; + ele.style.borderStyle = "inset"; + }, + + /** + * set the image size + * + * @author Dominik Eckelmann + */ + setsize: function(event,cb){ + if (cb.value) { + DokuCookie.setValue('size',cb.value); + media_manager.size = cb.value; + media_manager.outSet("media__sizebtn1"); + media_manager.outSet("media__sizebtn2"); + media_manager.outSet("media__sizebtn3"); + media_manager.inSet("media__sizebtn"+cb.value); + } else { + DokuCookie.setValue('size',''); + media_manager.width = false; + } } }; @@ -348,5 +907,8 @@ addInitEvent(function(){ media_manager.selectorattach($('media__content')); media_manager.confirmattach($('media__content')); media_manager.attachoptions($('media__opts')); + media_manager.initpopup(); media_manager.initFlashUpload(); }); + +// style nach linkwiz diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index 2831c984f..0bd70db3c 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -89,6 +89,99 @@ it's dirty, so any "real" fixes are welcome */ clear: left; } +/* --- popup --- */ + +#media__popup { + background-color:__background__; + display:none; + border: 1px solid __border__; + position: absolute; + width:270px; +} + +#media__popup h1 { + text-align:center; + font-weight:normal; + background-color: __background_alt__; + height: 16px; + margin-bottom: 5px; + font-size:12px; + border-bottom: 0; +} + +#media__popup p { + display:block; + line-height:14pt; + margin:0.5em; +} + +#media_nolink { + padding:4px 0; +} + +#media__popup label { + float:left; + width:9em; +} + +#media__popup .button { + margin-left:auto; + margin-right:auto; +} + +#media__popup .btnlbl { + text-align:center; +} + +#media__popup .btnlbl input { + margin:0 1em; +} + +#media__closeimg { + float:right; +} + +/* --- display options --- */ + +#media__linkopts label, +#media__nolnk { + width: 80px; + float: left; + margin-left: 10px; +} + +#media__linkopts label{ + line-height: 20px; +} + +#media__nolnk, +#media__linkopts label.long{ + margin-bottom: 8px; + line-height: 12px; +} + +#media__linkopts label.long{ + width: 150px; + float: none; +} + +#media__linkopts br { + clear: both; +} + +#media__linkopts select { + width: 60px; + margin-left: 10px; +} + +#media__linkopts input.edit { + width:50px; + margin-left:10px; +} +#media__linkopts #media__title { + width:150px; +} + /* --- file list --- */ #media__content img.load { -- cgit v1.2.3 From a8d2e40f2711896fc4704d00fdee5d3ba3a3f592 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 18 Feb 2010 12:16:16 +0100 Subject: images for media popup --- lib/images/image.png | Bin 0 -> 516 bytes lib/images/image_info.png | Bin 0 -> 651 bytes lib/images/image_link.png | Bin 0 -> 773 bytes lib/images/link.png | Bin 0 -> 343 bytes lib/images/link_break.png | Bin 0 -> 657 bytes lib/images/link_go.png | Bin 0 -> 655 bytes lib/images/magifier_zoom_out.png | Bin 0 -> 657 bytes lib/images/magnifier_zoom_in.png | Bin 0 -> 680 bytes lib/images/text_align_center.png | Bin 0 -> 234 bytes lib/images/text_align_left.png | Bin 0 -> 209 bytes lib/images/text_align_right.png | Bin 0 -> 209 bytes 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/images/image.png create mode 100644 lib/images/image_info.png create mode 100644 lib/images/image_link.png create mode 100644 lib/images/link.png create mode 100644 lib/images/link_break.png create mode 100644 lib/images/link_go.png create mode 100644 lib/images/magifier_zoom_out.png create mode 100644 lib/images/magnifier_zoom_in.png create mode 100644 lib/images/text_align_center.png create mode 100644 lib/images/text_align_left.png create mode 100644 lib/images/text_align_right.png (limited to 'lib') diff --git a/lib/images/image.png b/lib/images/image.png new file mode 100644 index 000000000..fc3c393ca Binary files /dev/null and b/lib/images/image.png differ diff --git a/lib/images/image_info.png b/lib/images/image_info.png new file mode 100644 index 000000000..1209164ca Binary files /dev/null and b/lib/images/image_info.png differ diff --git a/lib/images/image_link.png b/lib/images/image_link.png new file mode 100644 index 000000000..4bdb3541e Binary files /dev/null and b/lib/images/image_link.png differ diff --git a/lib/images/link.png b/lib/images/link.png new file mode 100644 index 000000000..25eacb7c2 Binary files /dev/null and b/lib/images/link.png differ diff --git a/lib/images/link_break.png b/lib/images/link_break.png new file mode 100644 index 000000000..523575306 Binary files /dev/null and b/lib/images/link_break.png differ diff --git a/lib/images/link_go.png b/lib/images/link_go.png new file mode 100644 index 000000000..ae8cae806 Binary files /dev/null and b/lib/images/link_go.png differ diff --git a/lib/images/magifier_zoom_out.png b/lib/images/magifier_zoom_out.png new file mode 100644 index 000000000..81f28199a Binary files /dev/null and b/lib/images/magifier_zoom_out.png differ diff --git a/lib/images/magnifier_zoom_in.png b/lib/images/magnifier_zoom_in.png new file mode 100644 index 000000000..af4fe0747 Binary files /dev/null and b/lib/images/magnifier_zoom_in.png differ diff --git a/lib/images/text_align_center.png b/lib/images/text_align_center.png new file mode 100644 index 000000000..57beb3813 Binary files /dev/null and b/lib/images/text_align_center.png differ diff --git a/lib/images/text_align_left.png b/lib/images/text_align_left.png new file mode 100644 index 000000000..6c8fcc116 Binary files /dev/null and b/lib/images/text_align_left.png differ diff --git a/lib/images/text_align_right.png b/lib/images/text_align_right.png new file mode 100644 index 000000000..a1502571c Binary files /dev/null and b/lib/images/text_align_right.png differ -- cgit v1.2.3 From 7b63547fc03ef0df23ae8c4bb61e3da41500149b Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 19 Feb 2010 14:58:22 +0100 Subject: =?UTF-8?q?Rewrite=20mediamanager=20options=E2=80=99=20JavaScript,?= =?UTF-8?q?=20new=20icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/images/image.png | Bin 516 -> 0 bytes lib/images/image_info.png | Bin 651 -> 0 bytes lib/images/image_link.png | Bin 773 -> 0 bytes lib/images/link.png | Bin 343 -> 0 bytes lib/images/link_break.png | Bin 657 -> 0 bytes lib/images/link_go.png | Bin 655 -> 0 bytes lib/images/magifier_zoom_out.png | Bin 657 -> 0 bytes lib/images/magnifier_zoom_in.png | Bin 680 -> 0 bytes lib/images/media_align_center.png | Bin 0 -> 294 bytes lib/images/media_align_left.png | Bin 0 -> 312 bytes lib/images/media_align_noalign.png | Bin 0 -> 269 bytes lib/images/media_align_right.png | Bin 0 -> 312 bytes lib/images/media_link_direct.png | Bin 0 -> 773 bytes lib/images/media_link_displaylnk.png | Bin 0 -> 343 bytes lib/images/media_link_lnk.png | Bin 0 -> 651 bytes lib/images/media_link_nolnk.png | Bin 0 -> 516 bytes lib/images/media_size_large.png | Bin 0 -> 153 bytes lib/images/media_size_medium.png | Bin 0 -> 296 bytes lib/images/media_size_original.png | Bin 0 -> 312 bytes lib/images/media_size_small.png | Bin 0 -> 305 bytes lib/images/text_align_center.png | Bin 234 -> 0 bytes lib/images/text_align_left.png | Bin 209 -> 0 bytes lib/images/text_align_right.png | Bin 209 -> 0 bytes lib/scripts/media.js | 227 ++++++++++------------------------- lib/tpl/default/_mediaoptions.css | 92 ++++++++++++++ lib/tpl/default/media.css | 93 -------------- lib/tpl/default/style.ini | 1 + 27 files changed, 155 insertions(+), 258 deletions(-) delete mode 100644 lib/images/image.png delete mode 100644 lib/images/image_info.png delete mode 100644 lib/images/image_link.png delete mode 100644 lib/images/link.png delete mode 100644 lib/images/link_break.png delete mode 100644 lib/images/link_go.png delete mode 100644 lib/images/magifier_zoom_out.png delete mode 100644 lib/images/magnifier_zoom_in.png create mode 100644 lib/images/media_align_center.png create mode 100644 lib/images/media_align_left.png create mode 100644 lib/images/media_align_noalign.png create mode 100644 lib/images/media_align_right.png create mode 100644 lib/images/media_link_direct.png create mode 100644 lib/images/media_link_displaylnk.png create mode 100644 lib/images/media_link_lnk.png create mode 100644 lib/images/media_link_nolnk.png create mode 100644 lib/images/media_size_large.png create mode 100644 lib/images/media_size_medium.png create mode 100644 lib/images/media_size_original.png create mode 100644 lib/images/media_size_small.png delete mode 100644 lib/images/text_align_center.png delete mode 100644 lib/images/text_align_left.png delete mode 100644 lib/images/text_align_right.png create mode 100644 lib/tpl/default/_mediaoptions.css (limited to 'lib') diff --git a/lib/images/image.png b/lib/images/image.png deleted file mode 100644 index fc3c393ca..000000000 Binary files a/lib/images/image.png and /dev/null differ diff --git a/lib/images/image_info.png b/lib/images/image_info.png deleted file mode 100644 index 1209164ca..000000000 Binary files a/lib/images/image_info.png and /dev/null differ diff --git a/lib/images/image_link.png b/lib/images/image_link.png deleted file mode 100644 index 4bdb3541e..000000000 Binary files a/lib/images/image_link.png and /dev/null differ diff --git a/lib/images/link.png b/lib/images/link.png deleted file mode 100644 index 25eacb7c2..000000000 Binary files a/lib/images/link.png and /dev/null differ diff --git a/lib/images/link_break.png b/lib/images/link_break.png deleted file mode 100644 index 523575306..000000000 Binary files a/lib/images/link_break.png and /dev/null differ diff --git a/lib/images/link_go.png b/lib/images/link_go.png deleted file mode 100644 index ae8cae806..000000000 Binary files a/lib/images/link_go.png and /dev/null differ diff --git a/lib/images/magifier_zoom_out.png b/lib/images/magifier_zoom_out.png deleted file mode 100644 index 81f28199a..000000000 Binary files a/lib/images/magifier_zoom_out.png and /dev/null differ diff --git a/lib/images/magnifier_zoom_in.png b/lib/images/magnifier_zoom_in.png deleted file mode 100644 index af4fe0747..000000000 Binary files a/lib/images/magnifier_zoom_in.png and /dev/null differ diff --git a/lib/images/media_align_center.png b/lib/images/media_align_center.png new file mode 100644 index 000000000..3db90fc17 Binary files /dev/null and b/lib/images/media_align_center.png differ diff --git a/lib/images/media_align_left.png b/lib/images/media_align_left.png new file mode 100644 index 000000000..cebbb1a9a Binary files /dev/null and b/lib/images/media_align_left.png differ diff --git a/lib/images/media_align_noalign.png b/lib/images/media_align_noalign.png new file mode 100644 index 000000000..74f34e5f1 Binary files /dev/null and b/lib/images/media_align_noalign.png differ diff --git a/lib/images/media_align_right.png b/lib/images/media_align_right.png new file mode 100644 index 000000000..5f54a4a49 Binary files /dev/null and b/lib/images/media_align_right.png differ diff --git a/lib/images/media_link_direct.png b/lib/images/media_link_direct.png new file mode 100644 index 000000000..4bdb3541e Binary files /dev/null and b/lib/images/media_link_direct.png differ diff --git a/lib/images/media_link_displaylnk.png b/lib/images/media_link_displaylnk.png new file mode 100644 index 000000000..25eacb7c2 Binary files /dev/null and b/lib/images/media_link_displaylnk.png differ diff --git a/lib/images/media_link_lnk.png b/lib/images/media_link_lnk.png new file mode 100644 index 000000000..1209164ca Binary files /dev/null and b/lib/images/media_link_lnk.png differ diff --git a/lib/images/media_link_nolnk.png b/lib/images/media_link_nolnk.png new file mode 100644 index 000000000..fc3c393ca Binary files /dev/null and b/lib/images/media_link_nolnk.png differ diff --git a/lib/images/media_size_large.png b/lib/images/media_size_large.png new file mode 100644 index 000000000..e2fb548d9 Binary files /dev/null and b/lib/images/media_size_large.png differ diff --git a/lib/images/media_size_medium.png b/lib/images/media_size_medium.png new file mode 100644 index 000000000..b33157256 Binary files /dev/null and b/lib/images/media_size_medium.png differ diff --git a/lib/images/media_size_original.png b/lib/images/media_size_original.png new file mode 100644 index 000000000..d179aa2db Binary files /dev/null and b/lib/images/media_size_original.png differ diff --git a/lib/images/media_size_small.png b/lib/images/media_size_small.png new file mode 100644 index 000000000..04efe7080 Binary files /dev/null and b/lib/images/media_size_small.png differ diff --git a/lib/images/text_align_center.png b/lib/images/text_align_center.png deleted file mode 100644 index 57beb3813..000000000 Binary files a/lib/images/text_align_center.png and /dev/null differ diff --git a/lib/images/text_align_left.png b/lib/images/text_align_left.png deleted file mode 100644 index 6c8fcc116..000000000 Binary files a/lib/images/text_align_left.png and /dev/null differ diff --git a/lib/images/text_align_right.png b/lib/images/text_align_right.png deleted file mode 100644 index a1502571c..000000000 Binary files a/lib/images/text_align_right.png and /dev/null differ diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 3f0a8fb65..599dbbdfa 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -259,7 +259,7 @@ var media_manager = { media_manager.popup.style.display = 'inline'; media_manager.popup.style.left = event.pageX + 'px'; media_manager.popup.style.top = event.pageY + 'px'; - + // set all buttons to outset media_manager.outSet('media__linkbtn1'); media_manager.outSet('media__linkbtn2'); @@ -270,7 +270,7 @@ var media_manager = { media_manager.outSet('media__alignbtn1'); media_manager.outSet('media__alignbtn2'); media_manager.outSet('media__alignbtn3'); - + media_manager.outSet('media__sizebtn1'); media_manager.outSet('media__sizebtn2'); media_manager.outSet('media__sizebtn3'); @@ -388,79 +388,44 @@ var media_manager = { root.appendChild(media_manager.popup); var headline = document.createElement('h1'); + headline.innerHTML = LANG.mediatitle; var headlineimg = document.createElement('img'); - var headtext = document.createElement('span'); - headlineimg.src = '/lib/images/close.png'; + headlineimg.src = DOKU_BASE + 'lib/images/close.png'; headlineimg.id = 'media__closeimg'; addEvent(headlineimg,'click',function(event){ return media_manager.closePopup(event,this); }); - headline.appendChild(headlineimg); - headtext.textContent = LANG['mediatitle']; - headline.appendChild(headtext); + headline.insertBefore(headlineimg, headline.firstChild); media_manager.popup.appendChild(headline); drag.attach(media_manager.popup,headline); // link - var linkp = document.createElement('p'); - var linkl = document.createElement('label'); - var linkbtn1 = document.createElement('button'); - var linkbtn2 = document.createElement('button'); - var linkbtn3 = document.createElement('button'); - var linkbtn4 = document.createElement('button'); - var linkimg1 = document.createElement('img'); - var linkimg2 = document.createElement('img'); - var linkimg3 = document.createElement('img'); - var linkimg4 = document.createElement('img'); + var linkp = document.createElement('p'); linkp.id = "media__linkstyle"; if (media_manager.display == "2") { linkp.style.display = "none"; } + var linkl = document.createElement('label'); + linkl.innerHTML = LANG.mediatarget; linkp.appendChild(linkl); - linkp.appendChild(linkbtn1); - linkp.appendChild(linkbtn2); - linkp.appendChild(linkbtn3); - linkp.appendChild(linkbtn4); - - linkl.innerHTML = LANG['mediatarget']; - - linkimg1.src = '/lib/images/image_info.png'; - linkimg2.src = '/lib/images/image_link.png'; - linkimg3.src = '/lib/images/image.png'; - linkimg4.src = '/lib/images/link.png'; - - linkbtn1.setAttribute('class','button'); - linkbtn1.appendChild(linkimg1); - linkbtn1.value = '1'; - linkbtn1.id = "media__linkbtn1"; - linkbtn1.title = LANG['medialnk']; - linkbtn1.style.borderStyle = 'outset'; - addEvent(linkbtn1,'click',function(event){ return media_manager.setlink(event,this); }); - - linkbtn2.setAttribute('class','button'); - linkbtn2.appendChild(linkimg2); - linkbtn2.value = '2'; - linkbtn2.id = "media__linkbtn2"; - linkbtn2.title = LANG['mediadirect']; - linkbtn2.style.borderStyle = 'outset'; - addEvent(linkbtn2,'click',function(event){ return media_manager.setlink(event,this); }); - - linkbtn3.setAttribute('class','button'); - linkbtn3.appendChild(linkimg3); - linkbtn3.value = '3'; - linkbtn3.id = "media__linkbtn3"; - linkbtn3.title = LANG['medianolnk']; - linkbtn3.style.borderStyle = 'outset'; - addEvent(linkbtn3,'click',function(event){ return media_manager.setlink(event,this); }); - - linkbtn4.setAttribute('class','button'); - linkbtn4.appendChild(linkimg4); - linkbtn4.value = '4'; - linkbtn4.id = "media__linkbtn4"; - linkbtn4.title = LANG['mediadisplaylnk']; - linkbtn4.style.borderStyle = 'outset'; - addEvent(linkbtn4,'click',function(event){ return media_manager.setlink(event,this); }); + + var linkbtns = ['lnk', 'direct', 'nolnk', 'displaylnk']; + for (var i = 0 ; i < linkbtns.length ; ++i) { + var linkbtn = document.createElement('button'); + linkbtn.className = 'button'; + linkbtn.value = i + 1; + linkbtn.id = "media__linkbtn" + (i + 1); + linkbtn.title = LANG['media' + linkbtns[i]]; + linkbtn.style.borderStyle = 'outset'; + addEvent(linkbtn,'click',function(event){ return media_manager.setlink(event,this); }); + + var linkimg = document.createElement('img'); + linkimg.src = DOKU_BASE + 'lib/images/media_link_' + linkbtns[i] + '.png'; + + linkbtn.appendChild(linkimg); + linkp.appendChild(linkbtn); + } media_manager.popup.appendChild(linkp); @@ -468,63 +433,30 @@ var media_manager = { var alignp = document.createElement('p'); var alignl = document.createElement('label'); - var alignbtn0 = document.createElement('button'); - var alignbtn1 = document.createElement('button'); - var alignbtn2 = document.createElement('button'); - var alignbtn3 = document.createElement('button'); - var alignimg0 = document.createElement('img'); - var alignimg1 = document.createElement('img'); - var alignimg2 = document.createElement('img'); - var alignimg3 = document.createElement('img'); + alignp.appendChild(alignl); alignp.id = 'media__align'; if (media_manager.display == "2") { alignp.style.display = "none"; } - - alignp.appendChild(alignbtn0); - alignp.appendChild(alignbtn1); - alignp.appendChild(alignbtn2); - alignp.appendChild(alignbtn3); - alignl.innerHTML = LANG['mediaalign']; - alignimg0.src = '/lib/images/text_align_left.png'; - alignimg1.src = '/lib/images/text_align_left.png'; - alignimg2.src = '/lib/images/text_align_center.png'; - alignimg3.src = '/lib/images/text_align_right.png'; - - alignbtn0.id = "media__alignbtn0"; - alignbtn0.value = '0'; - alignbtn0.title = LANG['medianoalign']; - alignbtn0.setAttribute('class','button'); - alignbtn0.appendChild(alignimg0); - alignbtn0.style.borderStyle = 'outset'; - addEvent(alignbtn0,'click',function(event){ return media_manager.setalign(event,this); }); - - alignbtn1.id = "media__alignbtn1"; - alignbtn1.value = '1'; - alignbtn1.title = LANG['medialeft']; - alignbtn1.setAttribute('class','button'); - alignbtn1.appendChild(alignimg1); - alignbtn1.style.borderStyle = 'outset'; - addEvent(alignbtn1,'click',function(event){ return media_manager.setalign(event,this); }); - - alignbtn2.value = '2'; - alignbtn2.id = "media__alignbtn2"; - alignbtn2.title = LANG['mediacenter']; - alignbtn2.setAttribute('class','button'); - alignbtn2.appendChild(alignimg2); - alignbtn2.style.borderStyle = 'outset'; - addEvent(alignbtn2,'click',function(event){ return media_manager.setalign(event,this); }); - - alignbtn3.value = '3'; - alignbtn3.id = "media__alignbtn3"; - alignbtn3.title = LANG['mediaright']; - alignbtn3.setAttribute('class','button'); - alignbtn3.appendChild(alignimg3); - alignbtn3.style.borderStyle = 'outset'; - addEvent(alignbtn3,'click',function(event){ return media_manager.setalign(event,this); }); + var alignbtns = ['noalign', 'left', 'center', 'right']; + for (var n = 0 ; n < alignbtns.length ; ++n) { + var alignbtn = document.createElement('button'); + var alignimg = document.createElement('img'); + alignimg.src = DOKU_BASE + 'lib/images/media_align_' + alignbtns[n] + '.png'; + + alignbtn.id = "media__alignbtn" + n; + alignbtn.value = n; + alignbtn.title = LANG['media' + alignbtns[n]]; + alignbtn.className = 'button'; + alignbtn.appendChild(alignimg); + alignbtn.style.borderStyle = 'outset'; + addEvent(alignbtn,'click',function(event){ return media_manager.setalign(event,this); }); + + alignp.appendChild(alignbtn); + } media_manager.popup.appendChild(alignp); @@ -532,63 +464,30 @@ var media_manager = { var sizep = document.createElement('p'); var sizel = document.createElement('label'); - var sizebtn1 = document.createElement('button'); - var sizebtn2 = document.createElement('button'); - var sizebtn3 = document.createElement('button'); - var sizebtn4 = document.createElement('button'); - var sizeimg1 = document.createElement('img'); - var sizeimg2 = document.createElement('img'); - var sizeimg3 = document.createElement('img'); - var sizeimg4 = document.createElement('img'); + sizep.id = 'media__size'; if (media_manager.display == "2") { sizep.style.display = "none"; } - sizep.appendChild(sizel); - sizep.appendChild(sizebtn1); - sizep.appendChild(sizebtn2); - sizep.appendChild(sizebtn3); - sizep.appendChild(sizebtn4); - sizel.innerHTML = LANG['mediasize']; - sizeimg1.src = '/lib/images/magifier_zoom_out.png'; - sizeimg2.src = '/lib/images/magnifier.png'; - sizeimg3.src = '/lib/images/magnifier_zoom_in.png'; - sizeimg4.src = '/lib/images/magnifier_zoom_in.png'; - - sizebtn1.setAttribute('class','button'); - sizebtn1.appendChild(sizeimg1); - sizebtn1.value = '1'; - sizebtn1.id = 'media__sizebtn1'; - sizebtn1.title = LANG['mediasmall']; - sizebtn1.style.borderStyle = 'outset'; - addEvent(sizebtn1,'click',function(event){ return media_manager.setsize(event,this); }); - - sizebtn2.setAttribute('class','button'); - sizebtn2.appendChild(sizeimg2); - sizebtn2.value = '2'; - sizebtn2.id = 'media__sizebtn2'; - sizebtn2.title = LANG['mediamedium']; - sizebtn2.style.borderStyle = 'outset'; - addEvent(sizebtn2,'click',function(event){ return media_manager.setsize(event,this); }); - - sizebtn3.setAttribute('class','button'); - sizebtn3.appendChild(sizeimg3); - sizebtn3.value = '3'; - sizebtn3.id = 'media__sizebtn3'; - sizebtn3.title = LANG['medialarge']; - sizebtn3.style.borderStyle = 'outset'; - addEvent(sizebtn3,'click',function(event){ return media_manager.setsize(event,this); }); - - sizebtn4.setAttribute('class','button'); - sizebtn4.appendChild(sizeimg4); - sizebtn4.value = '4'; - sizebtn4.id = 'media__sizebtn4'; - sizebtn4.title = LANG['mediaextralarge']; - sizebtn4.style.borderStyle = 'outset'; - addEvent(sizebtn4,'click',function(event){ return media_manager.setsize(event,this); }); + var sizebtns = ['small', 'medium', 'large', 'original']; + for (var size = 0 ; size < sizebtns.length ; ++size) { + var sizebtn = document.createElement('button'); + var sizeimg = document.createElement('img'); + + sizep.appendChild(sizebtn); + sizeimg.src = DOKU_BASE + 'lib/images/media_size_' + sizebtns[size] + '.png'; + + sizebtn.className = 'button'; + sizebtn.appendChild(sizeimg); + sizebtn.value = size + 1; + sizebtn.id = 'media__sizebtn' + (size + 1); + sizebtn.title = LANG['media' + sizebtns[size]]; + sizebtn.style.borderStyle = 'outset'; + addEvent(sizebtn,'click',function(event){ return media_manager.setsize(event,this); }); + } media_manager.popup.appendChild(sizep); @@ -891,9 +790,9 @@ var media_manager = { if (cb.value) { DokuCookie.setValue('size',cb.value); media_manager.size = cb.value; - media_manager.outSet("media__sizebtn1"); - media_manager.outSet("media__sizebtn2"); - media_manager.outSet("media__sizebtn3"); + for (var i = 1 ; i <= 4 ; ++i) { + media_manager.outSet("media__sizebtn" + i); + } media_manager.inSet("media__sizebtn"+cb.value); } else { DokuCookie.setValue('size',''); @@ -910,5 +809,3 @@ addInitEvent(function(){ media_manager.initpopup(); media_manager.initFlashUpload(); }); - -// style nach linkwiz diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css new file mode 100644 index 000000000..7ac489929 --- /dev/null +++ b/lib/tpl/default/_mediaoptions.css @@ -0,0 +1,92 @@ +/* --- popup --- */ + +#media__popup { + background-color:__background__; + display:none; + border: 1px solid __border__; + position: absolute; + width:270px; +} + +#media__popup h1 { + text-align:center; + font-weight:normal; + background-color: __background_alt__; + height: 16px; + margin-bottom: 5px; + font-size:12px; + border-bottom: 0; +} + +#media__popup p { + display:block; + line-height:14pt; + margin:0.5em; +} + +#media_nolink { + padding:4px 0; +} + +#media__popup label { + float:left; + width:9em; +} + +#media__popup .button { + margin-left:auto; + margin-right:auto; +} + +#media__popup .btnlbl { + text-align:center; +} + +#media__popup .btnlbl input { + margin:0 1em; +} + +#media__closeimg { + float:right; +} + +/* --- display options --- */ + +#media__linkopts label, +#media__nolnk { + width: 80px; + float: left; + margin-left: 10px; +} + +#media__linkopts label{ + line-height: 20px; +} + +#media__nolnk, +#media__linkopts label.long{ + margin-bottom: 8px; + line-height: 12px; +} + +#media__linkopts label.long{ + width: 150px; + float: none; +} + +#media__linkopts br { + clear: both; +} + +#media__linkopts select { + width: 60px; + margin-left: 10px; +} + +#media__linkopts input.edit { + width:50px; + margin-left:10px; +} +#media__linkopts #media__title { + width:150px; +} diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index 0bd70db3c..2831c984f 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -89,99 +89,6 @@ it's dirty, so any "real" fixes are welcome */ clear: left; } -/* --- popup --- */ - -#media__popup { - background-color:__background__; - display:none; - border: 1px solid __border__; - position: absolute; - width:270px; -} - -#media__popup h1 { - text-align:center; - font-weight:normal; - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; - font-size:12px; - border-bottom: 0; -} - -#media__popup p { - display:block; - line-height:14pt; - margin:0.5em; -} - -#media_nolink { - padding:4px 0; -} - -#media__popup label { - float:left; - width:9em; -} - -#media__popup .button { - margin-left:auto; - margin-right:auto; -} - -#media__popup .btnlbl { - text-align:center; -} - -#media__popup .btnlbl input { - margin:0 1em; -} - -#media__closeimg { - float:right; -} - -/* --- display options --- */ - -#media__linkopts label, -#media__nolnk { - width: 80px; - float: left; - margin-left: 10px; -} - -#media__linkopts label{ - line-height: 20px; -} - -#media__nolnk, -#media__linkopts label.long{ - margin-bottom: 8px; - line-height: 12px; -} - -#media__linkopts label.long{ - width: 150px; - float: none; -} - -#media__linkopts br { - clear: both; -} - -#media__linkopts select { - width: 60px; - margin-left: 10px; -} - -#media__linkopts input.edit { - width:50px; - margin-left:10px; -} -#media__linkopts #media__title { - width:150px; -} - /* --- file list --- */ #media__content img.load { diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index 84d04e743..c5b2c31a5 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -11,6 +11,7 @@ design.css = screen style.css = screen media.css = screen +_mediaoptions.css = screen _admin.css = screen _linkwiz.css = screen _subscription.css = screen -- cgit v1.2.3 From 1410ed4b6ef86f5fcd267682eae03c9aece3346f Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 2 Mar 2010 10:32:27 +0100 Subject: =?UTF-8?q?Provide=20=E2=80=BAoriginal=20size=E2=80=B9=20media=20i?= =?UTF-8?q?nsertion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/scripts/media.js | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 599dbbdfa..f14db63d7 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -310,25 +310,27 @@ var media_manager = { DokuCookie.setValue('link','3'); } + // disable button for original size + $('media__sizebtn4').style.display = 'none'; + } else { media_manager.ext = 'img'; - // ensure that the display buttens are there + // ensure that the display buttons are there $('media__linkbtn1').style.display = 'inline'; $('media__linkbtn2').style.display = 'inline'; + $('media__sizebtn4').style.display = 'inline'; // set the link button to default - if (media_manager.link != false) { - media_manager.inSet('media__linkbtn'+media_manager.link); - } else if (DokuCookie.getValue('link')) { - media_manager.inSet('media__linkbtn'+DokuCookie.getValue('link')); + if (DokuCookie.getValue('link')) { media_manager.link = DokuCookie.getValue('link'); - } else { + } + if (media_manager.link == false) { // default case media_manager.link = '1'; - media_manager.inSet('media__linkbtn1'); DokuCookie.setValue('link','1'); } + media_manager.inSet('media__linkbtn'+media_manager.link); } if (media_manager.link == '4') { @@ -354,18 +356,15 @@ var media_manager = { } // set the size button to default - if (media_manager.size != false) { - media_manager.inSet('media__sizebtn'+media_manager.size); - } else if (DokuCookie.getValue('size')) { - media_manager.inSet('media__sizebtn'+DokuCookie.getValue('size')); + if (DokuCookie.getValue('size')) { media_manager.size = DokuCookie.getValue('size'); - } else { + } + if (media_manager.size == false || (media_manager.size === '4' && ext === '.swf')) { // default case media_manager.size = '2'; - media_manager.inSet('media__sizebtn2'); DokuCookie.setValue('size','2'); } - + media_manager.inSet('media__sizebtn'+media_manager.size); $('media__sendbtn').focus(); } @@ -562,11 +561,6 @@ var media_manager = { if (media_manager.ext == 'swf') { opts += 'x185'; } - } else if (s=="4") { - opts += '400'; - if (media_manager.ext == 'swf') { - opts += 'x247'; - } } } if (media_manager.align == '1') { -- cgit v1.2.3 From 63de0a583d1ce8c88c5362eecd0fc5ecd8c411a4 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 2 Mar 2010 14:30:37 +0100 Subject: =?UTF-8?q?Fix=20pageX=20and=20pageY=20in=20IE=E2=80=99s=20JS=20ev?= =?UTF-8?q?ents?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/scripts/drag.js | 22 ++++------------------ lib/scripts/events.js | 4 ++++ 2 files changed, 8 insertions(+), 18 deletions(-) (limited to 'lib') diff --git a/lib/scripts/drag.js b/lib/scripts/drag.js index fa249a996..254eab4a6 100644 --- a/lib/scripts/drag.js +++ b/lib/scripts/drag.js @@ -50,8 +50,8 @@ var drag = { this.oX = parseInt(this.obj.style.left); this.oY = parseInt(this.obj.style.top); - this.eX = drag.evX(e); - this.eY = drag.evY(e); + this.eX = e.pageX; + this.eY = e.pageY; var _this = this; this.mousehandlers = [function (e) {return _this.drag(e);}, function (e) {return _this.stop(e);}]; @@ -80,23 +80,9 @@ var drag = { */ drag: function(e) { if(this.obj) { - this.obj.style.top = (this.evY(e)+this.oY-this.eY+'px'); - this.obj.style.left = (this.evX(e)+this.oX-this.eX+'px'); + this.obj.style.top = (e.pageY+this.oY-this.eY+'px'); + this.obj.style.left = (e.pageX+this.oX-this.eX+'px'); } }, - /** - * Returns the X position of the given event. - */ - evX: function(e){ - return (e.pageX) ? e.pageX : e.clientX + document.body.scrollTop; //fixme shouldn't this be scrollLeft? - }, - - /** - * Returns the Y position of the given event. - */ - evY: function(e){ - return (e.pageY) ? e.pageY : e.clientY + document.body.scrollTop; - } - }; diff --git a/lib/scripts/events.js b/lib/scripts/events.js index e7526ced7..2ea619085 100644 --- a/lib/scripts/events.js +++ b/lib/scripts/events.js @@ -55,6 +55,10 @@ function fixEvent(event) { event.stopPropagation = fixEvent.stopPropagation; // fix target event.target = event.srcElement; + // fix coords + event.pageX = (typeof event.pageX !== 'undefined') ? event.pageX : event.clientX + document.body.scrollTop; + event.pageY = (typeof event.pageY !== 'undefined') ? event.pageY : event.clientY + document.body.scrollTop; + return event; }; fixEvent.preventDefault = function() { -- cgit v1.2.3 From 7caaf84c91ff684b186dec09e921d319b64ec0e1 Mon Sep 17 00:00:00 2001 From: Leonard Elezi Date: Tue, 2 Mar 2010 20:02:00 +0100 Subject: Albanian translation added --- lib/plugins/acl/lang/sq/help.txt | 11 ++ lib/plugins/acl/lang/sq/lang.php | 34 ++++++ lib/plugins/config/lang/sq/intro.txt | 7 ++ lib/plugins/config/lang/sq/lang.php | 180 ++++++++++++++++++++++++++++ lib/plugins/plugin/lang/sq/admin_plugin.txt | 3 + lib/plugins/plugin/lang/sq/lang.php | 50 ++++++++ lib/plugins/popularity/lang/sq/intro.txt | 9 ++ lib/plugins/popularity/lang/sq/lang.php | 8 ++ lib/plugins/revert/lang/sq/intro.txt | 3 + lib/plugins/revert/lang/sq/lang.php | 15 +++ lib/plugins/usermanager/lang/sq/add.txt | 1 + lib/plugins/usermanager/lang/sq/delete.txt | 1 + lib/plugins/usermanager/lang/sq/edit.txt | 1 + lib/plugins/usermanager/lang/sq/intro.txt | 1 + lib/plugins/usermanager/lang/sq/lang.php | 48 ++++++++ lib/plugins/usermanager/lang/sq/list.txt | 1 + 16 files changed, 373 insertions(+) create mode 100644 lib/plugins/acl/lang/sq/help.txt create mode 100644 lib/plugins/acl/lang/sq/lang.php create mode 100644 lib/plugins/config/lang/sq/intro.txt create mode 100644 lib/plugins/config/lang/sq/lang.php create mode 100644 lib/plugins/plugin/lang/sq/admin_plugin.txt create mode 100644 lib/plugins/plugin/lang/sq/lang.php create mode 100644 lib/plugins/popularity/lang/sq/intro.txt create mode 100644 lib/plugins/popularity/lang/sq/lang.php create mode 100644 lib/plugins/revert/lang/sq/intro.txt create mode 100644 lib/plugins/revert/lang/sq/lang.php create mode 100644 lib/plugins/usermanager/lang/sq/add.txt create mode 100644 lib/plugins/usermanager/lang/sq/delete.txt create mode 100644 lib/plugins/usermanager/lang/sq/edit.txt create mode 100644 lib/plugins/usermanager/lang/sq/intro.txt create mode 100644 lib/plugins/usermanager/lang/sq/lang.php create mode 100644 lib/plugins/usermanager/lang/sq/list.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/sq/help.txt b/lib/plugins/acl/lang/sq/help.txt new file mode 100644 index 000000000..84a567f8b --- /dev/null +++ b/lib/plugins/acl/lang/sq/help.txt @@ -0,0 +1,11 @@ +=== Ndihmë e Shpejtë: === + +Në këtë faqe mund të shtoni ose hiqni të drejta për hapësira emri dhe faqe në wiki-n tuaj. + +Paneli i majtë tregon të gjitha faqet dhe hapësirat e emrit të disponueshme. + +Forma më sipër ju lejon të shihni dhe ndryshoni lejet për një grup ose përdorues të përzgjedhur. + +Në tabelën më poshtë tregohen të gjitha rregullat e vendosjes së aksesit. Mund ta përdorni për të fshirë shpejt ose ndryshuar shumë rregulla njëkohësisht. + +Leximi i [[doku>acl|dokumentimit zyrtar mbi ACL]] mund t'ju ndihmojë për të kuptuar plotësisht sesi funksionin Kontrolli i Aksesit në DokuWiki. diff --git a/lib/plugins/acl/lang/sq/lang.php b/lib/plugins/acl/lang/sq/lang.php new file mode 100644 index 000000000..30fc99bb0 --- /dev/null +++ b/lib/plugins/acl/lang/sq/lang.php @@ -0,0 +1,34 @@ +%s momentalisht ka të drejtat e mëposhtme mbi faqen %s: %s.'; +$lang['p_user_ns'] = 'Përdoruesi %s momentalisht ka të drejtat e mëposhtme mbi hapësirën e emrit %s: %s.'; +$lang['p_group_id'] = 'Anëtarët e grupit %s momentalisht kanë të drejtat e mëposhtme mbi faqen %s: %s.'; +$lang['p_group_ns'] = 'Anëtarët e grupit %s momentalisht kanë të drejtat e mëposhtme mbi hapësirën e emrit %s: %s.'; +$lang['p_choose_id'] = 'Ju lutemi futni një përdorues ose grup në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për faqen %s.'; +$lang['p_choose_ns'] = 'Ju lutemi futni një përdorues ose grup në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për hapësirën e emrit %s.'; +$lang['p_inherited'] = 'Shënim: Ato të drejta nuk janë vendosur specifikisht por janë të trashëguara nga grupe të tjera ose hapësira emri më të larta.'; +$lang['p_isadmin'] = 'Shënim: Grupi ose përdoruesi i përzgjedhur ka gjithmonë të drejta të plota sepse është konfiguruar si superpërdorues.'; +$lang['p_include'] = 'Të drejtat më të larta i përfshijnë edhe ato më të ultat. Të drejtat Krijo, Ngarko dhe Fshi u aplikohen vetëm hapësirave të emrit, jo faqeve.'; +$lang['current'] = 'Rregullat aktuale ACL'; +$lang['where'] = 'Faqe/Hapësirë Emri'; +$lang['who'] = 'Përdorues/Grup'; +$lang['perm'] = 'Të Drejta'; +$lang['acl_perm0'] = 'Asgjë'; +$lang['acl_perm1'] = 'Lexim'; +$lang['acl_perm2'] = 'Redaktim'; +$lang['acl_perm4'] = 'Krijim'; +$lang['acl_perm8'] = 'Ngarkim'; +$lang['acl_perm16'] = 'Fshi'; +$lang['acl_new'] = 'Shto Hyrje të re'; +$lang['acl_mod'] = 'Ndrysho Hyrje'; diff --git a/lib/plugins/config/lang/sq/intro.txt b/lib/plugins/config/lang/sq/intro.txt new file mode 100644 index 000000000..687b497c9 --- /dev/null +++ b/lib/plugins/config/lang/sq/intro.txt @@ -0,0 +1,7 @@ +====== Menaxheri Konfigurimit ====== + +Përdoreni këtë faqe për të kontrolluar kuadrot e instalimit të DokuWiki-t tuaj. Për ndihmë mbi kuadro individuale referojuni [[doku>config]]. Për më tepër detaje rreth këtij plugin-i shih [[doku>plugin:config]]. + +Kuadrot e treguara me një backgroudn me një ngjyrë të kuqe të lehtë janë të mbrojtura dhe nuk mund të ndryshohen me këtë plugin. Kuadrot e treguara me një background blu janë vlerat default dhe kuadrot e treguara me një background të bardhë janë vendosur lokalisht për këtë instalim të caktuar. Si kuadrot blu, ashtu edhe ato të bardhë mund të ndryshohen. + +Kujtohuni të shtypni butonin **Ruaj** para se të dilni nga kjo faqe ose ndryshimet tuaja do të humbasin. \ No newline at end of file diff --git a/lib/plugins/config/lang/sq/lang.php b/lib/plugins/config/lang/sq/lang.php new file mode 100644 index 000000000..6cf8fd5af --- /dev/null +++ b/lib/plugins/config/lang/sq/lang.php @@ -0,0 +1,180 @@ +Vlerat e pasakta tregohen të rrethuara nga një kornizë e kuqe.'; +$lang['updated'] = 'Kuadrot u përditësuan me sukses.'; +$lang['nochoice'] = '(asnjë zgjedhje tjetër e disponueshme)'; +$lang['locked'] = 'Skedari i kuadrove nuk mund të përditësohet, nëse kjo është e paqëllimshme,
sigurohuni që emri i skedarit të kuadrove lokale dhe të drejtat të jenë të sakta.'; +$lang['danger'] = 'Rrezik: Ndrishimi i kësaj alternative mund ta bëjë wiki-n dhe menunë tuaj të konfigurimit të pa aksesueshme.'; +$lang['warning'] = 'Paralajmërim: Ndryshimi i kësaj alternative mund të shkaktojë sjellje të padëshiruara.'; +$lang['security'] = 'Paralajmërim Sigurie: Ndryshimi i kësaj alternative mund të paraqesë një rrezik në siguri.'; +$lang['_configuration_manager'] = 'Menaxhuesi i Kuadrove'; +$lang['_header_dokuwiki'] = 'Kuadrot e DokuWiki-t'; +$lang['_header_plugin'] = 'Kuadrot e Plugin-eve'; +$lang['_header_template'] = 'Kuadrot e Template-eve'; +$lang['_header_undefined'] = 'Kuadro të Papërcaktuara'; +$lang['_basic'] = 'Kuadro Elementare'; +$lang['_display'] = 'Kuadrot e Shfaqjes'; +$lang['_authentication'] = 'Kuadrot e Autentikimit'; +$lang['_anti_spam'] = 'Kuadrot Anti-Spam'; +$lang['_editing'] = 'Kuadrot e Redaktimit'; +$lang['_links'] = 'Kuadrot e Link-eve'; +$lang['_media'] = 'Kuadrot e Medias'; +$lang['_advanced'] = 'Kuadro të Avancuara'; +$lang['_network'] = 'Kuadrot e Rrjetit'; +$lang['_plugin_sufix'] = 'Kuadrot e Plugin-eve'; +$lang['_template_sufix'] = 'Kuadrot e Template-eve'; +$lang['_msg_setting_undefined'] = 'Metadata pa kuadro.'; +$lang['_msg_setting_no_class'] = 'Klasë pa kuadro.'; +$lang['_msg_setting_no_default'] = 'Asnjë vlerë default.'; +$lang['fmode'] = 'Mënyra krijim skedari'; +$lang['dmode'] = 'Mënyra krijim dosjeje.'; +$lang['lang'] = 'Gjuha e ndërfaqes'; +$lang['basedir'] = 'Path-i i Serverit (psh /dokuwiki/). Lëre bosh për ta gjetur automatikisht.'; +$lang['baseurl'] = 'URL-ja serverit (psh http://www.serveriyt.com). Lëre bosh për ta gjetur automatikisht.'; +$lang['savedir'] = 'Direktoria për të ruajtur të dhënat'; +$lang['start'] = 'Emri i faqes së fillimit'; +$lang['title'] = 'Titulli i Wiki-t'; +$lang['template'] = 'Template'; +$lang['license'] = 'Nën cilën liçensë duhet të vihet përmbajtja juar?'; +$lang['fullpath'] = 'Trego adresën e plotë të faqeve në footer.'; +$lang['recent'] = 'Ndryshimet më të fundit'; +$lang['breadcrumbs'] = 'Numri i gjurmëve'; +$lang['youarehere'] = 'Gjurmë hierarkike'; +$lang['typography'] = 'Bëj zëvendësime tipografike'; +$lang['htmlok'] = 'Lejo HTML të ngulitura'; +$lang['phpok'] = 'Lejo PHP të ngulitura'; +$lang['dformat'] = 'Formati i Datës (shiko funksionin strftime e PHP-së)'; +$lang['signature'] = 'Firma'; +$lang['toptoclevel'] = 'Niveli i Kreut për tabelën e përmbajtjes'; +$lang['tocminheads'] = 'Sasia minimum e titrave që përcaktojnë nëse TOC ndërtohet ose jo'; +$lang['maxtoclevel'] = 'Niveli maksimum për tabelën e përmbajtjes'; +$lang['maxseclevel'] = 'Niveli maksimum për redaktim të seksionit'; +$lang['camelcase'] = 'Përdor CamelCase (shkronja e parë e çdo fjale është kapitale) për linke-t'; +$lang['deaccent'] = 'Emra faqesh të pastër'; +$lang['useheading'] = 'Përdor titra të nivelit të parë për faqet e emrave'; +$lang['refcheck'] = 'Kontroll për referim mediash'; +$lang['refshow'] = 'Numri i referimeve të medias që duhet të tregohet'; +$lang['allowdebug'] = 'Lejo debug çaktivizoje nëse nuk nevojitet!'; +$lang['usewordblock'] = 'Blloko spam-in duke u bazuar mbi listë fjalësh'; +$lang['indexdelay'] = 'Vonesa në kohë para index-imit (sekonda)'; +$lang['relnofollow'] = 'Përdor rel="nofollow" në linke të jashtëm'; +$lang['mailguard'] = 'Errëso adresat e email-it'; +$lang['iexssprotect'] = 'Kontrollo skedarët e ngarkuar për kod të mundshëm dashakeqës JavaScript ose HTML'; +$lang['showuseras'] = 'Cfarë të shfaqësh kur t\'i tregosh përdoruesit faqen e fundit të redaktuar'; +$lang['useacl'] = 'Përdor lista kontrolli të aksesit'; +$lang['autopasswd'] = 'Autogjenero fjalëkalime'; +$lang['authtype'] = 'Backend autentikimi'; +$lang['passcrypt'] = 'Metoda e enkriptimit të fjalëkalimit'; +$lang['defaultgroup'] = 'Grupi default'; +$lang['superuser'] = 'Superpërdorues - grup, përdorues ose listë e ndarë me presje user1, @group1,user2 me akses të plotë në të gjitha faqet dhe funksionet pavarësisht kuadrove të ACL'; +$lang['manager'] = 'Menaxher - grup, përdorues ose listë e ndarë me presje user1,@group1,user2 me akses në disa funksione të caktuara menaxhimi'; +$lang['profileconfirm'] = 'Konfirmo ndryshimet ne profil me fjalëkalim'; +$lang['disableactions'] = 'Caktivizo veprimet e DokuWiki-it'; +$lang['disableactions_check'] = 'Kontrollo'; +$lang['disableactions_subscription'] = 'Abonohu/Fshi Abonim'; +$lang['disableactions_wikicode'] = 'Shiku kodin burim/ Eksportoje të Papërpunuar'; +$lang['disableactions_other'] = 'Veprime të tjera (të ndarë me presje)'; +$lang['sneaky_index'] = 'Vetiu DokuWiki tregon të gjithë hapësirat e emrit në shikimin e index-it. Aktivizimi i kësaj alternative do të fshehë ato ku përdoruesi nuk ka të drejta leximi. Kjo mund të përfundojë në fshehje të nënhapësirave të emrit të aksesueshme. Kjo mund ta bëjë index-in të papërdorshëm me disa konfigurime të caktuara të ACL-së.'; +$lang['auth_security_timeout'] = 'Koha e Përfundimit për Autentikim (sekonda)'; +$lang['securecookie'] = 'A duhet që cookies të vendosura nëpërmjet HTTPS të dërgohen vetëm nëpërmjet HTTPS nga shfletuesit? Caktivizojeni këtë alternativë kur vetëm hyrja në wiki-n tuaj sigurohet me SSL por shfletimi i wiki-t bëhet në mënyrë të pasigurtë.'; +$lang['xmlrpc'] = 'Aktivizo/Caktivizo ndërfaqen XML-RPC'; +$lang['xmlrpcuser'] = 'Kufizo aksesin XML-RPC vetëm tek grupet ose përdoruesit e ndarë me presje të dhënë këtu. Lëre bosh për t\'i dhënë akses të gjithëve.'; +$lang['updatecheck'] = 'Kontrollo për përditësime dhe paralajmërime sigurie? DokuWiki duhet të kontaktojë me splitbrain.org për këtë veti.'; +$lang['userewrite'] = 'Përdor URL të këndshme.'; +$lang['useslash'] = 'Përdor / si ndarës të hapësirave të emrit në URL'; +$lang['usedraft'] = 'Ruaj automatikisht një skicë gjatë redaktimit'; +$lang['sepchar'] = 'Fjala ndarëse për emrin e faqes'; +$lang['canonical'] = 'Përdor URL kanonike të plota'; +$lang['autoplural'] = 'Kontrollo për forma shumës në link-e'; +$lang['compression'] = 'Metoda kompresimit për skedarët atikë'; +$lang['cachetime'] = 'Mosha maksimale për cache (sekonda)'; +$lang['locktime'] = 'Mosha maksimale për kyçjen e skedarëve (sekonda)'; +$lang['fetchsize'] = 'Madhësia maksimale (bytes) që fetch.php mund të shkarkojë nga jashtë'; +$lang['notify'] = 'Dërgo lajmërim për ndryshime te kjo adresë email-i'; +$lang['registernotify'] = 'Dërgo info për përdoruesit e sapo regjistruar te kjo adresë email-i'; +$lang['mailfrom'] = 'Adresa e email-it që do të përdoret për dërgimin e email-eve automatikë'; +$lang['gzip_output'] = 'Përdor gzip Content-Encoding për xhtml'; +$lang['gdlib'] = 'Versioni i GD Lib'; +$lang['im_convert'] = 'Path-i për tek mjeti i konvertimit ImageMagick'; +$lang['jpg_quality'] = 'Cilësia e kompresimit JPG (0-100)'; +$lang['subscribers'] = 'Aktivizo suportin për abonim faqesh'; +$lang['subscribe_time'] = 'Koha pas së cilës listat e abonimeve dhe konsumimet dërgohen (sekonda); Kjo duhet të jetë më e vogël se koha e specifikuar në ditët më të fundit'; +$lang['compress'] = 'Kompaktëso daljet CSS dhe JavaScript '; +$lang['hidepages'] = 'Fshi faqet që përkojnë (shprehjet e rregullta)'; +$lang['send404'] = 'Dërgo "HTTP 404/Page Not Found" për faqe që nuk ekzistojnë'; +$lang['sitemap'] = 'Gjenero Google sitemap (ditë)'; +$lang['broken_iua'] = 'Funksioni ignore_user_abort është i prishur në sistemin tuaj? Kjo mund të shkaktojë një indeks kërkimi jo funksional. IIS+PHP/CGI njihen si të prishura. Shiko Bug 852 për më shumë info.'; +$lang['xsendfile'] = 'Përdor kokën X-Sendfile për të lejuar webserver-in të dërgojë skedarë statikë? Kjo duhet të suportohet nga webserver-i juaj.'; +$lang['renderer_xhtml'] = 'Riprodhuesi i përdorur për daljen wiki kryesore (xhtml)'; +$lang['renderer__core'] = '%s (dokuwiki core)'; +$lang['renderer__plugin'] = '%s (plugin)'; +$lang['rememberme'] = 'Lejo cookies hyrjeje të përhershme (më kujto mua)'; +$lang['rss_type'] = 'Tipi feed XML'; +$lang['rss_linkto'] = 'XML feed lidhet me'; +$lang['rss_content'] = 'Cfarë të shfaqësh në objektet XML feed?'; +$lang['rss_update'] = 'Intervali i përditësimit XML feed (sekonda)'; +$lang['recent_days'] = 'Sa ndryshime të fundit duhen mbajtur (ditë)'; +$lang['rss_show_summary'] = 'XML feed trego përmbledhjen në titull'; +$lang['target____wiki'] = 'Dritarja target për link-e të brendshëm'; +$lang['target____interwiki'] = 'Dritarja target për link-e interwiki'; +$lang['target____extern'] = 'Dritarja target për link-e të jashtme'; +$lang['target____media'] = 'Dritarja target për link-e mediash'; +$lang['target____windows'] = 'Dritarja target për link-e windows-i'; +$lang['proxy____host'] = 'Emri i serverit të proxy-t'; +$lang['proxy____port'] = 'Porta e proxy-t'; +$lang['proxy____user'] = 'Emri i përdoruesit për proxy-n'; +$lang['proxy____pass'] = 'Fjalëkalimi proxy-t'; +$lang['proxy____ssl'] = 'Përdor SSL për tu lidhur me proxy-n'; +$lang['safemodehack'] = 'Aktivizo hack në safemode'; +$lang['ftp____host'] = 'Server FTP për safemode hack'; +$lang['ftp____port'] = 'Porta FTP për safemode hack'; +$lang['ftp____user'] = 'Emri përdoruesit për safemode hack'; +$lang['ftp____pass'] = 'Fjalëkalimi FTP për safemode hack'; +$lang['ftp____root'] = 'Direktoria rrënjë për safemode hack'; +$lang['license_o_'] = 'Nuk u zgjodh asgjë'; +$lang['typography_o_0'] = 'Asgjë'; +$lang['typography_o_1'] = 'përjashtim i thonjëzave teke'; +$lang['typography_o_2'] = 'përfshirje e thonjëzave teke (nuk punon gjithmonë) '; +$lang['userewrite_o_0'] = 'asgjë'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'Brendësia DokuWiki'; +$lang['deaccent_o_0'] = 'fikur'; +$lang['deaccent_o_1'] = 'hiq theksin'; +$lang['deaccent_o_2'] = 'romanizo'; +$lang['gdlib_o_0'] = 'GD Lib nuk është e disponueshme'; +$lang['gdlib_o_1'] = 'Versioni 1.x'; +$lang['gdlib_o_2'] = 'Dallim automatik'; +$lang['rss_type_o_rss'] = 'RSS 0.91'; +$lang['rss_type_o_rss1'] = 'RSS 1.0'; +$lang['rss_type_o_rss2'] = 'RSS 2.0'; +$lang['rss_type_o_atom'] = 'Atom 0.3'; +$lang['rss_type_o_atom1'] = 'Atom 1.0'; +$lang['rss_content_o_abstract'] = 'Abstrakte'; +$lang['rss_content_o_diff'] = 'Ndryshime të njësuara'; +$lang['rss_content_o_htmldiff'] = 'Tabelë ndryshimesh e formatuar në HTML'; +$lang['rss_content_o_html'] = 'Përmbajtje e plotë faqeje HTML'; +$lang['rss_linkto_o_diff'] = 'shikimi ndryshimit'; +$lang['rss_linkto_o_page'] = 'faqja e rishikuar'; +$lang['rss_linkto_o_rev'] = 'lista e rishikimeve'; +$lang['rss_linkto_o_current'] = 'faqja aktuale'; +$lang['compression_o_0'] = 'asgjë'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'mos e përdor'; +$lang['xsendfile_o_1'] = 'Proprietary lighttpd header (para lëshimit 1.5)'; +$lang['xsendfile_o_2'] = 'X-Sendfile header standard'; +$lang['xsendfile_o_3'] = 'Proprietary Nginx X-Accel-Redirect header'; +$lang['showuseras_o_loginname'] = 'Emri hyrjes'; +$lang['showuseras_o_username'] = 'Emri i plotë i përdoruesit'; +$lang['showuseras_o_email'] = 'Adresa e email-it e përdoruesit (errësuar sipas kuadros mailguard)'; +$lang['showuseras_o_email_link'] = 'Adresa email e përdoruesit si një mailto: link'; +$lang['useheading_o_0'] = 'Kurrë'; +$lang['useheading_o_navigation'] = 'Vetëm për Navigim'; +$lang['useheading_o_content'] = 'Vetëm për Përmbajtje Wiki'; +$lang['useheading_o_1'] = 'Gjithmonë'; diff --git a/lib/plugins/plugin/lang/sq/admin_plugin.txt b/lib/plugins/plugin/lang/sq/admin_plugin.txt new file mode 100644 index 000000000..2e1f19234 --- /dev/null +++ b/lib/plugins/plugin/lang/sq/admin_plugin.txt @@ -0,0 +1,3 @@ +====== Menaxhimi i Plugin-eve ====== + +Në këtë faqe mund të menaxhoni çdo gjë që ka të bëjë me [[doku>plugins|plugin-et]] Dokuwiki. Që të jetë në gjendje për të shkarkuar dhe instaluar një plugin, dosja e plugin-it duhet të jetë e shkrueshme nga webserver-i. \ No newline at end of file diff --git a/lib/plugins/plugin/lang/sq/lang.php b/lib/plugins/plugin/lang/sq/lang.php new file mode 100644 index 000000000..9ddcf527f --- /dev/null +++ b/lib/plugins/plugin/lang/sq/lang.php @@ -0,0 +1,50 @@ +%s: disku mund të jetë plotë ose të drejtat për aksesim skedari mund të jenë të gabuara. Kjo mund të ketë shkaktuar një instalim të pjesshëm të plugin-it dhe ta lërë instalimin e wiki-t tënd të paqëndrueshëm.'; +$lang['error_delete'] = 'Ndodhi një gabim gjatë përpjekjes për të fshirë plugin-in %s. Shkaku më i mundshëm është të drejta të pamjaftueshme për aksesim skedari ose dosjeje.'; +$lang['enabled'] = 'Plugini %s u aktivizua.'; +$lang['notenabled'] = 'Plugini %s nuk mundi të aktivizohej, kontrollo të drejtat e aksesit për skedarin.'; +$lang['disabled'] = 'Plugin %s është i paaktivizuar.'; +$lang['notdisabled'] = 'Plugini %s nuk mundi të çaktivizohej, kontrollo të drejtat e aksesit për skedarin.'; diff --git a/lib/plugins/popularity/lang/sq/intro.txt b/lib/plugins/popularity/lang/sq/intro.txt new file mode 100644 index 000000000..eb37e5f36 --- /dev/null +++ b/lib/plugins/popularity/lang/sq/intro.txt @@ -0,0 +1,9 @@ +====== Informacioni mbi Popullaritetin ====== + +Ky mjet mbledh të dhëna anonime rreth wiki-t tuaj dhe ju lejon t'ia dërgoni ato zhvilluesve të DokuWiki-t. Kjo i ndihmon ata të kuptojnë sesi DokuWiki përdoret nga përdoruesit e tij dhe siguron që vendimet për zhvillime të ardhshme të jenë të mbështetura mbi statistika të nxjera nga bota e vërtetë. + +Ju jeni të inkurajuar ta përsërisni këtë hap shpesh herë për t'i mbajtur zhvilluesit të informuar kur wiki juaj rritet. Bashkësia e të dhënave tuaja të përsëritura do të identifikohen nga një ID anonime. + +Të dhënat e mbledhura përmbajnë informacione si versioni i DokuWiki-t tuaj, numri dhe madhësia e faqeve dhe skedarëve, plugin-et e instaluar dhe informacione rreth instalimit të PHP-së. + +Të dhënat e papërpunuara që do të dërgohen janë treguar më poshtë. Ju lutem përdorni buttonin "Dërgo Të Dhëna" për të transferuar informacionin. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/sq/lang.php b/lib/plugins/popularity/lang/sq/lang.php new file mode 100644 index 000000000..1954ce04c --- /dev/null +++ b/lib/plugins/popularity/lang/sq/lang.php @@ -0,0 +1,8 @@ +%s.'; diff --git a/lib/plugins/usermanager/lang/sq/add.txt b/lib/plugins/usermanager/lang/sq/add.txt new file mode 100644 index 000000000..4c66aaf3e --- /dev/null +++ b/lib/plugins/usermanager/lang/sq/add.txt @@ -0,0 +1 @@ +===== Shto Përdorues ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/sq/delete.txt b/lib/plugins/usermanager/lang/sq/delete.txt new file mode 100644 index 000000000..34cb49173 --- /dev/null +++ b/lib/plugins/usermanager/lang/sq/delete.txt @@ -0,0 +1 @@ +===== Fshi përdorues ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/sq/edit.txt b/lib/plugins/usermanager/lang/sq/edit.txt new file mode 100644 index 000000000..63131038f --- /dev/null +++ b/lib/plugins/usermanager/lang/sq/edit.txt @@ -0,0 +1 @@ +===== Redakto Përdorues ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/sq/intro.txt b/lib/plugins/usermanager/lang/sq/intro.txt new file mode 100644 index 000000000..e1ebea60c --- /dev/null +++ b/lib/plugins/usermanager/lang/sq/intro.txt @@ -0,0 +1 @@ +===== Menaxhuesi i Përdoruesit ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/sq/lang.php b/lib/plugins/usermanager/lang/sq/lang.php new file mode 100644 index 000000000..bddf54d5b --- /dev/null +++ b/lib/plugins/usermanager/lang/sq/lang.php @@ -0,0 +1,48 @@ + Date: Tue, 2 Mar 2010 21:07:57 +0100 Subject: removed cursor:hand CSS property FS#1911 --- lib/scripts/script.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index ef4ae95a2..bf6f41ce5 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -215,10 +215,7 @@ function addTocToggle() { prependChild(header,obj); obj.parentNode.onclick = toggleToc; - try { - obj.parentNode.style.cursor = 'pointer'; - obj.parentNode.style.cursor = 'hand'; - }catch(e){} + obj.parentNode.style.cursor = 'pointer'; } /** -- cgit v1.2.3 From ec0fe1a56541bb02a6a8cf665014161702c22e14 Mon Sep 17 00:00:00 2001 From: Aivars Miska Date: Wed, 3 Mar 2010 20:37:32 +0100 Subject: Latvian language update --- lib/plugins/config/lang/lv/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php index 51cb6d89b..533ccbcfb 100644 --- a/lib/plugins/config/lang/lv/lang.php +++ b/lib/plugins/config/lang/lv/lang.php @@ -105,6 +105,7 @@ $lang['gdlib'] = 'GD Lib versija'; $lang['im_convert'] = 'Ceļš uz ImageMagick convert rīku'; $lang['jpg_quality'] = 'JPG saspiešanas kvalitāte'; $lang['subscribers'] = 'Atļaut abonēt izmaiņas'; +$lang['subscribe_time'] = 'Pēc cik ilga laika izsūtīt abonētos sarakstus un kopsavilkumus (sekundes); jābūt mazākam par laiku, kas norādīts "recent_days".'; $lang['compress'] = 'Saspiest CSS un javascript failus'; $lang['hidepages'] = 'Slēpt lapas (regulāras izteiksmes)'; $lang['send404'] = 'Par neesošām lapām atbildēt "HTTP 404/Page Not Found" '; -- cgit v1.2.3 From 620404a5dcfbccb29cd939932ecaead95b6e24cd Mon Sep 17 00:00:00 2001 From: Marek Sacha Date: Wed, 3 Mar 2010 22:25:51 +0100 Subject: Czech language update --- lib/plugins/acl/lang/cs/lang.php | 1 + lib/plugins/config/lang/cs/lang.php | 2 ++ lib/plugins/plugin/lang/cs/lang.php | 1 + lib/plugins/popularity/lang/cs/lang.php | 1 + lib/plugins/revert/lang/cs/lang.php | 1 + lib/plugins/usermanager/lang/cs/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php index 899d30ced..aab39098a 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -6,6 +6,7 @@ * @author Bohumir Zamecnik * @author Zbynek Krivka * @author tomas@valenta.cz + * @author Marek Sacha */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index e5114617b..25303791d 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -6,6 +6,7 @@ * @author Bohumir Zamecnik * @author Zbynek Krivka * @author tomas@valenta.cz + * @author Marek Sacha */ $lang['menu'] = 'Správa nastavení'; $lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce, @@ -115,6 +116,7 @@ $lang['gdlib'] = 'Verze GD knihovny'; $lang['im_convert'] = 'Cesta k nástroji convert z balíku ImageMagick'; $lang['jpg_quality'] = 'Kvalita komprese JPEG (0-100)'; $lang['subscribers'] = 'Možnost přihlásit se k odběru novinek stránky'; +$lang['subscribe_time'] = 'Časový interval v sekundách, ve kterém jsou posílány změny a souhrny změn. Interval by neměl být kratší než čas uvedený v recent_days.'; $lang['compress'] = 'Zahustit CSS a JavaScript výstup'; $lang['hidepages'] = 'Skrýt stránky odpovídající vzoru (regulární výrazy)'; $lang['send404'] = 'Posílat "HTTP 404/Page Not Found" pro neexistují stránky'; diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php index d56f52be2..bd1380143 100644 --- a/lib/plugins/plugin/lang/cs/lang.php +++ b/lib/plugins/plugin/lang/cs/lang.php @@ -7,6 +7,7 @@ * @author Zbynek Krivka * @author Bohumir Zamecnik * @author tomas@valenta.cz + * @author Marek Sacha */ $lang['menu'] = 'Správa pluginů'; $lang['download'] = 'Stáhnout a instalovat plugin'; diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php index f190e29b3..146bf54b6 100644 --- a/lib/plugins/popularity/lang/cs/lang.php +++ b/lib/plugins/popularity/lang/cs/lang.php @@ -4,6 +4,7 @@ * * @author Bohumir Zamecnik * @author tomas@valenta.cz + * @author Marek Sacha */ $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/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php index cdfe0e96c..5bb5334ae 100644 --- a/lib/plugins/revert/lang/cs/lang.php +++ b/lib/plugins/revert/lang/cs/lang.php @@ -7,6 +7,7 @@ * @author Bohumir Zamecnik * @author Zbynek Krivka * @author tomas@valenta.cz + * @author Marek Sacha */ $lang['menu'] = 'Obnova zaspamovaných stránek'; $lang['filter'] = 'Hledat zaspamované stránky'; diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index 6f368bd0f..64686fb2d 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -6,6 +6,7 @@ * @author Zbynek Krivka * @author Bohumir Zamecnik * @author tomas@valenta.cz + * @author Marek Sacha */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; -- cgit v1.2.3 From c1fe9e9f75eb20bf30cde6e67fe7ef9f664f4cdd Mon Sep 17 00:00:00 2001 From: Florian Gaub Date: Mon, 8 Mar 2010 18:30:08 +0100 Subject: French language update --- lib/plugins/acl/lang/fr/help.txt | 8 +-- lib/plugins/acl/lang/fr/lang.php | 17 ++--- lib/plugins/config/lang/fr/intro.txt | 4 +- lib/plugins/config/lang/fr/lang.php | 108 ++++++++++++++-------------- lib/plugins/plugin/lang/fr/admin_plugin.txt | 4 +- lib/plugins/plugin/lang/fr/lang.php | 49 ++++++------- lib/plugins/popularity/lang/fr/intro.txt | 4 +- lib/plugins/popularity/lang/fr/lang.php | 1 + lib/plugins/revert/lang/fr/intro.txt | 4 +- lib/plugins/revert/lang/fr/lang.php | 7 +- lib/plugins/usermanager/lang/fr/lang.php | 11 +-- 11 files changed, 112 insertions(+), 105 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/help.txt b/lib/plugins/acl/lang/fr/help.txt index 69661bb9b..f748f6b23 100644 --- a/lib/plugins/acl/lang/fr/help.txt +++ b/lib/plugins/acl/lang/fr/help.txt @@ -1,9 +1,9 @@ -=== Aide rapide : === +=== Aide rapide === 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 au-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné. -Dans la table 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 ACLs. +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 ACLs]] pourra vous permettre de comprendre complètement le fonctionnement du contrôle d'accès dans DokuWiki. +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. diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index 7973ab559..64d918360 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -18,6 +18,7 @@ * @author olivier duperray * @author Vincent Feltz * @author Philippe Bajoit + * @author Florian Gaub */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; @@ -26,15 +27,15 @@ $lang['acl_perms'] = 'Permission pour'; $lang['page'] = 'Page'; $lang['namespace'] = 'Catégorie'; $lang['btn_select'] = 'Sélectionner'; -$lang['p_user_id'] = 'Permissions actuelles de l\'utilisateur %s sur la page %s: %s.'; -$lang['p_user_ns'] = 'Permissions actuelles de l\'utilisateur %s sur la catégorie %s: %s.'; -$lang['p_group_id'] = 'Permissions actuelles des membres du groupe %s sur la page %s: %s.'; -$lang['p_group_ns'] = 'Permissions actuelles des membres du groupe %s sur la catégorie %s: %s.'; -$lang['p_choose_id'] = 'Saisissez un nom d\'utilisateur ou de groupe dans le formulaire ci-dessus pour afficher ou éditer les permissions relatives à la page %s.'; -$lang['p_choose_ns'] = 'Saisissez un nom d\'utilisateur ou de groupe dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie %s.'; +$lang['p_user_id'] = 'Permissions actuelles de l\'utilisateur %s sur la page %s: %s.'; +$lang['p_user_ns'] = 'Permissions actuelles de l\'utilisateur %s sur la catégorie %s: %s.'; +$lang['p_group_id'] = 'Permissions actuelles des membres du groupe %s sur la page %s: %s.'; +$lang['p_group_ns'] = 'Permissions actuelles des membres du groupe %s sur la catégorie %s: %s.'; +$lang['p_choose_id'] = 'Saisissez un nom d\'utilisateur ou de groupe dans le formulaire ci-dessus pour afficher ou éditer les permissions relatives à la page %s.'; +$lang['p_choose_ns'] = 'Saisissez un nom d\'utilisateur ou de groupe dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie %s.'; $lang['p_inherited'] = 'Note : Ces permissions n\'ont pas été explicitement fixées mais sont héritées d\'autres groupes ou catégories supérieures.'; $lang['p_isadmin'] = 'Note : Le groupe ou l\'utilisateur sélectionné dispose de toutes les permissions car il est paramétré en tant que superutilisateur.'; -$lang['p_include'] = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger, et Effacer, ne s\'appliquent qu\'aux catégories ; pas aux pages.'; +$lang['p_include'] = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger et Effacer ne s\'appliquent qu\'aux catégories, pas aux pages.'; $lang['current'] = 'ACL actuelles'; $lang['where'] = 'Page/Catégorie'; $lang['who'] = 'Utilisateur/Groupe'; @@ -43,7 +44,7 @@ $lang['acl_perm0'] = 'Aucune'; $lang['acl_perm1'] = 'Lecture'; $lang['acl_perm2'] = 'Écriture'; $lang['acl_perm4'] = 'Création'; -$lang['acl_perm8'] = 'Téléverser (Upload)'; +$lang['acl_perm8'] = 'Téléverser'; $lang['acl_perm16'] = 'Effacer'; $lang['acl_new'] = 'Ajouter une nouvelle entrée'; $lang['acl_mod'] = 'Modifier l\'entrée'; diff --git a/lib/plugins/config/lang/fr/intro.txt b/lib/plugins/config/lang/fr/intro.txt index 79e4a42da..de8a965d8 100644 --- a/lib/plugins/config/lang/fr/intro.txt +++ b/lib/plugins/config/lang/fr/intro.txt @@ -1,8 +1,8 @@ ====== 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 plugin, 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>config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>plugin:config]]. -Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec ce plugin. 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. +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. N'oubliez pas d'utiliser le bouton **Enregistrer** avant de quitter cette page, sinon vos modifications seront perdues. diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index e06a44c10..09e625eb1 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -13,9 +13,10 @@ * @author olivier duperray * @author Vincent Feltz * @author Philippe Bajoit + * @author Florian Gaub */ $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.
La valeur(s) erronée(s) est entourée d\'une bordure rouge.'; +$lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez.
Les valeurs erronées sont entourées d\'une bordure rouge.'; $lang['updated'] = 'Paramètres mis à jour avec succès.'; $lang['nochoice'] = '(aucun autre choix possible)'; $lang['locked'] = 'Le fichier des paramètres ne peut être modifié, si ceci n\'est pas intentionnel,
vérifiez que le nom et les droits du fichier sont corrects.'; @@ -23,9 +24,9 @@ $lang['danger'] = 'Danger : Modifier cette option pourrait rendre $lang['warning'] = 'Attention : Modifier cette option pourrait engendrer un comportement indésirable.'; $lang['security'] = 'Avertissement de sécurité : Modifier cette option pourrait induire un risque de sécurité.'; $lang['_configuration_manager'] = 'Gestionnaire de configuration'; -$lang['_header_dokuwiki'] = 'Paramètres DokuWiki'; -$lang['_header_plugin'] = 'Paramètres plugin'; -$lang['_header_template'] = 'Paramètres template'; +$lang['_header_dokuwiki'] = 'Paramètres de DokuWiki'; +$lang['_header_plugin'] = 'Paramètres des modules externes'; +$lang['_header_template'] = 'Paramètres des modèles'; $lang['_header_undefined'] = 'Paramètres indéfinis'; $lang['_basic'] = 'Paramètres de base'; $lang['_display'] = 'Paramètres d\'affichage'; @@ -36,7 +37,7 @@ $lang['_links'] = 'Paramètres des liens'; $lang['_media'] = 'Paramètres média'; $lang['_advanced'] = 'Paramètres avancés'; $lang['_network'] = 'Paramètres réseaux'; -$lang['_plugin_sufix'] = 'Paramètres plugin'; +$lang['_plugin_sufix'] = 'Paramètres de module'; $lang['_template_sufix'] = 'Paramètres de modèle'; $lang['_msg_setting_undefined'] = 'Pas de métadonnée de paramètres.'; $lang['_msg_setting_no_class'] = 'Pas de classe de paramètres.'; @@ -44,50 +45,50 @@ $lang['_msg_setting_no_default'] = 'Pas de valeur par défaut.'; $lang['fmode'] = 'Mode de création des fichiers'; $lang['dmode'] = 'Mode de création des répertoires'; $lang['lang'] = 'Langue'; -$lang['basedir'] = 'Répertoire de base'; -$lang['baseurl'] = 'URL de base'; +$lang['basedir'] = 'Répertoire de base (ex. : /dokuwiki/). Laisser vide pour une détection automatique.'; +$lang['baseurl'] = 'URL de base. Laisser vide pour une détection automatique.'; $lang['savedir'] = 'Répertoire de stockage'; $lang['start'] = 'Nom de la page d\'accueil'; $lang['title'] = 'Titre du wiki'; $lang['template'] = 'Modèle'; -$lang['license'] = 'Sous quelle licence doit être placée votre contribution ?'; +$lang['license'] = 'Sous quelle licence doit être placé le contenu ?'; $lang['fullpath'] = 'Utiliser le chemin complet dans le pied de page'; $lang['recent'] = 'Nombre de derniers changements à afficher'; $lang['breadcrumbs'] = 'Nombre de traces à afficher'; $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['htmlok'] = 'Permettre HTML dans les pages'; +$lang['phpok'] = 'Permettre PHP dans les pages'; $lang['dformat'] = 'Format de date (cf. fonction strftime de PHP)'; $lang['signature'] = 'Signature'; -$lang['toptoclevel'] = 'Niveau supérieur pour figurer dans la table des matières'; +$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'; $lang['maxtoclevel'] = 'Niveau maximum pour figurer dans la table des matières'; -$lang['maxseclevel'] = 'Niveau maximum pour éditer des sections'; +$lang['maxseclevel'] = 'Niveau maximum pour modifier des sections'; $lang['camelcase'] = 'Utiliser CamelCase pour les liens'; $lang['deaccent'] = 'Retirer les accents dans les noms de pages'; $lang['useheading'] = 'Utiliser le titre de premier niveau'; -$lang['refcheck'] = 'Vérifier les références de media'; -$lang['refshow'] = 'Nombre de références de media à montrer'; -$lang['allowdebug'] = 'Debug (Ne l\'activez que si vous en avez besoin !)'; +$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 (Ne l\'activez que si vous en avez besoin !)'; $lang['usewordblock'] = 'Bloquer le spam selon les mots utilisés'; -$lang['indexdelay'] = 'Délai avant l\'indexation (sec)'; +$lang['indexdelay'] = 'Délai avant l\'indexation (en secondes)'; $lang['relnofollow'] = 'Utiliser rel="nofollow" sur les liens extérieurs'; $lang['mailguard'] = 'Brouiller les adresses de courriel'; $lang['iexssprotect'] = 'Vérifier la présence de code JavaScript ou HTML malveillant dans les fichiers envoyés'; -$lang['showuseras'] = 'Qu\'afficher en montrant les utilisateurs qui ont récemment édité la page'; +$lang['showuseras'] = 'Qu\'afficher en montrant les utilisateurs qui ont récemment modifié la page'; $lang['useacl'] = 'Utiliser les listes de contrôle d\'accès (ACL)'; $lang['autopasswd'] = 'Auto-générer les mots de passe'; $lang['authtype'] = 'Mécanisme d\'authentification'; -$lang['passcrypt'] = 'Méthode de cryptage des mots de passe'; +$lang['passcrypt'] = 'Méthode de chiffrement des mots de passe'; $lang['defaultgroup'] = 'Groupe par défaut'; -$lang['superuser'] = 'Superuser - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant un accès complet à toutes les pages quelquesoit le paramétrage des ACL'; +$lang['superuser'] = 'Superuser - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant un accès complet à toutes les pages quelque soit le paramétrage des ACL'; $lang['manager'] = 'Manager - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant accès à certaines fonctions de gestion'; $lang['profileconfirm'] = 'Confirmer par mot de passe les modifications de profil'; $lang['disableactions'] = 'Actions à désactiver dans DokuWiki'; $lang['disableactions_check'] = 'Vérifier'; $lang['disableactions_subscription'] = 'Abonnement aux pages'; -$lang['disableactions_wikicode'] = 'Afficher source'; +$lang['disableactions_wikicode'] = 'Afficher le texte source'; $lang['disableactions_other'] = 'Autres actions (séparées par des virgules)'; $lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)'; @@ -95,64 +96,65 @@ $lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être $lang['xmlrpc'] = 'Activer l\'interface XML-RPC.'; $lang['xmlrpcuser'] = 'Restreindre l\'accès à XML-RPC aux groupes et utilisateurs indiqués ici. Laisser vide afin que tout le monde y ait accès.'; $lang['updatecheck'] = 'Vérifier les mises à jour ? DokuWiki doit pouvoir contacter splitbrain.org.'; -$lang['userewrite'] = 'URLs esthétiques'; -$lang['useslash'] = 'Utiliser slash comme séparateur de catégorie dans les URLs'; +$lang['userewrite'] = 'URL esthétiques'; +$lang['useslash'] = 'Utiliser « / » comme séparateur de catégorie dans les URL'; $lang['usedraft'] = 'Enregistrer automatiquement un brouillon pendant l\'édition'; -$lang['sepchar'] = 'Séparateur de nom de page'; -$lang['canonical'] = 'Utiliser des URLs canoniques'; +$lang['sepchar'] = 'Séparateur de mots dans les noms de page'; +$lang['canonical'] = 'Utiliser des URL canoniques'; $lang['autoplural'] = 'Rechercher les formes plurielles dans les liens'; $lang['compression'] = 'Méthode de compression pour les fichiers dans attic'; -$lang['cachetime'] = 'Âge maximum d\'un fichier en cache (sec)'; -$lang['locktime'] = 'Âge maximum des fichiers verrous (sec)'; +$lang['cachetime'] = 'Âge maximum d\'un fichier en cache (en secondes)'; +$lang['locktime'] = 'Âge maximum des fichiers verrous (en secondes)'; $lang['fetchsize'] = 'Taille maximale (en octets) du fichier que fetch.php peut télécharger'; $lang['notify'] = 'Notifier les modifications à cette adresse de courriel'; $lang['registernotify'] = 'Envoyer un courriel annonçant les nouveaux utilisateurs enregistrés à cette adresse'; $lang['mailfrom'] = 'Expéditeur des notifications par courriel du wiki'; -$lang['gzip_output'] = 'Utiliser Content-Encoding gzip pour xhtml'; +$lang['gzip_output'] = 'Utiliser Content-Encoding gzip pour XHTML'; $lang['gdlib'] = 'Version de GD Lib'; $lang['im_convert'] = 'Chemin vers l\'outil de conversion d\'ImageMagick'; -$lang['jpg_quality'] = 'Qualité de la compression JPG (0-100)'; +$lang['jpg_quality'] = 'Qualité de la compression JPEG (0-100)'; $lang['subscribers'] = 'Activer l\'abonnement aux pages'; -$lang['compress'] = 'Compresser CSS & JavaScript'; +$lang['subscribe_time'] = 'Délai après lequel les listes d\'abonnement et résumés sont envoyés (en secondes). Devrait être plus petit que le délai précisé dans recent_days.'; +$lang['compress'] = 'Compresser CSS et JavaScript'; $lang['hidepages'] = 'Cacher les pages correspondant à (expression régulière)'; $lang['send404'] = 'Renvoyer "HTTP 404/Page Non Trouvée" pour les pages introuvables'; -$lang['sitemap'] = 'Générer une carte G|oogle du site tous les (jours)'; +$lang['sitemap'] = 'Fréquence de génération une carte Google du site (en jours)'; $lang['broken_iua'] = 'La fonction ignore_user_abort est-elle opérationnelle sur votre système ? Ceci peut empêcher le fonctionnement de l\'index de recherche. IIS+PHP/ CGI dysfonctionne. Voir le bug 852 pour plus d\'info.'; $lang['xsendfile'] = 'Utiliser l\'en-tête X-Sendfile pour permettre au serveur Web de délivrer des fichiers statiques ? Votre serveur Web doit supporter cette fonctionnalité.'; -$lang['renderer_xhtml'] = 'Moteur de rendu du format de sortie principal (xhtml)'; -$lang['renderer__core'] = '%s (dokuwiki core)'; -$lang['renderer__plugin'] = '%s (plugin)'; +$lang['renderer_xhtml'] = 'Moteur de rendu du format de sortie principal (XHTML)'; +$lang['renderer__core'] = '%s (cœur de dokuwiki)'; +$lang['renderer__plugin'] = '%s (module externe)'; $lang['rememberme'] = 'Permettre de conserver de manière permanente les cookies de connexion (mémoriser)'; $lang['rss_type'] = 'Type de flux RSS'; $lang['rss_linkto'] = 'Lien du flux RSS vers'; $lang['rss_content'] = 'Quel contenu afficher dans le flux RSS ?'; -$lang['rss_update'] = 'Fréquence de mise à jour du flux RSS (sec)'; -$lang['recent_days'] = 'Signaler les pages modifiées depuis (jours)'; +$lang['rss_update'] = 'Fréquence de mise à jour du flux RSS (en secondes)'; +$lang['recent_days'] = 'Signaler les pages modifiées depuis (en jours)'; $lang['rss_show_summary'] = 'Le flux XML affiche le résumé dans le titre'; $lang['target____wiki'] = 'Cible pour liens internes'; $lang['target____interwiki'] = 'Cible pour liens interwiki'; $lang['target____extern'] = 'Cible pour liens externes'; -$lang['target____media'] = 'Cible pour liens media'; -$lang['target____windows'] = 'Cible pour liens windows'; -$lang['proxy____host'] = 'Proxy - hôte'; -$lang['proxy____port'] = 'Proxy - port'; -$lang['proxy____user'] = 'Proxy - identifiant'; -$lang['proxy____pass'] = 'Proxy - mot de passe'; -$lang['proxy____ssl'] = 'Proxy - utilisation de ssl'; +$lang['target____media'] = 'Cible pour liens média'; +$lang['target____windows'] = 'Cible pour liens vers partages Windows'; +$lang['proxy____host'] = 'Proxy - Serveur hôte'; +$lang['proxy____port'] = 'Proxy - Numéro de port'; +$lang['proxy____user'] = 'Proxy - Identifiant'; +$lang['proxy____pass'] = 'Proxy - Mot de passe'; +$lang['proxy____ssl'] = 'Proxy - Utilisation de SSL'; $lang['safemodehack'] = 'Activer l\'option Mode sans échec'; -$lang['ftp____host'] = 'FTP - hôte pour Mode sans échec'; -$lang['ftp____port'] = 'FTP - port pour Mode sans échec'; -$lang['ftp____user'] = 'FTP - identifiant pour Mode sans échec'; -$lang['ftp____pass'] = 'FTP - mot de passe pour Mode sans échec'; -$lang['ftp____root'] = 'FTP - répertoire racine pour Mode sans échec'; +$lang['ftp____host'] = 'FTP - Serveur hôte pour Mode sans échec'; +$lang['ftp____port'] = 'FTP - Numéro de port pour Mode sans échec'; +$lang['ftp____user'] = 'FTP - Identifiant pour Mode sans échec'; +$lang['ftp____pass'] = 'FTP - Mot de passe pour Mode sans échec'; +$lang['ftp____root'] = 'FTP - Répertoire racine pour Mode sans échec'; $lang['license_o_'] = 'Aucune choisie'; $lang['typography_o_0'] = 'aucun'; $lang['typography_o_1'] = 'guillemets uniquement'; $lang['typography_o_2'] = 'tout signe typographique (peut ne pas fonctionner)'; $lang['userewrite_o_0'] = 'aucun'; -$lang['userewrite_o_1'] = '.htaccess'; -$lang['userewrite_o_2'] = 'DokuWiki'; +$lang['userewrite_o_1'] = 'Fichier .htaccess'; +$lang['userewrite_o_2'] = 'Interne à DokuWiki'; $lang['deaccent_o_0'] = 'off'; $lang['deaccent_o_1'] = 'supprimer les accents'; $lang['deaccent_o_2'] = 'convertir en roman'; @@ -165,8 +167,8 @@ $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Résumé'; -$lang['rss_content_o_diff'] = 'Diff Unifié'; -$lang['rss_content_o_htmldiff'] = 'Diff formaté en table HTML'; +$lang['rss_content_o_diff'] = 'Diff. unifié'; +$lang['rss_content_o_htmldiff'] = 'Diff. formaté en table HTML'; $lang['rss_content_o_html'] = 'page complète au format HTML'; $lang['rss_linkto_o_diff'] = 'liste des différences'; $lang['rss_linkto_o_page'] = 'page révisée'; @@ -179,9 +181,9 @@ $lang['xsendfile_o_0'] = 'ne pas utiliser'; $lang['xsendfile_o_1'] = 'Entête propriétaire lighttpd (avant la version 1.5)'; $lang['xsendfile_o_2'] = 'Entête standard X-Sendfile'; $lang['xsendfile_o_3'] = 'En-tête propriétaire Nginx X-Accel-Redirect'; -$lang['showuseras_o_loginname'] = 'Nom d\'utilisateur'; +$lang['showuseras_o_loginname'] = 'Identifiant de l\'utilisateur'; $lang['showuseras_o_username'] = 'Nom de l\'utilisateur'; -$lang['showuseras_o_email'] = 'Le courriel de l\'utilisateur (obfusqué suivant les paramètres de brouillage sélectionnés)'; +$lang['showuseras_o_email'] = 'Courriel de l\'utilisateur (brouillé suivant les paramètres de brouillage sélectionnés)'; $lang['showuseras_o_email_link'] = 'Courriel de l\'utilisateur en tant que lien mailto:'; $lang['useheading_o_0'] = 'Jamais'; $lang['useheading_o_navigation'] = 'Navigation seulement'; diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt index 28696ebb4..c43e44684 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 plugins ====== +====== Gestion des modules externes ====== -Cette page vous permet de gérer tout ce qui a trait aux [[doku>plugins|plugins]] de DokuWiki. Pour télécharger et installer un plugin, 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>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 eec17cdbb..4e4bca214 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -13,14 +13,15 @@ * @author olivier duperray * @author Vincent Feltz * @author Philippe Bajoit + * @author Florian Gaub */ -$lang['menu'] = 'Gestion des module externes'; +$lang['menu'] = 'Gestion des modules externes'; $lang['download'] = 'Télécharger et installer un nouveau module'; -$lang['manage'] = 'Plugins installés'; -$lang['btn_info'] = 'info'; -$lang['btn_update'] = 'rafraîchir'; -$lang['btn_delete'] = 'effacer'; -$lang['btn_settings'] = 'paramètres'; +$lang['manage'] = 'Modules installés'; +$lang['btn_info'] = 'Info'; +$lang['btn_update'] = 'Mettre à jour'; +$lang['btn_delete'] = 'Supprimer'; +$lang['btn_settings'] = 'Paramètres'; $lang['btn_download'] = 'Télécharger'; $lang['btn_enable'] = 'Enregistrer'; $lang['url'] = 'URL'; @@ -28,33 +29,33 @@ $lang['installed'] = 'Installé :'; $lang['lastupdate'] = 'Dernière mise à jour :'; $lang['source'] = 'Source :'; $lang['unknown'] = 'inconnu'; -$lang['updating'] = 'Mise à jour...'; -$lang['updated'] = 'Plugin %s mis à jour avec succès'; +$lang['updating'] = 'Mise à jour…'; +$lang['updated'] = 'Modules %s mis à jour avec succès'; $lang['updates'] = 'Les modules suivants ont été mis à jour avec succès'; $lang['update_none'] = 'Aucune mise à jour n\'a été trouvée.'; -$lang['deleting'] = 'Suppression...'; -$lang['deleted'] = 'Plugin %s supprimé.'; -$lang['downloading'] = 'Téléchargement...'; -$lang['downloaded'] = 'Plugin %s installé avec succès'; +$lang['deleting'] = 'Suppression…'; +$lang['deleted'] = 'Module %s supprimé.'; +$lang['downloading'] = 'Téléchargement…'; +$lang['downloaded'] = 'Module %s installé avec succès'; $lang['downloads'] = 'Les modules suivants ont été installés avec succès :'; $lang['download_none'] = 'Aucun module n\'était trouvé, ou un problème inconnu est survenu durant le téléchargement et l\'installation.'; -$lang['plugin'] = 'Plugin :'; +$lang['plugin'] = 'Module :'; $lang['components'] = 'Composants'; $lang['noinfo'] = 'Ce module externe n\'a transmis aucune information, il pourrait être invalide.'; $lang['name'] = 'Nom :'; $lang['date'] = 'Date :'; $lang['type'] = 'Type :'; -$lang['desc'] = 'Description :'; +$lang['desc'] = 'Description :'; $lang['author'] = 'Auteur :'; -$lang['www'] = 'Web :'; +$lang['www'] = 'Site web :'; $lang['error'] = 'Une erreur inconnue est survenue.'; -$lang['error_download'] = 'Impossible de télécharger le fichier du plugin: %s'; -$lang['error_badurl'] = 'URL suspecte - impossible de déterminer le nom du fichier à partir de l\'URL'; +$lang['error_download'] = 'Impossible de télécharger le fichier du module : %s'; +$lang['error_badurl'] = 'URL suspecte. Impossible de déterminer le nom du fichier à partir de l\'URL'; $lang['error_dircreate'] = 'Impossible de créer le répertoire temporaire pour réceptionner le téléchargement'; -$lang['error_decompress'] = 'Le gestionnaire de plugin a été incapable de décompresser le fichier téléchargé. Ceci peut être le résultat d\'un mauvais téléchargement, auquel cas vous devriez réessayer ; ou bien le format de compression est inconnu, auquel cas vous devez télécharger et installer le plugin manuellement.'; -$lang['error_copy'] = 'Une erreur de copie est survenue lors de l\'installation des fichiers du plugin %s: votre disque est peut-être plein ou les droits d\'accès au fichier sont incorrects. Il a pu en résulter une installation partielle du plugin rendant votre installation du wiki instable.'; -$lang['error_delete'] = 'Une erreur est survenue à la suppression du plugin %s. La raison la plus probable est l\'insuffisance des droits sur les fichiers ou le répertoire.'; -$lang['enabled'] = 'Plugin %s activé.'; -$lang['notenabled'] = 'Le plugin %s n\'a pas pu être activé, vérifiez le fichier des permissions.'; -$lang['disabled'] = 'Plugin %s désactivé.'; -$lang['notdisabled'] = 'Le plugin %s n\'a pas pu être désactivé, vérifiez le fichier des permissions.'; +$lang['error_decompress'] = 'Le gestionnaire de modules externes a été incapable de décompresser le fichier téléchargé. Ceci peut être le résultat d\'un mauvais téléchargement, auquel cas vous devriez réessayer ; ou bien le format de compression est inconnu, auquel cas vous devez télécharger et installer le module manuellement.'; +$lang['error_copy'] = 'Une erreur de copie est survenue lors de l\'installation des fichiers du module %s : votre disque est peut-être plein ou les droits d\'accès au fichier sont incorrects. Il a pu en résulter une installation partielle du module rendant votre installation du wiki instable.'; +$lang['error_delete'] = 'Une erreur est survenue à la suppression du module %s. La raison la plus probable est l\'insuffisance des droits sur les fichiers ou le répertoire.'; +$lang['enabled'] = 'Module %s activé.'; +$lang['notenabled'] = 'Le module %s n\'a pas pu être activé, vérifiez le fichier des permissions.'; +$lang['disabled'] = 'Module %s désactivé.'; +$lang['notdisabled'] = 'Le module %s n\'a pas pu être désactivé, vérifiez le fichier des permissions.'; diff --git a/lib/plugins/popularity/lang/fr/intro.txt b/lib/plugins/popularity/lang/fr/intro.txt index 8e8adbb3c..58be61d03 100644 --- a/lib/plugins/popularity/lang/fr/intro.txt +++ b/lib/plugins/popularity/lang/fr/intro.txt @@ -4,7 +4,7 @@ Cet outil collecte des données anonymes concernant votre wiki et vous permet de Vous êtes encouragé à répéter l'opération de collecte et d'envoi des données anonymes de temps en temps afin d'informer les développeurs de la croissance de votre wiki. -Les données collectées contiennent des informations telle que votre version de DokuWiki, le nombre et la taille de vos pages et fichiers, les plugins installés ainsi que des informations sur la version de PHP installée. +Les données collectées contiennent des informations telle que votre version de DokuWiki, le nombre et la taille de vos pages et fichiers, les modules installés ainsi que des informations sur la version de PHP installée. -Les données brutes qui sont envoyées sont affichées ci dessous. Merci d'utiliser le bouton "Envoyer les données" pour expédier l'information. +Les données brutes qui sont envoyées sont affichées ci dessous. Merci d'utiliser le bouton « Envoyer les données » pour expédier l'information. diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index 48ecbd305..45cc7b593 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -10,6 +10,7 @@ * @author olivier duperray * @author Vincent Feltz * @author Philippe Bajoit + * @author Florian Gaub */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargé)'; $lang['submit'] = 'Envoyer les données'; diff --git a/lib/plugins/revert/lang/fr/intro.txt b/lib/plugins/revert/lang/fr/intro.txt index db61ac9cf..6dcbe74b9 100644 --- a/lib/plugins/revert/lang/fr/intro.txt +++ b/lib/plugins/revert/lang/fr/intro.txt @@ -1,3 +1,3 @@ -====== Gestion des réversions ====== +====== Gestionnaire de réversions ====== -Cette page peut vous aider à restaurer des pages après une attaque de spam. Pour trouver la liste des pages victimes des spammeurs, entrez un motif de recherche (tel qu'une URL de spam), puis confirmez que les pages trouvées contiennent du spam et annulez leurs éditions. +Cette page peut vous aider à restaurer des pages après une attaque de spam. Pour trouver la liste des pages vandalisées, entrez un motif de recherche (p. ex. une URL de spam), puis confirmez que les pages trouvées contiennent du spam et annulez leurs éditions. diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 0f58fad6e..982b44f5a 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -11,13 +11,14 @@ * @author olivier duperray * @author Vincent Feltz * @author Philippe Bajoit + * @author Florian Gaub */ $lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; -$lang['revert'] = 'Annuler les éditions sélectionnées'; +$lang['revert'] = 'Annuler les modifications sélectionnées'; $lang['reverted'] = '%s restauré à la révision %s'; $lang['removed'] = '%s supprimé'; $lang['revstart'] = 'Processus de réversion démarré. Ceci peut prendre longtemps. Si le script dépasse le délai avant de terminer, vous devrez restaurer de plus petits groupes de pages.'; $lang['revstop'] = 'Processus de réversion terminé avec succès.'; -$lang['note1'] = 'Note : cette recherche est insensible à la casse'; -$lang['note2'] = 'Note: cette page sera révisée à la version précédente ne contenant pas le terme spammeur %s.'; +$lang['note1'] = 'Note : cette recherche est insensible à la casse'; +$lang['note2'] = 'Note : cette page sera révisée à la version précédente ne contenant pas le terme spammeur %s.'; diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index d0fa09074..6ae537618 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -12,6 +12,7 @@ * @author olivier duperray * @author Vincent Feltz * @author Philippe Bajoit + * @author Florian Gaub */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; @@ -27,8 +28,8 @@ $lang['value'] = 'Valeur'; $lang['add'] = 'Ajouter'; $lang['delete'] = 'Supprimer'; $lang['delete_selected'] = 'Supprimer la sélection'; -$lang['edit'] = 'Éditer'; -$lang['edit_prompt'] = 'Éditer cet utilisateur'; +$lang['edit'] = 'Modifier'; +$lang['edit_prompt'] = 'Modifier cet utilisateur'; $lang['modify'] = 'Enregistrer les modifications'; $lang['search'] = 'Rechercher'; $lang['search_prompt'] = 'Effectuer la recherche'; @@ -38,9 +39,9 @@ $lang['summary'] = 'Affichage des utilisateurs %1$d-%2$d parmi %3$ $lang['nonefound'] = 'Aucun utilisateur trouvé. %d utilisateur(s) au total.'; $lang['delete_ok'] = '%d utilisateurs effacés'; $lang['delete_fail'] = '%d effacement échoué.'; -$lang['update_ok'] = 'utilisateur mis à jour avec succès'; -$lang['update_fail'] = 'échec de la mise à jour utilisateur'; -$lang['update_exists'] = 'échec du changement de nom d\'utilisateur, le nom spécifié (%s) existe déjà (toutes les autres modifications seront effectuées).'; +$lang['update_ok'] = 'Utilisateur mis à jour avec succès'; +$lang['update_fail'] = 'Échec de la mise à jour utilisateur'; +$lang['update_exists'] = 'Échec du changement de nom d\'utilisateur, le nom spécifié (%s) existe déjà (toutes les autres modifications seront effectuées).'; $lang['start'] = 'Démarrage'; $lang['prev'] = 'Précédent'; $lang['next'] = 'Suivant'; -- cgit v1.2.3 From 90a0f2e151531db5b76c3d1c340f70da35922456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Med=C3=BAlio?= Date: Mon, 8 Mar 2010 18:32:50 +0100 Subject: Galician language update --- lib/plugins/acl/lang/gl/help.txt | 12 +- lib/plugins/acl/lang/gl/lang.php | 40 +++-- lib/plugins/config/lang/gl/intro.txt | 8 +- lib/plugins/config/lang/gl/lang.php | 236 ++++++++++++++-------------- lib/plugins/plugin/lang/gl/admin_plugin.txt | 4 +- lib/plugins/plugin/lang/gl/lang.php | 48 +++--- lib/plugins/popularity/lang/gl/intro.txt | 10 +- lib/plugins/popularity/lang/gl/lang.php | 8 +- lib/plugins/revert/lang/gl/intro.txt | 4 +- lib/plugins/revert/lang/gl/lang.php | 22 ++- lib/plugins/usermanager/lang/gl/add.txt | 2 +- lib/plugins/usermanager/lang/gl/delete.txt | 2 +- lib/plugins/usermanager/lang/gl/edit.txt | 2 +- lib/plugins/usermanager/lang/gl/intro.txt | 2 +- lib/plugins/usermanager/lang/gl/lang.php | 62 ++++---- lib/plugins/usermanager/lang/gl/list.txt | 2 +- 16 files changed, 226 insertions(+), 238 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/gl/help.txt b/lib/plugins/acl/lang/gl/help.txt index c427b182f..593dcef07 100644 --- a/lib/plugins/acl/lang/gl/help.txt +++ b/lib/plugins/acl/lang/gl/help.txt @@ -1,11 +1,11 @@ -=== Axuda rápida: === +=== Axuda Rápida: === -Nesta páxina pode engadir e eliminar os permisos para os nomes de espazo e as páxinas do seu wiki. +Nesta páxina podes engadir e eliminar permisos para os nomes de espazo e as páxinas do teu wiki. -O panel da esquerda mostra todos os nomes de espazo e páxinas dispoñíbeis. +O panel da esquerda amosa todos os nomes de espazo e páxinas dispoñíbeis. -O formulario de arriba permítelle ver e modificar os permisos da persoa usuaria ou grupo seleccionada. +O formulario de enriba permíteche ver e modificares os permisos do usuario ou grupo seleccionado. -Na táboa de abaixo móstranse todas as regras de control de accesos estabelecidas. Pode empregala para cambiar ou eliminar varias regras dun xeito rápido. +Na táboa de embaixo amósanse todas as regras de control de accesos estabelecidas. Podes empregala para mudares ou eliminares varias regras dun xeito rápido. -A lectura da [[doku>acl|documentación oficial da ACL]] pode servirlle de axuda para comprender como funciona o control de accesos no Dokuwiki. +A lectura da [[doku>acl|documentación oficial da ACL]] pode servirche de axuda para comprenderes como funciona o control de accesos no Dokuwiki. diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php index 184cf7e1d..774bf207a 100644 --- a/lib/plugins/acl/lang/gl/lang.php +++ b/lib/plugins/acl/lang/gl/lang.php @@ -2,35 +2,33 @@ /** * Galicianlanguage file * - * @author CiberIrmandade da Fala - * @author Tagen Ata - * @author Leandro Regueiro + * @author Medúlio */ -$lang['admin_acl'] = 'Xestión da Lista de control de acceso (ACL)'; +$lang['admin_acl'] = 'Xestión da Lista de Control de Acceso (ACL)'; $lang['acl_group'] = 'Grupo'; -$lang['acl_user'] = 'Usuaria/o'; +$lang['acl_user'] = 'Usuario'; $lang['acl_perms'] = 'Permisos para'; $lang['page'] = 'Páxina'; $lang['namespace'] = 'Nome de espazo'; -$lang['btn_select'] = 'Selecciona'; -$lang['p_user_id'] = 'A persoa usuaria %s dispón actualmente dos seguintes permisos na páxina %s: %s.'; -$lang['p_user_ns'] = 'A persoa usuaria %s dispón actualmente dos seguintes permisos no nome de espazo %s: %s.'; -$lang['p_group_id'] = 'As e os integrantes do grupo %s dispoñen actualmente dos seguintes permisos na páxina %s: %s.'; -$lang['p_group_ns'] = 'As e os integrantes do grupo %s dispoñen actualmente dos seguintes permisos no nome de espazo %s: %s.'; -$lang['p_choose_id'] = 'Insira un nome de usuaria/o ou grupo no formulario de arriba para ver ou editar os permisos estabelecidos para a páxina %s.'; -$lang['p_choose_ns'] = 'Insira un nome de usuaria/o ou grupo no formulario de arriba para ver ou editar os permisos estabelecidos no nome de espazo %s.'; -$lang['p_inherited'] = 'Nota: Estes permisos non foron estabelecidos explicitamente senón que foron herdados doutros grupos ou nomes de espazo maiores.'; -$lang['p_isadmin'] = 'Nota: O grupo ou a persoa usuaria seleccionado terá sempre permisos completos por estar configurado como superusuaria/o.'; -$lang['p_include'] = 'Os permisos máis grandes inclúen os menores. Os permisos de Creación, Subida e Eliminación só se aplican aos nomes de espazo, non ás páxinas.'; -$lang['current'] = 'Regras ACL actuais'; -$lang['where'] = 'Páxina/Nome de espazo'; -$lang['who'] = 'Usuaria/o/Grupo'; +$lang['btn_select'] = 'Escolle'; +$lang['p_user_id'] = 'O usuario %s dispón actualmente dos seguintes permisos na páxina %s: %s.'; +$lang['p_user_ns'] = 'O usuario %s dispón actualmente dos seguintes permisos no nome de espazo %s: %s.'; +$lang['p_group_id'] = 'Os membros do grupo %s dispoñen actualmente dos seguintes permisos na páxina %s: %s.'; +$lang['p_group_ns'] = 'Os membros do grupo %s cdispoñen actualmente dos seguintes permisos no nome de espazo %s: %s.'; +$lang['p_choose_id'] = 'Por favor, insire un usuario ou grupo no formulario de enriba para ver ou editar os permisos establecidos para a páxina %s.'; +$lang['p_choose_ns'] = 'Por favor insire un usuario ou grupo no formulario de enriba para ver ou editar os permisos establecidos no nome de espazo %s.'; +$lang['p_inherited'] = 'Nota: Estes permisos non foron establecidos explicitamente senón que foron herdadas de outros grupos ou nomes de espazo meirandes.'; +$lang['p_isadmin'] = 'Nota: O grupo ou usuario seleccionado terá sempre permisos completos por estar configurado como super-usuario.'; +$lang['p_include'] = 'Os permisos meirandes inclúen os menores. Os permisos de Creación, Subida e Eliminado só se aplican aos nomes de espazo, non ás páxinas.'; +$lang['current'] = 'Regras ACL Actuais'; +$lang['where'] = 'Páxina/Nome de Espazo'; +$lang['who'] = 'Usuario/Grupo'; $lang['perm'] = 'Permisos'; $lang['acl_perm0'] = 'Ningún'; $lang['acl_perm1'] = 'Ler'; $lang['acl_perm2'] = 'Editar'; $lang['acl_perm4'] = 'Crear'; -$lang['acl_perm8'] = 'Subir ficheiros'; +$lang['acl_perm8'] = 'Subir arquivos'; $lang['acl_perm16'] = 'Eliminar'; -$lang['acl_new'] = 'Engadir una entrada'; -$lang['acl_mod'] = 'Modificar unha entrada'; +$lang['acl_new'] = 'Engadir nova Entrada'; +$lang['acl_mod'] = 'Modificar Entrada'; diff --git a/lib/plugins/config/lang/gl/intro.txt b/lib/plugins/config/lang/gl/intro.txt index 27feedfed..cafe28e13 100644 --- a/lib/plugins/config/lang/gl/intro.txt +++ b/lib/plugins/config/lang/gl/intro.txt @@ -1,7 +1,7 @@ -====== Xestor de configuración ====== +====== Xestor de Configuración ====== -Use esta páxina para controlar a configuración da súa instalación do Dokuwiki. Para encontrar axuda sobre cada unha das opcións da configuración vaia a [[doku>config]]. Para obter máis información sobre este plugin vexa o documento [[doku>plugin:config]]. +Usa esta páxina para controlares a configuración da túa instalación do Dokuwiki. Para atopares axuda verbo de cada opción da configuración vai a [[doku>config]]. Para obteres pormenores desta extensión bota un ollo a [[doku>plugin:config]]. -As opcións que se mostran cun fondo de cor vermello claro, están protexidas e non poden ser alteradas con este plugin. As opcións que se mostran cun fondo de cor azul, son valores predeterminados. As opcións que teñen un fondo branco foron configuradas de modo local para esta instalación en concreto. Ambas as dúas, as opcións azuis e brancas, poden ser alteradas. +As opcións que amosan un fondo de cor vermella clara están protexidas e non poden ser alteradas con esta extensión. As opcións que amosan un fondo de cor azul son valores predeterminados e as opcións que teñen fondo branco foron configuradas de xeito local para esta instalación en concreto. Ámbalas dúas, as opcións azuis e brancas, poden ser alteradas. -Lembre premer no botón **GARDAR** antes de saír desta páxina ou, en caso contrario, as súas modificacións perderanse. +Lembra premer no boton **GARDAR** denantes de saíres desta páxina ou, en caso contrario, os teus trocos perderanse. diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index eb7559e2f..2129beec0 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -2,40 +2,38 @@ /** * Galicianlanguage file * - * @author CiberIrmandade da Fala - * @author Tagen Ata - * @author Leandro Regueiro + * @author Medúlio */ -$lang['menu'] = 'Opcións de configuración'; -$lang['error'] = 'A configuración non foi actualizada debido a un valor non válido; verifique as modificacións feitas e envíeas de novo. -
Os valores incorrectos móstranse cun bordo de cor vermella.'; -$lang['updated'] = 'A configuración foi actualizada correctamente.'; -$lang['nochoice'] = '(non hai outras opcións dispoñíbeis)'; -$lang['locked'] = 'Non se puido actualizar o ficheiro de configuración; se isto non debería ser así,
-asegúrese de que o nome do ficheiro de configuración local e os permisos son correctos.'; -$lang['danger'] = 'Perigo: Se modifica esta opción podería facer que tanto o seu Wiki como o menú de configuración fiquen inaccesíbeis.'; -$lang['warning'] = 'Aviso: Se modifica esta opción podería causar un comportamento inesperado.'; -$lang['security'] = 'Aviso de seguranza: Cambiar esta opción podería supoñer un perigo de seguranza.'; -$lang['_configuration_manager'] = 'Xestor de configuración'; +$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. +
O(s) valor(es) incorrecto(s) amosanse cinguidos por un borde vermello.'; +$lang['updated'] = 'Configuración actualizada correctamente.'; +$lang['nochoice'] = '(non hai outras escollas dispoñibles)'; +$lang['locked'] = 'Non se puido actualizar o arquivo de configuración, se non ocorre como debería ser,
+asegúrate de que o nome do arquivo de configuración local e os permisos son correctos.'; +$lang['danger'] = 'Perigo: mudando esta opción podes facer inaccesíbeis o teu wiki e máis o menú de configuración.'; +$lang['warning'] = 'Ollo: mudando esta opción poden aparecer comportamentos do aplicativo non agardados.'; +$lang['security'] = 'Aviso de seguranza: mudando esta opción poden aparecer riscos de seguranza.'; +$lang['_configuration_manager'] = 'Xestor de Configuración'; $lang['_header_dokuwiki'] = 'Configuración do DokuWiki'; -$lang['_header_plugin'] = 'Configuración de plugins'; -$lang['_header_template'] = 'Configuración do modelo'; -$lang['_header_undefined'] = 'Configuración indefinida'; -$lang['_basic'] = 'Configuración básica'; -$lang['_display'] = 'Configuración da visualización'; -$lang['_authentication'] = 'Configuración da autenticación'; -$lang['_anti_spam'] = 'Configuración do Anti-Spam'; -$lang['_editing'] = 'Configuración da edición'; -$lang['_links'] = 'Configuración das ligazóns'; -$lang['_media'] = 'Configuración dos ficheiros multimedia'; -$lang['_advanced'] = 'Configuración avanzada'; -$lang['_network'] = 'Configuración de rede'; -$lang['_plugin_sufix'] = 'Configuración de plugins'; -$lang['_template_sufix'] = 'Configuración do modelo'; -$lang['_msg_setting_undefined'] = 'Non hai configuracións de metadatos.'; -$lang['_msg_setting_no_class'] = 'Non hai configuracións de clase.'; -$lang['_msg_setting_no_default'] = 'Non hai un valor predeterminado.'; -$lang['fmode'] = 'Modo de creación de ficheiros'; +$lang['_header_plugin'] = 'Configuración de Extensións'; +$lang['_header_template'] = 'Configuración de Sobreplanta'; +$lang['_header_undefined'] = 'Configuración Indefinida'; +$lang['_basic'] = 'Configuración Básica'; +$lang['_display'] = 'Configuración de Visualización'; +$lang['_authentication'] = 'Configuración de Autenticación'; +$lang['_anti_spam'] = 'Configuración de Anti-Correo-lixo'; +$lang['_editing'] = 'Configuración de Edición'; +$lang['_links'] = 'Configuración de Ligazóns'; +$lang['_media'] = 'Configuración de Media'; +$lang['_advanced'] = 'Configuración Avanzada'; +$lang['_network'] = 'Configuración de Rede'; +$lang['_plugin_sufix'] = 'Configuración de Extensións'; +$lang['_template_sufix'] = 'Configuración de Sobreplanta'; +$lang['_msg_setting_undefined'] = 'Non hai configuración de metadatos.'; +$lang['_msg_setting_no_class'] = 'Non hai configuración de clase.'; +$lang['_msg_setting_no_default'] = 'Non hai valor predeterminado.'; +$lang['fmode'] = 'Modo de creación de arquivos'; $lang['dmode'] = 'Modo de creación de directorios'; $lang['lang'] = 'Idioma'; $lang['basedir'] = 'Directorio base'; @@ -43,103 +41,103 @@ $lang['baseurl'] = 'URL base'; $lang['savedir'] = 'Directorio no que se gardarán os datos'; $lang['start'] = 'Nome da páxina inicial'; $lang['title'] = 'Título do Wiki'; -$lang['template'] = 'Modelo'; -$lang['license'] = 'Baixo que licenza será liberado os seus contidos?'; -$lang['fullpath'] = 'Mostrar o camiño completo das páxinas no pé das mesmas'; -$lang['recent'] = 'Cambios recentes'; +$lang['template'] = 'Sobreplanta'; +$lang['license'] = 'Baixo de que licenza será ceibado o teu contido?'; +$lang['fullpath'] = 'Amosar a ruta completa das páxinas no pé das mesmas'; +$lang['recent'] = 'Trocos recentes'; $lang['breadcrumbs'] = 'Número de niveis da estrutura de navegación'; $lang['youarehere'] = 'Niveis xerárquicos da estrutura de navegación'; $lang['typography'] = 'Facer substitucións tipográficas'; $lang['htmlok'] = 'Permitir a inserción de HTML'; $lang['phpok'] = 'Permitir a inserción de PHP'; -$lang['dformat'] = 'Formato de data (vexa a función strftime do PHP)'; +$lang['dformat'] = 'Formato de Data (bótalle un ollo á función strftime do PHP)'; $lang['signature'] = 'Sinatura'; $lang['toptoclevel'] = 'Nivel superior para a táboa de contidos'; -$lang['tocminheads'] = 'Cantidade mínima de liñas de cabeceira que determinará se se xerará a TDC'; +$lang['tocminheads'] = 'Cantidade mínima de liñas de cabeceira que determinará se a TDC vai ser xerada'; $lang['maxtoclevel'] = 'Nivel máximo para a táboa de contidos'; $lang['maxseclevel'] = 'Nivel máximo de edición da sección'; $lang['camelcase'] = 'Utilizar CamelCase para as ligazóns'; -$lang['deaccent'] = 'Limpar os nomes de páxina'; +$lang['deaccent'] = 'Limpar nomes de páxina'; $lang['useheading'] = 'Utilizar a primeira cabeceira para os nomes de páxina'; -$lang['refcheck'] = 'Comprobar a referencia de multimedia'; -$lang['refshow'] = 'Número de referencias multimedia para mostrar'; -$lang['allowdebug'] = 'Permitir a depuración desactíveo se non o precisa!'; -$lang['usewordblock'] = 'Bloquear o spam segundo unha listaxe de palabras'; -$lang['indexdelay'] = 'Atraso antes de indexar (en seg.)'; +$lang['refcheck'] = 'Comprobar a referencia media'; +$lang['refshow'] = 'Número de referencias media a amosar'; +$lang['allowdebug'] = 'Permitir o depurado desactívao se non o precisas!'; +$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'; -$lang['mailguard'] = 'Escurecer os enderezos de correo'; -$lang['iexssprotect'] = 'Comprobar os ficheiros que se suban na procura dun posíbel código JavaScript ou HTML maliciosos'; -$lang['showuseras'] = 'Que se mostrará ao informar da persoa usuaria que fixo a última modificación dunha páxina?'; -$lang['useacl'] = 'Utilizar a lista de control de acceso (ACL)'; -$lang['autopasswd'] = 'Xerar os contrasinais automaticamente'; +$lang['mailguard'] = 'Ofuscar enderezos de correo-e'; +$lang['iexssprotect'] = 'Comprobar arquivos subidos na procura de posíbel código JavaScript ou HTML malicioso'; +$lang['showuseras'] = 'Que amosar cando se informe do usuario que fixo a última modificación dunha páxina'; +$lang['useacl'] = 'Utilizar lista de control de acceso'; +$lang['autopasswd'] = 'Xerar contrasinais automaticamente'; $lang['authtype'] = 'Backend de autenticación'; -$lang['passcrypt'] = 'Método de codificación do contrasinal'; -$lang['defaultgroup'] = 'Grupo predeterminado'; -$lang['superuser'] = 'Superusuaria/o - un grupo ou usuaria/o con acceso completo a todas as páxinas e funcións, independentemente da configuración da ACL'; -$lang['manager'] = 'Xestor - un grupo ou usuaria/o con acceso a certas funcións de xestión'; -$lang['profileconfirm'] = 'Confirmar as modificacións de perfil mediante un contrasinal'; +$lang['passcrypt'] = 'Método de encriptado do contrasinal'; +$lang['defaultgroup'] = 'Grupo por defecto'; +$lang['superuser'] = 'Super-usuario - un grupo ou usuario con acceso completo a todas as páxinas e funcións independentemente da configuración da ACL'; +$lang['manager'] = 'Xestor - un grupo ou usuario con acceso a certas funcións de xestión'; +$lang['profileconfirm'] = 'Confirmar trocos de perfil mediante contrasinal'; $lang['disableactions'] = 'Desactivar accións do DokuWiki'; $lang['disableactions_check'] = 'Comprobar'; $lang['disableactions_subscription'] = 'Subscribir/Desubscribir'; -$lang['disableactions_wikicode'] = 'Ver o código/Exportar datos raw'; -$lang['disableactions_other'] = 'Outras accións (separadas por vírgulas)'; -$lang['sneaky_index'] = 'O DokuWiki mostrará por defecto todos os nomes de espazo na vista de índice. Se activa isto serán ocultados aqueles onde o usuario non teña permisos de lectura.'; -$lang['auth_security_timeout'] = 'Tempo límite de seguranza de autenticación (en segundos)'; -$lang['securecookie'] = 'Débense enviar só mediante HTTPS as cookies configuradas para HTTPS enviadas polo navegador? Desactive esta opción só cando o inicio de sesión do seu wiki estea asegurado con SSL, mais a navegación no mesmo se faga de modo inseguro.'; -$lang['xmlrpc'] = 'Activar/Desactivar a interface XML-RPC'; -$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Deixe baleiro para darlle acceso a todo o mundo.'; -$lang['updatecheck'] = 'Débese comprobar se hai actualizacións e avisos de seguranza? O DokuWiki precisa contactar con splitbrain.org para executar esta funcionalidade.'; -$lang['userewrite'] = 'Utilizar URL amigábeis'; -$lang['useslash'] = 'Utilizar a barra oblícua (/) como separador de nome de espazo nos URL'; -$lang['usedraft'] = 'Gardar un borrador automaticamente ao editar'; -$lang['sepchar'] = 'Palabra de separación do nome de páxina'; -$lang['canonical'] = 'Utilizar URL completamente canónicos'; -$lang['autoplural'] = 'Comprobar as formas plurais nas ligazóns'; -$lang['compression'] = 'Método de compresión para os ficheiros attic'; -$lang['cachetime'] = 'Tempo máximo para a caché (en seg.)'; -$lang['locktime'] = 'Tempo máximo para o bloqueo de ficheiros (en seg.)'; -$lang['fetchsize'] = 'Tamaño máximo (en bytes) que o fetch.php pode descargar de fontes externas'; -$lang['notify'] = 'Enviar as notificacións de cambios a este enderezo de correo'; -$lang['registernotify'] = 'Enviar a información de novas persoas usuarias rexistradas a este enderezo de correo'; -$lang['mailfrom'] = 'Enderezo de correo-e para usar nas mensaxes automáticas'; -$lang['gzip_output'] = 'Utilizar o Contido-Codificación do Gzip para o XHTML'; -$lang['gdlib'] = 'Versión da biblioteca GD'; -$lang['im_convert'] = 'Camiño para a ferramenta de conversión ImageMagick'; +$lang['disableactions_wikicode'] = 'Ver fonte/Exportar Datos Raw'; +$lang['disableactions_other'] = 'Outras accións (separadas por comas)'; +$lang['sneaky_index'] = 'O DokuWiki amosará por defecto todos os nomes de espazo na vista de índice. Se activas isto agocharanse aqueles onde o usuario non teña permisos de lectura.'; +$lang['auth_security_timeout'] = 'Tempo Límite de Seguridade de Autenticación (segundos)'; +$lang['securecookie'] = 'Deben enviarse só vía HTTPS polo navegador as cookies configuradas vía HTTPS? Desactiva esta opción cando só o inicio de sesión do teu wiki estea asegurado con SSL pero a navegación do mesmo se faga de xeito inseguro.'; +$lang['xmlrpc'] = 'Activar/Desactivar interface XML-RPC'; +$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Déixao baleiro para darlle acceso a todas as persoas.'; +$lang['updatecheck'] = 'Comprobar se hai actualizacións e avisos de seguridade? O DokuWiki precisa contactar con splitbrain.org para executar esta característica.'; +$lang['userewrite'] = 'Utilizar URLs amigábeis'; +$lang['useslash'] = 'Utilizar a barra inclinada (/) como separador de nome de espazo nos URLs'; +$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['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.)'; +$lang['locktime'] = 'Tempo máximo para o bloqueo de arquivos (seg.)'; +$lang['fetchsize'] = 'Tamaño máximo (en bytes) que pode descargar fetch.php dende fontes externas'; +$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['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'; $lang['jpg_quality'] = 'Calidade de compresión dos JPG (0-100)'; -$lang['subscribers'] = 'Activar a posibilidade de subscrición á páxina'; +$lang['subscribers'] = 'Activar posibilidade de subscrición á páxina'; $lang['compress'] = 'Saída compacta de CSS e Javascript'; -$lang['hidepages'] = 'Ocultar as páxinas que coincidan (expresións regulares)'; -$lang['send404'] = 'Enviar "HTTP 404/Páxina non encontrada" para as páxinas inexistentes'; -$lang['sitemap'] = 'Xerar o mapa do sitio do Google (en días)'; -$lang['broken_iua'] = 'Está danada a función ignore_user_abort no seu sistema? Isto podería causar que o índice de procura non funcione. Sábese que o IIS+PHP/CGI a dana. Vexa Bug 852 para obter máis información.'; -$lang['xsendfile'] = 'Débese empregar a cabeceira X-Sendfile para que o servidor web envíe ficheiros estáticos? O seu servidor web debe soportar isto.'; -$lang['renderer_xhtml'] = 'Intérprete para empregar na saída principal (XHTML) do Wiki'; +$lang['hidepages'] = 'Agochar páxinas que coincidan (expresións regulares)'; +$lang['send404'] = 'Enviar "HTTP 404/Páxina non atopada" para as páxinas inexistentes'; +$lang['sitemap'] = 'Xerar mapa do sitio co Google (días)'; +$lang['broken_iua'] = 'Rachou a función ignore_user_abort no teu sistema? Isto podería causar que o índice de procura non funcione. Coñécese que o IIS+PHP/CGI ráchaa. Bótalle un ollo ao Bug 852 para obter máis información.'; +$lang['xsendfile'] = 'Empregar a cabeceira X-Sendfile para que o servidor web envie arquivos estáticos? O teu servidor web precisa soportar isto.'; +$lang['renderer_xhtml'] = 'Intérprete a empregar para a saída principal (XHTML) do Wiki'; $lang['renderer__core'] = '%s (núcleo do Dokuwiki)'; -$lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Permitir as cookies permanentes de inicio de sesión (lembrar)'; -$lang['rss_type'] = 'Tipo de fío RSS XML'; -$lang['rss_linkto'] = 'O fío XML vincúlase a'; -$lang['rss_content'] = 'Que quere mostrar nos elementos do fío XML?'; -$lang['rss_update'] = 'Intervalo de actualización do fío XML (en seg.)'; -$lang['recent_days'] = 'Número de modificacións recentes para manter (en días)'; -$lang['rss_show_summary'] = 'Mostrar o sumario no título do fío XML'; -$lang['target____wiki'] = 'Xanela de destino para as ligazóns internas'; -$lang['target____interwiki'] = 'Xanela de destino para as ligazóns interwiki'; -$lang['target____extern'] = 'Xanela de destino para as ligazóns externas'; -$lang['target____media'] = 'Xanela de destino para as ligazóns multimedia'; -$lang['target____windows'] = 'Xanela de destino para as ligazóns de xanelas'; -$lang['proxy____host'] = 'Nome do servidor proxy'; -$lang['proxy____port'] = 'Porto do proxy'; -$lang['proxy____user'] = 'Nome de usuaria/o do proxy'; -$lang['proxy____pass'] = 'Contrasinal do proxy'; -$lang['proxy____ssl'] = 'Utilizar SSL para conectar co proxy'; -$lang['safemodehack'] = 'Activar o hack de modo seguro (safemode)'; +$lang['renderer__plugin'] = '%s (extensión)'; +$lang['rememberme'] = 'Permitir cookies permanentes de inicio de sesión (lembrarme)'; +$lang['rss_type'] = 'Tipo de corrente RSS XML'; +$lang['rss_linkto'] = 'A corrente XML liga para'; +$lang['rss_content'] = 'Que queres amosar nos elementos da corrente XML?'; +$lang['rss_update'] = 'Intervalo de actualización da corrente XML (seg.)'; +$lang['recent_days'] = 'Número de trocos recentes a manter (días)'; +$lang['rss_show_summary'] = 'Amosar sumario no título da corrente XML'; +$lang['target____wiki'] = 'Fiestra de destino para as ligazóns internas'; +$lang['target____interwiki'] = 'Fiestra de destino para as ligazóns interwiki'; +$lang['target____extern'] = 'Fiestra de destino para as ligazóns externas'; +$lang['target____media'] = 'Fiestra de destino para as ligazóns de media'; +$lang['target____windows'] = 'Fiestra de destino para as ligazóns de fiestras'; +$lang['proxy____host'] = 'Nome do servidor Proxy'; +$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['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)'; -$lang['ftp____user'] = 'Nome de usuaria/o FTP para o hack de modo seguro(safemode)'; +$lang['ftp____user'] = 'Nome de usuario FTP para o hack de modo seguro(safemode)'; $lang['ftp____pass'] = 'Contrasinal FTP para o hack de modo seguro(safemode)'; -$lang['ftp____root'] = 'Directorio raíz do FTP para o hack de modo seguro(safemode)'; -$lang['license_o_'] = 'Non se seleccionou nada'; +$lang['ftp____root'] = 'Directorio raigaña do FTP para o hack de modo seguro(safemode)'; +$lang['license_o_'] = 'Non se escolleu nada'; $lang['typography_o_0'] = 'ningunha'; $lang['typography_o_1'] = 'Só dobres aspas'; $lang['typography_o_2'] = 'Todas as aspas (pode que non funcione sempre)'; @@ -147,9 +145,9 @@ $lang['userewrite_o_0'] = 'ningún'; $lang['userewrite_o_1'] = '.htaccess'; $lang['userewrite_o_2'] = 'Interno do DokuWiki'; $lang['deaccent_o_0'] = 'desconectado'; -$lang['deaccent_o_1'] = 'Eliminar os acentos'; +$lang['deaccent_o_1'] = 'Eliminar acentos'; $lang['deaccent_o_2'] = 'romanizar'; -$lang['gdlib_o_0'] = 'A biblioteca GD non está dispoñíbel'; +$lang['gdlib_o_0'] = 'Libraría GD non dispoñíbel'; $lang['gdlib_o_1'] = 'Versión 1.x'; $lang['gdlib_o_2'] = 'Detección automática'; $lang['rss_type_o_rss'] = 'RSS 0.91'; @@ -157,26 +155,26 @@ $lang['rss_type_o_rss1'] = 'RSS 1.0'; $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; -$lang['rss_content_o_abstract'] = 'Resumo'; +$lang['rss_content_o_abstract'] = 'Sumario'; $lang['rss_content_o_diff'] = 'Formato Unified Diff'; $lang['rss_content_o_htmldiff'] = 'Táboa diff formatada en HTML'; $lang['rss_content_o_html'] = 'Contido HTML completo da páxina'; -$lang['rss_linkto_o_diff'] = 'visualización de diferenzas'; +$lang['rss_linkto_o_diff'] = 'vista de diferenzas'; $lang['rss_linkto_o_page'] = 'a páxina revisada'; $lang['rss_linkto_o_rev'] = 'listaxe de revisións'; $lang['rss_linkto_o_current'] = 'a páxina actual'; $lang['compression_o_0'] = 'ningunha'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; -$lang['xsendfile_o_0'] = 'non usar'; -$lang['xsendfile_o_1'] = 'Cabeceira lighttpd propietaria (anterior á versión 1.5)'; +$lang['xsendfile_o_0'] = 'non o empregues'; +$lang['xsendfile_o_1'] = 'Cabeceira lighttpd propietaria (denantes da versión 1.5)'; $lang['xsendfile_o_2'] = 'Cabeceira X-Sendfile estándar'; $lang['xsendfile_o_3'] = 'Cabeceira X-Accel-Redirect propia de Nginx'; $lang['showuseras_o_loginname'] = 'Nome de inicio de sesión'; -$lang['showuseras_o_username'] = 'Nome completo da persoa usuaria'; -$lang['showuseras_o_email'] = 'Enderezo de correo da persoa usuaria (escurecido conforme a configuración mailguard)'; -$lang['showuseras_o_email_link'] = 'Enderezo de correo da persoa usuaria como unha ligazón mailto:'; -$lang['useheading_o_0'] = 'Nunca'; -$lang['useheading_o_navigation'] = 'Só a navegación'; -$lang['useheading_o_content'] = 'Só o contido do Wiki'; +$lang['showuseras_o_username'] = 'Nome completo do usuario'; +$lang['showuseras_o_email'] = 'Enderezo de correo-e do usuario (ofuscado segundo a configuración mailguard)'; +$lang['showuseras_o_email_link'] = 'Enderezo de correo-e do usuario como ligazón mailto:'; +$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'; diff --git a/lib/plugins/plugin/lang/gl/admin_plugin.txt b/lib/plugins/plugin/lang/gl/admin_plugin.txt index 481cb49a6..216285a8d 100644 --- a/lib/plugins/plugin/lang/gl/admin_plugin.txt +++ b/lib/plugins/plugin/lang/gl/admin_plugin.txt @@ -1,3 +1,3 @@ -====== Xestión de plugins ====== +====== Xestión de Extensións ====== -Nesta páxina pode xestionar todas as accións posíbeis cos [[doku>plugins|plugins]] do DokuWiki. Para poder descargar e instalar un plugin, o seu cartafol de plugins debe ser escribíbel polo servidor web. +Nesta páxina podes xestionar todas as accións posíbeis cos [[doku>plugins|extensións]] do DokuWiki. Para poder descargar e instalar unha extensión, o teu cartafol de extensións debe ser escribíbel polo servidor web. diff --git a/lib/plugins/plugin/lang/gl/lang.php b/lib/plugins/plugin/lang/gl/lang.php index a4fd98594..157911a62 100644 --- a/lib/plugins/plugin/lang/gl/lang.php +++ b/lib/plugins/plugin/lang/gl/lang.php @@ -2,14 +2,12 @@ /** * Galicianlanguage file * - * @author CiberIrmandade da Fala - * @author Tagen Ata - * @author Leandro Regueiro + * @author Medúlio */ -$lang['menu'] = 'Xestionar os plugins'; -$lang['download'] = 'Descargar e instalar un plugin novo'; -$lang['manage'] = 'Plugins instalados'; -$lang['btn_info'] = 'información'; +$lang['menu'] = 'Xestionar Extensións'; +$lang['download'] = 'Descargar e instalar unha nova extensión'; +$lang['manage'] = 'Extensións Instalados'; +$lang['btn_info'] = 'info'; $lang['btn_update'] = 'actualización'; $lang['btn_delete'] = 'eliminar'; $lang['btn_settings'] = 'configuración'; @@ -21,18 +19,18 @@ $lang['lastupdate'] = 'Última actualización:'; $lang['source'] = 'Fonte:'; $lang['unknown'] = 'descoñecido'; $lang['updating'] = 'Actualizando...'; -$lang['updated'] = 'Actualizouse correctamente o plugin %s'; -$lang['updates'] = 'Actualizáronse correctamente os seguintes plugins'; -$lang['update_none'] = 'Non se encontraron actualizacións.'; +$lang['updated'] = 'Actualizouse correctamente a extensión %s'; +$lang['updates'] = 'Actualizáronse correctamente as seguintes extensións'; +$lang['update_none'] = 'Non se atoparon actualizacións.'; $lang['deleting'] = 'Eliminando...'; -$lang['deleted'] = 'Eliminado o plugin %s.'; +$lang['deleted'] = 'Eliminado a extensión %s.'; $lang['downloading'] = 'Descargando...'; -$lang['downloaded'] = 'Instalouse correctamente o plugin %s'; -$lang['downloads'] = 'Instaláronse correctamente os seguintes plugins:'; -$lang['download_none'] = 'Non se encontraron plugins ou aconteceu un problema descoñecido durante a descarga e instalación.'; -$lang['plugin'] = 'Plugin:'; +$lang['downloaded'] = 'Instalouse correctamente a extensión %s'; +$lang['downloads'] = 'Instaláronse correctamente as seguintes extensións:'; +$lang['download_none'] = 'Non se atoparon extensións, ou aconteceu un problema descoñecido durante a descarga e instalación.'; +$lang['plugin'] = 'Extensión:'; $lang['components'] = 'Compoñentes'; -$lang['noinfo'] = 'Este plugin non devolveu información ningunha; pode que non sexa válido.'; +$lang['noinfo'] = 'Esta extensión non devolveu información ningunha. Pode que non sexa válida.'; $lang['name'] = 'Nome:'; $lang['date'] = 'Data:'; $lang['type'] = 'Tipo:'; @@ -40,13 +38,13 @@ $lang['desc'] = 'Descrición:'; $lang['author'] = 'Autor:'; $lang['www'] = 'Web:'; $lang['error'] = 'Houbo un erro descoñecido.'; -$lang['error_download'] = 'Non se puido descargar o ficheiro de plugin: %s'; -$lang['error_badurl'] = 'O URL é posibelmente incorrecto - non se puido determinar o nome do ficheiro mediante o URL'; +$lang['error_download'] = 'Non se puido descargar o arquivo de extensión: %s'; +$lang['error_badurl'] = 'URL posiblemente incorrecto - non se puido determinar o nome do arquivo mediante o URL'; $lang['error_dircreate'] = 'Non se puido crear un cartafol temporal para recibir a descarga'; -$lang['error_decompress'] = 'O xestor de plugins non foi quen de descomprimir o ficheiro descargado. Isto podería estar causado por unha descarga danada e en tal caso poderíalo tentar de novo; pode tamén que o formato de compresión sexa descoñecido, co que precisará descargar e instalar o plugin de modo manual.'; -$lang['error_copy'] = 'Houbo un erro de copia do ficheiro ao tentar instalar o plugin %s: pode que o disco estea cheo ou que os permisos de acceso sexan incorrectos. Isto podería dar lugar a unha instalación parcial do plugin e facer que a súa instalación do wiki se volva inestábel.'; -$lang['error_delete'] = 'Houbo un erro ao tentar eliminar o plugin %s. O máis probábel é que sexa causado por permisos de acceso insuficientes ao ficheiro ou directorio.'; -$lang['enabled'] = 'O plugin %s foi activado.'; -$lang['notenabled'] = 'O plugin %s non puido ser activado; verifique os permisos do ficheiro.'; -$lang['disabled'] = 'O plugin %s foi desactivado.'; -$lang['notdisabled'] = 'O plugin %s non puido ser desactivado; verifique os permisos do ficheiro.'; +$lang['error_decompress'] = 'O xestor de extensións non foi quen de descomprimir o arquivo descargado. Isto podería ser causado por unha descarga corrupta, polo que, en tal caso, podes tentalo de novo; ou pode que o formato de compresión sexa descoñecido, co que precisarás descargar e instalar a extensión de xeito manual.'; +$lang['error_copy'] = 'Houbo un erro de copia de arquivo ao tentar instalar a extensión %s: pode que o disco estea cheo ou que os permisos de acceso sexan incorrectos. Isto podería dar lugar a unha instalación parcial da extensión e facer que a túa instalación do wiki se volva inestable.'; +$lang['error_delete'] = 'Houbo un erro ao tentar eliminar a extensión %s. O máis probable é que sexa causado por permisos de acceso ao arquivo ou directorio insuficientes.'; +$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.'; diff --git a/lib/plugins/popularity/lang/gl/intro.txt b/lib/plugins/popularity/lang/gl/intro.txt index d81903797..72f03e012 100644 --- a/lib/plugins/popularity/lang/gl/intro.txt +++ b/lib/plugins/popularity/lang/gl/intro.txt @@ -1,10 +1,10 @@ -====== Resposta de popularidade ====== +====== Resposta de Popularidade ====== -Esta ferramenta recolle datos anónimos sobre o seu wiki e permítelle envialos ás persoas desenvolvedoras do DokuWiki. Isto axudaralles a ter unha idea do modo en que se emprega o DokuWiki por parte das súas persoas usuarias e garante que as decisións de desenvolvemento futuro coincidan coas estadísticas de uso no mundo real. +Esta ferramenta recolle datos anónimos verbo do teu wiki e permíteche enviarllos aos desenvolvedores do DokuWiki. Isto axudaralles a ter unha idea do xeito en que se emprega o DokuWiki por parte dos seus usuarios, e asegura que as decisións de desenvolvemento futuro coincidan coas estatísticas de uso no mundo real. -Animámolo a executar este proceso de cando en vez, para manter informadas ás persoas desenvolvedoras a medida que o seu wiki vaia medrando. Os seus conxuntos de datos repetidos seran identificados por un ID anónimo. +Animámoste a levar a cabo este proceso de cando en vez para manteres informados aos desenvolvedores a medida que o teu wiki vaia medrando. Os teus xogos de datos repetidos seran identificados por un ID anónimo. -Os datos recompilados conteñen informacións do tipo: versión do Dokuwiki, número e tamaño das páxinas e ficheiros, plugins instalados e informacións sobre a súa instalación do PHP. +Os datos recompilados conteñen información como a versión do teu Dokuwiki, o número e tamaño das túas páxinas e arquivos, as extensións instaladas e información verbo da túa instalación do PHP. -Os datos en bruto que serán enviados móstranse abaixo. Empregue o botón "Enviar os datos" para transferir a información. +Os datos en bruto que serán enviados amósanse embaixo. Por favor, emprega o botón "Enviar Datos" para transferires a información. diff --git a/lib/plugins/popularity/lang/gl/lang.php b/lib/plugins/popularity/lang/gl/lang.php index 116a73256..3e7d9275b 100644 --- a/lib/plugins/popularity/lang/gl/lang.php +++ b/lib/plugins/popularity/lang/gl/lang.php @@ -2,9 +2,7 @@ /** * Galician language file * - * @author CiberIrmandade da Fala - * @author Tagen Ata - * @author Leandro Regueiro + * @author Medúlio */ -$lang['name'] = 'Resposta de popularidade (pode demorar un tempo a cargar)'; -$lang['submit'] = 'Enviar os datos'; +$lang['name'] = 'Resposta de Popularidade (pode demorar un tempo a cargar)'; +$lang['submit'] = 'Enviar Datos'; diff --git a/lib/plugins/revert/lang/gl/intro.txt b/lib/plugins/revert/lang/gl/intro.txt index 81e98f1d5..6327249fc 100644 --- a/lib/plugins/revert/lang/gl/intro.txt +++ b/lib/plugins/revert/lang/gl/intro.txt @@ -1,3 +1,3 @@ -====== Xestor de recuperación ====== +====== Xestor de Reversión ====== -Esta páxina axudarao a se recuperar automaticamente dun ataque de spam. Para encontrar unha listaxe de páxinas que conteñan spam, primeiro debe inserir unha cadea de procura (por ex. un URL de spam) e despois confirmar que as páxinas encontradas conteñen realmente spam, antes de reverter as edicións. +Esta páxina axudarache a revertir automaticamente un ataque de correo-lixo. Para atopares unha listaxe de páxinas que conteñan correo-lixo, primeiro debes inserir unha cadea de procura (p.e. un URL do correo-lixo), e logo confirmares que as páxinas atopadas conteñen realmente o tal correo-lixo e reverter as edicións. \ No newline at end of file diff --git a/lib/plugins/revert/lang/gl/lang.php b/lib/plugins/revert/lang/gl/lang.php index 33472090d..87bce32ba 100644 --- a/lib/plugins/revert/lang/gl/lang.php +++ b/lib/plugins/revert/lang/gl/lang.php @@ -2,16 +2,14 @@ /** * Galicianlanguage file * - * @author CiberIrmandade da Fala - * @author Tagen Ata - * @author Leandro Regueiro + * @author Medúlio */ -$lang['menu'] = 'Xestor de recuperación'; -$lang['filter'] = 'Procurar páxinas con spam'; -$lang['revert'] = 'Recuperar as páxinas seleccionadas'; -$lang['reverted'] = '%s foi revertida á revisión %s'; -$lang['removed'] = '%s foi eliminada'; -$lang['revstart'] = 'O proceso de recuperación foi iniciado. Isto podería demorar un certo tempo. Se o script falla por ter superado o seu límite de tempo antes de rematar, terá que efectuar a recuperación sobre fragmentos máis pequenos.'; -$lang['revstop'] = 'O proceso de recuperación rematou correctamente.'; -$lang['note1'] = 'Nota: Esta procura distingue entre maiúsculas e minúsculas'; -$lang['note2'] = 'Nota: A páxina será revertida á última versión que non conteña o termo de spam %s indicado.'; +$lang['menu'] = 'Xestor de Reversión'; +$lang['filter'] = 'Procurar páxinas con correo-lixo'; +$lang['revert'] = 'Revertir as páxinas seleccionadas'; +$lang['reverted'] = '%s revertido á revisión %s'; +$lang['removed'] = '%s eliminado'; +$lang['revstart'] = 'Proceso de reversión iniciado. Isto podería demorar un anaco longo. Se o script fallar por superar o seu límite de tempo denantes de rematar, terás que facer a reversión en anacos máis pequenos.'; +$lang['revstop'] = 'O proceso de reversión rematou correctamente.'; +$lang['note1'] = 'Nota: esta procura distingue entre maiúsculas e minúsculas'; +$lang['note2'] = 'Nota: a páxina revertirase á última versión que non conteña o termo de correo-lixo %s indicado.'; diff --git a/lib/plugins/usermanager/lang/gl/add.txt b/lib/plugins/usermanager/lang/gl/add.txt index cd1c487ff..7602c36ec 100644 --- a/lib/plugins/usermanager/lang/gl/add.txt +++ b/lib/plugins/usermanager/lang/gl/add.txt @@ -1 +1 @@ -===== Engadir unha persoa usuaria ===== +===== Engadir usuario ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/gl/delete.txt b/lib/plugins/usermanager/lang/gl/delete.txt index f13133d6f..4262a0c05 100644 --- a/lib/plugins/usermanager/lang/gl/delete.txt +++ b/lib/plugins/usermanager/lang/gl/delete.txt @@ -1 +1 @@ -===== Eliminar unha persoa usuaria ===== +===== Eliminar usuario ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/gl/edit.txt b/lib/plugins/usermanager/lang/gl/edit.txt index d33f9c335..11ef62cce 100644 --- a/lib/plugins/usermanager/lang/gl/edit.txt +++ b/lib/plugins/usermanager/lang/gl/edit.txt @@ -1 +1 @@ -===== Editar unha persoa usuaria ===== +===== Editar usuario ===== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/gl/intro.txt b/lib/plugins/usermanager/lang/gl/intro.txt index 9b05a0c5e..77675e9d6 100644 --- a/lib/plugins/usermanager/lang/gl/intro.txt +++ b/lib/plugins/usermanager/lang/gl/intro.txt @@ -1 +1 @@ -====== Xestor de persoas usuarias ====== +====== Xestor de Usuarios ====== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php index b6909c100..0a01ef750 100644 --- a/lib/plugins/usermanager/lang/gl/lang.php +++ b/lib/plugins/usermanager/lang/gl/lang.php @@ -2,48 +2,46 @@ /** * Galicianlanguage file * - * @author CiberIrmandade da Fala - * @author Tagen Ata - * @author Leandro Regueiro + * @author Medúlio */ -$lang['menu'] = 'Xestor de persoas usuarias'; -$lang['noauth'] = '(a autenticación de persoas usuarias non está dispoñíbel)'; -$lang['nosupport'] = '(a xestión de persoas usuarias non está soportada)'; -$lang['badauth'] = 'o mecanismo de autenticación non é válido'; -$lang['user_id'] = 'Usuaria/o'; +$lang['menu'] = 'Xestor de Usuarios'; +$lang['noauth'] = '(autenticación de usuarios non dispoñible)'; +$lang['nosupport'] = '(xestión de usuarios non soportada)'; +$lang['badauth'] = 'mecanismo de autenticación non válido'; +$lang['user_id'] = 'Usuario'; $lang['user_pass'] = 'Contrasinal'; -$lang['user_name'] = 'Nome real'; -$lang['user_mail'] = 'Correo'; +$lang['user_name'] = 'Nome Real'; +$lang['user_mail'] = 'Correo-e'; $lang['user_groups'] = 'Grupos'; $lang['field'] = 'Campo'; $lang['value'] = 'Valor'; $lang['add'] = 'Engadir'; $lang['delete'] = 'Eliminar'; -$lang['delete_selected'] = 'Eliminar as seleccionadas'; +$lang['delete_selected'] = 'Eliminar Seleccionados'; $lang['edit'] = 'Editar'; -$lang['edit_prompt'] = 'Editar esta persoa usuaria'; -$lang['modify'] = 'Gardar os cambios'; +$lang['edit_prompt'] = 'Editar este usuario'; +$lang['modify'] = 'Gardar Trocos'; $lang['search'] = 'Procurar'; -$lang['search_prompt'] = 'Facer unha procura'; -$lang['clear'] = 'Reiniciar o filtro de procura'; +$lang['search_prompt'] = 'Facer procura'; +$lang['clear'] = 'Reiniciar Filtro de Procura'; $lang['filter'] = 'Filtro'; -$lang['summary'] = 'A mostrar as persoas usuarias %1$d-%2$d de %3$d encontradas. %4$d persoas usuarias en total.'; -$lang['nonefound'] = 'Non se encontraron persoas usuarias. %d persoas usuarias en total.'; -$lang['delete_ok'] = '%d persoas usuarias foron eliminadas'; -$lang['delete_fail'] = '%d non puideron ser eliminadas.'; -$lang['update_ok'] = 'A persoa usuaria foi actualizada correctamente'; -$lang['update_fail'] = 'Non se puido actualizar a persoa usuaria'; -$lang['update_exists'] = 'Non se puido mudar o nome da persoa usuaria; o nome especificado (%s) xa existe (o resto de cambios aplicaranse sen problemas).'; +$lang['summary'] = 'Amosando usuarios %1$d-%2$d de %3$d atopados. %4$d usuarios en total.'; +$lang['nonefound'] = 'Non se atoparon usuarios. %d usuarios en total.'; +$lang['delete_ok'] = '%d usuarios eliminados'; +$lang['delete_fail'] = '%d non puideron ser eliminados.'; +$lang['update_ok'] = 'Usuario actualizado correctamente'; +$lang['update_fail'] = 'Non se puido actualizar o usuario'; +$lang['update_exists'] = 'Non se puido mudar o nome do usuario, xa que o nome especificado (%s) xa existe (o resto de trocos aplicaranse sen problemas).'; $lang['start'] = 'comezo'; $lang['prev'] = 'anterior'; $lang['next'] = 'seguinte'; -$lang['last'] = 'última'; -$lang['edit_usermissing'] = 'Non se encontrou a persoa usuaria seleccionada; pode que o nome de usuaria/o teña sido eliminado ou alterado nalgún momento.'; -$lang['user_notify'] = 'Notificar á/ao usuaria/o'; -$lang['note_notify'] = 'Os correos de notificación envíanse só se a persoa usuaria obtén un contrasinal novo.'; -$lang['note_group'] = 'As persoas usuarias novas serán engadidas ao grupo predeterminado (%s) se non se especifica outro.'; -$lang['note_pass'] = 'Se deixa o campo baleiro e a notificación á/ao usuaria/o está activada, xerarase automaticamente o contrasinal.'; -$lang['add_ok'] = 'A persoa usuaria foi engadida correctamente'; -$lang['add_fail'] = 'Non se puido engadir a/o usuaria/o'; -$lang['notify_ok'] = 'O correo de notificación foi enviado'; -$lang['notify_fail'] = 'Non se puido enviar o correo de notificación'; +$lang['last'] = 'derradeiro'; +$lang['edit_usermissing'] = 'Non se atopou o usuario seleccionado, pode que o nome de usuario fose eliminado ou mudado nalgún intre.'; +$lang['user_notify'] = 'Notificar ao usuario'; +$lang['note_notify'] = 'Os correos-e de notificación envíanse só se o usuario obtén un novo contrasinal.'; +$lang['note_group'] = 'Os novos usuarios serán engadidos ao grupo por defecto (%s) se non se especifica outro.'; +$lang['note_pass'] = 'Se deixas o campo baleiro e a notificación ao usuario está activada xerarase automaticamente o contrasinal.'; +$lang['add_ok'] = 'Usuario engadido correctamente'; +$lang['add_fail'] = 'Non se puido engadir o usuario'; +$lang['notify_ok'] = 'Correo-e de notificación enviado'; +$lang['notify_fail'] = 'Non se puido enviar o correo-e de notificación'; diff --git a/lib/plugins/usermanager/lang/gl/list.txt b/lib/plugins/usermanager/lang/gl/list.txt index 792afd7d1..013b2d7d8 100644 --- a/lib/plugins/usermanager/lang/gl/list.txt +++ b/lib/plugins/usermanager/lang/gl/list.txt @@ -1 +1 @@ -===== Listaxe de persoas usuarias ===== +===== Lista de Usuarios ===== \ No newline at end of file -- cgit v1.2.3 From c4ba149a58e742fab4739e2432ee00e41f1f7184 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 8 Mar 2010 13:04:31 +0100 Subject: Allow filtering of block buttons in initToolbar --- lib/scripts/toolbar.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 99ad1bb9c..37987c21a 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -5,12 +5,13 @@ var pickercounter=0; /** * Create a toolbar * - * @param string tbid ID of the element where to insert the toolbar - * @param string edid ID of the editor textarea - * @param array tb Associative array defining the buttons + * @param string tbid ID of the element where to insert the toolbar + * @param string edid ID of the editor textarea + * @param array tb Associative array defining the buttons + * @param bool allowblock Allow buttons creating multiline content * @author Andreas Gohr */ -function initToolbar(tbid,edid,tb){ +function initToolbar(tbid,edid,tb, allowblock){ var toolbar = $(tbid); if(!toolbar) return; var edit = $(edid); @@ -22,6 +23,9 @@ function initToolbar(tbid,edid,tb){ var cnt = tb.length; for(var i=0; i Date: Mon, 8 Mar 2010 13:04:59 +0100 Subject: Append linkwizard directly to the edit form --- lib/scripts/linkwiz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index 4528d9591..225868592 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -38,7 +38,7 @@ var linkwiz = { LANG['linkwiz']+'
'+ '
'+LANG['linkto']+'
'+ '
'; - textArea.form.parentNode.appendChild(linkwiz.wiz); + $('dw__editform').parentNode.appendChild(linkwiz.wiz); linkwiz.textArea = textArea; linkwiz.result = $('link__wiz_result'); linkwiz.entry = $('link__wiz_entry'); -- cgit v1.2.3 From 7e783d07e8533b7e27cec02dd2227ddc83d26d47 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 9 Mar 2010 10:07:09 +0100 Subject: Introduce toolbar buttons for headers and stuff --- lib/scripts/toolbar.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 37987c21a..3f967448c 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -18,6 +18,10 @@ function initToolbar(tbid,edid,tb, allowblock){ if(!edit) return; if(edit.readOnly) return; + if (typeof allowblock === 'undefined') { + allowblock = true; + } + //empty the toolbar area: toolbar.innerHTML=''; -- cgit v1.2.3 From fe17917e7668864526ec0f0ae65dd0787831d8a4 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 10 Mar 2010 10:41:32 +0100 Subject: Move & rename HTML_PAGE_FROMTEMPLATE to common.php The new COMMON_PAGE_FROMTEMPLATE is triggered by pageTemplate AFTER the template has been read but before performing the template replacements. --- lib/exe/xmlrpc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index a29a40612..155812d22 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -290,8 +290,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { } $text = rawWiki($id,$rev); if(!$text) { - $data = array($id); - return trigger_event('HTML_PAGE_FROMTEMPLATE',$data,'pageTemplate',true); + return pageTemplate($id); } else { return $text; } -- cgit v1.2.3 From a958c48cfeaefd8e8c1aeebcd04e9c862f014a6d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 12 Mar 2010 14:35:43 +0100 Subject: removed dead leftover code from media search --- lib/exe/ajax.php | 11 ----------- lib/scripts/media.js | 27 --------------------------- 2 files changed, 38 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 4c74709b8..a402c236f 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -201,17 +201,6 @@ function ajax_medialist(){ tpl_mediaContent(true); } -/** - * Return list of search result for the Mediamanager - * - * @author Tobias Sarnowski - */ -function ajax_mediasearchlist(){ - global $conf; - - media_searchlist($_POST['ns']); -} - /** * Return sub index for index view * diff --git a/lib/scripts/media.js b/lib/scripts/media.js index f14db63d7..95b1ab69e 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -147,33 +147,6 @@ var media_manager = { media_manager.updatehide(); }, - /** - * Opens the searchfield - * - * @author Tobias Sarnowski - */ - showsearchfield: function(event,link){ - // prepare an AJAX call to fetch the search - var ajax = new sack(DOKU_BASE + 'lib/exe/ajax.php'); - ajax.AjaxFailedAlert = ''; - ajax.encodeURIString = false; - if(ajax.failed) return true; - - cleanMsgArea(); - - var content = $('media__content'); - content.innerHTML = '...'; - - ajax.elementObj = content; - ajax.afterCompletion = function(){ - media_manager.selectorattach(content); - media_manager.confirmattach(content); - media_manager.updatehide(); - }; - ajax.runAJAX(link.search.substr(1)+'&call=mediasearchlist'); - return false; - }, - /** * Toggles the keep open state * -- cgit v1.2.3 From fda42deb082e4bdb560818a9c23b96f9312176d5 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 15 Mar 2010 16:57:38 +0100 Subject: Various JavaScript fixes * Syntax error fixed * lock refresh event is now attached to the whole edit form since it bubbles up and we cannot be sure that the wikitext input exists on all edit forms * Updated findPos(X|Y) * Easier and less error-prone way of getting the section edit button in the highlight mouseover event handler --- lib/scripts/drag.js | 3 +-- lib/scripts/edit.js | 3 +-- lib/scripts/script.js | 16 +++++++--------- 3 files changed, 9 insertions(+), 13 deletions(-) (limited to 'lib') diff --git a/lib/scripts/drag.js b/lib/scripts/drag.js index 254eab4a6..169be5219 100644 --- a/lib/scripts/drag.js +++ b/lib/scripts/drag.js @@ -83,6 +83,5 @@ var drag = { this.obj.style.top = (e.pageY+this.oY-this.eY+'px'); this.obj.style.left = (e.pageX+this.oX-this.eX+'px'); } - }, - + } }; diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 58433f25c..b756e9488 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -386,8 +386,7 @@ var locktimer = new locktimer_class(); locktimer.sack.onCompletion = locktimer.refreshed; // register refresh event - addEvent($('dw__editform').elements.wikitext,'keypress',function(){locktimer.refresh();}); - + addEvent($('dw__editform'),'keypress',function(){locktimer.refresh();}); // start timer locktimer.reset(); }; diff --git a/lib/scripts/script.js b/lib/scripts/script.js index bf6f41ce5..27d088584 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -78,16 +78,15 @@ function getElementsByClass(searchClass,node,tag) { /** * Get the X offset of the top left corner of the given object * - * @link http://www.quirksmode.org/index.html?/js/findpos.html + * @link http://www.quirksmode.org/js/findpos.html */ function findPosX(object){ var curleft = 0; var obj = $(object); if (obj.offsetParent){ - while (obj.offsetParent){ + do { curleft += obj.offsetLeft; - obj = obj.offsetParent; - } + } while (obj = obj.offsetParent); } else if (obj.x){ curleft += obj.x; @@ -98,16 +97,15 @@ function findPosX(object){ /** * Get the Y offset of the top left corner of the given object * - * @link http://www.quirksmode.org/index.html?/js/findpos.html + * @link http://www.quirksmode.org/js/findpos.html */ function findPosY(object){ var curtop = 0; var obj = $(object); if (obj.offsetParent){ - while (obj.offsetParent){ + do { curtop += obj.offsetTop; - obj = obj.offsetParent; - } + } while (obj = obj.offsetParent); } else if (obj.y){ curtop += obj.y; @@ -535,7 +533,7 @@ addInitEvent(function(){ var btns = getElementsByClass('btn_secedit',document,'form'); for(var i=0; i Date: Tue, 16 Mar 2010 11:20:53 +0000 Subject: Make constants in TarLib.class.php class constants The constants are required by the class constructor, which effectively means before the autoloader is triggered. This change fixes that issue. --- lib/plugins/plugin/classes/ap_download.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index 6ad048d72..beba0ab07 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -199,13 +199,13 @@ class ap_download extends ap_manage { if (in_array($ext, array('tar','bz','gz'))) { switch($ext){ case 'bz': - $compress_type = COMPRESS_BZIP; + $compress_type = TarLib::COMPRESS_BZIP; break; case 'gz': - $compress_type = COMPRESS_GZIP; + $compress_type = TarLib::COMPRESS_GZIP; break; default: - $compress_type = COMPRESS_NONE; + $compress_type = TarLib::COMPRESS_NONE; } $tar = new TarLib($file, $compress_type); @@ -215,7 +215,7 @@ class ap_download extends ap_manage { } return false; } - $ok = $tar->Extract(FULL_ARCHIVE, $target, '', 0777); + $ok = $tar->Extract(TarLib::FULL_ARCHIVE, $target, '', 0777); if($ok<1){ if($conf['allowdebug']){ -- cgit v1.2.3 From c77fa67b50d49455e3b518eeb2bcbd0531d07165 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 16 Mar 2010 15:33:58 +0100 Subject: Use md5sum of id and client ip as temporary filename in XML-RPC Before this patch the temporary filename was the uncleaned id. This allowed everyone with upload-privileges (on the whole wiki) and XML-RPC privileges on a XML-RPC-enabled DokuWiki to (over)write any file PHP is allowed to write with any content he wants. If you have XML-RPC enabled and users with XML-RPC and upload privileges you don't trust in a way you would allow them to write any file PHP may write, consider this as an important security fix. By default XML-RPC is disabled, so if you don't know what I'm talking about you are probably not affected by the problem. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 670ab5d7e..b6b9f0e52 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -578,7 +578,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return new IXR_ERROR(1, 'Filename not given.'); } - $ftmp = $conf['tmpdir'] . '/' . $id; + $ftmp = $conf['tmpdir'] . '/' . md5($id.clientIP()); // save temporary file @unlink($ftmp); -- cgit v1.2.3 From 1c5d577c52ccb55efa0aa1569c9deac5cb4f060d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ant=C3=B3nio=20Cidre=20Bardel=C3=A1s?= Date: Wed, 17 Mar 2010 20:12:13 +0100 Subject: Galician language update --- lib/plugins/config/lang/gl/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index 2129beec0..ac91098cb 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -105,6 +105,7 @@ $lang['gdlib'] = 'Versión da Libraría GD'; $lang['im_convert'] = 'Ruta deica a ferramenta de conversión ImageMagick'; $lang['jpg_quality'] = 'Calidade de compresión dos JPG (0-100)'; $lang['subscribers'] = 'Activar posibilidade de subscrición á páxina'; +$lang['subscribe_time'] = 'Tempo despois do cal se enviarán os resumos e listas de subscrición (seg.): isto debe ser inferior ao tempo especificado en recent_days.'; $lang['compress'] = 'Saída compacta de CSS e Javascript'; $lang['hidepages'] = 'Agochar páxinas que coincidan (expresións regulares)'; $lang['send404'] = 'Enviar "HTTP 404/Páxina non atopada" para as páxinas inexistentes'; -- cgit v1.2.3 From 8d557116a19d366c0f00592e4fa6250017295105 Mon Sep 17 00:00:00 2001 From: maros Date: Wed, 17 Mar 2010 20:13:22 +0100 Subject: Polish language update --- lib/plugins/acl/lang/pl/lang.php | 1 + lib/plugins/config/lang/pl/lang.php | 1 + lib/plugins/plugin/lang/pl/lang.php | 1 + lib/plugins/popularity/lang/pl/lang.php | 1 + lib/plugins/revert/lang/pl/lang.php | 1 + lib/plugins/usermanager/lang/pl/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index 0f88fe477..300f0ad1c 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -9,6 +9,7 @@ * @author Sławomir Boczek * @author sleshek@wp.pl * @author Leszek Stachowski + * @author maros */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index b722f7b4d..662a80c3b 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -10,6 +10,7 @@ * @author Piotr JANKOWSKI * @author sleshek@wp.pl * @author Leszek Stachowski + * @author maros */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
Niepoprawne wartości są wyróżnione kolorem czerwonym.'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index b5f813f03..d97dafc0b 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -10,6 +10,7 @@ * @author Sławomir Boczek * @author sleshek@wp.pl * @author Leszek Stachowski + * @author maros */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index 02a1f21b6..dd208fe47 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -8,6 +8,7 @@ * @author Sławomir Boczek * @author sleshek@wp.pl * @author Leszek Stachowski + * @author maros */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index 437daf3d7..613b96e6f 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -7,6 +7,7 @@ * @author Sławomir Boczek * @author sleshek@wp.pl * @author Leszek Stachowski + * @author maros */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 56add77f4..6d57455fb 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -8,6 +8,7 @@ * @author Sławomir Boczek * @author sleshek@wp.pl * @author Leszek Stachowski + * @author maros */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; -- cgit v1.2.3 From 71a1b3ab64b4601b9132e877e3b53c9b85d03429 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 22 Mar 2010 17:00:02 +0100 Subject: Really remove edit highlighting on mouseout --- lib/scripts/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index 27d088584..25b10205c 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -552,7 +552,7 @@ addInitEvent(function(){ addEvent(btns[i],'mouseout',function(e){ var secs = getElementsByClass('section_highlight'); for(var j=0; j Date: Mon, 22 Mar 2010 20:30:44 +0100 Subject: fixed Safari browser detection --- lib/scripts/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index 25b10205c..205d3f706 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -9,7 +9,7 @@ var clientPC = navigator.userAgent.toLowerCase(); // Get client info var is_macos = navigator.appVersion.indexOf('Mac') != -1; var is_gecko = ((clientPC.indexOf('gecko')!=-1) && (clientPC.indexOf('spoofer')==-1) && (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0')==-1)); -var is_safari = ((clientPC.indexOf('AppleWebKit')!=-1) && (clientPC.indexOf('spoofer')==-1)); +var is_safari = ((clientPC.indexOf('applewebkit')!=-1) && (clientPC.indexOf('spoofer')==-1)); var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled )); if (clientPC.indexOf('opera')!=-1) { var is_opera = true; -- cgit v1.2.3 From 9d706dd2a380574a0f89b771c7b3fd9a77de9dc7 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Mon, 22 Mar 2010 20:58:43 +0100 Subject: German language update --- lib/plugins/acl/lang/de/lang.php | 1 + lib/plugins/config/lang/de/lang.php | 1 + lib/plugins/plugin/lang/de/lang.php | 1 + lib/plugins/popularity/lang/de/lang.php | 1 + lib/plugins/revert/lang/de/lang.php | 1 + lib/plugins/usermanager/lang/de/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php index 022ea6683..5bac3ac1c 100644 --- a/lib/plugins/acl/lang/de/lang.php +++ b/lib/plugins/acl/lang/de/lang.php @@ -16,6 +16,7 @@ * @author Dirk Einecke * @author Blitzi94@gmx.de * @author Robert Bogenschneider + * @author Robert Bogenschneider */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 2075322d2..f5f68fab1 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -12,6 +12,7 @@ * @author Dirk Einecke * @author Blitzi94@gmx.de * @author Robert Bogenschneider + * @author Robert Bogenschneider */ $lang['menu'] = 'Konfiguration'; $lang['error'] = 'Die Einstellungen wurden wegen einer fehlerhaften Eingabe nicht gespeichert. diff --git a/lib/plugins/plugin/lang/de/lang.php b/lib/plugins/plugin/lang/de/lang.php index ff59cedce..e981f4a60 100644 --- a/lib/plugins/plugin/lang/de/lang.php +++ b/lib/plugins/plugin/lang/de/lang.php @@ -13,6 +13,7 @@ * @author Dirk Einecke * @author Blitzi94@gmx.de * @author Robert Bogenschneider + * @author Robert Bogenschneider */ $lang['menu'] = 'Plugins verwalten'; $lang['download'] = 'Neues Plugin herunterladen und installieren'; diff --git a/lib/plugins/popularity/lang/de/lang.php b/lib/plugins/popularity/lang/de/lang.php index d523be38f..1372e9d8a 100644 --- a/lib/plugins/popularity/lang/de/lang.php +++ b/lib/plugins/popularity/lang/de/lang.php @@ -10,6 +10,7 @@ * @author Dirk Einecke * @author Blitzi94@gmx.de * @author Robert Bogenschneider + * @author Robert Bogenschneider */ $lang['name'] = 'Popularitäts-Feedback (Eventuell längere Ladezeit)'; $lang['submit'] = 'Daten senden'; diff --git a/lib/plugins/revert/lang/de/lang.php b/lib/plugins/revert/lang/de/lang.php index d26413ac1..5dee8007b 100644 --- a/lib/plugins/revert/lang/de/lang.php +++ b/lib/plugins/revert/lang/de/lang.php @@ -11,6 +11,7 @@ * @author Dirk Einecke * @author Blitzi94@gmx.de * @author Robert Bogenschneider + * @author Robert Bogenschneider */ $lang['menu'] = 'Seiten wieder herstellen'; $lang['filter'] = 'Nach betroffenen Seiten suchen'; diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php index 913537f06..db5158a4c 100644 --- a/lib/plugins/usermanager/lang/de/lang.php +++ b/lib/plugins/usermanager/lang/de/lang.php @@ -12,6 +12,7 @@ * @author Dirk Einecke * @author Blitzi94@gmx.de * @author Robert Bogenschneider + * @author Robert Bogenschneider */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Authentifizierungssystem nicht verfügbar)'; -- cgit v1.2.3 From 229529655f061863ec76db9ea557fef8b1a5161b Mon Sep 17 00:00:00 2001 From: YoBoY Date: Tue, 23 Mar 2010 22:50:41 +0100 Subject: Limiting use of readdir in the idx_indexLengths function (v2). Each searches on the wiki use this function. Scanning the index directory eachtime is time consuming with a constant series of disk access. Switching a normal search to use file_exists 1 or more times, and not readdir all the directory. Switching a wildcard search to use a lengths.idx file containing all the word lengths used in the wiki, file generated if a new configuration parameter $conf[readdircache] is not 0 and fixed to a time in second. Creation of a new function idx_listIndexLengths to do this part. --- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 1 + 2 files changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 7198ca36d..2bcd17c12 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -234,3 +234,4 @@ $lang['useheading_o_navigation'] = 'Navigation Only'; $lang['useheading_o_content'] = 'Wiki Content Only'; $lang['useheading_o_1'] = 'Always'; +$lang['readdircache'] = 'Maximum age for readdir cache (sec)'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 2f91b0ad8..cea191f56 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -188,6 +188,7 @@ $meta['rss_show_summary'] = array('onoff'); $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); +$meta['readdircache'] = array('numeric'); $meta['_network'] = array('fieldset'); $meta['proxy____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i'); -- cgit v1.2.3 From 26ee1edf9c1750df399baebcb70afb49778b4a92 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 25 Mar 2010 15:01:25 +0100 Subject: Rewrite JavaScript change check --- lib/exe/js.php | 1 - lib/scripts/edit.js | 59 +++++++++++++++++++++++------------------------------ 2 files changed, 26 insertions(+), 34 deletions(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 0eb43b246..05965ba02 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -107,7 +107,6 @@ function js_out(){ js_runonstart('addTocToggle()'); js_runonstart("initSizeCtl('size__ctl','wiki__text')"); js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)"); - js_runonstart("initChangeCheck('".js_escape($lang['notsavedyet'])."')"); if($conf['locktime'] != 0){ js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); } diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index b756e9488..eeca27353 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -260,9 +260,9 @@ var textChanged = false; /** * Check for changes before leaving the page */ -function changeCheck(msg){ +function changeCheck(){ if(textChanged){ - var ok = confirm(msg); + var ok = confirm(LANG.notsavedyet); if(ok){ // remove a possibly saved draft using ajax var dwform = $('dw__editform'); @@ -289,57 +289,50 @@ function changeCheck(msg){ * JSnocheck class), add handlers to monitor changes * * Sets focus to the editbox as well - * - * @fixme this is old and crappy code. needs to be redone */ -function initChangeCheck(msg){ - var edit_text = document.getElementById('wiki__text'); - if(!edit_text) return; - if(edit_text.readOnly) return; - if(!$('dw__editform')) return; +addInitEvent(function (){ + var editform = $('dw__editform'); + if (!editform) return; + + var edit_text = $('wiki__text'); + if(edit_text) { + if(edit_text.readOnly) return; + + // set focus + edit_text.focus(); + } + + var checkfunc = function(){ + textChanged = true; //global var + summaryCheck(); + }; + addEvent(editform, 'change', checkfunc); + addEvent(editform, 'keydown', checkfunc); // add change check for links var links = document.getElementsByTagName('a'); for(var i=0; i < links.length; i++){ if(links[i].className.indexOf('JSnocheck') == -1){ - links[i].onclick = function(){ - var rc = changeCheck(msg); - if(window.event) window.event.returnValue = rc; - return rc; - }; + addEvent(links[i], 'click', changeCheck); } } // add change check for forms var forms = document.forms; for(i=0; i < forms.length; i++){ if(forms[i].className.indexOf('JSnocheck') == -1){ - forms[i].onsubmit = function(){ - var rc = changeCheck(msg); - if(window.event) window.event.returnValue = rc; - return rc; - }; + addEvent(forms[i], 'submit', changeCheck); } } // reset change memory var on submit - var btn_save = document.getElementById('edbtn__save'); - btn_save.onclick = function(){ textChanged = false; }; - var btn_prev = document.getElementById('edbtn__preview'); - btn_prev.onclick = function(){ textChanged = false; }; + addEvent($('edbtn__save'), 'click', function(){ textChanged = false; }); + addEvent($('edbtn__preview'), 'click', function(){ textChanged = false; }); - // add change memory setter - edit_text.onchange = function(){ - textChanged = true; //global var - summaryCheck(); - }; - var summary = document.getElementById('edit__summary'); + var summary = $('edit__summary'); addEvent(summary, 'change', summaryCheck); addEvent(summary, 'keyup', summaryCheck); if (textChanged) summaryCheck(); - - // set focus - edit_text.focus(); -} +}); /** * Checks if a summary was entered - if not the style is changed -- cgit v1.2.3 From 7d54a99ffcfd517bfc9bc5e18eb3f87922617077 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 25 Mar 2010 15:45:54 +0100 Subject: Do not try to save a draft in alternative editors --- lib/scripts/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index eeca27353..9437aa14e 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -420,7 +420,7 @@ var locktimer = new locktimer_class(); // refresh every minute only if(now.getTime() - locktimer.lasttime.getTime() > 30*1000){ //FIXME decide on time var params = 'call=lock&id='+encodeURIComponent(locktimer.pageid); - if(locktimer.draft){ + if(locktimer.draft && dwform.elements.wikitext){ var dwform = $('dw__editform'); params += '&prefix='+encodeURIComponent(dwform.elements.prefix.value); params += '&wikitext='+encodeURIComponent(dwform.elements.wikitext.value); -- cgit v1.2.3 From cd12dcad1a482ea805f8dcc58b364e9c6cddc667 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 2 Feb 2010 16:20:17 +0100 Subject: JavaScript syntax fixes --- lib/scripts/events.js | 8 ++++---- lib/scripts/helpers.js | 4 ++-- lib/scripts/textselection.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/scripts/events.js b/lib/scripts/events.js index 2ea619085..df46cc1cf 100644 --- a/lib/scripts/events.js +++ b/lib/scripts/events.js @@ -107,8 +107,8 @@ window.fireoninit = function() { } // for Internet Explorer (using conditional comments) - /*@cc_on @*/ - /*@if (@_win32) + /*@cc_on + @if (@_win32) document.write("<\/script>"); var script = document.getElementById("__ie_init"); script.onreadystatechange = function() { @@ -116,7 +116,7 @@ window.fireoninit = function() { window.fireoninit(); // call the onload handler } }; - /*@end @*/ + @end @*/ // for Safari if (/WebKit/i.test(navigator.userAgent)) { // sniff @@ -176,5 +176,5 @@ function bind (fnc) { var args = Array.prototype.slice.call(arguments, 1); return function() { return fnc.apply(this, args); - } + }; } diff --git a/lib/scripts/helpers.js b/lib/scripts/helpers.js index 8d4f3ea78..129964d29 100644 --- a/lib/scripts/helpers.js +++ b/lib/scripts/helpers.js @@ -109,7 +109,7 @@ function isEmpty (prop /* :Object */) /* :Boolean */ { if (isRegExp(prop) && new RegExp("").toString() == prop.toString()) return true; if (isString(prop) || isNumber(prop)) return !prop; if (Boolean(prop)&&false != prop) { - for (var i in prop) if(prop.hasOwnProperty(i)) return false + for (var i in prop) if(prop.hasOwnProperty(i)) return false; } return true; } @@ -124,7 +124,7 @@ function isEmpty (prop /* :Object */) /* :Boolean */ { if ('undefined' == typeof Object.hasOwnProperty) { Object.prototype.hasOwnProperty = function (prop) { return !('undefined' == typeof this[prop] || this.constructor && this.constructor.prototype[prop] && this[prop] === this.constructor.prototype[prop]); - } + }; } /** diff --git a/lib/scripts/textselection.js b/lib/scripts/textselection.js index 76cc6bcbb..5e4602f85 100644 --- a/lib/scripts/textselection.js +++ b/lib/scripts/textselection.js @@ -24,7 +24,7 @@ function selection_class(){ this.getText = function(){ if(!this.obj) return ''; return this.obj.value.substring(this.start,this.end); - } + }; } /** -- cgit v1.2.3 From ea6dfbca91f6afe89ff631ac28eae023bcc52853 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 26 Mar 2010 15:17:26 +0100 Subject: Rewrite footnote popup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Popup now shows up relative to the link, not the mouse position * Easier handling of mouseout’s bubbling * Factor out popup creation to allow plugins to use it --- lib/scripts/script.js | 82 +++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 51 deletions(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index 205d3f706..99dade692 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -234,57 +234,51 @@ function toggleToc() { } /** - * Display an insitu footnote popup - * - * @author Andreas Gohr - * @author Chris Smith + * Create JavaScript mouseover popup */ -function footnote(e){ - var obj = e.target; - var id = obj.id.substr(5); +function insitu_popup(target, popup_id) { - // get or create the footnote popup div - var fndiv = $('insitu__fn'); + // get or create the popup div + var fndiv = $(popup_id); if(!fndiv){ fndiv = document.createElement('div'); - fndiv.id = 'insitu__fn'; + fndiv.id = popup_id; fndiv.className = 'insitu-footnote JSpopup dokuwiki'; // autoclose on mouseout - ignoring bubbled up events addEvent(fndiv,'mouseout',function(e){ - if(e.target != fndiv){ - e.stopPropagation(); - return; + var p = e.relatedTarget || e.toElement; + while (p && p !== this) { + p = p.parentNode; } - // check if the element was really left - if(e.pageX){ // Mozilla - var bx1 = findPosX(fndiv); - var bx2 = bx1 + fndiv.offsetWidth; - var by1 = findPosY(fndiv); - var by2 = by1 + fndiv.offsetHeight; - var x = e.pageX; - var y = e.pageY; - if(x > bx1 && x < bx2 && y > by1 && y < by2){ - // we're still inside boundaries - e.stopPropagation(); - return; - } - }else{ // IE - if(e.offsetX > 0 && e.offsetX < fndiv.offsetWidth-1 && - e.offsetY > 0 && e.offsetY < fndiv.offsetHeight-1){ - // we're still inside boundaries - e.stopPropagation(); - return; - } + if (p === this) { + return; } // okay, hide it - fndiv.style.display='none'; + this.style.display='none'; }); - document.body.appendChild(fndiv); + getElementsByClass('dokuwiki', document.body, 'div')[0].appendChild(fndiv); } + // position the div and make it visible + fndiv.style.position = 'absolute'; + fndiv.style.left = findPosX(target)+'px'; + fndiv.style.top = (findPosY(target)+target.scrollHeight * 1.5) + 'px'; + fndiv.style.display = ''; + return fndiv; +} + +/** + * Display an insitu footnote popup + * + * @author Andreas Gohr + * @author Chris Smith + */ +function footnote(e){ + var fndiv = insitu_popup(e.target, 'insitu__fn'); + // locate the footnote anchor element - var a = $( "fn__"+id ); + var a = $("fn__" + e.target.id.substr(5)); if (!a){ return; } // anchor parent is the footnote container, get its innerHTML @@ -295,24 +289,10 @@ function footnote(e){ content = content.replace(/^\s+(,\s+)+/,''); // prefix ids on any elements with "insitu__" to ensure they remain unique - content = content.replace(/\bid=\"(.*?)\"/gi,'id="insitu__$1'); + content = content.replace(/\bid=(['"])([^"']+)\1/gi,'id="insitu__$2'); // now put the content into the wrapper fndiv.innerHTML = content; - - // position the div and make it visible - var x; var y; - if(e.pageX){ // Mozilla - x = e.pageX; - y = e.pageY; - }else{ // IE - x = e.offsetX; - y = e.offsetY; - } - fndiv.style.position = 'absolute'; - fndiv.style.left = (x+2)+'px'; - fndiv.style.top = (y+2)+'px'; - fndiv.style.display = ''; } /** -- cgit v1.2.3 From f6ec8df813b28547ca3b04bb39f0ce670a6bb990 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 29 Mar 2010 12:00:30 +0200 Subject: Allow plugins to specify that they have to be instantiated Plugins may return false in isSingleton to let plugin_load return a new instance every time it is called. Renderer plugins are not loaded with $new set to true, but instead specify themself that they are not singletons. This behaviour allows the odt renderer to keep working (see #1598). --- lib/plugins/syntax.php | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib') diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 601b5591e..f7b64d8c0 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -266,13 +266,5 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { return $conf; } - /** - * Allow the plugin to prevent DokuWiki creating a second instance of itself - * - * @return bool true if the plugin can not be instantiated more than once - */ - function isSingleton() { - return false; - } } //Setup VIM: ex: et ts=4 enc=utf-8 : -- cgit v1.2.3 From 187b5536f58354e627f88aead1dbfe0e8d6e7076 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 29 Mar 2010 12:44:02 +0200 Subject: Update syntax plugin base class (DOOM DO-OOM) --- lib/plugins/syntax.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index f7b64d8c0..127b92ce5 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -266,5 +266,14 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { return $conf; } + /** + * Allow the plugin to prevent DokuWiki from reusing an instance + * + * @return bool false if the plugin has to be instantiated + */ + function isSingleton() { + return true; + } + } //Setup VIM: ex: et ts=4 enc=utf-8 : -- cgit v1.2.3 From 2a98590b375e0acfd24fb0da343eb09a3ff76ff3 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 29 Mar 2010 16:58:14 +0200 Subject: Better footnote popup positioning --- lib/scripts/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index 99dade692..d8205b876 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -263,7 +263,7 @@ function insitu_popup(target, popup_id) { // position the div and make it visible fndiv.style.position = 'absolute'; fndiv.style.left = findPosX(target)+'px'; - fndiv.style.top = (findPosY(target)+target.scrollHeight * 1.5) + 'px'; + fndiv.style.top = (findPosY(target)+target.offsetHeight * 1.5) + 'px'; fndiv.style.display = ''; return fndiv; } -- cgit v1.2.3 From d059ba9bb09b872361eee77c46cbd4aba0042e83 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Apr 2010 11:34:38 +0200 Subject: Fix gzip compression in combination with buffer flushing FS#1927 This introduces a new function called tpl_flush() which should be used by template authors in favor of the PHP flush() method. --- lib/tpl/default/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index b5717c009..d9231678b 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -82,7 +82,7 @@ if (!defined('DOKU_INC')) die(); - + @@ -94,7 +94,7 @@ if (!defined('DOKU_INC')) die();
 
- +
-- cgit v1.2.3 From c0c4ef9875d90979ed9d31ea1b6f2866aecaf565 Mon Sep 17 00:00:00 2001 From: Rasmus Kinnerup Date: Fri, 2 Apr 2010 11:22:46 +0200 Subject: Danish language update --- lib/plugins/acl/lang/da/lang.php | 3 ++- lib/plugins/config/lang/da/lang.php | 2 ++ lib/plugins/plugin/lang/da/lang.php | 1 + lib/plugins/popularity/lang/da/lang.php | 1 + lib/plugins/revert/lang/da/lang.php | 1 + lib/plugins/usermanager/lang/da/lang.php | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php index c95ff1582..d40da52a0 100644 --- a/lib/plugins/acl/lang/da/lang.php +++ b/lib/plugins/acl/lang/da/lang.php @@ -11,6 +11,7 @@ * @author Harith * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen + * @author rasmus@kinnerup.com */ $lang['admin_acl'] = 'Rettighedsadministration'; $lang['acl_group'] = 'Gruppe'; @@ -31,7 +32,7 @@ $lang['p_include'] = 'Højere tilladelse inkluderer også lavere. Ti $lang['current'] = 'Aktuelle ACL-regler'; $lang['where'] = 'Side/navnerum'; $lang['who'] = 'Bruger/gruppe'; -$lang['perm'] = 'Adgangsniveau'; +$lang['perm'] = 'Rettigheder'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Læs'; $lang['acl_perm2'] = 'Skriv'; diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index 93eb5c3e3..f076e408a 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -9,6 +9,7 @@ * @author Harith * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen + * @author rasmus@kinnerup.com */ $lang['menu'] = 'Opsætningsindstillinger'; $lang['error'] = 'Indstillingerne blev ikke opdateret på grund af en ugyldig værdi, Gennemse venligst dine ændringer og gem dem igen. @@ -111,6 +112,7 @@ $lang['gdlib'] = 'Udgave af GD Lib'; $lang['im_convert'] = 'Sti til ImageMagick\'s omdannerværktøj'; $lang['jpg_quality'] = 'JPG komprimeringskvalitet (0-100)'; $lang['subscribers'] = 'Slå understøttelse af abonnement på sider til'; +$lang['subscribe_time'] = 'Tid der går før abonnementlister og nyhedsbreve er sendt (i sekunder). Denne værdi skal være mindre end den tid specificeret under recent_days.'; $lang['compress'] = 'Komprimer CSS- og JavaScript-filer'; $lang['hidepages'] = 'Skjul lignende sider (almindelige udtryk)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for ikke-eksisterende sider'; diff --git a/lib/plugins/plugin/lang/da/lang.php b/lib/plugins/plugin/lang/da/lang.php index 98d9f365e..1248c9a9c 100644 --- a/lib/plugins/plugin/lang/da/lang.php +++ b/lib/plugins/plugin/lang/da/lang.php @@ -9,6 +9,7 @@ * @author Harith * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen + * @author rasmus@kinnerup.com */ $lang['menu'] = 'Håndter udvidelser'; $lang['download'] = 'Hent og tilføj ny udvidelse'; diff --git a/lib/plugins/popularity/lang/da/lang.php b/lib/plugins/popularity/lang/da/lang.php index 7a0b1e1b8..af591b88c 100644 --- a/lib/plugins/popularity/lang/da/lang.php +++ b/lib/plugins/popularity/lang/da/lang.php @@ -7,6 +7,7 @@ * @author Harith * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen + * @author rasmus@kinnerup.com */ $lang['name'] = 'Tilbagemelding om popularitet (vil måske tage en del tid at indlæse)'; $lang['submit'] = 'Send data'; diff --git a/lib/plugins/revert/lang/da/lang.php b/lib/plugins/revert/lang/da/lang.php index 97e15f361..4e3b8ddeb 100644 --- a/lib/plugins/revert/lang/da/lang.php +++ b/lib/plugins/revert/lang/da/lang.php @@ -7,6 +7,7 @@ * @author Harith * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen + * @author rasmus@kinnerup.com */ $lang['menu'] = 'Gendannelsesstyring'; $lang['filter'] = 'Søg efter uønskede sider'; diff --git a/lib/plugins/usermanager/lang/da/lang.php b/lib/plugins/usermanager/lang/da/lang.php index 42bdcb7c3..81217c225 100644 --- a/lib/plugins/usermanager/lang/da/lang.php +++ b/lib/plugins/usermanager/lang/da/lang.php @@ -8,6 +8,7 @@ * @author Harith * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen + * @author rasmus@kinnerup.com */ $lang['menu'] = 'Brugerstyring'; $lang['noauth'] = '(Brugervalidering er ikke tilgængelig)'; -- cgit v1.2.3 From 6e00e8beb4aa97f22cafa8757c3e136232a62d7d Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 3 Apr 2010 13:47:37 +0200 Subject: Corrected German translation in the acl plugin --- lib/plugins/acl/lang/de-informal/lang.php | 8 ++++---- lib/plugins/acl/lang/de/lang.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index 6cabe3f35..ac4bb30c0 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -14,12 +14,12 @@ $lang['page'] = 'Seite'; $lang['namespace'] = 'Namensraum'; $lang['btn_select'] = 'Auswählen'; $lang['p_user_id'] = 'Benutzer %s hat im Moment folgende Rechte auf der Seite %s: %s'; -$lang['p_user_ns'] = 'Benutzer %s hat momentan die folgenden Rechte im Namensraum%s: %s.'; +$lang['p_user_ns'] = 'Benutzer %s hat momentan die folgenden Rechte im Namensraum %s: %s.'; $lang['p_group_id'] = 'Die Gruppenmitglieder %s haben momentan die folgenden Rechte auf der Seite %s: %s.'; $lang['p_group_ns'] = 'Die Mitglieder der Gruppe %s haben gerade Zugriff in folgenden Namensräumen %s: %s.'; -$lang['p_choose_id'] = 'Bitte gib einen Nutzer oder eine Gruppe in das Formular ein, um die Berechtigungen der Seite%s anzusehen oder zu bearbeiten.'; -$lang['p_choose_ns'] = 'Bitte gib einen Nutzer oder eine Gruppe in das Formular ein, um die Berechtigungen des Namenraumes%s anzusehen oder zu bearbeiten.'; -$lang['p_inherited'] = 'Hinweis: Diese Rechte wuredn nicht explizit gesetzt sondern geerbt von anderen Grupen oder übergeordneten Namensräumen.'; +$lang['p_choose_id'] = 'Bitte gib einen Nutzer oder eine Gruppe in das Formular ein, um die Berechtigungen der Seite %s anzusehen oder zu bearbeiten.'; +$lang['p_choose_ns'] = 'Bitte gib einen Nutzer oder eine Gruppe in das Formular ein, um die Berechtigungen des Namenraumes %s anzusehen oder zu bearbeiten.'; +$lang['p_inherited'] = 'Hinweis: Diese Rechte wurden nicht explizit gesetzt, sondern von anderen Gruppen oder übergeordneten Namensräumen geerbt.'; $lang['p_isadmin'] = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.'; $lang['p_include'] = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Löschrechte sind nur für Namensräume, nicht für Seiten.'; $lang['current'] = 'Momentane Zugriffsregeln'; diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php index 5bac3ac1c..0d30fe7a1 100644 --- a/lib/plugins/acl/lang/de/lang.php +++ b/lib/plugins/acl/lang/de/lang.php @@ -31,7 +31,7 @@ $lang['p_group_id'] = 'Mitglieder der Gruppe %s%s haben momentan folgende Berechtigungen für den Namensraum %s: %s.'; $lang['p_choose_id'] = 'Bitte geben Sie in obigem Formular eine einen Nutzer oder eine Gruppe an, um die Berechtigungen für die Seite %s zu sehen oder zu ändern.'; $lang['p_choose_ns'] = 'Bitte geben Sie in obigem Formular eine einen Nutzer oder eine Gruppe an, um die Berechtigungen für den Namensraum %s zu sehen oder zu ändern.'; -$lang['p_inherited'] = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.'; +$lang['p_inherited'] = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt, sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.'; $lang['p_isadmin'] = 'Hinweis: Die ausgewählte Gruppe oder Nutzer haben immer alle Berechtigungen das sie als Superuser konfiguriert wurden.'; $lang['p_include'] = 'Höhere Berechtigungen schließen niedrigere mit ein. Anlegen, Hochladen und Entfernen gilt nur für Namensräume, nicht für einzelne Seiten'; $lang['current'] = 'Momentane Zugriffsregeln'; -- cgit v1.2.3 From d74913c6df41b27eb1ea8388a47d94e66f97c652 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 3 Apr 2010 14:40:32 +0200 Subject: Fixed sorting in the acl manager treeview Previously the content of expanded namespaces was displayed below all other pages, now it is placed below it's parent namespace. The new comparison function is quite complex. Please have a look at it if it can done easier or if there are cases I haven't considered where the function produces incorrect results. --- lib/plugins/acl/admin.php | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index b38d2ac6e..dcd72b611 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -267,8 +267,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { usort($data,array($this,'_tree_sort')); $count = count($data); if($count>0) for($i=1; $i<$count; $i++){ - if($data[$i]['type'] == 'f') break; // namespaces come first, we're done - if($data[$i-1]['id'] == $data[$i]['id']) unset($data[$i]); + if($data[$i-1]['id'] == $data[$i]['id'] && $data[$i-1]['type'] == $data[$i]['type']) unset($data[$i]); } return $data; } @@ -279,13 +278,39 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { * Sorts the combined trees of media and page files */ function _tree_sort($a,$b){ - if($a['type'] == 'd' && $b['type'] == 'f'){ + // handle the trivial cases first + if ($a['id'] == '') return -1; + if ($b['id'] == '') return 1; + // split up the id into parts + $a_ids = explode(':', $a['id']); + $b_ids = explode(':', $b['id']); + // now loop through the parts + while (count($a_ids) && count($b_ids)) { + // compare each level from upper to lower + // until a non-equal component is found + $cur_result = strcmp(array_shift($a_ids), array_shift($b_ids)); + if ($cur_result) { + // if one of the components is the last component and is a file + // and the other one is either of a deeper level or a directory, + // the file has to come after the deeper level or directory + if (empty($a_ids) && $a['type'] == 'f' && (count($b_ids) || $b['type'] == 'd')) return 1; + if (empty($b_ids) && $b['type'] == 'f' && (count($a_ids) || $a['type'] == 'd')) return -1; + return $cur_result; + } + } + // The two ids seem to be equal. One of them might however refer + // to a page, one to a namespace, the namespace needs to be first. + if (empty($a_ids) && empty($b_ids)) { + if ($a['type'] == $b['type']) return 0; + if ($a['type'] == 'f') return 1; return -1; - }elseif($a['type'] == 'f' && $b['type'] == 'd'){ - return 1; - }else{ - return strcmp($a['id'],$b['id']); } + // Now the empty part is either a page in the parent namespace + // that obviously needs to be after the namespace + // Or it is the namespace that contains the other part and should be + // before that other part. + if (empty($a_ids)) return ($a['type'] == 'd') ? -1 : 1; + if (empty($b_ids)) return ($b['type'] == 'd') ? 1 : -1; } /** -- cgit v1.2.3 From 40307ce67e9cb6cc8f00ddcddf1677f41b42fb83 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 3 Apr 2010 16:57:58 +0200 Subject: Preserve selected item in the acl manager during ajax requests There are two new parameters submitted that contain the currently selected namespace and page id so it can be selected again indenpendently from the opened namespace. --- lib/plugins/acl/admin.php | 25 ++++++++++++++++++++++--- lib/plugins/acl/script.js | 6 +++++- 2 files changed, 27 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index dcd72b611..1f666660c 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -17,6 +17,15 @@ if(!defined('DOKU_INC')) die(); class admin_plugin_acl extends DokuWiki_Admin_Plugin { var $acl = null; var $ns = null; + /** + * The currently selected item, associative array with id and type. + * Populated from (in this order): + * $_REQUEST['current_ns'] + * $_REQUEST['current_id'] + * $ns + * $ID + */ + var $current_item = null; var $who = ''; var $usersgroups = array(); var $specials = array(); @@ -72,6 +81,16 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $this->ns = cleanID($_REQUEST['ns']); } + if ($_REQUEST['current_ns']) { + $this->current_item = array('id' => cleanID($_REQUEST['current_ns']), 'type' => 'd'); + } elseif ($_REQUEST['current_id']) { + $this->current_item = array('id' => cleanID($_REQUEST['current_id']), 'type' => 'f'); + } elseif ($this->ns) { + $this->current_item = array('id' => $this->ns, 'type' => 'd'); + } else { + $this->current_item = array('id' => $ID, 'type' => 'f'); + } + // user or group choosen? $who = trim($_REQUEST['acl_w']); if($_REQUEST['acl_t'] == '__g__' && $who){ @@ -167,7 +186,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '
'.NL; echo '
'.NL; - $this->_html_explorer($_REQUEST['ns']); + $this->_html_explorer(); echo '
'.NL; echo '
'.NL; @@ -498,8 +517,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } // highlight? - if( ($item['type']=='d' && $item['id'] == $this->ns) || - ($item['type']!='d' && $item['id'] == $ID)) $cl = ' cur'; + if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id'])) + $cl = ' cur'; // namespace or page? if($item['type']=='d'){ diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index 449a3c16a..d5d0371a9 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -118,7 +118,11 @@ acl = { var ul = document.createElement('ul'); listitem.appendChild(ul); ajax.elementObj = ul; - ajax.runAJAX(link.search.substr(1)+'&ajax=tree'); + ajax.setVar('ajax', 'tree'); + var frm = $('acl__detail').getElementsByTagName('form')[0]; + ajax.setVar('current_ns', encodeURIComponent(frm.elements['ns'].value)); + ajax.setVar('current_id', encodeURIComponent(frm.elements['id'].value)); + ajax.runAJAX(link.search.substr(1)); clicky.src = DOKU_BASE+'lib/images/minus.gif'; return false; }, -- cgit v1.2.3 From f03fd957525a714da1cde7e2957939046bd51bd5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 4 Apr 2010 20:28:39 +0200 Subject: new fnencode option FS#1649 This patch adds an option to choose how filenames are encoded when saved to the file system. You can choose between urlencoding (url), the new SafeFn method (safe) and storing real UTF-8 (utf-8). --- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.class.php | 2 +- lib/plugins/config/settings/config.metadata.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 2bcd17c12..dd13464fe 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -116,6 +116,7 @@ $lang['useslash'] = 'Use slash as namespace separator in URLs'; $lang['usedraft'] = 'Automatically save a draft while editing'; $lang['sepchar'] = 'Page name word separator'; $lang['canonical'] = 'Use fully canonical URLs'; +$lang['fnencode'] = 'Method for encoding non-ASCII filenames.'; $lang['autoplural'] = 'Check for plural forms in links'; $lang['compression'] = 'Compression method for attic files'; $lang['cachetime'] = 'Maximum age for cache (sec)'; diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index b7428bf6c..2a1d3a28f 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -343,7 +343,7 @@ if (!class_exists('setting')) { var $_cautionList = array( 'basedir' => 'danger', 'baseurl' => 'danger', 'savedir' => 'danger', 'useacl' => 'danger', 'authtype' => 'danger', 'superuser' => 'danger', 'userewrite' => 'danger', 'start' => 'warning', 'camelcase' => 'warning', 'deaccent' => 'warning', 'sepchar' => 'warning', 'compression' => 'warning', 'xsendfile' => 'warning', 'renderer_xhtml' => 'warning', - 'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'xmlrpc' => 'security' + 'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'xmlrpc' => 'security', 'fnencode' => 'warning' ); function setting($key, $params=NULL) { diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index cea191f56..316b4d1c5 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -171,6 +171,7 @@ $meta['userewrite'] = array('multichoice','_choices' => array(0,1,2)); $meta['useslash'] = array('onoff'); $meta['sepchar'] = array('sepchar'); $meta['canonical'] = array('onoff'); +$meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf-8')); $meta['autoplural'] = array('onoff'); $meta['mailfrom'] = array('richemail'); $meta['compress'] = array('onoff'); -- cgit v1.2.3 From 94f1f78b9d937c58369e0346233ea8dbf40a0cca Mon Sep 17 00:00:00 2001 From: Usama Akkad Date: Thu, 8 Apr 2010 11:45:05 +0200 Subject: Arabic language update --- lib/plugins/acl/lang/ar/lang.php | 1 + lib/plugins/config/lang/ar/lang.php | 39 ++++++++++++++++++++++++++++++++ lib/plugins/plugin/lang/ar/lang.php | 1 + lib/plugins/popularity/lang/ar/lang.php | 1 + lib/plugins/revert/lang/ar/lang.php | 1 + lib/plugins/usermanager/lang/ar/lang.php | 1 + 6 files changed, 44 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php index ced250243..e3e04a6c4 100644 --- a/lib/plugins/acl/lang/ar/lang.php +++ b/lib/plugins/acl/lang/ar/lang.php @@ -5,6 +5,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Mostafa Hussein * @author Yaman Hokan + * @author Usama Akkad */ $lang['admin_acl'] = 'إدارة قوائم التحكم بالدخول'; $lang['acl_group'] = 'مجموعة'; diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 03aa99b91..c62fe594b 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -3,5 +3,44 @@ * Arabic language file * * @author Yaman Hokan + * @author Usama Akkad */ $lang['menu'] = 'الإعدادات'; +$lang['error'] = 'لم تحدث الاعدادات بسبب قيمة غير صالحة، رجاء راجع تغييراتك ثم ارسلها. +
القيم الخاطئة ستظهر محاطة بحدود حمراء.'; +$lang['updated'] = 'رفعت الاعدادات بنجاح.'; +$lang['nochoice'] = '(لا خيارات اخرى متاحة)'; +$lang['locked'] = 'تعذر تحديث ملف الاعدادات، إن لم يكن ذلك مقصودا،
+تأكد من صحة اسم و صلاحيات ملف الاعدادات المحلي.'; +$lang['danger'] = 'خطر: تغيير هذا الخيار قد يؤدي إلى تعذر الوصول للويكي و قائمة الاعدادات.'; +$lang['warning'] = 'تحذير: تغييرهذا الخيار قد يؤدي لسلوك غير متوقع.'; +$lang['security'] = 'تحذير أمني: تغيير هذا الخيار قد يؤدي إلى مخاطرة أمنية.'; +$lang['_configuration_manager'] = 'مدير الاعدادات'; +$lang['_header_dokuwiki'] = 'اعدادات دوكي ويكي'; +$lang['_header_plugin'] = 'اعدادات الملحقات'; +$lang['_header_template'] = 'اعدادات القوالب'; +$lang['_header_undefined'] = 'اعدادات غير محددة'; +$lang['_basic'] = 'اعدادات اساسية'; +$lang['_display'] = 'اعدادات العرض'; +$lang['_authentication'] = 'اعدادات المواثقة'; +$lang['_anti_spam'] = 'اعدادات مضاد النفاية'; +$lang['_editing'] = 'اعدادات التحرير'; +$lang['_links'] = 'اعدادات الروابط'; +$lang['_media'] = 'اعدادات الوسائط'; +$lang['_advanced'] = 'اعدادات متقدمة'; +$lang['_network'] = 'اعدادات الشبكة'; +$lang['_plugin_sufix'] = 'اعدادات الملحقات'; +$lang['_template_sufix'] = 'اعدادات القوالب'; +$lang['_msg_setting_undefined'] = 'لا بيانات إعدادات.'; +$lang['_msg_setting_no_default'] = 'لا قيمة افتراضية.'; +$lang['fmode'] = 'نمط انشاء الملفات'; +$lang['dmode'] = 'نمط انشاء المجلدات'; +$lang['lang'] = 'لغة الواجهة'; +$lang['basedir'] = 'مسار الخادوم (مثال. /dokuwiki/) اترك فارغا للاكتشاف التلقائي.'; +$lang['baseurl'] = 'عنوان الخادوم (مثال. http://www.yourserver.com). اترك فارغا للاكتشاف التلقائي.'; +$lang['savedir'] = 'دليل حفظ البيانات'; +$lang['start'] = 'اسم صفحة البداية'; +$lang['title'] = 'عنوان الويكي'; +$lang['template'] = 'القالب'; +$lang['license'] = 'تحت أي رخصة تريد اصدار المحتوى؟'; +$lang['fullpath'] = 'اظهر المحتوى الكامل للصفحات في '; diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php index cda6f4a63..dbbcbd07a 100644 --- a/lib/plugins/plugin/lang/ar/lang.php +++ b/lib/plugins/plugin/lang/ar/lang.php @@ -3,6 +3,7 @@ * Arabic language file * * @author Yaman Hokan + * @author Usama Akkad */ $lang['btn_delete'] = 'حذف'; $lang['btn_settings'] = 'خيارات'; diff --git a/lib/plugins/popularity/lang/ar/lang.php b/lib/plugins/popularity/lang/ar/lang.php index cdab0cf43..d1d05c789 100644 --- a/lib/plugins/popularity/lang/ar/lang.php +++ b/lib/plugins/popularity/lang/ar/lang.php @@ -3,4 +3,5 @@ * Arabic language file * * @author Yaman Hokan + * @author Usama Akkad */ diff --git a/lib/plugins/revert/lang/ar/lang.php b/lib/plugins/revert/lang/ar/lang.php index cdab0cf43..d1d05c789 100644 --- a/lib/plugins/revert/lang/ar/lang.php +++ b/lib/plugins/revert/lang/ar/lang.php @@ -3,4 +3,5 @@ * Arabic language file * * @author Yaman Hokan + * @author Usama Akkad */ diff --git a/lib/plugins/usermanager/lang/ar/lang.php b/lib/plugins/usermanager/lang/ar/lang.php index 88a115de2..b6aff8120 100644 --- a/lib/plugins/usermanager/lang/ar/lang.php +++ b/lib/plugins/usermanager/lang/ar/lang.php @@ -3,6 +3,7 @@ * Arabic language file * * @author Yaman Hokan + * @author Usama Akkad */ $lang['user_id'] = 'اسم المستخدم'; $lang['user_pass'] = 'كلمة السر'; -- cgit v1.2.3 From 28a7a6433920fcafa4c345badb9b4a185932fbe9 Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Fri, 9 Apr 2010 08:24:07 +0200 Subject: Slovak language update --- lib/plugins/acl/lang/sk/help.txt | 4 ++-- lib/plugins/config/lang/sk/lang.php | 4 ++-- lib/plugins/plugin/lang/sk/lang.php | 16 ++++++++-------- lib/plugins/popularity/lang/sk/intro.txt | 6 +++--- lib/plugins/revert/lang/sk/lang.php | 4 ++-- lib/plugins/usermanager/lang/sk/lang.php | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/sk/help.txt b/lib/plugins/acl/lang/sk/help.txt index 1167bf5e9..103a0341a 100644 --- a/lib/plugins/acl/lang/sk/help.txt +++ b/lib/plugins/acl/lang/sk/help.txt @@ -4,8 +4,8 @@ Na tejto stránke môžete pridávať alebo rušiť oprávnenia pre menné pries Ľavý panel zobrazuje všetky dostupné menné priestory a stránky. -Formulár zobrazený vyššie Vam dovoľuje prehliadať a meniť oprávnenia pre vybraného používateľa alebo skupinu. +Formulár zobrazený vyššie Vám dovoľuje prehliadať a meniť oprávnenia pre vybraného používateľa alebo skupinu. -V tabuľke nižšie sú zobrazené všetky aktuálne prístupové pravidlá. Môžete v nej rýchlo rušiť alebo meniť viacero pravidiel naraz. +V tabuľke nižšie sú zobrazené všetky aktuálne prístupové pravidlá. Môžete v nej rýchlo rušiť alebo meniť viacero pravidiel súčasne. Prečítanie [[doku>acl|oficiálnej dokumentácie ACL]] Vám môže pomôcť plne pochopiť spôsob ako fungujú prístupové pravidlá (oprávnenia) v DokuWiki. \ No newline at end of file diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index b9490d49b..4e519d7d7 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -85,6 +85,7 @@ $lang['disableactions_other'] = 'Iné akcie (oddelené čiarkou)'; $lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.'; $lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)'; $lang['securecookie'] = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.'; +$lang['xmlrpc'] = 'Povoliť/zakázať XML-RPC rozhranie.'; $lang['updatecheck'] = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k splitbrain.org.'; $lang['userewrite'] = 'Používať nice URLs'; $lang['useslash'] = 'Používať lomku (/) ako oddeľovač v URL'; @@ -109,8 +110,7 @@ $lang['hidepages'] = 'Skryť zodpovedajúce stránky (regulárne vý $lang['send404'] = 'Poslať "HTTP 404/Page Not Found" pre neexistujúce stránky'; $lang['sitemap'] = 'Generovať Google sitemap (dni)'; $lang['broken_iua'] = 'Je vo Vašom systéme funkcia ignore_user_abort poškodená? Môže to mať za následok nefunkčnosť vyhľadávania v indexe. IIS+PHP/CGI je známy tým, že nefunguje správne. Pozrite Bug 852 pre dalšie informácie.'; -$lang['xsendfile'] = 'Používať X-Sendfile hlavičku pre doručenie statických suborov webserverom? Webserver musí túto funkcionalitu podporovať.'; -$lang['xmlrpc'] = 'Povoliť/zakázať XML-RPC rozhranie.'; +$lang['xsendfile'] = 'Používať X-Sendfile hlavičku pre doručenie statických súborov webserverom? Webserver musí túto funkcionalitu podporovať.'; $lang['renderer_xhtml'] = 'Používané vykresľovacie jadro pre hlavný (xhtml) wiki výstup'; $lang['renderer__core'] = '%s (dokuwiki jadro)'; $lang['renderer__plugin'] = '%s (plugin)'; diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php index cf89200c5..c04ac3af6 100644 --- a/lib/plugins/plugin/lang/sk/lang.php +++ b/lib/plugins/plugin/lang/sk/lang.php @@ -22,15 +22,15 @@ $lang['lastupdate'] = 'Aktualizovaný:'; $lang['source'] = 'Zdroj:'; $lang['unknown'] = 'neznámy'; $lang['updating'] = 'Aktualizuje sa ...'; -$lang['updated'] = 'Plugin %s bol úspešne zaktualizovaný'; -$lang['updates'] = 'Nasledujúce pluginy bol úspešne zaktualizované:'; +$lang['updated'] = 'Plugin %s bol úspešne aktualizovaný'; +$lang['updates'] = 'Nasledujúce pluginy bol úspešne aktualizované:'; $lang['update_none'] = 'Neboli nájdené žiadne aktualizácie.'; $lang['deleting'] = 'Vymazáva sa ...'; $lang['deleted'] = 'Plugin %s bol zmazaný.'; $lang['downloading'] = 'Sťahuje sa ...'; $lang['downloaded'] = 'Plugin %s bol úspešne stiahnutý'; $lang['downloads'] = 'Nasledujúce pluginy bol úspešne stiahnuté:'; -$lang['download_none'] = 'Neboli nájdené žiadne pluginy, alebo nastal neznámy problém počas sťahovania a inštalácie pluginov.'; +$lang['download_none'] = 'Neboli nájdené žiadne pluginy alebo nastal neznámy problém počas sťahovania a inštalácie pluginov.'; $lang['plugin'] = 'Plugin:'; $lang['components'] = 'Súčasti'; $lang['noinfo'] = 'Tento plugin neobsahuje žiadne informácie, je možné, že je chybný.'; @@ -44,10 +44,10 @@ $lang['error'] = 'Nastala neznáma chyba.'; $lang['error_download'] = 'Nie je možné stiahnuť súbor pluginu: %s'; $lang['error_badurl'] = 'Pravdepodobne zlá url adresa - nie je možné z nej určiť meno súboru'; $lang['error_dircreate'] = 'Nie je možné vytvoriť dočasný adresár pre uloženie sťahovaného súboru'; -$lang['error_decompress'] = 'Správca pluginov nedokáže dekomprimovať stiahnutý súbor. Môže to byť dôsledok zlého stiahnutia, v tom prípade to skúste znovu, alebo môže ísť o neznámy formát súboru, v tom prípade musítestiahnuť a nainštalovať plugin manuálne.'; -$lang['error_copy'] = 'Nastala chyba kopírovania súboru počas pokusu inštalovať súbory pluginu%s: disk môže byť plný, alebo prístupové práva k súboru môžu byť nesprávne. Toto môže mať za následok čiastočne nainštalovanie pluginu a nestabilitu vašej DokuWiki.'; -$lang['error_delete'] = 'Nastala chyba počas pokusu o zmazanie pluginu %s. Najpravdepodobnejším dôvodom môžu byť nedostatočné prístupové práva pre súbor, alebo adresár'; +$lang['error_decompress'] = 'Správca pluginov nedokáže dekomprimovať stiahnutý súbor. Môže to byť dôsledok zlého stiahnutia, v tom prípade to skúste znovu, alebo môže ísť o neznámy formát súboru, v tom prípade musíte stiahnuť a nainštalovať plugin manuálne.'; +$lang['error_copy'] = 'Nastala chyba kopírovania súboru počas pokusu inštalovať súbory pluginu%s: disk môže byť plný alebo prístupové práva k súboru môžu byť nesprávne. Toto môže mať za následok čiastočne nainštalovanie pluginu a nestabilitu vašej DokuWiki.'; +$lang['error_delete'] = 'Nastala chyba počas pokusu o zmazanie pluginu %s. Najpravdepodobnejším dôvodom môžu byť nedostatočné prístupové práva pre súbor alebo adresár'; $lang['enabled'] = 'Plugin %s aktivovaný.'; -$lang['notenabled'] = 'Plugin %s nemôže byť aktivovaný, skotrolujte prístupové práva.'; +$lang['notenabled'] = 'Plugin %s nemôže byť aktivovaný, skontrolujte prístupové práva.'; $lang['disabled'] = 'Plugin %s deaktivovaný.'; -$lang['notdisabled'] = 'Plugin %s nemôže byť deaktivovaný, skotrolujte prístupové práva.'; +$lang['notdisabled'] = 'Plugin %s nemôže byť deaktivovaný, skontrolujte prístupové práva.'; diff --git a/lib/plugins/popularity/lang/sk/intro.txt b/lib/plugins/popularity/lang/sk/intro.txt index 8e4260657..7f580d979 100644 --- a/lib/plugins/popularity/lang/sk/intro.txt +++ b/lib/plugins/popularity/lang/sk/intro.txt @@ -1,9 +1,9 @@ ====== Prieskum používania ====== -Tento nástroj získa anonymné dáta o Vašej wiki a ponúkne Vám možnosť odoslať ich späť k vývojárom DokuWiki. Týmto spôsobom im umožníte lepšie porozumieť, ako je používaná DokuWiki, a podporiť ich budúce rozhodnutia o ďalšom vývoji infomáciami z reálneho používania DokuWiki. +Tento nástroj získa anonymné dáta o Vašej wiki a ponúkne Vám možnosť odoslať ich späť k vývojárom DokuWiki. Týmto spôsobom im umožníte lepšie porozumieť, ako je používaná DokuWiki, a podporiť ich budúce rozhodnutia o ďalšom vývoji informáciami z reálneho používania DokuWiki. -Doporučujeme Vám opakovať tento krok z času na čas pri napredovaní Vašej wiki a tak pomôcť vývojárom DokuWiki. Vaše data budú označené anonymným ID. +Doporučujeme Vám opakovať tento krok z času na čas pri napredovaní Vašej wiki a tak pomôcť vývojárom DokuWiki. Vaše dáta budú označené anonymným ID. -Zozbierané data obsahujú informácie ako verziu DokuWiki, počet a veľkosť Vašich stránok a súborov, inštalované pluginy a informácie o inštalovanom PHP. +Zozbierané dáta obsahujú informácie ako verziu DokuWiki, počet a veľkosť Vašich stránok a súborov, inštalované pluginy a informácie o inštalovanom PHP. Dáta, ktoré budú poslané sú zobrazené nižšie. Prosím použite tlačidlo "Poslať dáta" na odoslanie týchto informácií. \ No newline at end of file diff --git a/lib/plugins/revert/lang/sk/lang.php b/lib/plugins/revert/lang/sk/lang.php index 822837de0..368d2d929 100644 --- a/lib/plugins/revert/lang/sk/lang.php +++ b/lib/plugins/revert/lang/sk/lang.php @@ -6,12 +6,12 @@ * @author exusik@gmail.com * @author Martin Michalek */ -$lang['menu'] = 'Reverzný menežér'; +$lang['menu'] = 'Reverzný manažér'; $lang['filter'] = 'Hľadať spamerské stránky'; $lang['revert'] = 'Vrátiť vybrané stránky'; $lang['reverted'] = '%s vrátená na revíziu %s'; $lang['removed'] = '%s odstránená'; -$lang['revstart'] = 'Proces reverzie bol spustený. Toto môže trvať dlhý čas. Ak skript vyprší pred tým, ako skončí, musíte urobiť reverziu v menších dávkach.'; +$lang['revstart'] = 'Proces reverzie bol spustený. Toto môže trvať dlhý čas. Ak skript prekročí daný maximálny časový interval pred tým, ako skončí, musíte urobiť reverziu v menších dávkach.'; $lang['revstop'] = 'Proces reverzie sa úspešne skončil.'; $lang['note1'] = 'Poznámka: vyhľadávanie rozlišuje medzi veľkými a malými písmenami'; $lang['note2'] = 'Poznámka: táto stránka bude vrátená do poslednej verzie, ktorá neobsahuje spamový výraz %s.'; diff --git a/lib/plugins/usermanager/lang/sk/lang.php b/lib/plugins/usermanager/lang/sk/lang.php index 8b309bc71..54ed374c6 100644 --- a/lib/plugins/usermanager/lang/sk/lang.php +++ b/lib/plugins/usermanager/lang/sk/lang.php @@ -10,7 +10,7 @@ $lang['menu'] = 'Správa používateľov'; $lang['noauth'] = '(autentifikácia užívateľov nie je dostupná)'; $lang['nosupport'] = '(správa užívateľov nie je podporovaná)'; -$lang['badauth'] = 'vadný autorizačný mechanizmus'; +$lang['badauth'] = 'neplatný autorizačný mechanizmus'; $lang['user_id'] = 'Užívateľ'; $lang['user_pass'] = 'Heslo'; $lang['user_name'] = 'Skutočné meno'; @@ -39,11 +39,11 @@ $lang['start'] = 'prvé'; $lang['prev'] = 'predošlé'; $lang['next'] = 'ďalšie'; $lang['last'] = 'posledné'; -$lang['edit_usermissing'] = 'Vybraný užívateľ nebol nájdený, mohol byť zmazaný, alebo zmenený iným spôsobom.'; +$lang['edit_usermissing'] = 'Vybraný užívateľ nebol nájdený, mohol byť zmazaný alebo zmenený iným spôsobom.'; $lang['user_notify'] = 'Upozorniť užívateľa'; $lang['note_notify'] = 'Notifikačné e-maily iba vtedy, ak dostane užívateľ nové heslo'; -$lang['note_group'] = 'Noví užívatelia budú pridaní do východej skupiny (%s), ak nie je pre nich špecifikovaná iná skupina.'; -$lang['note_pass'] = 'Heslo bude vygenegované automaticky, ak bude pole prázdne a je zapnutá notifikácia používateľa.'; +$lang['note_group'] = 'Noví užívatelia budú pridaní do východzej skupiny (%s), ak nie je pre nich špecifikovaná iná skupina.'; +$lang['note_pass'] = 'Heslo bude vygenerované automaticky, ak bude pole prázdne a je zapnutá notifikácia používateľa.'; $lang['add_ok'] = 'Používateľ úspešne pridaný'; $lang['add_fail'] = 'Pridávanie užívateľa nebolo úspešné'; $lang['notify_ok'] = 'Notifikačný e-mail bol poslaný'; -- cgit v1.2.3 From 767b2cc2194fe671edafa2a48ea0be6fe9da30cd Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Sat, 10 Apr 2010 14:19:26 +0200 Subject: Slovak language update --- lib/plugins/config/lang/sk/lang.php | 3 +++ lib/plugins/plugin/lang/sk/lang.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 4e519d7d7..73c3535d2 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -86,12 +86,14 @@ $lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky m $lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)'; $lang['securecookie'] = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.'; $lang['xmlrpc'] = 'Povoliť/zakázať XML-RPC rozhranie.'; +$lang['xmlrpcuser'] = 'Obmedziť XML-RPC prístup iba pre uvedené skupiny alebo používateľov (oddelených čiarkami).'; $lang['updatecheck'] = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k splitbrain.org.'; $lang['userewrite'] = 'Používať nice URLs'; $lang['useslash'] = 'Používať lomku (/) ako oddeľovač v URL'; $lang['usedraft'] = 'Automaticky ukladať koncept počas úpravy stránky'; $lang['sepchar'] = 'Oddeľovač slov v názvoch stránok'; $lang['canonical'] = 'Používať plne kanonické URL názvy'; +$lang['fnencode'] = 'Spôsob kódovania non-ASCII mien súborov.'; $lang['autoplural'] = 'Kontrolovať množné číslo v odkazoch'; $lang['compression'] = 'Metóda kompresie pre staré verzie stránok'; $lang['cachetime'] = 'Maximálne trvanie cache (sek)'; @@ -178,3 +180,4 @@ $lang['useheading_o_0'] = 'Nikdy'; $lang['useheading_o_navigation'] = 'Iba navigácia'; $lang['useheading_o_content'] = 'Iba Wiki obsah'; $lang['useheading_o_1'] = 'Vždy'; +$lang['readdircache'] = 'Maximálne trvanie readdir cache (sek)'; diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php index c04ac3af6..a10bc0fe4 100644 --- a/lib/plugins/plugin/lang/sk/lang.php +++ b/lib/plugins/plugin/lang/sk/lang.php @@ -8,7 +8,7 @@ * @author Martin Michalek */ $lang['menu'] = 'Správa pluginov'; -$lang['download'] = 'Stiahnuť a nainštalovať plugin'; +$lang['download'] = 'Stiahnuť a nainštalovať plugin'; $lang['manage'] = 'Nainštalované pluginy'; $lang['btn_info'] = 'info'; $lang['btn_update'] = 'aktualizovať'; -- cgit v1.2.3 From b3389c7a7fa0f2d29f3ab1714d577f9d2194e22d Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 10 Apr 2010 15:51:04 +0100 Subject: rtl improvements, plus explicitly specify monospace for pre --- lib/tpl/default/design.css | 1 + lib/tpl/default/print.css | 4 ++++ lib/tpl/default/rtl.css | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index cd4d03e43..d608e1113 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -38,6 +38,7 @@ div.dokuwiki p, div.dokuwiki blockquote, div.dokuwiki table, div.dokuwiki pre { + font-family: monospace; margin: 0 0 1.0em 0; } diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 1d6e0756f..46a419b35 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -143,6 +143,10 @@ span.li { font-weight: normal; } +pre { + font-family: monospace; +} + /* code blocks by indention */ pre.pre { font-size: 8pt; diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index af3793f7d..4bc41858b 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -45,6 +45,10 @@ div.meta div.doc { div.dokuwiki ul, div.dokuwiki ol { + margin: 0.5em 3.5em 0.5em 0; +} +div.dokuwiki li ul, +div.dokuwiki li ol { margin: 0.5em 1.5em 0.5em 0; } @@ -113,7 +117,8 @@ div.dokuwiki ul.toc li.clear { padding-right: 0.4em; } -div.dokuwiki pre { +div.dokuwiki .code { + direction: ltr; text-align: left; } -- cgit v1.2.3 From fe27e2968d47a4bef11df598c5d6cba87467ceff Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 10 Apr 2010 15:53:52 +0100 Subject: fix incorrectly placed explicit font declaration for pre --- lib/tpl/default/design.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index d608e1113..fdc41e55b 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -38,7 +38,6 @@ div.dokuwiki p, div.dokuwiki blockquote, div.dokuwiki table, div.dokuwiki pre { - font-family: monospace; margin: 0 0 1.0em 0; } @@ -463,6 +462,7 @@ div.dokuwiki blockquote { } div.dokuwiki pre { + font-family: monospace; font-size: 120%; padding: 0.5em; border: 1px dashed __border__; -- cgit v1.2.3 From b4877af37a38cedb703d975b6eca8ceb18652acd Mon Sep 17 00:00:00 2001 From: Usama Akkad Date: Sun, 11 Apr 2010 11:50:04 +0200 Subject: Arabic language update --- lib/plugins/config/lang/ar/intro.txt | 7 ++++ lib/plugins/config/lang/ar/lang.php | 71 ++++++++++++++++++++++++++++++++ lib/plugins/popularity/lang/ar/intro.txt | 9 ++++ lib/plugins/popularity/lang/ar/lang.php | 2 + 4 files changed, 89 insertions(+) create mode 100644 lib/plugins/config/lang/ar/intro.txt create mode 100644 lib/plugins/popularity/lang/ar/intro.txt (limited to 'lib') diff --git a/lib/plugins/config/lang/ar/intro.txt b/lib/plugins/config/lang/ar/intro.txt new file mode 100644 index 000000000..3e09db401 --- /dev/null +++ b/lib/plugins/config/lang/ar/intro.txt @@ -0,0 +1,7 @@ +====== مدير الضبط ====== + +استخدم هذه الصفحة للتحكم باعدادات دوكي ويكي المثبتة عندك. للمساعدة في أمر ما أشر إلى [[doku>config]]. لمعلومات اكثر عن هذه الاضافة انظر [[doku>plugin:config]]. + +الاعدادات الظاهرة بخلفية حمراء فاتحة اعدادات محمية ولا يمكن تغييرها بهذه الاضافة. الاعدادات الظاهرة بخلفية زرقاء هي القيم الافتراضية والاعدادات الظاهرة بخلفية بيضاء خصصت لهذا التثبيت محليا. الاعدادات الزرقاء والبيضاء يمكن تغييرها. + +تأكد من ضغط زر **SAVE** قبل ترك الصفحة وإلا ستضيع تعديلاتك. \ No newline at end of file diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index c62fe594b..5a5fc5bfe 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -44,3 +44,74 @@ $lang['title'] = 'عنوان الويكي'; $lang['template'] = 'القالب'; $lang['license'] = 'تحت أي رخصة تريد اصدار المحتوى؟'; $lang['fullpath'] = 'اظهر المحتوى الكامل للصفحات في '; +$lang['recent'] = 'أحدث التغييرات'; +$lang['htmlok'] = 'مكّن تضمين HTML'; +$lang['phpok'] = 'مكّن تضمين PHP'; +$lang['dformat'] = 'تنسيق التاريخ (انظر وظيفة PHP,s strftime)'; +$lang['signature'] = 'التوقيع'; +$lang['toptoclevel'] = 'المستوى الأعلى لمحتويات الجدول'; +$lang['maxtoclevel'] = 'المستوى الأقصى لمحتويات الجدول'; +$lang['maxseclevel'] = 'المستوى الأقصى لتحرير القسم'; +$lang['camelcase'] = 'استخدم CamelCase للروابط'; +$lang['deaccent'] = 'نظّف اسماء الصفحات'; +$lang['useheading'] = 'استخدم اول ترويسة كأسم للصفحة'; +$lang['refcheck'] = 'التحقق من مرجع الوسائط'; +$lang['refshow'] = 'عدد مراجع الوسائط لتعرض'; +$lang['allowdebug'] = 'مكّن التنقيح عطّلها إن لم تكن بحاجلة لها!'; +$lang['usewordblock'] = 'احجز الغثاء بناء على قائمة كلمات'; +$lang['indexdelay'] = 'التأخير قبل الفهرسة (ثوان)'; +$lang['relnofollow'] = 'استخدم rel="nofollow" للروابط الخارجية'; +$lang['iexssprotect'] = 'تحقق الملفات المرفوعة من احتمال وجود أكواد جافاسكربت أو HTML ضارة'; +$lang['showuseras'] = 'الذي يعرض لاظهار المستخدم الذي قام بآخر تحرير لصفحة'; +$lang['useacl'] = 'استخدم قائمة التحم بالوصول'; +$lang['autopasswd'] = 'ولد كلمات سر تلقائيا'; +$lang['authtype'] = 'آلية المواثقة'; +$lang['passcrypt'] = 'نمط تشفير كلمة السر'; +$lang['defaultgroup'] = 'المجموعة الافتراضية'; +$lang['superuser'] = 'مجموعة المستخدم المتفوق أو مستخدم أو قائمة مفصولة بالفاصلة مستخدم1،@مجموعة، مستخدم2 صلاحيتهم الوصول الكامل لكل الصفحات و الوظائف بغض النظر عن اعدادات ACL'; +$lang['manager'] = 'مجموعة المدراء أو مستخدم أو قائمة مفصولة بالفاصلة مستخدم1،@مجموعة، مستخدم2 صلاحيتهم بعض الوظائف الادارية'; +$lang['profileconfirm'] = 'اكد تغيير اللاحة بكلمة المرور'; +$lang['disableactions'] = 'عطّل اجراءات دوكي ويكي'; +$lang['disableactions_check'] = 'تحقق'; +$lang['disableactions_subscription'] = 'اشترك/الغ الاشتراك'; +$lang['disableactions_wikicode'] = 'اعرض المصدر/صدّر صرفا'; +$lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالفاصلة)'; +$lang['sneaky_index'] = 'افتراضيا، ستعرض دوكي ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; +$lang['notify'] = 'ارسل تنبيهات التغيير لهذا البريد'; +$lang['registernotify'] = 'ارسل بيانات عن المستخدمين المسجلين جديدا لهذا البريد'; +$lang['mailfrom'] = 'البريد الالكتروني ليستخدم للرسائل الآلية'; +$lang['gzip_output'] = 'استخدم ترميز-محتوى gzip ل xhtml'; +$lang['gdlib'] = 'اصدار مكتبة GD'; +$lang['im_convert'] = 'المسار إلى اداة تحويل ImageMagick'; +$lang['jpg_quality'] = 'دقة ضغط JPG (0-100)'; +$lang['subscribers'] = 'مكن دعم اشتراك الصفحة'; +$lang['hidepages'] = 'أخف الصفحات المنطبق عليها (تعابير شرطية)'; +$lang['send404'] = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة'; +$lang['sitemap'] = 'ولد خرائط موقع جوجل (أيام)'; +$lang['rememberme'] = 'اسمح بكعكات الدخول الدائم (تذكرني)'; +$lang['rss_type'] = 'نوع تلقيمات XML'; +$lang['rss_linkto'] = 'تلقيمات XML توصل إلى'; +$lang['rss_content'] = 'مالذي يعرض في عناصر تلقيمات XML؟'; +$lang['rss_update'] = 'تحديث تلقيم XML (ثوان)'; +$lang['recent_days'] = 'مدة إبقاء أحدث التغييرات (ايام)'; +$lang['rss_show_summary'] = 'تلقيم XML يظهر ملخصا في العنوان'; +$lang['target____wiki'] = 'النافذة الهدف للروابط الداخلية'; +$lang['target____extern'] = 'النافذة الهدف للروابط الخارجية'; +$lang['target____media'] = 'النافذة الهدف لروابط الوسائط'; +$lang['target____windows'] = 'النافذة الهدف لروابط النوافذ'; +$lang['proxy____host'] = 'اسم خادوم الوكيل'; +$lang['proxy____port'] = 'منفذ الوكيل'; +$lang['proxy____user'] = 'اسم مستخدم الوكيل'; +$lang['proxy____pass'] = 'كلمة سر الوكيل'; +$lang['proxy____ssl'] = 'استخدم ssl للاتصال بالوكيل'; +$lang['license_o_'] = 'غير مختار'; +$lang['typography_o_0'] = 'لاشيء'; +$lang['typography_o_1'] = 'استبعاد الاقتباس المفرد'; +$lang['userewrite_o_0'] = 'لاشيء'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['gdlib_o_0'] = 'مكتبة GD غير متوفرة'; +$lang['gdlib_o_1'] = 'الاصدار 1.x'; +$lang['gdlib_o_2'] = 'اكتشاف تلقائي'; +$lang['rss_type_o_atom'] = 'أتوم 0.3'; +$lang['rss_type_o_atom1'] = 'أتوم 1.0'; +$lang['rss_content_o_htmldiff'] = 'جدول الفروق بهيئة HTML'; \ No newline at end of file diff --git a/lib/plugins/popularity/lang/ar/intro.txt b/lib/plugins/popularity/lang/ar/intro.txt new file mode 100644 index 000000000..e5710af36 --- /dev/null +++ b/lib/plugins/popularity/lang/ar/intro.txt @@ -0,0 +1,9 @@ +====== Popularity Feedback ====== + +تجمع هذه الأداة بيانات مجهولة الاسم وتسمح لك بردها لمطوري لدوكي ويكي. يساعدهم ذلك على معرفة كيفية استخدام دوكي ويكي من المستخدمين والتأكد من أن التطويرات المستقبلية مدعومة بتقارير استخدام حقيقية. + +نشجعك على تكرار هذه الخطوة من وقت لآخر لابقاء المطورين على علم بنمو الويكي خاصتك. بياناتك المرسلة مكررا ستحتفظ ب ID بلا اسماء يميزها. + +البيانات المرسلة تحتوي معلومات مثل اصدار دوكي ويكي، عدد وحجم صفحاتك وملفاتك، الاضافات المركبة و معلومات عن PHP عندك. + +البيانات التي سترسل معروضة صرفا أسفله. رجاء استخدم زر "أرسل البيانات" لنقل المعلومات. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/ar/lang.php b/lib/plugins/popularity/lang/ar/lang.php index d1d05c789..c0e7dc6af 100644 --- a/lib/plugins/popularity/lang/ar/lang.php +++ b/lib/plugins/popularity/lang/ar/lang.php @@ -5,3 +5,5 @@ * @author Yaman Hokan * @author Usama Akkad */ +$lang['name'] = 'رد الشعبية (قد يأخذ بعض الوقت ليحمل)'; +$lang['submit'] = 'أرسل البيانات'; -- cgit v1.2.3 From e600c8346b32e7cf7c0ffb525972907391b54426 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 12 Apr 2010 10:50:05 +0100 Subject: Fix #1938, rtl style for blockquote --- lib/tpl/default/rtl.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 4bc41858b..b59fcc783 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -121,4 +121,9 @@ div.dokuwiki .code { direction: ltr; text-align: left; } - +div.dokuwiki blockquote { + border-left: 0; + padding-left: 0; + border-right: 2px solid __border__; + padding-right: 3px; +} -- cgit v1.2.3 From d258a97797c602857a8cf542d64f49e1676c2497 Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Thu, 15 Apr 2010 08:30:08 +0200 Subject: Slovak language update --- lib/plugins/config/lang/sk/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 73c3535d2..7b94f26d0 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -107,6 +107,7 @@ $lang['gdlib'] = 'Verzia GD Lib'; $lang['im_convert'] = 'Cesta k ImageMagick convert tool'; $lang['jpg_quality'] = 'Kvalita JPG kompresie (0-100)'; $lang['subscribers'] = 'Povoliť podporu informovania o zmenách stránky'; +$lang['subscribe_time'] = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.'; $lang['compress'] = 'Komprimovať CSS a javascript výstup'; $lang['hidepages'] = 'Skryť zodpovedajúce stránky (regulárne výrazy)'; $lang['send404'] = 'Poslať "HTTP 404/Page Not Found" pre neexistujúce stránky'; -- cgit v1.2.3 From acca0b77793187b25d85d39e7ed7d6194f8aa55e Mon Sep 17 00:00:00 2001 From: Usama Akkad Date: Thu, 15 Apr 2010 08:36:26 +0200 Subject: Arabic language update --- lib/plugins/acl/lang/ar/help.txt | 11 +++++++ lib/plugins/acl/lang/ar/lang.php | 12 +++++++ lib/plugins/config/lang/ar/lang.php | 2 +- lib/plugins/plugin/lang/ar/admin_plugin.txt | 4 +++ lib/plugins/plugin/lang/ar/lang.php | 50 ++++++++++++++++++++++------- lib/plugins/usermanager/lang/ar/edit.txt | 2 +- lib/plugins/usermanager/lang/ar/intro.txt | 1 + lib/plugins/usermanager/lang/ar/lang.php | 26 +++++++++++++-- lib/plugins/usermanager/lang/ar/list.txt | 1 + 9 files changed, 92 insertions(+), 17 deletions(-) create mode 100644 lib/plugins/acl/lang/ar/help.txt create mode 100644 lib/plugins/plugin/lang/ar/admin_plugin.txt create mode 100644 lib/plugins/usermanager/lang/ar/intro.txt create mode 100644 lib/plugins/usermanager/lang/ar/list.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/ar/help.txt b/lib/plugins/acl/lang/ar/help.txt new file mode 100644 index 000000000..afae13a86 --- /dev/null +++ b/lib/plugins/acl/lang/ar/help.txt @@ -0,0 +1,11 @@ +=== مساعدة سريعة: === + +على هذه الصفحة يمكنك إضافة أو إزالة الصلاحيات الخاصة بالنطاقات و الصفحات في ويكيتك. + +الشريط الأيسر يظهر كل النطاقات و الصفحات المتاحة. + +النموذج في الأسفل يمكنك من رؤية و تعديل الصلاحيات لمستخدم محدد أو مجموعة . + +في الجدول في الأسفل تجد قواعد التحكم بالوصول معروضة. يمكنك استخدامها لحذف أو تغيير عدة قواعد بسرعة. + +قراءة [[doku>acl|المستندات الرسمية عن ACL]] قد يساعدك على الفهم الكامل لطريقة عمل التحكم بالوصول في دوكي ويكي. diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php index e3e04a6c4..552ce90d9 100644 --- a/lib/plugins/acl/lang/ar/lang.php +++ b/lib/plugins/acl/lang/ar/lang.php @@ -14,6 +14,17 @@ $lang['acl_perms'] = 'ترخيص لـ'; $lang['page'] = 'صفحة'; $lang['namespace'] = 'فضاء التسمية'; $lang['btn_select'] = 'اختيار'; +$lang['p_user_id'] = 'المستخدم%s عنده حاليا الصلاحيات التالية على الصفحة%s: %s.'; +$lang['p_user_ns'] = 'المستخدم %s عنده حاليا الصلاحيات التالية في النطاق%s: %s.'; +$lang['p_group_id'] = 'أعضاء مجموعة%s عندهم حاليا الصلاحيات التالية على الصفحة page %s: %s.'; +$lang['p_group_ns'] = 'أعضاء مجموعة %s عندهم حاليا الصلاحيات التالية في النطاق %s: %s.'; +$lang['p_choose_id'] = 'رجاء مستخدما أو مجموعة في النموذج أعلاه لعرض أو تحرير اعداد الصلاحيات للصفحة%s.'; +$lang['p_choose_ns'] = 'رجاء Please أدخل مستخدما أو مجموعة في النموذج أعلاه لعرض أو تحرير اعداد الصلاحيات للنطاق%s.'; +$lang['p_inherited'] = 'لاحظ: هذه الصلاحيات لم تنشأ إراديا بل وُرثت من مجموعات أخرى أو نطاقات أعلى.'; +$lang['p_isadmin'] = 'لاحظ: المجموعة أو المستخدم المحدد عندهم دائما صلاحيات كاملة بسبب ضبطهم كمستخدمين متفوقين.'; +$lang['p_include'] = 'الصلاحيات الاعلى تتضمن الأخفض. صلاحيات الإنشاء ، والرفع، والحذف تطبق فقط على النطاقات، وليس على الصفحات.'; +$lang['current'] = 'قواعد ACL الحالية'; +$lang['where'] = 'الصفحة/النطاق'; $lang['who'] = 'اسم المستخدم / المجموعة'; $lang['perm'] = 'التصاريح'; $lang['acl_perm0'] = 'لا يوجد'; @@ -23,3 +34,4 @@ $lang['acl_perm4'] = 'إنشاء'; $lang['acl_perm8'] = 'تحميل'; $lang['acl_perm16'] = 'مسح'; $lang['acl_new'] = 'أضف أضافة جديدة'; +$lang['acl_mod'] = 'عدل المدخلة'; diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 5a5fc5bfe..22d3b7811 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -114,4 +114,4 @@ $lang['gdlib_o_1'] = 'الاصدار 1.x'; $lang['gdlib_o_2'] = 'اكتشاف تلقائي'; $lang['rss_type_o_atom'] = 'أتوم 0.3'; $lang['rss_type_o_atom1'] = 'أتوم 1.0'; -$lang['rss_content_o_htmldiff'] = 'جدول الفروق بهيئة HTML'; \ No newline at end of file +$lang['rss_content_o_htmldiff'] = 'جدول الفروق بهيئة HTML'; diff --git a/lib/plugins/plugin/lang/ar/admin_plugin.txt b/lib/plugins/plugin/lang/ar/admin_plugin.txt new file mode 100644 index 000000000..1aeaf13ad --- /dev/null +++ b/lib/plugins/plugin/lang/ar/admin_plugin.txt @@ -0,0 +1,4 @@ +====== إدارة الإضافات ====== + +على هذه الصفحة يمكنك إدارة كل ما يتعلق ب[[doku>plugins|إضافات]] دوكي ويكي. لتتمكن من تنزيل و تثبيت الإضافات يجب أن يكون دليل الاضافات قابلا للكتابة من خادوم الوب. + diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php index dbbcbd07a..55987881c 100644 --- a/lib/plugins/plugin/lang/ar/lang.php +++ b/lib/plugins/plugin/lang/ar/lang.php @@ -5,21 +5,47 @@ * @author Yaman Hokan * @author Usama Akkad */ -$lang['btn_delete'] = 'حذف'; -$lang['btn_settings'] = 'خيارات'; -$lang['btn_download'] = 'تحميل'; -$lang['btn_enable'] = 'حفظ'; +$lang['menu'] = 'إدارة الملحقات'; +$lang['download'] = 'نزّل و ثبت اضافة جديدة'; +$lang['manage'] = 'الإضافات المثبتة'; +$lang['btn_info'] = 'معلومات'; +$lang['btn_update'] = 'حدّث'; +$lang['btn_delete'] = 'احذف'; +$lang['btn_settings'] = 'إعدادات'; +$lang['btn_download'] = 'نزل'; +$lang['btn_enable'] = 'احفظ'; $lang['url'] = 'رابط'; -$lang['source'] = 'مصدر'; -$lang['unknown'] = 'غير معروف'; -$lang['updating'] = 'يتم التحديث ...'; -$lang['update_none'] = 'لم يتم العثور على تحديثات'; -$lang['deleting'] = 'يتم الحذف ... '; -$lang['downloading'] = 'يتم التحميل .. '; +$lang['installed'] = 'ثُبتت:'; +$lang['lastupdate'] = 'آخر تحديث:'; +$lang['source'] = 'المصدر:'; +$lang['unknown'] = 'مجهول'; +$lang['updating'] = 'تُحدث ...'; +$lang['updated'] = 'الاضافة %s حُدثت بنجاح'; +$lang['updates'] = 'الاضافة التالية حُدثت بنجاح'; +$lang['update_none'] = 'لا يوجد تحديثات.'; +$lang['deleting'] = 'تُحذف ... '; +$lang['deleted'] = 'حُذفت الإضافة %s.'; +$lang['downloading'] = 'يُنزل ...'; +$lang['downloaded'] = 'الاضافة %s ثبتت بنجاح'; +$lang['downloads'] = 'الاضافة التالية ثبتت بنجاح:'; +$lang['download_none'] = 'لم يجد إضافة، أو ان هناك مشكلة غير معروفة أثناء التنزيل و التثبيت.'; +$lang['plugin'] = 'الإضافة:'; +$lang['components'] = 'المكون:'; +$lang['noinfo'] = 'لم تعطي الإضافة أية معلومة، قد تكون معطوبة.'; $lang['name'] = 'الاسم :'; $lang['date'] = 'التاريخ :'; $lang['type'] = 'النوع :'; $lang['desc'] = 'الوصف :'; $lang['author'] = 'الكاتب :'; -$lang['www'] = 'شبكة :'; -$lang['error'] = 'ظهر خطأ غير معروف .'; +$lang['www'] = 'الشابكة :'; +$lang['error'] = 'حث خطأ مجهول.'; +$lang['error_download'] = 'تعذر تنزيل ملف الاضافة: %s'; +$lang['error_badurl'] = 'اشتبه بعنوان خاطئ - تعذر الحصول على الاسم من العنوان'; +$lang['error_dircreate'] = 'تعذر إنشاء مجلد مؤقت للتنزيل'; +$lang['error_decompress'] = 'تعذر على مدير الاضافات فك ضغط الملف المُنزّل. قد يكون ذلك نتيجة لتنزيل خاطئ، في هذه الحالة أعد المحاولة; أو ان هيئة الضغط غير معروفة، في هذه الحالة عليك تنزيل و تثبيت الاضافة يدويا.'; +$lang['error_copy'] = 'كان هناك خطأ في نسخ ملف عند محاولة تثبيت ملفات للإضافة %s: قد يكون القرص ممتلئا أو أن صلاحيات الوصول للملف خاطئة. لربما نتج عن ذلك اضافة مثبته جزئيا تجعل نظام الويكي غير ثابت.'; +$lang['error_delete'] = 'كان هناك خطأ عند محاولة حذف الاضافة %s. السبب الاكثر احتمالا هو صلاحيات غير كافية على الملف أو المجلد'; +$lang['enabled'] = 'الاضافة %s فُعلت. '; +$lang['notenabled'] = 'تعذر تفعيل الاضافة %s، تحقق من اذونات الملف.'; +$lang['disabled'] = 'عُطلت الإضافة %s.'; +$lang['notdisabled'] = 'تعذر تعطيل الإضافة %s، تحقق من اذونات الملف.'; diff --git a/lib/plugins/usermanager/lang/ar/edit.txt b/lib/plugins/usermanager/lang/ar/edit.txt index 5db2ce031..bd9876d82 100644 --- a/lib/plugins/usermanager/lang/ar/edit.txt +++ b/lib/plugins/usermanager/lang/ar/edit.txt @@ -1 +1 @@ -==== تعديل الحساب ==== \ No newline at end of file +==== تعديل المستخدم ==== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ar/intro.txt b/lib/plugins/usermanager/lang/ar/intro.txt new file mode 100644 index 000000000..1cfb841fa --- /dev/null +++ b/lib/plugins/usermanager/lang/ar/intro.txt @@ -0,0 +1 @@ +====== مدير المستخدمين ====== \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ar/lang.php b/lib/plugins/usermanager/lang/ar/lang.php index b6aff8120..6c1b2b840 100644 --- a/lib/plugins/usermanager/lang/ar/lang.php +++ b/lib/plugins/usermanager/lang/ar/lang.php @@ -5,6 +5,10 @@ * @author Yaman Hokan * @author Usama Akkad */ +$lang['menu'] = 'مدير المستخدمين'; +$lang['noauth'] = '(مصادقة المستخدمين غير متوفرة)'; +$lang['nosupport'] = '(إدارة المستخدمين غير متوفرة)'; +$lang['badauth'] = 'آلية مصادقة غير صالحة'; $lang['user_id'] = 'اسم المستخدم'; $lang['user_pass'] = 'كلمة السر'; $lang['user_name'] = 'الاسم الحقيقي'; @@ -16,13 +20,29 @@ $lang['add'] = 'إضافة'; $lang['delete'] = 'حذف'; $lang['delete_selected'] = 'حذف المختار'; $lang['edit'] = 'تحرير'; +$lang['edit_prompt'] = 'حرر هذا المستخدم'; $lang['modify'] = 'حفظ التعديلات'; $lang['search'] = 'بحث'; +$lang['search_prompt'] = 'ابدأ البحث'; +$lang['clear'] = 'صفّر مرشح البحث'; +$lang['filter'] = 'المرشّح'; +$lang['summary'] = 'عرض المستخدمين %1$d-%2$d of %3$d وجد. %4$d مستخدم كلي.'; +$lang['nonefound'] = 'لم يوجد مستخدمين. %d مستخدم كليا.'; +$lang['delete_ok'] = '%d مستخدم حذفوا'; +$lang['delete_fail'] = '%d فشل حذفهم.'; +$lang['update_ok'] = 'حُدث المستخدم بنجاح'; +$lang['update_fail'] = 'فشل تحديث المستخدم'; $lang['update_exists'] = 'لقد فشل تغيير اسم المستخدم , اسم المستخدم المحدد (%s) غير متاح . ( سيتم تطبيق أي تغييرات أخرى )'; $lang['start'] = 'ابدأ'; $lang['prev'] = 'السابق'; $lang['next'] = 'التالي'; $lang['last'] = 'الأخير'; -$lang['add_ok'] = 'تم بنجاح ضافة الحساب'; -$lang['add_fail'] = 'فشلت إضافة الحساب'; -$lang['notify_ok'] = 'تم إرسال رسالة الإشعار'; +$lang['edit_usermissing'] = 'لم يعثر على المستخدم المحدد، يحتمل أن اسم المستخدم قد حذف أو غُير في مكان آخر.'; +$lang['user_notify'] = 'أشعر المستخدم'; +$lang['note_notify'] = 'بريد الاشعار يرسل فقط إن اعطي المستخدم كلمة سر جديدة.'; +$lang['note_group'] = 'المستخدمون الجدد سيضافون للمجموعة الافتراضية (%s) إن لم تُحدد لهم مجموعة.'; +$lang['note_pass'] = 'ستولد كلمة المرور تلقائيا إن تُرك الحقل فارغا مع تمكين إشعار المستخدم.'; +$lang['add_ok'] = 'اضيف المستخدم بنجاح'; +$lang['add_fail'] = 'فشلت إضافة المستخدم'; +$lang['notify_ok'] = 'ارسلت رسالة الاشعار'; +$lang['notify_fail'] = 'تعذر ارسال بريد الاشعار'; diff --git a/lib/plugins/usermanager/lang/ar/list.txt b/lib/plugins/usermanager/lang/ar/list.txt new file mode 100644 index 000000000..02e9a0363 --- /dev/null +++ b/lib/plugins/usermanager/lang/ar/list.txt @@ -0,0 +1 @@ +===== قائمة المستخدمين ===== \ No newline at end of file -- cgit v1.2.3 From 0d9c4a0b2a392fa4eff32664d37fea6b2d528060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Wid=C5=82a?= Date: Sun, 18 Apr 2010 13:10:07 +0200 Subject: Polish language update --- lib/plugins/acl/lang/pl/lang.php | 1 + lib/plugins/config/lang/pl/lang.php | 3 +++ lib/plugins/plugin/lang/pl/lang.php | 1 + lib/plugins/popularity/lang/pl/lang.php | 1 + lib/plugins/revert/lang/pl/lang.php | 1 + lib/plugins/usermanager/lang/pl/lang.php | 1 + 6 files changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index 300f0ad1c..c954abe2a 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -10,6 +10,7 @@ * @author sleshek@wp.pl * @author Leszek Stachowski * @author maros + * @author Grzegorz Widła */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 662a80c3b..451c3125a 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author sleshek@wp.pl * @author Leszek Stachowski * @author maros + * @author Grzegorz Widła */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
Niepoprawne wartości są wyróżnione kolorem czerwonym.'; @@ -98,6 +99,7 @@ $lang['useslash'] = 'Używanie ukośnika jako separatora w adresie $lang['usedraft'] = 'Automatyczne zapisywanie szkicu podczas edycji'; $lang['sepchar'] = 'Znak rozdzielający wyrazy nazw'; $lang['canonical'] = 'Kanoniczne adresy URL'; +$lang['fnencode'] = 'Metoda kodowana nazw pików bez użycia ASCII.'; $lang['autoplural'] = 'Automatyczne tworzenie liczby mnogiej'; $lang['compression'] = 'Metoda kompresji dla usuniętych plików'; $lang['cachetime'] = 'Maksymalny wiek cache w sekundach'; @@ -185,3 +187,4 @@ $lang['useheading_o_0'] = 'Nigdy'; $lang['useheading_o_navigation'] = 'W nawigacji'; $lang['useheading_o_content'] = 'W treści'; $lang['useheading_o_1'] = 'Zawsze'; +$lang['readdircache'] = 'Maksymalny czas dla bufora readdir (w sek).'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index d97dafc0b..d4ccc7751 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author sleshek@wp.pl * @author Leszek Stachowski * @author maros + * @author Grzegorz Widła */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index dd208fe47..fbbe6dab2 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -9,6 +9,7 @@ * @author sleshek@wp.pl * @author Leszek Stachowski * @author maros + * @author Grzegorz Widła */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index 613b96e6f..8166250b4 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -8,6 +8,7 @@ * @author sleshek@wp.pl * @author Leszek Stachowski * @author maros + * @author Grzegorz Widła */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 6d57455fb..0c4ecbcdf 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -9,6 +9,7 @@ * @author sleshek@wp.pl * @author Leszek Stachowski * @author maros + * @author Grzegorz Widła */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; -- cgit v1.2.3 From 77e606973fc4a1066351f7c0537e326e86a34cf6 Mon Sep 17 00:00:00 2001 From: Usama Akkad Date: Sun, 18 Apr 2010 13:13:49 +0200 Subject: Arabic language update --- lib/plugins/config/lang/ar/lang.php | 49 ++++++++++++++++++++++++++++++++++++ lib/plugins/revert/lang/ar/intro.txt | 3 +++ lib/plugins/revert/lang/ar/lang.php | 10 ++++++++ 3 files changed, 62 insertions(+) create mode 100644 lib/plugins/revert/lang/ar/intro.txt (limited to 'lib') diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 22d3b7811..5d0ff76b9 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -45,11 +45,13 @@ $lang['template'] = 'القالب'; $lang['license'] = 'تحت أي رخصة تريد اصدار المحتوى؟'; $lang['fullpath'] = 'اظهر المحتوى الكامل للصفحات في '; $lang['recent'] = 'أحدث التغييرات'; +$lang['typography'] = 'اعمل استبدالات طبوغرافية'; $lang['htmlok'] = 'مكّن تضمين HTML'; $lang['phpok'] = 'مكّن تضمين PHP'; $lang['dformat'] = 'تنسيق التاريخ (انظر وظيفة PHP,s strftime)'; $lang['signature'] = 'التوقيع'; $lang['toptoclevel'] = 'المستوى الأعلى لمحتويات الجدول'; +$lang['tocminheads'] = 'الحد الأدنى من الترويسات لبناء جدول المحتويات'; $lang['maxtoclevel'] = 'المستوى الأقصى لمحتويات الجدول'; $lang['maxseclevel'] = 'المستوى الأقصى لتحرير القسم'; $lang['camelcase'] = 'استخدم CamelCase للروابط'; @@ -61,6 +63,7 @@ $lang['allowdebug'] = 'مكّن التنقيح عطّلها إن $lang['usewordblock'] = 'احجز الغثاء بناء على قائمة كلمات'; $lang['indexdelay'] = 'التأخير قبل الفهرسة (ثوان)'; $lang['relnofollow'] = 'استخدم rel="nofollow" للروابط الخارجية'; +$lang['mailguard'] = 'عناوين بريدية مبهمة'; $lang['iexssprotect'] = 'تحقق الملفات المرفوعة من احتمال وجود أكواد جافاسكربت أو HTML ضارة'; $lang['showuseras'] = 'الذي يعرض لاظهار المستخدم الذي قام بآخر تحرير لصفحة'; $lang['useacl'] = 'استخدم قائمة التحم بالوصول'; @@ -77,6 +80,21 @@ $lang['disableactions_subscription'] = 'اشترك/الغ الاشتراك'; $lang['disableactions_wikicode'] = 'اعرض المصدر/صدّر صرفا'; $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالفاصلة)'; $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكي ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; +$lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; +$lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; +$lang['xmlrpc'] = 'مكّن/عطل واجهة XML-RPC.'; +$lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب splitbrain.org لأجل ذلك'; +$lang['userewrite'] = 'استعمل عناوين URLs جميلة'; +$lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; +$lang['usedraft'] = 'احفظ المسودة تلقائيا أثناء التحرير'; +$lang['sepchar'] = 'فاصل كلمة اسم الصفحة'; +$lang['canonical'] = 'استخدم العناوين الشائعة كاملة'; +$lang['fnencode'] = 'نظام ترميز اسماء الملفات بغير الأسكي.'; +$lang['autoplural'] = 'تحقق من صيغ الجمع في الروابط'; +$lang['compression'] = 'طريقة الغضط لملفات attic'; +$lang['cachetime'] = 'الحد الأعظم لعمر المخُبأ (ثوان)'; +$lang['locktime'] = 'الحد الأعظمي لقفل الملف (ثوان)'; +$lang['fetchsize'] = 'الحجم الأعظمي (بايت) ل fetch.php لتنزيله من الخارج'; $lang['notify'] = 'ارسل تنبيهات التغيير لهذا البريد'; $lang['registernotify'] = 'ارسل بيانات عن المستخدمين المسجلين جديدا لهذا البريد'; $lang['mailfrom'] = 'البريد الالكتروني ليستخدم للرسائل الآلية'; @@ -85,6 +103,8 @@ $lang['gdlib'] = 'اصدار مكتبة GD'; $lang['im_convert'] = 'المسار إلى اداة تحويل ImageMagick'; $lang['jpg_quality'] = 'دقة ضغط JPG (0-100)'; $lang['subscribers'] = 'مكن دعم اشتراك الصفحة'; +$lang['subscribe_time'] = 'المهلة بعد ارسال قوائم الاشتراكات والملخصات (ثوان); هذا يجب أن يكون أقل من الوقت المخصص في أيام أحدث التغييرات.'; +$lang['compress'] = 'رُص مخرجات CSS و جافا سكربت'; $lang['hidepages'] = 'أخف الصفحات المنطبق عليها (تعابير شرطية)'; $lang['send404'] = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة'; $lang['sitemap'] = 'ولد خرائط موقع جوجل (أيام)'; @@ -104,14 +124,43 @@ $lang['proxy____port'] = 'منفذ الوكيل'; $lang['proxy____user'] = 'اسم مستخدم الوكيل'; $lang['proxy____pass'] = 'كلمة سر الوكيل'; $lang['proxy____ssl'] = 'استخدم ssl للاتصال بالوكيل'; +$lang['safemodehack'] = 'مكّن hack الوضع الآمن'; +$lang['ftp____host'] = 'خادوم FTP ل hack الوضع الآمن'; +$lang['ftp____port'] = 'منفذ FTP ل hack الوضع الآمن'; +$lang['ftp____user'] = 'اسم مستخدم FTP ل hack الوضع الآمن'; +$lang['ftp____pass'] = 'كلمة سر FTP ل hack الوضع الآمن'; +$lang['ftp____root'] = 'دليل الجذر ل FTP لأجل hack الوضع الآمن'; $lang['license_o_'] = 'غير مختار'; $lang['typography_o_0'] = 'لاشيء'; $lang['typography_o_1'] = 'استبعاد الاقتباس المفرد'; +$lang['typography_o_2'] = 'تضمين علامات اقتباس مفردة (قد لا يعمل دائما)'; $lang['userewrite_o_0'] = 'لاشيء'; $lang['userewrite_o_1'] = '.htaccess'; +$lang['deaccent_o_0'] = 'معطل'; $lang['gdlib_o_0'] = 'مكتبة GD غير متوفرة'; $lang['gdlib_o_1'] = 'الاصدار 1.x'; $lang['gdlib_o_2'] = 'اكتشاف تلقائي'; +$lang['rss_type_o_rss'] = 'RSS 0.91'; +$lang['rss_type_o_rss1'] = 'RSS 1.0'; +$lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'أتوم 0.3'; $lang['rss_type_o_atom1'] = 'أتوم 1.0'; +$lang['rss_content_o_diff'] = 'الفروق الموحدة'; $lang['rss_content_o_htmldiff'] = 'جدول الفروق بهيئة HTML'; +$lang['rss_content_o_html'] = 'محتوى HTML الكامل للصفحة'; +$lang['rss_linkto_o_diff'] = 'عرض الاختلافات'; +$lang['rss_linkto_o_page'] = 'الصفحة المعدلة'; +$lang['rss_linkto_o_rev'] = 'قائمة بالمراجعات'; +$lang['rss_linkto_o_current'] = 'الصفحة الحالية'; +$lang['compression_o_0'] = 'لا شيء'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'لا تستخدم'; +$lang['showuseras_o_loginname'] = 'اسم الدخول'; +$lang['showuseras_o_username'] = 'اسم المستخدم الكامل'; +$lang['showuseras_o_email'] = 'عنوان بريد المستخدم (مبهم تبعا لاعدادات حارس_البريد)'; +$lang['showuseras_o_email_link'] = 'عنوان بريد المستخدم كـ مالتيو: رابط'; +$lang['useheading_o_0'] = 'أبدا'; +$lang['useheading_o_navigation'] = 'ال'; +$lang['useheading_o_content'] = 'محتوى الويكي فقط'; +$lang['useheading_o_1'] = 'دائما'; diff --git a/lib/plugins/revert/lang/ar/intro.txt b/lib/plugins/revert/lang/ar/intro.txt new file mode 100644 index 000000000..5839ee0c8 --- /dev/null +++ b/lib/plugins/revert/lang/ar/intro.txt @@ -0,0 +1,3 @@ +====== مدير الاسترجاع ====== + +تساعدك هذه الصفحة في الاستعادة الآلية لهجوم غثاء. للحصول على قائمة بالصفحات المغثاة أولا أدخل نص البحث (مثل. عنوان غثاء), ثم أكد أن الصفحات الموجودة هي غثاء فعلا و استرجع التعديلات. \ No newline at end of file diff --git a/lib/plugins/revert/lang/ar/lang.php b/lib/plugins/revert/lang/ar/lang.php index d1d05c789..1e4e104fb 100644 --- a/lib/plugins/revert/lang/ar/lang.php +++ b/lib/plugins/revert/lang/ar/lang.php @@ -5,3 +5,13 @@ * @author Yaman Hokan * @author Usama Akkad */ +$lang['menu'] = 'مدير الاسترجاع'; +$lang['filter'] = 'ابحث في الصفحات المتأذاة'; +$lang['revert'] = 'استرجع الصفحات المحددة'; +$lang['reverted'] = '%s استرجعت للاصدار %s'; +$lang['removed'] = 'حُذفت %s '; +$lang['revstart'] = 'بدأت عملية الاستعادة. قد يستغرق ذلك وقتا طويلا. إذا كان وقت النص البرمجي ينفذ قبل النهاية، عليك استرجاع أجزاء أصغر. +'; +$lang['revstop'] = 'عملية الاستعادة انتهت بنجاح.'; +$lang['note1'] = 'لاحظ: البحث حساس لحالة الأحرف'; +$lang['note2'] = 'لاحظ: ستسترجع الصفحة إلى آخر اصدار لا يحوي شروط الغثاء %s.'; -- cgit v1.2.3 From ac1ffdde2b4e44e5eb2434a5df8ef6a04bb4ff29 Mon Sep 17 00:00:00 2001 From: Georges-Etienne Legendre Date: Sat, 17 Apr 2010 21:45:21 +0800 Subject: Fix #1943: full text search XML-RPC call should return the $pages instead of $data --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index b6b9f0e52..743d3eedb 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -415,7 +415,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { 'snippet' => $snippet, ); } - return $data; + return $pages; } -- cgit v1.2.3 From e6f4c9d492a59d555873548a77c477870f6cdcd8 Mon Sep 17 00:00:00 2001 From: Georges-Etienne Legendre Date: Sat, 17 Apr 2010 21:58:17 +0800 Subject: Adding getTitle to the XML-RPC API --- lib/exe/xmlrpc.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 743d3eedb..a4dc56f0f 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -7,7 +7,7 @@ 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',3); +define('DOKU_XMLRPC_API_VERSION',4); require_once(DOKU_INC.'inc/init.php'); session_write_close(); //close session @@ -134,6 +134,15 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { 'Lock or unlock pages.' ); + + $this->addCallback( + 'dokuwiki.getTitle', + 'this:getTitle', + array('string'), + 'Returns the wiki title.', + true + ); + /* Wiki API v2 http://www.jspwiki.org/wiki/WikiRPCInterface2 */ $this->addCallback( 'wiki.getRPCVersionSupported', @@ -418,6 +427,13 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $pages; } + /** + * Returns the wiki title. + */ + function getTitle(){ + global $conf; + return $conf['title']; + } /** * List all media files. -- cgit v1.2.3 From 288007e19d34550294a9ad820b6ffa11bba0e5b3 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 26 Apr 2010 16:18:20 +0200 Subject: Fix lock refresh and draft saving --- lib/scripts/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 9437aa14e..e66154f83 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -420,8 +420,8 @@ var locktimer = new locktimer_class(); // refresh every minute only if(now.getTime() - locktimer.lasttime.getTime() > 30*1000){ //FIXME decide on time var params = 'call=lock&id='+encodeURIComponent(locktimer.pageid); + var dwform = $('dw__editform'); if(locktimer.draft && dwform.elements.wikitext){ - var dwform = $('dw__editform'); params += '&prefix='+encodeURIComponent(dwform.elements.prefix.value); params += '&wikitext='+encodeURIComponent(dwform.elements.wikitext.value); params += '&suffix='+encodeURIComponent(dwform.elements.suffix.value); -- cgit v1.2.3 From 28f6aae1adeef509aa7be8895088cc9f47018054 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 29 Apr 2010 13:08:15 +0200 Subject: Support getSelection in input fields in IE --- lib/scripts/textselection.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/scripts/textselection.js b/lib/scripts/textselection.js index 5e4602f85..0378b544d 100644 --- a/lib/scripts/textselection.js +++ b/lib/scripts/textselection.js @@ -41,7 +41,6 @@ function getSelection(textArea) { sel.obj = textArea; sel.start = textArea.value.length; sel.end = textArea.value.length; - textArea.focus(); if(document.getSelection) { // Mozilla et al. sel.start = textArea.selectionStart; @@ -57,9 +56,13 @@ function getSelection(textArea) { // The current selection sel.rangeCopy = document.selection.createRange().duplicate(); - - var before_range = document.body.createTextRange(); - before_range.moveToElementText(textArea); // Selects all the text + if (textArea.tagName === 'INPUT') { + var before_range = textArea.createTextRange(); + before_range.expand('textedit'); // Selects all the text + } else { + var before_range = document.body.createTextRange(); + before_range.moveToElementText(textArea); // Selects all the text + } before_range.setEndPoint("EndToStart", sel.rangeCopy); // Moves the end where we need it var before_finished = false, selection_finished = false; -- cgit v1.2.3 From dc62d03d27d24a66840b83c5333221f5123ad203 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 30 Apr 2010 06:20:41 +0200 Subject: optimized SMB link warning thingy --- lib/scripts/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/scripts/script.js b/lib/scripts/script.js index d8205b876..57917aeb5 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -482,14 +482,14 @@ addInitEvent(function(){ */ function checkWindowsShares() { if(!LANG['nosmblinks']) return true; + if(document.all != null) return true; + var elems = getElementsByClass('windows',document,'a'); if(elems){ for(var i=0; i Date: Fri, 30 Apr 2010 06:41:49 +0200 Subject: avoid autocompletion in usermanager password field --- lib/plugins/usermanager/admin.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 4eb923bb1..984700d41 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -321,13 +321,20 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $disabled = $cando ? '' : ' disabled="disabled"'; echo str_pad('',$indent); - $fieldtype = ($name == "userpass") ? 'password' : 'text'; + if($name == 'userpass'){ + $fieldtype = 'password'; + $autocomp = 'autocomplete="off"'; + }else{ + $fieldtype = 'text'; + $autocomp = ''; + } + echo "
"; echo ""; echo "
'.$this->getLang('where').'
"; if($cando){ - echo ""; + echo ""; }else{ echo ""; echo ""; -- cgit v1.2.3 From 3e0c7aa328ac721b3bcf17822f9ed3659ad93d14 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 4 May 2010 12:07:35 +0200 Subject: Add locking for indexer-based notifications --- lib/exe/indexer.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index eb5670005..7e55915f4 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -353,6 +353,9 @@ function sendDigest() { $olduser = $_SERVER['REMOTE_USER']; foreach($subscriptions as $id => $users) { + if (!subscription_lock($id)) { + continue; + } foreach($users as $data) { list($user, $style, $lastupdate) = $data; $lastupdate = (int) $lastupdate; @@ -399,6 +402,7 @@ function sendDigest() { // Update notification time. subscription_set($user, $id, $style, time(), true); } + subscription_unlock($id); } // restore current user info -- cgit v1.2.3 From 7ea8e5925d4d2e18975712870d48912761ea1503 Mon Sep 17 00:00:00 2001 From: Marek Sacha Date: Tue, 27 Apr 2010 00:40:25 +0200 Subject: Reimplementation of Accesskeys in JavaScript (FS#1809) --- lib/exe/js.php | 1 + lib/scripts/hotkeys.js | 265 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 266 insertions(+) create mode 100644 lib/scripts/hotkeys.js (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 05965ba02..f1ac86c82 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -50,6 +50,7 @@ function js_out(){ DOKU_INC.'lib/scripts/linkwiz.js', DOKU_INC.'lib/scripts/media.js', DOKU_INC.'lib/scripts/subscriptions.js', + DOKU_INC.'lib/scripts/hotkeys.js', DOKU_TPLINC.'script.js', ); diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js new file mode 100644 index 000000000..d062118fb --- /dev/null +++ b/lib/scripts/hotkeys.js @@ -0,0 +1,265 @@ +/** + * Some of these scripts were taken from TinyMCE (http://tinymce.moxiecode.com/) and were modified for DokuWiki + * + * Class handles accesskeys using javascript and also provides ability + * to register and use other hotkeys as well. + * + * @author Marek Sacha + */ +function Hotkeys() { + + this.shortcuts = new Array(); + + /** + * Set modifier keys, for instance: + * this.modifier = 'ctrl'; + * this.modifier = 'ctrl+shift'; + * this.modifier = 'ctrl+alt+shift'; + * this.modifier = 'alt'; + * this.modifier = 'alt+shift'; + */ + this.modifier = 'ctrl'; + + /** + * Initialization + * + * This function looks up all the accesskeys used in the current page + * (at anchor elements and input elements [type="submit"]) and registers + * appropriate shortcuts. + * + * @author Marek Sacha + */ + this.initialize = function() { + var t = this; + /** + * Lookup all anchors with accesskey and register event - go to anchor + * target. + */ + var anchors = document.getElementsByTagName("a"); + t.each(anchors, function(a) { + if (a.accessKey != "") { + t.addShortcut(t.modifier + '+' + a.accessKey, function() { + window.location.href = a.href; + }); + } + }); + + /** + * Lookup all input [type="submit"] with accesskey and register event - + * perform "click" on a button. + */ + var inputs = document.getElementsByTagName("input"); + t.each(inputs, function(i) { + if (i.type == "submit") { + t.addShortcut(t.modifier + '+' + i.accessKey, function() { + i.click(); + }); + } + }); + }; + + /** + * Keyup processing function + * Function returns true if keyboard event has registered handler, and + * executes the handler function. + * + * @param e KeyboardEvent + * @author Marek Sacha + * @return b boolean + */ + this.onkeyup = function(e) { + var t = this; + var v = t.findShortcut(e); + if (v != null && v != false) { + v.func.call(t); + return false; + } + return true; + }; + + /** + * Keydown processing function + * Function returns true if keyboard event has registered handler + * + * @param e KeyboardEvent + * @author Marek Sacha + * @return b boolean + */ + this.onkeydown = function(e) { + var t = this; + var v = t.findShortcut(e); + if (v != null && v != false) { + return false; + } + return true; + }; + + /** + * Keypress processing function + * Function returns true if keyboard event has registered handler + * + * @param e KeyboardEvent + * @author Marek Sacha + * @return b + */ + this.onkeypress = function(e) { + var t = this; + var v = t.findShortcut(e); + if (v != null && v != false) { + return false; + } + return true; + }; + + /** + * Register new shortcut + * + * This function registers new shortcuts, each shortcut is defined by its + * modifier keys and a key (with + as delimiter). If shortcut is pressed + * cmd_function is performed. + * + * For example: + * pa = "ctrl+alt+p"; + * pa = "shift+alt+s"; + * + * Full example of method usage: + * hotkeys.addShortcut('ctrl+s',function() { + * document.getElementByID('form_1').submit(); + * }); + * + * @param pa String description of the shortcut (ctrl+a, ctrl+shift+p, .. ) + * @param cmd_func Function to be called if shortcut is pressed + * @author Marek Sacha + */ + this.addShortcut = function(pa, cmd_func) { + var t = this; + + var o = { + func : cmd_func, + alt : false, + ctrl : false, + shift : false + }; + + t.each(t.explode(pa, '+'), function(v) { + switch (v) { + case 'alt': + case 'ctrl': + case 'shift': + o[v] = true; + break; + + default: + o.charCode = v.charCodeAt(0); + o.keyCode = v.toUpperCase().charCodeAt(0); + } + }); + + t.shortcuts.push((o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode, o); + + return true; + }; + + /** + * @property isMac + */ + this.isMac = (navigator.userAgent.indexOf('Mac') != -1); + + /** + * Apply function cb on each element of o in the namespace of s + * @param o Array of objects + * @param cb Function to be called on each object + * @param s Namespace to be used during call of cb (default namespace is o) + * @author Marek Sacha + */ + this.each = function(o, cb, s) { + var n, l; + + if (!o) + return 0; + + s = s || o; + + if (o.length !== undefined) { + // Indexed arrays, needed for Safari + for (n=0, l = o.length; n < l; n++) { + if (cb.call(s, o[n], n, o) === false) + return 0; + } + } else { + // Hashtables + for (n in o) { + if (o.hasOwnProperty(n)) { + if (cb.call(s, o[n], n, o) === false) + return 0; + } + } + } + + return 1; + }; + + /** + * Explode string according to delimiter + * @param s String + * @param d Delimiter (default ',') + * @author Marek Sacha + * @return a Array of tokens + */ + this.explode = function(s, d) { + return s.split(d || ','); + }; + + /** + * Find if the shortcut was registered + * + * @param e KeyboardEvent + * @author Marek Sacha + * @return v Shortcut structure or null if not found + */ + this.findShortcut = function (e) { + var t = this; + var v = null; + + /* No modifier key used - shortcut does not exist */ + if (!e.altKey && !e.ctrlKey && !e.metaKey) { + return v; + } + + t.each(t.shortcuts, function(o) { + if (t.isMac && o.ctrl != e.metaKey) + return; + else if (!t.isMac && o.ctrl != e.ctrlKey) + return; + + if (o.alt != e.altKey) + return; + + if (o.shift != e.shiftKey) + return; + + if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) { + v = o; + return; + } + }); + return v; + }; +} + +addInitEvent(function(){ + var hotkeys = new Hotkeys(); + hotkeys.initialize(); + + addEvent(document,'keyup',function (e) { + return hotkeys.onkeyup.call(hotkeys,e); + }); + + addEvent(document,'keypress',function (e) { + return hotkeys.onkeypress.call(hotkeys,e); + }); + + addEvent(document,'keydown',function (e) { + return hotkeys.onkeydown.call(hotkeys,e); + }); +}); \ No newline at end of file -- cgit v1.2.3 From 4062d3d5c0c566751a1f098495e9aa836e8db9de Mon Sep 17 00:00:00 2001 From: Marek Sacha Date: Fri, 30 Apr 2010 17:18:40 +0200 Subject: Reimplementation of Accesskeys in javascript (FS#1809), toolbar accesskyes fix. --- lib/exe/js.php | 2 ++ lib/scripts/hotkeys.js | 58 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index f1ac86c82..f2f9dfe6b 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -113,6 +113,8 @@ function js_out(){ } js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); + // init hotkeys - must have been done after init of toolbar + js_runonstart('initializeHotkeys()'); // end output buffering and get contents $js = ob_get_contents(); diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js index d062118fb..9e2b9cb83 100644 --- a/lib/scripts/hotkeys.js +++ b/lib/scripts/hotkeys.js @@ -27,6 +27,9 @@ function Hotkeys() { * (at anchor elements and input elements [type="submit"]) and registers * appropriate shortcuts. * + * Secondly, initialization registers listeners on document to catch all + * keyboard events. + * * @author Marek Sacha */ this.initialize = function() { @@ -39,7 +42,7 @@ function Hotkeys() { t.each(anchors, function(a) { if (a.accessKey != "") { t.addShortcut(t.modifier + '+' + a.accessKey, function() { - window.location.href = a.href; + a.click(); }); } }); @@ -50,12 +53,41 @@ function Hotkeys() { */ var inputs = document.getElementsByTagName("input"); t.each(inputs, function(i) { - if (i.type == "submit") { + if (i.type == "submit" && i.accessKey != "") { t.addShortcut(t.modifier + '+' + i.accessKey, function() { i.click(); }); } }); + + /** + * Lookup all buttons with accesskey and register event - + * perform "click" on a button. + */ + var buttons = document.getElementsByTagName("button"); + t.each(buttons, function(b) { + if (b.accessKey != "") { + t.addShortcut(t.modifier + '+' + b.accessKey, function() { + b.click(); + }); + } + }); + + /** + * Register listeners on document to catch keyboard events. + */ + + addEvent(document,'keyup',function (e) { + return t.onkeyup.call(t,e); + }); + + addEvent(document,'keypress',function (e) { + return t.onkeypress.call(t,e); + }); + + addEvent(document,'keydown',function (e) { + return t.onkeydown.call(t,e); + }); }; /** @@ -247,19 +279,13 @@ function Hotkeys() { }; } -addInitEvent(function(){ +/** + * Init function for hotkeys. Called from js.php, to ensure hotkyes are initialized after toolbar. + * Call of addInitEvent(initializeHotkeys) is unnecessary now. + * + * @author Marek Sacha + */ +function initializeHotkeys() { var hotkeys = new Hotkeys(); hotkeys.initialize(); - - addEvent(document,'keyup',function (e) { - return hotkeys.onkeyup.call(hotkeys,e); - }); - - addEvent(document,'keypress',function (e) { - return hotkeys.onkeypress.call(hotkeys,e); - }); - - addEvent(document,'keydown',function (e) { - return hotkeys.onkeydown.call(hotkeys,e); - }); -}); \ No newline at end of file +} \ No newline at end of file -- cgit v1.2.3 From dd512d246ef7a200ca1137bb267aee87380a2f6c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 8 May 2010 12:09:19 +0200 Subject: use ALT as hotkey modifier --- lib/scripts/hotkeys.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js index 9e2b9cb83..2b696e78d 100644 --- a/lib/scripts/hotkeys.js +++ b/lib/scripts/hotkeys.js @@ -18,7 +18,7 @@ function Hotkeys() { * this.modifier = 'alt'; * this.modifier = 'alt+shift'; */ - this.modifier = 'ctrl'; + this.modifier = 'alt'; /** * Initialization @@ -288,4 +288,4 @@ function Hotkeys() { function initializeHotkeys() { var hotkeys = new Hotkeys(); hotkeys.initialize(); -} \ No newline at end of file +} -- cgit v1.2.3 From c275533eba3389cf4c186d995947aedfff356177 Mon Sep 17 00:00:00 2001 From: Mauro Javier Giamberardino Fernandez Date: Wed, 19 May 2010 19:44:29 +0200 Subject: Spanish language update --- lib/plugins/acl/lang/es/lang.php | 1 + lib/plugins/config/lang/es/lang.php | 3 +++ lib/plugins/plugin/lang/es/lang.php | 1 + lib/plugins/popularity/lang/es/lang.php | 1 + lib/plugins/revert/lang/es/lang.php | 1 + lib/plugins/usermanager/lang/es/lang.php | 1 + 6 files changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index c908dc5a9..e63448a00 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -18,6 +18,7 @@ * @author Daniel Castro Alvarado * @author Fernando J. Gómez * @author Victor Castelan + * @author Mauro Javier Giamberardino */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 9aed1f96c..2b87a1dd2 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -18,6 +18,7 @@ * @author Daniel Castro Alvarado * @author Fernando J. Gómez * @author Victor Castelan + * @author Mauro Javier Giamberardino */ $lang['menu'] = 'Parámetros de configuración'; $lang['error'] = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario.
Los valores incorrectos se mostrarán con un marco rojo alrededor.'; @@ -105,6 +106,7 @@ $lang['useslash'] = 'Usar barra (/) como separador de espacios de n $lang['usedraft'] = 'Guardar automáticamente un borrador mientras se edita'; $lang['sepchar'] = 'Separador de palabras en nombres de páginas'; $lang['canonical'] = 'Usar URLs totalmente canónicas'; +$lang['fnencode'] = 'Método para codificar nombres de archivo no-ASCII.'; $lang['autoplural'] = 'Controlar plurales en enlaces'; $lang['compression'] = 'Método de compresión para archivos en el ático'; $lang['cachetime'] = 'Edad máxima para caché (segundos)'; @@ -192,3 +194,4 @@ $lang['useheading_o_0'] = 'Nunca'; $lang['useheading_o_navigation'] = 'Solamente Navegación'; $lang['useheading_o_content'] = 'Contenido wiki solamente'; $lang['useheading_o_1'] = 'Siempre'; +$lang['readdircache'] = 'Tiempo máximo para la cache readdir (en segundos)'; diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php index 33264ddf3..d26218b2d 100644 --- a/lib/plugins/plugin/lang/es/lang.php +++ b/lib/plugins/plugin/lang/es/lang.php @@ -18,6 +18,7 @@ * @author Daniel Castro Alvarado * @author Fernando J. Gómez * @author Victor Castelan + * @author Mauro Javier Giamberardino */ $lang['menu'] = 'Administración de Plugins'; $lang['download'] = 'Descargar e instalar un nuevo plugin'; diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php index e349e5ea5..4fe24a8f0 100644 --- a/lib/plugins/popularity/lang/es/lang.php +++ b/lib/plugins/popularity/lang/es/lang.php @@ -14,6 +14,7 @@ * @author Daniel Castro Alvarado * @author Fernando J. Gómez * @author Victor Castelan + * @author Mauro Javier Giamberardino */ $lang['name'] = 'Retroinformación (Feedback) plugin Popularity'; $lang['submit'] = 'Enviar datos'; diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php index fd3e2e0bf..420454d45 100644 --- a/lib/plugins/revert/lang/es/lang.php +++ b/lib/plugins/revert/lang/es/lang.php @@ -16,6 +16,7 @@ * @author Daniel Castro Alvarado * @author Fernando J. Gómez * @author Victor Castelan + * @author Mauro Javier Giamberardino */ $lang['menu'] = 'Restaurador'; $lang['filter'] = 'Buscar páginas con spam'; diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index c3b345642..a5b6bcbb8 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -17,6 +17,7 @@ * @author Daniel Castro Alvarado * @author Fernando J. Gómez * @author Victor Castelan + * @author Mauro Javier Giamberardino */ $lang['menu'] = 'Administración de usuarios'; $lang['noauth'] = '(la autenticación de usuarios no está disponible)'; -- cgit v1.2.3 From 86228f109464404b30ea74164e855ef146c87249 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Mon, 24 May 2010 21:44:35 +0200 Subject: added cleanID to xmlrpc call wiki.getBackLinks --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index a4dc56f0f..377003cf1 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -476,7 +476,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Return a list of backlinks */ function listBackLinks($id){ - return ft_backlinks($id); + return ft_backlinks(cleanID($id)); } /** -- cgit v1.2.3 From b625808123f9b91b9803f98f818d5745bd7692cc Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 13 Jun 2010 11:40:31 +0200 Subject: msgs are saved in send_redirect now, less code duplication needed --- lib/plugins/plugin/classes/ap_manage.class.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php index 297764ebb..eb5348672 100644 --- a/lib/plugins/plugin/classes/ap_manage.class.php +++ b/lib/plugins/plugin/classes/ap_manage.class.php @@ -113,23 +113,14 @@ class ap_manage { * Refresh plugin list */ function refresh() { - global $MSG,$config_cascade; - - //are there any undisplayed messages? keep them in session for display - if (isset($MSG) && count($MSG)){ - //reopen session, store data and close session again - @session_start(); - $_SESSION[DOKU_COOKIE]['msg'] = $MSG; - session_write_close(); - } + global $config_cascade; // expire dokuwiki caches // touching local.php expires wiki page, JS and CSS caches @touch(reset($config_cascade['main']['local'])); // update latest plugin date - FIXME - header('Location: '.wl($ID).'?do=admin&page=plugin'); - exit(); + send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true)); } /** -- cgit v1.2.3 From 80423ab626c72923f347e2196ce660957dcc216f Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 16 Jun 2010 14:41:59 +0200 Subject: Perform quick search in title as well --- lib/exe/ajax.php | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index a402c236f..9c10ca548 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -50,27 +50,28 @@ function ajax_qsearch(){ global $conf; global $lang; - $query = cleanID($_POST['q']); - if(empty($query)) $query = cleanID($_GET['q']); + $query = $_POST['q']; + if(empty($query)) $query = $_GET['q']; if(empty($query)) return; - $data = array(); - $data = ft_pageLookup($query); + $data = ft_pageLookup($query, true, false); if(!count($data)) return; print ''.$lang['quickhits'].''; print '
    '; - foreach($data as $id){ - print '
  • '; - $ns = getNS($id); - if($ns){ - $name = shorten(noNS($id), ' ('.$ns.')',30); - }else{ - $name = $id; + foreach($data as $id => $title){ + if (useHeading('navigation')) { + $name = $title; + } else { + $ns = getNS($id); + if($ns){ + $name = shorten(noNS($id), ' ('.$ns.')',30); + }else{ + $name = $id; + } } - print html_wikilink(':'.$id,$name); - print '
    • '; + echo '
  • ' . html_wikilink(':'.$id,$name) . '
    • '; } print '
'; } -- cgit v1.2.3 From 159ef5962053a685e348239dfa0b3648ed516962 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 16 Jun 2010 16:09:06 +0200 Subject: Remove temp indexer upgrade stuff from 579b0f7e --- lib/exe/indexer.php | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 7e55915f4..1e6eb5685 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -134,18 +134,6 @@ function runIndexer(){ global $conf; print "runIndexer(): started".NL; - // Move index files (if needed) - // Uses the importoldindex plugin to upgrade the index automatically. - // FIXME: Remove this from runIndexer when it is no longer needed. - if (@file_exists($conf['cachedir'].'/page.idx') && - (!@file_exists($conf['indexdir'].'/page.idx') || - !filesize($conf['indexdir'].'/page.idx')) && - !@file_exists($conf['indexdir'].'/index_importing')) { - echo "trigger TEMPORARY_INDEX_UPGRADE_EVENT\n"; - $tmp = array(); // no event data - trigger_event('TEMPORARY_INDEX_UPGRADE_EVENT', $tmp); - } - if(!$ID) return false; // check if indexing needed -- cgit v1.2.3 From a0070b52bbd24f6972b819fa8ff4bdbfe81b5bbc Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 16 Jun 2010 16:15:28 +0200 Subject: Add title index to the indexer files, improve indexer calls --- lib/exe/indexer.php | 2 +- lib/exe/xmlrpc.php | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 1e6eb5685..75228779e 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -255,7 +255,7 @@ function runSitemapper(){ return false; } - $pages = file($conf['indexdir'].'/page.idx'); + $pages = idx_getIndex('page', ''); print 'runSitemapper(): creating sitemap using '.count($pages).' pages'.NL; // build the sitemap diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 377003cf1..f06792361 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -354,24 +354,22 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * List all pages - we use the indexer list here */ function listPages(){ - global $conf; - $list = array(); - $pages = file($conf['indexdir'] . '/page.idx'); - $pages = array_filter($pages, 'isVisiblePage'); + $pages = array_filter(array_filter(idx_getIndex('page', ''), + 'isVisiblePage'), + 'page_exists'); foreach(array_keys($pages) as $idx) { - if(page_exists($pages[$idx])) { - $perm = auth_quickaclcheck($pages[$idx]); - if($perm >= AUTH_READ) { - $page = array(); - $page['id'] = trim($pages[$idx]); - $page['perms'] = $perm; - $page['size'] = @filesize(wikiFN($pages[$idx])); - $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx]))); - $list[] = $page; - } + $perm = auth_quickaclcheck($pages[$idx]); + if($perm < AUTH_READ) { + continue; } + $page = array(); + $page['id'] = trim($pages[$idx]); + $page['perms'] = $perm; + $page['size'] = @filesize(wikiFN($pages[$idx])); + $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx]))); + $list[] = $page; } return $list; -- cgit v1.2.3 From 147c74da31acb22ac7dd026bdfe9f01b6ea3fe86 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 18 Jun 2010 23:36:57 +0200 Subject: Do not output trailing whitespace in conf/local.php --- lib/plugins/config/settings/config.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 2a1d3a28f..ea5a9be21 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -182,8 +182,8 @@ if (!class_exists('configuration')) { if ($this->_format == 'php') { $out .= '<'.'?php'."\n". "/*\n". - " * ".$header." \n". - " * Auto-generated by ".$id." plugin \n". + " * ".$header."\n". + " * Auto-generated by ".$id." plugin\n". " * Run for user: ".$_SERVER['REMOTE_USER']."\n". " * Date: ".date('r')."\n". " */\n\n"; -- cgit v1.2.3 From fa61423c0443cfa720938bd4ed01184c05678e97 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 22 Jun 2010 18:59:27 +0200 Subject: temporary disable hotkey JS for FS#1958 --- lib/exe/js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index f2f9dfe6b..669afb96c 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -114,7 +114,7 @@ function js_out(){ js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); // init hotkeys - must have been done after init of toolbar - js_runonstart('initializeHotkeys()'); +#FIXME disabled for FS#1958 js_runonstart('initializeHotkeys()'); // end output buffering and get contents $js = ob_get_contents(); -- cgit v1.2.3 From e53f9e72a48912e662dde20d7dceca74a022dcdf Mon Sep 17 00:00:00 2001 From: Marijn Hofstra Date: Tue, 22 Jun 2010 19:02:33 +0200 Subject: Dutch language update --- lib/plugins/acl/lang/nl/lang.php | 1 + lib/plugins/config/lang/nl/lang.php | 4 ++++ lib/plugins/plugin/lang/nl/lang.php | 1 + lib/plugins/popularity/lang/nl/lang.php | 1 + lib/plugins/revert/lang/nl/lang.php | 1 + lib/plugins/usermanager/lang/nl/lang.php | 1 + 6 files changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index d45bb5907..86ce933d3 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -14,6 +14,7 @@ * @author Danny Rotsaert * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be + * @author Marijn Hofstra */ $lang['admin_acl'] = 'Toegangsrechten'; $lang['acl_group'] = 'Groep'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index 781598cd8..87c82e378 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -11,6 +11,7 @@ * @author Danny Rotsaert * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be + * @author Marijn Hofstra */ $lang['menu'] = 'Configuratie-instellingen'; $lang['error'] = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.
Je kunt de incorrecte waarde(s) herkennen aan de rode rand.'; @@ -98,6 +99,7 @@ $lang['useslash'] = 'Gebruik slash (/) als scheiding tussen namepac $lang['usedraft'] = 'Sla automatisch een concept op tijdens het wijzigen'; $lang['sepchar'] = 'Woordscheider in paginanamen'; $lang['canonical'] = 'Herleid URL\'s tot hun basisvorm'; +$lang['fnencode'] = 'Methode om niet-ASCII bestandsnamen te coderen.'; $lang['autoplural'] = 'Controleer op meervoudsvormen in links'; $lang['compression'] = 'Compressiemethode voor attic-bestanden'; $lang['cachetime'] = 'Maximum leeftijd voor cache (sec)'; @@ -111,6 +113,7 @@ $lang['gdlib'] = 'Versie GD Lib '; $lang['im_convert'] = 'Path naar ImageMagick\'s convert tool'; $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['hidepages'] = 'Verberg deze pagina\'s (regular expressions)'; $lang['send404'] = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s'; @@ -184,3 +187,4 @@ $lang['useheading_o_0'] = 'Nooit'; $lang['useheading_o_navigation'] = 'Alleen navigatie'; $lang['useheading_o_content'] = 'Alleen wiki inhoud'; $lang['useheading_o_1'] = 'Altijd'; +$lang['readdircache'] = 'Maximale leeftijd voor readdir cache (in seconden)'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index f420865c1..024fe546e 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -9,6 +9,7 @@ * @author Danny Rotsaert * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be + * @author Marijn Hofstra */ $lang['menu'] = 'Plugins beheren'; $lang['download'] = 'Download en installeer een nieuwe plugin'; diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php index 1490ecef7..0a22203d1 100644 --- a/lib/plugins/popularity/lang/nl/lang.php +++ b/lib/plugins/popularity/lang/nl/lang.php @@ -8,6 +8,7 @@ * @author Danny Rotsaert * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be + * @author Marijn Hofstra */ $lang['name'] = 'Populariteitsfeedback (kan even duren om in te laden)'; $lang['submit'] = 'Verstuur'; diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php index 3b5c4e0fe..3cd4bbc2f 100644 --- a/lib/plugins/revert/lang/nl/lang.php +++ b/lib/plugins/revert/lang/nl/lang.php @@ -9,6 +9,7 @@ * @author Danny Rotsaert * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be + * @author Marijn Hofstra */ $lang['menu'] = 'Herstelmanager'; $lang['filter'] = 'Zoek naar bekladde pagina\'s'; diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index d4f0eaad9..76a4844ca 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -9,6 +9,7 @@ * @author Danny Rotsaert * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be + * @author Marijn Hofstra */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; -- cgit v1.2.3 From def4baf24186bf30d4ba5ea726fb7c8391d8b43f Mon Sep 17 00:00:00 2001 From: Samuel Dorsaz Date: Tue, 22 Jun 2010 19:03:25 +0200 Subject: French language update --- lib/plugins/acl/lang/fr/lang.php | 1 + lib/plugins/config/lang/fr/lang.php | 3 +++ lib/plugins/plugin/lang/fr/lang.php | 1 + lib/plugins/popularity/lang/fr/lang.php | 1 + lib/plugins/revert/lang/fr/lang.php | 1 + lib/plugins/usermanager/lang/fr/lang.php | 1 + 6 files changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index 64d918360..63e529aab 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -19,6 +19,7 @@ * @author Vincent Feltz * @author Philippe Bajoit * @author Florian Gaub + * @author Samuel Dorsaz samuel.dorsaz@novelion.net */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 09e625eb1..df220ea9e 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -14,6 +14,7 @@ * @author Vincent Feltz * @author Philippe Bajoit * @author Florian Gaub + * @author Samuel Dorsaz samuel.dorsaz@novelion.net */ $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.
Les valeurs erronées sont entourées d\'une bordure rouge.'; @@ -101,6 +102,7 @@ $lang['useslash'] = 'Utiliser « / » comme séparateur de catég $lang['usedraft'] = 'Enregistrer automatiquement un brouillon pendant l\'édition'; $lang['sepchar'] = 'Séparateur de mots dans les noms de page'; $lang['canonical'] = 'Utiliser des URL canoniques'; +$lang['fnencode'] = 'Méhtode pou r l\'encodage des fichiers non-ASCII'; $lang['autoplural'] = 'Rechercher les formes plurielles dans les liens'; $lang['compression'] = 'Méthode de compression pour les fichiers dans attic'; $lang['cachetime'] = 'Âge maximum d\'un fichier en cache (en secondes)'; @@ -189,3 +191,4 @@ $lang['useheading_o_0'] = 'Jamais'; $lang['useheading_o_navigation'] = 'Navigation seulement'; $lang['useheading_o_content'] = 'Contenu du wiki seulement'; $lang['useheading_o_1'] = 'Toujours'; +$lang['readdircache'] = 'Durée de vie maximale du cache pour readdir (sec)'; diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index 4e4bca214..79080f5f3 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -14,6 +14,7 @@ * @author Vincent Feltz * @author Philippe Bajoit * @author Florian Gaub + * @author Samuel Dorsaz samuel.dorsaz@novelion.net */ $lang['menu'] = 'Gestion des modules externes'; $lang['download'] = 'Télécharger et installer un nouveau module'; diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index 45cc7b593..5ddd074a7 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -11,6 +11,7 @@ * @author Vincent Feltz * @author Philippe Bajoit * @author Florian Gaub + * @author Samuel Dorsaz samuel.dorsaz@novelion.net */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargé)'; $lang['submit'] = 'Envoyer les données'; diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 982b44f5a..d80ece209 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -12,6 +12,7 @@ * @author Vincent Feltz * @author Philippe Bajoit * @author Florian Gaub + * @author Samuel Dorsaz samuel.dorsaz@novelion.net */ $lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 6ae537618..92bc127ed 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -13,6 +13,7 @@ * @author Vincent Feltz * @author Philippe Bajoit * @author Florian Gaub + * @author Samuel Dorsaz samuel.dorsaz@novelion.net */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; -- cgit v1.2.3 From 80601d26897c5dced80645aaf904085aa08b7bb9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 26 Jun 2010 11:20:25 +0200 Subject: fixed wildcard handling in ACL manager FS#1955 This patch also removes legacy support for @USER@. Only %USER% is valid now. --- lib/plugins/acl/admin.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 1f666660c..673ffbc96 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -96,7 +96,10 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if($_REQUEST['acl_t'] == '__g__' && $who){ $this->who = '@'.ltrim($auth->cleanGroup($who),'@'); }elseif($_REQUEST['acl_t'] == '__u__' && $who){ - $this->who = ltrim($auth->cleanUser($who),'@'); + $this->who = ltrim($who,'@'); + if($this->who != '%USER%'){ #keep wildcard as is + $this->who = $auth->cleanUser($this->who); + } }elseif($_REQUEST['acl_t'] && $_REQUEST['acl_t'] != '__u__' && $_REQUEST['acl_t'] != '__g__'){ @@ -150,7 +153,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if ($who!='@ALL') { $who = '@'.ltrim($auth->cleanGroup($who),'@'); } - } else { + } elseif ($who != '%USER%'){ #keep wildcard as is $who = $auth->cleanUser($who); } $who = auth_nameencode($who,true); -- cgit v1.2.3 From 8d22f1e96be5aa2c65ecb6ee934debbfe0f8f4cc Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 26 Jun 2010 13:38:10 +0200 Subject: Changes to the ft_pageLookup and related event FS#1978 This patch changes the ft_pageLookup function to always return the title of pages with the result. This makes it easier to work with the array, as it no longer changes between numeric and key indexes depending on useheading. This also means that action plugins subscribed to SEARCH_QUERY_PAGELOOKUP need to be adjusted. The event contains a new data field called 'has_titles' which plugins can use to check for backwards compatibility. --- lib/exe/ajax.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 9c10ca548..8b03bb07c 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -54,7 +54,7 @@ function ajax_qsearch(){ if(empty($query)) $query = $_GET['q']; if(empty($query)) return; - $data = ft_pageLookup($query, true, false); + $data = ft_pageLookup($query, true, useHeading('navigation')); if(!count($data)) return; @@ -93,6 +93,7 @@ function ajax_suggestions() { $data = array(); $data = ft_pageLookup($query); if(!count($data)) return; + $data = array_keys($data); // limit results to 15 hits $data = array_slice($data, 0, 15); @@ -252,26 +253,27 @@ function ajax_linkwiz(){ // use index to lookup matching pages $pages = array(); - $pages = ft_pageLookup($id,false); + $pages = ft_pageLookup($id,true); // result contains matches in pages and namespaces // we now extract the matching namespaces to show // them seperately $dirs = array(); - $count = count($pages); - for($i=0; $i<$count; $i++){ - if(strpos(noNS($pages[$i]),$id) === false){ + + + foreach($pages as $pid => $title){ + if(strpos(noNS($pid),$id) === false){ // match was in the namespace - $dirs[getNS($pages[$i])] = 1; // assoc array avoids dupes + $dirs[getNS($pid)] = 1; // assoc array avoids dupes }else{ // it is a matching page, add it to the result $data[] = array( - 'id' => $pages[$i], - 'title' => p_get_first_heading($pages[$i],false), + 'id' => $pid, + 'title' => $title, 'type' => 'f', ); } - unset($pages[$i]); + unset($pages[$pid]); } foreach($dirs as $dir => $junk){ $data[] = array( -- cgit v1.2.3 From 7e1f9fd36044e5c651c71348897a3a3dc103d15a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 26 Jun 2010 13:54:29 +0200 Subject: Hotkey trigger is now CTRL-ALT FS#1958 Tests and feedbacks please! --- lib/exe/js.php | 2 +- lib/scripts/hotkeys.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 669afb96c..f2f9dfe6b 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -114,7 +114,7 @@ function js_out(){ js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); // init hotkeys - must have been done after init of toolbar -#FIXME disabled for FS#1958 js_runonstart('initializeHotkeys()'); + js_runonstart('initializeHotkeys()'); // end output buffering and get contents $js = ob_get_contents(); diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js index 2b696e78d..2b6fb6d96 100644 --- a/lib/scripts/hotkeys.js +++ b/lib/scripts/hotkeys.js @@ -18,7 +18,7 @@ function Hotkeys() { * this.modifier = 'alt'; * this.modifier = 'alt+shift'; */ - this.modifier = 'alt'; + this.modifier = 'ctrl+alt'; /** * Initialization -- cgit v1.2.3 From b038bf62450c4c0aceb9f2cf7d4e24335d6e7bdf Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sat, 26 Jun 2010 14:11:35 +0200 Subject: FS#1874: removed padding for interwiki links in print stylesheet, as the icons aren't displayed there --- lib/tpl/default/print.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 46a419b35..60c172585 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -21,6 +21,10 @@ a { background: none !important; } +a.interwiki { + padding-left: 0px !important; +} + div.meta { clear: both; -- cgit v1.2.3 From f338aa804b93f9b32cb861ab64827eae545f6725 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 26 Jun 2010 14:49:18 +0200 Subject: Let config manager post to script FS#1942 --- lib/plugins/config/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 7cc2918f4..49712b73f 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -109,7 +109,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { elseif ($this->_changed) ptln('
'.$this->getLang('updated').'
'); - ptln('
'); + ptln(''); formSecurityToken(); $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki')); -- cgit v1.2.3 From 2b2693ccbd870382d9b02623a4bffa6849cf70d4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 26 Jun 2010 13:57:50 +0100 Subject: fix for textarea bug in IE8 (FS#1910) --- lib/tpl/default/design.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index fdc41e55b..07ea6b55e 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -91,7 +91,10 @@ div.dokuwiki textarea.edit { background-color: __background__; border: 1px solid __border__; padding: 0.3em 0 0 0.3em; - width: 100%; + /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ + width: 700px; + min-width: 100%; + max-width: 100%; } /* nice alphatransparency background except for IE <7 */ -- cgit v1.2.3 From 93eefc2f33c3ee04c61c03932b74586fa412463c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 26 Jun 2010 18:59:23 +0200 Subject: generate password if wanted on usermodify FS#1873 --- lib/plugins/usermanager/admin.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 984700d41..df13f65e3 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -398,7 +398,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } } else { if (!empty($mail)){ - return false; + return false; } } @@ -506,6 +506,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } } + // generate password if left empty and notification is on + if(!empty($_REQUEST['usernotify']) && empty($newpass)){ + $newpass = auth_pwgen(); + } + if (!empty($newpass) && $this->_auth->canDo('modPass')) $changes['pass'] = $newpass; if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name']) -- cgit v1.2.3 From 7aeda574860428d96fa1660613646b5684c1a6ea Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 26 Jun 2010 20:42:48 +0200 Subject: added proxy exception regexp FS#1247 --- lib/plugins/config/lang/en/lang.php | 11 ++++++----- lib/plugins/config/settings/config.metadata.php | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index dd13464fe..66e5b00e0 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -157,11 +157,12 @@ $lang['target____media'] = 'Target window for media links'; $lang['target____windows'] = 'Target window for windows links'; /* Proxy Options */ -$lang['proxy____host'] = 'Proxy servername'; -$lang['proxy____port'] = 'Proxy port'; -$lang['proxy____user'] = 'Proxy user name'; -$lang['proxy____pass'] = 'Proxy password'; -$lang['proxy____ssl'] = 'Use ssl to connect to Proxy'; +$lang['proxy____host'] = 'Proxy servername'; +$lang['proxy____port'] = 'Proxy port'; +$lang['proxy____user'] = 'Proxy user name'; +$lang['proxy____pass'] = 'Proxy password'; +$lang['proxy____ssl'] = 'Use SLL to connect to proxy'; +$lang['proxy____except'] = 'Regular expression to match URLs for which the proxy should be skipped for.'; /* Safemode Hack */ $lang['safemodehack'] = 'Enable safemode hack'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 316b4d1c5..edba65262 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -197,6 +197,7 @@ $meta['proxy____port'] = array('numericopt'); $meta['proxy____user'] = array('string'); $meta['proxy____pass'] = array('password','_code' => 'base64'); $meta['proxy____ssl'] = array('onoff'); +$meta['proxy____except'] = array('string'); $meta['safemodehack'] = array('onoff'); $meta['ftp____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i'); $meta['ftp____port'] = array('numericopt'); -- cgit v1.2.3 From 1a93c67cff4a7b3e30186141cd17f4ba6e113e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20D=C3=A1vid?= Date: Sun, 27 Jun 2010 10:38:10 +0200 Subject: Hungarian language update --- lib/plugins/acl/lang/hu/lang.php | 1 + lib/plugins/config/lang/hu/lang.php | 4 ++++ lib/plugins/plugin/lang/hu/lang.php | 1 + lib/plugins/popularity/lang/hu/lang.php | 1 + lib/plugins/revert/lang/hu/lang.php | 1 + lib/plugins/usermanager/lang/hu/lang.php | 1 + 6 files changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php index 4fb1720ae..7de0b87a9 100644 --- a/lib/plugins/acl/lang/hu/lang.php +++ b/lib/plugins/acl/lang/hu/lang.php @@ -5,6 +5,7 @@ * @author Sandor TIHANYI * @author Siaynoq Mage * @author schilling.janos@gmail.com + * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) */ $lang['admin_acl'] = 'Hozzáférési lista (ACL) kezelő'; $lang['acl_group'] = 'Csoport:'; diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php index 9e51305fd..1c4c48e63 100644 --- a/lib/plugins/config/lang/hu/lang.php +++ b/lib/plugins/config/lang/hu/lang.php @@ -5,6 +5,7 @@ * @author Sandor TIHANYI * @author Siaynoq Mage * @author schilling.janos@gmail.com + * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) */ $lang['menu'] = 'Beállító Központ'; $lang['error'] = 'Helytelen érték miatt a módosítások nem mentődtek. Nézd át a módosításokat, és ments újra. @@ -94,6 +95,7 @@ $lang['useslash'] = 'Per-jel használata névtér-elválasztóként $lang['usedraft'] = 'Piszkozat automatikus mentése szerkesztés alatt'; $lang['sepchar'] = 'Szó elválasztó az oldalnevekben'; $lang['canonical'] = 'Teljesen kanonikus URL-ek használata'; +$lang['fnencode'] = 'A nem ASCII fájlnevek dekódolási módja'; $lang['autoplural'] = 'Többes szám ellenőrzés a hivatkozásokban (angol)'; $lang['compression'] = 'Tömörítés használata a törölt lapokhoz'; $lang['cachetime'] = 'A gyorsítótár maximális élettartama (másodperc)'; @@ -107,6 +109,7 @@ $lang['gdlib'] = 'GD Lib verzió'; $lang['im_convert'] = 'Útvonal az ImageMagick csomag convert parancsához'; $lang['jpg_quality'] = 'JPG tömörítés minősége (0-100)'; $lang['subscribers'] = 'Oldalváltozás-listára feliratkozás engedélyezése'; +$lang['subscribe_time'] = 'Az értesítések kiküldésének késleltetése (másodperc); Érdemes kisebbet választani, mint a változások megőrzésének maximális ideje.'; $lang['compress'] = 'CSS és JavaScript fájlok tömörítése'; $lang['hidepages'] = 'Az itt megadott oldalak elrejtése (reguláris kifejezés)'; $lang['send404'] = '"HTTP 404/Page Not Found" küldése nemlétező oldalak esetén'; @@ -180,3 +183,4 @@ $lang['useheading_o_0'] = 'Soha'; $lang['useheading_o_navigation'] = 'Csak navigációhoz'; $lang['useheading_o_content'] = 'Csak Wiki tartalomhoz'; $lang['useheading_o_1'] = 'Mindig'; +$lang['readdircache'] = 'A könyvtár olvasás gyorsítótárának maximális tárolási ideje (másodperc)'; diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php index 9c9c0796f..06a5e00c6 100644 --- a/lib/plugins/plugin/lang/hu/lang.php +++ b/lib/plugins/plugin/lang/hu/lang.php @@ -5,6 +5,7 @@ * @author Sandor TIHANYI * @author Siaynoq Mage * @author schilling.janos@gmail.com + * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) */ $lang['menu'] = 'Bővítménykezelő'; $lang['download'] = 'Új bővítmény letöltése és telepítése'; diff --git a/lib/plugins/popularity/lang/hu/lang.php b/lib/plugins/popularity/lang/hu/lang.php index 4dad371b6..7ee195732 100644 --- a/lib/plugins/popularity/lang/hu/lang.php +++ b/lib/plugins/popularity/lang/hu/lang.php @@ -5,6 +5,7 @@ * @author Sandor TIHANYI * @author Siaynoq Mage * @author schilling.janos@gmail.com + * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) */ $lang['name'] = 'Visszajelzés a DokuWiki használatáról (sok időt vehet igénybe a betöltése)'; $lang['submit'] = 'Adatok elküldése'; diff --git a/lib/plugins/revert/lang/hu/lang.php b/lib/plugins/revert/lang/hu/lang.php index 58f17007d..fcb092231 100644 --- a/lib/plugins/revert/lang/hu/lang.php +++ b/lib/plugins/revert/lang/hu/lang.php @@ -5,6 +5,7 @@ * @author Sandor TIHANYI * @author Siaynoq Mage * @author schilling.janos@gmail.com + * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) */ $lang['menu'] = 'Visszaállítás kezelő (anti-SPAM)'; $lang['filter'] = 'SPAM tartalmú oldalak keresése'; diff --git a/lib/plugins/usermanager/lang/hu/lang.php b/lib/plugins/usermanager/lang/hu/lang.php index b9f35cfc7..51a7fbfb1 100644 --- a/lib/plugins/usermanager/lang/hu/lang.php +++ b/lib/plugins/usermanager/lang/hu/lang.php @@ -5,6 +5,7 @@ * @author Sandor TIHANYI * @author Siaynoq Mage * @author schilling.janos@gmail.com + * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) */ $lang['menu'] = 'Felhasználók kezelése'; $lang['noauth'] = '(A felhasználói azonosítás nem működik.)'; -- cgit v1.2.3 From 40f3c0b59813d467030d51948d518069141fd998 Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sun, 27 Jun 2010 12:25:15 +0200 Subject: FS#433: Editor now uses onbeforeunload event to capture ANY leaving of it besides via Save or Preview button. This has been successfully tested in FF, Chrome and IE6/7/8. Opera does not support onbeforeunload, therefore the draft is kept if the user navigates away from the editor. Please test this. --- lib/exe/ajax.php | 2 +- lib/scripts/edit.js | 59 ++++++++++++++++++++------------------------------ lib/scripts/tw-sack.js | 5 +++-- 3 files changed, 27 insertions(+), 39 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 8b03bb07c..582be90e5 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -156,7 +156,7 @@ function ajax_lock(){ * @author Andreas Gohr */ function ajax_draftdel(){ - $id = cleanID($_POST['id']); + $id = cleanID($_REQUEST['id']); if(empty($id)) return; $client = $_SERVER['REMOTE_USER']; diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index e66154f83..5178dba4c 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -258,35 +258,30 @@ function currentHeadlineLevel(textboxId){ var textChanged = false; /** - * Check for changes before leaving the page + * Delete the draft before leaving the page */ -function changeCheck(){ - if(textChanged){ - var ok = confirm(LANG.notsavedyet); - if(ok){ - // remove a possibly saved draft using ajax - var dwform = $('dw__editform'); - if(dwform){ - var params = 'call=draftdel'; - params += '&id='+encodeURIComponent(dwform.elements.id.value); - - var sackobj = new sack(DOKU_BASE + 'lib/exe/ajax.php'); - sackobj.AjaxFailedAlert = ''; - sackobj.encodeURIString = false; - sackobj.runAJAX(params); - // we send this request blind without waiting for - // and handling the returned data - } +function deleteDraft() { + if (is_opera) return; + + // remove a possibly saved draft using ajax + var dwform = $('dw__editform'); + if(dwform){ + var params = 'call=draftdel'; + params += '&id='+encodeURIComponent(dwform.elements.id.value); + + var sackobj = new sack(DOKU_BASE + 'lib/exe/ajax.php'); + // this needs to be synchronous and GET to not be aborted upon page unload + sackobj.asynchronous = false; + sackobj.method = 'GET'; + sackobj.AjaxFailedAlert = ''; + sackobj.encodeURIString = false; + sackobj.runAJAX(params); } - return ok; - }else{ - return true; - } } /** - * Add changeCheck to all Links and Forms (except those with a - * JSnocheck class), add handlers to monitor changes + * Activate "not saved" dialog, add draft deletion to page unload, + * add handlers to monitor changes * * Sets focus to the editbox as well */ @@ -309,20 +304,12 @@ addInitEvent(function (){ addEvent(editform, 'change', checkfunc); addEvent(editform, 'keydown', checkfunc); - // add change check for links - var links = document.getElementsByTagName('a'); - for(var i=0; i < links.length; i++){ - if(links[i].className.indexOf('JSnocheck') == -1){ - addEvent(links[i], 'click', changeCheck); - } - } - // add change check for forms - var forms = document.forms; - for(i=0; i < forms.length; i++){ - if(forms[i].className.indexOf('JSnocheck') == -1){ - addEvent(forms[i], 'submit', changeCheck); + window.onbeforeunload = function(){ + if(textChanged) { + return LANG.notsavedyet; } } + window.onunload = deleteDraft; // reset change memory var on submit addEvent($('edbtn__save'), 'click', function(){ textChanged = false; }); diff --git a/lib/scripts/tw-sack.js b/lib/scripts/tw-sack.js index cfcbe0ea9..b5a5c8861 100644 --- a/lib/scripts/tw-sack.js +++ b/lib/scripts/tw-sack.js @@ -10,6 +10,7 @@ function sack(file){ this.URLString = ""; this.encodeURIString = true; this.execute = false; + this.asynchronous = true; this.onLoading = function() { }; this.onLoaded = function() { }; @@ -86,9 +87,9 @@ function sack(file){ var self = this; if (this.method == "GET") { var totalurlstring = this.requestFile + "?" + this.URLString; - this.xmlhttp.open(this.method, totalurlstring, true); + this.xmlhttp.open(this.method, totalurlstring, this.asynchronous); } else { - this.xmlhttp.open(this.method, this.requestFile, true); + this.xmlhttp.open(this.method, this.requestFile, this.asynchronous); } if (this.method == "POST"){ try { -- cgit v1.2.3 From c8f80b4e70ee1b73ecc08cac583d021979af9359 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Jun 2010 14:43:56 +0200 Subject: Use config_cascade for ACLs and plain auth users FS#1677 --- lib/plugins/acl/admin.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 673ffbc96..84932f7ac 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -69,6 +69,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { global $AUTH_ACL; global $ID; global $auth; + global $config_cascade; // fresh 1:1 copy without replacements $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); @@ -161,11 +162,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } } // save it - io_saveFile(DOKU_CONF.'acl.auth.php', join('',$lines)); + io_saveFile($config_cascade['acl']['default'], join('',$lines)); } // reload ACL config - $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); + $AUTH_ACL = file($config_cascade['acl']['default']); } // initialize ACL array @@ -696,7 +697,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { * @author Frank Schubert */ function _acl_add($acl_scope, $acl_user, $acl_level){ - $acl_config = file_get_contents(DOKU_CONF.'acl.auth.php'); + global $config_cascade; + $acl_config = file_get_contents($config_cascade['acl']['default']); $acl_user = auth_nameencode($acl_user,true); // max level for pagenames is edit @@ -718,7 +720,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { * @author Frank Schubert */ function _acl_del($acl_scope, $acl_user){ - $acl_config = file(DOKU_CONF.'acl.auth.php'); + global $config_cascade; + $acl_config = file($config_cascade['acl']['default']); $acl_user = auth_nameencode($acl_user,true); $acl_pattern = '^'.preg_quote($acl_scope,'/').'\s+'.$acl_user.'\s+[0-8].*$'; -- cgit v1.2.3 From 0b34c70fcb312d38e6110e2ca1432779ffb73a8a Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sun, 27 Jun 2010 14:50:49 +0200 Subject: FS#1795: Restrict media manager to users with at least read access on the supplied namespace. --- lib/exe/mediamanager.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index 1fe363985..c79a25c08 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -34,6 +34,12 @@ // check auth $AUTH = auth_quickaclcheck("$NS:*"); + // do not display the manager if user does not have read access + if($AUTH < AUTH_READ) { + header('HTTP/1.0 403 Forbidden'); + die($lang['accessdenied']); + } + // create the given namespace (just for beautification) if($AUTH >= AUTH_UPLOAD) { io_createNamespace("$NS:xxx", 'media'); } -- cgit v1.2.3 From bbbf585321cf3464191ccd772baef4ee26a24e3b Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 27 Jun 2010 15:16:39 +0200 Subject: Added missing ";" in edit.js --- lib/scripts/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 5178dba4c..b9767fdc0 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -308,7 +308,7 @@ addInitEvent(function (){ if(textChanged) { return LANG.notsavedyet; } - } + }; window.onunload = deleteDraft; // reset change memory var on submit -- cgit v1.2.3 From 339bd727f11b2879121b67a65741bf1350e195e4 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 27 Jun 2010 15:02:06 +0100 Subject: Wrap $HTTP_RAW_POST_DATA in !empty() to avoid NOTICE in error logs --- lib/exe/ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 582be90e5..2945cca32 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/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); } -- cgit v1.2.3 From 136982455ae0eddc18744176db33fbd7b421e11c Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 27 Jun 2010 18:34:57 +0200 Subject: Fixed automatic insertion of listbullets in Opera FS#1877 The keydown event can't be prevented in Opera (see http://www.quirksmode.org/dom/events/keys.html) so this switches back to keypress in Opera (keypress doesn't give the correct key codes in Firefox). Furthermore Opera replaces '\n' by '\r\n' when inserting text, thus the offset for cursor/selection placement was wrong. --- lib/scripts/edit.js | 10 ++++++++-- lib/scripts/textselection.js | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index b9767fdc0..b507e804b 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -169,7 +169,7 @@ function keyHandler(e){ var scroll = field.scrollHeight; var match2 = search.match(/^\n +[\*-]\s*$/); // Cancel list if the last item is empty (i. e. two times enter) - if (match2 && field.value.substr(selection.start).match(/^($|\n)/)) { + if (match2 && field.value.substr(selection.start).match(/^($|\r?\n)/)) { field.value = field.value.substr(0, linestart) + "\n" + field.value.substr(selection.start); selection.start = linestart + 1; @@ -222,7 +222,13 @@ function keyHandler(e){ addInitEvent(function(){ var field = $('wiki__text'); if(!field) return; - addEvent(field,'keydown',keyHandler); + // in Firefox, keypress doesn't send the correct keycodes, + // in Opera, the default of keydown can't be prevented + if (is_opera) { + addEvent(field,'keypress',keyHandler); + } else { + addEvent(field,'keydown',keyHandler); + } }); /** diff --git a/lib/scripts/textselection.js b/lib/scripts/textselection.js index 0378b544d..742338785 100644 --- a/lib/scripts/textselection.js +++ b/lib/scripts/textselection.js @@ -161,7 +161,12 @@ function pasteText(selection,text,opts){ selection.obj.value.substring(selection.end, selection.obj.value.length); // set new selection - selection.end = selection.start + text.length; + if (is_opera) { + // Opera replaces \n by \r\n when inserting text. + selection.end = selection.start + text.replace(/\r?\n/g, '\r\n').length; + } else { + selection.end = selection.start + text.length; + } // modify the new selection if wanted if(opts.startofs) selection.start += opts.startofs; -- cgit v1.2.3 From 09edb7113c19b07ca11a79c2b0571f45ed2cc2eb Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Jun 2010 18:44:23 +0200 Subject: use config cascade for userscripts and styles FS#1678 --- lib/exe/css.php | 11 +++++++++-- lib/exe/js.php | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 38017af9d..76f40c7bb 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -28,6 +28,8 @@ if(!defined('SIMPLE_TEST')){ function css_out(){ global $conf; global $lang; + global $config_cascade; + $style = ''; if (isset($_REQUEST['s']) && in_array($_REQUEST['s'], array('all', 'print', 'feed'))) { @@ -64,7 +66,10 @@ function css_out(){ // load plugin, template, user styles $files = array_merge($files, css_pluginstyles($style)); if (isset($tplstyles[$style])) $files = array_merge($files, $tplstyles[$style]); - $files[DOKU_CONF.'user'.$style.'.css'] = DOKU_BASE; + + if(isset($config_cascade['userstyle'][$style])){ + $files[$config_cascade['userstyle'][$style]] = DOKU_BASE; + } }else{ $files[DOKU_INC.'lib/styles/style.css'] = DOKU_BASE.'lib/styles/'; // load plugin, template, user styles @@ -73,7 +78,9 @@ function css_out(){ if($lang['direction'] == 'rtl'){ if (isset($tplstyles['rtl'])) $files = array_merge($files, $tplstyles['rtl']); } - $files[DOKU_CONF.'userstyle.css'] = DOKU_BASE; + if(isset($config_cascade['userstyle']['default'])){ + $files[$config_cascade['userstyle']['default']] = DOKU_BASE; + } } // check cache age & handle conditional request diff --git a/lib/exe/js.php b/lib/exe/js.php index f2f9dfe6b..3756c43b9 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -29,6 +29,7 @@ if(!defined('SIMPLE_TEST')){ function js_out(){ global $conf; global $lang; + global $config_cascade; // The generated script depends on some dynamic options $cache = getCacheName('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); @@ -56,7 +57,9 @@ function js_out(){ // add possible plugin scripts and userscript $files = array_merge($files,js_pluginscripts()); - $files[] = DOKU_CONF.'userscript.js'; + if(isset($config_cascade['userscript']['default'])){ + $files[] = $config_cascade['userscript']['default']; + } // check cache age & handle conditional request header('Cache-Control: public, max-age=3600'); -- cgit v1.2.3 From ce19c3413a33bcdabb5d71ec713555b540b12c84 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Jun 2010 20:52:45 +0200 Subject: Use OS based Hotkey-Modifier FS#1958 Because ALT-GR fires a CTRL-ALT event on Windows systems, but ALT-GR is needed to write square brackets on German Keyboards, CTRL-ALT can not be used as modifier. This patch introdues OS dependent modifiers. Mac systems continue to use CTRL-ALT, all other systems use only ALT. Let's hope this works out. --- lib/scripts/hotkeys.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js index 2b6fb6d96..c340c7f02 100644 --- a/lib/scripts/hotkeys.js +++ b/lib/scripts/hotkeys.js @@ -1,6 +1,6 @@ /** * Some of these scripts were taken from TinyMCE (http://tinymce.moxiecode.com/) and were modified for DokuWiki - * + * * Class handles accesskeys using javascript and also provides ability * to register and use other hotkeys as well. * @@ -17,6 +17,8 @@ function Hotkeys() { * this.modifier = 'ctrl+alt+shift'; * this.modifier = 'alt'; * this.modifier = 'alt+shift'; + * + * overwritten in intitialize (see below) */ this.modifier = 'ctrl+alt'; @@ -34,6 +36,14 @@ function Hotkeys() { */ this.initialize = function() { var t = this; + + //switch modifier key based on OS FS#1958 + if(is_macos){ + t.modifier = 'ctrl+alt'; + }else{ + t.modifier = 'alt'; + } + /** * Lookup all anchors with accesskey and register event - go to anchor * target. @@ -97,7 +107,7 @@ function Hotkeys() { * * @param e KeyboardEvent * @author Marek Sacha - * @return b boolean + * @return b boolean */ this.onkeyup = function(e) { var t = this; -- cgit v1.2.3 From 64373bfcbb5e8c82f512283345f7822f1b8ef69f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 27 Jun 2010 20:00:14 +0100 Subject: added min-width to footnote tooltips (partly FS#1931) --- lib/tpl/default/design.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 07ea6b55e..09a9ecf01 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -692,6 +692,7 @@ div.insitu-footnote { text-align: left; padding: 4px; max-width: 40%; /* IE's width is handled in javascript */ + min-width: 5em; } /* overcome IE issue with one line code or file boxes which require h. scrolling */ -- cgit v1.2.3 From e03f8da34f265d1085e18bec8aa6cd627179cbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Kj=C3=A6r=20Pedersen?= Date: Fri, 2 Jul 2010 21:19:56 +0200 Subject: Danish language update --- lib/plugins/acl/lang/da/lang.php | 1 + lib/plugins/config/lang/da/lang.php | 1 + lib/plugins/plugin/lang/da/lang.php | 1 + lib/plugins/popularity/lang/da/lang.php | 1 + lib/plugins/revert/lang/da/lang.php | 1 + lib/plugins/usermanager/lang/da/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php index d40da52a0..f82098dee 100644 --- a/lib/plugins/acl/lang/da/lang.php +++ b/lib/plugins/acl/lang/da/lang.php @@ -12,6 +12,7 @@ * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen * @author rasmus@kinnerup.com + * @author Michael Pedersen subben@gmail.com */ $lang['admin_acl'] = 'Rettighedsadministration'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index f076e408a..29c222174 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -10,6 +10,7 @@ * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen * @author rasmus@kinnerup.com + * @author Michael Pedersen subben@gmail.com */ $lang['menu'] = 'Opsætningsindstillinger'; $lang['error'] = 'Indstillingerne blev ikke opdateret på grund af en ugyldig værdi, Gennemse venligst dine ændringer og gem dem igen. diff --git a/lib/plugins/plugin/lang/da/lang.php b/lib/plugins/plugin/lang/da/lang.php index 1248c9a9c..841d246df 100644 --- a/lib/plugins/plugin/lang/da/lang.php +++ b/lib/plugins/plugin/lang/da/lang.php @@ -10,6 +10,7 @@ * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen * @author rasmus@kinnerup.com + * @author Michael Pedersen subben@gmail.com */ $lang['menu'] = 'Håndter udvidelser'; $lang['download'] = 'Hent og tilføj ny udvidelse'; diff --git a/lib/plugins/popularity/lang/da/lang.php b/lib/plugins/popularity/lang/da/lang.php index af591b88c..325fd6568 100644 --- a/lib/plugins/popularity/lang/da/lang.php +++ b/lib/plugins/popularity/lang/da/lang.php @@ -8,6 +8,7 @@ * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen * @author rasmus@kinnerup.com + * @author Michael Pedersen subben@gmail.com */ $lang['name'] = 'Tilbagemelding om popularitet (vil måske tage en del tid at indlæse)'; $lang['submit'] = 'Send data'; diff --git a/lib/plugins/revert/lang/da/lang.php b/lib/plugins/revert/lang/da/lang.php index 4e3b8ddeb..c94366638 100644 --- a/lib/plugins/revert/lang/da/lang.php +++ b/lib/plugins/revert/lang/da/lang.php @@ -8,6 +8,7 @@ * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen * @author rasmus@kinnerup.com + * @author Michael Pedersen subben@gmail.com */ $lang['menu'] = 'Gendannelsesstyring'; $lang['filter'] = 'Søg efter uønskede sider'; diff --git a/lib/plugins/usermanager/lang/da/lang.php b/lib/plugins/usermanager/lang/da/lang.php index 81217c225..ea3109374 100644 --- a/lib/plugins/usermanager/lang/da/lang.php +++ b/lib/plugins/usermanager/lang/da/lang.php @@ -9,6 +9,7 @@ * @author Daniel Ejsing-Duun * @author Erik Bjørn Pedersen * @author rasmus@kinnerup.com + * @author Michael Pedersen subben@gmail.com */ $lang['menu'] = 'Brugerstyring'; $lang['noauth'] = '(Brugervalidering er ikke tilgængelig)'; -- cgit v1.2.3 From 3ddc5b7b6cf2366f53d20b55548346eede0ca9fe Mon Sep 17 00:00:00 2001 From: Omid Mottaghi Date: Mon, 12 Jul 2010 21:21:23 +0200 Subject: Persian language update --- lib/plugins/config/lang/fa/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php index bccb36804..98744f366 100644 --- a/lib/plugins/config/lang/fa/lang.php +++ b/lib/plugins/config/lang/fa/lang.php @@ -94,6 +94,7 @@ $lang['useslash'] = 'از اسلش «/» برای جداکننده $lang['usedraft'] = 'ایجاد خودکار چرک‌نویس در زمان نگارش'; $lang['sepchar'] = 'کلمه‌ی جداکننده‌ی نام صفحات'; $lang['canonical'] = 'استفاده از آدرس‌های استاندارد'; +$lang['fnencode'] = 'روش تغییر نام فایل‌هایی با فرمتی غیر از اسکی'; $lang['autoplural'] = 'بررسی جمع بودن در پیوندها'; $lang['compression'] = 'روش فشرده‌سازی برای فایل‌های خُرد'; $lang['cachetime'] = 'بیشینه‌ی زمان حافظه‌ی موقت (cache) به ثانیه'; @@ -133,6 +134,7 @@ $lang['proxy____port'] = 'پورت پروکسی'; $lang['proxy____user'] = 'نام کاربری پروکسی'; $lang['proxy____pass'] = 'گذرواژهي پروکسی'; $lang['proxy____ssl'] = 'استفاده از SSL برای اتصال به پروکسی'; +$lang['proxy____except'] = 'عبارت منظم برای تطبیق با URLها برای این‌که دریابیم که از روی چه پروکسی‌ای باید بپریم!'; $lang['safemodehack'] = 'فعال کردن safemode hack'; $lang['ftp____host'] = 'آدرس FTP برای safemode hack'; $lang['ftp____port'] = 'پورت FTP برای safemode hack'; @@ -180,3 +182,4 @@ $lang['useheading_o_0'] = 'هرگز'; $lang['useheading_o_navigation'] = 'فقط ناوبری (navigation)'; $lang['useheading_o_content'] = 'فقط محتویات ویکی'; $lang['useheading_o_1'] = 'همیشه'; +$lang['readdircache'] = 'بیش‌ترین عمر برای حافظه‌ی موقت readdir (ثانیه)'; -- cgit v1.2.3 From 0271153bc37bcbf6fca13a371b9f98eda8ee41f0 Mon Sep 17 00:00:00 2001 From: Georgios Petsagourakis Date: Mon, 12 Jul 2010 21:23:05 +0200 Subject: Greek language update --- lib/plugins/acl/lang/el/lang.php | 1 + lib/plugins/config/lang/el/lang.php | 5 +++++ lib/plugins/plugin/lang/el/lang.php | 1 + lib/plugins/popularity/lang/el/lang.php | 1 + lib/plugins/revert/lang/el/lang.php | 1 + lib/plugins/usermanager/lang/el/lang.php | 1 + 6 files changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/el/lang.php b/lib/plugins/acl/lang/el/lang.php index da8a72ab3..e2f6c35dc 100644 --- a/lib/plugins/acl/lang/el/lang.php +++ b/lib/plugins/acl/lang/el/lang.php @@ -12,6 +12,7 @@ * @author Thanos Massias * @author Αθανάσιος Νταής * @author Konstantinos Koryllos + * @author George Petsagourakis */ $lang['admin_acl'] = 'Διαχείριση Δικαιωμάτων Πρόσβασης'; $lang['acl_group'] = 'Ομάδα'; diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php index f0434a096..df9029506 100644 --- a/lib/plugins/config/lang/el/lang.php +++ b/lib/plugins/config/lang/el/lang.php @@ -10,6 +10,7 @@ * @author Thanos Massias * @author Αθανάσιος Νταής * @author Konstantinos Koryllos + * @author George Petsagourakis */ $lang['menu'] = 'Ρυθμίσεις'; $lang['error'] = 'Οι ρυθμίσεις σας δεν έγιναν δεκτές λόγω λανθασμένης τιμής κάποιας ρύθμισης. Διορθώστε την λάθος τιμή και προσπαθήστε ξανά. @@ -98,6 +99,7 @@ $lang['useslash'] = 'Χρήση slash σαν διαχωριστικ $lang['usedraft'] = 'Αυτόματη αποθήκευση αντιγράφων κατά την τροποποίηση σελίδων'; $lang['sepchar'] = 'Διαχωριστικός χαρακτήρας για κανονικοποίηση ονόματος σελίδας'; $lang['canonical'] = 'Πλήρη και κανονικοποιημένα URLs'; +$lang['fnencode'] = 'Μέθοδος κωδικοποίησης για ονόματα αρχείων μη-ASCII'; $lang['autoplural'] = 'Ταίριασμα πληθυντικού στους συνδέσμους'; $lang['compression'] = 'Μέθοδος συμπίεσης για αρχεία attic'; $lang['cachetime'] = 'Μέγιστη ηλικία cache (sec)'; @@ -111,6 +113,7 @@ $lang['gdlib'] = 'Έκδοση βιβλιοθήκης GD'; $lang['im_convert'] = 'Διαδρομή προς το εργαλείο μετατροπής εικόνων του ImageMagick'; $lang['jpg_quality'] = 'Ποιότητα συμπίεσης JPG (0-100)'; $lang['subscribers'] = 'Να επιτρέπεται η εγγραφή στην ενημέρωση αλλαγών σελίδας'; +$lang['subscribe_time'] = 'Χρόνος μετά τον οποίο οι λίστες ειδοποιήσεων και τα συνοπτικά θα αποστέλλονται (δευτερόλεπτα). Αυτό θα πρέπει να είναι μικρότερο από τον χρόνο που έχει η ρύθμιση recent_days.'; $lang['compress'] = 'Συμπίεση αρχείων CSS και javascript'; $lang['hidepages'] = 'Φίλτρο απόκρυψης σελίδων (regular expressions)'; $lang['send404'] = 'Αποστολή "HTTP 404/Page Not Found" για σελίδες που δεν υπάρχουν'; @@ -137,6 +140,7 @@ $lang['proxy____port'] = 'Θύρα Proxy'; $lang['proxy____user'] = 'Όνομα χρήστη Proxy'; $lang['proxy____pass'] = 'Κωδικός χρήστη Proxy'; $lang['proxy____ssl'] = 'Χρήση ssl για σύνδεση με διακομιστή Proxy'; +$lang['proxy____except'] = 'Regular expression για να πιάνει τα URLs για τα οποία θα παρακάμπτεται το proxy.'; $lang['safemodehack'] = 'Ενεργοποίηση safemode hack'; $lang['ftp____host'] = 'Διακομιστής FTP για safemode hack'; $lang['ftp____port'] = 'Θύρα FTP για safemode hack'; @@ -184,3 +188,4 @@ $lang['useheading_o_0'] = 'Ποτέ'; $lang['useheading_o_navigation'] = 'Μόνο κατά την πλοήγηση'; $lang['useheading_o_content'] = 'Μόνο για τα περιεχόμενα του wiki'; $lang['useheading_o_1'] = 'Πάντα'; +$lang['readdircache'] = 'Μέγιστος χρόνος διατήρησης για το cache του readdir (δευτερόλεπτα)'; diff --git a/lib/plugins/plugin/lang/el/lang.php b/lib/plugins/plugin/lang/el/lang.php index 7715667a3..d28a04ae2 100644 --- a/lib/plugins/plugin/lang/el/lang.php +++ b/lib/plugins/plugin/lang/el/lang.php @@ -10,6 +10,7 @@ * @author Thanos Massias * @author Αθανάσιος Νταής * @author Konstantinos Koryllos + * @author George Petsagourakis */ $lang['menu'] = 'Διαχείριση Επεκτάσεων'; $lang['download'] = 'Κατεβάστε και εγκαταστήστε μια νέα επέκταση (plugin)'; diff --git a/lib/plugins/popularity/lang/el/lang.php b/lib/plugins/popularity/lang/el/lang.php index a2e8bf080..0d16bbf86 100644 --- a/lib/plugins/popularity/lang/el/lang.php +++ b/lib/plugins/popularity/lang/el/lang.php @@ -3,6 +3,7 @@ * Greek language file * * @author Konstantinos Koryllos + * @author George Petsagourakis */ $lang['name'] = 'Αναφορά Δημοτικότητας (ίσως αργήσει λίγο να εμφανιστεί)'; $lang['submit'] = 'Αποστολή Δεδομένων'; diff --git a/lib/plugins/revert/lang/el/lang.php b/lib/plugins/revert/lang/el/lang.php index 7b6fde803..a0c3bb4ff 100644 --- a/lib/plugins/revert/lang/el/lang.php +++ b/lib/plugins/revert/lang/el/lang.php @@ -8,6 +8,7 @@ * @author Thanos Massias * @author Αθανάσιος Νταής * @author Konstantinos Koryllos + * @author George Petsagourakis */ $lang['menu'] = 'Αποκατάσταση κακόβουλων αλλαγών σελίδων'; $lang['filter'] = 'Αναζήτηση σελίδων που περιέχουν spam'; diff --git a/lib/plugins/usermanager/lang/el/lang.php b/lib/plugins/usermanager/lang/el/lang.php index 3c5c9b902..8bfb1a380 100644 --- a/lib/plugins/usermanager/lang/el/lang.php +++ b/lib/plugins/usermanager/lang/el/lang.php @@ -9,6 +9,7 @@ * @author Thanos Massias * @author Αθανάσιος Νταής * @author Konstantinos Koryllos + * @author George Petsagourakis */ $lang['menu'] = 'Διαχείριση Χρηστών'; $lang['noauth'] = '(η είσοδος χρηστών δεν είναι δυνατή)'; -- cgit v1.2.3 From 88b4123b3d96037c6d1ffe48386c507a0276cabc Mon Sep 17 00:00:00 2001 From: Ulrikhe Lukoie Date: Mon, 12 Jul 2010 21:24:46 +0200 Subject: Ukrainian language update --- lib/plugins/acl/lang/uk/lang.php | 1 + lib/plugins/config/lang/uk/lang.php | 5 +++++ lib/plugins/plugin/lang/uk/lang.php | 1 + lib/plugins/popularity/lang/uk/lang.php | 1 + lib/plugins/revert/lang/uk/lang.php | 1 + lib/plugins/usermanager/lang/uk/lang.php | 1 + 6 files changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/uk/lang.php b/lib/plugins/acl/lang/uk/lang.php index dc3e6a963..99b4b2623 100644 --- a/lib/plugins/acl/lang/uk/lang.php +++ b/lib/plugins/acl/lang/uk/lang.php @@ -8,6 +8,7 @@ * @author okunia@gmail.com * @author Oleksandr Kunytsia * @author Uko uko@uar.net + * @author Ulrikhe Lukoie .com */ $lang['admin_acl'] = 'Керування списками контролю доступу'; $lang['acl_group'] = 'Група'; diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php index be6ec9e7a..f98e9463c 100644 --- a/lib/plugins/config/lang/uk/lang.php +++ b/lib/plugins/config/lang/uk/lang.php @@ -8,6 +8,7 @@ * @author okunia@gmail.com * @author Oleksandr Kunytsia * @author Uko uko@uar.net + * @author Ulrikhe Lukoie .com */ $lang['menu'] = 'Настройка конфігурації'; $lang['error'] = 'Параметри не збережено через помилкові значення. Будь ласка, перегляньте ваші зміни та спробуйте ще раз @@ -97,6 +98,7 @@ $lang['useslash'] = 'Слеш, як розділювач прост $lang['usedraft'] = 'Автоматично зберігати чернетку при редагуванні'; $lang['sepchar'] = 'Розділювач слів у імені сторінки'; $lang['canonical'] = 'Канонічні URL'; +$lang['fnencode'] = 'Метод для кодування імен файлів, що містять не ASCII символи.'; $lang['autoplural'] = 'Перевіряти множину у посиланнях'; $lang['compression'] = 'Метод стиснення attic файлів'; $lang['cachetime'] = 'Максимальний вік кешу (сек)'; @@ -110,6 +112,7 @@ $lang['gdlib'] = 'Версія GD Lib'; $lang['im_convert'] = 'Шлях до ImageMagick'; $lang['jpg_quality'] = 'Якість компресії JPG (0-100)'; $lang['subscribers'] = 'Підписка на зміни'; +$lang['subscribe_time'] = 'Час, після якого список підписки та дайджести будуть надіслані (сек.); Має бути меншим за час, вказаний у перемінній recent_days'; $lang['compress'] = 'Стискати файли CSS та javascript'; $lang['hidepages'] = 'Ховати сторінки (regular expressions)'; $lang['send404'] = 'Надсилати "HTTP 404/Сторінка не знайдена " для неіснуючих сторінок'; @@ -136,6 +139,7 @@ $lang['proxy____port'] = 'Порт Proxy'; $lang['proxy____user'] = 'Користувач Proxy'; $lang['proxy____pass'] = 'Пароль Proxy'; $lang['proxy____ssl'] = 'Використовувати ssl для з\'єднання з Proxy'; +$lang['proxy____except'] = 'Регулярний вираз для веб-адреси, яку проксі-сервер пропустить.'; $lang['safemodehack'] = 'Увімкнути хак safemode'; $lang['ftp____host'] = 'FTP-сервер для хаку safemode'; $lang['ftp____port'] = 'FTP-порт для хаку safemode'; @@ -183,3 +187,4 @@ $lang['useheading_o_0'] = 'Ніколи'; $lang['useheading_o_navigation'] = 'Лише для навігації'; $lang['useheading_o_content'] = 'Лише у змісті'; $lang['useheading_o_1'] = 'Завжди'; +$lang['readdircache'] = 'Макссимальний вік для файлів кешу (сек.)'; diff --git a/lib/plugins/plugin/lang/uk/lang.php b/lib/plugins/plugin/lang/uk/lang.php index 5746cfb7d..c5bab816f 100644 --- a/lib/plugins/plugin/lang/uk/lang.php +++ b/lib/plugins/plugin/lang/uk/lang.php @@ -8,6 +8,7 @@ * @author okunia@gmail.com * @author Oleksandr Kunytsia * @author Uko uko@uar.net + * @author Ulrikhe Lukoie .com */ $lang['menu'] = 'Керування доданками'; $lang['download'] = 'Завантажити та встановити новий доданок'; diff --git a/lib/plugins/popularity/lang/uk/lang.php b/lib/plugins/popularity/lang/uk/lang.php index dff96a22b..157944fe4 100644 --- a/lib/plugins/popularity/lang/uk/lang.php +++ b/lib/plugins/popularity/lang/uk/lang.php @@ -6,6 +6,7 @@ * @author okunia@gmail.com * @author Oleksandr Kunytsia * @author Uko uko@uar.net + * @author Ulrikhe Lukoie .com */ $lang['name'] = 'Відгук популярності (може зайняти деякий час)'; $lang['submit'] = 'Передати дані'; diff --git a/lib/plugins/revert/lang/uk/lang.php b/lib/plugins/revert/lang/uk/lang.php index 37104bdd2..ffc394f43 100644 --- a/lib/plugins/revert/lang/uk/lang.php +++ b/lib/plugins/revert/lang/uk/lang.php @@ -6,6 +6,7 @@ * @author okunia@gmail.com * @author Oleksandr Kunytsia * @author Uko uko@uar.net + * @author Ulrikhe Lukoie .com */ $lang['menu'] = 'Менеджер відновлення'; $lang['filter'] = 'Пошук спамних сторінок'; diff --git a/lib/plugins/usermanager/lang/uk/lang.php b/lib/plugins/usermanager/lang/uk/lang.php index 7e9f9167e..027c94b44 100644 --- a/lib/plugins/usermanager/lang/uk/lang.php +++ b/lib/plugins/usermanager/lang/uk/lang.php @@ -8,6 +8,7 @@ * @author okunia@gmail.com * @author Oleksandr Kunytsia * @author Uko uko@uar.net + * @author Ulrikhe Lukoie .com */ $lang['menu'] = 'Керування користувачами'; $lang['noauth'] = '(автентифікація користувачів не доступна)'; -- cgit v1.2.3 From b2013a1cc82319bc131dfca41eb75b2f2b817373 Mon Sep 17 00:00:00 2001 From: Jeferson Propheta Date: Mon, 12 Jul 2010 22:12:28 +0200 Subject: Brasilian Portuguese language update --- lib/plugins/config/lang/pt-br/lang.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 2e6971e34..ecf302d81 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -96,12 +96,14 @@ $lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os e $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.'; $lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; +$lang['xmlrpcuser'] = 'Acesso Restrito ao XML-RPC para grupos separados por virgula ou usuários aqui. Deixe em branco para conveder acesso a todos.'; $lang['updatecheck'] = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.'; $lang['userewrite'] = 'Usar URLs "limpas"'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; $lang['usedraft'] = 'Salvar o rascunho automaticamente durante a edição'; $lang['sepchar'] = 'Separador de palavras no nome da página'; $lang['canonical'] = 'Usar URLs absolutas (http://servidor/caminho)'; +$lang['fnencode'] = 'Método de codificação não-ASCII de nome de arquivos.'; $lang['autoplural'] = 'Verificar formas plurais nos links'; $lang['compression'] = 'Método de compressão para arquivos antigos'; $lang['cachetime'] = 'Tempo máximo para o cache (seg)'; @@ -115,6 +117,7 @@ $lang['gdlib'] = 'Versão da biblioteca "GD Lib"'; $lang['im_convert'] = 'Caminho para a ferramenta de conversão ImageMagick'; $lang['jpg_quality'] = 'Qualidade de compressão do JPG (0-100)'; $lang['subscribers'] = 'Habilitar o suporte a monitoramento de páginas'; +$lang['subscribe_time'] = 'Tempo de envio que as listas de inscrições serão enviadas (segundos); Este tempo deve ser menor que o tempo especificado em mudanças recentes.'; $lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; $lang['hidepages'] = 'Esconder páginas correspondentes (expressão regular)'; $lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes'; @@ -141,6 +144,7 @@ $lang['proxy____port'] = 'Porta do proxy'; $lang['proxy____user'] = 'Nome de usuário do proxy'; $lang['proxy____pass'] = 'Senha do proxy'; $lang['proxy____ssl'] = 'Usar SSL para conectar ao proxy'; +$lang['proxy____except'] = 'Expressões regulares de URL para excessão de proxy.'; $lang['safemodehack'] = 'Habilitar o contorno de segurança'; $lang['ftp____host'] = 'Servidor FTP para o contorno de segurança'; $lang['ftp____port'] = 'Porta do FTP para o contorno de segurança'; @@ -188,3 +192,4 @@ $lang['useheading_o_0'] = 'nunca'; $lang['useheading_o_navigation'] = 'somente a navegação'; $lang['useheading_o_content'] = 'somente o conteúdo do wiki'; $lang['useheading_o_1'] = 'sempre'; +$lang['readdircache'] = 'Tempo máximo para cache readdir (segundos)'; -- cgit v1.2.3 From c0e46ee6bf1e41a839f43dda4bb3746534c55b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Lefty=20=C5=A0koda?= Date: Mon, 12 Jul 2010 22:14:03 +0200 Subject: Czech language update --- lib/plugins/acl/lang/cs/lang.php | 1 + lib/plugins/config/lang/cs/lang.php | 4 ++++ lib/plugins/plugin/lang/cs/lang.php | 1 + lib/plugins/popularity/lang/cs/lang.php | 1 + lib/plugins/revert/lang/cs/lang.php | 1 + lib/plugins/usermanager/lang/cs/lang.php | 1 + 6 files changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php index aab39098a..311b79ae9 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -7,6 +7,7 @@ * @author Zbynek Krivka * @author tomas@valenta.cz * @author Marek Sacha + * @author Lefty */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index 25303791d..3f8c05f26 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -7,6 +7,7 @@ * @author Zbynek Krivka * @author tomas@valenta.cz * @author Marek Sacha + * @author Lefty */ $lang['menu'] = 'Správa nastavení'; $lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce, @@ -103,6 +104,7 @@ $lang['useslash'] = 'Používat lomítko jako oddělovač jmenných $lang['usedraft'] = 'Během editace ukládat koncept automaticky'; $lang['sepchar'] = 'Znak pro oddělování slov v názvech stránek'; $lang['canonical'] = 'Používat plně kanonická URL'; +$lang['fnencode'] = 'Metoda pro kódování ne-ASCII názvů souborů'; $lang['autoplural'] = 'Kontrolovat plurálové tvary v odkazech'; $lang['compression'] = 'Metoda komprese pro staré verze'; $lang['cachetime'] = 'Maximální životnost cache (v sekundách)'; @@ -143,6 +145,7 @@ $lang['proxy____port'] = 'Proxy port'; $lang['proxy____user'] = 'Proxy uživatelské jméno'; $lang['proxy____pass'] = 'Proxy heslo'; $lang['proxy____ssl'] = 'Použít SSL při připojení k proxy'; +$lang['proxy____except'] = 'Regulární výrazy pro URL, pro které bude přeskočena proxy.'; $lang['safemodehack'] = 'Zapnout safemode hack'; $lang['ftp____host'] = 'FTP server pro safemode hack'; $lang['ftp____port'] = 'FTP port pro safemode hack'; @@ -190,3 +193,4 @@ $lang['useheading_o_0'] = 'Nikdy'; $lang['useheading_o_navigation'] = 'Pouze pro navigaci'; $lang['useheading_o_content'] = 'Pouze pro wiki obsah'; $lang['useheading_o_1'] = 'Vždy'; +$lang['readdircache'] = 'Maximální stáří readdir cache (sec)'; diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php index bd1380143..c15a5ca21 100644 --- a/lib/plugins/plugin/lang/cs/lang.php +++ b/lib/plugins/plugin/lang/cs/lang.php @@ -8,6 +8,7 @@ * @author Bohumir Zamecnik * @author tomas@valenta.cz * @author Marek Sacha + * @author Lefty */ $lang['menu'] = 'Správa pluginů'; $lang['download'] = 'Stáhnout a instalovat plugin'; diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php index 146bf54b6..c992ec4c6 100644 --- a/lib/plugins/popularity/lang/cs/lang.php +++ b/lib/plugins/popularity/lang/cs/lang.php @@ -5,6 +5,7 @@ * @author Bohumir Zamecnik * @author tomas@valenta.cz * @author Marek Sacha + * @author Lefty */ $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/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php index 5bb5334ae..ca0474cba 100644 --- a/lib/plugins/revert/lang/cs/lang.php +++ b/lib/plugins/revert/lang/cs/lang.php @@ -8,6 +8,7 @@ * @author Zbynek Krivka * @author tomas@valenta.cz * @author Marek Sacha + * @author Lefty */ $lang['menu'] = 'Obnova zaspamovaných stránek'; $lang['filter'] = 'Hledat zaspamované stránky'; diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index 64686fb2d..9c5a2abc9 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -7,6 +7,7 @@ * @author Bohumir Zamecnik * @author tomas@valenta.cz * @author Marek Sacha + * @author Lefty */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; -- cgit v1.2.3 From f62100e2e79ba5106f2777c8e9c5f5e35c593d40 Mon Sep 17 00:00:00 2001 From: Aleksandr Selivanov Date: Fri, 16 Jul 2010 08:59:39 +0200 Subject: Russian language update --- lib/plugins/acl/lang/ru/help.txt | 2 +- lib/plugins/acl/lang/ru/lang.php | 7 ++-- lib/plugins/config/lang/ru/intro.txt | 8 ++--- lib/plugins/config/lang/ru/lang.php | 55 ++++++++++++++++---------------- lib/plugins/plugin/lang/ru/lang.php | 17 +++++----- lib/plugins/popularity/lang/ru/intro.txt | 5 +-- lib/plugins/popularity/lang/ru/lang.php | 1 + lib/plugins/revert/lang/ru/lang.php | 9 +++--- lib/plugins/usermanager/lang/ru/lang.php | 15 +++++---- 9 files changed, 63 insertions(+), 56 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt index f969151fe..4b8013f2b 100644 --- a/lib/plugins/acl/lang/ru/help.txt +++ b/lib/plugins/acl/lang/ru/help.txt @@ -1,4 +1,4 @@ -=== Краткая Справка: === +=== Краткая справка: === На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам вашей вики. diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 911ae72da..6bfea16bc 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -12,6 +12,7 @@ * @author Kirill Krasnov * @author Vlad Tsybenko * @author Aleksey Osadchiy + * @author Aleksandr Selivanov */ $lang['admin_acl'] = 'Управление списками контроля доступа'; $lang['acl_group'] = 'Группа'; @@ -26,9 +27,9 @@ $lang['p_group_id'] = 'Сейчас члены группы %s cимеют следующие права на доступ к пространству имён %s: %s.'; $lang['p_choose_id'] = 'Пожалуйста, введите пользователя или группу в форме выше, чтобы просмотреть или отредактировать права на доступ к странице %s.'; $lang['p_choose_ns'] = 'Пожалуйста, введите пользователя или группу в форме выше, чтобы просмотреть или отредактировать права на доступ к пространству имён %s.'; -$lang['p_inherited'] = 'Замечание: Эти права доступа не были заданы явно, а были унаследованы от других групп или пространств имён более высокого порядка.'; -$lang['p_isadmin'] = 'Замечание: Выбранный пользователь всегда имеет полные права так, как он является суперпользователем.'; -$lang['p_include'] = 'Более высокие права доступа включают в себя более низкие. Права доступа Создание, Загрузка и Удаление относятся только к пространствам имён, а не к страницам.'; +$lang['p_inherited'] = 'Замечание: эти права доступа не были заданы явно, а были унаследованы от других групп или пространств имён более высокого порядка.'; +$lang['p_isadmin'] = 'Замечание: выбранный пользователь всегда имеет полные права так, как он является суперпользователем.'; +$lang['p_include'] = 'Более высокие права доступа включают в себя более низкие. Права доступа «Создание», «Загрузка» и «Удаление» относятся только к пространствам имён, а не к страницам.'; $lang['current'] = 'Текущие права ACL'; $lang['where'] = 'Страница/Пространство имён'; $lang['who'] = 'Пользователь/Группа'; diff --git a/lib/plugins/config/lang/ru/intro.txt b/lib/plugins/config/lang/ru/intro.txt index 989b65ba8..1fed8f106 100644 --- a/lib/plugins/config/lang/ru/intro.txt +++ b/lib/plugins/config/lang/ru/intro.txt @@ -1,9 +1,9 @@ -====== Настройки Вики ====== +====== Настройки вики ====== -Здесь вы можете изменить настройки Вашей DokuWiki. Для справки по поводу конкретных опций смотрите [[doku>config]]. Дополнительные детали об этом плагине доступны здесь: [[doku>plugin:config]]. +Здесь вы можете изменить настройки вашей DokuWiki. Для справки по поводу конкретных опций смотрите [[doku>config]]. Дополнительные детали об этом плагине доступны здесь: [[doku>plugin:config]]. -Настройки, отображаемые на светло-красном фоне, защищены от изменений и не могут быть отредактированы с помощью этого плагина. Голубым фоном отмечены настройки со значениями по умолчанию, а белым фоном -- настройки, которые были локально изменены для этой конкретной DokuWiki. Как голубые, так и белые настройки доступны для изменения. +Настройки, отображаемые на светло-красном фоне, защищены от изменений и не могут быть отредактированы с помощью этого плагина. Голубым фоном отмечены настройки со значениями по умолчанию, а белым фоном — настройки, которые были локально изменены для этой конкретной DokuWiki. Как голубые, так и белые настройки доступны для изменения. -Не забудьте нажать кнопку **Сохранить** перед тем, как покинуть эту страницу, иначе все Ваши изменения будут потеряны. +Не забудьте нажать кнопку **Сохранить** перед тем, как покинуть эту страницу, иначе все ваши изменения будут потеряны. diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index 515485afb..200b1859c 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -13,18 +13,18 @@ * @author Kirill Krasnov * @author Vlad Tsybenko * @author Aleksey Osadchiy + * @author Aleksandr Selivanov */ $lang['menu'] = 'Настройки Вики'; -$lang['error'] = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте ваши изменения и попробуйте еще раз. -
Неправильные значения будут обведены красной рамкой.'; +$lang['error'] = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте ваши изменения и попробуйте еще раз.
Неправильные значения будут обведены красной рамкой.'; $lang['updated'] = 'Настройки успешно сохранены.'; $lang['nochoice'] = '(нет других вариантов)'; $lang['locked'] = 'Файл настройки недоступен для изменения. Если это не специально,
- убедитесь, что файл локальной настройки имеет правильное имя и права доступа.'; +убедитесь, что файл локальной настройки имеет правильное имя и права доступа.'; $lang['danger'] = 'Внимание: изменение этой опции может сделать вашу вики и меню конфигурации недоступными.'; $lang['warning'] = 'Предостережение: изменение этой опции может вызвать непредсказуемое поведение.'; $lang['security'] = 'Предостережение по безопасности: изменение этой опции может вызвать риск, связанный с безопасностью.'; -$lang['_configuration_manager'] = 'Настройки Вики'; +$lang['_configuration_manager'] = 'Настройки dики'; $lang['_header_dokuwiki'] = 'Параметры DokuWiki'; $lang['_header_plugin'] = 'Параметры плагинов'; $lang['_header_template'] = 'Параметры шаблонов'; @@ -46,17 +46,17 @@ $lang['_msg_setting_no_default'] = 'Не задано значение по ум $lang['fmode'] = 'Права для создаваемых файлов'; $lang['dmode'] = 'Права для создаваемых директорий'; $lang['lang'] = 'Язык'; -$lang['basedir'] = 'Корневая директория'; -$lang['baseurl'] = 'Корневой адрес (URL)'; +$lang['basedir'] = 'Корневая директория (например, /dokuwiki/). Оставьте пустым для автоопределения.'; +$lang['baseurl'] = 'Корневой адрес (URL) (например, http://www.yourserver.ru). Оставьте пустым для автоопределения.'; $lang['savedir'] = 'Директория для данных'; $lang['start'] = 'Имя стартовой страницы'; -$lang['title'] = 'Название Вики'; +$lang['title'] = 'Название вики'; $lang['template'] = 'Шаблон'; $lang['license'] = 'На условиях какой лицензии будет предоставляться содержимое вики?'; $lang['fullpath'] = 'Полный путь к документу'; $lang['recent'] = 'Недавние изменения (кол-во)'; $lang['breadcrumbs'] = 'Вы посетили (кол-во)'; -$lang['youarehere'] = 'Показывать "Вы находитесь здесь"'; +$lang['youarehere'] = 'Показывать «Вы находитесь здесь»'; $lang['typography'] = 'Типографские символы'; $lang['htmlok'] = 'Разрешить HTML'; $lang['phpok'] = 'Разрешить PHP'; @@ -75,7 +75,7 @@ $lang['allowdebug'] = 'Включить отладку (отключ $lang['usewordblock'] = 'Блокировать спам по ключевым словам'; $lang['indexdelay'] = 'Задержка перед индексированием'; $lang['relnofollow'] = 'rel="nofollow" для внешних ссылок'; -$lang['mailguard'] = 'Кодировать адреса е-мэйл'; +$lang['mailguard'] = 'Кодировать адреса электронной почты'; $lang['iexssprotect'] = 'Проверять закачанные файлы на наличие потенциально опасного кода JavaScript или HTML'; $lang['showuseras'] = 'Что отображать при показе пользователя, редактировавшего страницу последним'; $lang['useacl'] = 'Использовать списки прав доступа'; @@ -83,15 +83,15 @@ $lang['autopasswd'] = 'Автогенерация паролей'; $lang['authtype'] = 'Механизм аутентификации'; $lang['passcrypt'] = 'Метод шифрования пароля'; $lang['defaultgroup'] = 'Группа по умолчанию'; -$lang['superuser'] = 'Администратор'; -$lang['manager'] = 'Менеджер - группа или пользователь с доступом к определенным функциям администрирования'; +$lang['superuser'] = 'Суперпользователь — группа или пользователь с полным доступом ко всем страницам и функциям администрирования, независимо от установок ACL. Перечень разделяйте запятыми: user1,@group1,user2'; +$lang['manager'] = 'Менеджер — группа или пользователь с доступом к определенным функциям управления. Перечень разделяйте запятыми: user1,@group1,user2'; $lang['profileconfirm'] = 'Пароль для изменения профиля'; $lang['disableactions'] = 'Заблокировать операции DokuWiki'; $lang['disableactions_check'] = 'Проверка'; $lang['disableactions_subscription'] = 'Подписка/Отмена подписки'; $lang['disableactions_wikicode'] = 'Показ/экспорт исходного текста'; $lang['disableactions_other'] = 'Другие операции (через запятую)'; -$lang['sneaky_index'] = 'По умолчанию, DokuWiki показывает в индексе страниц все пространства имен. Включение этой опции скроет пространства имен, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имен и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; +$lang['sneaky_index'] = 'По умолчанию, DokuWiki показывает в индексе страниц всё пространства имен. Включение этой опции скроет пространства имен, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имен и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; $lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)'; $lang['securecookie'] = 'Должны ли cookies, выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.'; $lang['xmlrpc'] = 'Включить/выключить XML-RPC интерфейс.'; @@ -102,38 +102,39 @@ $lang['useslash'] = 'Использовать слэш'; $lang['usedraft'] = 'Автоматически сохранять черновик в время правки'; $lang['sepchar'] = 'Разделитель слов в имени страницы'; $lang['canonical'] = 'Полные канонические адреса (URL)'; +$lang['fnencode'] = 'Метод кодирования имён файлов, записанных не ASCII-символами.'; $lang['autoplural'] = 'Автоматическое мн. число'; $lang['compression'] = 'Метод сжатия для архивных файлов'; $lang['cachetime'] = 'Время жизни кэш-файла (сек.)'; $lang['locktime'] = 'Время блокировки страницы (сек.)'; -$lang['fetchsize'] = 'Максимальный размер файла (в байтах) который fetch.php может скачивать с внешнего источника'; -$lang['notify'] = 'Е-мэйл для извещений'; -$lang['registernotify'] = 'Посылать информацию о новых зарегистрированных пользователях на этот адрес е-мэйл'; -$lang['mailfrom'] = 'Е-мэйл Вики (От:)'; -$lang['gzip_output'] = 'Использовать gzip Content-Encoding для xhtml'; +$lang['fetchsize'] = 'Максимальный размер файла (в байтах), который fetch.php может скачивать с внешнего источника'; +$lang['notify'] = 'Электронный адрес для извещений'; +$lang['registernotify'] = 'Посылать информацию о новых зарегистрированных пользователях на этот электронный адрес'; +$lang['mailfrom'] = 'Электронный адрес вики (От:)'; +$lang['gzip_output'] = 'Использовать gzip-сжатие для xhtml'; $lang['gdlib'] = 'Версия GD Lib'; -$lang['im_convert'] = 'Путь к imagemagick'; +$lang['im_convert'] = 'Путь к ImageMagick'; $lang['jpg_quality'] = 'Качество сжатия JPG (0-100)'; $lang['subscribers'] = 'Разрешить подписку на изменения'; -$lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек); Должен быть меньше, чем значение указанное в recent_days.'; +$lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек.); Должен быть меньше, чем значение, указанное в recent_days.'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; $lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; $lang['send404'] = 'Посылать "HTTP404/Page Not Found"'; -$lang['sitemap'] = 'Карта сайта для Google (дни)'; +$lang['sitemap'] = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Google, Яндекс и др.)'; $lang['broken_iua'] = 'Возможно, функция ignore_user_abort не работает в вашей системе? Это может привести к потере функциональности индексирования поиска. Эта проблема присутствует, например, в IIS+PHP/CGI. Для дополнительной информации смотрите баг 852.'; $lang['xsendfile'] = 'Используете заголовок X-Sendfile для загрузки файлов на вебсервер? Ваш вебсервер должен поддерживать это.'; $lang['renderer_xhtml'] = 'Обработчик основного (xhtml) вывода вики'; $lang['renderer__core'] = '%s (ядро dokuwiki)'; $lang['renderer__plugin'] = '%s (плагин)'; -$lang['rememberme'] = 'Разрешить перманентные cookies для входа (запомнить меня)'; +$lang['rememberme'] = 'Разрешить перманентные cookies для входа («запомнить меня»)'; $lang['rss_type'] = 'Тип RSS'; $lang['rss_linkto'] = 'Ссылки в RSS'; -$lang['rss_content'] = 'Что отображать в строках фида XML?'; +$lang['rss_content'] = 'Что отображать в строках XML-ленты?'; $lang['rss_update'] = 'Интервал обновления XML-ленты (сек.)'; $lang['recent_days'] = 'На сколько дней назад сохранять недавние изменения'; $lang['rss_show_summary'] = 'Показывать краткую выдержку в заголовках XML-ленты'; $lang['target____wiki'] = 'target для внутренних ссылок'; -$lang['target____interwiki'] = 'target для ссылок между Вики'; +$lang['target____interwiki'] = 'target для ссылок между вики'; $lang['target____extern'] = 'target для внешних ссылок'; $lang['target____media'] = 'target для ссылок на медиа-файлы'; $lang['target____windows'] = 'target для ссылок на сетевые каталоги'; @@ -142,7 +143,7 @@ $lang['proxy____port'] = 'proxy - порт'; $lang['proxy____user'] = 'proxy - имя пользователя'; $lang['proxy____pass'] = 'proxy - пароль'; $lang['proxy____ssl'] = 'proxy - ssl'; -$lang['safemodehack'] = 'Включить обход safemode'; +$lang['safemodehack'] = 'Включить обход safemode (хак)'; $lang['ftp____host'] = 'ftp - адрес'; $lang['ftp____port'] = 'ftp - порт'; $lang['ftp____user'] = 'ftp - имя пользователя'; @@ -178,13 +179,13 @@ $lang['compression_o_0'] = 'без сжатия'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'не используется'; -$lang['xsendfile_o_1'] = 'проприетарный lighttpd заголовок (перед релизом 1.5)'; +$lang['xsendfile_o_1'] = 'Проприетарный lighttpd заголовок (перед релизом 1.5)'; $lang['xsendfile_o_2'] = 'Стандартный заголовок X-Sendfile'; $lang['xsendfile_o_3'] = 'Проприетарный заголовок Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Логин'; $lang['showuseras_o_username'] = 'Полное имя пользователя'; -$lang['showuseras_o_email'] = 'E-mail пользователя (зашифрован согласно настройкам mailguard)'; -$lang['showuseras_o_email_link'] = 'E-mail пользователя в виде ссылки mailto:'; +$lang['showuseras_o_email'] = 'Адрес электронной почты пользователя (зашифрован согласно настройкам mailguard)'; +$lang['showuseras_o_email_link'] = 'Адрес электронной почты пользователя в виде ссылки mailto:'; $lang['useheading_o_0'] = 'Никогда'; $lang['useheading_o_navigation'] = 'Только навигация'; $lang['useheading_o_content'] = 'Только содержимое вики'; diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php index 514b38bc2..a33f95418 100644 --- a/lib/plugins/plugin/lang/ru/lang.php +++ b/lib/plugins/plugin/lang/ru/lang.php @@ -13,6 +13,7 @@ * @author Kirill Krasnov * @author Vlad Tsybenko * @author Aleksey Osadchiy + * @author Aleksandr Selivanov */ $lang['menu'] = 'Управление плагинами'; $lang['download'] = 'Скачать и установить новый плагин'; @@ -28,16 +29,16 @@ $lang['installed'] = 'Установлен:'; $lang['lastupdate'] = 'Последнее обновление:'; $lang['source'] = 'Источник:'; $lang['unknown'] = 'неизвестно'; -$lang['updating'] = 'Обновление ...'; +$lang['updating'] = 'Обновление...'; $lang['updated'] = 'Плагин %s успешно обновлен'; $lang['updates'] = 'Следующие плагины были успешно обновлены'; $lang['update_none'] = 'Обновления не найдены.'; -$lang['deleting'] = 'Удаление ...'; +$lang['deleting'] = 'Удаление...'; $lang['deleted'] = 'Плагин %s удален.'; -$lang['downloading'] = 'Скачивание ...'; +$lang['downloading'] = 'Скачивание...'; $lang['downloaded'] = 'Плагин %s успешно установлен'; $lang['downloads'] = 'Следующие плагины были успешно установлены:'; -$lang['download_none'] = 'Плагины не найдены, или возникла неизвестная проблема в процессе скачивания и установки.'; +$lang['download_none'] = 'Плагины не найдены или возникла неизвестная проблема в процессе скачивания и установки.'; $lang['plugin'] = 'Плагин:'; $lang['components'] = 'Компоненты'; $lang['noinfo'] = 'Этот плагин не сообщил никаких данных, он может быть нерабочим.'; @@ -46,13 +47,13 @@ $lang['date'] = 'Дата:'; $lang['type'] = 'Тип:'; $lang['desc'] = 'Описание:'; $lang['author'] = 'Автор:'; -$lang['www'] = 'Страничка:'; +$lang['www'] = 'Странца:'; $lang['error'] = 'Произошла неизвестная ошибка.'; $lang['error_download'] = 'Не могу скачать файл плагина: %s'; -$lang['error_badurl'] = 'Возможно, неправильный адрес - не могу определить имя файла из адреса'; +$lang['error_badurl'] = 'Возможно, неправильный адрес — не могу определить имя файла из адреса'; $lang['error_dircreate'] = 'Не могу создать временную директорию для скачивания'; -$lang['error_decompress'] = 'Менеджеру плагинов не удалось распаковать скачанный файл. Это может быть результатом ошибки при скачивании, в этом случае Вы можете попробовать снова; или же плагин упакован неизвестным архиватором, тогда Вам необходимо скачать и установить плагин вручную.'; -$lang['error_copy'] = 'Произошла ошибка копирования при попытке установки файлов для плагина %s: переполнение диска или неправильные права доступа. Это могло привести к частичной установке плагина и неустойчивости вашей Вики.'; +$lang['error_decompress'] = 'Менеджеру плагинов не удалось распаковать скачанный файл. Это может быть результатом ошибки при скачивании, в этом случае вы можете попробовать снова; или же плагин упакован неизвестным архиватором, тогда вам необходимо скачать и установить плагин вручную.'; +$lang['error_copy'] = 'Произошла ошибка копирования при попытке установки файлов для плагина %s: переполнение диска или неправильные права доступа. Это могло привести к частичной установке плагина и неустойчивости вашей вики.'; $lang['error_delete'] = 'Произошла ошибка при попытке удалить плагин %s. Наиболее вероятно, что нет необходимых прав доступа к файлам или директориям'; $lang['enabled'] = 'Плагин %s включён.'; $lang['notenabled'] = 'Не удалось включить плагин %s. Проверьте системные права доступа к файлам.'; diff --git a/lib/plugins/popularity/lang/ru/intro.txt b/lib/plugins/popularity/lang/ru/intro.txt index a2fd5b4fd..9250e20ae 100644 --- a/lib/plugins/popularity/lang/ru/intro.txt +++ b/lib/plugins/popularity/lang/ru/intro.txt @@ -1,9 +1,10 @@ ====== Сбор информации о популярности ====== + Этот инструмент собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам DokuWiki. Эти данные помогут им понять то, как именно используется DokuWiki, и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям. -Отправляйте данные время от времени для того, чтобы сообщить разработчикам о том, что ваша вики "подросла". Отправленные вами данные будут идентифицированы по анонимному ID. +Отправляйте данные время от времени для того, чтобы сообщить разработчикам о том, что ваша вики «подросла». Отправленные вами данные будут идентифицированы по анонимному ID. Собранные данные содержат такую информацию, как: версия DokuWiki, количество и размер ваших страниц и файлов, установленные плагины, информацию об установленном PHP. -Данные, которые будут посланы, представлены ниже. Пожалуйста, используйте кнопку "Отправить данные", чтобы передать информацию. +Данные, которые будут посланы, представлены ниже. Пожалуйста, используйте кнопку «Отправить данные», чтобы передать информацию. diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php index d6c5964db..df89c7022 100644 --- a/lib/plugins/popularity/lang/ru/lang.php +++ b/lib/plugins/popularity/lang/ru/lang.php @@ -10,6 +10,7 @@ * @author Kirill Krasnov * @author Vlad Tsybenko * @author Aleksey Osadchiy + * @author Aleksandr Selivanov */ $lang['name'] = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)'; $lang['submit'] = 'Отправить данные'; diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php index 3ac43bc89..712a41f08 100644 --- a/lib/plugins/revert/lang/ru/lang.php +++ b/lib/plugins/revert/lang/ru/lang.php @@ -11,13 +11,14 @@ * @author Kirill Krasnov * @author Vlad Tsybenko * @author Aleksey Osadchiy + * @author Aleksandr Selivanov */ $lang['menu'] = 'Менеджер откаток'; $lang['filter'] = 'Поиск спам-страниц'; $lang['revert'] = 'Откатить изменения для выбранных страниц'; $lang['reverted'] = '%s откачена к версии %s'; $lang['removed'] = '%s удалена'; -$lang['revstart'] = 'Начат процесс откатки. Он может занять много времени. Если скрипт не успевает завершить работу и выдает ошибку, необходимо произвести откатку более маленькими частями.'; -$lang['revstop'] = 'Процесс откатки успешно завершен.'; -$lang['note1'] = 'Замечание: поиск с учетом регистра'; -$lang['note2'] = 'Замечание: страница будет откачена к последней версии, не содержащей спам-термин %s.'; +$lang['revstart'] = 'Начат процесс откатки. Он может занять много времени. Если скрипт не успевает завершить работу и выдаёт ошибку, необходимо произвести откатку более маленькими частями.'; +$lang['revstop'] = 'Процесс откатки успешно завершён.'; +$lang['note1'] = 'Замечание: поиск с учётом регистра'; +$lang['note2'] = 'Замечание: страница будет восстановлена до последней версии, не содержащей спам-термин %s.'; diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 5b48c6ba6..81d9a72a6 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -13,6 +13,7 @@ * @author Kirill Krasnov * @author Vlad Tsybenko * @author Aleksey Osadchiy + * @author Aleksandr Selivanov */ $lang['menu'] = 'Управление пользователями'; $lang['noauth'] = '(авторизация пользователей недоступна)'; @@ -21,7 +22,7 @@ $lang['badauth'] = 'некорректный механизм ау $lang['user_id'] = 'Логин'; $lang['user_pass'] = 'Пароль'; $lang['user_name'] = 'Полное имя'; -$lang['user_mail'] = 'Е-мэйл'; +$lang['user_mail'] = 'Эл. адрес'; $lang['user_groups'] = 'Группы'; $lang['field'] = 'Поле'; $lang['value'] = 'Значение'; @@ -39,19 +40,19 @@ $lang['summary'] = 'Показаны пользователи %1$d $lang['nonefound'] = 'Не найдено ни одного пользователя. Всего пользователей: %d.'; $lang['delete_ok'] = 'Удалено пользователей: %d'; $lang['delete_fail'] = 'Не удалось удалить %d.'; -$lang['update_ok'] = 'Пользователь успешно обновлен'; +$lang['update_ok'] = 'Пользователь успешно обновлён'; $lang['update_fail'] = 'Не удалось обновить пользователя'; $lang['update_exists'] = 'Не удалось изменить имя пользователя, такой пользователь (%s) уже существует (все остальные изменения будут применены).'; $lang['start'] = 'в начало'; $lang['prev'] = 'назад'; -$lang['next'] = 'вперед'; +$lang['next'] = 'вперёд'; $lang['last'] = 'в конец'; -$lang['edit_usermissing'] = 'Выбранный пользователь не найден. Возможно, указанный логин был удален или изменен извне.'; +$lang['edit_usermissing'] = 'Выбранный пользователь не найден. Возможно, указанный логин был удалён или изменен извне.'; $lang['user_notify'] = 'Сообщить пользователю'; -$lang['note_notify'] = 'Е-мэйлы с уведомлением посылаются только в случае получения нового пароля.'; +$lang['note_notify'] = 'Письма с уведомлением высылаются только в случае получения нового пароля.'; $lang['note_group'] = 'Если группа не указана, новые пользователи будут добавлены в группу по умолчанию (%s).'; $lang['note_pass'] = 'Пароль будет сгенерирован автоматически, если поле оставлено пустым и включено уведомление пользователя.'; $lang['add_ok'] = 'Пользователь успешно добавлен'; $lang['add_fail'] = 'Не удалось добавить пользователя'; -$lang['notify_ok'] = 'Е-мэйл с уведомлением был послан'; -$lang['notify_fail'] = 'Не удалось послать е-мэйл с уведомлением'; +$lang['notify_ok'] = 'Пиьмо с уведомлением отправлено'; +$lang['notify_fail'] = 'Не удалось отправить письмо с уведомлением'; -- cgit v1.2.3 From 163ad9f2399a52f60868a2454c1113e214c1bfea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20D=C3=A1vid?= Date: Fri, 16 Jul 2010 09:01:32 +0200 Subject: Hungarian update --- lib/plugins/acl/lang/hu/lang.php | 1 + lib/plugins/config/lang/hu/lang.php | 2 ++ lib/plugins/plugin/lang/hu/lang.php | 1 + lib/plugins/popularity/lang/hu/lang.php | 1 + lib/plugins/revert/lang/hu/lang.php | 1 + lib/plugins/usermanager/lang/hu/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php index 7de0b87a9..318287073 100644 --- a/lib/plugins/acl/lang/hu/lang.php +++ b/lib/plugins/acl/lang/hu/lang.php @@ -6,6 +6,7 @@ * @author Siaynoq Mage * @author schilling.janos@gmail.com * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) + * @author Szabó Dávid */ $lang['admin_acl'] = 'Hozzáférési lista (ACL) kezelő'; $lang['acl_group'] = 'Csoport:'; diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php index 1c4c48e63..47c1e67c7 100644 --- a/lib/plugins/config/lang/hu/lang.php +++ b/lib/plugins/config/lang/hu/lang.php @@ -6,6 +6,7 @@ * @author Siaynoq Mage * @author schilling.janos@gmail.com * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) + * @author Szabó Dávid */ $lang['menu'] = 'Beállító Központ'; $lang['error'] = 'Helytelen érték miatt a módosítások nem mentődtek. Nézd át a módosításokat, és ments újra. @@ -136,6 +137,7 @@ $lang['proxy____port'] = 'Proxy port'; $lang['proxy____user'] = 'Proxy felhasználó név'; $lang['proxy____pass'] = 'Proxy jelszó'; $lang['proxy____ssl'] = 'SSL használata a proxyhoz csatlakozáskor'; +$lang['proxy____except'] = 'URL szabály azokra a webcímekre, amit szeretnél, hogy ne kezeljen a proxy.'; $lang['safemodehack'] = 'A PHP safemode beállítás megkerülésének engedélyezése'; $lang['ftp____host'] = 'FTP szerver a safemode megkerüléshez'; $lang['ftp____port'] = 'FTP port a safemode megkerüléshez'; diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php index 06a5e00c6..32242ece9 100644 --- a/lib/plugins/plugin/lang/hu/lang.php +++ b/lib/plugins/plugin/lang/hu/lang.php @@ -6,6 +6,7 @@ * @author Siaynoq Mage * @author schilling.janos@gmail.com * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) + * @author Szabó Dávid */ $lang['menu'] = 'Bővítménykezelő'; $lang['download'] = 'Új bővítmény letöltése és telepítése'; diff --git a/lib/plugins/popularity/lang/hu/lang.php b/lib/plugins/popularity/lang/hu/lang.php index 7ee195732..d1510ed75 100644 --- a/lib/plugins/popularity/lang/hu/lang.php +++ b/lib/plugins/popularity/lang/hu/lang.php @@ -6,6 +6,7 @@ * @author Siaynoq Mage * @author schilling.janos@gmail.com * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) + * @author Szabó Dávid */ $lang['name'] = 'Visszajelzés a DokuWiki használatáról (sok időt vehet igénybe a betöltése)'; $lang['submit'] = 'Adatok elküldése'; diff --git a/lib/plugins/revert/lang/hu/lang.php b/lib/plugins/revert/lang/hu/lang.php index fcb092231..6cbdf3643 100644 --- a/lib/plugins/revert/lang/hu/lang.php +++ b/lib/plugins/revert/lang/hu/lang.php @@ -6,6 +6,7 @@ * @author Siaynoq Mage * @author schilling.janos@gmail.com * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) + * @author Szabó Dávid */ $lang['menu'] = 'Visszaállítás kezelő (anti-SPAM)'; $lang['filter'] = 'SPAM tartalmú oldalak keresése'; diff --git a/lib/plugins/usermanager/lang/hu/lang.php b/lib/plugins/usermanager/lang/hu/lang.php index 51a7fbfb1..7b22dfb48 100644 --- a/lib/plugins/usermanager/lang/hu/lang.php +++ b/lib/plugins/usermanager/lang/hu/lang.php @@ -6,6 +6,7 @@ * @author Siaynoq Mage * @author schilling.janos@gmail.com * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu) + * @author Szabó Dávid */ $lang['menu'] = 'Felhasználók kezelése'; $lang['noauth'] = '(A felhasználói azonosítás nem működik.)'; -- cgit v1.2.3 From 6d83ed4c380ed439130b3552a088cdfb53bd9119 Mon Sep 17 00:00:00 2001 From: FELTZ Vincent Date: Mon, 26 Jul 2010 18:31:07 +0200 Subject: French language update --- lib/plugins/config/lang/fr/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index df220ea9e..b51c260fc 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -144,6 +144,7 @@ $lang['proxy____port'] = 'Proxy - Numéro de port'; $lang['proxy____user'] = 'Proxy - Identifiant'; $lang['proxy____pass'] = 'Proxy - Mot de passe'; $lang['proxy____ssl'] = 'Proxy - Utilisation de SSL'; +$lang['proxy____except'] = 'Expression régulière de test des URLs pour lesquelles le proxy ne devrait pas être utilisé.'; $lang['safemodehack'] = 'Activer l\'option Mode sans échec'; $lang['ftp____host'] = 'FTP - Serveur hôte pour Mode sans échec'; $lang['ftp____port'] = 'FTP - Numéro de port pour Mode sans échec'; -- cgit v1.2.3 From a77689b1ea6fd90abd14a6f375c661af93135b55 Mon Sep 17 00:00:00 2001 From: Arne Pelka Date: Mon, 26 Jul 2010 18:32:11 +0200 Subject: German language updates --- lib/plugins/usermanager/lang/de/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php index db5158a4c..816aaebd7 100644 --- a/lib/plugins/usermanager/lang/de/lang.php +++ b/lib/plugins/usermanager/lang/de/lang.php @@ -50,7 +50,7 @@ $lang['edit_usermissing'] = 'Der ausgewählte Nutzer wurde nicht gefunden. $lang['user_notify'] = 'Nutzer benachrichtigen'; $lang['note_notify'] = 'Benachrichtigungs-E-Mails werden nur versandt, wenn ein neues Passwort vergeben wurde.'; $lang['note_group'] = 'Neue Nutzer werden der Standard-Gruppe (%s) hinzugefügt, wenn keine Gruppe angegeben wurde.'; -$lang['note_pass'] = 'Das Password wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Nutzers aktiviert ist.'; +$lang['note_pass'] = 'Das Passwort wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Nutzers aktiviert ist.'; $lang['add_ok'] = 'Nutzer erfolgreich angelegt'; $lang['add_fail'] = 'Nutzer konnte nicht angelegt werden'; $lang['notify_ok'] = 'Benachrichtigungsmail wurde versandt'; -- cgit v1.2.3 From f48ee0bd5efcf14944440e5dcb4042b14301f8ef Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 28 Jul 2010 15:52:20 +0200 Subject: Do not cancel event bubble in drag --- lib/scripts/drag.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/drag.js b/lib/scripts/drag.js index 169be5219..2212fb6c1 100644 --- a/lib/scripts/drag.js +++ b/lib/scripts/drag.js @@ -58,8 +58,6 @@ var drag = { addEvent(document,'mousemove', this.mousehandlers[0]); addEvent(document,'mouseup', this.mousehandlers[1]); - e.preventDefault(); - e.stopPropagation(); return false; }, -- cgit v1.2.3 From 76b21ebd4cee931022ca883426b6d9770c7f5e20 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 28 Jul 2010 15:52:08 +0200 Subject: remove unused IE hack --- lib/scripts/pngbehavior.htc | 53 --------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 lib/scripts/pngbehavior.htc (limited to 'lib') diff --git a/lib/scripts/pngbehavior.htc b/lib/scripts/pngbehavior.htc deleted file mode 100644 index d1db8e765..000000000 --- a/lib/scripts/pngbehavior.htc +++ /dev/null @@ -1,53 +0,0 @@ -// this is an ugly fix to make Internet Explorer work with transparent -// PNG images - do your self a favour and use a real browser! - - - - - -- cgit v1.2.3 From e0d4d0544034f85323610a0a1ac592a45957c1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?= Date: Sun, 1 Aug 2010 21:00:42 +0200 Subject: Romanian language update --- lib/plugins/config/lang/ro/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 9d931933a..7eb22c341 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -95,6 +95,7 @@ $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de $lang['usedraft'] = 'Salvează automat o schiţă în timpul editării'; $lang['sepchar'] = 'Separator cuvinte în numele paginii'; $lang['canonical'] = 'Foloseşte URL-uri canonice'; +$lang['fnencode'] = 'Metoda de encodare a numelor fişierelor non-ASCII.'; $lang['autoplural'] = 'Verifică formele de plural în legături'; $lang['compression'] = 'Metoda de criptare a fişierelor pod'; $lang['cachetime'] = 'Durata maximă pentru cache (secunde)'; @@ -108,6 +109,7 @@ $lang['gdlib'] = 'Versiunea GD Lib'; $lang['im_convert'] = 'Calea către instrumentul de conversie ImageMagick'; $lang['jpg_quality'] = 'Calitatea compresiei JPG (0-100)'; $lang['subscribers'] = 'Activează suportul pentru subscrierea paginii'; +$lang['subscribe_time'] = 'Timpul după care lista de abonare şi digestie sunt trimise (sec); Aceasta ar trebui să fie mai mic decât timpul specificat în recent_days.'; $lang['compress'] = 'Compactează codul CSS şi javascript produs'; $lang['hidepages'] = 'Ascunde paginile pereche (expresii regulate)'; $lang['send404'] = 'Trimite mesajul "HTTP 404/Page Not Found" pentru paginile inexistente'; -- cgit v1.2.3 From 16c2466cff13dc43e2f66c5cb1071a2457d4dee3 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 30 Jul 2010 14:37:00 +0200 Subject: Fix event.pageX and pageY correctly --- lib/scripts/events.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/events.js b/lib/scripts/events.js index df46cc1cf..498ec21ff 100644 --- a/lib/scripts/events.js +++ b/lib/scripts/events.js @@ -56,8 +56,9 @@ function fixEvent(event) { // fix target event.target = event.srcElement; // fix coords - event.pageX = (typeof event.pageX !== 'undefined') ? event.pageX : event.clientX + document.body.scrollTop; - event.pageY = (typeof event.pageY !== 'undefined') ? event.pageY : event.clientY + document.body.scrollTop; + var base = (document.documentElement.scrollTop?document.documentElement:document.body); + event.pageX = (typeof event.pageX !== 'undefined') ? event.pageX : event.clientX + base.scrollLeft; + event.pageY = (typeof event.pageY !== 'undefined') ? event.pageY : event.clientY + base.scrollTop; return event; }; -- cgit v1.2.3 From ca0095d06dade6118afd8205b99001892b7f1296 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 30 Jul 2010 12:58:07 +0200 Subject: Fix currentTarget in fixevent --- lib/scripts/events.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/scripts/events.js b/lib/scripts/events.js index 498ec21ff..a1fcac718 100644 --- a/lib/scripts/events.js +++ b/lib/scripts/events.js @@ -35,26 +35,26 @@ function removeEvent(element, type, handler) { function handleEvent(event) { var returnValue = true; // grab the event object (IE uses a global event object) - event = event || fixEvent(window.event); + event = event || fixEvent(window.event, this); // get a reference to the hash table of event handlers var handlers = this.events[event.type]; // execute each event handler for (var i in handlers) { if (!handlers.hasOwnProperty(i)) continue; - this.$$handleEvent = handlers[i]; - if (this.$$handleEvent(event) === false) { + if (handlers[i].call(this, event) === false) { returnValue = false; } } return returnValue; }; -function fixEvent(event) { +function fixEvent(event, _this) { // add W3C standard event methods event.preventDefault = fixEvent.preventDefault; event.stopPropagation = fixEvent.stopPropagation; // fix target event.target = event.srcElement; + event.currentTarget = _this; // fix coords var base = (document.documentElement.scrollTop?document.documentElement:document.body); event.pageX = (typeof event.pageX !== 'undefined') ? event.pageX : event.clientX + base.scrollLeft; -- cgit v1.2.3 From b6bf4d661c4578a596f249f1a21ee588be6e4262 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 9 Aug 2010 21:55:45 +0200 Subject: remove accesskey once a JS handler was registered FS#2007 --- lib/scripts/hotkeys.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js index c340c7f02..356b691ea 100644 --- a/lib/scripts/hotkeys.js +++ b/lib/scripts/hotkeys.js @@ -54,6 +54,7 @@ function Hotkeys() { t.addShortcut(t.modifier + '+' + a.accessKey, function() { a.click(); }); + a.accessKey = ''; } }); @@ -67,6 +68,7 @@ function Hotkeys() { t.addShortcut(t.modifier + '+' + i.accessKey, function() { i.click(); }); + i.accessKey = ''; } }); @@ -80,6 +82,7 @@ function Hotkeys() { t.addShortcut(t.modifier + '+' + b.accessKey, function() { b.click(); }); + b.accessKey = ''; } }); -- cgit v1.2.3 From 45c5ecdccdd251af3e9202f944fa8bf103c5db0f Mon Sep 17 00:00:00 2001 From: osman tekin Date: Mon, 9 Aug 2010 22:04:49 +0200 Subject: Italian language update --- lib/plugins/acl/lang/it/lang.php | 1 + lib/plugins/config/lang/it/lang.php | 4 ++++ lib/plugins/plugin/lang/it/lang.php | 1 + lib/plugins/popularity/lang/it/lang.php | 1 + lib/plugins/revert/lang/it/lang.php | 1 + lib/plugins/usermanager/lang/it/lang.php | 1 + 6 files changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php index 2f579afae..89e421bbb 100644 --- a/lib/plugins/acl/lang/it/lang.php +++ b/lib/plugins/acl/lang/it/lang.php @@ -11,6 +11,7 @@ * @author Lorenzo Breda * @author snarchio@alice.it * @author robocap + * @author Osman Tekin osman.tekin93@hotmail.it */ $lang['admin_acl'] = 'Gestione Lista Controllo Accessi (ACL)'; $lang['acl_group'] = 'Gruppo'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index 9b84bb79e..5bbc6894f 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -11,6 +11,7 @@ * @author Lorenzo Breda * @author snarchio@alice.it * @author robocap + * @author Osman Tekin osman.tekin93@hotmail.it */ $lang['menu'] = 'Configurazione Wiki'; $lang['error'] = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo. @@ -100,6 +101,7 @@ $lang['useslash'] = 'Usa la barra rovescia (slash) come separatore $lang['usedraft'] = 'Salva una bozza in automatico in fase di modifica'; $lang['sepchar'] = 'Separatore di parole nei nomi di pagina'; $lang['canonical'] = 'Usa URL canoniche'; +$lang['fnencode'] = 'Metodo per codificare i filenames non-ASCII.'; $lang['autoplural'] = 'Controlla il plurale nei collegamenti'; $lang['compression'] = 'Usa la compressione per i file dell\'archivio'; $lang['cachetime'] = 'Durata della cache (sec)'; @@ -140,6 +142,7 @@ $lang['proxy____port'] = 'Porta proxy'; $lang['proxy____user'] = 'Nome utente proxy'; $lang['proxy____pass'] = 'Password proxy'; $lang['proxy____ssl'] = 'Usa SSL per connetterti al proxy'; +$lang['proxy____except'] = 'Espressioni regolari per far corrispondere le URLs per i quali i proxy dovrebbero essere ommessi.'; $lang['safemodehack'] = 'Abilita safemode hack'; $lang['ftp____host'] = 'Server FTP per safemode hack'; $lang['ftp____port'] = 'Porta FTP per safemode hack'; @@ -187,3 +190,4 @@ $lang['useheading_o_0'] = 'Mai'; $lang['useheading_o_navigation'] = 'Solo navigazione'; $lang['useheading_o_content'] = 'Solo contenuto wiki'; $lang['useheading_o_1'] = 'Sempre'; +$lang['readdircache'] = 'Tempo massimo per le readdir cache (sec)'; diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php index 3e9d855ec..c7ce28a59 100644 --- a/lib/plugins/plugin/lang/it/lang.php +++ b/lib/plugins/plugin/lang/it/lang.php @@ -11,6 +11,7 @@ * @author Lorenzo Breda * @author snarchio@alice.it * @author robocap + * @author Osman Tekin osman.tekin93@hotmail.it */ $lang['menu'] = 'Gestione Plugin'; $lang['download'] = 'Scarica e installa un nuovo plugin'; diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php index 277e93a25..583dfae26 100644 --- a/lib/plugins/popularity/lang/it/lang.php +++ b/lib/plugins/popularity/lang/it/lang.php @@ -7,6 +7,7 @@ * @author Lorenzo Breda * @author snarchio@alice.it * @author robocap + * @author Osman Tekin osman.tekin93@hotmail.it */ $lang['name'] = 'Raccolta dati sul wiki (può impiegare del tempo per caricarsi)'; $lang['submit'] = 'Invia dati'; diff --git a/lib/plugins/revert/lang/it/lang.php b/lib/plugins/revert/lang/it/lang.php index 0c2b265de..319493acd 100644 --- a/lib/plugins/revert/lang/it/lang.php +++ b/lib/plugins/revert/lang/it/lang.php @@ -8,6 +8,7 @@ * @author Lorenzo Breda * @author snarchio@alice.it * @author robocap + * @author Osman Tekin osman.tekin93@hotmail.it */ $lang['menu'] = 'Gestore di ripristini'; $lang['filter'] = 'Cerca pagine con spam'; diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php index d592fdf89..a766e5d07 100644 --- a/lib/plugins/usermanager/lang/it/lang.php +++ b/lib/plugins/usermanager/lang/it/lang.php @@ -10,6 +10,7 @@ * @author Lorenzo Breda * @author snarchio@alice.it * @author robocap + * @author Osman Tekin osman.tekin93@hotmail.it */ $lang['menu'] = 'Gestione Utenti'; $lang['noauth'] = '(autenticazione non disponibile)'; -- cgit v1.2.3 From 41c141178e9733bbf38f8e937d3dea63058af0dc Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 10 Aug 2010 12:26:19 +0200 Subject: Ignore small & own changes in digest & list mails --- lib/exe/indexer.php | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 75228779e..f8e2f7981 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -363,30 +363,40 @@ function sendDigest() { if (substr($id, -1, 1) === ':') { // The subscription target is a namespace $changes = getRecentsSince($lastupdate, null, getNS($id)); - if (count($changes) === 0) { - continue; - } - if ($style === 'digest') { - foreach($changes as $change) { - subscription_send_digest($USERINFO['mail'], $change, - $lastupdate); - } - } elseif ($style === 'list') { - subscription_send_list($USERINFO['mail'], $changes, $id); - } - // TODO: Handle duplicate subscriptions. } else { if(auth_quickaclcheck($id) < AUTH_READ) continue; $meta = p_get_metadata($id); - $rev = $meta['last_change']['date']; - if ($rev < $lastupdate) { - // There is no new revision. - continue; + $changes = array($meta['last_change']); + } + + // Filter out pages only changed in small and own edits + $change_ids = array(); + foreach($changes as $rev) { + $n = 0; + while (!is_null($rev) && $rev['date'] >= $lastupdate && + ($_SERVER['REMOTE_USER'] === $rev['user'] || + $rev['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT)) { + $rev = getRevisions($rev['id'], $n++, 1); + $rev = (count($rev) > 0) ? $rev[0] : null; + } + + if (!is_null($rev) && $rev['date'] >= $lastupdate) { + // Some change was not a minor one and not by myself + $change_ids[] = $rev['id']; } - subscription_send_digest($USERINFO['mail'], $meta['last_change'], - $lastupdate); } + + if ($style === 'digest') { + foreach($change_ids as $change_id) { + subscription_send_digest($USERINFO['mail'], $change_id, + $lastupdate); + } + } elseif ($style === 'list') { + subscription_send_list($USERINFO['mail'], $change_ids, $id); + } + // TODO: Handle duplicate subscriptions. + // Update notification time. subscription_set($user, $id, $style, time(), true); } -- cgit v1.2.3 From d259f728f887b2ad76a2531705eac51b7dda8676 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 11 Aug 2010 14:01:40 +0200 Subject: fixed locktimer/draft saving on new pages When creating new pages, no date field is added in the edit form. --- lib/exe/ajax.php | 2 +- lib/scripts/edit.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 2945cca32..533b8f91c 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -139,7 +139,7 @@ function ajax_lock(){ 'prefix' => $_POST['prefix'], 'text' => $_POST['wikitext'], 'suffix' => $_POST['suffix'], - 'date' => $_POST['date'], + 'date' => (int) $_POST['date'], 'client' => $client, ); $cname = getCacheName($draft['client'].$id,'.draft'); diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index b507e804b..01262bcef 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -418,7 +418,9 @@ var locktimer = new locktimer_class(); params += '&prefix='+encodeURIComponent(dwform.elements.prefix.value); params += '&wikitext='+encodeURIComponent(dwform.elements.wikitext.value); params += '&suffix='+encodeURIComponent(dwform.elements.suffix.value); - params += '&date='+encodeURIComponent(dwform.elements.date.value); + if(dwform.elements.date){ + params += '&date='+encodeURIComponent(dwform.elements.date.value); + } } locktimer.sack.runAJAX(params); locktimer.lasttime = now; -- cgit v1.2.3 From 102af705c4f1aee88916669eeacdfb5f148f4973 Mon Sep 17 00:00:00 2001 From: Tanguy Ortolo Date: Sat, 14 Aug 2010 17:42:48 +0200 Subject: The multiuploader applet is licensed under the MIT. --- lib/_fla/MultipleUpload.as | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/_fla/MultipleUpload.as b/lib/_fla/MultipleUpload.as index c5e7799f9..259441656 100644 --- a/lib/_fla/MultipleUpload.as +++ b/lib/_fla/MultipleUpload.as @@ -6,6 +6,7 @@ * @link http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/ * @author Alastair Dawson * @author Andreas Gohr + * @license MIT */ // delegate -- cgit v1.2.3 From 237f954610f045f604fe05a60d82df8b375e0cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0olti?= Date: Fri, 20 Aug 2010 11:44:51 +0200 Subject: Serbian language update --- lib/plugins/acl/lang/sr/lang.php | 1 + lib/plugins/config/lang/sr/lang.php | 18 ++++++++++++------ lib/plugins/plugin/lang/sr/lang.php | 1 + lib/plugins/popularity/lang/sr/lang.php | 1 + lib/plugins/revert/lang/sr/lang.php | 1 + lib/plugins/usermanager/lang/sr/lang.php | 1 + 6 files changed, 17 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/sr/lang.php b/lib/plugins/acl/lang/sr/lang.php index 6e1649992..20fbb0382 100644 --- a/lib/plugins/acl/lang/sr/lang.php +++ b/lib/plugins/acl/lang/sr/lang.php @@ -6,6 +6,7 @@ * @author Filip Brcic * @author Иван Петровић petrovicivan@ubuntusrbija.org * @author Ivan Petrovic + * @author Miroslav Šolti */ $lang['admin_acl'] = 'Управљање листом контроле приступа'; $lang['acl_group'] = 'Група'; diff --git a/lib/plugins/config/lang/sr/lang.php b/lib/plugins/config/lang/sr/lang.php index 2ad2f03aa..f66a7f717 100644 --- a/lib/plugins/config/lang/sr/lang.php +++ b/lib/plugins/config/lang/sr/lang.php @@ -4,6 +4,7 @@ * * @author Иван Петровић petrovicivan@ubuntusrbija.org * @author Ivan Petrovic + * @author Miroslav Šolti */ $lang['menu'] = 'Подешавања'; $lang['error'] = 'Подешавања нису прихваћена јер постоји вредност са грешком, проверите измене које сте извршили и поновите слање.
Вредност(и) са грешком су приказане са црвеним оквиром.'; @@ -83,12 +84,15 @@ $lang['disableactions_other'] = 'Остале наредбе (раздвоје $lang['sneaky_index'] = 'По инсталацији DokuWiki ће у индексу приказати све именске просторе. Укључивањем ове опције именски простори у којима корисник нема право читања ће бити сакривени. Консеквенца је да ће и доступни подпростори бити сакривени. Ово доводи до неупотребљивости Права приступа у неким поставкама.'; $lang['auth_security_timeout'] = 'Временска пауза у аутентификацији (секунде)'; $lang['securecookie'] = 'Да ли колачићи који су постављени преко ХТТПС треба слати веб читачу само преко ХТТПС? Искључите ову опцију само ако је пријављивање на вики заштићено ССЛом а остали део викија незаштићен.'; +$lang['xmlrpc'] = 'Укључи/искључи ИксМЛ-РПЦ интерфејс'; +$lang['xmlrpcuser'] = 'Ограничи ИксМЛ-РПЦ приступ на наведене групе корисника раздвојене зарезом. Остави празно да би свима дао приступ.'; $lang['updatecheck'] = 'Провера надоградњи и сигурносних упозорења? Dokuwiki мора да контактира splitbrain.org ради добијања информација.'; $lang['userewrite'] = 'Направи леп УРЛ'; $lang['useslash'] = 'Користи косу црту у УРЛу за раздвајање именских простора '; $lang['usedraft'] = 'Аутоматски сачувај скицу у току писања измена'; $lang['sepchar'] = 'Раздвајање речи у називу странице'; $lang['canonical'] = 'Користи правилне УРЛове'; +$lang['fnencode'] = 'Метод кодирања не-ASCII имена фајлова:'; $lang['autoplural'] = 'Провери облик множине у линковима'; $lang['compression'] = 'Метод компресије за attic датотеке'; $lang['cachetime'] = 'Максимално трајање оставе (сек)'; @@ -102,13 +106,13 @@ $lang['gdlib'] = 'ГД Либ верзија'; $lang['im_convert'] = 'Путања до алатке за коверзију ИмиџМеџик '; $lang['jpg_quality'] = 'ЈПГ квалитет компресије (0-100)'; $lang['subscribers'] = 'Укључи могућност претплате за странице'; +$lang['subscribe_time'] = 'Време након ког се спискови претплатника и сижеи шаљу (у секундама); Ова цифра би требало да буде мања од цифре наведене под recent_days'; $lang['compress'] = 'Сажимај ЦСС и јаваскрипт'; $lang['hidepages'] = 'Сакриј подударне странице (на основу регуларних израза)'; $lang['send404'] = 'Пошаљи поруку "ХТТП 404/Страница не постоји" за непостојеће странице'; $lang['sitemap'] = 'Генериши Гугл мапу сајта (дан)'; $lang['broken_iua'] = 'Да ли је функција ignore_user_abort function не ради на вашем систему? Ово може проузроковати неиндексирање података за претрагу. ИИС+ПХП/ЦГИ је често ван функције. Погледајте баг 852 за више информација.'; $lang['xsendfile'] = 'Користи заглавље X-Sendfile да би веб сервер могао да испоручује статичке датотеке? Веб сервер треба да подржава ову функцију.'; -$lang['xmlrpc'] = 'Укључи/искључи ИксМЛ-РПЦ прикључак'; $lang['renderer_xhtml'] = 'Исцртавање користи главни (xhtml) вики испис'; $lang['renderer__core'] = '%s (dokuwiki језгро)'; $lang['renderer__plugin'] = '%s (додатак)'; @@ -124,11 +128,12 @@ $lang['target____interwiki'] = 'Циљни прозор за међувики $lang['target____extern'] = 'Циљни прозор за спољне линкове'; $lang['target____media'] = 'Циљни прозор за медијске линкове'; $lang['target____windows'] = 'Циљни прозор за Виндоуз линкове'; -$lang['proxy____host'] = 'Назив посредника'; -$lang['proxy____port'] = 'Порт посредника'; -$lang['proxy____user'] = 'Корисничко име на посреднику'; -$lang['proxy____pass'] = 'Лозинка на посреднику'; -$lang['proxy____ssl'] = 'Користи ССЛ за повезивање са посредником'; +$lang['proxy____host'] = 'Назив посредника (проксија)'; +$lang['proxy____port'] = 'Порт посредника (проксија)'; +$lang['proxy____user'] = 'Корисничко име на посреднику (проксију)'; +$lang['proxy____pass'] = 'Лозинка на посреднику (проксију)'; +$lang['proxy____ssl'] = 'Користи ССЛ за повезивање са посредником (проксијем)'; +$lang['proxy____except'] = 'Редован израз који би требало да се подудара са веб адресом странице за коју треба прескочити посредника (прокси).'; $lang['safemodehack'] = 'Укључи преправку за безбедни режим'; $lang['ftp____host'] = 'ФТП сервер за безбедни режим'; $lang['ftp____port'] = 'ФТП порт за безбедни режим'; @@ -176,3 +181,4 @@ $lang['useheading_o_0'] = 'Никада'; $lang['useheading_o_navigation'] = 'Сами навигација'; $lang['useheading_o_content'] = 'Само за садржај викија'; $lang['useheading_o_1'] = 'Увек'; +$lang['readdircache'] = 'Максимално време трајања за readdir cache (у секундама)'; diff --git a/lib/plugins/plugin/lang/sr/lang.php b/lib/plugins/plugin/lang/sr/lang.php index 58f333879..bc22770a1 100644 --- a/lib/plugins/plugin/lang/sr/lang.php +++ b/lib/plugins/plugin/lang/sr/lang.php @@ -4,6 +4,7 @@ * * @author Иван Петровић petrovicivan@ubuntusrbija.org * @author Ivan Petrovic + * @author Miroslav Šolti */ $lang['menu'] = 'Управљач додацима'; $lang['download'] = 'Преузми и инсталирај нови додатак'; diff --git a/lib/plugins/popularity/lang/sr/lang.php b/lib/plugins/popularity/lang/sr/lang.php index c78dd70bb..f560b52a8 100644 --- a/lib/plugins/popularity/lang/sr/lang.php +++ b/lib/plugins/popularity/lang/sr/lang.php @@ -4,6 +4,7 @@ * * @author Иван Петровић petrovicivan@ubuntusrbija.org * @author Ivan Petrovic + * @author Miroslav Šolti */ $lang['name'] = 'Мерење популарности (може потрајати док се не учита)'; $lang['submit'] = 'Пошаљи податке'; diff --git a/lib/plugins/revert/lang/sr/lang.php b/lib/plugins/revert/lang/sr/lang.php index 3b28a1729..62c712ad1 100644 --- a/lib/plugins/revert/lang/sr/lang.php +++ b/lib/plugins/revert/lang/sr/lang.php @@ -4,6 +4,7 @@ * * @author Иван Петровић petrovicivan@ubuntusrbija.org * @author Ivan Petrovic + * @author Miroslav Šolti */ $lang['menu'] = 'Управљач за враћање'; $lang['filter'] = 'Претрага спам страница'; diff --git a/lib/plugins/usermanager/lang/sr/lang.php b/lib/plugins/usermanager/lang/sr/lang.php index ab64c925a..5f2669b58 100644 --- a/lib/plugins/usermanager/lang/sr/lang.php +++ b/lib/plugins/usermanager/lang/sr/lang.php @@ -4,6 +4,7 @@ * * @author Иван Петровић petrovicivan@ubuntusrbija.org * @author Ivan Petrovic + * @author Miroslav Šolti */ $lang['menu'] = 'Управљач корисницима'; $lang['noauth'] = '(корисничка провера није доступна)'; -- cgit v1.2.3 From 003a37b419108048f084be9c59598a00a7eb8724 Mon Sep 17 00:00:00 2001 From: Timon Van Overveldt Date: Fri, 20 Aug 2010 11:45:47 +0200 Subject: Dutch language update --- lib/plugins/acl/lang/nl/lang.php | 1 + lib/plugins/config/lang/nl/lang.php | 2 ++ lib/plugins/plugin/lang/nl/lang.php | 1 + lib/plugins/popularity/lang/nl/lang.php | 1 + lib/plugins/revert/lang/nl/lang.php | 1 + lib/plugins/usermanager/lang/nl/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index 86ce933d3..f9adb5f04 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -15,6 +15,7 @@ * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra + * @author Timon Van Overveldt */ $lang['admin_acl'] = 'Toegangsrechten'; $lang['acl_group'] = 'Groep'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index 87c82e378..a9e0d935f 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra + * @author Timon Van Overveldt */ $lang['menu'] = 'Configuratie-instellingen'; $lang['error'] = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.
Je kunt de incorrecte waarde(s) herkennen aan de rode rand.'; @@ -140,6 +141,7 @@ $lang['proxy____port'] = 'Proxy port'; $lang['proxy____user'] = 'Proxy gebruikersnaam'; $lang['proxy____pass'] = 'Proxy wachtwoord'; $lang['proxy____ssl'] = 'Gebruik SSL om een connectie te maken met de proxy'; +$lang['proxy____except'] = 'Reguliere expressie om URL\'s te bepalen waarvoor de proxy overgeslaan moet worden.'; $lang['safemodehack'] = 'Safemode hack aanzetten'; $lang['ftp____host'] = 'FTP server voor safemode hack'; $lang['ftp____port'] = 'FTP port voor safemode hack'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index 024fe546e..cb7fc44fc 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -10,6 +10,7 @@ * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra + * @author Timon Van Overveldt */ $lang['menu'] = 'Plugins beheren'; $lang['download'] = 'Download en installeer een nieuwe plugin'; diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php index 0a22203d1..54e12ae91 100644 --- a/lib/plugins/popularity/lang/nl/lang.php +++ b/lib/plugins/popularity/lang/nl/lang.php @@ -9,6 +9,7 @@ * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra + * @author Timon Van Overveldt */ $lang['name'] = 'Populariteitsfeedback (kan even duren om in te laden)'; $lang['submit'] = 'Verstuur'; diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php index 3cd4bbc2f..21f8c2971 100644 --- a/lib/plugins/revert/lang/nl/lang.php +++ b/lib/plugins/revert/lang/nl/lang.php @@ -10,6 +10,7 @@ * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra + * @author Timon Van Overveldt */ $lang['menu'] = 'Herstelmanager'; $lang['filter'] = 'Zoek naar bekladde pagina\'s'; diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index 76a4844ca..a6ae402d8 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -10,6 +10,7 @@ * @author Marijn Hofstra hofstra.m@gmail.com * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra + * @author Timon Van Overveldt */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; -- cgit v1.2.3 From b0fd28781bd88241e58786a6da0a44c65cbb6276 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 27 Aug 2010 08:50:23 +0200 Subject: allow empty values for emails in config manager FS#2012 --- lib/plugins/config/settings/config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index ea5a9be21..4f2129c70 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -597,7 +597,7 @@ if (!class_exists('setting_richemail')) { $addr = $test; } - if (!mail_isvalid($addr)) { + if ($test !== '' && !mail_isvalid($addr)) { $this->_error = true; $this->_input = $input; return false; -- cgit v1.2.3 From 7d3937102067f959de80afcbe1866e106aec82a0 Mon Sep 17 00:00:00 2001 From: Otto Vainio Date: Fri, 27 Aug 2010 09:43:54 +0200 Subject: Finish language update --- lib/plugins/config/lang/fi/lang.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index fccb055a2..f5c7b911b 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -94,6 +94,7 @@ $lang['useslash'] = 'Käytä kauttaviivaa nimiavaruuksien erottimen $lang['usedraft'] = 'Tallenna vedos muokkaustilassa automaattisesti '; $lang['sepchar'] = 'Sivunimen sanaerotin'; $lang['canonical'] = 'Käytä kanonisoituja URLeja'; +$lang['fnencode'] = 'Muita kuin ASCII merkkejä sisältävien tiedotonimien koodaustapa.'; $lang['autoplural'] = 'Etsi monikkomuotoja linkeistä'; $lang['compression'] = 'Attic-tiedostojen pakkausmenetelmä'; $lang['cachetime'] = 'Välimuisti-tiedostojen maksimi-ikä (sek)'; @@ -107,6 +108,7 @@ $lang['gdlib'] = 'GD Lib versio'; $lang['im_convert'] = 'ImageMagick-muunnostyökalun polku'; $lang['jpg_quality'] = 'JPG pakkauslaatu (0-100)'; $lang['subscribers'] = 'Salli tuki sivujen tilaamiselle'; +$lang['subscribe_time'] = 'Aika jonka jälkeen tilauslinkit ja yhteenveto lähetetään (sek). Tämän pitäisi olla pienempi, kuin recent_days aika.'; $lang['compress'] = 'Pakkaa CSS ja javascript'; $lang['hidepages'] = 'Piilota seuraavat sivut (säännönmukainen lauseke)'; $lang['send404'] = 'Lähetä "HTTP 404/Page Not Found" puuttuvista sivuista'; @@ -134,6 +136,7 @@ $lang['proxy____port'] = 'Proxy portti'; $lang['proxy____user'] = 'Proxy käyttäjän nimi'; $lang['proxy____pass'] = 'Proxy salasana'; $lang['proxy____ssl'] = 'Käytä ssl-yhteyttä kytkeytyäksesi proxy-palvelimeen'; +$lang['proxy____except'] = 'Säännönmukainen lause, URLiin, jolle proxy ohitetaan.'; $lang['safemodehack'] = 'Käytä safemode kiertoa'; $lang['ftp____host'] = 'FTP-palvelin safemode kiertoa varten'; $lang['ftp____port'] = 'FTP-portti safemode kiertoa varten'; @@ -181,3 +184,4 @@ $lang['useheading_o_0'] = 'Ei koskaan'; $lang['useheading_o_navigation'] = 'Vain Navigointi'; $lang['useheading_o_content'] = 'Vain Wiki-sisältö'; $lang['useheading_o_1'] = 'Aina'; +$lang['readdircache'] = 'Maksimiaika readdir cachelle (sek)'; -- cgit v1.2.3 From db6f7eaea3a9b1b536f2b65e54c911f2a4d49bd8 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 29 Aug 2010 12:27:41 +0200 Subject: don't load disabled plugins FS#1990 --- lib/plugins/plugin/classes/ap_info.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php index fcadb4599..cebbf090a 100644 --- a/lib/plugins/plugin/classes/ap_info.class.php +++ b/lib/plugins/plugin/classes/ap_info.class.php @@ -15,7 +15,7 @@ class ap_info extends ap_manage { foreach ($component_list as $component) { - if ($obj = & plugin_load($component['type'],$component['name']) === NULL) continue; + if ($obj = & plugin_load($component['type'],$component['name'],false,true) === NULL) continue; $compname = explode('_',$component['name']); if($compname[1]){ -- cgit v1.2.3