diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-04 20:19:52 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-04 20:19:52 +0100 |
| commit | 383dc9895eac5f1b8ee2a938bfff4a1482228817 (patch) | |
| tree | a6af696a4ecd6259628f2885e23eadb637603b30 | |
| parent | ecd445c000e4e54bf7228890848222312cffd3e3 (diff) | |
| parent | 2005b6b650f2523cb58a005961a55a6f099c70c3 (diff) | |
| download | rpg-383dc9895eac5f1b8ee2a938bfff4a1482228817.tar.gz rpg-383dc9895eac5f1b8ee2a938bfff4a1482228817.tar.bz2 | |
Merge branch 'master' into future
* master: (45 commits)
TarLib code cleanup
TarLib: fixed appending in non-dynamic mode
fixed third method of adding files in TarLib
fix lone zero block in TarLib created archives
fix use of constructor in TarLib
Slovak language update
Korean language update
Latvian language update
removed redundant variables in tpl_include_page() (because of 3ff8773b)
added cut off points for mobile devices as parameters to style.ini
Corrected typo: ruke -> rule
Persian language update
Spanish language update
russian language update
Kazach language update
correctly check hash parameter in media dispatcher FS#2648
avoid broken browser_uid on IE
Removed acronyms for "Perl" and "PERL" as Perl is not an acronym. See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
Made striplangs.php executable
release preparations
...
106 files changed, 1169 insertions, 787 deletions
diff --git a/_cs/DokuWiki/ruleset.xml b/_cs/DokuWiki/ruleset.xml index bfbef87fe..c69ef853a 100644 --- a/_cs/DokuWiki/ruleset.xml +++ b/_cs/DokuWiki/ruleset.xml @@ -25,7 +25,7 @@ <rule ref="Generic.CodeAnalysis.EmptyStatement" /> <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" /> <rule ref="Generic.Commenting.Todo" /> - <ruke ref="Generic.Files.ByteOrderMark" /> + <rule ref="Generic.Files.ByteOrderMark" /> <rule ref="Generic.Files.LineEndings" /> <rule ref="Generic.Formatting.DisallowMultipleStatements" /> <rule ref="Generic.Metrics.NestingLevel"> diff --git a/_test/tests/inc/tarlib.test.php b/_test/tests/inc/tarlib.test.php new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/_test/tests/inc/tarlib.test.php diff --git a/_test/tests/inc/template_sidebar.test.php b/_test/tests/inc/template_include_page.test.php index 56153894a..47d4d46f1 100644 --- a/_test/tests/inc/template_sidebar.test.php +++ b/_test/tests/inc/template_include_page.test.php @@ -1,12 +1,12 @@ <?php -class template_sidebar_test extends DokuWikiTest { +class template_include_page_test extends DokuWikiTest { function testNoSidebar() { global $ID; $ID = 'foo:bar:baz:test'; - $sidebar = tpl_sidebar(false); - $this->assertEquals('',$sidebar); + $sidebar = tpl_include_page('sidebar', false, true); + $this->assertEquals('', $sidebar); } function testExistingSidebars() { @@ -15,25 +15,25 @@ class template_sidebar_test extends DokuWikiTest { saveWikiText('sidebar', 'topsidebar-test', ''); $ID = 'foo:bar:baz:test'; - $sidebar = tpl_sidebar(false); + $sidebar = tpl_include_page('sidebar', false, true); $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0); $ID = 'foo'; - $sidebar = tpl_sidebar(false); + $sidebar = tpl_include_page('sidebar', false, true); $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0); saveWikiText('foo:bar:sidebar', 'bottomsidebar-test', ''); $ID = 'foo:bar:baz:test'; - $sidebar = tpl_sidebar(false); + $sidebar = tpl_include_page('sidebar', false, true); $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0); $ID = 'foo:bar:test'; - $sidebar = tpl_sidebar(false); + $sidebar = tpl_include_page('sidebar', false, true); $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0); $ID = 'foo'; - $sidebar = tpl_sidebar(false); + $sidebar = tpl_include_page('sidebar', false, true); $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0); } diff --git a/bin/striplangs.php b/bin/striplangs.php index 40cef5063..40cef5063 100644..100755 --- a/bin/striplangs.php +++ b/bin/striplangs.php diff --git a/conf/acronyms.conf b/conf/acronyms.conf index 058e85550..66f563bd2 100644 --- a/conf/acronyms.conf +++ b/conf/acronyms.conf @@ -90,8 +90,6 @@ OTOH On the other hand P2P Peer to Peer PDA Personal Digital Assistant PDF Portable Document Format -Perl Practical Extraction and Report Language -PERL Practical Extraction and Report Language PHP Hypertext Preprocessor PICS Platform for Internet Content Selection PIN Personal Identification Number diff --git a/data/deleted.files b/data/deleted.files index e13ecd35c..fada1f29e 100644 --- a/data/deleted.files +++ b/data/deleted.files @@ -5,18 +5,9 @@ # http://www.dokuwiki.org/install:upgrade#files_to_remove # removed in 2012-09-10 -lib/images/arrow_down.gif -lib/images/arrow_up.gif -lib/images/at.gif -lib/images/close.png -lib/images/del.png -lib/images/edit.gif lib/images/icon-file.png lib/images/icon-thumb.png lib/images/interwiki/skype.png -lib/images/list-minus.gif -lib/images/list-plus.gif -lib/images/pencil.png lib/plugins/acl/rtl.css lib/plugins/config/rtl.css lib/plugins/plugin/rtl.css @@ -9,7 +9,7 @@ */ // update message version -$updateVersion = 37; +$updateVersion = 38; // xdebug_start_profiling(); diff --git a/inc/TarLib.class.php b/inc/TarLib.class.php index 126604cd1..e04c47cb8 100644 --- a/inc/TarLib.class.php +++ b/inc/TarLib.class.php @@ -13,7 +13,6 @@ * @author Christopher Smith <chris@jalakai.co.uk> */ - /** * Those constants represent the compression method to use. * COMPRESS_GZIP is used for the GZIP compression; COMPRESS_BZIP for @@ -68,15 +67,15 @@ class TarLib { var $_result; var $_initerror; - const COMPRESS_GZIP = 1; - const COMPRESS_BZIP = 2; - const COMPRESS_AUTO = 3; - const COMPRESS_NONE = 0; - const TARLIB_VERSION = '1.2'; - const FULL_ARCHIVE = -1; - const ARCHIVE_DYNAMIC = 0; + const COMPRESS_GZIP = 1; + const COMPRESS_BZIP = 2; + const COMPRESS_AUTO = 3; + const COMPRESS_NONE = 0; + const TARLIB_VERSION = '1.2'; + const FULL_ARCHIVE = -1; + const ARCHIVE_DYNAMIC = 0; const ARCHIVE_RENAMECOMP = 5; - const COMPRESS_DETECT = -1; + const COMPRESS_DETECT = -1; /** * constructor, initialize the class @@ -108,21 +107,21 @@ class TarLib { * represent the GZIP or BZIP compression level. 1 produce fast compression, * and 9 produce smaller files. See the RFC 1952 for more infos. */ - function __construct($p_filen = TarLib::ARCHIVE_DYNAMIC , $p_comptype = TarLib::COMPRESS_AUTO, $p_complevel = 9) { + function __construct($p_filen = TarLib::ARCHIVE_DYNAMIC, $p_comptype = TarLib::COMPRESS_AUTO, $p_complevel = 9) { $this->_initerror = 0; - $this->_nomf = $p_filen; - $flag=0; - if($p_comptype && $p_comptype % 5 == 0){ + $this->_nomf = $p_filen; + $flag = 0; + if($p_comptype && $p_comptype % 5 == 0) { $p_comptype /= TarLib::ARCHIVE_RENAMECOMP; - $flag=1; + $flag = 1; } if($p_complevel > 0 && $p_complevel <= 9) $this->_compzlevel = $p_complevel; - else $p_complevel = 9; + else $this->_compzlevel = 9; if($p_comptype == TarLib::COMPRESS_DETECT) { - if(strtolower(substr($p_filen,-3)) == '.gz') $p_comptype = TarLib::COMPRESS_GZIP; - elseif(strtolower(substr($p_filen,-4)) == '.bz2') $p_comptype = TarLib::COMPRESS_BZIP; + if(strtolower(substr($p_filen, -3)) == '.gz') $p_comptype = TarLib::COMPRESS_GZIP; + elseif(strtolower(substr($p_filen, -4)) == '.bz2') $p_comptype = TarLib::COMPRESS_BZIP; else $p_comptype = TarLib::COMPRESS_NONE; } @@ -152,7 +151,7 @@ class TarLib { if($this->_initerror < 0) $this->_comptype = TarLib::COMPRESS_NONE; - if($flag) $this->_nomf.= '.'.$this->getCompression(1); + if($flag) $this->_nomf .= '.'.$this->getCompression(1); $this->_result = true; } @@ -162,9 +161,9 @@ class TarLib { * This function does exactly the same as TarLib (constructor), except it * returns a status code. */ - function setArchive($p_name='', $p_comp = TarLib::COMPRESS_AUTO, $p_level=9) { + function setArchive($p_name = '', $p_comp = TarLib::COMPRESS_AUTO, $p_level = 9) { $this->_CompTar(); - $this->TarLib($p_name, $p_comp, $p_level); + $this->__construct($p_name, $p_comp, $p_level); return $this->_result; } @@ -186,7 +185,7 @@ class TarLib { * MaxgTar Constants */ function getCompression($ext = false) { - $exts = Array('tar','tar.gz','tar.bz2'); + $exts = Array('tar', 'tar.gz', 'tar.bz2'); if($ext) return $exts[$this->_comptype]; return $this->_comptype; } @@ -263,8 +262,10 @@ class TarLib { if(!$archive && !$this->_memdat) return -10; if(!$name) $name = utf8_basename($this->_nomf); - if($archive){ if(!file_exists($archive)) return -11; } - else $decoded = $this->getDynamicArchive(); + if($archive) { + if(!file_exists($archive)) return -11; + } + $decoded = $this->getDynamicArchive(); if($headers) { header('Content-Type: application/x-gtar'); @@ -274,10 +275,10 @@ class TarLib { } if($archive) { - $fp = @fopen($archive,'rb'); + $fp = @fopen($archive, 'rb'); if(!$fp) return -4; - while(!feof($fp)) echo fread($fp,2048); + while(!feof($fp)) echo fread($fp, 2048); } else { echo $decoded; } @@ -311,10 +312,10 @@ class TarLib { * permission in octal mode (prefixed with a 0) that will be given on each * extracted file. */ - function Extract($p_what = TarLib::FULL_ARCHIVE, $p_to = '.', $p_remdir='', $p_mode = 0755) { + function Extract($p_what = TarLib::FULL_ARCHIVE, $p_to = '.', $p_remdir = '', $p_mode = 0755) { if(!$this->_OpenRead()) return -4; // if(!@is_dir($p_to)) if(!@mkdir($p_to, 0777)) return -8; --CS - if(!@is_dir($p_to)) if(!$this->_dirApp($p_to)) return -8; //--CS (route through correct dir fn) + if(!@is_dir($p_to)) if(!$this->_dirApp($p_to)) return -8; //--CS (route through correct dir fn) $ok = $this->_extractList($p_to, $p_what, $p_remdir, $p_mode); $this->_CompTar(); @@ -327,21 +328,20 @@ class TarLib { * * This function will attempt to create a new archive with global headers * then add the given files into. If the archive is a real file, the - * contents are written directly into the file, if it is a dynamic archive + * contents are written directly into the file. If it is a dynamic archive, * contents are only stored in memory. This function should not be used to * add files to an existing archive, you should use Add() instead. * - * The FileList actually supports three different modes : + * The FileList actually supports three different modes: * * - You can pass a string containing filenames separated by pipes '|'. - * In this case the file are read from the webserver filesystem and the - * root folder is the folder where the script using the MaxgTar is called. + * In this case thes file are read from the filesystem and the root folder + * is the folder running script located. NOT RECOMMENDED * - * - You can also give a unidimensional indexed array containing the - * filenames. The behaviour for the content reading is the same that a - * '|'ed string. + * - You can also give an indexed array containing the filenames. The + * behaviour for the content reading is the same as above. * - * - The more useful usage is to pass bidimensional arrays, where the + * - You can pass an array of arrays. For each file use an array where the * first element contains the filename and the second contains the file * contents. You can even add empty folders to the package if the filename * has a leading '/'. Once again, have a look at the exemples to understand @@ -357,15 +357,15 @@ class TarLib { * to the file you store. Note also that the RemovePath is applied before the * AddPath is added, so it HAS a sense to use both parameters together. */ - function Create($p_filelist,$p_add='',$p_rem='') { + function Create($p_filelist, $p_add = '', $p_rem = '') { if(!$fl = $this->_fetchFilelist($p_filelist)) return -5; if(!$this->_OpenWrite()) return -6; - $ok = $this->_addFileList($fl,$p_add,$p_rem); + $ok = $this->_addFileList($fl, $p_add, $p_rem); - if($ok){ + if($ok) { $this->_writeFooter(); - }else{ + } else { $this->_CompTar(); @unlink($this->_nomf); } @@ -376,18 +376,26 @@ class TarLib { /** * Add files to an existing package. * - * This function does exactly the same than Create() exept it - * will append the given files at the end of the archive. Please not the is - * safe to call Add() on a newly created archive whereas the - * contrary will fail ! + * This function does exactly the same as Create() exept it + * will append the given files at the end of the archive. + * + * Note: This is only supported for dynamic in memory files and uncompressed + * tar files * * This function returns a status code, you can use TarErrorStr() on * it to get the human-readable description of the error. */ function Add($p_filelist, $p_add = '', $p_rem = '') { - if (($this->_nomf != TarLib::ARCHIVE_DYNAMIC && @is_file($this->_nomf)) || - ($this->_nomf == TarLib::ARCHIVE_DYNAMIC && !$this->_memdat)){ - return $this->Create($p_filelist, $p_add, $p_rem); + if($this->_nomf !== TarLib::ARCHIVE_DYNAMIC && + $this->_comptype !== TarLib::COMPRESS_NONE + ) { + return -12; + } + + if(($this->_nomf !== TarLib::ARCHIVE_DYNAMIC && !$this->_fp) || + ($this->_nomf === TarLib::ARCHIVE_DYNAMIC && !$this->_memdat) + ) { + return $this->Create($p_filelist, $p_add, $p_rem); } if(!$fl = $this->_fetchFilelist($p_filelist)) return -5; @@ -419,15 +427,15 @@ class TarLib { $result = Array(); - while ($dat = $this->_read(512)) { + while($dat = $this->_read(512)) { $dat = $this->_readHeader($dat); if(!is_array($dat)) continue; - $this->_seek(ceil($dat['size']/512)*512,1); + $this->_seek(ceil($dat['size'] / 512) * 512, 1); $result[] = $dat; } - return $result; + return $result; } /** @@ -439,35 +447,48 @@ class TarLib { */ function TarErrorStr($i) { $ecodes = Array( - 1 => true, - 0 => "Undocumented error", - -1 => "Can't use COMPRESS_GZIP compression : ZLIB extensions are not loaded !", - -2 => "Can't use COMPRESS_BZIP compression : BZ2 extensions are not loaded !", - -3 => "You must set a archive file to read the contents !", - -4 => "Can't open the archive file for read !", - -5 => "Invalide file list !", - -6 => "Can't open the archive in write mode !", - -7 => "There is no ARCHIVE_DYNAMIC to write !", - -8 => "Can't create the directory to extract files !", - -9 => "Please pass a archive name to send if you made created an ARCHIVE_DYNAMIC !", - -10 => "You didn't pass an archive filename and there is no stored ARCHIVE_DYNAMIC !", - -11 => "Given archive doesn't exist !" - ); + 1 => true, + 0 => "Undocumented error", + -1 => "Can't use COMPRESS_GZIP compression : ZLIB extensions are not loaded !", + -2 => "Can't use COMPRESS_BZIP compression : BZ2 extensions are not loaded !", + -3 => "You must set a archive file to read the contents !", + -4 => "Can't open the archive file for read !", + -5 => "Invalide file list !", + -6 => "Can't open the archive in write mode !", + -7 => "There is no ARCHIVE_DYNAMIC to write !", + -8 => "Can't create the directory to extract files !", + -9 => "Please pass a archive name to send if you made created an ARCHIVE_DYNAMIC !", + -10 => "You didn't pass an archive filename and there is no stored ARCHIVE_DYNAMIC !", + -11 => "Given archive doesn't exist !", + -12 => "Appending not supported for compressed files" + ); return isset($ecodes[$i]) ? $ecodes[$i] : $ecodes[0]; } - function _seek($p_flen, $tell=0) { + /** + * Seek in the data stream + * + * @todo probably broken for bzip tars + * @param int $p_flen seek to this position + * @param bool $tell seek from current position? + */ + function _seek($p_flen, $tell = false) { if($this->_nomf === TarLib::ARCHIVE_DYNAMIC) - $this->_memdat=substr($this->_memdat,0,($tell ? strlen($this->_memdat) : 0) + $p_flen); + $this->_memdat = substr($this->_memdat, 0, ($tell ? strlen($this->_memdat) : 0) + $p_flen); elseif($this->_comptype == TarLib::COMPRESS_GZIP) - @gzseek($this->_fp, ($tell ? @gztell($this->_fp) : 0)+$p_flen); + @gzseek($this->_fp, ($tell ? @gztell($this->_fp) : 0) + $p_flen); elseif($this->_comptype == TarLib::COMPRESS_BZIP) - @fseek($this->_fp, ($tell ? @ftell($this->_fp) : 0)+$p_flen); + @fseek($this->_fp, ($tell ? @ftell($this->_fp) : 0) + $p_flen); else - @fseek($this->_fp, ($tell ? @ftell($this->_fp) : 0)+$p_flen); + @fseek($this->_fp, ($tell ? @ftell($this->_fp) : 0) + $p_flen); } + /** + * Open the archive for reading + * + * @return bool true if succesfull + */ function _OpenRead() { if($this->_comptype == TarLib::COMPRESS_GZIP) $this->_fp = @gzopen($this->_nomf, 'rb'); @@ -479,6 +500,12 @@ class TarLib { return ($this->_fp ? true : false); } + /** + * Open the archive for writing + * + * @param string $add filemode + * @return bool true on success + */ function _OpenWrite($add = 'w') { if($this->_nomf === TarLib::ARCHIVE_DYNAMIC) return true; @@ -492,6 +519,9 @@ class TarLib { return ($this->_fp ? true : false); } + /** + * Closes the open file pointer + */ function _CompTar() { if($this->_nomf === TarLib::ARCHIVE_DYNAMIC || !$this->_fp) return; @@ -500,27 +530,46 @@ class TarLib { else @fclose($this->_fp); } + /** + * Read from the open file pointer + * + * @param int $p_len bytes to read + * @return string + */ function _read($p_len) { if($this->_comptype == TarLib::COMPRESS_GZIP) - return @gzread($this->_fp,$p_len); + return @gzread($this->_fp, $p_len); elseif($this->_comptype == TarLib::COMPRESS_BZIP) - return @bzread($this->_fp,$p_len); + return @bzread($this->_fp, $p_len); else - return @fread($this->_fp,$p_len); + return @fread($this->_fp, $p_len); } + /** + * Write to the open filepointer or memory + * + * @param string $p_data + * @return int + */ function _write($p_data) { - if($this->_nomf === TarLib::ARCHIVE_DYNAMIC) $this->_memdat .= $p_data; - elseif($this->_comptype == TarLib::COMPRESS_GZIP) - return @gzwrite($this->_fp,$p_data); - - elseif($this->_comptype == TarLib::COMPRESS_BZIP) - return @bzwrite($this->_fp,$p_data); - - else - return @fwrite($this->_fp,$p_data); + if($this->_nomf === TarLib::ARCHIVE_DYNAMIC) { + $this->_memdat .= $p_data; + return strlen($p_data); + } elseif($this->_comptype == TarLib::COMPRESS_GZIP) { + return @gzwrite($this->_fp, $p_data); + } elseif($this->_comptype == TarLib::COMPRESS_BZIP) { + return @bzwrite($this->_fp, $p_data); + } else { + return @fwrite($this->_fp, $p_data); + } } + /** + * Compress given data according to the set compression method + * + * @param $p_dat + * @return string + */ function _encode($p_dat) { if($this->_comptype == TarLib::COMPRESS_GZIP) return gzencode($p_dat, $this->_compzlevel); @@ -529,55 +578,77 @@ class TarLib { else return $p_dat; } + /** + * Decode the given tar file header + * + * @param $p_dat + * @return array|bool + */ function _readHeader($p_dat) { - if (!$p_dat || strlen($p_dat) != 512) return false; + if(!$p_dat || strlen($p_dat) != 512) return false; - for ($i=0, $chks=0; $i<148; $i++) + for($i = 0, $chks = 0; $i < 148; $i++) $chks += ord($p_dat[$i]); - for ($i=156,$chks+=256; $i<512; $i++) + for($i = 156, $chks += 256; $i < 512; $i++) $chks += ord($p_dat[$i]); $headers = @unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1typeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor", $p_dat); if(!$headers) return false; $return['checksum'] = OctDec(trim($headers['checksum'])); - if ($return['checksum'] != $chks) return false; + if($return['checksum'] != $chks) return false; $return['filename'] = trim($headers['filename']); - $return['mode'] = OctDec(trim($headers['mode'])); - $return['uid'] = OctDec(trim($headers['uid'])); - $return['gid'] = OctDec(trim($headers['gid'])); - $return['size'] = OctDec(trim($headers['size'])); - $return['mtime'] = OctDec(trim($headers['mtime'])); + $return['mode'] = OctDec(trim($headers['mode'])); + $return['uid'] = OctDec(trim($headers['uid'])); + $return['gid'] = OctDec(trim($headers['gid'])); + $return['size'] = OctDec(trim($headers['size'])); + $return['mtime'] = OctDec(trim($headers['mtime'])); $return['typeflag'] = $headers['typeflag']; - $return['link'] = trim($headers['link']); - $return['uname'] = trim($headers['uname']); - $return['gname'] = trim($headers['gname']); + $return['link'] = trim($headers['link']); + $return['uname'] = trim($headers['uname']); + $return['gname'] = trim($headers['gname']); return $return; } + /** + * Builds a normalized file list + * + * @todo remove string support, use saner format + * + * @param $p_filelist + * @return array|bool + */ function _fetchFilelist($p_filelist) { if(!$p_filelist || (is_array($p_filelist) && !@count($p_filelist))) return false; if(is_string($p_filelist)) { - $p_filelist = explode('|',$p_filelist); + $p_filelist = explode('|', $p_filelist); if(!is_array($p_filelist)) $p_filelist = Array($p_filelist); } return $p_filelist; } + /** + * Adds files given as file list + * + * @param array $p_fl + * @param string $p_addir + * @param string $p_remdir + * @return bool + */ function _addFileList($p_fl, $p_addir, $p_remdir) { foreach($p_fl as $file) { - if(($file == $this->_nomf && $this->_nomf != TarLib::ARCHIVE_DYNAMIC) || !$file || (!file_exists($file) && !is_array($file))) + if(($file == $this->_nomf && $this->_nomf !== TarLib::ARCHIVE_DYNAMIC) || !$file || (!is_array($file) && !file_exists($file))) continue; - if (!$this->_addFile($file, $p_addir, $p_remdir)) + if(!$this->_addFile($file, $p_addir, $p_remdir)) continue; - if (@is_dir($file)) { + if(@is_dir($file)) { $d = @opendir($file); if(!$d) continue; @@ -592,26 +663,36 @@ class TarLib { } closedir($d); - unset($tmplist,$f); + unset($tmplist, $f); } } return true; } + /** + * Adds a single file + * + * @param array|string $p_fn + * @param string $p_addir + * @param string $p_remdir + * @return bool + */ function _addFile($p_fn, $p_addir = '', $p_remdir = '') { + $data = false; if(is_array($p_fn)) list($p_fn, $data) = $p_fn; $sname = $p_fn; if($p_remdir) { - if(substr($p_remdir,-1) != '/') $p_remdir .= "/"; + if(substr($p_remdir, -1) != '/') $p_remdir .= "/"; if(substr($sname, 0, strlen($p_remdir)) == $p_remdir) $sname = substr($sname, strlen($p_remdir)); } - if($p_addir) $sname = $p_addir.(substr($p_addir,-1) == '/' ? '' : "/").$sname; + if($p_addir) $sname = $p_addir.(substr($p_addir, -1) == '/' ? '' : "/").$sname; - if(strlen($sname) > 99) return; + // FIXME ustar should support up 256 chars + if(strlen($sname) > 99) return false; if(@is_dir($p_fn)) { if(!$this->_writeFileHeader($p_fn, $sname)) return false; @@ -625,14 +706,14 @@ class TarLib { if(!$data) { while(!feof($fp)) { - $packed = pack("a512", fread($fp,512)); + $packed = pack("a512", fread($fp, 512)); $this->_write($packed); } fclose($fp); } else { $len = strlen($data); - for($s = 0; $s < $len; $s += 512){ - $this->_write(pack("a512",substr($data,$s,512))); + for($s = 0; $s < $len; $s += 512) { + $this->_write(pack("a512", substr($data, $s, 512))); } } } @@ -640,53 +721,70 @@ class TarLib { return true; } - function _writeFileHeader($p_file, $p_sname, $p_data=false) { + /** + * Write the header for a file in the TAR archive + * + * @param string $p_file + * @param string $p_sname + * @param bool $p_data + * @return bool + */ + function _writeFileHeader($p_file, $p_sname, $p_data = false) { if(!$p_data) { - if (!$p_sname) $p_sname = $p_file; + if(!$p_sname) $p_sname = $p_file; $p_sname = $this->_pathTrans($p_sname); $h_info = stat($p_file); - $h[0] = sprintf("%6s ", DecOct($h_info[4])); - $h[] = sprintf("%6s ", DecOct($h_info[5])); - $h[] = sprintf("%6s ", DecOct(fileperms($p_file))); + $h[0] = sprintf("%6s ", DecOct($h_info[4])); + $h[] = sprintf("%6s ", DecOct($h_info[5])); + $h[] = sprintf("%6s ", DecOct(fileperms($p_file))); clearstatcache(); $h[] = sprintf("%11s ", DecOct(filesize($p_file))); $h[] = sprintf("%11s", DecOct(filemtime($p_file))); $dir = @is_dir($p_file) ? '5' : ''; } else { - $dir = ''; + $dir = ''; $p_data = sprintf("%11s ", DecOct($p_data)); - $time = sprintf("%11s ", DecOct(time())); - $h = Array(" 0 "," 0 "," 40777 ",$p_data,$time); + $time = sprintf("%11s ", DecOct(time())); + $h = Array(" 0 ", " 0 ", " 40777 ", $p_data, $time); } $data_first = pack("a100a8a8a8a12A12", $p_sname, $h[2], $h[0], $h[1], $h[3], $h[4]); - $data_last = pack("a1a100a6a2a32a32a8a8a155a12", $dir, '', '', '', '', '', '', '', '', ""); + $data_last = pack("a1a100a6a2a32a32a8a8a155a12", $dir, '', '', '', '', '', '', '', '', ""); - for ($i=0,$chks=0; $i<148; $i++) + for($i = 0, $chks = 0; $i < 148; $i++) $chks += ord($data_first[$i]); - for ($i=156, $chks+=256, $j=0; $i<512; $i++, $j++) + for($i = 156, $chks += 256, $j = 0; $i < 512; $i++, $j++) $chks += ord($data_last[$j]); $this->_write($data_first); - $chks = pack("a8",sprintf("%6s ", DecOct($chks))); + $chks = pack("a8", sprintf("%6s ", DecOct($chks))); $this->_write($chks.$data_last); return true; } - function _append($p_filelist, $p_addir="", $p_remdir="") { + /** + * Append the given files to the already open archive + * + * @param array $p_filelist + * @param string $p_addir + * @param string $p_remdir + * @return bool|int + */ + function _append($p_filelist, $p_addir = "", $p_remdir = "") { if(!$this->_fp) if(!$this->_OpenWrite('a')) return -6; - if($this->_nomf == TarLib::ARCHIVE_DYNAMIC) { - $s = strlen($this->_memdat); - $this->_memdat = substr($this->_memdat,0,-512); + if($this->_nomf === TarLib::ARCHIVE_DYNAMIC) { + $this->_memdat = substr($this->_memdat, 0, -512 * 2); // remove footer } else { + clearstatcache(); $s = filesize($this->_nomf); - $this->_seek($s-512); + + $this->_seek($s - (512 * 2)); // remove footer } $ok = $this->_addFileList($p_filelist, $p_addir, $p_remdir); @@ -695,48 +793,70 @@ class TarLib { return $ok; } + /** + * Cleans up a path and removes relative parts + * + * @param string $p_dir + * @return string + */ function _pathTrans($p_dir) { - if ($p_dir) { + $r = ''; + if($p_dir) { $subf = explode("/", $p_dir); - $r=''; - for ($i=count($subf)-1; $i>=0; $i--) { - if ($subf[$i] == ".") { + for($i = count($subf) - 1; $i >= 0; $i--) { + if($subf[$i] == ".") { # do nothing - } elseif ($subf[$i] == "..") { + } elseif($subf[$i] == "..") { $i--; - } elseif (!$subf[$i] && $i!=count($subf)-1 && $i) { + } elseif(!$subf[$i] && $i != count($subf) - 1 && $i) { # do nothing } else { - $r = $subf[$i].($i!=(count($subf)-1) ? "/".$r : ""); + $r = $subf[$i].($i != (count($subf) - 1) ? "/".$r : ""); } } } return $r; } + /** + * Add the closing footer to the archive + * + * Physically, an archive consists of a series of file entries terminated by an end-of-archive entry, which + * consists of two 512 blocks of zero bytes + * + * @link http://www.gnu.org/software/tar/manual/html_chapter/tar_8.html#SEC134 + */ function _writeFooter() { $this->_write(pack("a512", "")); + $this->_write(pack("a512", "")); } + /** + * @param $p_to + * @param $p_files + * @param $p_remdir + * @param int $p_mode + * @return array|bool|int|string + */ function _extractList($p_to, $p_files, $p_remdir, $p_mode = 0755) { - if (!$p_to || ($p_to[0]!="/"&&substr($p_to,0,3)!="../"&&substr($p_to,1,3)!=":\\"&&substr($p_to,1,2)!=":/")) /*" // <- PHP Coder bug */ + if(!$p_to || ($p_to[0] != "/" && substr($p_to, 0, 3) != "../" && substr($p_to, 1, 3) != ":\\" && substr($p_to, 1, 2) != ":/")) /*" // <- PHP Coder bug */ $p_to = "./$p_to"; - if ($p_remdir && substr($p_remdir,-1)!='/') $p_remdir .= '/'; + if($p_remdir && substr($p_remdir, -1) != '/') $p_remdir .= '/'; $p_remdirs = strlen($p_remdir); while($dat = $this->_read(512)) { $headers = $this->_readHeader($dat); if(!$headers['filename']) continue; - if($p_files == -1 || $p_files[0] == -1){ + if($p_files == -1 || $p_files[0] == -1) { $extract = true; } else { $extract = false; foreach($p_files as $f) { - if(substr($f,-1) == "/") { - if((strlen($headers['filename']) > strlen($f)) && (substr($headers['filename'],0,strlen($f))==$f)) { + if(substr($f, -1) == "/") { + if((strlen($headers['filename']) > strlen($f)) && (substr($headers['filename'], 0, strlen($f)) == $f)) { $extract = true; break; } @@ -747,15 +867,15 @@ class TarLib { } } - if ($extract) { + if($extract) { $det[] = $headers; - if ($p_remdir && substr($headers['filename'],0,$p_remdirs)==$p_remdir) - $headers['filename'] = substr($headers['filename'],$p_remdirs); + if($p_remdir && substr($headers['filename'], 0, $p_remdirs) == $p_remdir) + $headers['filename'] = substr($headers['filename'], $p_remdirs); - if($headers['filename'].'/' == $p_remdir && $headers['typeflag']=='5') continue; + if($headers['filename'].'/' == $p_remdir && $headers['typeflag'] == '5') continue; - if ($p_to != "./" && $p_to != "/") { - while($p_to{-1}=="/") $p_to = substr($p_to,0,-1); + if($p_to != "./" && $p_to != "/") { + while($p_to{-1} == "/") $p_to = substr($p_to, 0, -1); if($headers['filename']{0} == "/") $headers['filename'] = $p_to.$headers['filename']; @@ -763,29 +883,35 @@ class TarLib { $headers['filename'] = $p_to."/".$headers['filename']; } - $ok = $this->_dirApp($headers['typeflag']=="5" ? $headers['filename'] : dirname($headers['filename'])); + $ok = $this->_dirApp($headers['typeflag'] == "5" ? $headers['filename'] : dirname($headers['filename'])); if($ok < 0) return $ok; - if (!$headers['typeflag']) { - if (!$fp = @fopen($headers['filename'], "wb")) return -6; - $n = floor($headers['size']/512); + if(!$headers['typeflag']) { + if(!$fp = @fopen($headers['filename'], "wb")) return -6; + $n = floor($headers['size'] / 512); - for ($i=0; $i<$n; $i++){ - fwrite($fp, $this->_read(512),512); + for($i = 0; $i < $n; $i++) { + fwrite($fp, $this->_read(512), 512); } - if (($headers['size'] % 512) != 0) fwrite($fp, $this->_read(512), $headers['size'] % 512); + if(($headers['size'] % 512) != 0) fwrite($fp, $this->_read(512), $headers['size'] % 512); fclose($fp); touch($headers['filename'], $headers['mtime']); chmod($headers['filename'], $p_mode); } else { - $this->_seek(ceil($headers['size']/512)*512,1); + $this->_seek(ceil($headers['size'] / 512) * 512, 1); } - }else $this->_seek(ceil($headers['size']/512)*512,1); + } else $this->_seek(ceil($headers['size'] / 512) * 512, 1); } return $det; } + /** + * Create a directory hierarchy in filesystem + * + * @param string $d + * @return bool + */ function _dirApp($d) { // map to dokuwiki function (its more robust) return io_mkdir_p($d); diff --git a/inc/auth.php b/inc/auth.php index 3fe465cbb..76356c37f 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -300,7 +300,7 @@ function auth_createToken() { * * This is neither unique nor unfakable - still it adds some * security. Using the first part of the IP makes sure - * proxy farms like AOLs are stil okay. + * proxy farms like AOLs are still okay. * * @author Andreas Gohr <andi@splitbrain.org> * @@ -314,6 +314,7 @@ function auth_browseruid() { $uid .= $_SERVER['HTTP_ACCEPT_LANGUAGE']; $uid .= $_SERVER['HTTP_ACCEPT_CHARSET']; $uid .= substr($ip, 0, strpos($ip, '.')); + $uid = strtolower($uid); return md5($uid); } diff --git a/inc/lang/en/preview.txt b/inc/lang/en/preview.txt index 16c96c5d7..5ca69694d 100644 --- a/inc/lang/en/preview.txt +++ b/inc/lang/en/preview.txt @@ -1,4 +1,4 @@ ====== Preview ====== -This is a preview of how your text will look like. Remember: It is **not saved** yet! +This is a preview of what your text will look like. Remember: It is **not saved** yet! diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 95b1af43e..4c15877e3 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -27,6 +27,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; diff --git a/inc/lang/es/subscr_single.txt b/inc/lang/es/subscr_single.txt index e2a54c79f..abddeeb21 100644 --- a/inc/lang/es/subscr_single.txt +++ b/inc/lang/es/subscr_single.txt @@ -1,7 +1,7 @@ Hola! La página @PAGE@ en @TITLE@ wiki ha cambiado. -Estos son los cambioss: +Estos son los cambios: -------------------------------------------------------- @DIFF@ @@ -9,7 +9,7 @@ Estos son los cambioss: Fecha : @DATE@ Usuario : @USER@ -Resúmen de edición: @SUMMARY@ +Resumen de edición: @SUMMARY@ Revisión Anterior: @OLDPAGE@ Nueva Revisión: @NEWPAGE@ diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index f7a517fe4..59d9d86fb 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -5,6 +5,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Xabi Ezpeleta <xezpeleta@mendikute.com> * @author Inko Illarramendi <inko.i.a@gmail.com> + * @author Zigor Astarbe <astarbe@gmail.com> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -40,11 +41,14 @@ $lang['btn_backtomedia'] = 'Atzera Multimedia Fitxategiaren Aukeraketara'; $lang['btn_subscribe'] = 'Harpidetu Orri Aldaketetara'; $lang['btn_profile'] = 'Eguneratu Profila '; $lang['btn_reset'] = 'Aldaketak Desegin'; +$lang['btn_resendpwd'] = 'Pasahitza berria ezarri'; $lang['btn_draft'] = 'Editatu zirriborroa'; $lang['btn_recover'] = 'Berreskuratu zirriborroa'; $lang['btn_draftdel'] = 'Ezabatu zirriborroa'; $lang['btn_revert'] = 'Berrezarri'; $lang['btn_register'] = 'Erregistratu'; +$lang['btn_apply'] = 'Baieztatu'; +$lang['btn_media'] = 'Media Kudeatzailea'; $lang['loggedinas'] = 'Erabiltzailea'; $lang['user'] = 'Erabiltzailea'; $lang['pass'] = 'Pasahitza'; @@ -74,6 +78,7 @@ $lang['profnoempty'] = 'Izen edota e-posta hutsa ez dago onartua.'; $lang['profchanged'] = 'Erabiltzaile profila arrakastaz eguneratua.'; $lang['pwdforget'] = 'Pasahitza ahaztu duzu? Eskuratu berri bat'; $lang['resendna'] = 'Wiki honek ez du pasahitz berbidalketa onartzen.'; +$lang['resendpwd'] = '-entzat pasahitza berria ezarri'; $lang['resendpwdmissing'] = 'Barkatu, eremu guztiak bete behar dituzu.'; $lang['resendpwdnouser'] = 'Barkatu, ez dugu erabiltzaile hori datu-basean aurkitzen'; $lang['resendpwdbadauth'] = 'Barkatu, kautotze kodea ez da baliozkoa. Ziurtatu baieztapen esteka osoa erabili duzula.'; @@ -88,7 +93,7 @@ $lang['txt_filename'] = 'Idatzi wikiname-a (aukerazkoa)'; $lang['txt_overwrt'] = 'Oraingo fitxategiaren gainean idatzi'; $lang['lockedby'] = 'Momentu honetan blokeatzen:'; $lang['lockexpire'] = 'Blokeaketa iraungitzen da:'; -$lang['js']['willexpire'] = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.'; +$lang['js']['willexpire'] = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.'; $lang['js']['notsavedyet'] = 'Gorde gabeko aldaketak galdu egingo dira. Benetan jarraitu nahi duzu?'; $lang['js']['searchmedia'] = 'Bilatu fitxategiak'; @@ -120,6 +125,15 @@ Esteka kopiatu eta itsatsi dezakezu dena den.'; $lang['js']['linkwiz'] = 'Estekatze Laguntzailea'; $lang['js']['linkto'] = 'Estekatu hona:'; $lang['js']['del_confirm'] = 'Benetan ezabatu aukeratutako fitxategia(k)?'; +$lang['js']['restore_confirm'] = 'Benetan bertsio hau berrezarri?'; +$lang['js']['media_diff'] = 'Diferentziak ikusi:'; +$lang['js']['media_diff_both'] = 'Ondoz ondo'; +$lang['js']['media_select'] = 'Fitxategiak hautatu'; +$lang['js']['media_upload_btn'] = 'Igo'; +$lang['js']['media_done_btn'] = 'Egina'; +$lang['js']['media_drop'] = 'Fitxategiak igotzeko hona bota'; +$lang['js']['media_cancel'] = 'ezabatu'; +$lang['js']['media_overwrt'] = 'Dauden fitxategiak berridatzi'; $lang['rssfailed'] = 'Errorea gertatu da feed hau irakurtzean:'; $lang['nothingfound'] = 'Ez da ezer aurkitu.'; $lang['mediaselect'] = 'Aukeratu Multimedia fitxategia'; @@ -169,11 +183,21 @@ $lang['external_edit'] = 'kanpoko aldaketa'; $lang['summary'] = 'Aldatu laburpena'; $lang['noflash'] = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> beharrezkoa da eduki hau bistaratzeko.'; $lang['download'] = 'Deskarga Snippet-a'; +$lang['tools'] = 'Tresnak'; +$lang['user_tools'] = 'Erabiltzaile Tresnak'; +$lang['site_tools'] = 'Gune Tresnak'; +$lang['page_tools'] = 'Orri Tresnak'; +$lang['skip_to_content'] = 'edukira sahiestu'; +$lang['sidebar'] = 'Alboko-barra'; $lang['mail_newpage'] = '[DokuWiki] gehitutako orria:'; $lang['mail_changed'] = '[DokuWiki] aldatutako orria:'; $lang['mail_subscribe_list'] = 'izen-espazioan aldatutako orriak:'; $lang['mail_new_user'] = 'erabiltzaile berria:'; $lang['mail_upload'] = 'fitxategia igota:'; +$lang['changes_type'] = '-ren aldaketak ikusi'; +$lang['pages_changes'] = 'Orriak'; +$lang['media_changes'] = 'Media fitxategiak'; +$lang['both_changes'] = 'Bai orriak nahiz media fitxategiak'; $lang['qb_bold'] = 'Letra beltzez'; $lang['qb_italic'] = 'Letra italiarrez'; $lang['qb_underl'] = 'Azpimarratua'; @@ -214,6 +238,9 @@ $lang['img_copyr'] = 'Copyright'; $lang['img_format'] = 'Formatua'; $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Hitz-gakoak'; +$lang['img_width'] = 'Zabalera'; +$lang['img_height'] = 'Altuera'; +$lang['img_manager'] = 'Media kudeatzailean ikusi'; $lang['subscr_subscribe_success'] = '%s gehitua %s-ren harpidetza zerrendara'; $lang['subscr_subscribe_error'] = 'Errorea %s gehitzen %s-ren harpidetza zerrendara'; $lang['subscr_subscribe_noaddress'] = 'Ez dago helbiderik zure login-arekin lotuta, ezin zara harpidetza zerrendara gehitua izan.'; @@ -232,6 +259,7 @@ $lang['subscr_style_digest'] = 'e-posta laburbildua orri bakoitzeko aldaketent $lang['subscr_style_list'] = 'aldatutako orrien zerrenda azken e-postatik (%.2f egunero)'; $lang['authmodfailed'] = 'Erabiltzaile kautotzearen konfigurazioa okerra da. Mesedez, eman honen berri Wiki administratzaileari'; $lang['authtempfail'] = 'Erabiltzaile kautotzea denboraldi batez ez dago erabilgarri. Egoerak hala jarraitzen badu, mesedez, eman honen berri Wiki administratzaileari'; +$lang['authpwdexpire'] = 'Zure pasahitza %d egun barru iraungiko da, laster aldatu beharko zenuke.'; $lang['i_chooselang'] = 'Hautatu zure hizkuntza'; $lang['i_installer'] = 'DokuWiki instalatzailea'; $lang['i_wikiname'] = 'Wiki Izena'; @@ -263,3 +291,19 @@ $lang['hours'] = 'duela %d ordu'; $lang['minutes'] = 'duela %d minutu'; $lang['seconds'] = 'duela %d segundu'; $lang['wordblock'] = 'Zure aldaketa ez da aldatua izan blokeatutako testua (spam) daukalako.'; +$lang['media_uploadtab'] = 'Igo'; +$lang['media_searchtab'] = 'Bilatu'; +$lang['media_file'] = 'Fitxategia'; +$lang['media_viewtab'] = 'Begiratu'; +$lang['media_edittab'] = 'Editatu'; +$lang['media_historytab'] = 'Historia'; +$lang['media_sort_name'] = 'Izena'; +$lang['media_sort_date'] = 'Data'; +$lang['media_files'] = '%s -n fitxategiak'; +$lang['media_upload'] = 'Igo %s -ra'; +$lang['media_search'] = 'Bilatu %s -n'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s -n %s'; +$lang['media_edit'] = '%s editatu'; +$lang['media_update'] = 'Bertsio berria igo'; +$lang['media_restore'] = 'Bertsio hau berrezarri'; diff --git a/inc/lang/eu/mailwrap.html b/inc/lang/eu/mailwrap.html new file mode 100644 index 000000000..0cf92c28b --- /dev/null +++ b/inc/lang/eu/mailwrap.html @@ -0,0 +1,13 @@ +<html> +<head> +<title>@TITLE@</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> +<body> + +@HTMLBODY@ + +<br /><hr /> +<small>Mezu elektroniko hau DokuWiki-k sortua da @DOKUWIKIURL@.</small> +</body> +</html>
\ No newline at end of file diff --git a/inc/lang/eu/resetpwd.txt b/inc/lang/eu/resetpwd.txt new file mode 100644 index 000000000..9bb6e3ae8 --- /dev/null +++ b/inc/lang/eu/resetpwd.txt @@ -0,0 +1,3 @@ + ====== Pasahitza berria ezarri ====== + +Mesedez wiki honetako zure pasahitza berria sartu.
\ No newline at end of file diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index 33a89a631..fdcdeb1bc 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -13,6 +13,7 @@ * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> * @author Milad DZand <M.DastanZand@gmail.com> + * @author AmirH Hassaneini <mytechmix@gmail.com> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'rtl'; @@ -198,6 +199,7 @@ $lang['user_tools'] = 'ابزار کاربر'; $lang['site_tools'] = 'ابزار سایت'; $lang['page_tools'] = 'ابزار صفحه'; $lang['skip_to_content'] = 'پرش به محتوا'; +$lang['sidebar'] = 'نوار کناری'; $lang['mail_newpage'] = 'صفحه اضافه شد:'; $lang['mail_changed'] = 'صفحه تغییر داده شد:'; $lang['mail_subscribe_list'] = 'صفحات تغییر داده شده در فضاینام'; diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php index 3ff5ae455..37b0f462b 100644 --- a/inc/lang/kk/lang.php +++ b/inc/lang/kk/lang.php @@ -38,11 +38,13 @@ $lang['btn_backtomedia'] = 'Медиафайлды таңдауға қай $lang['btn_subscribe'] = 'Жазылуларды басқару'; $lang['btn_profile'] = 'Профильді жаңарту'; $lang['btn_reset'] = 'Түсіру'; +$lang['btn_resendpwd'] = 'Шартты белгінi Өзгерту'; $lang['btn_draft'] = 'Шимайды өңдеу'; $lang['btn_recover'] = 'Шимайды қайтару'; $lang['btn_draftdel'] = 'Шимайды өшіру'; $lang['btn_revert'] = 'Қалпына келтіру'; $lang['btn_register'] = 'Тіркеу'; +$lang['btn_apply'] = 'Қолдану/Енгізу'; $lang['loggedinas'] = 'түпнұсқамен кірген'; $lang['user'] = 'Түпнұсқа'; $lang['pass'] = 'Құпиясөз'; @@ -86,7 +88,7 @@ $lang['txt_filename'] = 'Келесідей еңгізу (қалауы $lang['txt_overwrt'] = 'Бар файлды қайта жазу'; $lang['lockedby'] = 'Осы уақытта тойтарылған'; $lang['lockexpire'] = 'Тойтару келесі уақытта бітеді'; -$lang['js']['willexpire'] = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.'; +$lang['js']['willexpire'] = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.'; $lang['js']['notsavedyet'] = 'Сақталмаған өзгерістер жоғалатын болады.'; $lang['js']['searchmedia'] = 'Файлдарды іздеу'; $lang['js']['keepopen'] = 'Таңдаған соң терезе жаппаңыз'; @@ -112,3 +114,17 @@ $lang['js']['medialeft'] = 'Сүретті сол жаққа тегіст $lang['js']['mediaright'] = 'Сүретті оң жаққа тегістеу'; $lang['js']['mediacenter'] = 'Сүретті ортаға тегістеу'; $lang['js']['medianoalign'] = 'Тегістеусіз'; +$lang['js']['linkwiz'] = 'Сілтеме көмекшіci'; +$lang['js']['media_diff'] = 'Өзгеліктердi Көрсету'; +$lang['js']['media_select'] = 'Файлды тандау'; +$lang['mediaselect'] = 'Медиа файлдар'; +$lang['mediaroot'] = 'root'; +$lang['yours'] = 'Сендердің болжамыңыз'; +$lang['created'] = 'ЖасалFан'; +$lang['mail_new_user'] = 'Жаңа пайдаланушы'; +$lang['qb_chars'] = 'Арнайы белгiлер'; +$lang['img_backto'] = 'Қайта оралу'; +$lang['img_format'] = 'Формат'; +$lang['img_camera'] = 'Камера'; +$lang['i_chooselang'] = 'Тіл таңдау'; +$lang['i_retry'] = 'Қайталау'; diff --git a/inc/lang/ko/install.html b/inc/lang/ko/install.html index f73b91294..aeeac870f 100644 --- a/inc/lang/ko/install.html +++ b/inc/lang/ko/install.html @@ -6,7 +6,7 @@ 현재 설치 과정 중에는 디렉토리 권한 설정이 불가능합니다. 보통 직접 쉘 명령어를 사용하거나, 호스팅을 사용한다면 FTP나 호스팅 제어판(예를 들어 CPanel)을 사용해서 설정해야 합니다.</p> <p>현재 설치 과정중에 관리자로 로그인 후 DokuWiki의 관리 메뉴(플러그인 설치, 사용자 관리, 위키 문서 접근 권한 관리, 옵션 설정)를 가능하게 <acronym title="접근 제어 목록">ACL</acronym>에 대한 환경 설정을 수행합니다. -이 것은 DokuWiki가 동작하는데 필요한 사항은 아니지만, 어쨌든 더 쉽게 관리자가 관리할 수 있도록 해줍니다.</p> +DokuWiki가 동작하는데 필요한 사항은 아니지만, 어쨌든 더 쉽게 관리자가 관리할 수 있도록 해줍니다.</p> <p>숙련된 사용자나 특별한 설치 과정이 필요한 경우에 다음 링크를 참고하기 바랍니다: <a href="http://dokuwiki.org/ko:install">설치 과정 (한국어)</a> diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 64507fa81..89d045503 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -7,7 +7,7 @@ * @author jk Lee * @author dongnak@gmail.com * @author Song Younghwan <purluno@gmail.com> - * @author Seung-Chul Yoo <dryoo@live.com> + * @author Seung-Chul Yoo <dryoo@live.com> * @author erial2@gmail.com * @author Myeongjin <aranet100@gmail.com> */ @@ -37,13 +37,13 @@ $lang['btn_secedit'] = '편집'; $lang['btn_login'] = '로그인'; $lang['btn_logout'] = '로그아웃'; $lang['btn_admin'] = '관리'; -$lang['btn_update'] = '변경'; +$lang['btn_update'] = '바꾸기'; $lang['btn_delete'] = '삭제'; $lang['btn_back'] = '뒤로'; $lang['btn_backlink'] = '가리키는 링크'; $lang['btn_backtomedia'] = '미디어 파일 선택으로 돌아가기'; $lang['btn_subscribe'] = '구독 관리'; -$lang['btn_profile'] = '개인 정보 변경'; +$lang['btn_profile'] = '개인 정보 바꾸기'; $lang['btn_reset'] = '초기화'; $lang['btn_resendpwd'] = '새 비밀번호 설정'; $lang['btn_draft'] = '문서 초안 편집'; @@ -66,7 +66,7 @@ $lang['profile'] = '개인 정보'; $lang['badlogin'] = '잘못된 사용자 이름이거나 비밀번호입니다.'; $lang['minoredit'] = '사소한 바뀜'; $lang['draftdate'] = '문서 초안 자동 저장 시간'; -$lang['nosecedit'] = '문서가 수정되어 세션 정보의 유효 시간이 지나 문서 전부를 다시 읽습니다.'; +$lang['nosecedit'] = '한동안 문서가 바뀌어 세션 정보의 유효 시간이 지나 문서 전부를 다시 읽습니다.'; $lang['regmissing'] = '모든 항목을 입력해야 합니다.'; $lang['reguexists'] = '같은 이름을 사용하는 사용자가 있습니다.'; $lang['regsuccess'] = '사용자를 만들었으며 비밀번호는 이메일로 보냈습니다.'; @@ -219,7 +219,7 @@ $lang['qb_hplus'] = '상위 문단 제목'; $lang['qb_hminus'] = '하위 문단 제목'; $lang['qb_hequal'] = '동급 문단 제목'; $lang['qb_link'] = '내부 링크'; -$lang['qb_extlink'] = '외부 링크'; +$lang['qb_extlink'] = '바깥 링크'; $lang['qb_hr'] = '가로줄'; $lang['qb_ol'] = '순서 있는 목록'; $lang['qb_ul'] = '순서 없는 목록'; @@ -296,7 +296,7 @@ $lang['days'] = '%d일 전'; $lang['hours'] = '%d시간 전'; $lang['minutes'] = '%d분 전'; $lang['seconds'] = '%d초 전'; -$lang['wordblock'] = '스팸 문구를 포함하고 있어서 저장되지 않았습니다.'; +$lang['wordblock'] = '스팸 문구를 포함하고 있어서 저장하지 않았습니다.'; $lang['media_uploadtab'] = '올리기'; $lang['media_searchtab'] = '찾기'; $lang['media_file'] = '파일'; @@ -313,8 +313,8 @@ $lang['media_upload'] = '%s에 올리기'; $lang['media_search'] = '%s 찾기'; $lang['media_view'] = '%s'; $lang['media_viewold'] = '%s의 %s'; -$lang['media_edit'] = '%s 수정'; -$lang['media_history'] = '%s 변경 내력'; +$lang['media_edit'] = '%s 편집'; +$lang['media_history'] = '%s 바뀜 내역'; $lang['media_meta_edited'] = '메타데이터가 수정됨'; $lang['media_perm_read'] = '이 파일을 읽을 권한이 없습니다.'; $lang['media_perm_upload'] = '파일을 올릴 권한이 없습니다.'; diff --git a/inc/lang/ko/mailtext.txt b/inc/lang/ko/mailtext.txt index 219fe6e0b..01bada9ba 100644 --- a/inc/lang/ko/mailtext.txt +++ b/inc/lang/ko/mailtext.txt @@ -1,4 +1,4 @@ -DokuWiki 문서가 추가 또는 변경되었습니다. 자세한 정보는 다음과 같습니다: +DokuWiki 문서가 추가 또는 바뀌었습니다. 자세한 정보는 다음과 같습니다: 날짜 : @DATE@ 브라우저 : @BROWSER@ diff --git a/inc/lang/ko/preview.txt b/inc/lang/ko/preview.txt index 6563874ee..1b7710e2f 100644 --- a/inc/lang/ko/preview.txt +++ b/inc/lang/ko/preview.txt @@ -1,3 +1,3 @@ ====== 미리 보기 ====== -이것은 입력한 내용이 어떻게 보일지 미리 보여줍니다. 아직 **저장되지 않았다**는 점을 기억해두십시오!
\ No newline at end of file +입력한 내용이 어떻게 보일지 미리 보여줍니다. 아직 **저장되지 않았다**는 점을 기억해두십시오!
\ No newline at end of file diff --git a/inc/lang/ko/showrev.txt b/inc/lang/ko/showrev.txt index 084d82737..f6930044b 100644 --- a/inc/lang/ko/showrev.txt +++ b/inc/lang/ko/showrev.txt @@ -1,2 +1,2 @@ -**이것은 문서의 이전 버전입니다!** +**문서의 이전 버전입니다!** ---- diff --git a/inc/lang/ko/updateprofile.txt b/inc/lang/ko/updateprofile.txt index ebf19d8ab..379981cb3 100644 --- a/inc/lang/ko/updateprofile.txt +++ b/inc/lang/ko/updateprofile.txt @@ -1,3 +1,3 @@ -====== 개인 정보 수정 ====== +====== 개인 정보 바꾸기 ====== 바꾸고 싶은 항목을 입력하기 바랍니다. 사용자 이름은 바꿀 수 없습니다.
\ No newline at end of file diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index cc17b17fe..19a7b7cce 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -39,6 +39,7 @@ $lang['btn_backtomedia'] = 'Atpakaļ uz mēdiju failu izvēli'; $lang['btn_subscribe'] = 'Abonēt izmaiņu paziņojumus'; $lang['btn_profile'] = 'Labot savu profilu'; $lang['btn_reset'] = 'Atsaukt izmaiņas'; +$lang['btn_resendpwd'] = 'Uzstādīt jaunu paroli'; $lang['btn_draft'] = 'Labot melnrakstu'; $lang['btn_recover'] = 'Atjaunot melnrakstu'; $lang['btn_draftdel'] = 'Dzēst melnrakstu'; @@ -75,6 +76,7 @@ $lang['profnoempty'] = 'Bez vārda vai e-pasta adreses nevar.'; $lang['profchanged'] = 'Profils veiksmīgi izlabots.'; $lang['pwdforget'] = 'Aizmirsi paroli? Saņem jaunu'; $lang['resendna'] = 'Paroļu izsūtīšanu nepiedāvāju.'; +$lang['resendpwd'] = 'Uzstādīt jaunu paroli lietotājam'; $lang['resendpwdmissing'] = 'Atvaino, jāizpilda visas ailes.'; $lang['resendpwdnouser'] = 'Atvaino, tāda lietotāja nav.'; $lang['resendpwdbadauth'] = 'Atvaino, šis autorizācijas kods nav derīgs. Pārliecinies, ka lietoji pilnu apstiprināšanas adresi.'; @@ -87,6 +89,7 @@ $lang['searchmedia_in'] = 'Meklēt iekš %s'; $lang['txt_upload'] = 'Norādi augšupielādējamo failu'; $lang['txt_filename'] = 'Ievadi vikivārdu (nav obligāts)'; $lang['txt_overwrt'] = 'Aizstāt esošo failu'; +$lang['maxuploadsize'] = 'Augšuplādējamā faila ierobežojums: %s.'; $lang['lockedby'] = 'Patlaban bloķējis '; $lang['lockexpire'] = 'Bloķējums beigsies '; $lang['js']['willexpire'] = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.'; @@ -129,6 +132,7 @@ $lang['js']['media_select'] = 'Norādīt failus...'; $lang['js']['media_upload_btn'] = 'Augšuplādēt'; $lang['js']['media_done_btn'] = 'Gatavs'; $lang['js']['media_drop'] = 'Nomet te augšuplādējamos failus'; +$lang['js']['media_cancel'] = 'atlikt'; $lang['js']['media_overwrt'] = 'Rakstīt pāri esošajiem failiem'; $lang['rssfailed'] = 'Kļūda saņemot saturu no '; $lang['nothingfound'] = 'Nekas nav atrasts.'; @@ -179,6 +183,12 @@ $lang['external_edit'] = 'ārpussistēmas labojums'; $lang['summary'] = 'Anotācija'; $lang['noflash'] = 'Lai attēlotu lapas saturu, vajag <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.'; $lang['download'] = 'Lejuplādēt «kodiņu»((snippet))'; +$lang['tools'] = 'Rīki'; +$lang['user_tools'] = 'Lietotāja rīki'; +$lang['site_tools'] = 'Vietnes rīki'; +$lang['page_tools'] = 'Lapas rīki'; +$lang['skip_to_content'] = 'uz rakstu'; +$lang['sidebar'] = 'Izvēlne'; $lang['mail_newpage'] = 'lapa pievienota:'; $lang['mail_changed'] = 'lapa mainīta:'; $lang['mail_subscribe_list'] = 'Nodaļā mainītās lapas:'; @@ -249,6 +259,7 @@ $lang['subscr_style_digest'] = 'kopsavilkumu par katru lapu (reizi %.2f dienā $lang['subscr_style_list'] = 'kopš pēdējās vēstules notikušo labojumu sarakstu (reizi %.2f dienās)'; $lang['authmodfailed'] = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzu ziņo Wiki administratoram.'; $lang['authtempfail'] = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.'; +$lang['authpwdexpire'] = 'Tavai parolei pēc %d dienām biegsies termiņš, tā drīzumā jānomaina.'; $lang['i_chooselang'] = 'Izvēlies valodu'; $lang['i_installer'] = 'DokuWiki instalētājs'; $lang['i_wikiname'] = 'Wiki vārds'; diff --git a/inc/lang/lv/mailwrap.html b/inc/lang/lv/mailwrap.html new file mode 100644 index 000000000..34b723901 --- /dev/null +++ b/inc/lang/lv/mailwrap.html @@ -0,0 +1,13 @@ +<html> +<head> +<title>@TITLE@</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> +<body> + +@HTMLBODY@ + +<br /><hr /> +<small>Šo vēstuli nosūtījusi programma DokuWiki no vietnes @DOKUWIKIURL@.</small> +</body> +</html>
\ No newline at end of file diff --git a/inc/lang/lv/resetpwd.txt b/inc/lang/lv/resetpwd.txt new file mode 100644 index 000000000..757f34cff --- /dev/null +++ b/inc/lang/lv/resetpwd.txt @@ -0,0 +1,3 @@ +====== Uzstādīt jaunu paroli ====== + +Lūdzu izvēlies savam kontam jaunu paroli.
\ No newline at end of file diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index d6dc8f96b..b3d56bae7 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -54,11 +54,14 @@ $lang['btn_backtomedia'] = 'Voltar à seleção do arquivo de mídia'; $lang['btn_subscribe'] = 'Monitorar alterações'; $lang['btn_profile'] = 'Atualizar o perfil'; $lang['btn_reset'] = 'Limpar'; +$lang['btn_resendpwd'] = 'Definir a nova senha'; $lang['btn_draft'] = 'Editar o rascunho'; $lang['btn_recover'] = 'Recuperar o rascunho'; $lang['btn_draftdel'] = 'Excluir o rascunho'; $lang['btn_revert'] = 'Restaurar'; $lang['btn_register'] = 'Cadastre-se'; +$lang['btn_apply'] = 'Aplicar'; +$lang['btn_media'] = 'Gerenciador de mídias'; $lang['loggedinas'] = 'Identificado(a) como'; $lang['user'] = 'Nome de usuário'; $lang['pass'] = 'Senha'; @@ -88,6 +91,7 @@ $lang['profnoempty'] = 'Não são permitidos nomes ou endereços de e- $lang['profchanged'] = 'O perfil do usuário foi atualizado com sucesso.'; $lang['pwdforget'] = 'Esqueceu sua senha? Solicite outra'; $lang['resendna'] = 'Esse wiki não tem suporte para o reenvio de senhas.'; +$lang['resendpwd'] = 'Definir a nova senha para'; $lang['resendpwdmissing'] = 'Desculpe, você deve preencher todos os campos.'; $lang['resendpwdnouser'] = 'Desculpe, não foi possível encontrar esse usuário no nosso banco de dados.'; $lang['resendpwdbadauth'] = 'Desculpe, esse código de autorização é inválido. Certifique-se de que você usou o link de confirmação inteiro.'; @@ -100,6 +104,7 @@ $lang['searchmedia_in'] = 'Buscar em %s'; $lang['txt_upload'] = 'Selecione o arquivo a ser enviado'; $lang['txt_filename'] = 'Enviar como (opcional)'; $lang['txt_overwrt'] = 'Substituir o arquivo existente'; +$lang['maxuploadsize'] = 'Tamanho máximo de %s por arquivo.'; $lang['lockedby'] = 'Atualmente bloqueada por'; $lang['lockexpire'] = 'O bloqueio expira em'; $lang['js']['willexpire'] = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.'; @@ -134,6 +139,17 @@ Entretanto, você ainda pode copiar e colar o atalho.'; $lang['js']['linkwiz'] = 'Link Wizard'; $lang['js']['linkto'] = 'Link para:'; $lang['js']['del_confirm'] = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?'; +$lang['js']['restore_confirm'] = 'Deseja realmente restaurar essa versão?'; +$lang['js']['media_diff'] = 'Ver as diferenças:'; +$lang['js']['media_diff_both'] = 'Lado a lado'; +$lang['js']['media_diff_opacity'] = 'Sobreposição'; +$lang['js']['media_diff_portions'] = 'Deslizamento'; +$lang['js']['media_select'] = 'Selecione os arquivos...'; +$lang['js']['media_upload_btn'] = 'Enviar'; +$lang['js']['media_done_btn'] = 'Concluído'; +$lang['js']['media_drop'] = 'Arraste os arquivos até aqui para enviar'; +$lang['js']['media_cancel'] = 'remover'; +$lang['js']['media_overwrt'] = 'Sobrescrever arquivos existentes'; $lang['rssfailed'] = 'Ocorreu um erro durante a atualização dessa fonte: '; $lang['nothingfound'] = 'Não foi encontrado nada.'; $lang['mediaselect'] = 'Arquivos de mídia'; @@ -178,16 +194,26 @@ $lang['lastmod'] = 'Última modificação'; $lang['by'] = 'por'; $lang['deleted'] = 'removida'; $lang['created'] = 'criada'; -$lang['restored'] = 'revisão anterior restaurada'; +$lang['restored'] = 'a revisão anterior foi restaurada (%s)'; $lang['external_edit'] = 'edição externa'; $lang['summary'] = 'Resumo da edição'; $lang['noflash'] = 'O <a href="http://www.adobe.com/products/flashplayer/">plug-in Adobe Flash</a> é necessário para exibir este conteúdo.'; -$lang['download'] = 'Download Snippet'; +$lang['download'] = 'Baixar o snippet'; +$lang['tools'] = 'Ferramentas'; +$lang['user_tools'] = 'Ferramentas do usuário'; +$lang['site_tools'] = 'Ferramentas do site'; +$lang['page_tools'] = 'Ferramentas da página'; +$lang['skip_to_content'] = 'ir para o conteúdo'; +$lang['sidebar'] = 'Barra lateral'; $lang['mail_newpage'] = 'página adicionada:'; $lang['mail_changed'] = 'página modificada:'; $lang['mail_subscribe_list'] = 'páginas alteradas no espaço de nomes:'; $lang['mail_new_user'] = 'novo usuário:'; $lang['mail_upload'] = 'arquivo enviado:'; +$lang['changes_type'] = 'Ver as mudanças de'; +$lang['pages_changes'] = 'Páginas'; +$lang['media_changes'] = 'Arquivos de mídia'; +$lang['both_changes'] = 'Páginas e arquivos de mídia'; $lang['qb_bold'] = 'Texto em negrito'; $lang['qb_italic'] = 'Texto em itálico'; $lang['qb_underl'] = 'Texto sublinhado'; @@ -212,7 +238,7 @@ $lang['qb_media'] = 'Adicionar imagens e/ou outros arquivos'; $lang['qb_sig'] = 'Inserir assinatura'; $lang['qb_smileys'] = 'Carinhas'; $lang['qb_chars'] = 'Caracteres especiais'; -$lang['upperns'] = 'Pular para namespace acima'; +$lang['upperns'] = 'Pular para espaço de nomes acima'; $lang['admin_register'] = 'Adicionar novo usuário'; $lang['metaedit'] = 'Editar metadados'; $lang['metasaveerr'] = 'Não foi possível escrever os metadados'; @@ -228,6 +254,9 @@ $lang['img_copyr'] = 'Direitos autorais'; $lang['img_format'] = 'Formato'; $lang['img_camera'] = 'Câmera'; $lang['img_keywords'] = 'Palavras-chave'; +$lang['img_width'] = 'Largura'; +$lang['img_height'] = 'Altura'; +$lang['img_manager'] = 'Ver no gerenciador de mídias'; $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de monitoramentos de %s'; $lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de monitoramentos de %s'; $lang['subscr_subscribe_noaddress'] = 'Como não há nenhum endereço associado ao seu usuário, você não pode ser adicionado à lista de monitoramento'; @@ -246,6 +275,7 @@ $lang['subscr_style_digest'] = 'um agrupamento de e-mails com as mudanças par $lang['subscr_style_list'] = 'uma lista de páginas modificadas desde o último e-mail (a cada %.2f dias)'; $lang['authmodfailed'] = 'A configuração da autenticação de usuário está com problemas. Por favor, informe ao administrador do wiki.'; $lang['authtempfail'] = 'A autenticação de usuários está temporariamente desabilitada. Se essa situação persistir, por favor, informe ao administrador do Wiki.'; +$lang['authpwdexpire'] = 'Sua senha vai expirar em %d dias. Você deve mudá-la assim que for possível.'; $lang['i_chooselang'] = 'Selecione o seu idioma'; $lang['i_installer'] = 'Instalador do DokuWiki'; $lang['i_wikiname'] = 'Nome do Wiki'; @@ -278,3 +308,26 @@ $lang['hours'] = '%d horas atrás'; $lang['minutes'] = '%d minutos atrás'; $lang['seconds'] = '%d segundos atrás'; $lang['wordblock'] = 'Suas mudanças não foram salvas pois contem texto bloqueados (spam)'; +$lang['media_uploadtab'] = 'Enviar'; +$lang['media_searchtab'] = 'Pesquisar'; +$lang['media_file'] = 'Arquivo'; +$lang['media_viewtab'] = 'Ver'; +$lang['media_edittab'] = 'Editar'; +$lang['media_historytab'] = 'Histórico'; +$lang['media_list_thumbs'] = 'Miniaturas'; +$lang['media_list_rows'] = 'Linhas'; +$lang['media_sort_name'] = 'Nome'; +$lang['media_sort_date'] = 'Data'; +$lang['media_namespaces'] = 'Selecione o espaço de nomes'; +$lang['media_files'] = 'Arquivos em %s'; +$lang['media_upload'] = 'Enviar para %s'; +$lang['media_search'] = 'Pesquisar em %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s em %s'; +$lang['media_edit'] = 'Editar %s'; +$lang['media_history'] = 'Histórico de %s'; +$lang['media_meta_edited'] = 'o metadado foi editado'; +$lang['media_perm_read'] = 'Desculpe, mas você não tem privilégios suficientes para ler arquivos.'; +$lang['media_perm_upload'] = 'Desculpe, mas você não tem privilégios suficientes para enviar arquivos.'; +$lang['media_update'] = 'Enviar uma nova versão'; +$lang['media_restore'] = 'Restaurar esta versão'; diff --git a/inc/lang/pt-br/mailwrap.html b/inc/lang/pt-br/mailwrap.html new file mode 100644 index 000000000..80bea7a22 --- /dev/null +++ b/inc/lang/pt-br/mailwrap.html @@ -0,0 +1,13 @@ +<html> +<head> +<title>@TITLE@</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> +<body> + +@HTMLBODY@ + +<br /><hr /> +<small>Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@.</small> +</body> +</html>
\ No newline at end of file diff --git a/inc/lang/pt-br/resetpwd.txt b/inc/lang/pt-br/resetpwd.txt new file mode 100644 index 000000000..febb1d6a0 --- /dev/null +++ b/inc/lang/pt-br/resetpwd.txt @@ -0,0 +1,3 @@ +====== Definir uma nova senha ====== + +Por favor, digite uma nova senha para sua conta neste wiki.
\ No newline at end of file diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 800b1a1b2..5f428b36a 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -203,6 +203,7 @@ $lang['user_tools'] = 'Инструменты пользовател $lang['site_tools'] = 'Инструменты сайта'; $lang['page_tools'] = 'Инструменты страницы'; $lang['skip_to_content'] = 'Перейти к содержанию'; +$lang['sidebar'] = 'Боковая колонна'; $lang['mail_newpage'] = 'страница добавлена:'; $lang['mail_changed'] = 'страница изменена:'; $lang['mail_subscribe_list'] = 'изменились страницы в пространстве имён:'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index 1407474ec..b8a947dc3 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -182,7 +182,7 @@ $lang['lastmod'] = 'Posledná úprava'; $lang['by'] = 'od'; $lang['deleted'] = 'odstránené'; $lang['created'] = 'vytvorené'; -$lang['restored'] = 'stará verzia bola obnovená'; +$lang['restored'] = 'stará verzia bola obnovená (%s)'; $lang['external_edit'] = 'externá úprava'; $lang['summary'] = 'Komentár k úpravám'; $lang['noflash'] = 'Pre zobrazenie tohto obsahu potrebujete <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.'; @@ -318,4 +318,3 @@ $lang['media_perm_read'] = 'Prepáčte, ale nemáte dostatočné oprávnen $lang['media_perm_upload'] = 'Prepáčte, ale nemáte dostatočné oprávnenie na nahrávanie súborov.'; $lang['media_update'] = 'Nahrať novú verziu'; $lang['media_restore'] = 'Obnoviť túto verziu'; -$lang['plugin_install_err'] = 'Plugin nebol nainštalovaný úspešne. Premenujte adresár s pluginom \'%s\' na \'%s\'.'; diff --git a/inc/template.php b/inc/template.php index 9f17d5e32..0d96be214 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1465,18 +1465,19 @@ function tpl_license($img = 'badge', $imgonly = false, $return = false, $wrap = } /** - * Includes the rendered XHTML of a given page + * Includes the rendered HTML of a given page * * This function is useful to populate sidebars or similar features in a * template */ -function tpl_include_page($pageid, $print = true) { +function tpl_include_page($pageid, $print = true, $propagate = false) { global $ID; global $TOC; - $oldid = $ID; + + if ($propagate) $pageid = page_findnearest($pageid); + $oldtoc = $TOC; $html = p_wiki_xhtml($pageid, '', false); - $ID = $oldid; $TOC = $oldtoc; if(!$print) return $html; @@ -1485,17 +1486,6 @@ function tpl_include_page($pageid, $print = true) { } /** - * Include the sidebar, will check current namespaces first - */ -function tpl_sidebar($print = true) { - global $conf; - - $sidebar = page_findnearest($conf['sidebar']); - if($sidebar) return tpl_include_page($sidebar, $print); - return ''; -} - -/** * Display the subscribe form * * @author Adrian Lang <lang@cosmocode.de> diff --git a/lib/exe/css.php b/lib/exe/css.php index 8899ff193..1e662c64a 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -49,14 +49,16 @@ function css_out(){ $tpldir = tpl_basedir(); } + // used style.ini file + $styleini = css_styleini($tplinc); + // The generated script depends on some dynamic options $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tplinc.$type,'.css'); // load template styles $tplstyles = array(); - if(@file_exists($tplinc.'style.ini')){ - $ini = parse_ini_file($tplinc.'style.ini',true); - foreach($ini['stylesheets'] as $file => $mode){ + if ($styleini) { + foreach($styleini['stylesheets'] as $file => $mode) { $tplstyles[$mode][$tplinc.$file] = $tpldir; } } @@ -72,6 +74,7 @@ function css_out(){ $cache_files = getConfigFiles('main'); $cache_files[] = $tplinc.'style.ini'; + $cache_files[] = $tplinc.'style.local.ini'; $cache_files[] = __FILE__; foreach($mediatypes as $mediatype) { @@ -119,8 +122,10 @@ function css_out(){ // print the default classes for interwiki links and file downloads if ($mediatype == 'screen') { + print '@media screen {'; css_interwiki(); css_filetypes(); + print '}'; } // load files @@ -173,14 +178,37 @@ function css_out(){ * @author Andreas Gohr <andi@splitbrain.org> */ function css_applystyle($css,$tplinc){ - if(@file_exists($tplinc.'style.ini')){ - $ini = parse_ini_file($tplinc.'style.ini',true); - $css = strtr($css,$ini['replacements']); + $styleini = css_styleini($tplinc); + + if($styleini){ + $css = strtr($css,$styleini['replacements']); } return $css; } /** + * Get contents of merged style.ini and style.local.ini as an array. + * + * @author Anika Henke <anika@selfthinker.org> + */ +function css_styleini($tplinc) { + $styleini = array(); + + foreach (array($tplinc.'style.ini', $tplinc.'style.local.ini') as $ini) { + $tmp = (@file_exists($ini)) ? parse_ini_file($ini, true) : array(); + + foreach($tmp as $key => $value) { + if(array_key_exists($key, $styleini) && is_array($value)) { + $styleini[$key] = array_merge($styleini[$key], $tmp[$key]); + } else { + $styleini[$key] = $value; + } + } + } + return $styleini; +} + +/** * Prints classes for interwikilinks * * Interwiki links have two classes: 'interwiki' and 'iw_$name>' where diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index e8f189256..52e7ebe1e 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -157,7 +157,7 @@ function checkFileStatus(&$media, &$file, $rev='') { //media to local file if(preg_match('#^(https?)://#i',$media)){ //check hash - if(substr(md5(auth_cookiesalt().$media),0,6) != $INPUT->str('hash')){ + if(substr(md5(auth_cookiesalt().$media),0,6) !== $INPUT->str('hash')){ return array( 412, 'Precondition Failed'); } //handle external images diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/images/README index 7e12bbbd4..e2788b400 100644 --- a/lib/tpl/dokuwiki/images/icons-license.txt +++ b/lib/images/README @@ -1,4 +1,5 @@ -Icons for: sitetools.png, email.png, external-link.png and unc.png + +Icons: email.png, external-link.png, unc.png Icon set: Dusseldorf Designer: pc.de License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] diff --git a/lib/images/_deprecated.txt b/lib/images/_deprecated.txt new file mode 100644 index 000000000..bccea2049 --- /dev/null +++ b/lib/images/_deprecated.txt @@ -0,0 +1,12 @@ + +== @deprecated 2012-10-06 == + +arrow_down.gif +arrow_up.gif +at.gif +close.png +del.png +edit.gif +list-minus.gif +list-plus.gif +pencil.png diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif Binary files differnew file mode 100644 index 000000000..ff13b9585 --- /dev/null +++ b/lib/images/arrow_down.gif diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif Binary files differnew file mode 100644 index 000000000..d491c18db --- /dev/null +++ b/lib/images/arrow_up.gif diff --git a/lib/images/at.gif b/lib/images/at.gif Binary files differnew file mode 100644 index 000000000..8bdf40d54 --- /dev/null +++ b/lib/images/at.gif diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/images/bullet.png Binary files differindex 5e557b334..5e557b334 100644 --- a/lib/tpl/dokuwiki/images/bullet.png +++ b/lib/images/bullet.png diff --git a/lib/images/close.png b/lib/images/close.png Binary files differnew file mode 100644 index 000000000..4ccef0603 --- /dev/null +++ b/lib/images/close.png diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/images/closed-rtl.png Binary files differindex caa027e34..caa027e34 100644 --- a/lib/tpl/dokuwiki/images/closed-rtl.png +++ b/lib/images/closed-rtl.png diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/images/closed.png Binary files differindex e3bd0f9e9..e3bd0f9e9 100644 --- a/lib/tpl/dokuwiki/images/closed.png +++ b/lib/images/closed.png diff --git a/lib/images/del.png b/lib/images/del.png Binary files differnew file mode 100644 index 000000000..e59ded55f --- /dev/null +++ b/lib/images/del.png diff --git a/lib/images/edit.gif b/lib/images/edit.gif Binary files differnew file mode 100644 index 000000000..a2a23de7b --- /dev/null +++ b/lib/images/edit.gif diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/images/email.png Binary files differindex d1d4a5fd5..d1d4a5fd5 100644 --- a/lib/tpl/dokuwiki/images/email.png +++ b/lib/images/email.png diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/images/external-link.png Binary files differindex a4d5de17c..a4d5de17c 100644 --- a/lib/tpl/dokuwiki/images/external-link.png +++ b/lib/images/external-link.png diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif Binary files differnew file mode 100644 index 000000000..36902f159 --- /dev/null +++ b/lib/images/list-minus.gif diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif Binary files differnew file mode 100644 index 000000000..adc3fac8a --- /dev/null +++ b/lib/images/list-plus.gif diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/images/open.png Binary files differindex 5f2d408c5..5f2d408c5 100644 --- a/lib/tpl/dokuwiki/images/open.png +++ b/lib/images/open.png diff --git a/lib/images/pencil.png b/lib/images/pencil.png Binary files differnew file mode 100644 index 000000000..78142b61e --- /dev/null +++ b/lib/images/pencil.png diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/images/unc.png Binary files differindex a552d6e6f..a552d6e6f 100644 --- a/lib/tpl/dokuwiki/images/unc.png +++ b/lib/images/unc.png diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index 8aed3c504..b60033e0f 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -23,6 +23,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/acl/lang/eu/lang.php b/lib/plugins/acl/lang/eu/lang.php index 99e70ad00..b9285ff36 100644 --- a/lib/plugins/acl/lang/eu/lang.php +++ b/lib/plugins/acl/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi <inko.i.a@gmail.com> + * @author Zigor Astarbe <astarbe@gmail.com> */ $lang['admin_acl'] = 'Atzipen Kontrol Listaren Kudeaketa'; $lang['acl_group'] = 'Taldea'; diff --git a/lib/plugins/acl/lang/fa/lang.php b/lib/plugins/acl/lang/fa/lang.php index 8b7d72f51..7fe0f2c43 100644 --- a/lib/plugins/acl/lang/fa/lang.php +++ b/lib/plugins/acl/lang/fa/lang.php @@ -8,6 +8,7 @@ * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> * @author Milad DZand <M.DastanZand@gmail.com> + * @author AmirH Hassaneini <mytechmix@gmail.com> */ $lang['admin_acl'] = 'مدیریت کنترل دسترسیها'; $lang['acl_group'] = 'گروه'; diff --git a/lib/plugins/acl/lang/kk/lang.php b/lib/plugins/acl/lang/kk/lang.php index dde5b9577..f21b93132 100644 --- a/lib/plugins/acl/lang/kk/lang.php +++ b/lib/plugins/acl/lang/kk/lang.php @@ -4,3 +4,7 @@ * * @author Nurgozha Kaliaskarov astana08@gmail.com */ +$lang['acl_group'] = 'Группа'; +$lang['acl_user'] = 'Пайдаланушы'; +$lang['page'] = 'Бет'; +$lang['acl_perm1'] = 'Оқу'; diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt index 377636682..6a15b7a2e 100644 --- a/lib/plugins/acl/lang/ko/help.txt +++ b/lib/plugins/acl/lang/ko/help.txt @@ -1,4 +1,4 @@ -=== 도움말: === +=== 빠른 도움말: === 현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다. diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index c8e1ce5cc..5d2662ef8 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -41,4 +41,4 @@ $lang['acl_perm4'] = '만들기'; $lang['acl_perm8'] = '올리기'; $lang['acl_perm16'] = '삭제'; $lang['acl_new'] = '새 항목 추가'; -$lang['acl_mod'] = '선택 항목 변경'; +$lang['acl_mod'] = '선택 항목 수정'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index b940f13cd..5d03efb60 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -23,6 +23,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $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. <br /> Los valores incorrectos se mostrarán con un marco rojo alrededor.'; diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php index 97addbb50..4dd3ff351 100644 --- a/lib/plugins/config/lang/eu/lang.php +++ b/lib/plugins/config/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi <inko.i.a@gmail.com> + * @author Zigor Astarbe <astarbe@gmail.com> */ $lang['menu'] = 'Konfigurazio Ezarpenak'; $lang['error'] = 'Ezarpenak ez dira eguneratu balio oker bat dela eta, mesedez errepasatu aldaketak eta berriz bidali. <br />Balio okerra(k) ertz gorriz inguratuak erakutsiko dira. '; @@ -25,6 +26,8 @@ $lang['_anti_spam'] = 'Anti-Spam Ezarpenak'; $lang['_editing'] = 'Edizio Ezarpenak'; $lang['_links'] = 'Esteken Ezarpenak'; $lang['_media'] = 'Multimedia Ezarpenak'; +$lang['_notifications'] = 'Abisuen ezarpenak'; +$lang['_syndication'] = 'Sindikazio ezarpenak'; $lang['_advanced'] = 'Ezarpen Aurreratuak'; $lang['_network'] = 'Sare Ezarpenak'; $lang['_plugin_sufix'] = 'Plugin Ezarpenak'; @@ -32,25 +35,26 @@ $lang['_template_sufix'] = 'Txantiloi Ezarpenak'; $lang['_msg_setting_undefined'] = 'Ezarpen metadaturik ez.'; $lang['_msg_setting_no_class'] = 'Ezarpen klaserik ez.'; $lang['_msg_setting_no_default'] = 'Balio lehenetsirik ez.'; -$lang['fmode'] = 'Fitxategi sortze modua'; -$lang['dmode'] = 'Direktorio sortze modua'; -$lang['lang'] = 'Hizkuntza'; -$lang['basedir'] = 'Oinarri direktorioa'; -$lang['baseurl'] = 'Oinarri URLa'; -$lang['savedir'] = 'Datuak gordetzeko direktorioa'; -$lang['start'] = 'Hasiera orriaren izena'; $lang['title'] = 'Wiki-aren izenburua'; +$lang['start'] = 'Hasiera orriaren izena'; +$lang['lang'] = 'Hizkuntza'; $lang['template'] = 'Txantiloia'; $lang['license'] = 'Zein lizentziapean argitaratu beharko lirateke edukiak?'; -$lang['fullpath'] = 'Orri oinean orrien bide osoa erakutsi'; +$lang['savedir'] = 'Datuak gordetzeko direktorioa'; +$lang['basedir'] = 'Oinarri direktorioa'; +$lang['baseurl'] = 'Oinarri URLa'; +$lang['dmode'] = 'Direktorio sortze modua'; +$lang['fmode'] = 'Fitxategi sortze modua'; +$lang['allowdebug'] = 'Baimendu debug-a <b>ezgaitu behar ez bada!</b>'; $lang['recent'] = 'Azken aldaketak'; +$lang['recent_days'] = 'Zenbat azken aldaketa gordeko dira (egunak)'; $lang['breadcrumbs'] = 'Arrasto pauso kopurua'; $lang['youarehere'] = 'Arrasto pauso hierarkikoak'; +$lang['fullpath'] = 'Orri oinean orrien bide osoa erakutsi'; $lang['typography'] = 'Ordezkapen tipografikoak egin'; -$lang['htmlok'] = 'Enbotatutako HTMLa baimendu'; -$lang['phpok'] = 'Enbotatutako PHPa baimendu'; $lang['dformat'] = 'Data formatua (ikusi PHPren <a href="http://www.php.net/strftime">strftime</a> funtzioa)'; $lang['signature'] = 'Sinadura'; +$lang['showuseras'] = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan'; $lang['toptoclevel'] = 'Eduki taularen goiko maila'; $lang['tocminheads'] = 'Gutxiengo izenburu kopuru minimoa Edukien Taula-ren sortu dadin.'; $lang['maxtoclevel'] = 'Eduki taularen maila maximoa'; @@ -58,15 +62,8 @@ $lang['maxseclevel'] = 'Sekzio edizio mailaren maximoa'; $lang['camelcase'] = 'Estekentzat CamelCase erabili'; $lang['deaccent'] = 'Orri izen garbiak'; $lang['useheading'] = 'Erabili lehen izenburua orri izen moduan'; -$lang['refcheck'] = 'Multimedia erreferentzia kontrolatu'; -$lang['refshow'] = 'Erakusteko multimedia erreferentzia kopurua'; -$lang['allowdebug'] = 'Baimendu debug-a <b>ezgaitu behar ez bada!</b>'; -$lang['usewordblock'] = 'Blokeatu spam-a hitz zerrenda batean oinarrituta'; -$lang['indexdelay'] = 'Denbora atzerapena indexatu baino lehen (seg)'; -$lang['relnofollow'] = 'Erabili rel="nofollow" kanpo esteketan'; -$lang['mailguard'] = 'Ezkutatu posta-e helbidea'; -$lang['iexssprotect'] = 'Egiaztatu igotako fitxategiak JavaScript edo HTML kode maltzurra detektatzeko'; -$lang['showuseras'] = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan'; +$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.'; +$lang['hidepages'] = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)'; $lang['useacl'] = 'Erabili atzipen kontrol listak'; $lang['autopasswd'] = 'Pasahitzak automatikoki sortu'; $lang['authtype'] = 'Kautotze backend-a'; @@ -75,57 +72,64 @@ $lang['defaultgroup'] = 'Talde lehenetsia'; $lang['superuser'] = 'Supererabiltzailea - taldea, erabiltzailea edo komaz bereiztutako zerrenda user1,@group1,user2 orri eta funtzio guztietara atzipen osoarekin, AKL-ren ezarpenetan zehaztutakoa kontutan hartu gabe'; $lang['manager'] = 'Kudeatzailea - talde, erabiltzaile edo komaz bereiztutako zerrenda user1,@group1,user2 kudeatze funtzio zehatz batzuetara atzipenarekin'; $lang['profileconfirm'] = 'Profil aldaketak pasahitzaz berretsi'; +$lang['rememberme'] = 'Baimendu saio hasiera cookie iraunkorrak (gogoratu iezaidazu)'; $lang['disableactions'] = 'DokuWiki ekintzak ezgaitu'; $lang['disableactions_check'] = 'Egiaztatu'; $lang['disableactions_subscription'] = '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.'; $lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)'; $lang['securecookie'] = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. '; +$lang['usewordblock'] = 'Blokeatu spam-a hitz zerrenda batean oinarrituta'; +$lang['relnofollow'] = 'Erabili rel="nofollow" kanpo esteketan'; +$lang['indexdelay'] = 'Denbora atzerapena indexatu baino lehen (seg)'; +$lang['mailguard'] = 'Ezkutatu posta-e helbidea'; +$lang['iexssprotect'] = 'Egiaztatu igotako fitxategiak JavaScript edo HTML kode maltzurra detektatzeko'; +$lang['usedraft'] = 'Automatikoki zirriborroa gorde editatze garaian'; +$lang['htmlok'] = 'Enbotatutako HTMLa baimendu'; +$lang['phpok'] = 'Enbotatutako PHPa baimendu'; +$lang['locktime'] = 'Adin maximoa lock fitxategientzat (seg)'; +$lang['cachetime'] = 'Adin maximoa cachearentzat (seg)'; +$lang['target____wiki'] = 'Barne estekentzat helburu leihoa'; +$lang['target____interwiki'] = 'Interwiki estekentzat helburu leihoa'; +$lang['target____extern'] = 'Kanpo estekentzat helburu leihoa'; +$lang['target____media'] = 'Multimedia estekentzat helburu leihoa'; +$lang['target____windows'] = 'Leihoen estekentzat helburu leihoa'; +$lang['mediarevisions'] = 'Media rebisioak gaitu?'; +$lang['refcheck'] = 'Multimedia erreferentzia kontrolatu'; +$lang['refshow'] = 'Erakusteko multimedia erreferentzia kopurua'; +$lang['gdlib'] = 'GD Lib bertsioa'; +$lang['im_convert'] = 'ImageMagick-en aldaketa tresnara bidea'; +$lang['jpg_quality'] = 'JPG konprimitze kalitatea (0-100)'; +$lang['fetchsize'] = 'Kanpo esteketatik fetch.php-k deskargatu dezakeen tamaina maximoa (byteak)'; +$lang['subscribers'] = 'Gaitu orri harpidetza euskarria'; +$lang['subscribe_time'] = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.'; +$lang['notify'] = 'Aldaketen jakinarazpenak posta-e helbide honetara bidali'; +$lang['registernotify'] = 'Erregistratu berri diren erabiltzaileei buruzko informazioa post-e helbide honetara bidali'; +$lang['mailfrom'] = 'Posta automatikoentzat erabiliko den posta-e helbidea'; +$lang['mailprefix'] = 'Posta automatikoen gaientzat erabili beharreko aurrizkia'; +$lang['sitemap'] = 'Sortu Google gune-mapa (egunak)'; +$lang['rss_type'] = 'XML jario mota'; +$lang['rss_linkto'] = 'XML jarioak hona estekatzen du'; +$lang['rss_content'] = 'Zer erakutsi XML jarioetan?'; +$lang['rss_update'] = 'XML jarioaren eguneratze tartea (seg)'; +$lang['rss_show_summary'] = 'XML jarioak laburpena erakusten du izenburuan'; $lang['updatecheck'] = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako update.dokuwiki.org kontaktatu behar du.'; $lang['userewrite'] = 'Erabili URL politak'; $lang['useslash'] = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan'; -$lang['usedraft'] = 'Automatikoki zirriborroa gorde editatze garaian'; $lang['sepchar'] = 'Orri izenaren hitz banatzailea'; $lang['canonical'] = 'Erabili URL erabat kanonikoak'; $lang['fnencode'] = 'Non-ASCII fitxategi izenak kodetzeko metodoa.'; $lang['autoplural'] = 'Kontrolatu forma pluralak esteketan'; $lang['compression'] = 'Trinkotze metodoa attic fitxategientzat'; -$lang['cachetime'] = 'Adin maximoa cachearentzat (seg)'; -$lang['locktime'] = 'Adin maximoa lock fitxategientzat (seg)'; -$lang['fetchsize'] = 'Kanpo esteketatik fetch.php-k deskargatu dezakeen tamaina maximoa (byteak)'; -$lang['notify'] = 'Aldaketen jakinarazpenak posta-e helbide honetara bidali'; -$lang['registernotify'] = 'Erregistratu berri diren erabiltzaileei buruzko informazioa post-e helbide honetara bidali'; -$lang['mailfrom'] = 'Posta automatikoentzat erabiliko den posta-e helbidea'; -$lang['mailprefix'] = 'Posta automatikoen gaientzat erabili beharreko aurrizkia'; $lang['gzip_output'] = 'Gzip Eduki-Kodeketa erabili xhtml-rentzat'; -$lang['gdlib'] = 'GD Lib bertsioa'; -$lang['im_convert'] = 'ImageMagick-en aldaketa tresnara bidea'; -$lang['jpg_quality'] = 'JPG konprimitze kalitatea (0-100)'; -$lang['subscribers'] = 'Gaitu orri harpidetza euskarria'; -$lang['subscribe_time'] = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.'; $lang['compress'] = 'Trinkotu CSS eta javascript irteera'; -$lang['hidepages'] = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)'; $lang['send404'] = 'Bidali "HTTP 404/Ez Da Orria Aurkitu" existitzen ez diren orrientzat'; -$lang['sitemap'] = 'Sortu Google gune-mapa (egunak)'; $lang['broken_iua'] = 'Zure sisteman ignore_user_abort (erabiltzailearen bertan behera uztea kontuan ez hartu) funtzioa hautsia al dago? Honek funtzionatzen ez duen bilaketa indize bat eragin dezake. ISS+PHP/CGI hautsiak daude. Ikusi <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> informazio gehiago jasotzeko.'; $lang['xsendfile'] = 'X-Sendfile goiburua erabili web zerbitzariari fitxategi estatikoak bidaltzen uzteko? Zure web zerbitzariak hau ahalbidetuta eduki beharko du.'; $lang['renderer_xhtml'] = 'Erabiliko den errenderizatzailea wiki irteera (xhtml) nagusiarentzat'; $lang['renderer__core'] = '%s (dokuwiki-ren nukleoa)'; $lang['renderer__plugin'] = '%s (plugina)'; -$lang['rememberme'] = 'Baimendu saio hasiera cookie iraunkorrak (gogoratu iezaidazu)'; -$lang['rss_type'] = 'XML jario mota'; -$lang['rss_linkto'] = 'XML jarioak hona estekatzen du'; -$lang['rss_content'] = 'Zer erakutsi XML jarioetan?'; -$lang['rss_update'] = 'XML jarioaren eguneratze tartea (seg)'; -$lang['recent_days'] = 'Zenbat azken aldaketa gordeko dira (egunak)'; -$lang['rss_show_summary'] = 'XML jarioak laburpena erakusten du izenburuan'; -$lang['target____wiki'] = 'Barne estekentzat helburu leihoa'; -$lang['target____interwiki'] = 'Interwiki estekentzat helburu leihoa'; -$lang['target____extern'] = 'Kanpo estekentzat helburu leihoa'; -$lang['target____media'] = 'Multimedia estekentzat helburu leihoa'; -$lang['target____windows'] = 'Leihoen estekentzat helburu leihoa'; $lang['proxy____host'] = 'Proxy zerbitzari izena'; $lang['proxy____port'] = 'Proxy portua'; $lang['proxy____user'] = 'Proxyaren erabiltzaile izena'; diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php index ba00d5a2d..34c76780c 100644 --- a/lib/plugins/config/lang/fa/lang.php +++ b/lib/plugins/config/lang/fa/lang.php @@ -8,6 +8,7 @@ * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> * @author Milad DZand <M.DastanZand@gmail.com> + * @author AmirH Hassaneini <mytechmix@gmail.com> */ $lang['menu'] = 'تنظیمات پیکربندی'; $lang['error'] = 'به دلیل ایراد در مقادیر وارد شده، تنظیمات اعمال نشد، خواهشمندیم تغییرات را مجددن کنترل نمایید و دوباره ارسال کنید.<br/> مقادیر مشکلدار با کادر قرمز مشخص شدهاند.'; diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt index f6b76ecfc..5ef34df64 100644 --- a/lib/plugins/config/lang/ko/intro.txt +++ b/lib/plugins/config/lang/ko/intro.txt @@ -1,7 +1,7 @@ ====== 환경 설정 관리 ====== -DokuWiki 설치할 때 설정을 변경하기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서 (영어)]]를 참고하세요. +DokuWiki 설치할 때 설정을 바꾸기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서 (영어)]]를 참고하세요. -플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 변경하지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정이 가능합니다. +플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 바꾸지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정이 가능합니다. 이 페이지를 끝내기 전에 **저장** 버튼을 누르지 않으면 설정값은 적용되지 않습니다. diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 5f90044e4..cd2cc6d6c 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -12,9 +12,9 @@ * @author Myeongjin <aranet100@gmail.com> */ $lang['menu'] = '환경 설정'; -$lang['error'] = '잘못된 값 때문에 설정을 변경할 수 없습니다. 수정한 값을 검토하고 확인을 누르세요. +$lang['error'] = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 수정한 값을 검토하고 확인을 누르세요. <br />잘못된 값은 빨간 선으로 둘러싸여 있습니다.'; -$lang['updated'] = '설정이 성공적으로 변경되었습니다.'; +$lang['updated'] = '설정이 성공적으로 바뀌었습니다.'; $lang['nochoice'] = '(다른 선택이 불가능합니다.)'; $lang['locked'] = '환경 설정 파일을 수정할 수 없습니다. 의도한 행동이 아니라면,<br /> 파일 이름과 권한이 맞는지 확인하기 바랍니다. '; @@ -39,9 +39,9 @@ $lang['_advanced'] = '고급 설정'; $lang['_network'] = '네트워크 설정'; $lang['_plugin_sufix'] = '플러그인 설정'; $lang['_template_sufix'] = '템플릿 설정'; -$lang['_msg_setting_undefined'] = '설정되지 않은 메타데이터.'; -$lang['_msg_setting_no_class'] = '설정되지 않은 클래스.'; -$lang['_msg_setting_no_default'] = '기본값 없음.'; +$lang['_msg_setting_undefined'] = '설정된 메타데이터가 없습니다.'; +$lang['_msg_setting_no_class'] = '설정된 클래스가 없습니다.'; +$lang['_msg_setting_no_default'] = '기본값이 없습니다.'; $lang['title'] = '위키 제목 (위키 이름)'; $lang['start'] = '각 이름공간에서 사용할 시작 문서 이름'; $lang['lang'] = '인터페이스 언어'; @@ -53,12 +53,12 @@ $lang['savedir'] = '데이타 저장 디렉토리'; $lang['basedir'] = '서버 경로 (예를 들어 <code>/dokuwiki/</code>). 자동 감지를 하려면 비우세요.'; $lang['baseurl'] = '서버 URL (예를 들어 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비우세요.'; $lang['cookiedir'] = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.'; -$lang['dmode'] = '디렉토리 생성 모드'; -$lang['fmode'] = '파일 생성 모드'; +$lang['dmode'] = '디렉토리 만들기 모드'; +$lang['fmode'] = '파일 만들기 모드'; $lang['allowdebug'] = '디버그 허용 <b>필요하지 않으면 금지!</b>'; $lang['recent'] = '최근 바뀐 문서당 항목 수'; $lang['recent_days'] = '최근 바뀐 문서 기준 시간 (날짜)'; -$lang['breadcrumbs'] = '위치 "추적" 수. 0으로 설정하면 비활성화함.'; +$lang['breadcrumbs'] = '위치 "추적" 수. 0으로 설정하면 비활성화합니다.'; $lang['youarehere'] = '계층형 위치 추적 (다음 위의 옵션을 비활성화하고 싶습니다)'; $lang['fullpath'] = '문서 하단에 전체 경로 보여주기'; $lang['typography'] = '기호 대체'; @@ -80,21 +80,21 @@ $lang['autopasswd'] = '자동으로 만들어진 비밀번호'; $lang['authtype'] = '인증 백-엔드'; $lang['passcrypt'] = '비밀번호 암호화 방법'; $lang['defaultgroup'] = '기본 그룹, 모든 새 사용자는 이 그룹에 속합니다'; -$lang['superuser'] = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자. 사용자1,@그룹1,사용자2 쉼표로 구분한 목록'; -$lang['manager'] = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자. 사용자1,@그룹1,사용자2 쉼표로 구분한 목록'; +$lang['superuser'] = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록'; +$lang['manager'] = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록'; $lang['profileconfirm'] = '개인 정보를 바꿀 때 비밀번호 다시 확인'; $lang['rememberme'] = '항상 로그인 정보 저장 허용 (기억하기)'; $lang['disableactions'] = 'DokuWiki 활동 비활성화'; $lang['disableactions_check'] = '검사'; $lang['disableactions_subscription'] = '구독 신청/해지'; -$lang['disableactions_wikicode'] = '내용 보기/원시 내보대기'; +$lang['disableactions_wikicode'] = '내용 보기/원본 내보대기'; $lang['disableactions_other'] = '다른 활동 (쉼표로 구분)'; $lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.'; -$lang['remote'] = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근가능합니다.'; +$lang['remote'] = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근 가능합니다.'; $lang['remoteuser'] = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.'; $lang['usewordblock'] = '금지 단어를 사용해 스팸 막기'; -$lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; +$lang['relnofollow'] = '바깥 링크에 rel="nofollow" 사용'; $lang['indexdelay'] = '색인 연기 시간 (초)'; $lang['mailguard'] = '이메일 주소를 알아볼 수 없게 하기'; $lang['iexssprotect'] = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사'; @@ -105,7 +105,7 @@ $lang['locktime'] = '최대 파일 잠금 시간(초)'; $lang['cachetime'] = '최대 캐시 생존 시간 (초)'; $lang['target____wiki'] = '내부 링크에 대한 타겟 창'; $lang['target____interwiki'] = '인터위키 링크에 대한 타겟 창'; -$lang['target____extern'] = '외부 링크에 대한 타겟 창'; +$lang['target____extern'] = '바깥 링크에 대한 타겟 창'; $lang['target____media'] = '미디어 링크에 대한 타겟 창'; $lang['target____windows'] = '창 링크에 대한 타겟 창'; $lang['mediarevisions'] = '미디어 버전 관리를 사용하겠습니까?'; @@ -114,9 +114,9 @@ $lang['refshow'] = '위의 설정이 활성화되었을 때 보여 $lang['gdlib'] = 'GD 라이브러리 버전'; $lang['im_convert'] = 'ImageMagick 변환 도구 위치'; $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; -$lang['fetchsize'] = 'fetch.php가 외부에서 다운로드할 수도 있는 최대 크기 (바이트)'; +$lang['fetchsize'] = 'fetch.php가 바깥에서 다운로드할 수도 있는 최대 크기 (바이트)'; $lang['subscribers'] = '사용자가 이메일로 문서 바뀜에 구독하도록 허용'; -$lang['subscribe_time'] = '구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; +$lang['subscribe_time'] = '구독 목록과 요약이 보내질 경과 시간 (초); recent_days에서 설정된 시간보다 작아야 합니다.'; $lang['notify'] = '항상 이 이메일 주소로 바뀜 알림을 보냄'; $lang['registernotify'] = '항상 새 사용자한테 이 이메일 주소로 정보를 보냄'; $lang['mailfrom'] = '자동으로 보내지는 메일 발신자'; @@ -127,7 +127,7 @@ $lang['rss_type'] = 'XML 피드 타입'; $lang['rss_linkto'] = 'XML 피드 링크 정보'; $lang['rss_content'] = 'XML 피드 항목에 표시되는 내용은?'; $lang['rss_update'] = 'XML 피드 업데이트 주기 (초)'; -$lang['rss_show_summary'] = 'XML 피드 제목에서 요약정보 보여주기'; +$lang['rss_show_summary'] = 'XML 피드 제목에서 요약 보여주기'; $lang['rss_media'] = '어떤 규격으로 XML 피드를 받아보시겠습니까?'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 DokuWiki를 update.dokuwiki.org에 연결해야 합니다.'; $lang['userewrite'] = '멋진 URL 사용'; @@ -141,9 +141,8 @@ $lang['gzip_output'] = 'xhml 내용 gzip 압축 사용'; $lang['compress'] = '최적화된 CSS, 자바스크립트 출력'; $lang['cssdatauri'] = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code>에서 <code>600</code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.'; $lang['send404'] = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답'; -$lang['broken_iua'] = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있으면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a>를 참고하기 바랍니다.'; -$lang['xsendfile'] = '웹 서버 static 파일 전송 지원을 위해 X-Sendfile 헤더를 사용한다면 이 옵션을 사용합니다. -웹 서버가 이 기능을 지원해야 합니다.'; +$lang['broken_iua'] = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&task_id=852">버그 852</a>를 참고하기 바랍니다.'; +$lang['xsendfile'] = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.'; $lang['renderer_xhtml'] = '주 (xhtml) 위키 출력 처리기'; $lang['renderer__core'] = '%s (DokuWiki 내부 기능)'; $lang['renderer__plugin'] = '%s (플러그인)'; diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php index f95697c46..50031d5e5 100644 --- a/lib/plugins/config/lang/lv/lang.php +++ b/lib/plugins/config/lang/lv/lang.php @@ -33,25 +33,26 @@ $lang['_template_sufix'] = 'šablona iestatījumi'; $lang['_msg_setting_undefined'] = 'Nav atrodami iestatījumu metadati'; $lang['_msg_setting_no_class'] = 'Nav iestatījumu klases'; $lang['_msg_setting_no_default'] = 'Nav noklusētās vērtības'; -$lang['fmode'] = 'Tiesības izveidotajiem failiem'; -$lang['dmode'] = 'Tiesības izveidotajām direktorijām'; -$lang['lang'] = 'Valoda'; -$lang['basedir'] = 'Saknes direktorija'; -$lang['baseurl'] = 'Saknes adrese (URL)'; -$lang['savedir'] = 'Direktorija datu glabāšanai'; -$lang['start'] = 'Sākumlapas vārds'; $lang['title'] = 'Wiki virsraksts'; +$lang['start'] = 'Sākumlapas vārds'; +$lang['lang'] = 'Valoda'; $lang['template'] = 'Šablons'; $lang['license'] = 'Ar kādu licenci saturs tiks publicēts?'; -$lang['fullpath'] = 'Norādīt kājenē pilnu lapas ceļu'; +$lang['savedir'] = 'Direktorija datu glabāšanai'; +$lang['basedir'] = 'Saknes direktorija'; +$lang['baseurl'] = 'Saknes adrese (URL)'; +$lang['dmode'] = 'Tiesības izveidotajām direktorijām'; +$lang['fmode'] = 'Tiesības izveidotajiem failiem'; +$lang['allowdebug'] = 'Ieslēgt atkļūdošanu. <b>Izslēdz!</b>'; $lang['recent'] = 'Jaunākie grozījumi'; +$lang['recent_days'] = 'Cik dienas glabāt jaunākās izmaiņas'; $lang['breadcrumbs'] = 'Apmeklējumu vēstures garums'; $lang['youarehere'] = 'Rādīt "tu atrodies šeit"'; +$lang['fullpath'] = 'Norādīt kājenē pilnu lapas ceļu'; $lang['typography'] = 'Veikt tipogrāfijas aizvietošanu'; -$lang['htmlok'] = 'Atļaut iekļautu HTTP'; -$lang['phpok'] = 'Atļaut iekļautu PHP'; $lang['dformat'] = 'Datuma formāts (sk. PHP <a href="http://www.php.net/strftime">strftime</a> funkciju)'; $lang['signature'] = 'Paraksts'; +$lang['showuseras'] = 'Kā rādīt pēdējo lietotāju, ka labojis lapu'; $lang['toptoclevel'] = 'Satura rādītāja pirmais līmenis'; $lang['tocminheads'] = 'Mazākais virsrakstu skaits, no kuriem jāveido satura rādītājs.'; $lang['maxtoclevel'] = 'Satura rādītāja dziļākais līmenis'; @@ -59,15 +60,8 @@ $lang['maxseclevel'] = 'Dziļākais sekciju labošanas līmenis'; $lang['camelcase'] = 'Lietot saitēm CamelCase'; $lang['deaccent'] = 'Lapu nosaukumu transliterācija'; $lang['useheading'] = 'Izmantot pirmo virsrakstu lapu nosaukumiem'; -$lang['refcheck'] = 'Pārbaudīt saites uz mēdiju failiem'; -$lang['refshow'] = 'Cik saites uz mēdiju failiem rādīt'; -$lang['allowdebug'] = 'Ieslēgt atkļūdošanu. <b>Izslēdz!</b>'; -$lang['usewordblock'] = 'Bloķēt spamu pēc slikto vārdu saraksta.'; -$lang['indexdelay'] = 'Laika aizture pirms indeksācijas (sekundēs)'; -$lang['relnofollow'] = 'rel="nofollow" ārējām saitēm'; -$lang['mailguard'] = 'Slēpt epasta adreses'; -$lang['iexssprotect'] = 'Pārbaudīt, vai augšupielādētajā failā nav nav potenciāli bīstamā JavaScript vai HTML koda.'; -$lang['showuseras'] = 'Kā rādīt pēdējo lietotāju, ka labojis lapu'; +$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.'; +$lang['hidepages'] = 'Slēpt lapas (regulāras izteiksmes)'; $lang['useacl'] = 'Izmantot piekļuves tiesības'; $lang['autopasswd'] = 'Automātiski ģenerēt paroles'; $lang['authtype'] = 'Autentifikācijas mehānisms'; @@ -76,57 +70,63 @@ $lang['defaultgroup'] = 'Noklusētā grupa'; $lang['superuser'] = 'Administrators - grupa, lietotājs vai to saraksts ( piem.: user1,@group1,user2), kam ir pilnas tiesības.'; $lang['manager'] = 'Pārziņi - grupa, lietotājs vai to saraksts ( piem.: user1,@group1,user2), kam ir pieeja pie dažām administrēšanas funkcijām.'; $lang['profileconfirm'] = 'Profila labošanai vajag paroli'; +$lang['rememberme'] = 'Atļaut pastāvīgas ielogošanās sīkdatnes ("atceries mani")'; $lang['disableactions'] = 'Bloķēt Dokuwiki darbības'; $lang['disableactions_check'] = 'atzīmēt'; $lang['disableactions_subscription'] = 'abonēt/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.'; $lang['auth_security_timeout'] = 'Autorizācijas drošības intervāls (sekundēs)'; $lang['securecookie'] = 'Vai pa HTTPS sūtāmās sīkdatnes sūtīt tikai pa HTTPS? Atslēdz šo iespēju, kad tikai pieteikšanās wiki sistēmā notiek pa SSL šifrētu savienojumu, bet skatīšana - pa nešifrētu.'; +$lang['usewordblock'] = 'Bloķēt spamu pēc slikto vārdu saraksta.'; +$lang['relnofollow'] = 'rel="nofollow" ārējām saitēm'; +$lang['indexdelay'] = 'Laika aizture pirms indeksācijas (sekundēs)'; +$lang['mailguard'] = 'Slēpt epasta adreses'; +$lang['iexssprotect'] = 'Pārbaudīt, vai augšupielādētajā failā nav nav potenciāli bīstamā JavaScript vai HTML koda.'; +$lang['usedraft'] = 'Labojot automātiski saglabāt melnrakstu'; +$lang['htmlok'] = 'Atļaut iekļautu HTTP'; +$lang['phpok'] = 'Atļaut iekļautu PHP'; +$lang['locktime'] = 'Bloķēšanas failu maksimālais vecums'; +$lang['cachetime'] = 'Bufera maksimālais vecums (sek)'; +$lang['target____wiki'] = 'Kur atvērt iekšējās saites'; +$lang['target____interwiki'] = 'Kur atvērt saites strap wiki'; +$lang['target____extern'] = 'Kur atvērt ārējās saites'; +$lang['target____media'] = 'Kur atvērt mēdiju saites'; +$lang['target____windows'] = 'Kur atvērt saites uz tīkla mapēm'; +$lang['refcheck'] = 'Pārbaudīt saites uz mēdiju failiem'; +$lang['refshow'] = 'Cik saites uz mēdiju failiem rādīt'; +$lang['gdlib'] = 'GD Lib versija'; +$lang['im_convert'] = 'Ceļš uz ImageMagick convert rīku'; +$lang['jpg_quality'] = 'JPG saspiešanas kvalitāte'; +$lang['fetchsize'] = 'Maksimālais faila apjoms baitos, ko fetch.php var ielādēt no interneta.'; +$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['notify'] = 'Nosūtīt izmaiņu paziņojumu uz epasta adresi'; +$lang['registernotify'] = 'Nosūtīt paziņojumu par jauniem lietotājiem uz epasta adresi'; +$lang['mailfrom'] = 'Epasta adrese automātiskajiem paziņojumiem'; +$lang['mailprefix'] = 'E-pasta temata prefikss automātiskajiem paziņojumiem'; +$lang['sitemap'] = 'Lapas karte priekš Google (dienas)'; +$lang['rss_type'] = 'XML barotnes veids'; +$lang['rss_linkto'] = 'XML barotnes uz '; +$lang['rss_content'] = 'Ko attēlot XML barotnē?'; +$lang['rss_update'] = 'XML barotnes atjaunošanas intervāls (sec)'; +$lang['rss_show_summary'] = 'Rādīt visrakstos XML barotnes kopsavilkumu '; $lang['updatecheck'] = 'Pārbaudīt, vai pieejami atjauninājumi un drošības brīdinājumi? Dokuwiki sazināsies ar update.dokuwiki.org'; $lang['userewrite'] = 'Ērti lasāmas adreses (URL)'; $lang['useslash'] = 'Lietot slīpiņu par URL atdalītāju'; -$lang['usedraft'] = 'Labojot automātiski saglabāt melnrakstu'; $lang['sepchar'] = 'Lapas nosaukuma vārdu atdalītājs'; $lang['canonical'] = 'Lietot kanoniskus URL'; $lang['fnencode'] = 'Ne ASCII failvārdu kodēšanas metode:'; $lang['autoplural'] = 'Automātisks daudzskaitlis'; $lang['compression'] = 'Saspiešanas metode vecajiem failiem'; -$lang['cachetime'] = 'Bufera maksimālais vecums (sek)'; -$lang['locktime'] = 'Bloķēšanas failu maksimālais vecums'; -$lang['fetchsize'] = 'Maksimālais faila apjoms baitos, ko fetch.php var ielādēt no interneta.'; -$lang['notify'] = 'Nosūtīt izmaiņu paziņojumu uz epasta adresi'; -$lang['registernotify'] = 'Nosūtīt paziņojumu par jauniem lietotājiem uz epasta adresi'; -$lang['mailfrom'] = 'Epasta adrese automātiskajiem paziņojumiem'; -$lang['mailprefix'] = 'E-pasta temata prefikss automātiskajiem paziņojumiem'; $lang['gzip_output'] = 'Lietot gzip Content-Encoding priekš xhtml'; -$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" '; -$lang['sitemap'] = 'Lapas karte priekš Google (dienas)'; $lang['broken_iua'] = 'Varbūt tavā serverī nedarbojas funkcija ignore_user_abort? Tā dēļ var nestādāt meklēšanas indeksācija. Šī problēma sastopama, piemēram, IIS ar PHP/CGI. Papildus informāciju skatīt <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Kļūdā Nr.852</a>.'; $lang['xsendfile'] = 'Lietot X-Sendfile virsrakstu, augšupielādējot failu serverī? '; $lang['renderer_xhtml'] = 'Galveno (xhtml) wiki saturu renderēt ar '; $lang['renderer__core'] = '%s (dokuwiki kodols)'; $lang['renderer__plugin'] = '%s (modulis)'; -$lang['rememberme'] = 'Atļaut pastāvīgas ielogošanās sīkdatnes ("atceries mani")'; -$lang['rss_type'] = 'XML barotnes veids'; -$lang['rss_linkto'] = 'XML barotnes uz '; -$lang['rss_content'] = 'Ko attēlot XML barotnē?'; -$lang['rss_update'] = 'XML barotnes atjaunošanas intervāls (sec)'; -$lang['recent_days'] = 'Cik dienas glabāt jaunākās izmaiņas'; -$lang['rss_show_summary'] = 'Rādīt visrakstos XML barotnes kopsavilkumu '; -$lang['target____wiki'] = 'Kur atvērt iekšējās saites'; -$lang['target____interwiki'] = 'Kur atvērt saites strap wiki'; -$lang['target____extern'] = 'Kur atvērt ārējās saites'; -$lang['target____media'] = 'Kur atvērt mēdiju saites'; -$lang['target____windows'] = 'Kur atvērt saites uz tīkla mapēm'; $lang['proxy____host'] = 'Proxy servera vārds'; $lang['proxy____port'] = 'Proxy ports'; $lang['proxy____user'] = 'Proxy lietotāja vārds'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 8c0ef713a..7151713d8 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -39,33 +39,38 @@ $lang['_anti_spam'] = 'Configurações do anti-spam'; $lang['_editing'] = 'Configurações de edição'; $lang['_links'] = 'Configurações de link'; $lang['_media'] = 'Configurações de mídia'; +$lang['_notifications'] = 'Configurações de notificação'; +$lang['_syndication'] = 'Configurações de sindicância'; $lang['_advanced'] = 'Configurações avançadas'; $lang['_network'] = 'Configurações de rede'; $lang['_plugin_sufix'] = 'Configurações de plug-ins'; -$lang['_template_sufix'] = 'Configurações de modelos'; +$lang['_template_sufix'] = 'Configurações do modelo'; $lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.'; $lang['_msg_setting_no_class'] = 'Nenhuma classe definida.'; $lang['_msg_setting_no_default'] = 'Nenhum valor padrão.'; -$lang['fmode'] = 'Modo de criação do arquivo'; -$lang['dmode'] = 'Modo de criação do diretório'; +$lang['title'] = 'Título do wiki'; +$lang['start'] = 'Nome da página inicial'; $lang['lang'] = 'Idioma'; +$lang['template'] = 'Modelo, ou a aparência do wiki.'; +$lang['tagline'] = 'Slogan (caso o modelo suporte isso)'; +$lang['sidebar'] = 'Nome da página da barra lateral (caso o modelo suporte isso). Deixe em branco para desabilitar a barra lateral.'; +$lang['license'] = 'Sob qual licença o seu conteúdo deve ser disponibilizado?'; +$lang['savedir'] = 'Diretório para salvar os dados'; $lang['basedir'] = 'Diretório base'; $lang['baseurl'] = 'URL base'; -$lang['savedir'] = 'Diretório para salvar os dados'; $lang['cookiedir'] = 'Caminhos dos cookies. Deixe em branco para usar a url base.'; -$lang['start'] = 'Nome da página inicial'; -$lang['title'] = 'Título do wiki'; -$lang['template'] = 'Modelo'; -$lang['license'] = 'Sob qual licença o seu conteúdo deve ser disponibilizado?'; -$lang['fullpath'] = 'Indica o caminho completo das páginas no rodapé'; +$lang['dmode'] = 'Modo de criação do diretório'; +$lang['fmode'] = 'Modo de criação do arquivo'; +$lang['allowdebug'] = 'Habilitar a depuração <b>(desabilite se não for necessário!)</b>'; $lang['recent'] = 'Modificações recentes'; +$lang['recent_days'] = 'Quantas mudanças recentes devem ser mantidas (dias)?'; $lang['breadcrumbs'] = 'Número de elementos na trilha de páginas visitadas'; $lang['youarehere'] = 'Trilha hierárquica'; +$lang['fullpath'] = 'Indica o caminho completo das páginas no rodapé'; $lang['typography'] = 'Efetuar modificações tipográficas'; -$lang['htmlok'] = 'Permitir incorporação de HTML'; -$lang['phpok'] = 'Permitir incorporação de PHP'; $lang['dformat'] = 'Formato da data (veja a função <a href="http://www.php.net/strftime">strftime</a> do PHP)'; $lang['signature'] = 'Assinatura'; +$lang['showuseras'] = 'O que exibir quando mostrar o usuário que editou a página pela última vez'; $lang['toptoclevel'] = 'Nível mais alto para a tabela de conteúdos'; $lang['tocminheads'] = 'Quantidade mínima de cabeçalhos para a construção da tabela de conteúdos.'; $lang['maxtoclevel'] = 'Nível máximo para entrar na tabela de conteúdos'; @@ -73,15 +78,8 @@ $lang['maxseclevel'] = 'Nível máximo para gerar uma seção de ediç $lang['camelcase'] = 'Usar CamelCase para links'; $lang['deaccent'] = '"Limpar" os nomes das páginas'; $lang['useheading'] = 'Usar o primeiro cabeçalho como nome da página'; -$lang['refcheck'] = 'Verificação de referência da mídia'; -$lang['refshow'] = 'Número de referências de mídia a exibir'; -$lang['allowdebug'] = 'Habilitar a depuração <b>(desabilite se não for necessário!)</b>'; -$lang['usewordblock'] = 'Bloquear spam baseado em lista de palavras'; -$lang['indexdelay'] = 'Tempo de espera antes da indexação (seg)'; -$lang['relnofollow'] = 'Usar rel="nofollow" em links externos'; -$lang['mailguard'] = 'Obscurecer endereços de e-mail'; -$lang['iexssprotect'] = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados'; -$lang['showuseras'] = 'O que exibir quando mostrar o usuário que editou a página pela última vez'; +$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.'; +$lang['hidepages'] = 'Esconder páginas correspondentes (expressão regular)'; $lang['useacl'] = 'Usar listas de controle de acesso'; $lang['autopasswd'] = 'Gerar senhas automaticamente'; $lang['authtype'] = 'Método de autenticação'; @@ -90,58 +88,70 @@ $lang['defaultgroup'] = 'Grupo padrão'; $lang['superuser'] = 'Superusuário - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso completo a todas as páginas e funções, independente das definições da ACL'; $lang['manager'] = 'Gerente - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso a certas funções de gerenciamento'; $lang['profileconfirm'] = 'Confirmar mudanças no perfil com a senha'; +$lang['rememberme'] = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")'; $lang['disableactions'] = 'Desabilitar as ações do DokuWiki'; $lang['disableactions_check'] = 'Verificação'; $lang['disableactions_subscription'] = 'Monitoramento'; $lang['disableactions_wikicode'] = 'Ver a fonte/Exportar 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.'; $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['remote'] = 'Habilitar o sistema de API remota. Isso permite que outras aplicações acessem o wiki via XML-RPC ou outros mecanismos.'; +$lang['remoteuser'] = 'Restringir o acesso à API remota aos grupos ou usuários definidos aqui (separados por vírgulas). Deixe em branco para permitir o acesso a qualquer um.'; +$lang['usewordblock'] = 'Bloquear spam baseado em lista de palavras'; +$lang['relnofollow'] = 'Usar rel="nofollow" em links externos'; +$lang['indexdelay'] = 'Tempo de espera antes da indexação (seg)'; +$lang['mailguard'] = 'Obscurecer endereços de e-mail'; +$lang['iexssprotect'] = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados'; +$lang['usedraft'] = 'Salvar o rascunho automaticamente durante a edição'; +$lang['htmlok'] = 'Permitir incorporação de HTML'; +$lang['phpok'] = 'Permitir incorporação de PHP'; +$lang['locktime'] = 'Tempo máximo para o bloqueio de arquivos (seg)'; +$lang['cachetime'] = 'Tempo máximo para o cache (seg)'; +$lang['target____wiki'] = 'Parâmetro "target" para links internos'; +$lang['target____interwiki'] = 'Parâmetro "target" para links interwiki'; +$lang['target____extern'] = 'Parâmetro "target" para links externos'; +$lang['target____media'] = 'Parâmetro "target" para links de mídia'; +$lang['target____windows'] = 'Parâmetro "target" para links do Windows'; +$lang['mediarevisions'] = 'Habilitar revisões de mídias?'; +$lang['refcheck'] = 'Verificação de referência da mídia'; +$lang['refshow'] = 'Número de referências de mídia a exibir'; +$lang['gdlib'] = 'Versão da biblioteca "GD Lib"'; +$lang['im_convert'] = 'Caminho para a ferramenta de conversão ImageMagick'; +$lang['jpg_quality'] = 'Qualidade de compressão do JPG (0-100)'; +$lang['fetchsize'] = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior'; +$lang['subscribers'] = 'Habilitar o suporte ao monitoramento de páginas'; +$lang['subscribe_time'] = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days'; +$lang['notify'] = 'Enviar notificações de mudança para esse endereço de e-mail'; +$lang['registernotify'] = 'Enviar informações de usuários registrados para esse endereço de e-mail'; +$lang['mailfrom'] = 'Endereço de e-mail a ser utilizado para mensagens automáticas'; +$lang['mailprefix'] = 'Prefixo do assunto dos e-mails de envio automático'; +$lang['htmlmail'] = 'Enviar e-mail HTML multipartes, que têm uma aparência melhor, mas um tamanho maior. Desabilite para enviar e-mails em texto puro.'; +$lang['sitemap'] = 'Gerar Google Sitemap (dias)'; +$lang['rss_type'] = 'Tipo de fonte XML'; +$lang['rss_linkto'] = 'Os links da fonte XML apontam para'; +$lang['rss_content'] = 'O que deve ser exibido nos itens da fonte XML?'; +$lang['rss_update'] = 'Intervalo de atualização da fonte XML (seg)'; +$lang['rss_show_summary'] = 'Resumo de exibição da fonte XML no título'; +$lang['rss_media'] = 'Que tipo de alterações devem ser listadas na fonte XML?'; $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)'; -$lang['locktime'] = 'Tempo máximo para o bloqueio de arquivos (seg)'; -$lang['fetchsize'] = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior'; -$lang['notify'] = 'Enviar notificações de mudança para esse endereço de e-mail'; -$lang['registernotify'] = 'Enviar informações de usuários registrados para esse endereço de e-mail'; -$lang['mailfrom'] = 'Endereço de e-mail a ser utilizado para mensagens automáticas'; -$lang['mailprefix'] = 'Prefixo do assunto dos e-mails de envio automático'; $lang['gzip_output'] = 'Usar "Content-Encoding" do gzip para o código xhtml'; -$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 ao monitoramento de páginas'; -$lang['subscribe_time'] = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days'; $lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; $lang['cssdatauri'] = 'Tamanho máximo em bytes para o qual as imagens referenciadas em arquivos CSS devam ser incorporadas na folha de estilos (o arquivo CSS) para reduzir o custo dos pedidos HTTP. Essa técnica não funcionará na versões do IE < 8! Valores de <code>400</code> a <code>600</code> são bons. Defina o valor <code>0</code> para desativar.'; -$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'; -$lang['sitemap'] = 'Gerar Google Sitemap (dias)'; $lang['broken_iua'] = 'A função "ignore_user_abort" está com defeito no seu sistema? Isso pode causar um índice de busca defeituoso. IIS+PHP/CGI reconhecidamente possui esse erro. Veja o <a href="http://bugs.splitbrain.org/?do=details&task_id=852">bug 852</a> para mais informações.'; $lang['xsendfile'] = 'Usar o cabeçalho "X-Sendfile" para permitir que o servidor web encaminhe arquivos estáticos? Seu servidor web precisa ter suporte a isso.'; $lang['renderer_xhtml'] = 'Renderizador a ser utilizado para a saída principal (xhtml) do wiki'; $lang['renderer__core'] = '%s (núcleo do DokuWiki)'; $lang['renderer__plugin'] = '%s ("plug-in")'; -$lang['rememberme'] = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")'; -$lang['rss_type'] = 'Tipo de fonte XML'; -$lang['rss_linkto'] = 'Os links da fonte XML apontam para'; -$lang['rss_content'] = 'O que deve ser exibido nos itens da fonte XML?'; -$lang['rss_update'] = 'Intervalo de atualização da fonte XML (seg)'; -$lang['recent_days'] = 'Quantas mudanças recentes devem ser mantidas (dias)?'; -$lang['rss_show_summary'] = 'Resumo de exibição da fonte XML no título'; -$lang['target____wiki'] = 'Parâmetro "target" para links internos'; -$lang['target____interwiki'] = 'Parâmetro "target" para links interwiki'; -$lang['target____extern'] = 'Parâmetro "target" para links externos'; -$lang['target____media'] = 'Parâmetro "target" para links de mídia'; -$lang['target____windows'] = 'Parâmetro "target" para links do Windows'; +$lang['dnslookups'] = 'O DokuWiki procurará pelo nome de host dos endereços IP remotos dos usuários que estão editando as páginas. Caso você tenha um DNS lento, ele não esteja funcionando ou, ainda, você não queira esse recurso, desabilite essa opção.'; $lang['proxy____host'] = 'Nome do servidor proxy'; $lang['proxy____port'] = 'Porta do proxy'; $lang['proxy____user'] = 'Nome de usuário do proxy'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index 84dce4a67..36e04686d 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -39,6 +39,7 @@ $lang['_editing'] = 'Параметры правки'; $lang['_links'] = 'Параметры ссылок'; $lang['_media'] = 'Параметры медиафайлов'; $lang['_notifications'] = 'Параметры уведомлений'; +$lang['_syndication'] = 'Настройки синдикаций'; $lang['_advanced'] = 'Тонкая настройка'; $lang['_network'] = 'Параметры сети'; $lang['_plugin_sufix'] = 'Параметры плагина'; @@ -95,6 +96,7 @@ $lang['disableactions_other'] = 'Другие операции (через за $lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)'; $lang['securecookie'] = 'Должны ли куки (cookies), выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.'; $lang['remote'] = 'Включить систему API для подключений. Это позволит другим приложениям получить доступ к вики через XML-RPC или другие механизмы.'; +$lang['remoteuser'] = 'Дать права для удаленного API доступа пользователям указанным тут (разделять запятыми). Оставьте это поле пустым что бы открыть доступ всем.'; $lang['usewordblock'] = 'Блокировать спам по ключевым словам'; $lang['relnofollow'] = 'rel="nofollow" для внешних ссылок'; $lang['indexdelay'] = 'Задержка перед индексированием'; @@ -129,6 +131,7 @@ $lang['rss_linkto'] = 'Ссылки в RSS'; $lang['rss_content'] = 'Что отображать в строках XML-ленты?'; $lang['rss_update'] = 'Интервал обновления XML-ленты (сек.)'; $lang['rss_show_summary'] = 'Показывать краткую выдержку в заголовках XML-ленты'; +$lang['rss_media'] = 'Какие изменения должны быть отображены в XML?'; $lang['updatecheck'] = 'Проверять наличие обновлений и предупреждений о безопасности? Для этого «ДокуВики» потребуется связываться с сайтом <a href="http://www.splitbrain.org/">splitbrain.org</a>.'; $lang['userewrite'] = 'Удобочитаемые адреса (URL)'; $lang['useslash'] = 'Использовать слэш'; @@ -146,6 +149,7 @@ $lang['xsendfile'] = 'Используете заголовок X-Se $lang['renderer_xhtml'] = 'Обработчик основного (xhtml) вывода вики'; $lang['renderer__core'] = '%s (ядро dokuwiki)'; $lang['renderer__plugin'] = '%s (плагин)'; +$lang['dnslookups'] = 'DokuWiki ищет DNS имена пользователей редактирующих страницы. Если у вас нет DNS сервера или он работает медленно, рекомендуем отключить эту опцию.'; $lang['proxy____host'] = 'proxy-адрес'; $lang['proxy____port'] = 'proxy-порт'; $lang['proxy____user'] = 'proxy-имя пользователя'; diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php index db91b73c6..ded7d7369 100644 --- a/lib/plugins/plugin/lang/es/lang.php +++ b/lib/plugins/plugin/lang/es/lang.php @@ -23,6 +23,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $lang['menu'] = 'Administración de Plugins'; $lang['download'] = 'Descargar e instalar un nuevo plugin'; @@ -66,6 +67,6 @@ $lang['error_copy'] = 'Hubo un error al copiar el fichero mientras se $lang['error_delete'] = 'Hubo un error al intentar eliminar el plugin <em>%s</em>. La causa más probable es que no se cuente con los permisos necesarios en el fichero o en el directorio'; $lang['enabled'] = 'Plugin %s habilitado.'; $lang['notenabled'] = 'Plugin %s no puede ser habilitado, verifica los permisos del archivo.'; -$lang['disabled'] = 'Plugin %s desabilitado.'; -$lang['notdisabled'] = 'Plugin %s no puede ser desabilitado, verifica los permisos de archivo.'; +$lang['disabled'] = 'Plugin %s deshabilitado.'; +$lang['notdisabled'] = 'Plugin %s no puede ser deshabilitado, verifica los permisos de archivo.'; $lang['packageinstalled'] = 'Plugin (%d plugin(s): %s) instalado exitosamente.'; diff --git a/lib/plugins/plugin/lang/eu/lang.php b/lib/plugins/plugin/lang/eu/lang.php index 56c03325f..2fc07fef9 100644 --- a/lib/plugins/plugin/lang/eu/lang.php +++ b/lib/plugins/plugin/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi <inko.i.a@gmail.com> + * @author Zigor Astarbe <astarbe@gmail.com> */ $lang['menu'] = 'Plugin-ak Kudeatu'; $lang['download'] = 'Plugin berri bat deskargatu eta instalatu'; diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php index dbfe9ef9a..bc43ee3ef 100644 --- a/lib/plugins/plugin/lang/fa/lang.php +++ b/lib/plugins/plugin/lang/fa/lang.php @@ -8,6 +8,7 @@ * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> * @author Milad DZand <M.DastanZand@gmail.com> + * @author AmirH Hassaneini <mytechmix@gmail.com> */ $lang['menu'] = 'مدیریت افزونهها'; $lang['download'] = 'دریافت و نصب افزونه'; diff --git a/lib/plugins/plugin/lang/lv/lang.php b/lib/plugins/plugin/lang/lv/lang.php index 0f6103899..9a8727875 100644 --- a/lib/plugins/plugin/lang/lv/lang.php +++ b/lib/plugins/plugin/lang/lv/lang.php @@ -48,3 +48,4 @@ $lang['enabled'] = 'Modulis %s pieslēgts.'; $lang['notenabled'] = 'Moduli %s nevar pieslēgt, pārbaudi failu tiesības.'; $lang['disabled'] = 'Modulis %s atslēgts.'; $lang['notdisabled'] = 'Moduli %s nevar atslēgt, pārbaudi failu tiesības.'; +$lang['packageinstalled'] = 'Moduļu paka (pavisam kopā %d: %s) veiksmīgi uzstādīti.'; diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php index af1e8a706..34521021d 100644 --- a/lib/plugins/popularity/helper.php +++ b/lib/plugins/popularity/helper.php @@ -143,7 +143,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin { // number and size of pages $list = array(); - search($list,$conf['datadir'],array($this,'_search_count'),'',''); + search($list,$conf['datadir'],array($this,'_search_count'),array('all'=>false),''); $data['page_count'] = $list['file_count']; $data['page_size'] = $list['file_size']; $data['page_biggest'] = $list['file_max']; diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php index 2be2d4a04..e46735782 100644 --- a/lib/plugins/popularity/lang/es/lang.php +++ b/lib/plugins/popularity/lang/es/lang.php @@ -20,6 +20,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $lang['name'] = 'Retroinformación (Feedback) plugin Popularity'; $lang['submit'] = 'Enviar datos'; diff --git a/lib/plugins/popularity/lang/eu/lang.php b/lib/plugins/popularity/lang/eu/lang.php index 05e4262de..b52ccaee1 100644 --- a/lib/plugins/popularity/lang/eu/lang.php +++ b/lib/plugins/popularity/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi <inko.i.a@gmail.com> + * @author Zigor Astarbe <astarbe@gmail.com> */ $lang['name'] = 'Popularitate Feedback-a (denbora dezente iraun dezake kargatzen)'; $lang['submit'] = 'Datuak Bidali'; diff --git a/lib/plugins/popularity/lang/fa/lang.php b/lib/plugins/popularity/lang/fa/lang.php index 600e68077..6a0529891 100644 --- a/lib/plugins/popularity/lang/fa/lang.php +++ b/lib/plugins/popularity/lang/fa/lang.php @@ -8,6 +8,7 @@ * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> * @author Milad DZand <M.DastanZand@gmail.com> + * @author AmirH Hassaneini <mytechmix@gmail.com> */ $lang['name'] = 'بازخورد محبوبیت (ممکن است اندکی زمان ببرد)'; $lang['submit'] = 'ارسال اطلاعات'; diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt index 0af7ee2cc..b9e66094e 100644 --- a/lib/plugins/popularity/lang/ko/intro.txt +++ b/lib/plugins/popularity/lang/ko/intro.txt @@ -1,6 +1,6 @@ ====== 인기도 조사 ====== -설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|기능]]은 DokuWiki가 실제 사용자에게 어떻게 사용되는지 DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다. +설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지 DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다. 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이타는 익명 ID로 구별되어집니다. diff --git a/lib/plugins/popularity/lang/pt-br/intro.txt b/lib/plugins/popularity/lang/pt-br/intro.txt index 306cb2820..e07aa0ac3 100644 --- a/lib/plugins/popularity/lang/pt-br/intro.txt +++ b/lib/plugins/popularity/lang/pt-br/intro.txt @@ -1,9 +1,9 @@ ====== Retorno de Popularidade ====== -Essa ferramenta coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real. +Essa [[doku>popularity|ferramenta]] coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real. Você é encorajado a repetir esse procedimento de tempos em tempos, para manter os desenvolvedores informados quando o seu wiki for alterado. Seus pacotes de dados repetidos serão categorizados por uma identificação anônima. Os dados coletados contém informações do tipo: a versão do seu DokuWiki, o número e tamanho das suas páginas e arquivos, plug-ins instalados e informações sobre a sua instalação do PHP. -Os dados brutos que serão enviados é mostrado abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação. +Os dados brutos que serão enviados serão exibidos abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação. diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt index 871259ee9..2f1451c4a 100644 --- a/lib/plugins/popularity/plugin.info.txt +++ b/lib/plugins/popularity/plugin.info.txt @@ -1,7 +1,7 @@ base popularity author Andreas Gohr email andi@splitbrain.org -date 2012-09-08 +date 2012-10-07 name Popularity Feedback Plugin desc Send anonymous data about your wiki to the developers. url http://www.dokuwiki.org/plugin:popularity diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php index 3fb02be8e..129d71574 100644 --- a/lib/plugins/revert/lang/es/lang.php +++ b/lib/plugins/revert/lang/es/lang.php @@ -21,6 +21,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $lang['menu'] = 'Restaurador'; $lang['filter'] = 'Buscar páginas con spam'; diff --git a/lib/plugins/revert/lang/eu/lang.php b/lib/plugins/revert/lang/eu/lang.php index e94f07b2a..d3532c070 100644 --- a/lib/plugins/revert/lang/eu/lang.php +++ b/lib/plugins/revert/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi <inko.i.a@gmail.com> + * @author Zigor Astarbe <astarbe@gmail.com> */ $lang['menu'] = 'Berrezartze Kudeatzailea'; $lang['filter'] = 'Bilatu spam duten orriak'; diff --git a/lib/plugins/revert/lang/fa/lang.php b/lib/plugins/revert/lang/fa/lang.php index 34a5c430e..ba20313a3 100644 --- a/lib/plugins/revert/lang/fa/lang.php +++ b/lib/plugins/revert/lang/fa/lang.php @@ -8,6 +8,7 @@ * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> * @author Milad DZand <M.DastanZand@gmail.com> + * @author AmirH Hassaneini <mytechmix@gmail.com> */ $lang['menu'] = 'مدیریت برگشتها'; $lang['filter'] = 'جستجوی صفحات اسپم شده'; diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index b616857a2..521191701 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -22,6 +22,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $lang['menu'] = 'Administración de usuarios'; $lang['noauth'] = '(la autenticación de usuarios no está disponible)'; diff --git a/lib/plugins/usermanager/lang/eu/lang.php b/lib/plugins/usermanager/lang/eu/lang.php index b6e04f7c4..5d3a01fc7 100644 --- a/lib/plugins/usermanager/lang/eu/lang.php +++ b/lib/plugins/usermanager/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi <inko.i.a@gmail.com> + * @author Zigor Astarbe <astarbe@gmail.com> */ $lang['menu'] = 'Erabiltzaile Kudeatzailea'; $lang['noauth'] = '(erabiltzaile kautotzea ez dago erabilgarri)'; diff --git a/lib/plugins/usermanager/lang/fa/lang.php b/lib/plugins/usermanager/lang/fa/lang.php index 674013474..8176b776b 100644 --- a/lib/plugins/usermanager/lang/fa/lang.php +++ b/lib/plugins/usermanager/lang/fa/lang.php @@ -8,6 +8,7 @@ * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> * @author Milad DZand <M.DastanZand@gmail.com> + * @author AmirH Hassaneini <mytechmix@gmail.com> */ $lang['menu'] = 'مدیریت کاربر'; $lang['noauth'] = '(معتبرسازی کاربر ممکن نیست)'; diff --git a/lib/plugins/usermanager/lang/kk/lang.php b/lib/plugins/usermanager/lang/kk/lang.php index dde5b9577..b1bbd39ec 100644 --- a/lib/plugins/usermanager/lang/kk/lang.php +++ b/lib/plugins/usermanager/lang/kk/lang.php @@ -4,3 +4,6 @@ * * @author Nurgozha Kaliaskarov astana08@gmail.com */ +$lang['user_id'] = 'Пайдаланушы'; +$lang['user_pass'] = 'Шартты белгi'; +$lang['user_mail'] = 'E-mail'; diff --git a/lib/plugins/usermanager/lang/ko/edit.txt b/lib/plugins/usermanager/lang/ko/edit.txt index b8b13c5c8..ebb5bb002 100644 --- a/lib/plugins/usermanager/lang/ko/edit.txt +++ b/lib/plugins/usermanager/lang/ko/edit.txt @@ -1 +1 @@ -===== 사용자 정보 수정 ===== +===== 사용자 정보 편집 ===== diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index 3754fea90..58f9bf14a 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -35,14 +35,14 @@ $lang['summary'] = '찾은 사용자 %3$d 중 %1$d-%2$d 보기. $lang['nonefound'] = '찾은 사용자가 없습니다. 전체 사용자 %d명.'; $lang['delete_ok'] = '사용자 %d명이 삭제되었습니다'; $lang['delete_fail'] = '사용자 %d명의 삭제가 실패했습니다.'; -$lang['update_ok'] = '사용자 변경을 성공했습니다.'; -$lang['update_fail'] = '사용자 변경을 실패했습니다.'; -$lang['update_exists'] = '사용자 이름 변경이 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)'; +$lang['update_ok'] = '사용자 정보를 성공적으로 바꾸었습니다.'; +$lang['update_fail'] = '사용자 정보를 바꾸는 데 실패했습니다.'; +$lang['update_exists'] = '사용자 이름을 바꾸기는 데 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)'; $lang['start'] = '시작'; $lang['prev'] = '이전'; $lang['next'] = '다음'; $lang['last'] = '마지막'; -$lang['edit_usermissing'] = '선택된 사용자를 찾을 수 없습니다. 사용자 이름이 삭제되거나 변경됐을 수도 있습니다.'; +$lang['edit_usermissing'] = '선택된 사용자를 찾을 수 없습니다. 사용자 이름이 삭제되거나 바뀌었을 수도 있습니다.'; $lang['user_notify'] = '사용자에게 알림'; $lang['note_notify'] = '사용자에게 새로운 비밀번호를 준 경우에만 알림 이메일이 보내집니다.'; $lang['note_group'] = '새로운 사용자는 어떤 그룹도 설정하지 않은 경우에 기본 그룹(%s)에 추가됩니다.'; diff --git a/lib/scripts/page.js b/lib/scripts/page.js index b8e83cb0c..4ab0bf9b5 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -22,24 +22,27 @@ dw_page = { jQuery('form.btn_secedit') .mouseover(function(){ var $tgt = jQuery(this).parent(), - nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2]; - - // Walk the DOM tree up (first previous siblings, then parents) - // until boundary element - while($tgt.length > 0 && !$tgt.hasClass('sectionedit' + nr)) { - // go down when the sectionedit begin marker is below $tgt - if ($tgt.find('.sectionedit' + nr).length > 0) { - $tgt = $tgt.children().last(); - } else { - // $.last gives the DOM-ordered last element: - // prev if present, else parent. - $tgt = $tgt.prev().add($tgt.parent()).last(); - } - $tgt.addClass('section_highlight'); + nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2], + $highlight = jQuery(), // holder for elements in the section to be highlighted + $highlightWrap = jQuery('<div class="section_highlight"></div>'); // section highlight wrapper + + // Walk the dom tree in reverse to find the sibling which is or contains the section edit marker + while($tgt.length > 0 && !($tgt.hasClass('sectionedit' + nr) || $tgt.find('.sectionedit' + nr).length)) { + $tgt = $tgt.prev(); + $highlight = $highlight.add($tgt); } + // insert the section highlight wrapper before the last element added to $highlight + $highlight.filter(':last').before($highlightWrap); + // and move the elements to be highlighted inside the section highlight wrapper + $highlight.detach().appendTo($highlightWrap); }) .mouseout(function(){ - jQuery('.section_highlight').removeClass('section_highlight'); + // find the section highlight wrapper... + var $highlightWrap = jQuery('.section_highlight'); + // ...move its children in front of it (as siblings)... + $highlightWrap.before($highlightWrap.children().detach()); + // ...and remove the section highlight wrapper + $highlightWrap.detach(); }); }, diff --git a/lib/styles/all.css b/lib/styles/all.css index 5d7eb7d14..ff4bd2457 100644 --- a/lib/styles/all.css +++ b/lib/styles/all.css @@ -1,5 +1,5 @@ /** - * Basic styles. These styles are needed for basic DokuWiki functions + * Basic screen and print styles. These styles are needed for basic DokuWiki functions * regardless of the used template. Templates can override them of course */ diff --git a/lib/styles/print.css b/lib/styles/print.css index 76bc6d3bc..a5c39e889 100644 --- a/lib/styles/print.css +++ b/lib/styles/print.css @@ -1,23 +1,15 @@ /** - * Basic styles. These styles are needed for basic DokuWiki functions + * Basic print styles. These styles are needed for basic DokuWiki functions * regardless of the used template. Templates can override them of course */ -/* messages with msg() */ -div.error, +div.error, /* messages with msg() */ div.info, div.success, -div.notify { - display: none; -} - -/* section edit button */ -.secedit { - display: none; -} - -/* modal windows */ -.JSpopup, +div.notify, +.secedit, /* section edit button */ +.a11y, /* accessibly hidden text */ +.JSpopup, /* modal windows */ #link__wiz { display: none; } diff --git a/lib/styles/screen.css b/lib/styles/screen.css index 8ada48932..241904d7c 100644 --- a/lib/styles/screen.css +++ b/lib/styles/screen.css @@ -1,5 +1,5 @@ /** - * Basic styles. These styles are needed for basic DokuWiki functions + * Basic screen styles. These styles are needed for basic DokuWiki functions * regardless of the used template. Templates can override them of course */ @@ -73,12 +73,16 @@ div.notify { (e.g. for screen readers or to keep access keys working) */ .a11y { position: absolute !important; - left: -10000px !important; + left: -99999em !important; top: auto !important; width: 1px !important; height: 1px !important; overflow: hidden !important; } +[dir=rtl] .a11y { + left: auto !important; + right: -99999em !important; +} /* syntax highlighting code */ .code .br0 { color: #66cc66; } diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index 7d27381c9..0706303d0 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -1,6 +1,11 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forget to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and rtl are supported. rtl styles are loaded additionally diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index e4182774e..0c66c75b7 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -135,13 +135,10 @@ div.picker button.toolbutton { font-size: 75%; } -/* generic style for section highlighting (including headings) */ -.dokuwiki .section_highlight { -} -/* style for section highlighting (only sections below headings) */ +/* style for section highlighting */ .dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */ - padding: 3em .5em .01em .5em; + margin: 0 -1em; /* negative side margin = side padding + side border */ + padding: 0 .5em; border: solid __background_alt__; border-width: 0 .5em; } diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index e53ba45e5..7e5fb02cd 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -6,13 +6,9 @@ /* existing wikipage */ .dokuwiki a.wikilink1 { - color: __existing__; - background-color: inherit; } /* not existing wikipage */ .dokuwiki a.wikilink2 { - color: __missing__; - background-color: inherit; text-decoration: none; } .dokuwiki a.wikilink2:link, @@ -43,15 +39,15 @@ } /* external link */ .dokuwiki a.urlextern { - background-image: url(images/external-link.png); + background-image: url(../../images/external-link.png); } /* windows share */ .dokuwiki a.windows { - background-image: url(images/unc.png); + background-image: url(../../images/unc.png); } /* email link */ .dokuwiki a.mail { - background-image: url(images/email.png); + background-image: url(../../images/email.png); } /* icons of the following are set by dokuwiki in lib/exe/css.php */ diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index c67e16051..8d5e1e8ca 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -91,24 +91,35 @@ text-align: right; } +/* make it look like a tab (as in _tabs.css) */ #mediamanager__page .namespaces h2 { font-size: 1em; display: inline-block; - border-width: 0; padding: .3em .8em; - margin: 0 .3em 0 0; + margin: 0 0 0 .3em; border-radius: .5em .5em 0 0; font-weight: normal; background-color: __background_alt__; color: __text__; + border: 1px solid __border__; + border-bottom-color: __background_alt__; line-height: 1.4em; + position: relative; + bottom: -1px; + z-index: 2; } * html #mediamanager__page .namespaces h2, *+html #mediamanager__page .namespaces h2 { display: inline; } [dir=rtl] #mediamanager__page .namespaces h2 { - margin-right: 10px; + margin: 0 .3em 0 0; + position: relative; + right: 10px; +} +#mediamanager__page .namespaces .panelHeader { + border-top: 1px solid __border__; + z-index: 1; } #mediamanager__page .namespaces ul { @@ -165,10 +176,12 @@ #mediamanager__page .panelHeader ul li.listType { padding-left: 30px; + margin: 0 0 0 5px; background: url('../../images/icon-list.png') 3px 1px no-repeat; } #mediamanager__page .panelHeader ul li.sortBy { padding-left: 30px; + margin: 0 0 0 5px; background: url('../../images/icon-sort.png') 3px 1px no-repeat; } @@ -185,10 +198,10 @@ #mediamanager__page .filelist ul { padding: 0; - margin: 0; + margin: 0 10px 0 0; } -[dir=rtl] #mediamanager__page .filelist ul.tabs { - margin-right: 10px; +[dir=rtl] #mediamanager__page .filelist ul { + margin: 0 10px 0 0; } #mediamanager__page .filelist .panelContent ul li:hover { diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css index 1dffa8f7b..845ec9a57 100644 --- a/lib/tpl/dokuwiki/css/_tabs.css +++ b/lib/tpl/dokuwiki/css/_tabs.css @@ -2,40 +2,56 @@ * This file provides the styles for general tabs. */ +.dokuwiki .tabs > ul, .dokuwiki ul.tabs { padding: 0; margin: 0; overflow: hidden; + position: relative; } +/* border underneath */ +.dokuwiki .tabs > ul:after, +.dokuwiki ul.tabs:after { + position: absolute; + content: ""; + width: 100%; + bottom: 0; + left: 0; + border-bottom: 1px solid __border__; + z-index: 1; +} + +.dokuwiki .tabs > ul li, .dokuwiki ul.tabs li { float: left; padding: 0; margin: 0; list-style: none; } +[dir=rtl] .dokuwiki .tabs > ul li, [dir=rtl] .dokuwiki ul.tabs li { float: right; } +.dokuwiki .tabs > ul li a, .dokuwiki ul.tabs li strong, .dokuwiki ul.tabs li a { - float: left; + display: inline-block; padding: .3em .8em; - margin: 0 .3em 0 0; + margin: 0 0 0 .3em; background-color: __background_neu__; color: __text__; + border: 1px solid __border__; border-radius: .5em .5em 0 0; + position: relative; + z-index: 0; } +[dir=rtl] .dokuwiki .tabs > ul li a, [dir=rtl] .dokuwiki ul.tabs li strong, [dir=rtl] .dokuwiki ul.tabs li a { - float: right; - margin: 0 0 0 .3em; -} -*+html[dir=rtl] .dokuwiki ul.tabs li strong, -*+html[dir=rtl] .dokuwiki ul.tabs li a { - float: none; - display: inline-block; + margin: 0 .3em 0 0; } + .dokuwiki ul.tabs li strong { font-weight: normal; } @@ -43,6 +59,11 @@ .dokuwiki ul.tabs li a:link, .dokuwiki ul.tabs li a:visited { } +.dokuwiki .tabs > ul li a:hover, +.dokuwiki .tabs > ul li a:active, +.dokuwiki .tabs > ul li a:focus, +.dokuwiki .tabs > ul li .curid a, +.dokuwiki .tabs > ul .active a, .dokuwiki ul.tabs li a:hover, .dokuwiki ul.tabs li a:active, .dokuwiki ul.tabs li a:focus, @@ -50,4 +71,12 @@ background-color: __background_alt__; color: __text__; text-decoration: none; + font-weight: normal; +} + +.dokuwiki .tabs > ul li .curid a, +.dokuwiki .tabs > ul li .active a, +.dokuwiki ul.tabs li strong { + z-index: 2; + border-bottom-color: __background_alt__; } diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css index 0d1b976d1..1226b5b5b 100644 --- a/lib/tpl/dokuwiki/css/_toc.css +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -80,14 +80,14 @@ padding-right: 0; } .dokuwiki ul.idx li { - list-style-image: url(images/bullet.png); + list-style-image: url(../../images/bullet.png); } .dokuwiki ul.idx li.open { - list-style-image: url(images/open.png); + list-style-image: url(../../images/open.png); } .dokuwiki ul.idx li.closed { - list-style-image: url(images/closed.png); + list-style-image: url(../../images/closed.png); } [dir=rtl] .dokuwiki ul.idx li.closed { - list-style-image: url(images/closed-rtl.png); + list-style-image: url(../../images/closed-rtl.png); } diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 55c1d2dfe..8b7447239 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -38,11 +38,20 @@ caption, legend { font-family: Arial, sans-serif; font-weight: bold; - background-color: inherit; padding: 0; line-height: 1.2; clear: left; /* ideally 'both', but problems with toc */ } +[dir=rtl] h1, +[dir=rtl] h2, +[dir=rtl] h3, +[dir=rtl] h4, +[dir=rtl] h5, +[dir=rtl] h6, +[dir=rtl] caption, +[dir=rtl] legend { + clear: right; +} h1 { font-size: 2em; @@ -99,11 +108,20 @@ ul, ol { padding: 0 0 0 1.5em; } +[dir=rtl] ul, +[dir=rtl] ol { + padding: 0 1.5em 0 0; +} + li, dd { padding: 0; margin: 0 0 0 1.5em; } +[dir=rtl] li, +[dir=rtl] dd { + margin: 0 1.5em 0 0; +} dt { font-weight: bold; margin: 0; @@ -145,6 +163,9 @@ caption { text-align: left; margin: 0 0 .3em; } +[dir=rtl] caption { + text-align: right; +} th, td { @@ -158,6 +179,10 @@ th { font-weight: bold; background-color: __background_alt__; } +[dir=rtl] td, +[dir=rtl] th { + text-align: right; +} /*____________ links ____________*/ @@ -225,10 +250,18 @@ kbd { font-size: 1em; direction: ltr; text-align: left; + background-color: __background_site__; + color: __text__; + box-shadow: inset 0 0 .3em __border__; + border-radius: 2px; } pre { overflow: auto; word-wrap: normal; + border: 1px solid __border__; + border-radius: 2px; + box-shadow: inset 0 0 .5em __border__; + padding: .7em 1em; } blockquote { @@ -236,6 +269,9 @@ blockquote { border: solid __border__; border-width: 0 0 0 .25em; } +[dir=rtl] blockquote { + border-width: 0 .25em 0 0; +} q:before, q:after { content: ''; @@ -343,6 +379,10 @@ button, padding: .1em .5em; cursor: pointer; } +#IE7 input.button, +#IE7 button { + line-height: 1.4; +} input[type=submit]:hover, input[type=submit]:active, @@ -379,39 +419,3 @@ input[readonly], button[readonly] { cursor: auto; } - -/*____________ rtl corrections ____________*/ - -[dir=rtl] caption, -[dir=rtl] td, -[dir=rtl] th { - text-align: right; -} - -[dir=rtl] ul, -[dir=rtl] ol { - padding: 0 1.5em 0 0; -} -[dir=rtl] li, -[dir=rtl] dd { - margin: 0 1.5em 0 0; -} -[dir=rtl] blockquote { - border-width: 0 .25em 0 0; -} - -[dir=rtl] h1, -[dir=rtl] h2, -[dir=rtl] h3, -[dir=rtl] h4, -[dir=rtl] h5, -[dir=rtl] h6, -[dir=rtl] caption, -[dir=rtl] legend { - clear: right; -} - -[dir=rtl] .a11y { - left: auto; - right: -9000px; -} diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 9f3eab0f0..c23612643 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -6,7 +6,6 @@ * @author Clarence Lee <clarencedglee@gmail.com> */ - /*____________ section indenting ____________ .dokuwiki.page h1 {margin-left: 0;} @@ -34,6 +33,20 @@ /* hx margin-left = (1 / font-size) * .levelx-margin */ +/*____________ links to wiki pages (addition to _links) ____________*/ + +/* existing wikipage */ +.dokuwiki a.wikilink1 { + color: __existing__; + background-color: inherit; +} +/* not existing wikipage */ +.dokuwiki a.wikilink2 { + color: __missing__; + background-color: inherit; +} + + /*____________ images ____________*/ /* embedded images (styles are already partly set in lib/styles/all.css) */ @@ -69,6 +82,7 @@ /*____________ tables ____________*/ +/* div around each table */ .dokuwiki div.table { overflow-x: auto; margin-bottom: 1.4em; @@ -79,17 +93,6 @@ .dokuwiki table.inline { min-width: 50%; - border-width: 0; -} -.dokuwiki table.inline th, -.dokuwiki table.inline td { - border: 1px solid __border__; -} -.dokuwiki table.inline th { - color: inherit; - background-color: __background_alt__; -} -.dokuwiki table.inline td { } .dokuwiki table.inline tr:hover td { background-color: __background_alt__; @@ -101,22 +104,11 @@ /*____________ code ____________*/ -.dokuwiki pre, -.dokuwiki tt, -.dokuwiki code, -.dokuwiki samp, -.dokuwiki kbd { - background-color: __background_alt__; - color: __text__; -} /* fix if background-color hides underlining */ .dokuwiki em.u code { text-decoration: underline; } -.dokuwiki pre { - border: 1px solid __border__; - padding: .75em 1em; -} + /* for code in <file> */ .dokuwiki pre.file { } @@ -128,15 +120,15 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { - background-color: __background_alt__; - /*background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); see FS#2447 */ - background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); - background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background-color: __background_site__; + /* background: -moz-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); see FS#2447 */ + background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%); + background: -o-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); + background: -ms-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); + background: linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); color: inherit; border: 1px solid __border__; - border-bottom-color: __background_alt__; + border-bottom-color: __background_site__; border-top-left-radius: .3em; border-top-right-radius: .3em; padding: .3em .6em .1em; @@ -145,8 +137,7 @@ } [dir=rtl] .dokuwiki dl.code dt, [dir=rtl] .dokuwiki dl.file dt { - margin-left: 0; - margin-right: 1em; + float: right; } .dokuwiki dl.code dt a, .dokuwiki dl.file dt a { @@ -156,9 +147,216 @@ display: block; min-height: 16px; } + .dokuwiki dl.code dd, .dokuwiki dl.file dd { margin: 0; clear: left; + min-height: 1px; /* for IE7 */ +} +[dir=rtl] .dokuwiki dl.code dd, +[dir=rtl] .dokuwiki dl.file dd { + clear: right; +} + +.dokuwiki dl.code pre, +.dokuwiki dl.file pre { + box-shadow: inset -4px -4px .5em -.3em __border__; +} + + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + box-shadow: .1em .1em .1em __border__; + border-radius: 2px; + padding: .3em .5em; + font-size: .9em; +} +.dokuwiki form.search div.ajax_qsearch { + top: -.35em; + font-size: 1em; + text-overflow: ellipsis; } +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} +[dir=rtl] .JSpopup ul, +[dir=rtl] .JSpopup ol { + padding-right: 0; +} + + +/* changes to underscored CSS files +********************************************************************/ + +#acl__tree li { + margin: 0; +} + +#dokuwiki__content span.curid a { + font-weight: normal; +} +#dokuwiki__content strong span.curid a { + font-weight: bold; +} + + +/*____________ changes to _edit ____________*/ + +.dokuwiki div.toolbar button.toolbutton { + border-radius: 0; + border-left-width: 0; + padding: .1em .35em; +} +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-left-width: 1px; +} +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-left-width: 0; + border-right-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-left-width: 1px; +} + +.dokuwiki div.section_highlight { + margin: 0 -2em; + padding: 0 1em; + border-width: 0 1em; +} + +.dokuwiki textarea.edit { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; +} + +.dokuwiki div.preview { + margin: 0 -2em; + padding: 0 2em; +} +.dokuwiki.hasSidebar div.preview { + border-right: __sidebar_width__ solid __background_alt__; +} +[dir=rtl] .dokuwiki.hasSidebar div.preview { + border-right-width: 0; + border-left: __sidebar_width__ solid __background_alt__; +} +.dokuwiki div.preview div.pad { + padding: 1.556em 0 2em; +} + + +/*____________ changes to _toc ____________*/ + +#dw__toc { + margin: -1.556em -2em .5em 1.4em; + width: __sidebar_width__; + border-left: 1px solid __border__; + background: __background__; + color: inherit; +} +[dir=rtl] #dw__toc { + margin: -1.556em 1.4em .5em -2em; + border-left-width: 0; + border-right: 1px solid __border__; +} + +.dokuwiki h3.toggle { + padding: .5em 1em; + margin-bottom: 0; + font-size: .875em; + letter-spacing: .1em; +} +#dokuwiki__aside h3.toggle { + display: none; +} + +.dokuwiki .toggle strong { + background: transparent url(images/toc-arrows.png) 0 0; + width: 8px; + height: 5px; + margin: .4em 0 0; +} +.dokuwiki .toggle.closed strong { + background-position: 0 -5px; +} + +.dokuwiki .toggle strong span { + display: none; +} + + +#dw__toc > div { + font-size: 0.875em; + padding: .5em 1em 1em; +} +#dw__toc ul { + padding: 0 0 0 1.2em; +} +[dir=rtl] #dw__toc ul { + padding: 0 1.5em 0 0; +} +#dw__toc ul li { + list-style-image: url(images/toc-bullet.png); +} +#dw__toc ul li.clear { + list-style: none; +} +#dw__toc ul li div.li { + padding: .2em 0; +} + + +/*____________ changes to _imgdetail ____________*/ + +#dokuwiki__detail { + padding: 0; +} +#dokuwiki__detail img { + float: none; + margin-bottom: 1.4em; +} +#dokuwiki__detail div.img_detail { + float: none; +} + +#dokuwiki__detail div.img_detail dl { + overflow: hidden; +} +#dokuwiki__detail div.img_detail dl dt { + float: left; + width: 9em; + text-align: right; + clear: left; +} +[dir=rtl] #dokuwiki__detail div.img_detail dl dt { + float: right; + text-align: left; + clear: right; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 9.5em; +} +[dir=rtl] #dokuwiki__detail div.img_detail dl dd { + margin-left: 0; + margin-right: 9.5em; +} diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 12ec80687..2c2109228 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -264,7 +264,8 @@ /* make sidebar more condensed */ #dokuwiki__aside h1 { - margin-bottom: .222em; + font-size: 1.714em; + margin-bottom: .292em; } #dokuwiki__aside h2 { margin-bottom: .333em; @@ -294,15 +295,16 @@ #dokuwiki__aside ul, #dokuwiki__aside ol { - padding-left: 0; + padding-left: .5em; } [dir=rtl] #dokuwiki__aside ul, [dir=rtl] #dokuwiki__aside ol { - padding-right: 0; + padding-right: .5em; } #dokuwiki__aside li ul, #dokuwiki__aside li ol { margin-bottom: 0; + padding: 0; } #dokuwiki__aside a:link, @@ -362,215 +364,11 @@ text-align: left; } -/*____________ misc ____________*/ - /* license note under edit window */ .dokuwiki div.license { font-size: 93.75%; } -#IE7 .dokuwiki input.button, -#IE7 .dokuwiki button { - line-height: 1.4; -} - -#acl__tree li { - margin: 0; -} - -#dokuwiki__content span.curid a { - font-weight: normal; -} -#dokuwiki__content strong span.curid a { - font-weight: bold; -} - - -/*____________ changes to _edit ____________*/ - -.dokuwiki div.toolbar button.toolbutton { - border-radius: 0; - border-left-width: 0; - padding: .1em .35em; -} -.dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-left-width: 1px; -} -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-left-width: 0; - border-right-width: 1px; -} -.dokuwiki div.toolbar button.toolbutton:last-child { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-left-width: 1px; -} - -.dokuwiki div.section_highlight { - margin: -3em -2em -.01em -2em; - padding: 3em 1em .01em 1em; - border-width: 0 1em; -} -[dir=rtl] .dokuwiki div.section_highlight { - margin-right: -2em; - border-right-width: 1em; -} - -.dokuwiki textarea.edit { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; -} - -.dokuwiki div.preview { - margin: 0 -2em; - padding: 0 2em; -} -.dokuwiki.hasSidebar div.preview { - border-right: __sidebar_width__ solid __background_alt__; -} -[dir=rtl] .dokuwiki.hasSidebar div.preview { - border-right-width: 0; - border-left: __sidebar_width__ solid __background_alt__; -} -.dokuwiki div.preview div.pad { - padding: 1.556em 0 2em; -} - - -/*____________ changes to _toc ____________*/ - -#dw__toc { - margin: -1.556em -2em .5em 1.4em; - width: __sidebar_width__; - border-left: 1px solid __border__; - background: __background__; - color: inherit; -} -[dir=rtl] #dw__toc { - margin: -1.556em 1.4em .5em -2em; - border-left-width: 0; - border-right: 1px solid __border__; -} - -.dokuwiki h3.toggle { - padding: .5em 1em; - margin-bottom: 0; - font-size: .875em; - letter-spacing: .1em; -} -#dokuwiki__aside h3.toggle { - display: none; -} - -.dokuwiki .toggle strong { - background: transparent url(images/toc-arrows.png) 0 0; - width: 8px; - height: 5px; - margin: .4em 0 0; -} -.dokuwiki .toggle.closed strong { - background-position: 0 -5px; -} - -.dokuwiki .toggle strong span { - display: none; -} - - -#dw__toc > div { - font-size: 0.875em; - padding: .5em 1em 1em; -} -#dw__toc ul { - padding: 0 0 0 1.2em; -} -[dir=rtl] #dw__toc ul { - padding: 0 1.5em 0 0; -} -#dw__toc ul li { - list-style-image: url(images/toc-bullet.png); -} -#dw__toc ul li.clear { - list-style: none; -} -#dw__toc ul li div.li { - padding: .2em 0; -} - - -/*____________ changes to _imgdetail ____________*/ - -#dokuwiki__detail { - padding: 0; -} -#dokuwiki__detail img { - float: none; - margin-bottom: 1.4em; -} -#dokuwiki__detail div.img_detail { - float: none; -} - -#dokuwiki__detail div.img_detail dl { - overflow: hidden; -} -#dokuwiki__detail div.img_detail dl dt { - float: left; - width: 9em; - text-align: right; - clear: left; -} -[dir=rtl] #dokuwiki__detail div.img_detail dl dt { - float: right; - text-align: left; - clear: right; -} -#dokuwiki__detail div.img_detail dl dd { - margin-left: 9.5em; -} -[dir=rtl] #dokuwiki__detail div.img_detail dl dd { - margin-left: 0; - margin-right: 9.5em; -} - - -/*____________ JS popup ____________*/ - -.JSpopup { - background-color: __background__; - color: __text__; - border: 1px solid __border__; - box-shadow: .1em .1em .1em __border__; - border-radius: 2px; - padding: .3em .5em; - font-size: .9em; -} -.dokuwiki form.search div.ajax_qsearch { - top: -.35em; - font-size: 1em; - text-overflow: ellipsis; -} - -.JSpopup ul, -.JSpopup ol { - padding-left: 0; -} -[dir=rtl] .JSpopup ul, -[dir=rtl] .JSpopup ol { - padding-right: 0; -} - /* footer ********************************************************************/ diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index cc61ab06c..88333c012 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -11,9 +11,9 @@ z-index: 0; } -/* up to 979px screen widths +/* for screen widths in the tablet range ********************************************************************/ -@media only screen and (max-width: 979px) { +@media only screen and (max-width: __tablet_width__) { #screen__mode { z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ @@ -92,8 +92,8 @@ /* _edit */ .dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; - padding: 3em .5em .01em .5em; + margin: 0 -1em; + padding: 0 .5em; border-width: 0 .5em; } .dokuwiki div.preview { @@ -113,9 +113,9 @@ } /* /@media */ -/* up to 480px screen widths +/* for screen widths in the smartphone range ********************************************************************/ -@media only screen and (max-width: 480px) { +@media only screen and (max-width: __phone_width__) { #screen__mode { z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index 191d50c28..d30bc6c91 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -14,16 +14,11 @@ body { /* hide certain sections */ .a11y, -div.notify, -div.info, -div.success, -div.error, #dokuwiki__header .tools, #dokuwiki__aside, .dokuwiki .breadcrumbs, #dw__toc, h3.toggle, -.dokuwiki .secedit, #dokuwiki__pagetools, #dokuwiki__footer { display: none; @@ -57,14 +52,11 @@ h3.toggle, list-style-type: lower-roman; } -/* undo icons */ .dokuwiki a:link, .dokuwiki a:visited { text-decoration: underline; color: #333; background-color: inherit; - background-image: none; - padding: 0; } /* display href after link */ @@ -94,42 +86,12 @@ a.mail:after { } .dokuwiki img.medialeft { margin: .2em 1em .2em 0; - float: left; } .dokuwiki img.mediaright { margin: .2em 0 .2em 1em; - float: right; } .dokuwiki img.mediacenter { margin: .2em auto; - display: block; -} - -/* align table cells */ -.dokuwiki .leftalign { - text-align: left; -} -.dokuwiki .centeralign { - text-align: center; -} -.dokuwiki .rightalign { - text-align: right; -} - -/* underline */ -.dokuwiki em.u { - font-style: normal; - text-decoration: underline; -} -.dokuwiki em em.u { - font-style: italic; -} - -div.clearer { - clear: both; - line-height: 0; - height: 0; - overflow: hidden; } .dokuwiki blockquote { diff --git a/lib/tpl/dokuwiki/images/license.txt b/lib/tpl/dokuwiki/images/license.txt new file mode 100644 index 000000000..7d12604b6 --- /dev/null +++ b/lib/tpl/dokuwiki/images/license.txt @@ -0,0 +1,5 @@ +Icons for: sitetools.png +Icon set: Dusseldorf +Designer: pc.de +License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] +URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 6b1e95d62..963750a1c 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -42,7 +42,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); <div class="content"> <?php tpl_flush() ?> <?php tpl_includeFile('sidebarheader.html') ?> - <?php tpl_sidebar() ?> + <?php tpl_include_page($conf['sidebar'], 1, 1) ?> <?php tpl_includeFile('sidebarfooter.html') ?> </div> </div></div><!-- /aside --> @@ -91,7 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); </div></div><!-- /site --> <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> - <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div> + <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?> <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]--> </body> </html> diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 242b43080..67fbb3065 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -1,6 +1,11 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forget to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and all are supported. @@ -54,6 +59,9 @@ __background_neu__ = "#ddd" ; border color __border__ = "#ccc" +; highlighted text (e.g. search snippets) +__highlight__ = "#ff9" + ;-------------------------------------------------------------------------- __background_site__ = "#fbfaf9" @@ -63,9 +71,9 @@ __link__ = "#2b73b7" __existing__ = "#080" __missing__ = "#d30" -; highlighting search snippets -__highlight__ = "#ff9" - ; site and sidebar widths __site_width__ = "75em" __sidebar_width__ = "16em" +; cut off points for mobile devices +__tablet_width__ = "979px" +__phone_width__ = "480px" diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index dfac2ef4e..d32e94d39 100644 --- a/lib/tpl/dokuwiki/template.info.txt +++ b/lib/tpl/dokuwiki/template.info.txt @@ -1,7 +1,7 @@ -base dokuwiki +base dokuwiki author Anika Henke email anika@selfthinker.org -date 2012-09-08 +date 2012-10-26 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 357cc1f0d..3c00ab8e8 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -43,7 +43,11 @@ require_once(DOKU_INC.'inc/init.php'); </head> <body> <?php -$ini = @parse_ini_file($conf['template'].'/style.ini',true); +// get merged style.ini +define('SIMPLE_TEST', true); // hack to prevent css output and headers +require_once(DOKU_INC.'lib/exe/css.php'); +$ini = css_styleini(tpl_incdir()); + if ($ini) { echo '<table>'; echo "<caption>".htmlspecialchars($conf['template'])."'s style.ini</caption>"; @@ -60,7 +64,7 @@ if ($ini) { } echo '</table>'; } else { - echo "<p>Non-existent template: <strong>".htmlspecialchars($conf['template'])."</strong></p>"; + echo "<p>Non-existent or invalid template or style.ini: <strong>".htmlspecialchars($conf['template'])."</strong></p>"; } ?> </body> |
