diff options
Diffstat (limited to 'inc')
80 files changed, 963 insertions, 622 deletions
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index afa70168c..5c043fb6b 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -1207,7 +1207,7 @@ class JpegMeta { * @author Andreas Gohr <andi@splitbrain.org> */ function _parseFileInfo() { - if (file_exists($this->_fileName)) { + if (file_exists($this->_fileName) && is_file($this->_fileName)) { $this->_info['file'] = array(); $this->_info['file']['Name'] = basename($this->_fileName); $this->_info['file']['Path'] = fullpath($this->_fileName); diff --git a/inc/SimplePie.php b/inc/SimplePie.php index d35443165..10d8141bd 100644 --- a/inc/SimplePie.php +++ b/inc/SimplePie.php @@ -5,7 +5,7 @@ * A PHP-Based RSS and Atom Feed Framework. * Takes the hard work out of managing a complete RSS/Atom solution. * - * Copyright (c) 2004-2009, Ryan Parman and Geoffrey Sneddon + * Copyright (c) 2004-2011, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors * All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are @@ -33,10 +33,11 @@ * POSSIBILITY OF SUCH DAMAGE. * * @package SimplePie - * @version 1.2.1-dev - * @copyright 2004-2009 Ryan Parman, Geoffrey Sneddon + * @version 1.2.1 + * @copyright 2004-2011 Ryan Parman, Geoffrey Sneddon, Ryan McCue * @author Ryan Parman * @author Geoffrey Sneddon + * @author Ryan McCue * @link http://simplepie.org/ SimplePie * @link http://simplepie.org/support/ Please submit all bug reports and feature requests to the SimplePie forums * @license http://www.opensource.org/licenses/bsd-license.php BSD License @@ -55,9 +56,8 @@ define('SIMPLEPIE_VERSION', '1.2.1-dev'); /** * SimplePie Build - * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::parse_date() only every load of simplepie.inc) */ -define('SIMPLEPIE_BUILD', gmdate('YmdHis', SimplePie_Misc::parse_date(substr('$Date$', 7, 25)) ? SimplePie_Misc::parse_date(substr('$Date$', 7, 25)) : filemtime(__FILE__))); +define('SIMPLEPIE_BUILD', '20111015034325'); /** * SimplePie Website URL @@ -3279,6 +3279,11 @@ class SimplePie_Item { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML); + } + elseif (!$description_only) { return $this->get_content(true); @@ -3643,7 +3648,7 @@ class SimplePie_Item { return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT); } - elseif (($date = $this->get_date('U')) !== null) + elseif (($date = $this->get_date('U')) !== null && $date !== false) { return strftime($date_format, $date); } @@ -4068,16 +4073,16 @@ class SimplePie_Item $temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); if (sizeof($temp) > 0) { - (int) $seconds = array_pop($temp); + $seconds = (int) array_pop($temp); } if (sizeof($temp) > 0) { - (int) $minutes = array_pop($temp); + $minutes = (int) array_pop($temp); $seconds += $minutes * 60; } if (sizeof($temp) > 0) { - (int) $hours = array_pop($temp); + $hours = (int) array_pop($temp); $seconds += $hours * 3600; } unset($temp); @@ -5056,7 +5061,7 @@ class SimplePie_Item { foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content) { - if (isset($content['attribs']['']['url'])) + if (isset($content['attribs']['']['url']) || isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'])) { // Attributes $bitrate = null; @@ -5141,8 +5146,10 @@ class SimplePie_Item { $width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT); } - $url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); - + if (isset($content['attribs']['']['url'])) + { + $url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } // Checking the other optional media: elements. Priority: media:content, media:group, item, channel // CAPTIONS @@ -7731,16 +7738,17 @@ class SimplePie_File { $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN; $url_parts = parse_url($url); + $socket_host = $url_parts['host']; if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') { - $url_parts['host'] = "ssl://$url_parts[host]"; + $socket_host = "ssl://$url_parts[host]"; $url_parts['port'] = 443; } if (!isset($url_parts['port'])) { $url_parts['port'] = 80; } - $fp = @fsockopen($url_parts['host'], $url_parts['port'], $errno, $errstr, $timeout); + $fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout); if (!$fp) { $this->error = 'fsockopen error: ' . $errstr; @@ -8486,7 +8494,7 @@ class SimplePie_gzdecode // Get the length of the extra field $len = current(unpack('v', substr($this->compressed_data, $this->position, 2))); - $position += 2; + $this->position += 2; // Check the length of the string is still valid $this->min_compressed_size += $len + 4; @@ -9448,12 +9456,12 @@ class SimplePie_Misc } // This is first, as behaviour of this is completely predictable - if ($input === 'Windows-1252' && $output === 'UTF-8') + if ($input === 'windows-1252' && $output === 'UTF-8') { return SimplePie_Misc::windows_1252_to_utf8($data); } // This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported). - elseif (function_exists('mb_convert_encoding') && @mb_convert_encoding("\x80", 'UTF-16BE', $input) !== "\x00\x80" && ($return = @mb_convert_encoding($data, $output, $input))) + elseif (function_exists('mb_convert_encoding') && @mb_convert_encoding("\x80", 'UTF-16BE', $input) !== "\x00\x80" && in_array($input, mb_list_encodings()) && ($return = @mb_convert_encoding($data, $output, $input))) { return $return; } @@ -9469,6 +9477,17 @@ class SimplePie_Misc } } + /** + * Normalize an encoding name + * + * This is automatically generated by create.php + * + * To generate it, run `php create.php` on the command line, and copy the + * output to replace this function. + * + * @param string $charset Character set to standardise + * @return string Standardised name + */ function encoding($charset) { // Normalization from UTS #22 @@ -9502,7 +9521,6 @@ class SimplePie_Misc case 'big5': case 'csbig5': - case 'xxbig5': return 'Big5'; case 'big5hkscs': @@ -9658,14 +9676,14 @@ class SimplePie_Misc case 'isoir85': return 'ES2'; - case 'cseucfixwidjapanese': - case 'extendedunixcodefixedwidthforjapanese': - return 'Extended_UNIX_Code_Fixed_Width_for_Japanese'; - case 'cseucpkdfmtjapanese': case 'eucjp': case 'extendedunixcodepackedformatforjapanese': - return 'Extended_UNIX_Code_Packed_Format_for_Japanese'; + return 'EUC-JP'; + + case 'cseucfixwidjapanese': + case 'extendedunixcodefixedwidthforjapanese': + return 'Extended_UNIX_Code_Fixed_Width_for_Japanese'; case 'gb18030': return 'GB18030'; @@ -9744,80 +9762,6 @@ class SimplePie_Misc case 'ibmthai': return 'IBM-Thai'; - case 'ccsid858': - case 'cp858': - case 'ibm858': - case 'pcmultilingual850euro': - return 'IBM00858'; - - case 'ccsid924': - case 'cp924': - case 'ebcdiclatin9euro': - case 'ibm924': - return 'IBM00924'; - - case 'ccsid1140': - case 'cp1140': - case 'ebcdicus37euro': - case 'ibm1140': - return 'IBM01140'; - - case 'ccsid1141': - case 'cp1141': - case 'ebcdicde273euro': - case 'ibm1141': - return 'IBM01141'; - - case 'ccsid1142': - case 'cp1142': - case 'ebcdicdk277euro': - case 'ebcdicno277euro': - case 'ibm1142': - return 'IBM01142'; - - case 'ccsid1143': - case 'cp1143': - case 'ebcdicfi278euro': - case 'ebcdicse278euro': - case 'ibm1143': - return 'IBM01143'; - - case 'ccsid1144': - case 'cp1144': - case 'ebcdicit280euro': - case 'ibm1144': - return 'IBM01144'; - - case 'ccsid1145': - case 'cp1145': - case 'ebcdices284euro': - case 'ibm1145': - return 'IBM01145'; - - case 'ccsid1146': - case 'cp1146': - case 'ebcdicgb285euro': - case 'ibm1146': - return 'IBM01146'; - - case 'ccsid1147': - case 'cp1147': - case 'ebcdicfr297euro': - case 'ibm1147': - return 'IBM01147'; - - case 'ccsid1148': - case 'cp1148': - case 'ebcdicinternational500euro': - case 'ibm1148': - return 'IBM01148'; - - case 'ccsid1149': - case 'cp1149': - case 'ebcdicis871euro': - case 'ibm1149': - return 'IBM01149'; - case 'cp37': case 'csibm37': case 'ebcdiccpca': @@ -9965,6 +9909,12 @@ class SimplePie_Misc case 'ibm857': return 'IBM857'; + case 'ccsid858': + case 'cp858': + case 'ibm858': + case 'pcmultilingual850euro': + return 'IBM00858'; + case '860': case 'cp860': case 'csibm860': @@ -10067,6 +10017,12 @@ class SimplePie_Misc case 'ibm918': return 'IBM918'; + case 'ccsid924': + case 'cp924': + case 'ebcdiclatin9euro': + case 'ibm924': + return 'IBM00924'; + case 'cp1026': case 'csibm1026': case 'ibm1026': @@ -10075,6 +10031,68 @@ class SimplePie_Misc case 'ibm1047': return 'IBM1047'; + case 'ccsid1140': + case 'cp1140': + case 'ebcdicus37euro': + case 'ibm1140': + return 'IBM01140'; + + case 'ccsid1141': + case 'cp1141': + case 'ebcdicde273euro': + case 'ibm1141': + return 'IBM01141'; + + case 'ccsid1142': + case 'cp1142': + case 'ebcdicdk277euro': + case 'ebcdicno277euro': + case 'ibm1142': + return 'IBM01142'; + + case 'ccsid1143': + case 'cp1143': + case 'ebcdicfi278euro': + case 'ebcdicse278euro': + case 'ibm1143': + return 'IBM01143'; + + case 'ccsid1144': + case 'cp1144': + case 'ebcdicit280euro': + case 'ibm1144': + return 'IBM01144'; + + case 'ccsid1145': + case 'cp1145': + case 'ebcdices284euro': + case 'ibm1145': + return 'IBM01145'; + + case 'ccsid1146': + case 'cp1146': + case 'ebcdicgb285euro': + case 'ibm1146': + return 'IBM01146'; + + case 'ccsid1147': + case 'cp1147': + case 'ebcdicfr297euro': + case 'ibm1147': + return 'IBM01147'; + + case 'ccsid1148': + case 'cp1148': + case 'ebcdicinternational500euro': + case 'ibm1148': + return 'IBM01148'; + + case 'ccsid1149': + case 'cp1149': + case 'ebcdicis871euro': + case 'ibm1149': + return 'IBM01149'; + case 'csiso143iecp271': case 'iecp271': case 'isoir143': @@ -10617,11 +10635,6 @@ class SimplePie_Misc case 'sen850200c': return 'SEN_850200_C'; - case 'csshiftjis': - case 'mskanji': - case 'shiftjis': - return 'Shift_JIS'; - case 'csiso102t617bit': case 'isoir102': case 't617bit': @@ -10720,7 +10733,10 @@ class SimplePie_Misc case 'viscii': return 'VISCII'; + case 'csshiftjis': case 'cswindows31j': + case 'mskanji': + case 'shiftjis': case 'windows31j': return 'Windows-31J'; @@ -11381,6 +11397,58 @@ function embed_wmedia(width, height, link) { } <?php } + + + + /** + * Format debugging information + */ + function debug($sp) + { + $info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n"; + $info .= 'PHP ' . PHP_VERSION . "\n"; + if ($sp->error() !== null) + { + $info .= 'Error occurred: ' . $sp->error() . "\n"; + } + else + { + $info .= "No error found.\n"; + } + $info .= "Extensions:\n"; + $extensions = array('pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml'); + foreach ($extensions as $ext) + { + if (extension_loaded($ext)) + { + $info .= " $ext loaded\n"; + switch ($ext) + { + case 'pcre': + $info .= ' Version ' . PCRE_VERSION . "\n"; + break; + case 'curl': + $version = curl_version(); + $info .= ' Version ' . $version['version'] . "\n"; + break; + case 'mbstring': + $info .= ' Overloading: ' . mb_get_info('func_overload') . "\n"; + break; + case 'iconv': + $info .= ' Version ' . ICONV_VERSION . "\n"; + break; + case 'xml': + $info .= ' Version ' . LIBXML_DOTTED_VERSION . "\n"; + break; + } + } + else + { + $info .= " $ext not loaded\n"; + } + } + return $info; + } } /** @@ -11852,14 +11920,135 @@ class SimplePie_IRI /** * Replace invalid character with percent encoding * - * @access private * @param string $string Input string * @param string $valid_chars Valid characters * @param int $case Normalise case * @return string */ - function replace_invalid_with_pct_encoding($string, $valid_chars, $case = SIMPLEPIE_SAME_CASE) + function replace_invalid_with_pct_encoding($string, $valid_chars, $case = SIMPLEPIE_SAME_CASE, $iprivate = false) { + // Normalize as many pct-encoded sections as possible + $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string); + + // Replace invalid percent characters + $string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string); + + // Add unreserved and % to $valid_chars (the latter is safe because all + // pct-encoded sections are now valid). + $valid_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%'; + + // Now replace any bytes that aren't allowed with their pct-encoded versions + $position = 0; + $strlen = strlen($string); + while (($position += strspn($string, $valid_chars, $position)) < $strlen) + { + $value = ord($string[$position]); + + // Start position + $start = $position; + + // By default we are valid + $valid = true; + + // No one byte sequences are valid due to the while. + // Two byte sequence: + if (($value & 0xE0) === 0xC0) + { + $character = ($value & 0x1F) << 6; + $length = 2; + $remaining = 1; + } + // Three byte sequence: + elseif (($value & 0xF0) === 0xE0) + { + $character = ($value & 0x0F) << 12; + $length = 3; + $remaining = 2; + } + // Four byte sequence: + elseif (($value & 0xF8) === 0xF0) + { + $character = ($value & 0x07) << 18; + $length = 4; + $remaining = 3; + } + // Invalid byte: + else + { + $valid = false; + $length = 1; + $remaining = 0; + } + + if ($remaining) + { + if ($position + $length <= $strlen) + { + for ($position++; $remaining; $position++) + { + $value = ord($string[$position]); + + // Check that the byte is valid, then add it to the character: + if (($value & 0xC0) === 0x80) + { + $character |= ($value & 0x3F) << (--$remaining * 6); + } + // If it is invalid, count the sequence as invalid and reprocess the current byte: + else + { + $valid = false; + $position--; + break; + } + } + } + else + { + $position = $strlen - 1; + $valid = false; + } + } + + // Percent encode anything invalid or not in ucschar + if ( + // Invalid sequences + !$valid + // Non-shortest form sequences are invalid + || $length > 1 && $character <= 0x7F + || $length > 2 && $character <= 0x7FF + || $length > 3 && $character <= 0xFFFF + // Outside of range of ucschar codepoints + // Noncharacters + || ($character & 0xFFFE) === 0xFFFE + || $character >= 0xFDD0 && $character <= 0xFDEF + || ( + // Everything else not in ucschar + $character > 0xD7FF && $character < 0xF900 + || $character < 0xA0 + || $character > 0xEFFFD + ) + && ( + // Everything not in iprivate, if it applies + !$iprivate + || $character < 0xE000 + || $character > 0x10FFFD + ) + ) + { + // If we were a character, pretend we weren't, but rather an error. + if ($valid) + $position--; + + for ($j = $start; $j <= $position; $j++) + { + $string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1); + $j += 2; + $position += 2; + $strlen += 2; + } + } + } + // Normalise case if ($case & SIMPLEPIE_LOWERCASE) { @@ -11870,61 +12059,148 @@ class SimplePie_IRI $string = strtoupper($string); } - // Store position and string length (to avoid constantly recalculating this) - $position = 0; - $strlen = strlen($string); + return $string; + } - // Loop as long as we have invalid characters, advancing the position to the next invalid character - while (($position += strspn($string, $valid_chars, $position)) < $strlen) + /** + * Callback function for preg_replace_callback. + * + * Removes sequences of percent encoded bytes that represent UTF-8 + * encoded characters in iunreserved + * + * @access private + * @param array $match PCRE match + * @return string Replacement + */ + function remove_iunreserved_percent_encoded($match) + { + // As we just have valid percent encoded sequences we can just explode + // and ignore the first member of the returned array (an empty string). + $bytes = explode('%', $match[0]); + + // Initialize the new string (this is what will be returned) and that + // there are no bytes remaining in the current sequence (unsurprising + // at the first byte!). + $string = ''; + $remaining = 0; + + // Loop over each and every byte, and set $value to its value + for ($i = 1, $len = count($bytes); $i < $len; $i++) { - // If we have a % character - if ($string[$position] === '%') + $value = hexdec($bytes[$i]); + + // If we're the first byte of sequence: + if (!$remaining) { - // If we have a pct-encoded section - if ($position + 2 < $strlen && strspn($string, '0123456789ABCDEFabcdef', $position + 1, 2) === 2) - { - // Get the the represented character - $chr = chr(hexdec(substr($string, $position + 1, 2))); + // Start position + $start = $i; - // If the character is valid, replace the pct-encoded with the actual character while normalising case - if (strpos($valid_chars, $chr) !== false) - { - if ($case & SIMPLEPIE_LOWERCASE) - { - $chr = strtolower($chr); - } - elseif ($case & SIMPLEPIE_UPPERCASE) - { - $chr = strtoupper($chr); - } - $string = substr_replace($string, $chr, $position, 3); - $strlen -= 2; - $position++; - } + // By default we are valid + $valid = true; - // Otherwise just normalise the pct-encoded to uppercase - else + // One byte sequence: + if ($value <= 0x7F) + { + $character = $value; + $length = 1; + } + // Two byte sequence: + elseif (($value & 0xE0) === 0xC0) + { + $character = ($value & 0x1F) << 6; + $length = 2; + $remaining = 1; + } + // Three byte sequence: + elseif (($value & 0xF0) === 0xE0) + { + $character = ($value & 0x0F) << 12; + $length = 3; + $remaining = 2; + } + // Four byte sequence: + elseif (($value & 0xF8) === 0xF0) + { + $character = ($value & 0x07) << 18; + $length = 4; + $remaining = 3; + } + // Invalid byte: + else + { + $valid = false; + $remaining = 0; + } + } + // Continuation byte: + else + { + // Check that the byte is valid, then add it to the character: + if (($value & 0xC0) === 0x80) + { + $remaining--; + $character |= ($value & 0x3F) << ($remaining * 6); + } + // If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence: + else + { + $valid = false; + $remaining = 0; + $i--; + } + } + + // If we've reached the end of the current byte sequence, append it to Unicode::$data + if (!$remaining) + { + // Percent encode anything invalid or not in iunreserved + if ( + // Invalid sequences + !$valid + // Non-shortest form sequences are invalid + || $length > 1 && $character <= 0x7F + || $length > 2 && $character <= 0x7FF + || $length > 3 && $character <= 0xFFFF + // Outside of range of iunreserved codepoints + || $character < 0x2D + || $character > 0xEFFFD + // Noncharacters + || ($character & 0xFFFE) === 0xFFFE + || $character >= 0xFDD0 && $character <= 0xFDEF + // Everything else not in iunreserved (this is all BMP) + || $character === 0x2F + || $character > 0x39 && $character < 0x41 + || $character > 0x5A && $character < 0x61 + || $character > 0x7A && $character < 0x7E + || $character > 0x7E && $character < 0xA0 + || $character > 0xD7FF && $character < 0xF900 + ) + { + for ($j = $start; $j <= $i; $j++) { - $string = substr_replace($string, strtoupper(substr($string, $position + 1, 2)), $position + 1, 2); - $position += 3; + $string .= '%' . strtoupper($bytes[$j]); } } - // If we don't have a pct-encoded section, just replace the % with its own esccaped form else { - $string = substr_replace($string, '%25', $position, 1); - $strlen += 2; - $position += 3; + for ($j = $start; $j <= $i; $j++) + { + $string .= chr(hexdec($bytes[$j])); + } } } - // If we have an invalid character, change into its pct-encoded form - else + } + + // If we have any bytes left over they are invalid (i.e., we are + // mid-way through a multi-byte sequence) + if ($remaining) + { + for ($j = $start; $j < $len; $j++) { - $replacement = sprintf("%%%02X", ord($string[$position])); - $string = str_replace($string[$position], $replacement, $string); - $strlen = strlen($string); + $string .= '%' . strtoupper($bytes[$j]); } } + return $string; } @@ -14446,7 +14722,7 @@ class SimplePie_Parser case constant('XMLReader::END_ELEMENT'): if ($xml->namespaceURI !== '') { - $tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}"; + $tagName = $xml->namespaceURI . $this->separator . $xml->localName; } else { @@ -14458,7 +14734,7 @@ class SimplePie_Parser $empty = $xml->isEmptyElement; if ($xml->namespaceURI !== '') { - $tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}"; + $tagName = $xml->namespaceURI . $this->separator . $xml->localName; } else { @@ -14469,7 +14745,7 @@ class SimplePie_Parser { if ($xml->namespaceURI !== '') { - $attrName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}"; + $attrName = $xml->namespaceURI . $this->separator . $xml->localName; } else { diff --git a/inc/actions.php b/inc/actions.php index 1a0ae4028..4a2e200ae 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -101,7 +101,7 @@ function act_dispatch(){ if(checkSecurityToken()){ $ACT = act_save($ACT); }else{ - $ACT = 'show'; + $ACT = 'preview'; } } @@ -215,7 +215,7 @@ function act_clean($act){ //disable all acl related commands if ACL is disabled if(!$conf['useacl'] && in_array($act,array('login','logout','register','admin', 'subscribe','unsubscribe','profile','revert', - 'resendpwd','subscribens','unsubscribens',))){ + 'resendpwd'))){ msg('Command unavailable: '.htmlspecialchars($act),-1); return 'show'; } @@ -227,7 +227,7 @@ function act_clean($act){ 'preview','search','show','check','index','revisions', 'diff','recent','backlink','admin','subscribe','revert', 'unsubscribe','profile','resendpwd','recover', - 'draftdel','subscribens','unsubscribens','sitemap','media')) && substr($act,0,7) != 'export_' ) { + 'draftdel','sitemap','media')) && substr($act,0,7) != 'export_' ) { msg('Command unknown: '.htmlspecialchars($act),-1); return 'show'; } diff --git a/inc/auth.php b/inc/auth.php index eff984b36..e0f58e5f2 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -673,8 +673,14 @@ function auth_sendPassword($user,$password){ $text = str_replace('@PASSWORD@',$password,$text); $text = str_replace('@TITLE@',$conf['title'],$text); + if(empty($conf['mailprefix'])) { + $subject = $lang['regpwmail']; + } else { + $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail']; + } + return mail_send($userinfo['name'].' <'.$userinfo['mail'].'>', - $lang['regpwmail'], + $subject, $text, $conf['mailfrom']); } @@ -912,8 +918,14 @@ function act_resendpwd(){ $text = str_replace('@TITLE@',$conf['title'],$text); $text = str_replace('@CONFIRM@',$url,$text); + if(empty($conf['mailprefix'])) { + $subject = $lang['regpwmail']; + } else { + $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail']; + } + if(mail_send($userinfo['name'].' <'.$userinfo['mail'].'>', - $lang['regpwmail'], + $subject, $text, $conf['mailfrom'])){ msg($lang['resendpwdconfirm'],1); diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 9ffd3e18b..1fddad243 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -286,11 +286,13 @@ class auth_ad extends auth_basic { if(isset($changes['mail'])){ $adchanges['email'] = $changes['mail']; } - try { - $return = $return & $this->adldap->user_modify($user,$adchanges); - } catch (adLDAPException $e) { - if ($this->cnf['debug']) msg('AD Auth: '.$e->getMessage(), -1); - $return = false; + if(count($adchanges)){ + try { + $return = $return & $this->adldap->user_modify($user,$adchanges); + } catch (adLDAPException $e) { + if ($this->cnf['debug']) msg('AD Auth: '.$e->getMessage(), -1); + $return = false; + } } return $return; diff --git a/inc/common.php b/inc/common.php index ec7f9bece..0c769c50d 100644 --- a/inc/common.php +++ b/inc/common.php @@ -56,7 +56,7 @@ function stripctl($string){ * @return string */ function getSecurityToken(){ - return md5(auth_cookiesalt().session_id()); + return md5(auth_cookiesalt().session_id().$_SERVER['REMOTE_USER']); } /** @@ -714,8 +714,8 @@ function checklock($id){ } //my own lock - $ip = io_readFile($lock); - if( ($ip == clientIP()) || ($ip == $_SERVER['REMOTE_USER']) ){ + list($ip,$session) = explode("\n",io_readFile($lock)); + if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()){ return false; } @@ -738,7 +738,7 @@ function lock($id){ if($_SERVER['REMOTE_USER']){ io_saveFile($lock,$_SERVER['REMOTE_USER']); }else{ - io_saveFile($lock,clientIP()); + io_saveFile($lock,clientIP()."\n".session_id()); } } @@ -751,8 +751,8 @@ function lock($id){ function unlock($id){ $lock = wikiLockFN($id); if(@file_exists($lock)){ - $ip = io_readFile($lock); - if( ($ip == clientIP()) || ($ip == $_SERVER['REMOTE_USER']) ){ + list($ip,$session) = explode("\n",io_readFile($lock)); + if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()){ @unlink($lock); return true; } @@ -980,7 +980,7 @@ function saveWikiText($id,$text,$summary,$minor=false){ $file = wikiFN($id); $old = @filemtime($file); // from page - $wasRemoved = empty($text); + $wasRemoved = (trim($text) == ''); // check for empty or whitespace only $wasCreated = !@file_exists($file); $wasReverted = ($REV==true); $newRev = false; diff --git a/inc/config_cascade.php b/inc/config_cascade.php index c01778e99..443114f52 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -67,7 +67,10 @@ $config_cascade = array_merge( 'plugins' => array( 'local' => array(DOKU_CONF.'plugins.local.php'), - 'protected' => array(DOKU_CONF.'plugins.protected.php'), + 'protected' => array( + DOKU_CONF.'plugins.required.php', + DOKU_CONF.'plugins.protected.php', + ), ), ), $config_cascade diff --git a/inc/html.php b/inc/html.php index 7f5a46b93..1a2d7daef 100644 --- a/inc/html.php +++ b/inc/html.php @@ -899,45 +899,41 @@ function html_li_default($item){ * * @author Andreas Gohr <andi@splitbrain.org> */ -function html_buildlist($data,$class,$func,$lifunc='html_li_default'){ +function html_buildlist($data,$class,$func,$lifunc='html_li_default',$forcewrapper=false){ if (count($data) === 0) { return ''; } $start_level = $data[0]['level']; - $ret = ''; - - if ($start_level < 2) { - // Trigger building a wrapper ul if the first level is - // 0 (we have a root object) or 1 (just the root content) - --$start_level; - } - $level = $start_level; + $ret = ''; + $open = 0; foreach ($data as $item){ if( $item['level'] > $level ){ //open new list for($i=0; $i<($item['level'] - $level); $i++){ - if ($i) $ret .= "<li class=\"clear\">\n"; + if ($i) $ret .= "<li class=\"clear\">"; $ret .= "\n<ul class=\"$class\">\n"; + $open++; } + $level = $item['level']; + }elseif( $item['level'] < $level ){ //close last item $ret .= "</li>\n"; - for ($i=0; $i<($level - $item['level']); $i++){ + while( $level > $item['level'] && $open > 0 ){ //close higher lists $ret .= "</ul>\n</li>\n"; + $level--; + $open--; } } elseif ($ret !== '') { - //close last item + //close previous item $ret .= "</li>\n"; } - //remember current level - $level = $item['level']; - //print item $ret .= call_user_func($lifunc,$item); $ret .= '<div class="li">'; @@ -947,8 +943,15 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){ } //close remaining items and lists - while(--$level >= $start_level) { - $ret .= "</li></ul>\n"; + $ret .= "</li>\n"; + while($open-- > 0) { + $ret .= "</ul></li>\n"; + } + + if ($forcewrapper || $start_level < 2) { + // Trigger building a wrapper ul if the first level is + // 0 (we have a root object) or 1 (just the root content) + $ret = "\n<ul class=\"$class\">\n".$ret."</ul>\n"; } return $ret; @@ -1694,7 +1697,7 @@ function html_TOC($toc){ $out .= $lang['toc']; $out .= '</div>'.DOKU_LF; $out .= '<div id="toc__inside">'.DOKU_LF; - $out .= html_buildlist($toc,'toc','html_list_toc'); + $out .= html_buildlist($toc,'toc','html_list_toc','html_li_default',true); $out .= '</div>'.DOKU_LF.'</div>'.DOKU_LF; $out .= '<!-- TOC END -->'.DOKU_LF; return $out; diff --git a/inc/infoutils.php b/inc/infoutils.php index f1deec66b..2b8486906 100644 --- a/inc/infoutils.php +++ b/inc/infoutils.php @@ -24,7 +24,7 @@ function checkUpdateMessages(){ $lm = @filemtime($cf); // check if new messages needs to be fetched - if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_INC.'doku.php')){ + if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_INC.DOKU_SCRIPT)){ $http = new DokuHTTPClient(); $http->timeout = 8; $data = $http->get(DOKU_MESSAGEURL.$updateVersion); @@ -175,6 +175,12 @@ function check(){ msg('Lockdir is not writable',-1); } + if(is_writable(DOKU_CONF)){ + msg('conf directory is writable',1); + }else{ + msg('conf directory is not writable',-1); + } + if($conf['authtype'] == 'plain'){ global $config_cascade; if(is_writable($config_cascade['plainauth.users']['default'])){ diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index ee330099b..02a62fe94 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -123,7 +123,6 @@ $lang['js']['nosmblinks'] = 'الروابط لمجلدات مشاركة و $lang['js']['linkwiz'] = 'مرشد الروابط'; $lang['js']['linkto'] = 'الرابط إلى :'; $lang['js']['del_confirm'] = 'هل حقاً تريد حذف البنود المختارة؟'; -$lang['js']['mu_btn'] = 'رفع عدة ملفات في وقت واحد'; $lang['rssfailed'] = 'خطأ ما حدث أثناء جلب ملف التغذية:'; $lang['nothingfound'] = 'لا يوجد شيء'; $lang['mediaselect'] = 'ملفات الوسائط'; diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php index 302f24c16..13ba7b3c3 100644 --- a/inc/lang/az/lang.php +++ b/inc/lang/az/lang.php @@ -38,8 +38,6 @@ $lang['btn_backlink'] = 'Bura olan link-lər'; $lang['btn_backtomedia'] = 'media-fayl seçiminə qayıt'; $lang['btn_subscribe'] = 'Abunə ol (bütün dəyişiklər)'; $lang['btn_unsubscribe'] = 'Abunəlikdən çıx (bütün dəyişiklər)'; -$lang['btn_subscribens'] = 'Abunə ol (bu bölümün dəyişikləri)'; -$lang['btn_unsubscribens'] = 'Abunəlikdən çıx (bu bölümün dəyişikləri)'; $lang['btn_profile'] = 'Profil'; $lang['btn_reset'] = 'Boşalt'; $lang['btn_resendpwd'] = 'Yeni şifrəni göndər'; @@ -118,7 +116,6 @@ $lang['js']['nosmblinks'] = 'Windows-un şəbəkə qovluqlarına link ancaq $lang['js']['linkwiz'] = 'Linklər köməkçisi'; $lang['js']['linkto'] = 'Link göstərir:'; $lang['js']['del_confirm'] = 'Siz əminsiz ki, seçilmişləri silmək istəyirsiniz?'; -$lang['js']['mu_btn'] = 'Bir neçə faylı birdən yükləmək'; $lang['mediausage'] = 'Bu fayla link yaratmaq üçün aşağıdakı sintaksisdən istifadə edin:'; $lang['mediaview'] = 'Bu faylın ilkinə bax'; $lang['mediaroot'] = 'kök'; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index 580f6d963..1c6c90703 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -37,7 +37,7 @@ $lang['btn_update'] = 'Актуализиране'; $lang['btn_delete'] = 'Изтриване'; $lang['btn_back'] = 'Назад'; $lang['btn_backlink'] = 'Обратни препратки'; -$lang['btn_backtomedia'] = 'Назад към избора на медиен файл'; +$lang['btn_backtomedia'] = 'Назад към избора на файл'; $lang['btn_subscribe'] = 'Абонаменти'; $lang['btn_profile'] = 'Профил'; $lang['btn_reset'] = 'Изчистване'; @@ -47,6 +47,8 @@ $lang['btn_recover'] = 'Възстановяване на чернов $lang['btn_draftdel'] = 'Изтриване на чернова'; $lang['btn_revert'] = 'Възстановяване'; $lang['btn_register'] = 'Регистриране'; +$lang['btn_apply'] = 'Прилагане'; +$lang['btn_media'] = 'Диспечер на файлове'; $lang['loggedinas'] = 'Вписани сте като'; $lang['user'] = 'Потребител'; $lang['pass'] = 'Парола'; @@ -91,7 +93,7 @@ $lang['txt_filename'] = 'Качи като (незадължителн $lang['txt_overwrt'] = 'Презапиши съществуващите файлове'; $lang['lockedby'] = 'В момента е заключена от'; $lang['lockexpire'] = 'Ще бъде отключена на'; -$lang['js']['willexpire'] = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.'; +$lang['js']['willexpire'] = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.'; $lang['js']['notsavedyet'] = 'Незаписаните промени ще бъдат загубени. Желаете ли да продължите?'; $lang['js']['searchmedia'] = 'Търсене на файлове'; $lang['js']['keepopen'] = 'Без затваряне на прозореца след избор'; @@ -122,11 +124,21 @@ $lang['js']['nosmblinks'] = 'Връзките към Windows shares раб $lang['js']['linkwiz'] = 'Помощник за препратки'; $lang['js']['linkto'] = 'Препратка към: '; $lang['js']['del_confirm'] = 'Да бъдат ли изтрити избраните елементи?'; -$lang['js']['mu_btn'] = 'Качване на няколко файла наведнъж'; +$lang['js']['restore_confirm'] = 'Наистина ли желаете да бъде възстановена тази версия?'; +$lang['js']['media_diff'] = 'Преглед на разликите:'; +$lang['js']['media_diff_both'] = 'Един до друг'; +$lang['js']['media_diff_opacity'] = 'Наслагване (и прозиране)'; +$lang['js']['media_diff_portions'] = 'По половинка'; +$lang['js']['media_select'] = 'Изберете файлове...'; +$lang['js']['media_upload_btn'] = 'Качване'; +$lang['js']['media_done_btn'] = 'Готово'; +$lang['js']['media_drop'] = 'Влачете и пуснете файливе тук, за да бъдат качени'; +$lang['js']['media_cancel'] = 'премахване'; +$lang['js']['media_overwrt'] = 'Презапиши съществуващите файлове'; $lang['rssfailed'] = 'Възникна грешка при получаването на емисията: '; $lang['nothingfound'] = 'Нищо не е открито.'; -$lang['mediaselect'] = 'Медийни файлове'; -$lang['fileupload'] = 'Качване на медийни файлове'; +$lang['mediaselect'] = 'Файлове'; +$lang['fileupload'] = 'Качване на файлове'; $lang['uploadsucc'] = 'Качването е успешно'; $lang['uploadfail'] = 'Качването се провали. Може би поради грешни права?'; $lang['uploadwrong'] = 'Качването е отказано. Файлово разширение е забранено!'; @@ -177,6 +189,10 @@ $lang['mail_changed'] = 'променена страница: '; $lang['mail_subscribe_list'] = 'променени страници в именно пространство: '; $lang['mail_new_user'] = 'нов потребител: '; $lang['mail_upload'] = 'качен файл: '; +$lang['changes_type'] = 'Преглед на променените'; +$lang['pages_changes'] = 'Страници'; +$lang['media_changes'] = 'Файлове'; +$lang['both_changes'] = 'Страници и файлове'; $lang['qb_bold'] = 'Удебелен текст'; $lang['qb_italic'] = 'Курсив текст'; $lang['qb_underl'] = 'Подчертан текст'; @@ -217,6 +233,9 @@ $lang['img_copyr'] = 'Авторско право'; $lang['img_format'] = 'Формат'; $lang['img_camera'] = 'Фотоапарат'; $lang['img_keywords'] = 'Ключови думи'; +$lang['img_width'] = 'Ширина'; +$lang['img_height'] = 'Височина'; +$lang['img_manager'] = 'Преглед в диспечера на файлове'; $lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s'; $lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s'; $lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (на ел. поща) с профила ви.'; @@ -282,3 +301,27 @@ $lang['hours'] = 'преди %d часа'; $lang['minutes'] = 'преди %d минути'; $lang['seconds'] = 'преди %d секунди'; $lang['wordblock'] = 'Направените от вас промени не са съхранени, защото съдържат забранен текст (SPAM).'; +$lang['media_uploadtab'] = 'Качване'; +$lang['media_searchtab'] = 'Търсене'; +$lang['media_file'] = 'Файл'; +$lang['media_viewtab'] = 'Преглед'; +$lang['media_edittab'] = 'Редактиране'; +$lang['media_historytab'] = 'История'; +$lang['media_list_thumbs'] = 'Миниатюри'; +$lang['media_list_rows'] = 'Редове'; +$lang['media_sort_name'] = 'Име'; +$lang['media_sort_date'] = 'Дата'; +$lang['media_namespaces'] = 'Изберете:'; +$lang['media_files'] = 'Файлове в %s'; +$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_meta_edited'] = 'редактиране на метаданните'; +$lang['media_perm_read'] = 'За съжаление нямате достатъчно права, за да можете да прочетете файла.'; +$lang['media_perm_upload'] = 'За съжаление нямате достатъчно права, за да можете да качите файла.'; +$lang['media_update'] = 'Качване на нова версия'; +$lang['media_restore'] = 'Възстановяване на тази версия'; +$lang['plugin_install_err'] = 'Неправилно инсталирана приставка. Моля, преименувайте директорията \'%s\' на \'%s\'.'; diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php index c9c15b12d..eac9fc8d1 100644 --- a/inc/lang/ca-valencia/lang.php +++ b/inc/lang/ca-valencia/lang.php @@ -39,8 +39,6 @@ $lang['btn_backlink'] = 'Vínculs remitents'; $lang['btn_backtomedia'] = 'Tornar a la selecció d\'archius de mijos'; $lang['btn_subscribe'] = 'Subscriure\'s a la pàgina'; $lang['btn_unsubscribe'] = 'Desubscriure\'s de la pàgina'; -$lang['btn_subscribens'] = 'Subscriure\'s a l\'espai de noms'; -$lang['btn_unsubscribens'] = 'Desubscriure\'s de l\'espai de noms'; $lang['btn_profile'] = 'Actualisar perfil'; $lang['btn_reset'] = 'Reiniciar'; $lang['btn_resendpwd'] = 'Enviar contrasenya nova'; @@ -119,7 +117,6 @@ $lang['js']['nosmblinks'] = 'Els vínculs a recursos compartits de Windows $lang['js']['linkwiz'] = 'Assistent de vínculs'; $lang['js']['linkto'] = 'Vincular a:'; $lang['js']['del_confirm'] = '¿Realment vol borrar el(s) ítem(s) seleccionat(s)?'; -$lang['js']['mu_btn'] = 'Enviar diversos archius d\'una'; $lang['mediausage'] = 'Utilise la següent sintaxis per a referenciar est archiu:'; $lang['mediaview'] = 'Vore l\'archiu original'; $lang['mediaroot'] = 'base'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index fbd1cb18a..7094df5b4 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -39,8 +39,6 @@ $lang['btn_backlink'] = 'Què hi enllaça'; $lang['btn_backtomedia'] = 'Torna a la selecció de fitxers'; $lang['btn_subscribe'] = 'Subscripció a canvis d\'aquesta pàgina'; $lang['btn_unsubscribe'] = 'Cancel·la subscripció a pàgina'; -$lang['btn_subscribens'] = 'Subscripció a canvis d\'aquest espai'; -$lang['btn_unsubscribens'] = 'Cancel·la subscripció a espai'; $lang['btn_profile'] = 'Actualització del perfil'; $lang['btn_reset'] = 'Reinicia'; $lang['btn_resendpwd'] = 'Envia nova contrasenya'; @@ -120,7 +118,6 @@ Si voleu podeu copiar i enganxar l\'enllaç.'; $lang['js']['linkwiz'] = 'Auxiliar d\'enllaços'; $lang['js']['linkto'] = 'Enllaça a:'; $lang['js']['del_confirm'] = 'Suprimiu aquesta entrada?'; -$lang['js']['mu_btn'] = 'Penja múltiples fitxers'; $lang['mediausage'] = 'Utilitzeu la sintaxi següent per referir-vos a aquest enllaç:'; $lang['mediaview'] = 'Mostra el fitxer original'; $lang['mediaroot'] = 'arrel'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index eaefaadb5..c6eb7be49 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Marek Sacha <sachamar@fel.cvut.cz> * @author Lefty <lefty@multihost.cz> * @author Vojta Beran <xmamut@email.cz> + * @author zbynek.krivka@seznam.cz */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -51,6 +52,8 @@ $lang['btn_recover'] = 'Obnovit koncept'; $lang['btn_draftdel'] = 'Vymazat koncept'; $lang['btn_revert'] = 'Vrátit zpět'; $lang['btn_register'] = 'Registrovat'; +$lang['btn_apply'] = 'Použít'; +$lang['btn_media'] = 'Správa médií'; $lang['loggedinas'] = 'Přihlášen(a) jako'; $lang['user'] = 'Uživatelské jméno'; $lang['pass'] = 'Heslo'; @@ -95,7 +98,7 @@ $lang['txt_filename'] = 'Wiki jméno (volitelné)'; $lang['txt_overwrt'] = 'Přepsat existující soubor'; $lang['lockedby'] = 'Právě zamknuto:'; $lang['lockexpire'] = 'Zámek vyprší:'; -$lang['js']['willexpire'] = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.'; +$lang['js']['willexpire'] = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.'; $lang['js']['notsavedyet'] = 'Jsou tu neuložené změny, které budou ztraceny. Chcete opravdu pokračovat?'; $lang['js']['searchmedia'] = 'Hledat soubory'; @@ -127,7 +130,17 @@ Přesto tento odkaz můžete zkopírovat a vložit jinde.'; $lang['js']['linkwiz'] = 'Průvodce odkazy'; $lang['js']['linkto'] = 'Odkaz na:'; $lang['js']['del_confirm'] = 'Vymazat tuto položku?'; -$lang['js']['mu_btn'] = 'Načíst více souborů najednou'; +$lang['js']['restore_confirm'] = 'Opravdu obnovit tuto verzi?'; +$lang['js']['media_diff'] = 'Prohlédnout rozdíly:'; +$lang['js']['media_diff_both'] = 'Vedle sebe'; +$lang['js']['media_diff_opacity'] = 'Zvýraznění'; +$lang['js']['media_diff_portions'] = 'Osvědčit'; +$lang['js']['media_select'] = 'Vybrat soubory...'; +$lang['js']['media_upload_btn'] = 'Nahrát'; +$lang['js']['media_done_btn'] = 'Hotovo'; +$lang['js']['media_drop'] = 'Sem přetáhněte soubory pro nahrátí'; +$lang['js']['media_cancel'] = 'odstranit'; +$lang['js']['media_overwrt'] = 'Přepsat existující soubory'; $lang['rssfailed'] = 'Nastala chyba při vytváření tohoto RSS: '; $lang['nothingfound'] = 'Nic nenalezeno.'; $lang['mediaselect'] = 'Výběr dokumentu'; @@ -162,7 +175,7 @@ $lang['yours'] = 'Vaše verze'; $lang['diff'] = 'Zobrazit rozdíly vůči aktuální verzi'; $lang['diff2'] = 'Zobrazit rozdíly mezi vybranými verzemi'; $lang['difflink'] = 'Odkaz na výstup diff'; -$lang['diff_type'] = 'Prohlédnout rozdíly:'; +$lang['diff_type'] = 'Zobrazit rozdíly:'; $lang['diff_inline'] = 'Vložené'; $lang['diff_side'] = 'Přidané'; $lang['line'] = 'Řádek'; @@ -182,6 +195,10 @@ $lang['mail_changed'] = 'změna stránky:'; $lang['mail_subscribe_list'] = 'stránky změněné ve jmenném prostoru:'; $lang['mail_new_user'] = 'nový uživatel:'; $lang['mail_upload'] = 'načtený dokument:'; +$lang['changes_type'] = 'Prohlednou změny '; +$lang['pages_changes'] = 'stránek'; +$lang['media_changes'] = 'souborů médií'; +$lang['both_changes'] = 'stránek i médií'; $lang['qb_bold'] = 'Tučně'; $lang['qb_italic'] = 'Kurzíva'; $lang['qb_underl'] = 'Podtržení'; @@ -222,6 +239,9 @@ $lang['img_copyr'] = 'Copyright'; $lang['img_format'] = 'Formát'; $lang['img_camera'] = 'Typ fotoaparátu'; $lang['img_keywords'] = 'Klíčová slova'; +$lang['img_width'] = 'Šířka'; +$lang['img_height'] = 'Výška'; +$lang['img_manager'] = 'Zobrazit ve správě médií'; $lang['subscr_subscribe_success'] = '%s byl přihlášen do seznamu odběratelů %s'; $lang['subscr_subscribe_error'] = 'Došlo k chybě při přihlašování %s do seznamu odběratelů %s'; $lang['subscr_subscribe_noaddress'] = 'K Vašemu loginu neexistuje žádná adresa, nemohl jste být přihlášen do seznamu odběratelů.'; @@ -236,8 +256,8 @@ $lang['subscr_m_unsubscribe'] = 'Odhlásit z odběru změn emailem'; $lang['subscr_m_subscribe'] = 'Přihlásit se k odběru změn emailem'; $lang['subscr_m_receive'] = 'Přejete si dostávat'; $lang['subscr_style_every'] = 'email pro každou změnu'; -$lang['subscr_style_digest'] = 'souhrnný email změn pro každou stránku'; -$lang['subscr_style_list'] = 'seznam změněných stránek od posledního emailu'; +$lang['subscr_style_digest'] = 'souhrnný email změn pro každou stránku (každé %.2f dny/dní)'; +$lang['subscr_style_list'] = 'seznam změněných stránek od posledního emailu (každé %.2f dny/dní)'; $lang['authmodfailed'] = 'Autentizace uživatelů je špatně nastavena. Informujte prosím správce této wiki.'; $lang['authtempfail'] = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.'; $lang['i_chooselang'] = 'Vyberte si jazyk'; @@ -246,7 +266,7 @@ $lang['i_wikiname'] = 'Název wiki'; $lang['i_enableacl'] = 'Zapnout ACL (doporučeno)'; $lang['i_superuser'] = 'Správce'; $lang['i_problems'] = 'Instalátor narazil na níže popsané problémy. Nelze pokračovat v instalaci, dokud je neopravíte.'; -$lang['i_modified'] = 'Instalátor bude z bezpečnostních důvodů pracovat pouze s čistou a ještě neupravenou instalací DokuWiki. Buď znovu rozbalte souboru z instalačního balíčku nebo se zkuste poradit s <a href="http://dokuwiki.org/install">instrukcemi pro instalaci DokuWiki</a>.'; +$lang['i_modified'] = 'Instalátor bude z bezpečnostních důvodů pracovat pouze s čistou a ještě neupravenou instalací DokuWiki. Buď znovu rozbalte soubory z instalačního balíčku, nebo zkuste prostudovat <a href="http://dokuwiki.org/install">instrukce pro instalaci DokuWiki</a>.'; $lang['i_funcna'] = 'PHP funkce <code>%s</code> není dostupná. Váš webhosting ji možná z nějakého důvodu vypnul.'; $lang['i_phpver'] = 'Verze vaší instalace PHP <code>%s</code> je nižší než požadovaná <code>%s</code>. Budete muset aktualizovat svou instalaci PHP.'; $lang['i_permfail'] = 'DokuWiki nemůže zapisovat do <code>%s</code>. Budete muset opravit práva k tomuto adresáři.'; @@ -278,11 +298,35 @@ $lang['mu_filetypes'] = 'Povolené typy souborů'; $lang['mu_info'] = 'soubory načteny.'; $lang['mu_lasterr'] = 'Poslední chyba:'; $lang['recent_global'] = 'Právě si prohlížíte změny ve jmenném prostoru <b>%s</b>. Také si můžete <a href="%s">zobrazit změny v celé wiki</a>.'; -$lang['years'] = 'před % roky'; -$lang['months'] = 'před % měsíci'; -$lang['weeks'] = 'před % týdny'; -$lang['days'] = 'před % dny'; -$lang['hours'] = 'před % hodinami'; -$lang['minutes'] = 'před % minutami'; -$lang['seconds'] = 'před % sekundami'; +$lang['years'] = 'před %d roky'; +$lang['months'] = 'před %d měsíci'; +$lang['weeks'] = 'před %d týdny'; +$lang['days'] = 'před %d dny'; +$lang['hours'] = 'před %d hodinami'; +$lang['minutes'] = 'před %d minutami'; +$lang['seconds'] = 'před %d sekundami'; $lang['wordblock'] = 'Vaše změny nebyly uloženy, protože obsahují blokovaný text(spam).'; +$lang['media_uploadtab'] = 'Nahrát'; +$lang['media_searchtab'] = 'Hledat'; +$lang['media_file'] = 'Soubor'; +$lang['media_viewtab'] = 'Zobrazit'; +$lang['media_edittab'] = 'Upravit'; +$lang['media_historytab'] = 'Historie'; +$lang['media_list_thumbs'] = 'Zmenšeniny'; +$lang['media_list_rows'] = 'Řádky'; +$lang['media_sort_name'] = 'Jméno'; +$lang['media_sort_date'] = 'Datum'; +$lang['media_namespaces'] = 'Vyber jmenný prostor'; +$lang['media_files'] = 'Soubory v %s'; +$lang['media_upload'] = 'Upload do %s'; +$lang['media_search'] = 'Hledat v %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s na %s'; +$lang['media_edit'] = 'Upravit %s'; +$lang['media_history'] = 'Historie %s'; +$lang['media_meta_edited'] = 'metadata upravena'; +$lang['media_perm_read'] = 'Bohužel, nemáte práva číst soubory.'; +$lang['media_perm_upload'] = 'Bohužel, nemáte práva nahrávat soubory.'; +$lang['media_update'] = 'Nahrát novou verzi'; +$lang['media_restore'] = 'Obnovit tuto verzi'; +$lang['plugin_install_err'] = 'Plugin je špatně nainstalován. Přejmenujte adresář pluginu \'%s\' na \'%s\'.'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index 614f2bdf2..0b6961921 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -130,7 +130,6 @@ Du kan stadig kopiere og indsætte linket.'; $lang['js']['linkwiz'] = 'guiden til henvisninger'; $lang['js']['linkto'] = 'Henvise til:'; $lang['js']['del_confirm'] = 'Slet valgte post(er)?'; -$lang['js']['mu_btn'] = 'Overføre flere filer på en gang'; $lang['rssfailed'] = 'Der opstod en fejl ved indhentning af: '; $lang['nothingfound'] = 'Søgningen gav intet resultat.'; $lang['mediaselect'] = 'Vælg mediefil'; diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index 4d7c26621..3779d6fb3 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -18,8 +18,8 @@ * @author Marcel Metz <marcel_metz@gmx.de> * @author Matthias Schulte <mailinglist@lupo49.de> * @author Christian Wichmann <nospam@zone0.de> + * @author Pierre Corell <info@joomla-praxis.de> */ - $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; $lang['doublequoteopening'] = '„'; @@ -27,7 +27,6 @@ $lang['doublequoteclosing'] = '“'; $lang['singlequoteopening'] = '‚'; $lang['singlequoteclosing'] = '‘'; $lang['apostrophe'] = '’'; - $lang['btn_edit'] = 'Diese Seite bearbeiten'; $lang['btn_source'] = 'Zeige Quelltext'; $lang['btn_show'] = 'Seite anzeigen'; @@ -63,7 +62,6 @@ $lang['btn_revert'] = 'Wiederherstellen'; $lang['btn_register'] = 'Registrieren'; $lang['btn_apply'] = 'Übernehmen'; $lang['btn_media'] = 'Medien-Manager'; - $lang['loggedinas'] = 'Angemeldet als'; $lang['user'] = 'Benutzername'; $lang['pass'] = 'Passwort'; @@ -75,10 +73,9 @@ $lang['fullname'] = 'Voller Name'; $lang['email'] = 'E-Mail'; $lang['profile'] = 'Benutzerprofil'; $lang['badlogin'] = 'Nutzername oder Passwort sind falsch.'; -$lang['minoredit'] = 'kleine Änderung'; +$lang['minoredit'] = 'Kleine Änderung'; $lang['draftdate'] = 'Entwurf gespeichert am'; $lang['nosecedit'] = 'Diese Seite wurde in der Zwischenzeit geändert, da das Sektionsinfo veraltet ist. Die ganze Seite wird stattdessen geladen.'; - $lang['regmissing'] = 'Alle Felder müssen ausgefüllt werden'; $lang['reguexists'] = 'Der Nutzername existiert leider schon.'; $lang['regsuccess'] = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.'; @@ -88,12 +85,10 @@ $lang['regbadmail'] = 'Die angegebene Mail-Adresse scheint ungültig $lang['regbadpass'] = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuche es noch einmal.'; $lang['regpwmail'] = 'Ihr DokuWiki Passwort'; $lang['reghere'] = 'Du hast noch keinen Zugang? Hier registrieren'; - $lang['profna'] = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.'; $lang['profnochange'] = 'Keine Änderungen, nichts zu tun.'; $lang['profnoempty'] = 'Es muss ein Name oder eine E-Mail Adresse angegeben werden.'; $lang['profchanged'] = 'Benutzerprofil erfolgreich geändert.'; - $lang['pwdforget'] = 'Passwort vergessen? Fordere ein neues an'; $lang['resendna'] = 'Passwörter versenden ist in diesem Wiki nicht möglich.'; $lang['resendpwd'] = 'Neues Passwort senden für'; @@ -102,10 +97,8 @@ $lang['resendpwdnouser'] = 'Es tut mir Leid, aber der Benutzer existiert n $lang['resendpwdbadauth'] = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.'; $lang['resendpwdconfirm'] = 'Ein Bestätigungslink wurde per E-Mail versandt.'; $lang['resendpwdsuccess'] = 'Dein neues Passwort wurde per E-Mail versandt.'; - $lang['license'] = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:'; $lang['licenseok'] = 'Hinweis: Durch das Bearbeiten dieser Seite gibst du dein Einverständnis, dass dein Inhalt unter der folgenden Lizenz veröffentlicht wird:'; - $lang['searchmedia'] = 'Suche nach Datei:'; $lang['searchmedia_in'] = 'Suche in %s'; $lang['txt_upload'] = 'Datei zum Hochladen auswählen'; @@ -113,8 +106,7 @@ $lang['txt_filename'] = 'Hochladen als (optional)'; $lang['txt_overwrt'] = 'Bestehende Datei überschreiben'; $lang['lockedby'] = 'Momentan gesperrt von'; $lang['lockexpire'] = 'Sperre läuft ab am'; - -$lang['js']['willexpire'] = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.'; +$lang['js']['willexpire'] = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.'; $lang['js']['notsavedyet'] = 'Nicht gespeicherte Änderungen gehen verloren!'; $lang['js']['searchmedia'] = 'Suche nach Dateien'; $lang['js']['keepopen'] = 'Fenster nach Auswahl nicht schließen'; @@ -144,29 +136,26 @@ $lang['js']['nosmblinks'] = 'Das Verlinken von Windows-Freigaben funktionie $lang['js']['linkwiz'] = 'Link-Assistent'; $lang['js']['linkto'] = 'Link zu:'; $lang['js']['del_confirm'] = 'Die ausgewählten Dateien wirklich löschen?'; -$lang['js']['mu_btn'] = 'Mehrere Dateien gleichzeitig hochladen'; -$lang['js']['restore_confirm'] = 'Really restore this version?'; -$lang['js']['media_diff'] = 'Unterschiede anzeigen:'; -$lang['js']['media_diff_both'] = 'Side by Side'; -$lang['js']['media_diff_opacity'] = 'Überblenden'; +$lang['js']['restore_confirm'] = 'Wirkliich diese Version wieder herstellen?'; +$lang['js']['media_diff'] = 'Unterschiede anzeigen:'; +$lang['js']['media_diff_both'] = 'Seite für Seite'; +$lang['js']['media_diff_opacity'] = 'Überblenden'; $lang['js']['media_diff_portions'] = 'Übergang'; -$lang['js']['media_select'] = 'Dateien auswählen…'; -$lang['js']['media_upload_btn'] = 'Hochladen'; -$lang['js']['media_done_btn'] = 'Fertig'; -$lang['js']['media_drop'] = 'Dateien hier draufziehen um sie hochzuladen'; -$lang['js']['media_cancel'] = 'Entfernen'; -$lang['js']['media_overwrt'] = 'Existierende Dateien überschreiben'; - +$lang['js']['media_select'] = 'Dateien auswählen…'; +$lang['js']['media_upload_btn'] = 'Hochladen'; +$lang['js']['media_done_btn'] = 'Fertig'; +$lang['js']['media_drop'] = 'Dateien hier draufziehen um sie hochzuladen'; +$lang['js']['media_cancel'] = 'Entfernen'; +$lang['js']['media_overwrt'] = 'Existierende Dateien überschreiben'; $lang['rssfailed'] = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: '; $lang['nothingfound'] = 'Nichts gefunden.'; - $lang['mediaselect'] = 'Dateiauswahl'; $lang['fileupload'] = 'Datei hochladen'; $lang['uploadsucc'] = 'Datei wurde erfolgreich hochgeladen'; $lang['uploadfail'] = 'Hochladen fehlgeschlagen. Keine Berechtigung?'; $lang['uploadwrong'] = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.'; $lang['uploadexist'] = 'Datei existiert bereits. Keine Änderungen vorgenommen.'; -$lang['uploadbadcontent'] = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung % überein.'; +$lang['uploadbadcontent'] = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung %s überein.'; $lang['uploadspam'] = 'Hochladen verweigert: Treffer auf der Spamliste.'; $lang['uploadxss'] = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.'; $lang['uploadsize'] = 'Die hochgeladene Datei war zu groß. (max. %s)'; @@ -184,7 +173,6 @@ $lang['mediaextchange'] = 'Dateiendung vom .%s nach .%s geändert!'; $lang['reference'] = 'Verwendung von'; $lang['ref_inuse'] = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:'; $lang['ref_hidden'] = 'Einige Verweise sind auf Seiten, für die du keine Leseberechtigung hast.'; - $lang['hits'] = 'Treffer'; $lang['quickhits'] = 'Passende Seitennamen'; $lang['toc'] = 'Inhaltsverzeichnis'; @@ -208,18 +196,15 @@ $lang['external_edit'] = 'Externe Bearbeitung'; $lang['summary'] = 'Zusammenfassung'; $lang['noflash'] = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.'; $lang['download'] = 'Download-Teil'; - $lang['mail_newpage'] = 'Neue Seite:'; $lang['mail_changed'] = 'Seite geändert:'; $lang['mail_subscribe_list'] = 'Seite hat sich im Namespace geändert:'; $lang['mail_new_user'] = 'Neuer Benutzer:'; $lang['mail_upload'] = 'Datei hochgeladen:'; - $lang['changes_type'] = 'Änderungen anzeigen von'; $lang['pages_changes'] = 'Seiten'; $lang['media_changes'] = 'Mediendateien'; $lang['both_changes'] = 'Beides, Seiten- und Mediendateien'; - $lang['qb_bold'] = 'Fetter Text'; $lang['qb_italic'] = 'Kursiver Text'; $lang['qb_underl'] = 'Unterstrichener Text'; @@ -244,11 +229,8 @@ $lang['qb_media'] = 'Bilder und andere Dateien hinzufügen'; $lang['qb_sig'] = 'Unterschrift einfügen'; $lang['qb_smileys'] = 'Smileys'; $lang['qb_chars'] = 'Sonderzeichen'; - $lang['upperns'] = 'Gehe zum übergeordneten Namensraum'; - $lang['admin_register'] = 'Neuen Benutzer anmelden'; - $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; $lang['metasaveok'] = 'Metadaten gesichert'; @@ -266,7 +248,6 @@ $lang['img_keywords'] = 'Schlagwörter'; $lang['img_width'] = 'Breite'; $lang['img_height'] = 'Höhe'; $lang['img_manager'] = 'Im Medien-Manager anzeigen'; - $lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementenliste von %s hinzugefügt'; $lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementenliste von %s'; $lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden'; @@ -274,7 +255,6 @@ $lang['subscr_unsubscribe_success'] = 'Die Seite %s wurde von der Abonnementenli $lang['subscr_unsubscribe_error'] = 'Fehler beim Entfernen von %s von der Abonnementenliste von %s'; $lang['subscr_already_subscribed'] = '%s ist bereits auf der Abonnementenliste von %s'; $lang['subscr_not_subscribed'] = '%s ist nicht auf der Abonnementenliste von %s'; -// Manage page for subscriptions $lang['subscr_m_not_subscribed'] = 'Du hast kein Abonnement von dieser Seite oder dem Namensraum.'; $lang['subscr_m_new_header'] = 'Abonnementen hinzufügen'; $lang['subscr_m_current_header'] = 'Aktive Abonnements'; @@ -284,12 +264,8 @@ $lang['subscr_m_receive'] = 'Erhalten'; $lang['subscr_style_every'] = 'E-Mail bei jeder Änderung'; $lang['subscr_style_digest'] = 'E-Mail mit zusammengefasster Übersicht der Seitenänderungen (alle %.2f Tage)'; $lang['subscr_style_list'] = 'Auflistung aller geänderten Seiten seit der letzten E-Mail (alle %.2f Tage)'; - -/* auth.class language support */ $lang['authmodfailed'] = 'Benutzerüberprüfung nicht möglich. Bitte wende dich an den Admin.'; $lang['authtempfail'] = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Admin.'; - -/* installer strings */ $lang['i_chooselang'] = 'Wähle deine Sprache'; $lang['i_installer'] = 'DokuWiki-Installation'; $lang['i_wikiname'] = 'Wiki-Name'; @@ -312,7 +288,6 @@ $lang['i_pol1'] = 'Öffentliches Wiki (lesen für alle, schreiben $lang['i_pol2'] = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)'; $lang['i_retry'] = 'Wiederholen'; $lang['i_license'] = 'Bitte wähle die Lizenz aus unter der die Wiki-Inhalte veröffentlicht werden sollen:'; - $lang['mu_intro'] = 'In diesem Bereich kannst du mehrere Dateien gleichzeitig hochladen. Benutze die Schaltfläche "Durchsuchen", um sie der Warteschlange zuzufügen. Betätige die Schaltfläche "Hochladen", um die Übertragung zu starten.'; $lang['mu_gridname'] = 'Dateiname'; $lang['mu_gridsize'] = 'Größe'; @@ -328,7 +303,6 @@ $lang['mu_progress'] = '@PCT@% hochgeladen'; $lang['mu_filetypes'] = 'Erlaubte Dateitypen'; $lang['mu_info'] = 'Dateien hochgeladen.'; $lang['mu_lasterr'] = 'Letzter Fehler:'; - $lang['recent_global'] = 'Im Moment siehst du die Änderungen im Namensraum <b>%s</b>. Du kannst auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.'; $lang['years'] = 'vor %d Jahren'; $lang['months'] = 'vor %d Monaten'; @@ -337,30 +311,28 @@ $lang['days'] = 'vor %d Tagen'; $lang['hours'] = 'vor %d Stunden'; $lang['minutes'] = 'vor %d Minuten'; $lang['seconds'] = 'vor %d Sekunden'; - $lang['wordblock'] = 'Deine Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).'; - $lang['media_uploadtab'] = 'Hochladen'; $lang['media_searchtab'] = 'Suchen'; +$lang['media_file'] = 'Datei'; $lang['media_viewtab'] = 'Anzeigen'; $lang['media_edittab'] = 'Bearbeiten'; $lang['media_historytab'] = 'Verlauf'; -$lang['media_list_thumbs'] = '<span>Medien anzeigen als</span> Miniaturansicht'; -$lang['media_list_rows'] = '<span>Medien anzeigen als</span> Listenansicht'; -$lang['media_sort_name'] = '<span>Sortieren nach</span> Name'; -$lang['media_sort_date'] = '<span>Sortieren nach</span> Datum'; -$lang['media_files'] = 'Medien im Namespace <strong>%s</strong>.'; -$lang['media_upload'] = 'In den <strong>%s</strong> Namespace hochladen.'; -$lang['media_search'] = 'Im Namespace <strong>%s</strong> suchen.'; -$lang['media_view'] = '<span class="%s">%s</span>'; -$lang['media_edit'] = '<span class="%s">%s</span> bearbeiten'; -$lang['media_history'] = 'Versionen von <span class="%s">%s</span>'; +$lang['media_list_thumbs'] = 'Medien anzeigen als Miniaturansicht'; +$lang['media_list_rows'] = 'Medien anzeigen als Listenansicht'; +$lang['media_sort_name'] = 'Sortieren nach Name'; +$lang['media_sort_date'] = 'Sortieren nach Datum'; +$lang['media_namespaces'] = 'Namensraum wählen'; +$lang['media_files'] = 'Medien im Namensraum <strong>%s</strong>.'; +$lang['media_upload'] = 'In den <strong>%s</strong> Namensraum hochladen.'; +$lang['media_search'] = 'Im Namensraum <strong>%s</strong> suchen.'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s in %s'; +$lang['media_edit'] = '%s bearbeiten'; +$lang['media_history'] = 'Versionen von %s'; $lang['media_meta_edited'] = 'Meta-Informationen bearbeitet'; $lang['media_perm_read'] = 'Du besitzt nicht die notwendigen Berechtigungen um die Datei anzuzeigen.'; $lang['media_perm_upload'] = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.'; $lang['media_update'] = 'Neue Version hochladen'; $lang['media_restore'] = 'Diese Version wiederherstellen'; - -$lang['plugin_install_err'] = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen."; - -//Setup VIM: ex: et ts=2 : +$lang['plugin_install_err'] = 'Plugin nicht korrekt installiert. Plugin-Verzeichnis von \'%s\' nach \'%s\' umbenennen.'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index f647e6d64..3bd326c84 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -20,6 +20,7 @@ * @author Christian Wichmann <nospam@zone0.de> * @author Matthias Schulte <mailinglist@lupo49.de> * @author Paul Lachewsky <kaeptn.haddock@gmail.com> + * @author Pierre Corell <info@joomla-praxis.de> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -137,7 +138,6 @@ $lang['js']['nosmblinks'] = 'Das Verlinken von Windows-Freigaben funktionie $lang['js']['linkwiz'] = 'Link-Assistent'; $lang['js']['linkto'] = 'Link nach:'; $lang['js']['del_confirm'] = 'Eintrag wirklich löschen?'; -$lang['js']['mu_btn'] = 'Mehrere Dateien gleichzeitig hochladen'; $lang['js']['restore_confirm'] = 'Really restore this version?'; $lang['js']['media_diff'] = 'Unterschiede anzeigen:'; $lang['js']['media_diff_both'] = 'Side by Side'; @@ -316,18 +316,22 @@ $lang['seconds'] = 'vor %d Sekunden'; $lang['wordblock'] = 'Ihre Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).'; $lang['media_uploadtab'] = 'Hochladen'; $lang['media_searchtab'] = 'Suchen'; +$lang['media_file'] = 'Datei'; $lang['media_viewtab'] = 'Anzeigen'; $lang['media_edittab'] = 'Bearbeiten'; $lang['media_historytab'] = 'Verlauf'; -$lang['media_thumbsview'] = 'Miniaturansicht'; -$lang['media_listview'] = 'Detailansicht'; -$lang['media_sort'] = 'Sortieren'; +$lang['media_list_thumbs'] = 'Vorschaubilder'; +$lang['media_list_rows'] = 'Reihen'; $lang['media_sort_name'] = 'nach Name'; $lang['media_sort_date'] = 'nach Datum'; +$lang['media_namespaces'] = 'Namensraum wählen'; +$lang['media_files'] = 'Dateien in %s'; $lang['media_upload'] = 'In den <strong>%s</strong> Namespace hochladen.'; $lang['media_search'] = 'Im Namespace <strong>%s</strong> suchen.'; -$lang['media_edit'] = 'Bearbeiten'; -$lang['media_history'] = 'Versionsverlauf der Datei.'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s in %s'; +$lang['media_edit'] = '%s bearbeiten'; +$lang['media_history'] = 'Versionsverlauf von %s.'; $lang['media_meta_edited'] = 'Meta-Informationen bearbeitet'; $lang['media_perm_read'] = 'Sie besitzen nicht die notwendigen Berechtigungen um die Datei anzuzeigen.'; $lang['media_perm_upload'] = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index de8705db9..4c334c1de 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -127,7 +127,6 @@ $lang['js']['nosmblinks'] = 'Οι σύνδεσμοι προς Windows share $lang['js']['linkwiz'] = 'Αυτόματος Οδηγός Συνδέσμων'; $lang['js']['linkto'] = 'Σύνδεση σε:'; $lang['js']['del_confirm'] = 'Να διαγραφεί;'; -$lang['js']['mu_btn'] = 'Ταυτόχρονη φόρτωση πολλαπλών φακέλων'; $lang['js']['restore_confirm'] = 'Θέλετε την επαναφορά σε αυτή την έκδοση;'; $lang['js']['media_diff'] = 'Εμφάνιση διαφορών:'; $lang['js']['media_diff_both'] = 'Δίπλα δίπλα'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 92c7185b2..89a7c4d40 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -132,7 +132,6 @@ $lang['js']['nosmblinks'] = 'Linking to Windows shares only works in Micros $lang['js']['linkwiz'] = 'Link Wizard'; $lang['js']['linkto'] = 'Link to:'; $lang['js']['del_confirm'] = 'Really delete selected item(s)?'; -$lang['js']['mu_btn'] = 'Upload multiple files at once'; $lang['js']['restore_confirm'] = 'Really restore this version?'; $lang['js']['media_diff'] = 'View differences:'; $lang['js']['media_diff_both'] = 'Side by Side'; diff --git a/inc/lang/eo/conflict.txt b/inc/lang/eo/conflict.txt index 0d7ede0b0..603af39e1 100644 --- a/inc/lang/eo/conflict.txt +++ b/inc/lang/eo/conflict.txt @@ -2,4 +2,4 @@ Ekzistas pli nova versio de la dokumento. Tio okazas kiam iu alia uzanto ŝanĝigis enhavon de la dokumento dum vi redaktis ĝin. -Atente esploru distingojn kaj decidu kiun version vi tenigos. Se vi premos ''Konservi'', do via versio estos konservita. Presonte butonon ''Rezigni'' vi tenos la kurantan version. +Atente esploru distingojn kaj decidu kiun version vi tenigos. Se vi premos '"Konservi'", do via versio estos konservita. Presonte butonon '"Rezigni" vi tenos la kurantan version. diff --git a/inc/lang/eo/edit.txt b/inc/lang/eo/edit.txt index c1ca31e1d..9239c7fe6 100644 --- a/inc/lang/eo/edit.txt +++ b/inc/lang/eo/edit.txt @@ -1 +1 @@ -Redaktu paĝon kaj poste premu butonon titolitan ''Konservi''. Bonvolu tralegi la [[vikio:sintakso|vikian sintakson]] por kompreni kiel vi povas krei paĝojn. Bonvolu redakti nur se vi planas **plibonigi** la enhavon de la paĝo. Se vi volas nur testi ion, do bonvolu uzi specialan paĝon: [[vikio:ludejo|ludejo]]. +Redaktu paĝon kaj poste premu butonon titolitan '"Konservi'". Bonvolu tralegi la [[vikio:sintakso|vikian sintakson]] por kompreni kiel vi povas krei paĝojn. Bonvolu redakti nur se vi planas **plibonigi** la enhavon de la paĝo. Se vi volas nur testi ion, do bonvolu uzi specialan paĝon: [[vikio:ludejo|ludejo]]. diff --git a/inc/lang/eo/index.txt b/inc/lang/eo/index.txt index 08bf3c894..4ef720cb2 100644 --- a/inc/lang/eo/index.txt +++ b/inc/lang/eo/index.txt @@ -1,3 +1,3 @@ ====== Enhavo ====== -Tio ĉi estas indekso pri ĉiuj disponeblaj paĝoj ordigitaj laŭ [[doku>namespaces|nomspacoj]].
\ No newline at end of file +Tio ĉi estas indekso pri ĉiuj disponeblaj paĝoj ordigitaj laŭ [[doku>namespaces|nomspacoj]].
\ No newline at end of file diff --git a/inc/lang/eo/install.html b/inc/lang/eo/install.html index 74bbe15e2..9f43ae82e 100644 --- a/inc/lang/eo/install.html +++ b/inc/lang/eo/install.html @@ -1,9 +1,9 @@ -<p>Tiu ĉi paĝo helpas en la unua instalo kaj agordado de <a href="http://dokuwiki.org">DokuWiki</a>. Pli da informo pri tiu instalilo estas disponebla en ĝia propra <a href="http://dokuwiki.org/installer">dokumentada paĝo</a>.</p> +<p>Tiu ĉi paĝo helpas en la unua instalo kaj agordado de <a href="http://dokuwiki.org">DokuWiki</a>. Pli da informo pri tiu instalilo estas disponebla en ĝia propra <a href="http://dokuwiki.org/installer">dokumentada paĝo</a>.</p> -<p>DokuWiki uzas ordinarajn dosierojn por konservi vikiajn paĝojn kaj aliajn informojn asociitaj al tiuj paĝoj (ekz. bildoj, serĉindeksoj, malnovaj revizioj, ktp). Por bone funkcii, DokuWiki <strong>devas</strong> havi registran rajton sur la subdosierujoj, kiuj entenas tiujn dosierojn. Tiu ĉi instalilo ne kapablas difini permes-atributojn de dosierujoj. Ordinare, tio devas esti senpere farita de iu komando en konzolo aŭ, se vi abonas retprovizanton, per FTP aŭ kontrola panelo de tiu retprovizanto (ekz. cPanel).</p> +<p>DokuWiki uzas ordinarajn dosierojn por konservi vikiajn paĝojn kaj aliajn informojn asociitaj al tiuj paĝoj (ekz. bildoj, serĉindeksoj, malnovaj revizioj, ktp). Por bone funkcii, DokuWiki <strong>devas</strong> havi registran rajton sur la subdosierujoj, kiuj entenas tiujn dosierojn. Tiu ĉi instalilo ne kapablas difini permes-atributojn de dosierujoj. Ordinare, tio devas esti senpere farita de iu komando en konzolo aŭ, se vi abonas retprovizanton, per FTP aŭ kontrola panelo de tiu retprovidanto (ekz. cPanel).</p> -<p>Tiu ĉi instalilo difinos vian DokuWiki-an agordadon por <acronym title="alir-kontrola listo">ACL</acronym>, kiu ebligas al administranto identiĝi kaj aliri taŭgan interfacon por instali kromaĵojn, administri uzantojn kaj alireblon al vikipaĝoj, kaj difini agordojn ĝeneralajn. -Ĝi ne estas nepra por ke DokuWiki funkciu, tamen ĝi multe faciligos administradon.</p> +<p>Tiu ĉi instalilo difinos vian DokuWiki-an agordadon por <acronym title="alir-kontrola listo">ACL</acronym>, kiu ebligas al administranto identiĝi kaj aliri taŭgan interfacon por instali kromaĵojn, administri uzantojn kaj alireblon al vikipaĝoj, kaj difini agordojn ĝeneralajn. +Ĝi ne estas nepra por ke DokuWiki funkciu, tamen ĝi multe faciligos administradon.</p> -<p>Spertuloj aŭ uzantoj kiuj bezonas specialajn agordrimedojn devus uzi tiujn ligilojn por havi pli detalojn pri <a href="http://dokuwiki.org/install">instaladaj instrukcioj</a> -kaj <a href="http://dokuwiki.org/config">agordadaj difinoj</a>.</p>
\ No newline at end of file +<p>Spertuloj aŭ uzantoj kiuj bezonas specialajn agordrimedojn devus uzi tiujn ligilojn por havi pli detalojn pri <a href="http://dokuwiki.org/install">instaladaj instrukcioj</a> +kaj <a href="http://dokuwiki.org/config">agordadaj difinoj</a>.</p>
\ No newline at end of file diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 94bd244ac..01772726f 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -52,8 +52,8 @@ $lang['btn_draftdel'] = 'Forigi skizon'; $lang['btn_revert'] = 'Restarigi'; $lang['btn_register'] = 'Registriĝi'; $lang['btn_apply'] = 'Apliki'; -$lang['btn_media'] = 'Media-administrilo'; -$lang['loggedinas'] = 'Ensalutita kiel'; +$lang['btn_media'] = 'Medio-administrilo'; +$lang['loggedinas'] = 'Ensalutinta kiel'; $lang['user'] = 'Uzant-nomo'; $lang['pass'] = 'Pasvorto'; $lang['newpass'] = 'Nova pasvorto'; @@ -66,16 +66,16 @@ $lang['profile'] = 'Uzanto-profilo'; $lang['badlogin'] = 'Pardonu, uzant-nomo aŭ pasvorto estis erara.'; $lang['minoredit'] = 'Etaj modifoj'; $lang['draftdate'] = 'Lasta konservo de la skizo:'; -$lang['nosecedit'] = 'La paĝo ŝanĝiĝis intertempe, sekcio-informo estis malĝisdata, ni ŝargas la tutan paĝon anstataŭe.'; +$lang['nosecedit'] = 'La paĝo ŝanĝiĝis intertempe, sekcio-informo estis malĝisdata, tial la tuta paĝo estas reŝargita.'; $lang['regmissing'] = 'Pardonu, vi devas plenigi ĉiujn kampojn.'; -$lang['reguexists'] = 'Pardonu, ĉi tiu uzanto-nomo jam estas okupita.'; +$lang['reguexists'] = 'Pardonu, ĉi tiu uzanto-nomo jam ekzistas.'; $lang['regsuccess'] = 'La uzanto estas kreita kaj la pasvorto estis elsendita per retpoŝto.'; $lang['regsuccess2'] = 'La uzanto estas kreita.'; $lang['regmailfail'] = 'Ŝajne okazis eraro dum elsendo de la pasvorto. Bonvolu informi administranton pri tio!'; $lang['regbadmail'] = 'Entajpita retpoŝta adreso ne ŝajnas valida. Se vi pensas, ke tio estas eraro, kontaktu la administranton.'; $lang['regbadpass'] = 'La du pasvortoj ne samas, bonvolu provi refoje.'; $lang['regpwmail'] = 'Via DokuWiki-pasvorto'; -$lang['reghere'] = 'Se vi ne havas konton, do vi povas akiri ĝin'; +$lang['reghere'] = 'Se vi ne havas konton, vi povas akiri ĝin'; $lang['profna'] = 'Tiu ĉi vikio ne ebligas modifon en la profiloj.'; $lang['profnochange'] = 'Neniu ŝanĝo, nenio farinda.'; $lang['profnoempty'] = 'Malplena nomo aŭ retadreso ne estas permesataj.'; @@ -124,12 +124,10 @@ $lang['js']['medialeft'] = 'Meti la bildon maldekstren.'; $lang['js']['mediaright'] = 'Meti la bildon dekstren.'; $lang['js']['mediacenter'] = 'Meti la bildon mezen.'; $lang['js']['medianoalign'] = 'Ne uzi poziciigon.'; -$lang['js']['nosmblinks'] = 'Tio ĉi nur funkcias en la Vindozaĉa "Microsoft Internet Explorer". -Vi ankoraŭ povas kopii kaj almeti la ligilon.'; +$lang['js']['nosmblinks'] = 'Tio ĉi nur funkcias en la Vindozaĉa "Microsoft Internet Explorer".\nVi ankoraŭ povas kopii kaj almeti la ligilon.'; $lang['js']['linkwiz'] = 'Ligil-Asistanto'; $lang['js']['linkto'] = 'Ligilo al:'; $lang['js']['del_confirm'] = 'Ĉu vere forigi elektitajn ero(j)n?'; -$lang['js']['mu_btn'] = 'Alŝuti plurajn dosierojn multope.'; $lang['js']['restore_confirm'] = 'Ĉu vere restarigi ĉi tiun version?'; $lang['js']['media_diff'] = 'Rigardu la diferencojn:'; $lang['js']['media_diff_both'] = 'Flankon apud flanko'; @@ -167,11 +165,11 @@ $lang['mediaextchange'] = 'La dosiersufikso ŝanĝis de .%s al .%s!'; $lang['reference'] = 'Referencoj por'; $lang['ref_inuse'] = 'La dosiero ne povas esti forigita, ĉar ĝi ankoraŭ estas uzata de la jenaj paĝoj:'; $lang['ref_hidden'] = 'Kelkaj referencoj estas en paĝoj, kiujn vi ne rajtas legi'; -$lang['hits'] = 'Kongruoj'; -$lang['quickhits'] = 'Kongruoj trovitaj en paĝnomoj'; +$lang['hits'] = 'Trafoj'; +$lang['quickhits'] = 'Trafoj trovitaj en paĝnomoj'; $lang['toc'] = 'Enhavtabelo'; $lang['current'] = 'aktuala'; -$lang['yours'] = 'Via Versio'; +$lang['yours'] = 'Via versio'; $lang['diff'] = 'Montri diferencojn el la aktuala versio'; $lang['diff2'] = 'Montri diferencojn inter la elektitaj revizioj'; $lang['difflink'] = 'Ligilo al kompara rigardo'; @@ -256,8 +254,8 @@ $lang['subscr_m_unsubscribe'] = 'Malaboni'; $lang['subscr_m_subscribe'] = 'Aboni'; $lang['subscr_m_receive'] = 'Ricevi'; $lang['subscr_style_every'] = 'retpoŝtaĵo pro ĉiu ŝanĝo'; -$lang['subscr_style_digest'] = 'kolekta retpoŝtaĵo de ŝanĝoj por ĉiu paĝo'; -$lang['subscr_style_list'] = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo'; +$lang['subscr_style_digest'] = 'resuma retpoŝtaĵo de ŝanĝoj por ĉiu paĝo (je %.2f tagoj)'; +$lang['subscr_style_list'] = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo (je %.2f tagoj)'; $lang['authmodfailed'] = 'Malbona agordo por identigi la uzanton. Bonvolu informi la administranton de la vikio.'; $lang['authtempfail'] = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.'; $lang['i_chooselang'] = 'Elektu vian lingvon'; @@ -266,18 +264,18 @@ $lang['i_wikiname'] = 'Nomo de la vikio'; $lang['i_enableacl'] = 'Ebligi "ACL" (alirkontrolo, rekomendinde)'; $lang['i_superuser'] = 'Superuzanto'; $lang['i_problems'] = 'La instalilo trovis kelkajn problemojn, indikitaj sube. Vi ne povas pluiri ĝis ili estos iel korektitaj.'; -$lang['i_modified'] = 'Pro sekureco tiu ĉi instalilo nur funkcias por nova kaj nemodifita Dokuwiki-pakaĵo. +$lang['i_modified'] = 'Pro sekureco tiu ĉi instalilo nur funkcias por nova kaj nemodifita DokuWiki-pakaĵo. Vi devas aŭ redemeti la dosierojn el la elŝutita pakaĵo aŭ plibone informiĝi pri la instalada procezo.'; $lang['i_funcna'] = 'La PHP-a funkcio <code>%s</code> ne estas uzebla. Eble via retprovizanto ial malpermesis tion?'; $lang['i_phpver'] = 'La versio de la PHP <code>%s</code> estas pli malnova ol la bezonata <code>%s</code>. Vi bezonas ĝisdatigi la PHP-an instalon.'; $lang['i_permfail'] = '<code>%s</code> ne estas skribebla por DokuWiki. Vi devas redifini la permes-atributojn de tiu ĉi dosierujo!'; $lang['i_confexists'] = '<code>%s</code> jam ekzistas'; -$lang['i_writeerr'] = 'Ne eblas krei "<code>%s</code>"-on. Vi bezonas kontroli la permesojn de la dosier(uj)oj kaj mem krej la dosieron.'; +$lang['i_writeerr'] = 'Ne eblas krei "<code>%s</code>". Vi bezonas kontroli la permesojn de la dosier(uj)oj kaj mem krej la dosieron.'; $lang['i_badhash'] = 'dokuwiki.php ne estas rekonebla aŭ ĝi estas modifita (hash=<code>%s</code>)'; $lang['i_badval'] = '<code>%s</code> - malvalida aŭ malplena valoro'; $lang['i_success'] = 'La agordado estas sukcese kompletita. Vi povas forigi la dosieron nun. Pluiru al <a href="doku.php">via nova DokuWiki</a>.'; $lang['i_failure'] = 'Kelkaj eraroj okazis dum la konservo de la agordaj dosieroj. Vi devas senpere korekti ilin antaŭ ol vi povos uzi <a href="doku.php">vian novan DokuWiki-on</a>. '; -$lang['i_policy'] = 'Apriora ACL-a agordo'; +$lang['i_policy'] = 'Komenca ACL-a agordo'; $lang['i_pol0'] = 'Malferma Vikio (legi, skribi, alŝuti povas ĉiuj)'; $lang['i_pol1'] = 'Publika Vikio (legi povas ĉiuj, skribi kaj alŝuti povas registritaj uzantoj)'; $lang['i_pol2'] = 'Ferma Vikio (legi, skribi, alŝuti nur povas registritaj uzantoj)'; @@ -309,18 +307,22 @@ $lang['seconds'] = 'antaŭ %d sekundoj'; $lang['wordblock'] = 'Via ŝanĝo ne estis savita, ĉar ĝi enhavas blokitan tekston (spamon).'; $lang['media_uploadtab'] = 'Alŝuto'; $lang['media_searchtab'] = 'Serĉo'; +$lang['media_file'] = 'Dosiero'; $lang['media_viewtab'] = 'Rigardi'; $lang['media_edittab'] = 'Modifi'; $lang['media_historytab'] = 'Historio'; -$lang['media_thumbsview'] = 'Bildetoj'; -$lang['media_listview'] = 'Listigi'; -$lang['media_sort'] = 'Sorti'; +$lang['media_list_thumbs'] = 'Bildeto'; +$lang['media_list_rows'] = 'Kolumnoj'; $lang['media_sort_name'] = 'per nomo'; $lang['media_sort_date'] = 'per dato'; +$lang['media_namespaces'] = 'Elektu nomspacon'; +$lang['media_files'] = 'Dosieroj en %s'; $lang['media_upload'] = 'Alŝuti al la nomspaco <strong>%s</strong>.'; $lang['media_search'] = 'Serĉi en la nomspaco <strong>%s</strong>.'; -$lang['media_edit'] = 'Modifi'; -$lang['media_history'] = 'Tiuj estas la pli malnovaj revizioj de la dosiero.'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s ĉe %s'; +$lang['media_edit'] = 'Modifi %s'; +$lang['media_history'] = 'Protokolo de %s'; $lang['media_meta_edited'] = 'metadatumoj ŝanĝitaj'; $lang['media_perm_read'] = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi dosierojn.'; $lang['media_perm_upload'] = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.'; diff --git a/inc/lang/eo/newpage.txt b/inc/lang/eo/newpage.txt index 4ddcd33be..486f61f5a 100644 --- a/inc/lang/eo/newpage.txt +++ b/inc/lang/eo/newpage.txt @@ -1,4 +1,4 @@ ====== Ĉi tiu paĝo ankoraŭ ne ekzistas ====== -Vi sekvis ligilon, kiu kondukas al artikolo ankoraŭ ne ekzistanta. Se vi rajtas, tiel vi povas krei tiun ĉi paĝon ekpremante la butonon ''Krei paĝon''. +Vi sekvis ligilon, kiu kondukas al artikolo ankoraŭ ne ekzistanta. Se vi rajtas, tiel vi povas krei tiun ĉi paĝon ekpremante la butonon "Krei paĝon". diff --git a/inc/lang/eo/norev.txt b/inc/lang/eo/norev.txt index f17d8df7c..dc44d194b 100644 --- a/inc/lang/eo/norev.txt +++ b/inc/lang/eo/norev.txt @@ -1,3 +1,3 @@ ====== Tiu revizio ne ekzistas ====== -La elektita revizio ne ekzistas. Premu butonon ''Malnovaj revizioj'', por vidi liston de malnovaj revizioj de la dokumento.
\ No newline at end of file +La elektita revizio ne ekzistas. Premu butonon "Malnovaj revizioj" por vidi liston de malnovaj revizioj de la dokumento.
\ No newline at end of file diff --git a/inc/lang/eo/password.txt b/inc/lang/eo/password.txt index bb854a926..ef744059e 100644 --- a/inc/lang/eo/password.txt +++ b/inc/lang/eo/password.txt @@ -2,8 +2,8 @@ Saluton @FULLNAME@! Jen via uzantodatenoj por @TITLE@ ĉe @DOKUWIKIURL@ -Ensalutnomo : @LOGIN@ -Pasvorto : @PASSWORD@ +Ensalutnomo: @LOGIN@ +Pasvorto: @PASSWORD@ -- Tiu ĉi mesaĝo estis kreita de DokuWiki ĉe diff --git a/inc/lang/eo/registermail.txt b/inc/lang/eo/registermail.txt index e5b1da902..8b9ea8501 100644 --- a/inc/lang/eo/registermail.txt +++ b/inc/lang/eo/registermail.txt @@ -1,4 +1,4 @@ -Nova uzulo estis registrata. Jen la detaloj: +Nova uzanto estis registrata. Jen la detaloj: Uzantonomo: @NEWUSER@ Kompleta nomo: @NEWNAME@ diff --git a/inc/lang/eo/stopwords.txt b/inc/lang/eo/stopwords.txt index 2c18cb319..38757ae04 100644 --- a/inc/lang/eo/stopwords.txt +++ b/inc/lang/eo/stopwords.txt @@ -1,13 +1,10 @@ -# This is a list of words the indexer ignores, one word per line -# When you edit this file be sure to use UNIX line endings (single newline) -# No need to include words shorter than 3 chars - these are ignored anyway -la +# Jen listo de vortoj, kiujn la indeksilo ignoras, unu vorton po linio +# Kiam vi modifas la dosieron, estu certa ke vi uzas UNIX-stilajn linifinaĵojn (unuopa novlinio) +# Ne enmetu vortojn malpli longajn ol 3 literoj - tiuj ĉiukaze estas ignorataj pri estas kaj -mi mia -vi via ili ilia diff --git a/inc/lang/eo/subscr_single.txt b/inc/lang/eo/subscr_single.txt index a1f483570..d51c5ca15 100644 --- a/inc/lang/eo/subscr_single.txt +++ b/inc/lang/eo/subscr_single.txt @@ -7,8 +7,8 @@ Jen sekvas la ŝanĝoj: @DIFF@ -------------------------------------------------------- -Dato : @DATE@ -Uzanto : @USER@ +Dato: @DATE@ +Uzanto: @USER@ Modifa resumo: @SUMMARY@ Malnova versio: @OLDPAGE@ Nova versio: @NEWPAGE@ diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 8e912e9a8..5164c3243 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -145,7 +145,6 @@ Lo que sí puedes hacer es copiar y pegar el enlace.'; $lang['js']['linkwiz'] = 'Asistente de enlaces'; $lang['js']['linkto'] = 'Enlazar a:'; $lang['js']['del_confirm'] = '¿Quieres realmente borrar lo seleccionado?'; -$lang['js']['mu_btn'] = 'Subir varios archivos a la vez'; $lang['js']['restore_confirm'] = '¿Estás seguro de querer restaurar esta versión?'; $lang['js']['media_diff'] = 'Ver diferencias:'; $lang['js']['media_diff_both'] = 'Lado por lado'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index 66fab3f9a..6cd2f437d 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -124,7 +124,6 @@ Siiski võid kopeerida ja asetada lingi.'; $lang['js']['linkwiz'] = 'Lingi nõustaja'; $lang['js']['linkto'] = 'Lingi:'; $lang['js']['del_confirm'] = 'Kas kustutame selle kirje?'; -$lang['js']['mu_btn'] = 'Laadi üles mittu faili'; $lang['rssfailed'] = 'Sinu soovitud info ammutamisel tekkis viga: '; $lang['nothingfound'] = 'Oops, aga mitte muhvigi ei leitud.'; $lang['mediaselect'] = 'Hunnik faile'; diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index 30dfe9e5b..d02f281c3 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -122,7 +122,6 @@ 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']['mu_btn'] = 'Igo hainbat fitxategi aldi berean'; $lang['rssfailed'] = 'Errorea gertatu da feed hau irakurtzean:'; $lang['nothingfound'] = 'Ez da ezer aurkitu.'; $lang['mediaselect'] = 'Aukeratu Multimedia fitxategia'; diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index 1a7467431..ac14ce07a 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -98,7 +98,7 @@ $lang['txt_overwrt'] = 'بر روی فایل موجود بنویس'; $lang['lockedby'] = 'در حال حاضر قفل شده است'; $lang['lockexpire'] = 'قفل منقضی شده است'; $lang['js']['willexpire'] = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمهی پیشنمایش را برای صفر شدن ساعت قفل بزنید.'; -$lang['js']['notsavedyet'] = 'تغییرات ذخیره شده از بین خواهد رفت. +$lang['js']['notsavedyet'] = 'تغییرات ذخیره شده از بین خواهد رفت. میخواهید ادامه دهید؟'; $lang['js']['searchmedia'] = 'جستجو برای فایل'; $lang['js']['keepopen'] = 'پنجره را ر زمان انتخاب باز نگهدار'; @@ -129,7 +129,6 @@ $lang['js']['nosmblinks'] = 'پیوند به Windows share فقط در ای $lang['js']['linkwiz'] = 'ویزارد پیوند'; $lang['js']['linkto'] = 'پیوند به:'; $lang['js']['del_confirm'] = 'واقعن تصمیم به حذف این موارد دارید؟'; -$lang['js']['mu_btn'] = 'ارسال همزمان چندین فایل '; $lang['rssfailed'] = 'بروز خطا در هنگام واکشی'; $lang['nothingfound'] = 'چیزی پیدا نشد'; $lang['mediaselect'] = 'فایلها'; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index 83d487302..3477f15a3 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -127,7 +127,6 @@ Voit silti kopioida ja liittää linkin.'; $lang['js']['linkwiz'] = 'Linkkivelho'; $lang['js']['linkto'] = 'Linkki kohteeseen:'; $lang['js']['del_confirm'] = 'Haluatko todella poistaa valitut kohteet?'; -$lang['js']['mu_btn'] = 'Lähetä useampia tiedostoja kerralla'; $lang['js']['restore_confirm'] = 'Haluatko varmasti palauttaa tämän version?'; $lang['js']['media_diff'] = 'Näytä erot:'; $lang['js']['media_diff_both'] = 'Vierekkäin'; @@ -243,7 +242,7 @@ $lang['img_manager'] = 'Näytä mediamanagerissa'; $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle'; $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s'; $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen'; -$lang['subscr_unsubscribe_success'] = '% poistettu tilauslistalta %s'; +$lang['subscr_unsubscribe_success'] = '%s poistettu tilauslistalta %s'; $lang['subscr_unsubscribe_error'] = 'Virhe tapahtui poistaessa %s tilauslistalta %s'; $lang['subscr_already_subscribed'] = '%s on jo tilannut %s'; $lang['subscr_not_subscribed'] = '%s ei ole tilannut %s'; @@ -254,8 +253,8 @@ $lang['subscr_m_unsubscribe'] = 'Poista tilaus'; $lang['subscr_m_subscribe'] = 'Tilaa'; $lang['subscr_m_receive'] = 'Vastaanota'; $lang['subscr_style_every'] = 'Sähköposti joka muutoksesta'; -$lang['subscr_style_digest'] = 'yhteenveto sähköposti joka sivusta'; -$lang['subscr_style_list'] = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen'; +$lang['subscr_style_digest'] = 'yhteenveto-sähköposti joka sivusta (joka %.2f. päivä)'; +$lang['subscr_style_list'] = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen (joka %.2f. päivä)'; $lang['authmodfailed'] = 'Käyttäjien autentikoinnin asetukset ovat virheelliset. Ilmoita asiasta wikin ylläpitäjälle.'; $lang['authtempfail'] = 'Käyttäjien autentikointi ei tällä hetkellä onnistu. Jos ongelma jatkuu, ota yhteyttä wikin ylläpitäjään.'; $lang['i_chooselang'] = 'Valitse kieli'; @@ -302,22 +301,26 @@ $lang['weeks'] = '%d viikkoa sitten'; $lang['days'] = '%d päivää sitten'; $lang['hours'] = '%d tuntia sitten'; $lang['minutes'] = '%d minuuttia sitten'; -$lang['seconds'] = '% sekuntia sitten'; +$lang['seconds'] = '%d sekuntia sitten'; $lang['wordblock'] = 'Muutostasi ei talletettu, koska se sisältää estettyä tekstiä (spam).'; $lang['media_uploadtab'] = 'Lähetä'; $lang['media_searchtab'] = 'Etsi'; +$lang['media_file'] = 'Tiedosto'; $lang['media_viewtab'] = 'Näytä'; $lang['media_edittab'] = 'Muokkaa'; $lang['media_historytab'] = 'Historia'; -$lang['media_thumbsview'] = 'Pikkukuvat'; -$lang['media_listview'] = 'Lista'; -$lang['media_sort'] = 'Järjestä'; +$lang['media_list_thumbs'] = 'Thumbnails'; +$lang['media_list_rows'] = 'Rivit'; $lang['media_sort_name'] = 'nimen mukaan'; $lang['media_sort_date'] = 'päivämäärän mukaan'; +$lang['media_namespaces'] = 'Valitse nimiavaruus'; +$lang['media_files'] = 'Tiedostoja %s'; $lang['media_upload'] = 'Lähetä <strong>%s</strong> nimiavaruuteen'; $lang['media_search'] = 'Etsi <strong>%s</strong> nimiavaruudesta'; -$lang['media_edit'] = 'Muokkaa'; -$lang['media_history'] = 'Nämä ovat vanhat versiot tiedostosta.'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s at %s'; +$lang['media_edit'] = 'Muokkaa %s'; +$lang['media_history'] = 'Nämä ovat vanhat versiot tiedostosta %s'; $lang['media_meta_edited'] = 'Metadataa muokattu'; $lang['media_perm_read'] = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lukeaksesi tiedostoja.'; $lang['media_perm_upload'] = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lähettääksesi tiedostoja.'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index c73febc00..60b86b346 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -7,7 +7,7 @@ * @author Antoine Fixary <antoine.fixary@freesbee.fr> * @author cumulus <pta-n56@myamail.com> * @author Gwenn Gueguen <contact@demisel.net> - * @author Guy Brand <gb@isis.u-strasbg.fr> + * @author Guy Brand <gb@unistra.fr> * @author Fabien Chabreuil <fabien@integralpersonality.com> * @author Stéphane Chamberland <stephane.chamberland@ec.gc.ca> * @author Delassaux Julien <julien@delassaux.fr> @@ -25,12 +25,11 @@ */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; -$lang['doublequoteopening'] = '“'; //“ -$lang['doublequoteclosing'] = '”'; //” -$lang['singlequoteopening'] = '‘'; //‘ -$lang['singlequoteclosing'] = '’'; //’ -$lang['apostrophe'] = '’'; //’ - +$lang['doublequoteopening'] = '“'; +$lang['doublequoteclosing'] = '”'; +$lang['singlequoteopening'] = '‘'; +$lang['singlequoteclosing'] = '’'; +$lang['apostrophe'] = '’'; $lang['btn_edit'] = 'Modifier cette page'; $lang['btn_source'] = 'Afficher le texte source'; $lang['btn_show'] = 'Afficher la page'; @@ -66,7 +65,6 @@ $lang['btn_revert'] = 'Restaurer'; $lang['btn_register'] = 'S\'enregistrer'; $lang['btn_apply'] = 'Appliquer'; $lang['btn_media'] = 'Gestionnaire de médias'; - $lang['loggedinas'] = 'Connecté en tant que '; $lang['user'] = 'Utilisateur'; $lang['pass'] = 'Mot de passe'; @@ -79,9 +77,8 @@ $lang['email'] = 'Adresse de courriel'; $lang['profile'] = 'Profil utilisateur'; $lang['badlogin'] = 'L\'utilisateur ou le mot de passe est incorrect.'; $lang['minoredit'] = 'Modification mineure'; -$lang['draftdate'] = 'Brouillon auto-enregistré le'; // full dformat date will be added +$lang['draftdate'] = 'Brouillon auto-enregistré le'; $lang['nosecedit'] = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.'; - $lang['regmissing'] = 'Désolé, vous devez remplir tous les champs.'; $lang['reguexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris.'; $lang['regsuccess'] = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.'; @@ -91,12 +88,10 @@ $lang['regbadmail'] = 'L\'adresse de courriel semble incorrecte. Si v $lang['regbadpass'] = 'Les deux mots de passe fournis sont différents, veuillez recommencez.'; $lang['regpwmail'] = 'Votre mot de passe DokuWiki'; $lang['reghere'] = 'Vous n\'avez pas encore de compte ? Enregistrez-vous ici '; - $lang['profna'] = 'Ce wiki ne permet pas de modifier les profils'; $lang['profnochange'] = 'Pas de changement, rien à faire.'; $lang['profnoempty'] = 'Un nom ou une adresse de courriel vide n\'est pas permis.'; $lang['profchanged'] = 'Mise à jour du profil réussie.'; - $lang['pwdforget'] = 'Mot de passe oublié ? Faites-vous envoyer votre mot de passe '; $lang['resendna'] = 'Ce wiki ne permet pas le renvoi de mot de passe.'; $lang['resendpwd'] = 'Renvoyer le mot de passe de'; @@ -105,10 +100,8 @@ $lang['resendpwdnouser'] = 'Désolé, cet utilisateur est introuvable dans $lang['resendpwdbadauth'] = 'Désolé, ce code d\'authentification est invalide. Assurez-vous d\'avoir utilisé le lien de confirmation.'; $lang['resendpwdconfirm'] = 'Un lien de confirmation vous a été envoyé par courriel.'; $lang['resendpwdsuccess'] = 'Votre nouveau mot de passe vous a été expédié par courriel.'; - $lang['license'] = 'Sauf mention contraire, le contenu de ce wiki est placé sous la licence suivante :'; $lang['licenseok'] = 'Note : En modifiant cette page, vous acceptez que le contenu soit placé sous les termes de la licence suivante :'; - $lang['searchmedia'] = 'Chercher le nom de fichier :'; $lang['searchmedia_in'] = 'Chercher dans %s'; $lang['txt_upload'] = 'Sélectionnez un fichier à envoyer '; @@ -116,9 +109,7 @@ $lang['txt_filename'] = 'Donnez un « wikiname » (optionnel) '; $lang['txt_overwrt'] = 'Écraser le fichier cible'; $lang['lockedby'] = 'Actuellement bloqué par'; $lang['lockexpire'] = 'Le blocage expire à'; - -$lang['js']['willexpire'] = 'Votre blocage pour modifier cette page expire dans une minute. - Pour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.'; +$lang['js']['willexpire'] = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.'; $lang['js']['notsavedyet'] = 'Les modifications non enregistrées seront perdues. Voulez-vous vraiment continuer ?'; $lang['js']['searchmedia'] = 'Chercher des fichiers'; $lang['js']['keepopen'] = 'Gardez la fenêtre ouverte pendant la sélection'; @@ -150,22 +141,19 @@ $lang['js']['linkwiz'] = 'Assistant Lien'; $lang['js']['linkto'] = 'Lien vers :'; $lang['js']['del_confirm'] = 'Effacer cette entrée ?'; $lang['js']['mu_btn'] = 'Envoyer plusieurs fichiers en même temps'; -$lang['js']['willexpire'] = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.'; -$lang['js']['restore_confirm'] = 'Voulez vous vraiment restaurer cette version?'; -$lang['js']['media_diff'] = 'Voir les différences:'; -$lang['js']['media_diff_both'] = 'Côte à côte'; -$lang['js']['media_diff_opacity'] = 'Calque'; +$lang['js']['restore_confirm'] = 'Voulez vous vraiment restaurer cette version ?'; +$lang['js']['media_diff'] = 'Voir les différences:'; +$lang['js']['media_diff_both'] = 'Côte à côte'; +$lang['js']['media_diff_opacity'] = 'Calque'; $lang['js']['media_diff_portions'] = 'Curseur'; -$lang['js']['media_select'] = 'Sélection de fichiers…'; -$lang['js']['media_upload_btn'] = 'Télécharger'; -$lang['js']['media_done_btn'] = 'Terminé'; -$lang['js']['media_drop'] = 'Déposez des fichiers ici pour les télécharger'; -$lang['js']['media_cancel'] = 'supprimer'; -$lang['js']['media_overwrt'] = 'Écraser les fichiers existants'; - +$lang['js']['media_select'] = 'Sélection de fichiers…'; +$lang['js']['media_upload_btn'] = 'Télécharger'; +$lang['js']['media_done_btn'] = 'Terminé'; +$lang['js']['media_drop'] = 'Déposez des fichiers ici pour les télécharger'; +$lang['js']['media_cancel'] = 'supprimer'; +$lang['js']['media_overwrt'] = 'Écraser les fichiers existants'; $lang['rssfailed'] = 'Une erreur s\'est produite en récupérant ce flux : '; $lang['nothingfound'] = 'Pas de réponse.'; - $lang['mediaselect'] = 'Sélection de fichier'; $lang['fileupload'] = 'Envoi de fichier'; $lang['uploadsucc'] = 'Téléversement réussi'; @@ -190,7 +178,6 @@ $lang['mediaextchange'] = 'Extension du fichier changée de .%s en .%s !' $lang['reference'] = 'Références pour'; $lang['ref_inuse'] = 'Le fichier ne peut être effacé car il est utilisé par les pages suivantes :'; $lang['ref_hidden'] = 'Des références existent dans des pages que vous n\'avez pas la permission de lire'; - $lang['hits'] = 'Occurrences trouvées'; $lang['quickhits'] = 'Pages trouvées '; $lang['toc'] = 'Table des matières'; @@ -214,18 +201,15 @@ $lang['external_edit'] = 'modification externe'; $lang['summary'] = 'Résumé'; $lang['noflash'] = 'Le greffon <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash</a> est nécessaire pour afficher ce contenu.'; $lang['download'] = 'Télécharger un extrait'; - $lang['mail_newpage'] = 'page ajoutée :'; $lang['mail_changed'] = 'page modifiée :'; $lang['mail_subscribe_list'] = 'pages modifiées dans la catégorie :'; $lang['mail_new_user'] = 'nouvel utilisateur :'; $lang['mail_upload'] = 'fichier envoyé :'; - $lang['changes_type'] = 'Voir les changements'; $lang['pages_changes'] = 'Pages'; $lang['media_changes'] = 'Fichier multimédias'; $lang['both_changes'] = 'Pages et fichiers multimédias'; - $lang['qb_bold'] = 'Emphase forte (gras)'; $lang['qb_italic'] = 'Emphase (italique)'; $lang['qb_underl'] = 'Souligné'; @@ -250,11 +234,8 @@ $lang['qb_media'] = 'Ajouter des images ou d\'autres fichiers'; $lang['qb_sig'] = 'Insérer une signature'; $lang['qb_smileys'] = 'Émoticones'; $lang['qb_chars'] = 'Caractères spéciaux'; - $lang['upperns'] = 'Aller à la catégorie parente'; - $lang['admin_register'] = 'Ajouter un nouvel utilisateur'; - $lang['metaedit'] = 'Modifier les métadonnées'; $lang['metasaveerr'] = 'Erreur lors de l\'écriture des métadonnées'; $lang['metasaveok'] = 'Métadonnées enregistrées'; @@ -272,30 +253,24 @@ $lang['img_keywords'] = 'Mots-clés'; $lang['img_width'] = 'Largeur'; $lang['img_height'] = 'Hauteur'; $lang['img_manager'] = 'Voir dans le gestionnaire de médias'; - -$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s'; -$lang['subscr_subscribe_error'] = 'Erreur en ajoutant %s à la liste de souscription de %s'; +$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s'; +$lang['subscr_subscribe_error'] = 'Erreur en ajoutant %s à la liste de souscription de %s'; $lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription'; $lang['subscr_unsubscribe_success'] = '%s a été retiré de la liste de souscription de %s'; -$lang['subscr_unsubscribe_error'] = 'Erreur en retirant %s de la liste de souscription de %s'; -$lang['subscr_already_subscribed'] = '%s est déjà souscrit à %s'; -// Manage page for subscriptions -$lang['subscr_not_subscribed'] = '%s n\'est pas souscrit à %s'; -$lang['subscr_m_not_subscribed'] = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou la catégorie'; -$lang['subscr_m_new_header'] = 'Ajouter une souscription'; -$lang['subscr_m_current_header'] = 'Souscriptions actives'; -$lang['subscr_m_unsubscribe'] = 'Annuler la souscription'; -$lang['subscr_m_subscribe'] = 'Souscrire'; -$lang['subscr_m_receive'] = 'Recevoir'; -$lang['subscr_style_every'] = 'Envoyer un courriel à chaque modification'; -$lang['subscr_style_digest'] = 'Courriel résumant les modifications de chaque page'; -$lang['subscr_style_list'] = 'Liste des pages modifiées depuis le dernier courriel'; - -/* auth.class language support */ +$lang['subscr_unsubscribe_error'] = 'Erreur en retirant %s de la liste de souscription de %s'; +$lang['subscr_already_subscribed'] = '%s est déjà souscrit à %s'; +$lang['subscr_not_subscribed'] = '%s n\'est pas souscrit à %s'; +$lang['subscr_m_not_subscribed'] = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou la catégorie'; +$lang['subscr_m_new_header'] = 'Ajouter une souscription'; +$lang['subscr_m_current_header'] = 'Souscriptions actives'; +$lang['subscr_m_unsubscribe'] = 'Annuler la souscription'; +$lang['subscr_m_subscribe'] = 'Souscrire'; +$lang['subscr_m_receive'] = 'Recevoir'; +$lang['subscr_style_every'] = 'Envoyer un courriel à chaque modification'; +$lang['subscr_style_digest'] = 'Courriel résumant les modifications de chaque page'; +$lang['subscr_style_list'] = 'Liste des pages modifiées depuis le dernier courriel'; $lang['authmodfailed'] = 'Mauvais paramétrage de l\'authentification. Merci d\'informer l\'administrateur du Wiki.'; $lang['authtempfail'] = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'informer l\'administrateur du Wiki.'; - -/* installer strings */ $lang['i_chooselang'] = 'Choisissez votre langue'; $lang['i_installer'] = 'Installeur DokuWiki'; $lang['i_wikiname'] = 'Nom du wiki'; @@ -318,7 +293,6 @@ $lang['i_pol1'] = 'Wiki public (lecture pour tout le monde, écri $lang['i_pol2'] = 'Wiki fermé (lecture, écriture, envoi de fichiers pour les utilisateurs enregistrés uniquement)'; $lang['i_retry'] = 'Réessayer'; $lang['i_license'] = 'Veuillez choisir la licence sous laquelle placer votre contenu :'; - $lang['mu_intro'] = 'Ici vous pouvez envoyer plusieurs fichiers en même temps. Cliquez sur le bouton parcourir pour les ajouter. Cliquez sur envoyer lorsque c\'est prêt. '; $lang['mu_gridname'] = 'Nom du fichier'; $lang['mu_gridsize'] = 'Taille'; @@ -334,7 +308,6 @@ $lang['mu_progress'] = '@PCT@% envoyé'; $lang['mu_filetypes'] = 'Types de fichiers acceptés'; $lang['mu_info'] = 'fichiers envoyés.'; $lang['mu_lasterr'] = 'Dernière erreur : '; - $lang['recent_global'] = 'Vous êtes actuellement en train de regarder les modifications au sein de la catégorie <strong>%s</strong>. Vous pouvez aussi <a href="%s">voir les récentes modifications sur tout le wiki</a>.'; $lang['years'] = 'il y a %d ans'; $lang['months'] = 'il y a %d mois'; @@ -343,25 +316,28 @@ $lang['days'] = 'il y a %d jours'; $lang['hours'] = 'il y a %d heures'; $lang['minutes'] = 'il y a %d minutes'; $lang['seconds'] = 'il y a %d secondes'; - $lang['wordblock'] = 'Vos modifications n\'ont pas été sauvegardées parce qu\'elles contiennent des textes non autorisé (spam).'; - $lang['media_uploadtab'] = 'Télécharger'; $lang['media_searchtab'] = 'Rechercher'; +$lang['media_file'] = 'Fichier'; $lang['media_viewtab'] = 'Voir'; $lang['media_edittab'] = 'Éditer'; $lang['media_historytab'] = 'Historique'; -$lang['media_sort_name'] = '<span>Tri par</span> nom'; -$lang['media_sort_date'] = '<span>Tri par</span> date'; +$lang['media_list_thumbs'] = 'Aperçus'; +$lang['media_list_rows'] = 'Lignes'; +$lang['media_sort_name'] = 'Tri par nom'; +$lang['media_sort_date'] = 'Tri par date'; +$lang['media_namespaces'] = 'Choisissez un espace de nom'; +$lang['media_files'] = 'Fichiers présents dans'; $lang['media_upload'] = 'Télécharger dans la catégorie <strong>%s</strong>.'; $lang['media_search'] = 'Chercher dans la catégorie <strong>%s</strong>.'; -$lang['media_view'] = '<span class="%s">%s</span>'; -$lang['media_edit'] = 'Éditer <span class="%s">%s</span>'; -$lang['media_history'] = 'Historique du <span class="%s">%s</span>'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s dans %s'; +$lang['media_edit'] = 'Éditer %s'; +$lang['media_history'] = 'Historique du %s'; $lang['media_meta_edited'] = 'métadonnées éditées'; $lang['media_perm_read'] = 'Désolé, vous n\'avez pas les droits pour lire les fichiers.'; $lang['media_perm_upload'] = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.'; $lang['media_update'] = 'Télécharger une nouvelle version'; $lang['media_restore'] = 'Restaurer cette version'; - -$lang['plugin_install_err'] = "Extension mal installée. Renommez le dossier de l'extension '%s' en '%s'."; +$lang['plugin_install_err'] = 'Extension mal installée. Renommez le dossier de l\'extension \'%s\' en \'%s\'.'; diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index a3caeff6d..01938b3a0 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -137,7 +137,6 @@ Sempre podes copiar e colar a ligazón.'; $lang['js']['linkwiz'] = 'Asistente de ligazóns'; $lang['js']['linkto'] = 'Ligazón para:'; $lang['js']['del_confirm'] = 'Estás certo de quereres eliminar os elementos seleccionados?'; -$lang['js']['mu_btn'] = 'Subir varios arquivos de vez'; $lang['mediausage'] = 'Emprega a seguinte sintaxe para inserires unha referencia a este arquivo:'; $lang['mediaview'] = 'Ver arquivo orixinal'; $lang['mediaroot'] = 'raigaña'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index 589088320..f295e44a9 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -126,7 +126,6 @@ $lang['js']['nosmblinks'] = 'קישור לכונני שיתוף של Window $lang['js']['linkwiz'] = 'אשף הקישורים'; $lang['js']['linkto'] = 'קישור אל:'; $lang['js']['del_confirm'] = 'באמת למחוק?'; -$lang['js']['mu_btn'] = 'העלאת מספר קבצים יחד'; $lang['rssfailed'] = 'אירע כשל בעת קבלת הזנה זו:'; $lang['nothingfound'] = 'לא נמצאו תוצאות.'; $lang['mediaselect'] = 'קובצי מדיה'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index a85214cf7..ef10d7720 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -123,7 +123,6 @@ $lang['js']['nosmblinks'] = 'Linkovi na dijeljene Windows mape rade samo s $lang['js']['linkwiz'] = 'Čarobnjak za poveznice'; $lang['js']['linkto'] = 'Poveznica na:'; $lang['js']['del_confirm'] = 'Zbilja želite obrisati odabrane stavke?'; -$lang['js']['mu_btn'] = 'Postavi više datoteka odjednom'; $lang['rssfailed'] = 'Došlo je do greške prilikom preuzimanja feed-a: '; $lang['nothingfound'] = 'Traženi dokumetni nisu pronađeni.'; $lang['mediaselect'] = 'Mediafile datoteke'; diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index 89ad77948..23419a2bd 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -127,7 +127,6 @@ A hivatkozást másolni és beszúrni ettől fügetlenül mndig tudod.'; $lang['js']['linkwiz'] = 'Hivatkozás varázsló'; $lang['js']['linkto'] = 'Hivatkozás erre:'; $lang['js']['del_confirm'] = 'Valóban törölni akarod a kiválasztott elem(ek)et?'; -$lang['js']['mu_btn'] = 'Több fájl feltöltése egyszerre'; $lang['rssfailed'] = 'Hiba történt ennek a betöltésekor: '; $lang['nothingfound'] = 'Semmit sem találtam.'; $lang['mediaselect'] = 'Médiafájl kiválasztása'; diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index abf1e6786..8398f29f0 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -143,7 +143,6 @@ Tu pote nonobstante copiar e collar le ligamine.'; $lang['js']['linkwiz'] = 'Assistente pro ligamines'; $lang['js']['linkto'] = 'Ligar verso:'; $lang['js']['del_confirm'] = 'Realmente deler le entrata(s) seligite?'; -$lang['js']['mu_btn'] = 'Incargar plure files simultaneemente'; $lang['mediausage'] = 'Usa le syntaxe sequente pro referer a iste file:'; $lang['mediaview'] = 'Vider file original'; $lang['mediaroot'] = 'radice'; diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php index 7388e6908..0e281e58d 100644 --- a/inc/lang/is/lang.php +++ b/inc/lang/is/lang.php @@ -45,8 +45,6 @@ $lang['btn_backlink'] = 'Hvað tengist hingað'; $lang['btn_backtomedia'] = 'Aftur til miðlaskrá'; $lang['btn_subscribe'] = 'Vakta'; $lang['btn_unsubscribe'] = 'Afvakta'; -$lang['btn_subscribens'] = 'Vakta breytingar á nafnrými'; -$lang['btn_unsubscribens'] = 'Afvakta breytingar á nafnrými'; $lang['btn_profile'] = 'Uppfæra notanda'; $lang['btn_reset'] = 'Endurstilla'; $lang['btn_resendpwd'] = 'Senda nýtt aðgangsorð með tölvupósti'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index 8812b148d..ebbe983de 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -92,7 +92,7 @@ $lang['resendpwdsuccess'] = 'La nuova password è stata spedita via email.' $lang['license'] = 'Ad eccezione da dove è diversamente indicato, il contenuto di questo wiki è soggetto alla seguente licenza:'; $lang['licenseok'] = 'Nota: modificando questa pagina accetti di rilasciare il contenuto sotto la seguente licenza:'; $lang['searchmedia'] = 'Cerca file di nome:'; -$lang['searchmedia_in'] = 'Cerca in &s'; +$lang['searchmedia_in'] = 'Cerca in %s'; $lang['txt_upload'] = 'Seleziona un file da caricare'; $lang['txt_filename'] = 'Carica come (opzionale)'; $lang['txt_overwrt'] = 'Sovrascrivi file esistente'; @@ -129,7 +129,6 @@ $lang['js']['nosmblinks'] = 'I collegamenti con le risorse condivise di Win $lang['js']['linkwiz'] = 'Collegamento guidato'; $lang['js']['linkto'] = 'Collega a:'; $lang['js']['del_confirm'] = 'Eliminare veramente questa voce?'; -$lang['js']['mu_btn'] = 'Carica più di un file alla volta'; $lang['rssfailed'] = 'Si è verificato un errore cercando questo feed: '; $lang['nothingfound'] = 'Nessun risultato trovato.'; $lang['mediaselect'] = 'Selezione dei file'; @@ -226,8 +225,8 @@ $lang['subscr_subscribe_error'] = 'Impossibile aggiungere %s alla lista di sotto $lang['subscr_subscribe_noaddress'] = 'Non esiste alcun indirizzo associato al tuo account, non puoi essere aggiunto alla lista di sottoscrizioni'; $lang['subscr_unsubscribe_success'] = 'Rimosso %s dalla lista di sottoscrizioni %s'; $lang['subscr_unsubscribe_error'] = 'Impossibile rimuovere %s dalla lista di sottoscrizioni %s'; -$lang['subscr_already_subscribed'] = '% è già iscritto a %s'; -$lang['subscr_not_subscribed'] = '% non è iscritto a %s'; +$lang['subscr_already_subscribed'] = '%s è già iscritto a %s'; +$lang['subscr_not_subscribed'] = '%s non è iscritto a %s'; $lang['subscr_m_not_subscribed'] = 'Attualmente non sei iscritto alla pagina o categoria corrente'; $lang['subscr_m_new_header'] = 'Aggiungi sottoscrizione'; $lang['subscr_m_current_header'] = 'Sottoscrizioni attuali'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index b0b93450e..1eeb6bb73 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -123,7 +123,6 @@ $lang['js']['nosmblinks'] = 'ウィンドウズの共有フォルダへリ $lang['js']['linkwiz'] = 'リンクウィザード'; $lang['js']['linkto'] = 'リンク先：'; $lang['js']['del_confirm'] = '選択した項目を本当に削除しますか？'; -$lang['js']['mu_btn'] = '複数のファイルを一度にアップロード'; $lang['rssfailed'] = 'RSSの取得に失敗しました：'; $lang['nothingfound'] = '該当文書はありませんでした。'; $lang['mediaselect'] = 'メディアファイルを選択'; diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php index f9ea0bced..9738ae51c 100644 --- a/inc/lang/kk/lang.php +++ b/inc/lang/kk/lang.php @@ -82,7 +82,7 @@ $lang['resendpwdsuccess'] = 'Сіздің жаңа құпиясөзіңіз $lang['license'] = 'Басқаша көрсетілген болмаса, бұл wiki-дің мазмұны келесі лицензия бойынша беріледі:'; $lang['licenseok'] = 'Ескерту: бұл бетті өңдеуіңізбен мазмұныңыз келесі лицензия бойынша беруге келесесіз:'; $lang['searchmedia'] = 'Іздеу файлдың атауы:'; -$lang['searchmedia_in'] = '%-мен іздеу:'; +$lang['searchmedia_in'] = '%s-мен іздеу:'; $lang['txt_upload'] = 'Еңгізетін файлды таңдау'; $lang['txt_filename'] = 'Келесідей еңгізу (қалауынша)'; $lang['txt_overwrt'] = 'Бар файлды қайта жазу'; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 7b55ebe71..91825c797 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -125,7 +125,6 @@ $lang['js']['nosmblinks'] = '윈도우 공유 파일과의 연결은 MS 인 $lang['js']['linkwiz'] = '링크 마법사'; $lang['js']['linkto'] = '다음으로 연결:'; $lang['js']['del_confirm'] = '정말로 선택된 항목(들)을 삭제하시겠습니까?'; -$lang['js']['mu_btn'] = '여러 파일들을 한번에 업로드합니다.'; $lang['rssfailed'] = 'feed 가져오기 실패: '; $lang['nothingfound'] = '아무 것도 없습니다.'; $lang['mediaselect'] = '미디어 파일 선택'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index 00312f7a1..e8d79a997 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -125,7 +125,6 @@ Adhuc transcribere nexum potes.'; $lang['js']['linkwiz'] = 'Connectendi ductor'; $lang['js']['linkto'] = 'Nexum ad:'; $lang['js']['del_confirm'] = 'Delere electas res uin?'; -$lang['js']['mu_btn'] = 'Plura documenta uno tempore onerare'; $lang['rssfailed'] = 'Error in restituendo '; $lang['nothingfound'] = 'Nihil inuentum est.'; $lang['mediaselect'] = 'Documenta uisiua:'; @@ -223,7 +222,7 @@ $lang['subscr_subscribe_noaddress'] = 'Cursus interretialis tuus deest, sic in i $lang['subscr_unsubscribe_success'] = 'A subscriptione %s deletur quod %s'; $lang['subscr_unsubscribe_error'] = 'Error delendi %s a subscriptione quod %s'; $lang['subscr_already_subscribed'] = '%s iam subscriptus\a est in %s'; -$lang['subscr_not_subscribed'] = '%s non subscriptus\a est in %n'; +$lang['subscr_not_subscribed'] = '%s non subscriptus\a est in %s'; $lang['subscr_m_not_subscribed'] = 'Non hanc paginam uel genus subscribere potes.'; $lang['subscr_m_new_header'] = 'Subscriptionem addere'; $lang['subscr_m_current_header'] = 'haec subscriptio:'; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 191a9bab5..00692f48e 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -206,7 +206,7 @@ $lang['mu_info'] = 'Dateien eropgelueden.'; $lang['mu_lasterr'] = 'Leschte Feeler:'; $lang['recent_global'] = 'Du kucks am Moment d\'Ännerungen innerhalb vum <b>%s</b> Namespace. Du kanns och <a href="%s">d\'Kierzilech Ännerungen vum ganze Wiki kucken</a>.'; $lang['years'] = 'virun %d Joer'; -$lang['months'] = 'virun % Méint'; +$lang['months'] = 'virun %d Méint'; $lang['weeks'] = 'virun %d Wochen'; $lang['days'] = 'virun %d Deeg'; $lang['hours'] = 'virun %d Stonnen'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index 121e25308..d14a0695a 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -41,8 +41,6 @@ $lang['btn_backlink'] = 'Atgalinės nuorodos'; $lang['btn_backtomedia'] = 'Atgal į Mediabylos išsirinkimą'; $lang['btn_subscribe'] = 'Užsisakyti keitimų prenumeratą'; $lang['btn_unsubscribe'] = 'Atsisakyti keitimų prenumeratos'; -$lang['btn_subscribens'] = 'Užsakyti vardų srities prenumeratą'; -$lang['btn_unsubscribens'] = 'Atsisakyti vardų srities prenumeratos'; $lang['btn_profile'] = 'Atnaujinti profilį'; $lang['btn_reset'] = 'Atstata'; $lang['btn_resendpwd'] = 'Išsiųsti naują slaptažodį'; @@ -115,7 +113,6 @@ $lang['js']['keepopen'] = 'Pažymėjus palikti langą atvertą'; $lang['js']['hidedetails'] = 'Paslėpti Detales'; $lang['js']['nosmblinks'] = 'Nurodos į "Windows shares" veikia tik su Microsoft Internet Explorer naršykle. Vis dėlto, jūs galite nukopijuoti šią nuorodą.'; -$lang['js']['mu_btn'] = 'Pateikite kelis failus vienu ypu'; $lang['mediausage'] = 'Failo nuorodai užrašyti naudokite tokią sintaksę:'; $lang['mediaview'] = 'Žiūrėti pirminį failą'; $lang['mediaroot'] = 'pradžia (root)'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 64e22c56a..926341393 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -45,6 +45,8 @@ $lang['btn_recover'] = 'Atjaunot melnrakstu'; $lang['btn_draftdel'] = 'Dzēst melnrakstu'; $lang['btn_revert'] = 'Atjaunot'; $lang['btn_register'] = 'Reģistrēties'; +$lang['btn_apply'] = 'Labi'; +$lang['btn_media'] = 'Mēdiju pārvaldnieks'; $lang['loggedinas'] = 'Pieteicies kā'; $lang['user'] = 'Lietotājvārds'; $lang['pass'] = 'Parole'; @@ -89,7 +91,7 @@ $lang['txt_filename'] = 'Ievadi vikivārdu (nav obligāts)'; $lang['txt_overwrt'] = 'Aizstāt esošo failu'; $lang['lockedby'] = 'Patlaban bloķējis '; $lang['lockexpire'] = 'Bloķējums beigsies '; -$lang['js']['willexpire'] = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.'; +$lang['js']['willexpire'] = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.'; $lang['js']['notsavedyet'] = 'Veiktas bet nav saglabātas izmaiņas. Vai tiešām tās nevajag?'; $lang['js']['searchmedia'] = 'Meklēt failus'; @@ -122,6 +124,15 @@ $lang['js']['linkwiz'] = 'Saišu vednis'; $lang['js']['linkto'] = 'Saite uz: '; $lang['js']['del_confirm'] = 'Dzēst šo šķirkli?'; $lang['js']['mu_btn'] = 'Augšuplādēt uzreiz vairākus failus.'; +$lang['js']['restore_confirm'] = 'Tiešām atjaunot šo versiju'; +$lang['js']['media_diff'] = 'Skatīt atšķirību'; +$lang['js']['media_diff_both'] = 'Blakus'; +$lang['js']['media_diff_opacity'] = 'Pārklāti'; +$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_overwrt'] = 'Rakstīt pāri esošajiem failiem'; $lang['rssfailed'] = 'Kļūda saņemot saturu no '; $lang['nothingfound'] = 'Nekas nav atrasts.'; $lang['mediaselect'] = 'Mēdiju faila izvēle'; @@ -160,7 +171,7 @@ $lang['diff_type'] = 'Skatīt atšķirības:'; $lang['diff_inline'] = 'Iekļauti'; $lang['diff_side'] = 'Blakus'; $lang['line'] = 'Rinda'; -$lang['breadcrumb'] = 'Ceļš'; +$lang['breadcrumb'] = 'Apmeklēts'; $lang['youarehere'] = 'Tu atrodies šeit'; $lang['lastmod'] = 'Labota'; $lang['by'] = ', labojis'; @@ -176,6 +187,10 @@ $lang['mail_changed'] = 'lapa mainīta:'; $lang['mail_subscribe_list'] = 'Nodaļā mainītās lapas:'; $lang['mail_new_user'] = 'Jauns lietotājs:'; $lang['mail_upload'] = 'augšupielādētais fails:'; +$lang['changes_type'] = 'Skatīt izmaiņas'; +$lang['pages_changes'] = 'Lapās'; +$lang['media_changes'] = 'Mēdiju failos'; +$lang['both_changes'] = 'Gan lapās, gan mēdiju failos'; $lang['qb_bold'] = 'Trekninājums'; $lang['qb_italic'] = 'Kursīvs'; $lang['qb_underl'] = 'Pasvītrojums'; @@ -216,6 +231,9 @@ $lang['img_copyr'] = 'Autortiesības'; $lang['img_format'] = 'Formāts'; $lang['img_camera'] = 'Fotoaparāts'; $lang['img_keywords'] = 'Atslēgvārdi'; +$lang['img_width'] = 'Platums'; +$lang['img_height'] = 'Augstums'; +$lang['img_manager'] = 'Skatīt mēdiju pārvaldniekā'; $lang['subscr_subscribe_success'] = '%s pievienots %s abonēšanas sarakstam'; $lang['subscr_subscribe_error'] = 'Kļūme pievienojot %s %s abonēšanas sarakstam.'; $lang['subscr_subscribe_noaddress'] = 'Nav zināma jūsu e-pasta adrese, tāpēc nevarat abonēt.'; @@ -275,9 +293,33 @@ $lang['mu_lasterr'] = 'Pēdējā ķļūda.'; $lang['recent_global'] = 'Tu skati izmaiņas nodaļā <b>%s</b>. Ir iespējams <a href="%s">skatīt jaunākos grozījums visā viki</a>. '; $lang['years'] = 'pirms %d gadiem'; $lang['months'] = 'pirms %d mēnešiem'; -$lang['weeks'] = 'pirms % nedēļām'; -$lang['days'] = 'pirms %d dienām'; +$lang['weeks'] = 'pirms %d nedēļām'; +$lang['days'] = 'pirms %d dienām'; $lang['hours'] = 'pirms %d stundām'; $lang['minutes'] = 'pirms %d minūtēm'; $lang['seconds'] = 'pirms %d sekundēm'; $lang['wordblock'] = 'Grozījumus nevarēju saglabāt, jo tie satur aizliegto vārdu (spamu).'; +$lang['media_uploadtab'] = 'Augšuplādēt'; +$lang['media_searchtab'] = 'Meklēt'; +$lang['media_file'] = 'Fails'; +$lang['media_viewtab'] = 'Skatīt'; +$lang['media_edittab'] = 'Labot'; +$lang['media_historytab'] = 'Vēsture'; +$lang['media_list_thumbs'] = 'Sīktēli'; +$lang['media_list_rows'] = 'Rindas'; +$lang['media_sort_name'] = 'Nosaukums'; +$lang['media_sort_date'] = 'Datums'; +$lang['media_namespaces'] = 'Norādīt nodaļu'; +$lang['media_files'] = 'Faili nodaļā %s'; +$lang['media_upload'] = 'Augšuplādēt nodaļā %s'; +$lang['media_search'] = 'Meklēt nodaļā %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s nodaļā %s'; +$lang['media_edit'] = 'Labot %s'; +$lang['media_history'] = '%s vēsture'; +$lang['media_meta_edited'] = 'metadati laboti'; +$lang['media_perm_read'] = 'Atvainojiet, jums nav tiesību skatīt failus. '; +$lang['media_perm_upload'] = 'Atvainojiet, jums nav tiesību augšupielādēt. '; +$lang['media_update'] = 'Augšupielādēt jaunu versiju'; +$lang['media_restore'] = 'Atjaunot šo versiju'; +$lang['plugin_install_err'] = 'Modulis aplami instalēts. Pārdēvē moduļa direktoriju %s par %s.'; diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php index b7d433092..ca4a746cd 100644 --- a/inc/lang/mk/lang.php +++ b/inc/lang/mk/lang.php @@ -117,7 +117,6 @@ $lang['js']['nosmblinks'] = 'Поврзувањето со Windows Shares $lang['js']['linkwiz'] = 'Волшебник за врски'; $lang['js']['linkto'] = 'Врска до:'; $lang['js']['del_confirm'] = 'Дали навистина да ги избришам избраните датотеки?'; -$lang['js']['mu_btn'] = 'Качете повеќе датотеки наеднаш'; $lang['mediausage'] = 'Користете ја следнава синтакса за референцирање кон оваа датотека:'; $lang['mediaview'] = 'Види ја оригиналната датотека'; $lang['mediaroot'] = 'root'; diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index ae9d05bfd..63fda3e5a 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -45,8 +45,6 @@ $lang['btn_backlink'] = 'येथे काय जोडले आह $lang['btn_backtomedia'] = 'परत माध्यम फाइल निवडीकड़े'; $lang['btn_subscribe'] = 'पृष्ठाच्या बदलांची पुरवणी (फीड) लावा '; $lang['btn_unsubscribe'] = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा'; -$lang['btn_subscribens'] = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) लावा'; -$lang['btn_unsubscribens'] = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) बंद करा'; $lang['btn_profile'] = 'प्रोफाइल अद्ययावत करा'; $lang['btn_reset'] = 'रिसेट'; $lang['btn_resendpwd'] = 'कृपया परवलीचा नवीन शब्द माझ्या इमेल पत्त्यावर पाठविणे.'; @@ -118,7 +116,6 @@ $lang['mediafiles'] = 'मध्ये उपलब्ध असल $lang['js']['keepopen'] = 'निवड केल्यावर विण्डो उघडी ठेवा'; $lang['js']['hidedetails'] = 'सविस्तर मजकूर लपवा'; $lang['js']['nosmblinks'] = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.'; -$lang['js']['mu_btn'] = 'एक वेळेस अनेक फाइल वापरा'; $lang['mediausage'] = 'ह्या फाइलचा संदर्भ देण्यासाठी खालील सिन्टॅक्स वापरा :'; $lang['mediaview'] = 'मूळ फाइल बघू '; $lang['mediaroot'] = 'रूट'; diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php index 53c701b23..97e2dde5c 100644 --- a/inc/lang/ne/lang.php +++ b/inc/lang/ne/lang.php @@ -38,8 +38,6 @@ $lang['btn_backlink'] = 'पछाडिका लिङ्कहरु $lang['btn_backtomedia'] = 'मिडिया छनौटमा फर्कनुहोस्'; $lang['btn_subscribe'] = 'पृष्ठ परिवर्तन ग्राह्य गर्नुहोस्'; $lang['btn_unsubscribe'] = 'पृष्ठ परिवर्तन अग्राह्य गर्नुहोस्'; -$lang['btn_subscribens'] = 'नेमस्पेस परिवर्तन ग्राह्य गर्नुहोस् '; -$lang['btn_unsubscribens'] = 'नेमस्पेस परिवर्तन अग्राह्य गर्नुहोस् '; $lang['btn_profile'] = 'प्रोफाइल अध्यावधिक गर्नुहोस् '; $lang['btn_reset'] = 'पूर्वरुपमा फर्काउनुहोस'; $lang['btn_resendpwd'] = 'नयाँ प्रवेश शव्द(पासवर्ड) पठाउनुहोस् '; @@ -110,7 +108,6 @@ $lang['mediafiles'] = ' उपलब्ध फाइलहरु '; $lang['js']['keepopen'] = 'छनौटमा विन्डो खुला राख्नुहोस् '; $lang['js']['hidedetails'] = 'जानकारी लुकाउनु होस् '; $lang['js']['nosmblinks'] = 'विन्डोहरु लिङ्क गर्दा माइक्रो सफ्ट एक्सप्लोररमामात्र काम साझा हुन्छ । तर कपि गर्न र टास्न मिल्छ। '; -$lang['js']['mu_btn'] = 'धेरै वटा फाइलहरु एकैपटक अपलोड गर्नुहोस् ।'; $lang['mediausage'] = 'फाइललाई रेफरेन्स गर्न निम्न सुत्र प्रयोग गर्नुहोस् :'; $lang['mediaview'] = 'सक्कली फाइल हेर्नुहोस् '; $lang['mediaroot'] = 'रुट(मूख्य प्रयोगकर्ता)'; diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 1f548508e..62d23b0d2 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -134,7 +134,6 @@ Je kan de link wel kopiëren en plakken.'; $lang['js']['linkwiz'] = 'Linkwizard'; $lang['js']['linkto'] = 'Link naar:'; $lang['js']['del_confirm'] = 'Item(s) verwijderen?'; -$lang['js']['mu_btn'] = 'Meerdere files tegelijk uploaden'; $lang['js']['restore_confirm'] = 'Werkelijk deze versie terugzetten?'; $lang['js']['media_diff'] = 'Verschillen bekijken:'; $lang['js']['media_diff_both'] = 'Naast elkaar'; diff --git a/inc/lang/no/conflict.txt b/inc/lang/no/conflict.txt index 89479af4f..855034685 100644 --- a/inc/lang/no/conflict.txt +++ b/inc/lang/no/conflict.txt @@ -1,4 +1,4 @@ -====== Det fins en nyere versjon ====== +====== Det finnes en nyere versjon ====== Det fins en nyere versjon av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg. diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 7ed5902ca..88d21b536 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -16,6 +16,7 @@ * @author Lisa Ditlefsen <lisa@vervesearch.com> * @author Erik Pedersen <erik.pedersen@shaw.ca> * @author Rune Rasmussen syntaxerror.no@gmail.com + * @author Jon Bøe <jonmagneboe@hotmail.com> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -135,10 +136,10 @@ Du kan fortsatt kopiere og lime inn lenken.'; $lang['js']['linkwiz'] = 'guide til lenker'; $lang['js']['linkto'] = 'Lenke til:'; $lang['js']['del_confirm'] = 'Slett denne oppføringen?'; -$lang['js']['mu_btn'] = 'Last opp flere filer samtidig'; $lang['js']['restore_confirm'] = 'Er du sikker på at du vil gjenopprette denne versjonen?'; $lang['js']['media_diff'] = 'Vis forskjeller:'; -$lang['js']['media_diff_both'] = 'Side ved side:'; +$lang['js']['media_diff_both'] = 'Side ved side'; +$lang['js']['media_diff_opacity'] = 'Gjennomskinnelighet'; $lang['js']['media_diff_portions'] = 'Glidebryter'; $lang['js']['media_select'] = 'Velg filer…'; $lang['js']['media_upload_btn'] = 'Last opp'; @@ -317,16 +318,20 @@ $lang['seconds'] = '%d sekunder siden'; $lang['wordblock'] = 'Din endring ble ikke lagret ettersom den inneholder blokkert tekst (søppel).'; $lang['media_uploadtab'] = 'Last opp'; $lang['media_searchtab'] = 'Søk'; +$lang['media_file'] = 'Fil'; $lang['media_viewtab'] = 'Vis'; $lang['media_edittab'] = 'Rediger'; $lang['media_historytab'] = 'Historikk'; -$lang['media_thumbsview'] = 'Miniatyrbilder'; -$lang['media_listview'] = 'Liste'; -$lang['media_sort'] = 'Sorter'; +$lang['media_list_thumbs'] = 'Miniatyrbilder'; +$lang['media_list_rows'] = 'Rader'; $lang['media_sort_name'] = 'etter navn'; $lang['media_sort_date'] = 'etter dato'; +$lang['media_namespaces'] = 'Velg navnerom'; +$lang['media_files'] = 'Filer i %s'; $lang['media_upload'] = 'Last opp til navnerommet <strong>%s</strong>.'; $lang['media_search'] = 'Søk i navnerommet <strong>%s</strong>.'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s på %s'; $lang['media_edit'] = 'Rediger'; $lang['media_history'] = 'Dette er de tidligere versjonene av fila.'; $lang['media_meta_edited'] = 'metadata er endra'; diff --git a/inc/lang/no/registermail.txt b/inc/lang/no/registermail.txt index e1fae2b90..35ed253ab 100644 --- a/inc/lang/no/registermail.txt +++ b/inc/lang/no/registermail.txt @@ -1,4 +1,4 @@ -En ny bruker har registret seg, her er detaljene: +En ny bruker har registrert seg, her er detaljene: Brukernavn : @NEWUSER@ Fult navn : @NEWNAME@ diff --git a/inc/lang/no/stopwords.txt b/inc/lang/no/stopwords.txt index 2b2ab11e2..9a4c302d9 100644 --- a/inc/lang/no/stopwords.txt +++ b/inc/lang/no/stopwords.txt @@ -1,130 +1,68 @@ -# This is a list of words the indexer ignores, one word per line -# When you edit this file be sure to use UNIX line endings (single newline) -# No need to include words shorter than 3 chars - these are ignored anyway -# This list is based upon the ones found at http://www.ranks.nl/stopwords/ -alle -andre -arbeid -begge -bort -bra -bruke -denne -der -deres +# Dette er en liste med ord som indeksereren ignorerer, ett ord per linje. +# Når du redigerer siden, pass på å bruke UNIX linjeslutt (enkel ny linje). +# Ord kortere enn 3 bokstaver er automatisk ignorert. +# Listen er basert på http://helmer.aksis.uib.no/nta/ord10000.txt +i +og det -din -disse -eller -ene -eneste -enhver -enn -folk +er +på +til +som +en +å for -fordi -forsÛke -fra -fÅ -fÛr -fÛrst -gjorde -gjÛre -god -gÅ -hadde -han -hans -hennes -her -hva -hvem -hver -hvilken -hvis -hvor -hvordan -hvorfor -ikke -inn -innen -kan -kunne -lage -lang -lik -like -makt -mange +av +at +har med -meg -meget -men -mens -mer -mest -min -mye -mÅ -mÅte -navn -nei -nÅ -nÅr -ogsÅ -opp -oss -over -part -punkt -pÅ -rett -riktig -samme -sant -siden -sist -skulle -slik -slutt -som -start -stille -sÅ -tid -til -tilbake -tilstand -under -uten -var -ved -verdi -vil -ville -vite -vÅr -vÖre -vÖrt -om -er -og -du -dine de -deres -com -for +ikke +den +han +om +et fra -inni -hvordan -det -dette +men +vi var -hva -når -hvor -hvem +jeg +seg +sier vil -med +kan +ble +skal +etter +også +så +ut +år +nå +da +dette +blir +ved +mot +hadde +to +hun +over +være +ha +må +går +opp +få +andre +eller +bare +sin +mer +inn +før +bli +vært +enn +alle www
\ No newline at end of file diff --git a/inc/lang/no/subscr_digest.txt b/inc/lang/no/subscr_digest.txt index 3192e43b7..6afd0cc5c 100644 --- a/inc/lang/no/subscr_digest.txt +++ b/inc/lang/no/subscr_digest.txt @@ -1,6 +1,6 @@ Hei! -Sida @PAGE@ på wikien @TITLE@ har blitt endra. +Siden @PAGE@ på wikien @TITLE@ har blitt endret. Her er endringene: -------------------------------------------------------- @@ -10,10 +10,10 @@ Her er endringene: Gammel versjon : @OLDPAGE@ Ny versjon: @NEWPAGE@ -For å avslutte varslinga, logg inn på +For å avslutte varslingen, logg inn på @DOKUWIKIURL@ og gå til @NEWPAGE@ -og avslutt abonnementet på endringer av sida eller i navnerommet. +og avslutt abonnementet på endringer av siden eller i navnerommet. -- Denne e-posten ble generert av DokuWiki på diff --git a/inc/lang/no/subscr_single.txt b/inc/lang/no/subscr_single.txt index ce117b952..25296da58 100644 --- a/inc/lang/no/subscr_single.txt +++ b/inc/lang/no/subscr_single.txt @@ -1,6 +1,6 @@ Hei! -Sida @PAGE@ på wikien @TITLE@ har blitt endra. +Siden @PAGE@ på wikien @TITLE@ har blitt endret. Her er endringene: -------------------------------------------------------- @@ -13,10 +13,10 @@ Sammendrag: @SUMMARY@ Gammel versjon : @OLDPAGE@ Ny versjon: @NEWPAGE@ -For å avslutte varslinga, logg inn på +For å avslutte varslingen, logg inn på @DOKUWIKIURL@, gå til @NEWPAGE@ -og avslutt abonnementet på endringer av sida eller i navnerommet. +og avslutt abonnementet på endringer av siden eller i navnerommet. -- Denne e-posten ble generert av DokuWiki på diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index f9bf57852..a6fc3d52e 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -129,7 +129,6 @@ Możesz skopiować odnośnik.'; $lang['js']['linkwiz'] = 'Tworzenie odnośników'; $lang['js']['linkto'] = 'Link do'; $lang['js']['del_confirm'] = 'Czy na pewno usunąć?'; -$lang['js']['mu_btn'] = 'Wyślij wiele plików na raz'; $lang['rssfailed'] = 'Wystąpił błąd przy pobieraniu tych danych: '; $lang['nothingfound'] = 'Nic nie znaleziono.'; $lang['mediaselect'] = 'Wysyłanie pliku'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index d1b46c294..373590b76 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -136,7 +136,6 @@ 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']['mu_btn'] = 'Enviar vários arquivos de uma vez'; $lang['rssfailed'] = 'Ocorreu um erro durante a atualização dessa fonte: '; $lang['nothingfound'] = 'Não foi encontrado nada.'; $lang['mediaselect'] = 'Arquivos de mídia'; @@ -236,8 +235,8 @@ $lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de $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'; $lang['subscr_unsubscribe_success'] = '%s foi removido da lista de monitoramento de %s'; $lang['subscr_unsubscribe_error'] = 'Ocorreu um erro na remoção de %s da lista de monitoramentos de %s'; -$lang['subscr_already_subscribed'] = '%s já está monitorando s%'; -$lang['subscr_not_subscribed'] = 's% não está monitorando s%'; +$lang['subscr_already_subscribed'] = '%s já está monitorando %s'; +$lang['subscr_not_subscribed'] = '%s não está monitorando %s'; $lang['subscr_m_not_subscribed'] = 'Você não está monitorando nem a página atual nem o espaço de nomes.'; $lang['subscr_m_new_header'] = 'Adicionar monitoramento'; $lang['subscr_m_current_header'] = 'Monitoramentos atuais'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 6a2034a95..2fa8a1ab4 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -137,7 +137,6 @@ $lang['js']['linkwiz'] = 'Assistente de Criação de Ligação'; $lang['js']['linkto'] = 'Ligação para:'; $lang['js']['del_confirm'] = 'Remover o(s) item(s) selecionados?'; $lang['js']['restore_confirm'] = 'Restaurar esta versão?'; -$lang['js']['mu_btn'] = 'Enviar múltiplos ficheiros de uma vez'; $lang['rssfailed'] = 'Ocorreu um erro neste canal RSS: '; $lang['nothingfound'] = 'Nada foi encontrado.'; $lang['mediaselect'] = 'Selecção de ficheiros'; @@ -162,7 +161,7 @@ $lang['mediaroot'] = 'root'; $lang['mediaupload'] = 'Carregar ficheiros para o grupo actual aqui. Para criar sub-grupos: escrever o nome do sub-grupo seguido de : antes do nome do ficheiro no campo "Carregar como".'; $lang['mediaextchange'] = 'Extensão alterada de .%s para .%s!'; $lang['reference'] = 'Referências para'; -$lang['ref_inuse'] = 'O ficheiro "%s" não pode ser removido, porque está ainda a ser usado nestes documentos:'; +$lang['ref_inuse'] = 'O ficheiro não pode ser removido, porque está ainda a ser usado nestes documentos:'; $lang['ref_hidden'] = 'Algumas referências estão em documentos para os quais não tem permissão para ler'; $lang['hits'] = 'Resultados'; $lang['quickhits'] = 'Documentos encontrados'; @@ -310,13 +309,13 @@ $lang['media_viewtab'] = 'Ver'; $lang['media_edittab'] = 'Editar'; $lang['media_historytab'] = 'Histórico'; $lang['media_sort'] = 'Ordenar'; -$lang['media_sort_name'] = '<span>Ordenar por</span> nome'; -$lang['media_sort_date'] = '<span>Ordenar por</span> data'; +$lang['media_sort_name'] = 'Ordenar por nome'; +$lang['media_sort_date'] = 'Ordenar por data'; $lang['media_upload'] = 'Enviar para o grupo <strong>%s</strong>.'; $lang['media_search'] = 'Procurar no grupo <strong>%s</strong>.'; -$lang['media_view'] = '<span class="%s">%s</span>'; -$lang['media_edit'] = 'Editar <span class="%s">%s</span>'; -$lang['media_history'] = 'Histórico do <span class="%s">%s</span>'; +$lang['media_view'] = '%s'; +$lang['media_edit'] = 'Editar %s'; +$lang['media_history'] = 'Histórico do %s'; $lang['media_meta_edited']= 'metadata editada'; $lang['media_perm_read'] = 'Perdão, não tem permissão para ler ficheiros.'; $lang['media_perm_upload']= 'Perdão, não tem permissão para enviar ficheiros.'; diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 2a61ef204..91f8ebb97 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -127,7 +127,6 @@ Puteţi însă copia şi insera legătura.'; $lang['js']['linkwiz'] = 'Asistent legătură'; $lang['js']['linkto'] = 'Legătură la:'; $lang['js']['del_confirm'] = 'Doriţi într-adevăr ştergerea elementelor selectate?'; -$lang['js']['mu_btn'] = 'Încarcă mai multe fişiere simultan'; $lang['js']['restore_confirm'] = 'Sunteți sigur că doriți restaurarea acestei versiuni?'; $lang['js']['media_diff'] = 'Arată diferențele:'; $lang['js']['media_diff_both'] = 'Unul lângă altul'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 52c1dc20b..eda838451 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -143,7 +143,6 @@ $lang['js']['nosmblinks'] = 'Ссылка на сетевые катало $lang['js']['linkwiz'] = 'Мастер ссылок'; $lang['js']['linkto'] = 'Ссылка на:'; $lang['js']['del_confirm'] = 'Вы на самом деле желаете удалить выбранное?'; -$lang['js']['mu_btn'] = 'Загрузить несколько файлов одновременно'; $lang['js']['willexpire'] = 'Ваша блокировка этой страницы на редактирование истекает в течении минуты.\nЧтобы предотвратить конфликты используйте кнопку "Просмотр" для сброса таймера блокировки.'; $lang['js']['restore_confirm'] = 'Действительно восстановить эту версию?'; $lang['js']['media_diff'] = 'Просмотр отличий:'; @@ -348,12 +347,12 @@ $lang['media_searchtab'] = 'Поиск'; $lang['media_viewtab'] = 'Просмотр'; $lang['media_edittab'] = 'Правка'; $lang['media_historytab'] = 'История'; -$lang['media_sort_name'] = '<span>Сортировка по</span> имени'; -$lang['media_sort_date'] = '<span>Сортировка по</span> дате'; +$lang['media_sort_name'] = 'Сортировка по имени'; +$lang['media_sort_date'] = 'Сортировка по дате'; $lang['media_upload'] = 'Загрузка в пространство имён <strong>%s</strong>.'; $lang['media_search'] = 'Поиск в пространстве имён <strong>%s</strong>.'; -$lang['media_view'] = '<span class="%s">%s</span>'; -$lang['media_edit'] = 'Правка <span class="%s">%s</span>'; +$lang['media_view'] = '%s'; +$lang['media_edit'] = 'Правка %s'; $lang['media_meta_edited'] = 'метаданные изменены'; $lang['media_perm_read'] = 'Извините, у Вас недостаточно прав для чтения файлов.'; $lang['media_perm_upload'] = 'Извините, у Вас недостаточно прав для загрузки файлов.'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index 4dab977b9..c0d45da58 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -48,6 +48,8 @@ $lang['btn_recover'] = 'Obnoviť koncept'; $lang['btn_draftdel'] = 'Zmazať koncept'; $lang['btn_revert'] = 'Obnoviť'; $lang['btn_register'] = 'Registrovať'; +$lang['btn_apply'] = 'Použiť'; +$lang['btn_media'] = 'Správa médií'; $lang['loggedinas'] = 'Prihlásený(á) ako'; $lang['user'] = 'Užívateľské meno'; $lang['pass'] = 'Heslo'; @@ -92,7 +94,7 @@ $lang['txt_filename'] = 'Uložiť ako (voliteľné)'; $lang['txt_overwrt'] = 'Prepísať existujúci súbor'; $lang['lockedby'] = 'Práve zamknuté:'; $lang['lockexpire'] = 'Zámok stratí platnosť:'; -$lang['js']['willexpire'] = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.'; +$lang['js']['willexpire'] = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.'; $lang['js']['notsavedyet'] = 'Neuložené zmeny budú stratené. Chcete naozaj pokračovať?'; $lang['js']['searchmedia'] = 'Hľadať súbory'; @@ -101,7 +103,7 @@ $lang['js']['hidedetails'] = 'Skryť detaily'; $lang['js']['mediatitle'] = 'Nastavenia odkazu'; $lang['js']['mediadisplay'] = 'Typ odkazu'; $lang['js']['mediaalign'] = 'Zarovnanie'; -$lang['js']['mediasize'] = 'Veľkosť obrázku'; +$lang['js']['mediasize'] = 'Veľkosť obrázka'; $lang['js']['mediatarget'] = 'Cieľ odkazu'; $lang['js']['mediaclose'] = 'Zatvoriť'; $lang['js']['mediainsert'] = 'Vložiť'; @@ -124,7 +126,17 @@ Aj napriek tomu tento odkaz môžete skopírovať a vložiť inde.'; $lang['js']['linkwiz'] = 'Sprievodca odkazmi'; $lang['js']['linkto'] = 'Odkaz na:'; $lang['js']['del_confirm'] = 'Zmazať túto položku?'; -$lang['js']['mu_btn'] = 'Nahrať viac súborov súčasne'; +$lang['js']['restore_confirm'] = 'Skutočne obnoviť túto verziu?'; +$lang['js']['media_diff'] = 'Zobraziť rozdiely:'; +$lang['js']['media_diff_both'] = 'Vedľa seba'; +$lang['js']['media_diff_opacity'] = 'Presvitaním'; +$lang['js']['media_diff_portions'] = 'Potiahnutím'; +$lang['js']['media_select'] = 'Vybrať súbory...'; +$lang['js']['media_upload_btn'] = 'Nahrať'; +$lang['js']['media_done_btn'] = 'Hotovo'; +$lang['js']['media_drop'] = 'Pridajte súbory potiahnutím myšou'; +$lang['js']['media_cancel'] = 'odstrániť'; +$lang['js']['media_overwrt'] = 'Prepísať existujúce súbory'; $lang['rssfailed'] = 'Nastala chyba pri vytváraní tohto RSS: '; $lang['nothingfound'] = 'Nič nenájdené.'; $lang['mediaselect'] = 'Výber dokumentu'; @@ -179,6 +191,10 @@ $lang['mail_changed'] = 'stránka zmenená:'; $lang['mail_subscribe_list'] = 'stránky zmenené v mennom priestore:'; $lang['mail_new_user'] = 'nový užívateľ:'; $lang['mail_upload'] = 'nahraný súbor:'; +$lang['changes_type'] = 'Prehľad zmien'; +$lang['pages_changes'] = 'Stránok'; +$lang['media_changes'] = 'Média súborov'; +$lang['both_changes'] = 'Stránok spolu s média súbormi'; $lang['qb_bold'] = 'Tučné'; $lang['qb_italic'] = 'Kurzíva'; $lang['qb_underl'] = 'Podčiarknutie'; @@ -219,6 +235,9 @@ $lang['img_copyr'] = 'Kopírovacie práva'; $lang['img_format'] = 'Formát'; $lang['img_camera'] = 'Fotoaparát'; $lang['img_keywords'] = 'Kľúčové slová'; +$lang['img_width'] = 'Šírka'; +$lang['img_height'] = 'Výška'; +$lang['img_manager'] = 'Prezrieť v správcovi médií'; $lang['subscr_subscribe_success'] = 'Používateľ %s bol pridaný do zoznamu hlásení o zmenách %s'; $lang['subscr_subscribe_error'] = 'Chyba pri pridaní používateľa %s do zoznamu hlásení o zmenách %s'; $lang['subscr_subscribe_noaddress'] = 'Vaše prihlasovacie meno nemá priradenú žiadnu email adresu, nemôžete byť pridaný do zoznamu hlásení o zmenách'; @@ -283,3 +302,27 @@ $lang['hours'] = 'pred %d hodinami'; $lang['minutes'] = 'pred %d minútami'; $lang['seconds'] = 'pred %d sekundami'; $lang['wordblock'] = 'Vaše zmeny neboli uložené, pretože obsahovali nepovolený text (spam).'; +$lang['media_uploadtab'] = 'Nahrať'; +$lang['media_searchtab'] = 'Hľadať'; +$lang['media_file'] = 'Súbor'; +$lang['media_viewtab'] = 'Náhľad'; +$lang['media_edittab'] = 'Upraviť'; +$lang['media_historytab'] = 'História'; +$lang['media_list_thumbs'] = 'Miniatúry'; +$lang['media_list_rows'] = 'Zoznam'; +$lang['media_sort_name'] = 'Meno'; +$lang['media_sort_date'] = 'Dátum'; +$lang['media_namespaces'] = 'Vybrať priestor'; +$lang['media_files'] = 'Súbory v %s'; +$lang['media_upload'] = 'Nahrať do %s'; +$lang['media_search'] = 'Hľadať v %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s v %s'; +$lang['media_edit'] = 'Upraviť %s'; +$lang['media_history'] = 'História %s'; +$lang['media_meta_edited'] = 'metadáta upravené'; +$lang['media_perm_read'] = 'Prepáčte, ale nemáte dostatočné oprávnenie na čítanie súborov.'; +$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/lang/sl/lang.php b/inc/lang/sl/lang.php index 55c895b2d..9acf13504 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -123,7 +123,6 @@ $lang['js']['nosmblinks'] = 'Povezovanje do souporabnih datotek sistema Win $lang['js']['linkwiz'] = 'Čarovnik za povezave'; $lang['js']['linkto'] = 'Poveži na:'; $lang['js']['del_confirm'] = 'Ali naj se res izbrišejo izbrani predmeti?'; -$lang['js']['mu_btn'] = 'Pošiljanje več dokumentov hkrati.'; $lang['rssfailed'] = 'Prišlo je do napake med pridobivanjem vira: '; $lang['nothingfound'] = 'Ni najdenih predmetov.'; $lang['mediaselect'] = 'Predstavne datoteke'; diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php index ea2f018b3..87d0f30b5 100644 --- a/inc/lang/sq/lang.php +++ b/inc/lang/sq/lang.php @@ -120,7 +120,6 @@ $lang['js']['nosmblinks'] = 'Lidhja te Windows shares funksionon vetëm në $lang['js']['linkwiz'] = 'Magjistari i Link'; $lang['js']['linkto'] = 'Lidh tek:'; $lang['js']['del_confirm'] = 'Fshiji vërtetë objektet e përzgjedhura?'; -$lang['js']['mu_btn'] = 'Ngarko shumë skedarë njëkohësisht'; $lang['mediausage'] = 'Përdor sintaksën e mëposhtme për të referuar këtë skedar:'; $lang['mediaview'] = 'Shiko skedarin origjinal'; $lang['mediaroot'] = 'rrënja'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index a868f1d81..22bcf4e33 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -123,7 +123,6 @@ $lang['js']['nosmblinks'] = 'Повезивање са Windows дељени $lang['js']['linkwiz'] = 'Чаробњак за стварање везе'; $lang['js']['linkto'] = 'Повежи ка:'; $lang['js']['del_confirm'] = 'Обриши овај унос?'; -$lang['js']['mu_btn'] = 'Слање више датотека одједном'; $lang['rssfailed'] = 'Дошло је до грешке приликом преузимања овог довода: '; $lang['nothingfound'] = 'Ништа није нађено.'; $lang['mediaselect'] = 'Избор медијске датотеке'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index d6f90a5f4..943509fed 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -131,7 +131,6 @@ Du kan fortfarande klippa och klistra in länken om du använder en annan webbl $lang['js']['linkwiz'] = 'Snabbguide Länkar'; $lang['js']['linkto'] = 'Länk till:'; $lang['js']['del_confirm'] = 'Vill du verkligen radera?'; -$lang['js']['mu_btn'] = 'Ladda upp flera filer samtidigt'; $lang['rssfailed'] = 'Ett fel uppstod när detta RSS-flöde skulle hämtas: '; $lang['nothingfound'] = 'Inga filer hittades.'; $lang['mediaselect'] = 'Mediafiler'; diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php index e9dffa2c1..0d0613961 100644 --- a/inc/lang/th/lang.php +++ b/inc/lang/th/lang.php @@ -46,8 +46,6 @@ $lang['btn_backlink'] = 'หน้าที่ลิงก์มา'; $lang['btn_backtomedia'] = 'กลับไปยังหน้าเลือกไฟล์สื่อ'; $lang['btn_subscribe'] = 'เฝ้าดู'; $lang['btn_unsubscribe'] = 'เลิกเฝ้าดู'; -$lang['btn_subscribens'] = 'สมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ'; -$lang['btn_unsubscribens'] = 'ยกเลิกสมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ'; $lang['btn_profile'] = 'แก้ข้อมูลผู้ใช้'; $lang['btn_reset'] = 'เริ่มใหม่'; $lang['btn_resendpwd'] = 'ลืมรหัส ส่งให้ใหม่ทางอีเมล'; @@ -126,7 +124,6 @@ $lang['js']['nosmblinks'] = 'เชื่อมไปยังหน้า $lang['js']['linkwiz'] = 'ลิงค์วิเศษ'; $lang['js']['linkto'] = 'ลิงค์ไป:'; $lang['js']['del_confirm'] = 'ต้องการลบรายการที่เลือกจริงๆหรือ?'; -$lang['js']['mu_btn'] = 'อัพโหลดหลายๆไฟล์ในครั้งเดียว'; $lang['mediausage'] = 'ให้ใช้ไวยกรณ์ต่อไปนี้เพื่ออ้างอิงไฟล์นี้'; $lang['mediaview'] = 'ดูไฟล์ต้นฉบับ'; $lang['mediaroot'] = 'ราก(รูท)'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index 0b76a6e81..94b1c951a 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -124,7 +124,6 @@ $lang['js']['nosmblinks'] = 'Windows paylaşımı sadece Microsoft Internet $lang['js']['linkwiz'] = 'Bağlantı sihirbazı'; $lang['js']['linkto'] = 'Bağlantı:'; $lang['js']['del_confirm'] = 'Bu girişi sil?'; -$lang['js']['mu_btn'] = 'Birden fazla dosyayı bir seferde gönder'; $lang['rssfailed'] = 'Bu beslemeyi çekerken hata oluştu: '; $lang['nothingfound'] = 'Hiçbir şey yok.'; $lang['mediaselect'] = 'Çokluortam dosyası seçimi'; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index 6b80bc75c..22d61c9bf 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -126,7 +126,6 @@ $lang['js']['nosmblinks'] = 'Посилання на мережеві па $lang['js']['linkwiz'] = 'Чарівник посилань'; $lang['js']['linkto'] = 'Посилання на:'; $lang['js']['del_confirm'] = 'Дійсно знищити обрані елементи?'; -$lang['js']['mu_btn'] = 'Завантажити одночасно кілька файлів'; $lang['rssfailed'] = 'Виникла помилка під час отримання RSS-стрічки: '; $lang['nothingfound'] = 'Нічого не знайдено.'; $lang['mediaselect'] = 'Вибір медіа-файлу'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index 2222125f5..a46869d6c 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -126,7 +126,6 @@ $lang['js']['nosmblinks'] = '只有在 Microsoft IE 下才能執行「連 $lang['js']['linkwiz'] = '建立連結精靈'; $lang['js']['linkto'] = '連結至：'; $lang['js']['del_confirm'] = '確定刪除選取的項目？'; -$lang['js']['mu_btn'] = '上傳多個檔案'; $lang['rssfailed'] = '擷取 RSS 饋送檔時發生錯誤：'; $lang['nothingfound'] = '沒找到任何結果。'; $lang['mediaselect'] = '媒體檔案'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 4328d10ce..6e6dff6f4 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -133,7 +133,6 @@ $lang['js']['nosmblinks'] = '连接到 Windows 共享功能只有在 IE 浏 $lang['js']['linkwiz'] = '链接向导'; $lang['js']['linkto'] = '链接到：'; $lang['js']['del_confirm'] = '真的要删除选中的项目吗？'; -$lang['js']['mu_btn'] = '一次上传了多个文件'; $lang['js']['restore_confirm'] = '确实要恢复这个版本么？'; $lang['js']['media_diff'] = '查看差异：'; $lang['js']['media_diff_both'] = '肩并肩'; diff --git a/inc/media.php b/inc/media.php index 3e640237a..9d3e90a54 100644 --- a/inc/media.php +++ b/inc/media.php @@ -647,7 +647,11 @@ function media_tabs_details($image, $selected_tab = ''){ function media_tab_files_options(){ global $lang, $NS; $form = new Doku_Form(array('class' => 'options', 'method' => 'get', - 'action' => media_managerURL(array(), '&'))); + 'action' => wl($ID))); + $media_manager_params = media_managerURL(array(), '', false, true); + foreach($media_manager_params as $pKey => $pVal){ + $form->addHidden($pKey, $pVal); + } $form->addHidden('sectok', null); if (isset($_REQUEST['q'])) { $form->addHidden('q', $_REQUEST['q']); @@ -698,7 +702,11 @@ function _media_get_display_param($param, $values) { // FIXME: Set cookie return $_REQUEST[$param]; } else { - return get_doku_pref($param, $values['default']); + $val = get_doku_pref($param, $values['default']); + if (!in_array($val, $values)) { + $val = $values['default']; + } + return $val; } } @@ -1355,6 +1363,20 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){ echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '. 'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>'; + // mediamanager button + $link = wl('',array('do'=>'media','image'=>$item['id'])); + echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/mediamanager.png" '. + 'alt="'.$lang['btn_media'].'" title="'.$lang['btn_media'].'" class="btn" /></a>'; + + // delete button + if($item['writable'] && $auth >= AUTH_DELETE){ + $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']). + '&sectok='.getSecurityToken(); + echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$item['id'].'">'. + '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '. + 'title="'.$lang['btn_delete'].'" class="btn" /></a>'; + } + echo '<div class="example" id="ex_'.str_replace(':','_',$item['id']).'">'; echo $lang['mediausage'].' <code>{{:'.$item['id'].'}}</code>'; echo '</div>'; diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 22a50d1b7..55b715ad9 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1489,10 +1489,10 @@ class Doku_Handler_Block { } } - function openParagraph($pos){
+ function openParagraph($pos){ if ($this->inParagraph) return; $this->calls[] = array('p_open',array(), $pos); - $this->inParagraph = true;
+ $this->inParagraph = true; $this->skipEol = true; } @@ -1503,11 +1503,12 @@ class Doku_Handler_Block { * * @author Andreas Gohr <andi@splitbrain.org> */ - function closeParagraph($pos){
+ function closeParagraph($pos){ if (!$this->inParagraph) return; // look back if there was any content - we don't want empty paragraphs $content = ''; - for($i=count($this->calls)-1; $i>=0; $i--){ + $ccount = count($this->calls); + for($i=$ccount-1; $i>=0; $i--){ if($this->calls[$i][0] == 'p_open'){ break; }elseif($this->calls[$i][0] == 'cdata'){ @@ -1520,18 +1521,19 @@ class Doku_Handler_Block { if(trim($content)==''){ //remove the whole paragraph - array_splice($this->calls,$i); - }else{
- // remove ending linebreaks in the paragraph
- $i=count($this->calls)-1;
+ //array_splice($this->calls,$i); // <- this is much slower than the loop below + for($x=$ccount; $x>$i; $x--) array_pop($this->calls); + }else{ + // remove ending linebreaks in the paragraph + $i=count($this->calls)-1; if ($this->calls[$i][0] == 'cdata') $this->calls[$i][1][0] = rtrim($this->calls[$i][1][0],DOKU_PARSER_EOL); $this->calls[] = array('p_close',array(), $pos); } - $this->inParagraph = false;
+ $this->inParagraph = false; $this->skipEol = true; } - + function addCall($call) { $key = count($this->calls); if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) { @@ -1553,7 +1555,7 @@ class Doku_Handler_Block { * @author Andreas Gohr <andi@splitbrain.org> */ function process($calls) { - // open first paragraph
+ // open first paragraph $this->openParagraph(0); foreach ( $calls as $key => $call ) { $cname = $call[0]; diff --git a/inc/template.php b/inc/template.php index b56d6c718..c70e407d6 100644 --- a/inc/template.php +++ b/inc/template.php @@ -480,10 +480,15 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){ $linktarget = wl($id, $params); } $caption = $lang['btn_' . $type]; + $akey = $addTitle = ''; + if($accesskey){ + $akey = 'accesskey="'.$accesskey.'" '; + $addTitle = ' ['.strtoupper($accesskey).']'; + } $out = tpl_link($linktarget, $pre.(($inner)?$inner:$caption).$suf, 'class="action ' . $type . '" ' . - 'accesskey="' . $accesskey . '" rel="nofollow" ' . - 'title="' . hsc($caption) . '"', 1); + $akey . 'rel="nofollow" ' . + 'title="' . hsc($caption).$addTitle . '"', 1); } if ($return) return $out; echo $out; @@ -626,10 +631,6 @@ function tpl_get_action($type) { return false; } break; - case 'subscribens': - // Superseded by subscribe/subscription - return ''; - break; case 'media': break; default: diff --git a/inc/utf8.php b/inc/utf8.php index 303987e4f..9d0d17f78 100644 --- a/inc/utf8.php +++ b/inc/utf8.php @@ -1219,7 +1219,7 @@ if(empty($UTF8_SPECIAL_CHARS)) $UTF8_SPECIAL_CHARS = array( global $UTF8_SPECIAL_CHARS2; if(empty($UTF8_SPECIAL_CHARS2)) $UTF8_SPECIAL_CHARS2 = "\x1A".' !"#$%&\'()+,/;<=>?@[\]^`{|}~
�'. - '� ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½�'. + '� ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½�'. '�¿×÷ˇ˘˙˚˛˜˝̣̀́̃̉΄΅·ϖְֱֲֳִֵֶַָֹֻּֽ־ֿ�'. '�ׁׂ׃׳״،؛؟ـًٌٍَُِّْ٪฿–—―‗‘’‚“”�'. '��†‡•…‰′″‹›⁄₧₪₫€№℘™Ωℵ←↑→↓↔↕↵'. |